Commit Graph

110426 Commits

Author SHA1 Message Date
Peter Kokot
623911f993 Merge branch 'PHP-7.4'
* PHP-7.4:
  Remove local variables
2019-02-03 21:23:18 +01:00
Peter Kokot
92ac598aab Remove local variables
This patch removes the so called local variables defined per
file basis for certain editors to properly show tab width, and
similar settings. These are mainly used by Vim and Emacs editors
yet with recent changes the once working definitions don't work
anymore in Vim without custom plugins or additional configuration.
Neither are these settings synced across the PHP code base.

A simpler and better approach is EditorConfig and fixing code
using some code style fixing tools in the future instead.

This patch also removes the so called modelines for Vim. Modelines
allow Vim editor specifically to set some editor configuration such as
syntax highlighting, indentation style and tab width to be set in the
first line or the last 5 lines per file basis. Since the php test
files have syntax highlighting already set in most editors properly and
EditorConfig takes care of the indentation settings, this patch removes
these as well for the Vim 6.0 and newer versions.

With the removal of local variables for certain editors such as
Emacs and Vim, the footer is also probably not needed anymore when
creating extensions using ext_skel.php script.

Additionally, Vim modelines for setting php syntax and some editor
settings has been removed from some *.phpt files.  All these are
mostly not relevant for phpt files neither work properly in the
middle of the file.
2019-02-03 21:03:00 +01:00
Christoph M. Becker
5ded0e8f29 Merge branch 'PHP-7.4'
* PHP-7.4:
  [ci skip] Add missing notes regarding gc_status()
2019-02-03 18:33:08 +01:00
Christoph M. Becker
020ca5bf2b Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  [ci skip] Add missing notes regarding gc_status()
2019-02-03 18:32:01 +01:00
Christoph M. Becker
c0228f741e [ci skip] Add missing notes regarding gc_status() 2019-02-03 18:28:43 +01:00
Joe Watkins
4752aecdaf
Merge branch 'PHP-7.4'
* PHP-7.4:
  Properly check for array_replace_recursive in sccp.c
2019-02-03 08:42:22 +01:00
Joe Watkins
ed1afdd617
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Properly check for array_replace_recursive in sccp.c
2019-02-03 08:42:07 +01:00
Joe Watkins
e1c93d1fb2
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Properly check for array_replace_recursive in sccp.c
2019-02-03 08:41:26 +01:00
Tyson Andre
cf56832d00
Properly check for array_replace_recursive in sccp.c
Due to a typo, this code used to check for array_merge_recursive
twice.
2019-02-03 08:40:21 +01:00
Nikita Popov
76f8a908bb Try to fix serialization_miscTypes_001.phpt 2019-02-01 17:15:16 +01:00
Nikita Popov
4f187b8fbc Make session_cache_expire() arg an integer
This is logically an integer, and the function also returns the old
value as an integer. The fact that the integer needs to be converted
to a string for the ini assignment is an implementation detail.
2019-02-01 16:08:31 +01:00
Nikita Popov
4a4c68d90d Make mb_ereg(i) argument a normal string argument
Instead of manually handling the string conversion, use the standard
zpp mechanism.
2019-02-01 15:40:09 +01:00
Nikita Popov
06ed6b8978 Make mb_ereg_replace() pattern argument a string 2019-02-01 15:19:46 +01:00
Nikita Popov
ba5d2e6af3 Merge branch 'PHP-7.4' 2019-02-01 15:03:10 +01:00
Nikita Popov
e366ceebad Deprecate mb_ereg_replace with non-string pattern
I'm counting this towards the non-string needle deprecation from
https://wiki.php.net/rfc/deprecations_php_7_3. I wasn't aware that
mb_ereg_replace() is also affected by this issue. It's even more
ridiculous than usual here, because the integer is interpreted as
an ASCII codepoint, even though these are supposed to be multibyte
functions :(
2019-02-01 15:02:31 +01:00
Nikita Popov
e237591467 Merge branch 'PHP-7.4' 2019-02-01 11:42:52 +01:00
Nikita Popov
882dcb43f7 Fix bogus $PHP_PCRE_REGEX checks
This variable was dropped in the pkg-config migration, which resulted
in spurious warnings about using valgrind with external PCRE. Fix the
checks to use the right variable.
2019-02-01 11:42:41 +01:00
Dmitry Stogov
c4dd9776df Merge branch 'PHP-7.4'
* PHP-7.4:
  Fixed bug #77329 (Buffer Overflow via overly long Error Messages)
2019-02-01 11:13:49 +03:00
Dmitry Stogov
d91e3beaa3 Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Fixed bug #77329 (Buffer Overflow via overly long Error Messages)
2019-02-01 11:13:25 +03:00
Dmitry Stogov
203a2da30a Fixed bug #77329 (Buffer Overflow via overly long Error Messages) 2019-02-01 11:11:15 +03:00
Christoph M. Becker
a851f16b2b Fix version.inc update notes 2019-01-31 16:12:50 +01:00
Nikita Popov
aad39879f2 Remove bareword fallback for constants
Access to undefined constants will now always result in an Error
exception being thrown.

This required quite a few test changes, because there were many
buggy tests that unintentionally used bareword fallback in combination
with error suppression.
2019-01-31 13:52:06 +01:00
Nikita Popov
3d39479f4d Remove support for case-insensitive constants
The only remaining case-insensitive constants are null, true and
false, which are handled explicitly.

In the future we may convert them from constants to reserved keywords.
2019-01-31 13:52:06 +01:00
Dmitry Stogov
3d478e5cc3 gmp_random() was removed 2019-01-31 14:35:27 +03:00
Nikita Popov
9c5ab992ac Merge branch 'PHP-7.4' 2019-01-31 09:40:01 +01:00
Nikita Popov
340c6d3927 Revert "Don't silence fatal errors with @"
This reverts commit abd36289e2.

This wasn't ready for merging yet, there are still some test
failures.
2019-01-31 09:39:10 +01:00
Joe Watkins
839bdf12ee
Merge branch 'PHP-7.4'
* PHP-7.4:
  Don't silence fatal errors with @
2019-01-31 07:11:18 +01:00
Nikita Popov
abd36289e2
Don't silence fatal errors with @ 2019-01-31 07:11:05 +01:00
Gabriel Caruso
4e0dd6b0ed Remove unnecessary CLI checks in tests 2019-01-31 00:21:32 -02:00
Joe Watkins
cc60e8b000
Merge branch 'PHP-7.4'
* PHP-7.4:
  Fix bug 76596: phpdbg supports display_errors=stderr
2019-01-30 18:29:18 +01:00
Joe Watkins
25dc5f18e4
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Fix bug 76596: phpdbg supports display_errors=stderr
2019-01-30 18:28:55 +01:00
Joe Watkins
7d1df603ad
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Fix bug 76596: phpdbg supports display_errors=stderr
2019-01-30 18:28:25 +01:00
Kevin Abel
3890c8bce5
Fix bug 76596: phpdbg supports display_errors=stderr 2019-01-30 18:27:57 +01:00
Joe Watkins
ffbe00886f
Merge branch 'PHP-7.3'
* PHP-7.3:
  Fix #77546 iptcembed broken function
2019-01-30 17:11:11 +01:00
Joe Watkins
b8e683e868
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Fix #77546 iptcembed broken function
2019-01-30 17:10:33 +01:00
Guillaume Degoulet
f27f902266
Fix #77546 iptcembed broken function 2019-01-30 17:09:12 +01:00
Nikita Popov
e18fde1a02 Remove -1 crop mode 2019-01-30 16:46:36 +01:00
Nikita Popov
f8038f827c Remove intl Normalizer::NONE 2019-01-30 16:35:32 +01:00
Nikita Popov
db8a4e87a7 Remove error_reporting assignments in some tests 2019-01-30 16:00:19 +01:00
Nikita Popov
0dfd918ee7 Remove support for __autoload()
There are probably some improvements we can do to the SPL
implementation now that __autoload() is gone. In particular having
EG(autoload_func) as a property zend function, rather than a simple
callback probably doesn't make sense.
2019-01-30 14:00:16 +01:00
Nikita Popov
e93bbf4d5d Remove more leftovers from invalid static calls
Callbacks are now always valid or not valid, there is no in-between.
2019-01-30 13:13:47 +01:00
Nikita Popov
c88e2cce81 Removed read_exif_data() alias 2019-01-30 13:13:47 +01:00
Nikita Popov
5a2787a02d Require at least one arg for mktime/gmmktime 2019-01-30 13:13:47 +01:00
Nikita Popov
94ae35c9fb Remove ability to specify 'salt' in password_hash() 2019-01-30 13:13:47 +01:00
Nikita Popov
1870283e45 Merge branch 'PHP-7.4' 2019-01-30 12:02:47 +01:00
David Carlier
6a8260a0ac opcache/FreeBSD huge code page pragma support
Sort of following up on super pages support earlier, here
we also detect page mappings possibly eligible to go to
super pages.
2019-01-30 12:01:44 +01:00
Nikita Popov
d46ba963c3 Merge branch 'PHP-7.4' 2019-01-30 11:48:42 +01:00
Zeev Suraski
a453619499 Take out some last remnants of the yearly copyright range 2019-01-30 11:48:30 +01:00
Zeev Suraski
a81202ac49 Adios, yearly copyright ranges 2019-01-30 11:48:28 +01:00
Zeev Suraski
91a7c6f612 Take out some last remnants of the yearly copyright range 2019-01-30 11:26:28 +02:00