]> granicus.if.org Git - php/log
php
6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Tue, 26 Feb 2019 16:27:16 +0000 (17:27 +0100)]
Merge branch 'PHP-7.4'

6 years agoSync types in .gdbinit, improve property dumping
Nikita Popov [Tue, 26 Feb 2019 16:26:16 +0000 (17:26 +0100)]
Sync types in .gdbinit, improve property dumping

If an object doesn't have a property table, we need to go through
the property into table and read the corresponding slots.

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Mon, 25 Feb 2019 16:45:35 +0000 (17:45 +0100)]
Merge branch 'PHP-7.4'

6 years agoMake regex replacements in zend_vm_gen.php more obvious
Benjamin Eberlei [Sat, 23 Feb 2019 20:14:12 +0000 (21:14 +0100)]
Make regex replacements in zend_vm_gen.php more obvious

Change specializing preg_replace code in VM to be map of search to
replacement for easier understanding.

6 years agoFix tests bareword fallback with error suppression
Nikita Popov [Thu, 31 Jan 2019 11:25:51 +0000 (12:25 +0100)]
Fix tests bareword fallback with error suppression

Re-merge commit a369326003995c137046c908e79b6ab482d34cec into PHP-7.4
(cherry picked from commit aad39879f2d2e89de105c4f87d334ee129b4321c)
(cherry picked from commit 76f8a908bb18aee92b8f3d523b74b06c9d12cb6b)

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Mon, 25 Feb 2019 12:03:26 +0000 (13:03 +0100)]
Merge branch 'PHP-7.4'

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 25 Feb 2019 12:02:58 +0000 (13:02 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 25 Feb 2019 12:01:18 +0000 (13:01 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoFix assertion in Exception::getMessage() if $message is a ref
Nikita Popov [Mon, 25 Feb 2019 12:00:16 +0000 (13:00 +0100)]
Fix assertion in Exception::getMessage() if $message is a ref

And same for other properties. Encountered in Symfony.

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Mon, 25 Feb 2019 08:36:20 +0000 (09:36 +0100)]
Merge branch 'PHP-7.4'

6 years agoFix some directory collisions in dir tests
Nikita Popov [Mon, 25 Feb 2019 08:34:20 +0000 (09:34 +0100)]
Fix some directory collisions in dir tests

6 years agoFix some port collisions in sockets tests
Nikita Popov [Mon, 25 Feb 2019 08:24:45 +0000 (09:24 +0100)]
Fix some port collisions in sockets tests

6 years agoMerge branch 'PHP-7.3'
Xinchen Hui [Mon, 25 Feb 2019 07:04:13 +0000 (15:04 +0800)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Fixed compiler warning

6 years agoFixed compiler warning
Xinchen Hui [Mon, 25 Feb 2019 07:04:04 +0000 (15:04 +0800)]
Fixed compiler warning

6 years agoMerge branch 'PHP-7.3'
Xinchen Hui [Mon, 25 Feb 2019 07:00:44 +0000 (15:00 +0800)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Update NEWS
  Fixed bug #77660 (Segmentation fault on break 2147483648)

6 years agoUpdate NEWS
Xinchen Hui [Mon, 25 Feb 2019 07:00:37 +0000 (15:00 +0800)]
Update NEWS

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Xinchen Hui [Mon, 25 Feb 2019 07:00:23 +0000 (15:00 +0800)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fixed bug #77660 (Segmentation fault on break 2147483648)

6 years agoFixed bug #77660 (Segmentation fault on break 2147483648)
Xinchen Hui [Mon, 25 Feb 2019 07:00:14 +0000 (15:00 +0800)]
Fixed bug #77660 (Segmentation fault on break 2147483648)

6 years agoMerge branch 'PHP-7.3'
Xinchen Hui [Mon, 25 Feb 2019 06:42:56 +0000 (14:42 +0800)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Update NEWS
  Fixed bug #77664 (Segmentation fault when using undefined constant in custom wrapper)

6 years agoUpdate NEWS
Xinchen Hui [Mon, 25 Feb 2019 06:42:18 +0000 (14:42 +0800)]
Update NEWS

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Xinchen Hui [Mon, 25 Feb 2019 06:42:01 +0000 (14:42 +0800)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fixed bug #77664 (Segmentation fault when using undefined constant in custom wrapper)

6 years agoFixed bug #77664 (Segmentation fault when using undefined constant in custom wrapper)
Xinchen Hui [Mon, 25 Feb 2019 06:40:53 +0000 (14:40 +0800)]
Fixed bug #77664 (Segmentation fault when using undefined constant in custom wrapper)

6 years agoMerge branch 'PHP-7.4'
Jakub Zelenka [Sun, 24 Feb 2019 13:15:57 +0000 (13:15 +0000)]
Merge branch 'PHP-7.4'

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Jakub Zelenka [Sun, 24 Feb 2019 13:15:17 +0000 (13:15 +0000)]
Merge branch 'PHP-7.3' into PHP-7.4

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Jakub Zelenka [Sun, 24 Feb 2019 13:14:36 +0000 (13:14 +0000)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoMerge branch 'PHP-7.4'
Jakub Zelenka [Sun, 24 Feb 2019 13:13:10 +0000 (13:13 +0000)]
Merge branch 'PHP-7.4'

6 years agoRevert "Disable bug77390.phpt"
Jakub Zelenka [Sun, 24 Feb 2019 13:12:38 +0000 (13:12 +0000)]
Revert "Disable bug77390.phpt"

This reverts commit 139492b1ae67efe541f88f8d1f3183e40ad7636d.

6 years agoPrint empty string in test for but 77390 just once
Jakub Zelenka [Sun, 24 Feb 2019 13:11:27 +0000 (13:11 +0000)]
Print empty string in test for but 77390 just once

6 years agoUse spaces instead of tabs in bug 77390 test
Jakub Zelenka [Sun, 24 Feb 2019 13:05:43 +0000 (13:05 +0000)]
Use spaces instead of tabs in bug 77390 test

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sat, 23 Feb 2019 21:29:16 +0000 (22:29 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Remove unused PHP_AC_BROKEN_SPRINTF and AC_ZEND_BROKEN_SPRINTF

6 years agoRemove unused PHP_AC_BROKEN_SPRINTF and AC_ZEND_BROKEN_SPRINTF
Peter Kokot [Wed, 20 Feb 2019 22:17:15 +0000 (23:17 +0100)]
Remove unused PHP_AC_BROKEN_SPRINTF and AC_ZEND_BROKEN_SPRINTF

The sprintf function has been normalized to php_sprintf via
61364b5bb172fa512c871b795c2613b1b587e4cd.

This patch removes the checks to make a custom sprintf function

The ZEND_BROKEN_SPRINTF has been removed and the
hardcoded #define zend_sprintf sprintf is used.

The php_sprintf and zend_sprintf are now symbols to sprintf.

This patch now removes the custom PHP definitions of the php_sprintf and
zend_sprintf functions in favor of the C99 sprintf which is also
standardized in C89 already. Once, on some systems sprintf didn't behave
in same way.

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sat, 23 Feb 2019 21:18:19 +0000 (22:18 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Replace Hebrew characters with escape sequences

6 years agoReplace Hebrew characters with escape sequences
Peter Kokot [Thu, 21 Feb 2019 21:46:41 +0000 (22:46 +0100)]
Replace Hebrew characters with escape sequences

calendar.c includes ISO-8859-8 encoded Hebrew characters, which may
cause compile errors, and is causing issues when saving file as UTF-8.
This patch replaces characters with appropriate escape sequences.

Following 99fdf5916eccbd72c10cc4d84693e677996b1229.

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 22 Feb 2019 16:40:08 +0000 (17:40 +0100)]
Merge branch 'PHP-7.4'

6 years agoDisable bug77390.phpt
Nikita Popov [Fri, 22 Feb 2019 16:39:43 +0000 (17:39 +0100)]
Disable bug77390.phpt

This is causing a lot of spurious failures on AppVeyor.

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 22 Feb 2019 14:44:13 +0000 (15:44 +0100)]
Merge branch 'PHP-7.4'

6 years agoFix anon class handling in ext mode
Nikita Popov [Fri, 22 Feb 2019 14:42:37 +0000 (15:42 +0100)]
Fix anon class handling in ext mode

Opcode order changes in 7.4 and the EXT_STMT is now declare the
DECLARE_ANON. Fix this by returning the opline from compile_class_decl
to avoid any fragile opcode searching.

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 22 Feb 2019 12:42:22 +0000 (13:42 +0100)]
Merge branch 'PHP-7.4'

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Fri, 22 Feb 2019 12:42:13 +0000 (13:42 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

6 years agoRemove result def during jmp_set optimization
Nikita Popov [Fri, 22 Feb 2019 12:41:47 +0000 (13:41 +0100)]
Remove result def during jmp_set optimization

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 22 Feb 2019 11:45:39 +0000 (12:45 +0100)]
Merge branch 'PHP-7.4'

6 years agoFix removal of unreachable code in SCCP
Nikita Popov [Fri, 22 Feb 2019 11:44:36 +0000 (12:44 +0100)]
Fix removal of unreachable code in SCCP

Due to a wrongly placed check, we were only performing the
unreachable code removal if there were loop vars...

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 22 Feb 2019 11:00:49 +0000 (12:00 +0100)]
Merge branch 'PHP-7.4'

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Fri, 22 Feb 2019 11:00:35 +0000 (12:00 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 22 Feb 2019 11:00:20 +0000 (12:00 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoFix inference warning about missing key type
Nikita Popov [Fri, 22 Feb 2019 10:55:16 +0000 (11:55 +0100)]
Fix inference warning about missing key type

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 22 Feb 2019 10:26:26 +0000 (11:26 +0100)]
Merge branch 'PHP-7.4'

6 years agoFix get_unresolved_initializer for static props
Nikita Popov [Fri, 22 Feb 2019 10:23:16 +0000 (11:23 +0100)]
Fix get_unresolved_initializer for static props

For static props the offset is a simple index.

6 years agoFix directory collisions in zlib tests
Nikita Popov [Fri, 22 Feb 2019 10:11:20 +0000 (11:11 +0100)]
Fix directory collisions in zlib tests

6 years agoFix more file name collisions in phar tests
Nikita Popov [Fri, 22 Feb 2019 10:06:04 +0000 (11:06 +0100)]
Fix more file name collisions in phar tests

6 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Fri, 22 Feb 2019 10:11:59 +0000 (11:11 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #77648: BOM in sapi/apache2handler/php_functions.c

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Fri, 22 Feb 2019 10:11:27 +0000 (11:11 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #77648: BOM in sapi/apache2handler/php_functions.c

6 years agoFix #77648: BOM in sapi/apache2handler/php_functions.c
Christoph M. Becker [Fri, 22 Feb 2019 10:03:52 +0000 (11:03 +0100)]
Fix #77648: BOM in sapi/apache2handler/php_functions.c

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 22 Feb 2019 09:53:28 +0000 (10:53 +0100)]
Merge branch 'PHP-7.4'

6 years agoUse separate files in phar tests
Nikita Popov [Fri, 22 Feb 2019 09:48:17 +0000 (10:48 +0100)]
Use separate files in phar tests

6 years agoStricter validation for popen mode argument on Windows
Nikita Popov [Thu, 21 Feb 2019 15:59:30 +0000 (16:59 +0100)]
Stricter validation for popen mode argument on Windows

Context: The ext/standard/tests/file/popen_pclose_error-win32.phpt
test often fails under parallel testing, because the "is not recognized
as an internal or external command" message doesn't actually have a
guaranteed position in the output.

While looking into this, I noticed that this test on Windows tests
something very different (invalid comand) than on Linux (invalid mode).
Here I'm adjusting the Windows popen implementation so it immediately
fails on a `rw` mode, just like it does on Linux.

6 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Fri, 22 Feb 2019 09:35:46 +0000 (10:35 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Avoid potentially superfluous string reallocation

6 years agoAvoid potentially superfluous string reallocation
Christoph M. Becker [Fri, 22 Feb 2019 09:18:39 +0000 (10:18 +0100)]
Avoid potentially superfluous string reallocation

If we're not going to register the constant, it makes no sense to
allocate a `zend_string` and free it shortly after.

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 22 Feb 2019 09:15:02 +0000 (10:15 +0100)]
Merge branch 'PHP-7.4'

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Fri, 22 Feb 2019 09:14:28 +0000 (10:14 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 22 Feb 2019 09:13:07 +0000 (10:13 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoFixed bug #77652
Nikita Popov [Fri, 22 Feb 2019 09:11:54 +0000 (10:11 +0100)]
Fixed bug #77652

6 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Fri, 22 Feb 2019 08:43:49 +0000 (09:43 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Properly clean up test case

6 years agoProperly clean up test case
Christoph M. Becker [Fri, 22 Feb 2019 08:43:12 +0000 (09:43 +0100)]
Properly clean up test case

If we had to create an initial $start directory, we should remove it
at the end of the test.

6 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Fri, 22 Feb 2019 07:12:49 +0000 (10:12 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Use different method to suppress "false" memory leak reports

6 years agoUse different method to suppress "false" memory leak reports
Dmitry Stogov [Fri, 22 Feb 2019 07:11:43 +0000 (10:11 +0300)]
Use different method to suppress "false" memory leak reports

6 years agoMerge branch 'PHP-7.4'
Joe Watkins [Thu, 21 Feb 2019 22:55:54 +0000 (23:55 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  While the compiler does not have the FBC set for zend_get_call_op, optimizer does, and so incorrectly results in ignoring these flags.

6 years agoWhile the compiler does not have the FBC set for zend_get_call_op, optimizer does...
Joe Watkins [Thu, 21 Feb 2019 22:54:26 +0000 (23:54 +0100)]
While the compiler does not have the FBC set for zend_get_call_op, optimizer does, and so incorrectly results in ignoring these flags.

If someone has a better patch, please merge it ASAP, this appears to be correct as I and Nikita originally thought.

Revert "Revert "zend_get_call_op ignoring compiler flags zend_get_call_op will ignore ZEND_COMPILE_IGNORE_USER_FUNCTIONS and ZEND_COMPILE_IGNORE_USER_FUNCTIONS, breaking the intention of these flags""

This reverts commit 0bbbd0f9e7449a2f204f959d06e5266175a86be9.

6 years agoMerge branch 'PHP-7.4'
Joe Watkins [Thu, 21 Feb 2019 21:41:13 +0000 (22:41 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Revert "zend_get_call_op ignoring compiler flags zend_get_call_op will ignore ZEND_COMPILE_IGNORE_USER_FUNCTIONS and ZEND_COMPILE_IGNORE_USER_FUNCTIONS, breaking the intention of these flags"

6 years agoRevert "zend_get_call_op ignoring compiler flags zend_get_call_op will ignore ZEND_CO...
Joe Watkins [Thu, 21 Feb 2019 21:40:02 +0000 (22:40 +0100)]
Revert "zend_get_call_op ignoring compiler flags zend_get_call_op will ignore ZEND_COMPILE_IGNORE_USER_FUNCTIONS and ZEND_COMPILE_IGNORE_USER_FUNCTIONS, breaking the intention of these flags"

This reverts commit 46807ec5da23d399873d9a1fcf4b73b7a783d23b.

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Thu, 21 Feb 2019 20:44:16 +0000 (21:44 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Remove unused PDO_MYSQL_LIB_CHK m4 macro

6 years agoRemove unused PDO_MYSQL_LIB_CHK m4 macro
Peter Kokot [Wed, 20 Feb 2019 20:08:56 +0000 (21:08 +0100)]
Remove unused PDO_MYSQL_LIB_CHK m4 macro

This was once used by the ext/mysql extension named as MYSQL_LIB_CHK.
The call got removed via fd1578c196575c7e120a84ee030bb87c14a199b0. In
PDO this is not called anymore and can be removed.

6 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Thu, 21 Feb 2019 17:26:00 +0000 (18:26 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix typo in error message

6 years agoFix typo in error message
Fabien Villepinte [Thu, 21 Feb 2019 16:11:55 +0000 (17:11 +0100)]
Fix typo in error message

6 years agoMerge branch 'PHP-7.4'
Frank Denis [Thu, 21 Feb 2019 15:47:18 +0000 (16:47 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix bug #77646

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Frank Denis [Thu, 21 Feb 2019 15:45:43 +0000 (16:45 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix bug #77646

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Frank Denis [Thu, 21 Feb 2019 15:34:42 +0000 (16:34 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix bug #77646

6 years agoFix bug #77646
Frank Denis [Thu, 21 Feb 2019 15:10:27 +0000 (16:10 +0100)]
Fix bug #77646

6 years agoMerge branch 'PHP-7.4'
Frank Denis [Thu, 21 Feb 2019 15:21:16 +0000 (16:21 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix bug #77646

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Frank Denis [Thu, 21 Feb 2019 15:19:44 +0000 (16:19 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix bug #77646

6 years agoFix bug #77646
Frank Denis [Thu, 21 Feb 2019 15:10:27 +0000 (16:10 +0100)]
Fix bug #77646

6 years agoFix bug #77646
Frank Denis [Thu, 21 Feb 2019 15:10:27 +0000 (16:10 +0100)]
Fix bug #77646

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 21 Feb 2019 15:07:03 +0000 (16:07 +0100)]
Merge branch 'PHP-7.4'

6 years agoRemove use of file resources from string function tests
Nikita Popov [Thu, 21 Feb 2019 14:49:37 +0000 (15:49 +0100)]
Remove use of file resources from string function tests

These tests are pointless (they don't even have anything to do
with resources, they just use get_resource_type() as a peculiar way
to create a string), and cause unnecessary IO dependency.

6 years agoMake (v)fprintf tests more robust
Nikita Popov [Thu, 21 Feb 2019 14:29:22 +0000 (15:29 +0100)]
Make (v)fprintf tests more robust

By using a separate file for each test. Also drop some unnecessary
SKIPIF checks for file creation. We assume that files can be created in
the test directories all over the place, so don't check for it here.

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 21 Feb 2019 12:46:42 +0000 (13:46 +0100)]
Merge branch 'PHP-7.4'

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 21 Feb 2019 12:46:31 +0000 (13:46 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 21 Feb 2019 12:45:25 +0000 (13:45 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoFixed bug #77597
Nikita Popov [Thu, 21 Feb 2019 12:42:47 +0000 (13:42 +0100)]
Fixed bug #77597

The same variable was reused in two nested loops... The test doesn't
fail on 7.2, but I'm fixing this here anyway as the code is clearly
wrong, and probably erroneous in other situations.

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 21 Feb 2019 11:23:08 +0000 (12:23 +0100)]
Merge branch 'PHP-7.4'

6 years agoMake zip oo_addglob test more robust
Nikita Popov [Thu, 21 Feb 2019 11:19:02 +0000 (12:19 +0100)]
Make zip oo_addglob test more robust

Use a separate directory for the test, so files created in the main
test directory cannot influence it.

6 years agoDon't parallelize dba tests
Nikita Popov [Thu, 21 Feb 2019 11:13:38 +0000 (12:13 +0100)]
Don't parallelize dba tests

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 21 Feb 2019 11:06:58 +0000 (12:06 +0100)]
Merge branch 'PHP-7.4'

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 21 Feb 2019 11:06:48 +0000 (12:06 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

6 years agoFix issue mentioned in #77302
Nikita Popov [Thu, 21 Feb 2019 11:04:49 +0000 (12:04 +0100)]
Fix issue mentioned in #77302

Apparently Serializable::serialize() can return NULL, which is encoded
as N;. As we do not allow back-references to non-object values in
PHP 7.3 we need to make sure that any references are also compiled to
N;.

6 years agoMerge branch 'PHP-7.4'
Joe Watkins [Thu, 21 Feb 2019 10:22:43 +0000 (11:22 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  zend_get_call_op ignoring compiler flags zend_get_call_op will ignore ZEND_COMPILE_IGNORE_USER_FUNCTIONS and ZEND_COMPILE_IGNORE_USER_FUNCTIONS, breaking the intention of these flags

6 years agozend_get_call_op ignoring compiler flags zend_get_call_op will ignore ZEND_COMPILE_IG...
Joe Watkins [Thu, 21 Feb 2019 07:53:28 +0000 (08:53 +0100)]
zend_get_call_op ignoring compiler flags zend_get_call_op will ignore ZEND_COMPILE_IGNORE_USER_FUNCTIONS and ZEND_COMPILE_IGNORE_USER_FUNCTIONS, breaking the intention of these flags

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 21 Feb 2019 10:08:37 +0000 (11:08 +0100)]
Merge branch 'PHP-7.4'

6 years agoEnable parallel tests on AppVeyor
Nikita Popov [Thu, 21 Feb 2019 10:05:36 +0000 (11:05 +0100)]
Enable parallel tests on AppVeyor

I'll be keeping an eye on spurious failures resulting from this...

6 years agoAdd special "all" conflict
Nikita Popov [Thu, 21 Feb 2019 08:35:30 +0000 (09:35 +0100)]
Add special "all" conflict

If a test conflicts with "all", then no other tests may be run in
parallel. This is needed for windows_mb_path tests, which rely on
the console codepage, which is shared across all parallel workers.

Also add support for comments in the CONFLICTS section/file.