]>
granicus.if.org Git - php/log
Nikita Popov [Fri, 22 Feb 2019 09:15:02 +0000 (10:15 +0100)]
Merge branch '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
Nikita Popov [Fri, 22 Feb 2019 09:13:07 +0000 (10:13 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 22 Feb 2019 09:11:54 +0000 (10:11 +0100)]
Fixed bug #77652
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
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.
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
Dmitry Stogov [Fri, 22 Feb 2019 07:11:43 +0000 (10:11 +0300)]
Use different method to suppress "false" memory leak reports
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.
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 .
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"
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 .
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
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.
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
Fabien Villepinte [Thu, 21 Feb 2019 16:11:55 +0000 (17:11 +0100)]
Fix typo in error message
Frank Denis [Thu, 21 Feb 2019 15:47:18 +0000 (16:47 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix bug #77646
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
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
Frank Denis [Thu, 21 Feb 2019 15:10:27 +0000 (16:10 +0100)]
Fix bug #77646
Frank Denis [Thu, 21 Feb 2019 15:21:16 +0000 (16:21 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix bug #77646
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
Frank Denis [Thu, 21 Feb 2019 15:10:27 +0000 (16:10 +0100)]
Fix bug #77646
Frank Denis [Thu, 21 Feb 2019 15:10:27 +0000 (16:10 +0100)]
Fix bug #77646
Nikita Popov [Thu, 21 Feb 2019 15:07:03 +0000 (16:07 +0100)]
Merge branch 'PHP-7.4'
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.
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.
Nikita Popov [Thu, 21 Feb 2019 12:46:42 +0000 (13:46 +0100)]
Merge branch '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
Nikita Popov [Thu, 21 Feb 2019 12:45:25 +0000 (13:45 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
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.
Nikita Popov [Thu, 21 Feb 2019 11:23:08 +0000 (12:23 +0100)]
Merge branch 'PHP-7.4'
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.
Nikita Popov [Thu, 21 Feb 2019 11:13:38 +0000 (12:13 +0100)]
Don't parallelize dba tests
Nikita Popov [Thu, 21 Feb 2019 11:06:58 +0000 (12:06 +0100)]
Merge branch '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
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;.
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
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
Nikita Popov [Thu, 21 Feb 2019 10:08:37 +0000 (11:08 +0100)]
Merge branch 'PHP-7.4'
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...
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.
Nikita Popov [Thu, 21 Feb 2019 10:00:52 +0000 (11:00 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 21 Feb 2019 09:59:30 +0000 (10:59 +0100)]
Fixed bug #77643
Resolve property initializers against the correct class, even when
parent slots are reused.
Nikita Popov [Thu, 21 Feb 2019 09:36:49 +0000 (10:36 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 21 Feb 2019 09:35:59 +0000 (10:35 +0100)]
Print more precise warning for unresolved constants
Dmitry Stogov [Wed, 20 Feb 2019 19:38:22 +0000 (22:38 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Reinstall pcntl tick handler on each request (it cleared after the first request).
Dmitry Stogov [Wed, 20 Feb 2019 19:36:51 +0000 (22:36 +0300)]
Reinstall pcntl tick handler on each request (it cleared after the first request).
Peter Kokot [Wed, 20 Feb 2019 19:07:31 +0000 (20:07 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
[ci skip] Update changelog
Remove unused PHP_SYS_LFS m4 macro
Remove unused PHP_SOLARIS_PIC_WEIRDNESS m4 macro
Remove unused PHP_TARGET_RDYNAMIC m4 macro
Remove unused AM_SET_LIBTOOL_VARIABLE m4 macro
Peter Kokot [Wed, 20 Feb 2019 19:07:23 +0000 (20:07 +0100)]
[ci skip] Update changelog
Peter Kokot [Tue, 19 Feb 2019 22:42:12 +0000 (23:42 +0100)]
Remove unused PHP_SYS_LFS m4 macro
This was once named as AC_SYS_LFS and today it is not used in current
PHP code base anymore.
Peter Kokot [Tue, 19 Feb 2019 22:34:24 +0000 (23:34 +0100)]
Remove unused PHP_SOLARIS_PIC_WEIRDNESS m4 macro
This has been once used for Solaris systems and has been removed via
827ad656cb2585d2b9a9cc2d3bb021e8edf34365
Peter Kokot [Tue, 19 Feb 2019 22:25:55 +0000 (23:25 +0100)]
Remove unused PHP_TARGET_RDYNAMIC m4 macro
This has been once used with apache sapi. Since PHP 7.0 it is not used
in the PHP anymore.
Peter Kokot [Tue, 19 Feb 2019 22:19:12 +0000 (23:19 +0100)]
Remove unused AM_SET_LIBTOOL_VARIABLE m4 macro
It was once used with Automake and Zend's build files. Call has been
removed via
e1f101d79840e171f1dcfe17f8ae7a3d0be7e89d
Christoph M. Becker [Wed, 20 Feb 2019 18:41:25 +0000 (19:41 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
fix #77642: typo "incompatibe" in Zend/zend_compile.c [ci skip]
divinity76 [Wed, 20 Feb 2019 15:38:27 +0000 (16:38 +0100)]
fix #77642: typo "incompatibe" in Zend/zend_compile.c [ci skip]
the word "incompatible" was accidentally written as "incompatibe"
guilty commit:
7e597f48e9fda982e930e4f617d2b2d98d8878a5
Dmitry Stogov [Wed, 20 Feb 2019 15:19:36 +0000 (18:19 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Supress memory leak reports
Dmitry Stogov [Wed, 20 Feb 2019 15:18:44 +0000 (18:18 +0300)]
Supress memory leak reports
Nikita Popov [Wed, 20 Feb 2019 15:02:52 +0000 (16:02 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 20 Feb 2019 15:01:15 +0000 (16:01 +0100)]
Don't use uniqid for temporary POST data files
uniqid() is not necessarily unique when multiple testing processes
run in parallel.
Nikita Popov [Wed, 20 Feb 2019 11:57:50 +0000 (12:57 +0100)]
Add a --shuffle mode to run-tests
Makes it easier to find paralellization issues. Of course only works
if the tests aren't order-dependent...
Dmitry Stogov [Wed, 20 Feb 2019 14:10:33 +0000 (17:10 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remember __COMPILER_HALT_OFFSET__(s) in preloaded scripts
Dmitry Stogov [Wed, 20 Feb 2019 14:10:10 +0000 (17:10 +0300)]
Remember __COMPILER_HALT_OFFSET__(s) in preloaded scripts
Nikita Popov [Wed, 20 Feb 2019 11:46:46 +0000 (12:46 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 20 Feb 2019 11:45:27 +0000 (12:45 +0100)]
Support passing single file to bless_tests.php
Or a mix of multiple directories/files. Also make the file executable.
Nikita Popov [Wed, 20 Feb 2019 11:38:40 +0000 (12:38 +0100)]
Use PHP_BINARY by default in run-tests.php
You pretty much always want to run with -P, make it the default.
Nikita Popov [Wed, 20 Feb 2019 11:19:51 +0000 (12:19 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 20 Feb 2019 11:19:01 +0000 (12:19 +0100)]
Enable parallel tests on Travis
I'll keep an eye on spurious failures resulting from this.
Nikita Popov [Wed, 20 Feb 2019 11:12:27 +0000 (12:12 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 20 Feb 2019 11:12:11 +0000 (12:12 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 20 Feb 2019 11:11:56 +0000 (12:11 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Abyr Valg [Sat, 9 Feb 2019 09:15:55 +0000 (12:15 +0300)]
OpenSSL: Improve non-blocking eof test
Nikita Popov [Wed, 20 Feb 2019 11:06:02 +0000 (12:06 +0100)]
Make zip oo_addpattern test more robust
Use a separate directory for the tests, so that no other tests can
concurrently create files in the same directory.
Nikita Popov [Wed, 20 Feb 2019 10:53:31 +0000 (11:53 +0100)]
Use "modify" error message for FUNC_ARG fetch as well
Avoid differences based on whether a W or FUNC_ARG fetch is performed.
Nikita Popov [Wed, 20 Feb 2019 10:22:31 +0000 (11:22 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 18 Feb 2019 15:43:22 +0000 (16:43 +0100)]
Implement fine-grained conflict handling
Tests can specify conflict keys, either in --CONFLICTS-- or
a per-directory CONFLICTS file. Non-conflicting tests may be run
in parallel.
Nikita Popov [Tue, 19 Feb 2019 14:13:11 +0000 (15:13 +0100)]
Make proc_open_bug69900.phpt more robust against parallelization
With multiple workers running this might take more than 1ms. Bump
this up to the same threshold that was already used for CI.
Nikita Popov [Tue, 19 Feb 2019 15:15:01 +0000 (16:15 +0100)]
Make ext/spl/tests/bug42364.phpt more robust
If tests are run in parallel, files may be created and deleted in
the directory. Create a separate directory just for this test to
avoid this dependence.
Dmitry Stogov [Wed, 20 Feb 2019 08:47:39 +0000 (11:47 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Disable preloading for sensetive opcache tests
Dmitry Stogov [Wed, 20 Feb 2019 08:47:19 +0000 (11:47 +0300)]
Disable preloading for sensetive opcache tests
Dmitry Stogov [Wed, 20 Feb 2019 08:36:24 +0000 (11:36 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Prevent error reporting during preloading request start-up
Dmitry Stogov [Wed, 20 Feb 2019 08:35:56 +0000 (11:35 +0300)]
Prevent error reporting during preloading request start-up
Nikita Popov [Wed, 20 Feb 2019 08:31:44 +0000 (09:31 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 20 Feb 2019 08:31:08 +0000 (09:31 +0100)]
Use zend_parse_parameters_none() in XmlWriter::openMemory()
And fix incorrect uses in tests
Dmitry Stogov [Wed, 20 Feb 2019 07:27:27 +0000 (10:27 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Added reference to parser generator
Dmitry Stogov [Wed, 20 Feb 2019 07:26:56 +0000 (10:26 +0300)]
Added reference to parser generator
Dmitry Stogov [Wed, 20 Feb 2019 06:33:17 +0000 (09:33 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix typo
Simplify even more - use PHP_VERSION directly
Bump FFI extension version to PHP_VERSION
Peter Kokot [Mon, 18 Feb 2019 21:40:56 +0000 (22:40 +0100)]
Fix typo
Peter Kokot [Mon, 18 Feb 2019 21:39:00 +0000 (22:39 +0100)]
Simplify even more - use PHP_VERSION directly
Peter Kokot [Mon, 18 Feb 2019 21:11:12 +0000 (22:11 +0100)]
Bump FFI extension version to PHP_VERSION
This simplifies bumping the FFI extension version.
Christopher Jones [Wed, 20 Feb 2019 00:14:06 +0000 (11:14 +1100)]
Merge branch 'PHP-7.4'
Christopher Jones [Wed, 20 Feb 2019 00:12:08 +0000 (11:12 +1100)]
Correct skipif use for OCI8 password tests
Christopher Jones [Wed, 20 Feb 2019 00:11:16 +0000 (11:11 +1100)]
Merge branch 'PHP-7.3' into PHP-7.4
Christopher Jones [Wed, 20 Feb 2019 00:11:06 +0000 (11:11 +1100)]
Merge branch 'PHP-7.2' into PHP-7.3
Christopher Jones [Wed, 20 Feb 2019 00:10:57 +0000 (11:10 +1100)]
Correct skipif use for OCI8 password tests
Dmitry Stogov [Tue, 19 Feb 2019 23:35:44 +0000 (02:35 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Skip tests f oci8 extension is not loaded
Dmitry Stogov [Tue, 19 Feb 2019 23:35:25 +0000 (02:35 +0300)]
Skip tests f oci8 extension is not loaded
Dmitry Stogov [Tue, 19 Feb 2019 23:33:38 +0000 (02:33 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Reorder conditions
Dmitry Stogov [Tue, 19 Feb 2019 23:33:21 +0000 (02:33 +0300)]
Reorder conditions
Dmitry Stogov [Tue, 19 Feb 2019 23:33:11 +0000 (02:33 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Use ZEND_ACC_REUSE_GET_ITERATOR flag instead of run-time class modification