]>
granicus.if.org Git - php/log
Peter Kokot [Sun, 9 Jun 2019 20:55:43 +0000 (22:55 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Extend wildcard files section in EditorConfig [ci skip]
Simplify LiteSpeed SAPI module version
Use PHP_VERSION for zend modules
Peter Kokot [Sun, 9 Jun 2019 20:55:21 +0000 (22:55 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Extend wildcard files section in EditorConfig [ci skip]
Peter Kokot [Sun, 9 Jun 2019 20:54:59 +0000 (22:54 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Extend wildcard files section in EditorConfig [ci skip]
Peter Kokot [Sun, 9 Jun 2019 20:53:58 +0000 (22:53 +0200)]
Extend wildcard files section in EditorConfig [ci skip]
Changes:
- Trim trailing whitespace for all files except patches. There isn't
really any practical reason to not trim the trailing whitespace in all
other files. Binary files or phpt files that include trailing
whitespace as part of the test should be manually set in editors/IDEs
or by disabling the editorconfig for particular editing.
- Add *.ac, *.d, *.l, *.skl, *.re, *.wsdl, *.dtd, *.html, *.rng, *.xml,
*.xsd, *.xsl, buildconf, and Makefile* files settings.
Closes #4156
Peter Kokot [Sat, 11 May 2019 02:43:40 +0000 (04:43 +0200)]
Simplify LiteSpeed SAPI module version
This patch syncs versioning of the LiteSpeed SAPI module by making it in
sync with the rest of the bundled PHP extensions and SAPIs.
Closes #4145
Peter Kokot [Sun, 19 May 2019 15:18:29 +0000 (17:18 +0200)]
Use PHP_VERSION for zend modules
Closes #4147
Joe Watkins [Sun, 9 Jun 2019 20:23:45 +0000 (22:23 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
azure macos
Jan Altensen [Thu, 6 Jun 2019 15:37:04 +0000 (17:37 +0200)]
azure macos
Change-Id: I3465dcc865c254cea02feb619f6706fa0d164757
Joe Watkins [Sun, 9 Jun 2019 11:40:04 +0000 (13:40 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
azure image update [not skipping on purpose to test new configuration]
Joe Watkins [Sun, 9 Jun 2019 11:39:35 +0000 (13:39 +0200)]
azure image update [not skipping on purpose to test new configuration]
Joe Watkins [Sat, 8 Jun 2019 19:48:00 +0000 (21:48 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78132 wrong line number on ZEND_BIND_STATIC for lexical vars
Joe Watkins [Sat, 8 Jun 2019 19:47:07 +0000 (21:47 +0200)]
Fix #78132 wrong line number on ZEND_BIND_STATIC for lexical vars
Dmitry Stogov [Fri, 7 Jun 2019 09:39:40 +0000 (12:39 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Restored NEWS entry
Dmitry Stogov [Fri, 7 Jun 2019 09:39:24 +0000 (12:39 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Restored NEWS entry
Dmitry Stogov [Fri, 7 Jun 2019 09:38:37 +0000 (12:38 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Restored NEWS entry
Dmitry Stogov [Fri, 7 Jun 2019 09:37:49 +0000 (12:37 +0300)]
Restored NEWS entry
Nikita Popov [Fri, 7 Jun 2019 08:58:06 +0000 (10:58 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 7 Jun 2019 08:57:51 +0000 (10:57 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Fri, 7 Jun 2019 08:57:43 +0000 (10:57 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 7 Jun 2019 08:26:37 +0000 (10:26 +0200)]
Enable STRICT_TRANS_TABLES in new test
The part testing error cases relies on this.
Dmitry Stogov [Fri, 7 Jun 2019 08:50:30 +0000 (11:50 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #77135 (Extract with EXTR_SKIP should skip $this)
Dmitry Stogov [Fri, 7 Jun 2019 08:50:19 +0000 (11:50 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #77135 (Extract with EXTR_SKIP should skip $this)
Dmitry Stogov [Fri, 7 Jun 2019 08:48:57 +0000 (11:48 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed bug #77135 (Extract with EXTR_SKIP should skip $this)
Dmitry Stogov [Fri, 7 Jun 2019 08:36:39 +0000 (11:36 +0300)]
Fixed bug #77135 (Extract with EXTR_SKIP should skip $this)
Nikita Popov [Fri, 7 Jun 2019 07:54:05 +0000 (09:54 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 7 Jun 2019 07:53:35 +0000 (09:53 +0200)]
Use batch mode on Azure
Nikita Popov [Fri, 7 Jun 2019 07:49:22 +0000 (09:49 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 7 Jun 2019 07:49:09 +0000 (09:49 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Fri, 7 Jun 2019 07:49:01 +0000 (09:49 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Cameron Porter [Wed, 6 Mar 2019 06:33:40 +0000 (00:33 -0600)]
Fixed bug #38546
Properly support binding boolean parameters with emulated prepared
statements disabled. Also add the necessary mysqlnd support for
MYSQL_TYPE_TINY.
Nikita Popov [Fri, 7 Jun 2019 07:35:41 +0000 (09:35 +0200)]
Merge branch 'PHP-7.4'
Hugh McMaster [Thu, 6 Jun 2019 12:22:00 +0000 (22:22 +1000)]
ext/xsl: Use PKG_CHECK_MODULES to detect the EXSLT library
Hugh McMaster [Thu, 6 Jun 2019 11:19:19 +0000 (21:19 +1000)]
ext/xsl: Use PKG_CHECK_MODULES to detect the XSLT library
Peter Kokot [Thu, 6 Jun 2019 23:25:20 +0000 (01:25 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
[ci skip] Catch up with
642b8d00e01170eb934c1adb56bcf43c9c4aecd4
Peter Kokot [Thu, 6 Jun 2019 23:24:02 +0000 (01:24 +0200)]
Christoph M. Becker [Thu, 6 Jun 2019 14:19:37 +0000 (16:19 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Use zero port in socket_(export|import)_stream-4-win.phpt
Christoph M. Becker [Thu, 6 Jun 2019 14:18:25 +0000 (16:18 +0200)]
Use zero port in socket_(export|import)_stream-4-win.phpt
These regularly fail due to port clashes, though we don't seem to
use those ports in any other tests.
As we don't care about the specific port that is used here, pass
zero so that a random ephemeral port is used.
Christoph M. Becker [Thu, 6 Jun 2019 13:56:13 +0000 (15:56 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix bug #78094: File Search Problem Excessive Time
Christoph M. Becker [Thu, 6 Jun 2019 13:54:12 +0000 (15:54 +0200)]
Fix bug #78094: File Search Problem Excessive Time
Instead of checking GetBinaryType() for each file, we do a much cheaper
pre-check whether the filename extension matches .exe or .com, and call
GetBinaryType() only in this case. For BC we also report .bat and .cmd
files as executables again.
The patch has been provided by @weltling.
Christoph M. Becker [Thu, 6 Jun 2019 13:09:57 +0000 (15:09 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix test regarding Unix Domain Sockets on Windows
Christoph M. Becker [Thu, 6 Jun 2019 13:02:41 +0000 (15:02 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix test regarding Unix Domain Sockets on Windows
Christoph M. Becker [Thu, 6 Jun 2019 13:00:35 +0000 (15:00 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix test regarding Unix Domain Sockets on Windows
Christoph M. Becker [Thu, 6 Jun 2019 12:56:47 +0000 (14:56 +0200)]
Fix test regarding Unix Domain Sockets on Windows
Recent Windows versions actually support Unix Domain Sockets. Cf.
<https://github.com/curl/curl/pull/3939>.
Nikita Popov [Thu, 6 Jun 2019 12:56:58 +0000 (14:56 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 6 Jun 2019 12:56:42 +0000 (14:56 +0200)]
Try to fix Windows build
Dmitry Stogov [Thu, 6 Jun 2019 11:23:02 +0000 (14:23 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Use ZEND_ASSUME() to perform the following check only on "slow" path.
Dmitry Stogov [Thu, 6 Jun 2019 11:22:10 +0000 (14:22 +0300)]
Use ZEND_ASSUME() to perform the following check only on "slow" path.
Dmitry Stogov [Thu, 6 Jun 2019 11:10:23 +0000 (14:10 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Support for exceptions thrown during "Array to string conversion" error processing
Reduce over-specialization for quite seldom instructions
Dmitry Stogov [Thu, 6 Jun 2019 11:09:42 +0000 (14:09 +0300)]
Support for exceptions thrown during "Array to string conversion" error processing
Dmitry Stogov [Thu, 6 Jun 2019 10:13:09 +0000 (13:13 +0300)]
Reduce over-specialization for quite seldom instructions
Nikita Popov [Thu, 6 Jun 2019 09:48:54 +0000 (11:48 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 6 Jun 2019 09:46:23 +0000 (11:46 +0200)]
php_zip_pcre: Match pattern before stating for directories
For two reasons: First, it's generally cheaper to match a regex than
perform a stat (especially on Windows). Second, it will not fail on
concurrent modification of a directory in parts that are not matched
by the pattern, such as the spurious failure in ext/zip/tests/bug72660.phpt.
Nikita Popov [Thu, 6 Jun 2019 08:07:59 +0000 (10:07 +0200)]
Fix accidentially dropped type
I only meant to drop the MAY_BE_FALSE here, not the MAY_BE_ARRAY...
Christoph M. Becker [Thu, 6 Jun 2019 08:01:44 +0000 (10:01 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78114: segfault when calling sodium_* functions from eval
Christoph M. Becker [Thu, 6 Jun 2019 08:01:12 +0000 (10:01 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78114: segfault when calling sodium_* functions from eval
Christoph M. Becker [Thu, 6 Jun 2019 07:29:44 +0000 (09:29 +0200)]
Fix #78114: segfault when calling sodium_* functions from eval
We must not follow the NULL pointer.
Nikita Popov [Thu, 6 Jun 2019 07:49:25 +0000 (09:49 +0200)]
Remove possible false return value from get_object_vars()
I'm not sure this one ever happens in practice (and we might want
to forbid NULL return from get_properties), but if it does, return
an empty array instead of false.
Dmitry Stogov [Wed, 5 Jun 2019 23:24:00 +0000 (02:24 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Update release-process.md
Dmitry Stogov [Wed, 5 Jun 2019 23:23:17 +0000 (02:23 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Cheaper checks for exceptions thrown from __toString()
Sara Golemon [Wed, 5 Jun 2019 23:05:38 +0000 (19:05 -0400)]
Update release-process.md
Dmitry Stogov [Wed, 5 Jun 2019 22:47:22 +0000 (01:47 +0300)]
Cheaper checks for exceptions thrown from __toString()
Dmitry Stogov [Wed, 5 Jun 2019 22:40:59 +0000 (01:40 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed reference-counting
Dmitry Stogov [Wed, 5 Jun 2019 22:40:40 +0000 (01:40 +0300)]
Fixed reference-counting
Joe Watkins [Wed, 5 Jun 2019 18:23:31 +0000 (20:23 +0200)]
fix test
Joe Watkins [Wed, 5 Jun 2019 18:22:44 +0000 (20:22 +0200)]
Revert "this test is flaky on azure, and can't see why from current output"
This reverts commit
6f9a06cb74421306dc0158b28fa5b4bbb262fd9d .
Joe Watkins [Wed, 5 Jun 2019 17:28:41 +0000 (19:28 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
junit testcase classname is used as filename on azure
Joe Watkins [Wed, 5 Jun 2019 17:27:50 +0000 (19:27 +0200)]
junit testcase classname is used as filename on azure
Joe Watkins [Wed, 5 Jun 2019 17:26:33 +0000 (19:26 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
this test is flaky on azure, and can't see why from current output so refactored, and restored an accidentally removed check (resource)
Joe Watkins [Wed, 5 Jun 2019 17:24:41 +0000 (19:24 +0200)]
this test is flaky on azure, and can't see why from current output
so refactored, and restored an accidentally removed check (resource)
Dmitry Stogov [Wed, 5 Jun 2019 14:38:36 +0000 (17:38 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Prevent generation of specialized ZEND_ASSIGN_OP_..._STATIC_PROP handlers, that call unspecialized helper, anyway.
Dmitry Stogov [Wed, 5 Jun 2019 14:38:13 +0000 (17:38 +0300)]
Prevent generation of specialized ZEND_ASSIGN_OP_..._STATIC_PROP handlers, that call unspecialized helper, anyway.
Joe Watkins [Wed, 5 Jun 2019 14:36:41 +0000 (16:36 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
fix flaky posix test
Joe Watkins [Wed, 5 Jun 2019 14:35:55 +0000 (16:35 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
fix flaky posix test
Joe Watkins [Wed, 5 Jun 2019 14:35:43 +0000 (16:35 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
fix flaky posix test
Joe Watkins [Wed, 5 Jun 2019 14:34:50 +0000 (16:34 +0200)]
fix flaky posix test
Nikita Popov [Wed, 5 Jun 2019 13:34:56 +0000 (15:34 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 5 Jun 2019 13:33:52 +0000 (15:33 +0200)]
Deprecate ReflectionType::__toString()
We weren't able to do this in 7.1 because the deprecation notice
may be converted to an exception and __toString() can't throw,
which means that it ultimately become a fatal error. This issue
is resolved now, so we can mark the method as deprecated.
Nikita Popov [Wed, 5 Jun 2019 12:56:32 +0000 (14:56 +0200)]
Make sure array_splice() always returns an array
Return an array even if the return value isn't used. This allows us
to add the arginfo return type.
Nikita Popov [Wed, 5 Jun 2019 12:38:01 +0000 (14:38 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 26 Feb 2019 14:32:18 +0000 (15:32 +0100)]
Allow exceptions in __toString()
RFC: https://wiki.php.net/rfc/tostring_exceptions
And convert some object to string conversion related recoverable
fatal errors into Error exceptions.
Improve exception safety of internal code performing string
conversions.
Nikita Popov [Wed, 5 Jun 2019 09:58:20 +0000 (11:58 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 5 Jun 2019 09:55:57 +0000 (11:55 +0200)]
Use zero port in socket_(export|import)_stream-5.phpt
These regularly fail due to port clashes, though we don't seem to
use those ports in any other tests.
As we don't care about the specific port that is used here, pass
zero so that a random ephemeral port is used.
Remi Collet [Wed, 5 Jun 2019 09:50:20 +0000 (11:50 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
ignore first gets time which is usually a few ms only
Remi Collet [Wed, 5 Jun 2019 09:48:48 +0000 (11:48 +0200)]
ignore first gets time which is usually a few ms only
in previous version, max_ms was "1" and "10" in travis/appveyor
having 10 by default make it fails on fast computer
Nikita Popov [Wed, 5 Jun 2019 09:30:20 +0000 (11:30 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 5 Jun 2019 09:26:20 +0000 (11:26 +0200)]
Make mysqli_connect arguments explicitly nullable
It should be possible to skip any of these (and use the ini configured
defaults) by passing null, independently of strict_types settings.
Noticed while working on GH-4227.
Remi Collet [Wed, 5 Jun 2019 08:56:25 +0000 (10:56 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
keep DIR option to --with-unixODBC for old versions without libodbc.pc
Remi Collet [Wed, 5 Jun 2019 08:56:05 +0000 (10:56 +0200)]
keep DIR option to --with-unixODBC for old versions without libodbc.pc
Nikita Popov [Wed, 5 Jun 2019 08:06:04 +0000 (10:06 +0200)]
Merge branch 'PHP-7.4'
Peter Kokot [Wed, 5 Jun 2019 08:04:57 +0000 (10:04 +0200)]
Fixed bug #78102
Nikita Popov [Wed, 5 Jun 2019 07:58:59 +0000 (09:58 +0200)]
Avoid concurrent directory writes in FilesystemIterator test
The test directory is often used for temporary files, let's use
the source directory, which should be more stable. If that doesn't
work we need to create a temporary directory.
Gabriel Caruso [Wed, 29 May 2019 22:23:30 +0000 (19:23 -0300)]
Add return type to some array_* functions
Joe Watkins [Tue, 4 Jun 2019 15:11:46 +0000 (17:11 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
add azure pipelines badge to readme [ci skip]
Joe Watkins [Tue, 4 Jun 2019 15:11:16 +0000 (17:11 +0200)]
add azure pipelines badge to readme [ci skip]
Nikita Popov [Tue, 4 Jun 2019 14:28:14 +0000 (16:28 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 4 Jun 2019 14:28:08 +0000 (16:28 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Tue, 4 Jun 2019 14:27:45 +0000 (16:27 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 4 Jun 2019 13:08:16 +0000 (15:08 +0200)]
Fixed bug #78050
This is a backport of
a9821255612a99f9773c3601ff1914de4e7a7e32 .
Nikita Popov [Tue, 4 Jun 2019 14:14:46 +0000 (16:14 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 4 Jun 2019 08:03:34 +0000 (10:03 +0200)]
Actually load opcache on Azure