]> granicus.if.org Git - php/log
php
4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Mon, 26 Oct 2020 16:01:25 +0000 (17:01 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix inconsistency in PDO transaction state

4 years agoFix inconsistency in PDO transaction state
Nikita Popov [Tue, 20 Oct 2020 09:29:47 +0000 (11:29 +0200)]
Fix inconsistency in PDO transaction state

This addresses an issue introduced by #4996 and reported in
https://bugs.php.net/bug.php?id=80260.

Now that PDO::inTransaction() reports the real transaction state
of the connection, there may be a mismatch with PDOs internal
transaction state (in_tcx). This is compounded by the fact that
MySQL performs implicit commits for DDL queries.

This patch fixes the issue by making beginTransaction/commit/rollBack
work on the real transaction state provided by the driver as well
(or falling back to in_tcx if the driver does not support it).

This does mean that writing something like

    $pdo->beginTransaction();
    $pdo->exec('CREATE DATABASE ...');
    $pdo->rollBack(); // <- illegal

will now result in an error, because the CREATE DATABASE already
committed the transaction. I believe this behavior is both correct
and desired -- otherwise, there is no indication that the code did
not behave correctly and the rollBack() was effectively ignored.
However, this is also a BC break.

Closes GH-6355.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Mon, 26 Oct 2020 15:54:58 +0000 (16:54 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Deny serialization of finfo objects

4 years agoDeny serialization of finfo objects
Nikita Popov [Mon, 26 Oct 2020 15:54:30 +0000 (16:54 +0100)]
Deny serialization of finfo objects

The resulting objects were already unusable, make it error out
earlier.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Mon, 26 Oct 2020 15:52:22 +0000 (16:52 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Deny cloning of fileinfo objects

4 years agoMerge branch 'PHP-7.4' into PHP-8.0
Nikita Popov [Mon, 26 Oct 2020 15:51:53 +0000 (16:51 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Deny cloning of fileinfo objects

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 26 Oct 2020 15:50:48 +0000 (16:50 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Deny cloning of fileinfo objects

4 years agoDeny cloning of fileinfo objects
Nikita Popov [Mon, 26 Oct 2020 15:50:20 +0000 (16:50 +0100)]
Deny cloning of fileinfo objects

Using a cloned finfo object will crash.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Mon, 26 Oct 2020 15:25:31 +0000 (16:25 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Consistent error handling in mysqli_poll

4 years agoConsistent error handling in mysqli_poll
Dharman [Wed, 14 Oct 2020 22:17:48 +0000 (23:17 +0100)]
Consistent error handling in mysqli_poll

This error condition should not actually be reachable, but change
it to be consistent with the other ones.

Also fix a memory leak.

Closes GH-6340.

4 years agoMerge branch 'PHP-8.0'
Christoph M. Becker [Mon, 26 Oct 2020 14:42:32 +0000 (15:42 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Revert "Fix out-of-bounds write"

4 years agoMerge branch 'PHP-7.4' into PHP-8.0
Christoph M. Becker [Mon, 26 Oct 2020 14:42:08 +0000 (15:42 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Revert "Fix out-of-bounds write"

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Mon, 26 Oct 2020 14:40:55 +0000 (15:40 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Revert "Fix out-of-bounds write"

4 years agoRevert "Fix out-of-bounds write"
Christoph M. Becker [Tue, 20 Oct 2020 15:09:20 +0000 (17:09 +0200)]
Revert "Fix out-of-bounds write"

This reverts commit bf6873a18e3b6b00f82a645c0893a281ae8eadb8.

CVE-2020-26159 is bogus; the "bug" was apparently a false positive
reported by Coverity, and the "fix" apparently wrong, see
<https://github.com/kkos/oniguruma/issues/221>.

Closes GH-6357.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Mon, 26 Oct 2020 13:31:55 +0000 (14:31 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Re-enable laravel tests

4 years agoRe-enable laravel tests
Nikita Popov [Mon, 19 Oct 2020 14:45:44 +0000 (16:45 +0200)]
Re-enable laravel tests

Laravel is now sufficiently PHP 8 compatible.

Closes GH-6353.

4 years agoMerge branch 'PHP-8.0'
Dmitry Stogov [Mon, 26 Oct 2020 12:57:23 +0000 (15:57 +0300)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fixed incorrect register allocation in ext/gd/tests/imagecopyresampled_variation1.phpt

4 years agoFixed incorrect register allocation in ext/gd/tests/imagecopyresampled_variation1...
Dmitry Stogov [Mon, 26 Oct 2020 12:56:37 +0000 (15:56 +0300)]
Fixed incorrect register allocation in ext/gd/tests/imagecopyresampled_variation1.phpt

4 years agoMerge branch 'PHP-8.0'
Christoph M. Becker [Mon, 26 Oct 2020 12:15:33 +0000 (13:15 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix #80268: loadHTML() truncates at NUL bytes

4 years agoMerge branch 'PHP-7.4' into PHP-8.0
Christoph M. Becker [Mon, 26 Oct 2020 12:14:05 +0000 (13:14 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #80268: loadHTML() truncates at NUL bytes

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Mon, 26 Oct 2020 12:11:00 +0000 (13:11 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Don't set xdebug.default_enable in run-tests

4 years agoDon't set xdebug.default_enable in run-tests
bashkarev [Mon, 12 Oct 2020 12:28:48 +0000 (15:28 +0300)]
Don't set xdebug.default_enable in run-tests

This throws a deprecation warning in XDebug 3.

Closes GH-6324.

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Mon, 26 Oct 2020 12:08:47 +0000 (13:08 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #80268: loadHTML() truncates at NUL bytes

4 years agoFix #80268: loadHTML() truncates at NUL bytes
Christoph M. Becker [Fri, 23 Oct 2020 09:06:30 +0000 (11:06 +0200)]
Fix #80268: loadHTML() truncates at NUL bytes

libxml2 has no particular issues parsing HTML strings with NUL bytes;
these just cause truncation of the current text content, but parsing
continues generally.  Since `::loadHTMLFile()` already supports NUL
bytes, `::loadHTML()` should as well.

Note that this is different from XML, which does not allow any NUL
bytes.

Closes GH-6368.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Mon, 26 Oct 2020 11:41:19 +0000 (12:41 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Declare may_retry_reparse_point on windows only

4 years agoMerge branch 'PHP-7.4' into PHP-8.0
Nikita Popov [Mon, 26 Oct 2020 11:41:12 +0000 (12:41 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Declare may_retry_reparse_point on windows only

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 26 Oct 2020 11:40:56 +0000 (12:40 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Declare may_retry_reparse_point on windows only

4 years agoDeclare may_retry_reparse_point on windows only
Nikita Popov [Mon, 26 Oct 2020 11:40:27 +0000 (12:40 +0100)]
Declare may_retry_reparse_point on windows only

4 years agoRemove dated results from ext/hash/bench.php
Nikita Popov [Mon, 26 Oct 2020 11:24:32 +0000 (12:24 +0100)]
Remove dated results from ext/hash/bench.php

These are not exactly representative anymore.

4 years agoMerge branch 'PHP-8.0'
Christoph M. Becker [Mon, 26 Oct 2020 10:55:46 +0000 (11:55 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix #62474: com_event_sink crashes on certain arguments

4 years agoMerge branch 'PHP-7.4' into PHP-8.0
Christoph M. Becker [Mon, 26 Oct 2020 10:55:10 +0000 (11:55 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #62474: com_event_sink crashes on certain arguments

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Mon, 26 Oct 2020 10:54:33 +0000 (11:54 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #62474: com_event_sink crashes on certain arguments

4 years agoFix #62474: com_event_sink crashes on certain arguments
Christoph M. Becker [Thu, 22 Oct 2020 15:50:22 +0000 (17:50 +0200)]
Fix #62474: com_event_sink crashes on certain arguments

We have to make sure that the variant is of type `VT_DISPATCH` before
we access it as such.

Closes GH-6372.

4 years agoRaise E_WARNING on PHP related errors
Christoph M. Becker [Tue, 20 Oct 2020 10:31:58 +0000 (12:31 +0200)]
Raise E_WARNING on PHP related errors

If Zip operations fails due to PHP error conditions before libzip even
has been called, there is no meaningful indication what failed; the
functions just return false, and the Zip status indicated that no error
did occur.  Therefore we raise `E_WARNING` in these cases.

Closes GH-6356.

4 years agoMerge branch 'PHP-8.0'
Christoph M. Becker [Mon, 26 Oct 2020 10:22:55 +0000 (11:22 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix #80258: Windows Deduplication Enabled, randon permission errors

4 years agoMerge branch 'PHP-7.4' into PHP-8.0
Christoph M. Becker [Mon, 26 Oct 2020 10:22:16 +0000 (11:22 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #80258: Windows Deduplication Enabled, randon permission errors

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Mon, 26 Oct 2020 10:21:35 +0000 (11:21 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #80258: Windows Deduplication Enabled, randon permission errors

4 years agoFix #80258: Windows Deduplication Enabled, randon permission errors
Christoph M. Becker [Mon, 19 Oct 2020 15:41:58 +0000 (17:41 +0200)]
Fix #80258: Windows Deduplication Enabled, randon permission errors

A recent bug fix regarding symlinks claimed:

> After resolving reparse points, the path still may be a reparse
> point; in that case we have to resolve that reparse point as well.

While that is basically correct, some reparse points may point to
inaccessible system folders (e.g. `IO_REPARSE_TAG_DEDUP` points to
"\System Volume Information").  Since we don't know details about
arbitrary reparse points, and are mainly interested in nested symlinks,
we take a step back, and only resolve `IO_REPARSE_TAG_SYMLINK` for now.

Close GH-6354.

4 years agoMerge branch 'PHP-8.0'
Christoph M. Becker [Mon, 26 Oct 2020 10:06:25 +0000 (11:06 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix #80280: ADD_EXTENSION_DEP() fails for ext/standard and ext/date

4 years agoMerge branch 'PHP-7.4' into PHP-8.0
Christoph M. Becker [Mon, 26 Oct 2020 10:05:48 +0000 (11:05 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #80280: ADD_EXTENSION_DEP() fails for ext/standard and ext/date

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Mon, 26 Oct 2020 10:04:57 +0000 (11:04 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #80280: ADD_EXTENSION_DEP() fails for ext/standard and ext/date

4 years agoFix #80280: ADD_EXTENSION_DEP() fails for ext/standard and ext/date
Christoph M. Becker [Sat, 24 Oct 2020 14:08:02 +0000 (16:08 +0200)]
Fix #80280: ADD_EXTENSION_DEP() fails for ext/standard and ext/date

`ADD_EXTENSION_DEP()` relies on the `PHP_<extname>` config variables to
be set to `"yes"`, and since the standard and date extension are always
enabled, we define the respective variables uncoditionally.

Closes GH-6383.

4 years agoMerge branch 'PHP-8.0'
Christoph M. Becker [Mon, 26 Oct 2020 10:00:13 +0000 (11:00 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix bug 76618
  Fix bug 76618

4 years agoMerge branch 'PHP-7.4' into PHP-8.0
Christoph M. Becker [Mon, 26 Oct 2020 09:59:46 +0000 (10:59 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix bug 76618
  Fix bug 76618

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Mon, 26 Oct 2020 09:58:26 +0000 (10:58 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix bug 76618

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Mon, 26 Oct 2020 08:26:26 +0000 (09:26 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Use separate directory in dit_004.phpt

4 years agoUse separate directory in dit_004.phpt
Nikita Popov [Mon, 26 Oct 2020 08:25:38 +0000 (09:25 +0100)]
Use separate directory in dit_004.phpt

Make sure the directory is not modified while we're iterating it,
which may give unstable results.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Mon, 26 Oct 2020 08:05:37 +0000 (09:05 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix parameter stats generation

[ci skip]

4 years agoFix parameter stats generation
Nikita Popov [Mon, 26 Oct 2020 08:05:25 +0000 (09:05 +0100)]
Fix parameter stats generation

[ci skip]

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Mon, 26 Oct 2020 07:59:11 +0000 (08:59 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Document breaking change in strspn/strcspn

[ci skip]

4 years agoDocument breaking change in strspn/strcspn
Thiemo Kreuz [Sat, 24 Oct 2020 10:26:27 +0000 (12:26 +0200)]
Document breaking change in strspn/strcspn

See https://phabricator.wikimedia.org/T264502.

[ci skip]

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Mon, 26 Oct 2020 07:52:50 +0000 (08:52 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Revert "Make ReflectionUnionType final"

4 years agoRevert "Make ReflectionUnionType final"
Nikita Popov [Mon, 26 Oct 2020 07:51:06 +0000 (08:51 +0100)]
Revert "Make ReflectionUnionType final"

This reverts commit ef6adb4e27853eb19bf50bad6486311920d6af7b.

Per Ondrej's comment, this is already being used by BetterReflection
adaptors, ugh.

4 years agoMerge branch 'PHP-8.0'
Máté Kocsis [Sun, 25 Oct 2020 19:16:11 +0000 (20:16 +0100)]
Merge branch 'PHP-8.0'

4 years agoMake ReflectionUnionType final
Máté Kocsis [Sun, 25 Oct 2020 18:20:03 +0000 (19:20 +0100)]
Make ReflectionUnionType final

Closes GH-6384

4 years agoMerge branch 'PHP-8.0'
Christoph M. Becker [Sun, 25 Oct 2020 15:27:45 +0000 (16:27 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  [ci skip] Fix typos in UPGRADING

4 years ago[ci skip] Fix typos in UPGRADING
Christoph M. Becker [Sun, 25 Oct 2020 15:27:20 +0000 (16:27 +0100)]
[ci skip] Fix typos in UPGRADING

4 years agoMerge branch 'PHP-8.0' into master
Christoph M. Becker [Sat, 24 Oct 2020 13:36:44 +0000 (15:36 +0200)]
Merge branch 'PHP-8.0' into master

* PHP-8.0:
  Define config var PHP_JSON

4 years agoDefine config var PHP_JSON
Christoph M. Becker [Sat, 24 Oct 2020 13:31:10 +0000 (15:31 +0200)]
Define config var PHP_JSON

Otherwise, `ADD_EXTENSION_DEP('foo', 'json')` fails, even though the
JSON extension is available.

4 years agoMerge branch 'PHP-8.0'
George Peter Banyard [Fri, 23 Oct 2020 19:48:52 +0000 (20:48 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Throw Value/TypeError for invalid $bodies in imap_mail_compose()

4 years agoThrow Value/TypeError for invalid $bodies in imap_mail_compose()
George Peter Banyard [Thu, 22 Oct 2020 14:23:35 +0000 (15:23 +0100)]
Throw Value/TypeError for invalid $bodies in imap_mail_compose()

Small drive by refactoring to use HashTables

Closes GH-6371

4 years agowaitpid in ftp server tests
Nikita Popov [Fri, 23 Oct 2020 09:10:21 +0000 (11:10 +0200)]
waitpid in ftp server tests

This is not relevant right now, but ensures consistent order if
the tests are repeated.

4 years agoAllow running session tests in parallel
Nikita Popov [Fri, 23 Oct 2020 14:17:13 +0000 (16:17 +0200)]
Allow running session tests in parallel

Use unique session IDs and/or save paths. Also removes the annoying
order-dependence of session tests.

4 years agoMerge branch 'PHP-8.0'
Máté Kocsis [Fri, 23 Oct 2020 14:34:40 +0000 (16:34 +0200)]
Merge branch 'PHP-8.0'

4 years agoRequire stubs to declare return types for magic methods when possible
Máté Kocsis [Fri, 23 Oct 2020 12:09:23 +0000 (14:09 +0200)]
Require stubs to declare return types for magic methods when possible

Closes GH-6376

4 years agoUse ephemeral port in more server tests
Nikita Popov [Fri, 23 Oct 2020 09:29:44 +0000 (11:29 +0200)]
Use ephemeral port in more server tests

Port the main php_cli_server.inc to use ephemeral ports, thus
allowing CLI server tests to be parallelized.

A complication here is that we also need to give each test a
separate doc root, to avoid index.php files writing over each
other.

Closes GH-6375.

4 years agoFix pasv_port determination
Nikita Popov [Fri, 23 Oct 2020 09:46:54 +0000 (11:46 +0200)]
Fix pasv_port determination

Apparently the ftp server is also used by ext/standard/tests/streams,
and only that part actually uses pasv.

4 years agoUse ephemeral port in ftp tests
Nikita Popov [Thu, 22 Oct 2020 10:53:57 +0000 (12:53 +0200)]
Use ephemeral port in ftp tests

And enable them to run in parallel.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Fri, 23 Oct 2020 08:31:55 +0000 (10:31 +0200)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Make GC default threshold handling consistent

4 years agoMake GC default threshold handling consistent
Nikita Popov [Fri, 23 Oct 2020 08:30:07 +0000 (10:30 +0200)]
Make GC default threshold handling consistent

While the initial threshold is set to 10001 roots, the threshold
adjustment logic may then set it to 10000. The exact value really
doesn't matter, but we should make it consistent.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Fri, 23 Oct 2020 07:47:36 +0000 (09:47 +0200)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Don't allow passing unknown named params to class without ctor

4 years agoDon't allow passing unknown named params to class without ctor
Nikita Popov [Wed, 21 Oct 2020 09:55:03 +0000 (11:55 +0200)]
Don't allow passing unknown named params to class without ctor

See also https://externals.io/message/112083.

Closes GH-6364.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Fri, 23 Oct 2020 07:34:37 +0000 (09:34 +0200)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fixed some typos

[ci skip]

4 years agoFixed some typos
Javier Eguiluz [Thu, 22 Oct 2020 17:46:24 +0000 (19:46 +0200)]
Fixed some typos

Closes GH-6373.

[ci skip]

4 years agoMerge branch 'PHP-8.0'
Dmitry Stogov [Thu, 22 Oct 2020 20:17:19 +0000 (23:17 +0300)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fixed register allocation
  Fixed reference-counter inference
  Missed warning

4 years agoFixed register allocation
Dmitry Stogov [Thu, 22 Oct 2020 20:16:41 +0000 (23:16 +0300)]
Fixed register allocation

4 years agoFixed reference-counter inference
Dmitry Stogov [Thu, 22 Oct 2020 20:15:39 +0000 (23:15 +0300)]
Fixed reference-counter inference

4 years agoMissed warning
Dmitry Stogov [Thu, 22 Oct 2020 20:15:15 +0000 (23:15 +0300)]
Missed warning

4 years agoMerge branch 'PHP-8.0'
Máté Kocsis [Thu, 22 Oct 2020 17:03:04 +0000 (19:03 +0200)]
Merge branch 'PHP-8.0'

4 years agoRun arginfo/ZPP verification tests in strict mode as well
Máté Kocsis [Thu, 22 Oct 2020 10:48:12 +0000 (12:48 +0200)]
Run arginfo/ZPP verification tests in strict mode as well

Closes GH-6370

4 years agoMerge branch 'PHP-8.0'
George Peter Banyard [Thu, 22 Oct 2020 16:06:07 +0000 (17:06 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix bug 76618

4 years agoFix bug 76618
George Peter Banyard [Thu, 22 Oct 2020 16:01:48 +0000 (17:01 +0100)]
Fix bug 76618

Apply patch which was attached to the bug in July 2018

4 years agoFix bug 76618
George Peter Banyard [Thu, 22 Oct 2020 16:01:48 +0000 (17:01 +0100)]
Fix bug 76618

Apply patch which was attached to the bug in July 2018

4 years agoFix bug 76618
George Peter Banyard [Thu, 22 Oct 2020 16:01:48 +0000 (17:01 +0100)]
Fix bug 76618

Apply patch which was attached to the bug in July 2018

4 years agoMerge branch 'PHP-8.0'
Dmitry Stogov [Thu, 22 Oct 2020 15:24:22 +0000 (18:24 +0300)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Checj type guards before loading values into CPU registers
  Avoid register allocation for ASSIGN into aliased variable (it might be indirectly changed into IS_REFERENCE)

4 years agoChecj type guards before loading values into CPU registers
Dmitry Stogov [Thu, 22 Oct 2020 15:23:49 +0000 (18:23 +0300)]
Checj type guards before loading values into CPU registers

4 years agoAvoid register allocation for ASSIGN into aliased variable (it might be indirectly...
Dmitry Stogov [Thu, 22 Oct 2020 15:22:36 +0000 (18:22 +0300)]
Avoid register allocation for ASSIGN into aliased variable (it might be indirectly changed into IS_REFERENCE)

4 years agoMerge branch 'PHP-8.0'
George Peter Banyard [Thu, 22 Oct 2020 14:50:42 +0000 (15:50 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix segfaults after conversion from zval to zend_string params

4 years agoFix segfaults after conversion from zval to zend_string params
George Peter Banyard [Thu, 22 Oct 2020 14:21:57 +0000 (15:21 +0100)]
Fix segfaults after conversion from zval to zend_string params

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Thu, 22 Oct 2020 14:06:16 +0000 (16:06 +0200)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Don't crash on uninitialized tidy object

4 years agoMerge branch 'PHP-7.4' into PHP-8.0
Nikita Popov [Thu, 22 Oct 2020 14:05:57 +0000 (16:05 +0200)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Don't crash on uninitialized tidy object

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 22 Oct 2020 14:05:34 +0000 (16:05 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Don't crash on uninitialized tidy object

4 years agoDon't crash on uninitialized tidy object
Nikita Popov [Thu, 22 Oct 2020 14:04:22 +0000 (16:04 +0200)]
Don't crash on uninitialized tidy object

"Uninitialized" here means that the object was created ordinarily
-- no constructor skipping involved. Most tidy methods seem to
handle this fine, but these three need to be guarded.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Thu, 22 Oct 2020 13:20:51 +0000 (15:20 +0200)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Properly validate ArrayObject::asort() argument

4 years agoProperly validate ArrayObject::asort() argument
Nikita Popov [Thu, 22 Oct 2020 13:19:47 +0000 (15:19 +0200)]
Properly validate ArrayObject::asort() argument

4 years agoFix zpp for GdFont|int
Nikita Popov [Thu, 22 Oct 2020 13:06:47 +0000 (15:06 +0200)]
Fix zpp for GdFont|int

Use Z_PARAM_OBJ_OF_TYPE_OR_LONG to get standard behavior.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Thu, 22 Oct 2020 12:56:00 +0000 (14:56 +0200)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix parameter name of pspell_config_save_repl()

4 years agoFix parameter name of pspell_config_save_repl()
Máté Kocsis [Thu, 22 Oct 2020 09:44:19 +0000 (11:44 +0200)]
Fix parameter name of pspell_config_save_repl()

Closes GH-6369.

4 years agoMerge branch 'PHP-8.0'
Nikita Popov [Thu, 22 Oct 2020 12:52:03 +0000 (14:52 +0200)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix stub for dba_key_split()

4 years agoFix stub for dba_key_split()
Nikita Popov [Thu, 22 Oct 2020 12:49:48 +0000 (14:49 +0200)]
Fix stub for dba_key_split()

This is an extremely weird function, but the behavior seems to be
intentional, and is quite clearly documented.

So we adjust the stub to also accept false|null as arguments. I
believe the implementation already correctly matches union type
semantics.