1
0
mirror of https://github.com/php/php-src.git synced 2026-04-22 07:28:09 +02:00
Commit Graph

57137 Commits

Author SHA1 Message Date
Nikita Popov 927ab74ffc Merge branch 'PHP-8.0'
* PHP-8.0:
  Revert "Make ReflectionUnionType final"
2020-10-26 08:52:50 +01:00
Nikita Popov 7f462c97f9 Revert "Make ReflectionUnionType final"
This reverts commit ef6adb4e27.

Per Ondrej's comment, this is already being used by BetterReflection
adaptors, ugh.
2020-10-26 08:51:06 +01:00
Máté Kocsis f46c881f0e Merge branch 'PHP-8.0' 2020-10-25 20:16:11 +01:00
Máté Kocsis ef6adb4e27 Make ReflectionUnionType final
Closes GH-6384
2020-10-25 20:14:07 +01:00
Christoph M. Becker a9f657218a Merge branch 'PHP-8.0' into master
* PHP-8.0:
  Define config var PHP_JSON
2020-10-24 15:36:44 +02:00
Christoph M. Becker 5609701389 Define config var PHP_JSON
Otherwise, `ADD_EXTENSION_DEP('foo', 'json')` fails, even though the
JSON extension is available.
2020-10-24 15:36:05 +02:00
George Peter Banyard 77582ec13f Merge branch 'PHP-8.0'
* PHP-8.0:
  Throw Value/TypeError for invalid $bodies in imap_mail_compose()
2020-10-23 20:48:52 +01:00
George Peter Banyard 158d308197 Throw Value/TypeError for invalid $bodies in imap_mail_compose()
Small drive by refactoring to use HashTables

Closes GH-6371
2020-10-23 20:47:35 +01:00
Nikita Popov ac1ccce264 waitpid in ftp server tests
This is not relevant right now, but ensures consistent order if
the tests are repeated.
2020-10-23 16:56:23 +02:00
Nikita Popov 8f17d48b69 Allow running session tests in parallel
Use unique session IDs and/or save paths. Also removes the annoying
order-dependence of session tests.
2020-10-23 16:55:11 +02:00
Máté Kocsis 09f4f305ec Merge branch 'PHP-8.0' 2020-10-23 16:34:40 +02:00
Máté Kocsis 47bbfe1fc0 Require stubs to declare return types for magic methods when possible
Closes GH-6376
2020-10-23 16:33:16 +02:00
Nikita Popov 6ab4e330ac 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.
2020-10-23 14:26:34 +02:00
Nikita Popov 3859e74347 Fix pasv_port determination
Apparently the ftp server is also used by ext/standard/tests/streams,
and only that part actually uses pasv.
2020-10-23 11:46:54 +02:00
Nikita Popov 08eb917fd5 Use ephemeral port in ftp tests
And enable them to run in parallel.
2020-10-23 10:48:21 +02:00
Nikita Popov f9fd3313cf Merge branch 'PHP-8.0'
* PHP-8.0:
  Fixed some typos

[ci skip]
2020-10-23 09:34:37 +02:00
Javier Eguiluz c64dcda5e5 Fixed some typos
Closes GH-6373.

[ci skip]
2020-10-23 09:34:09 +02:00
Dmitry Stogov 680466cd82 Merge branch 'PHP-8.0'
* PHP-8.0:
  Fixed register allocation
  Fixed reference-counter inference
  Missed warning
2020-10-22 23:17:19 +03:00
Dmitry Stogov 0f8518f875 Fixed register allocation 2020-10-22 23:16:41 +03:00
Dmitry Stogov 838d8d0ba0 Fixed reference-counter inference 2020-10-22 23:15:39 +03:00
Dmitry Stogov 5626dcdb9d Missed warning 2020-10-22 23:15:15 +03:00
George Peter Banyard 77d14477db Merge branch 'PHP-8.0'
* PHP-8.0:
  Fix bug 76618
2020-10-22 17:06:07 +01:00
George Peter Banyard ba27866aec Fix bug 76618
Apply patch which was attached to the bug in July 2018
2020-10-22 17:05:29 +01:00
Dmitry Stogov 66271df663 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)
2020-10-22 18:24:22 +03:00
Dmitry Stogov 20cbb233c4 Checj type guards before loading values into CPU registers 2020-10-22 18:23:49 +03:00
Dmitry Stogov 30cf0a04bf Avoid register allocation for ASSIGN into aliased variable (it might be indirectly changed into IS_REFERENCE) 2020-10-22 18:22:36 +03:00
George Peter Banyard 35f1b0bfaa Merge branch 'PHP-8.0'
* PHP-8.0:
  Fix segfaults after conversion from zval to zend_string params
2020-10-22 15:50:42 +01:00
George Peter Banyard 8b265fb602 Fix segfaults after conversion from zval to zend_string params 2020-10-22 15:50:01 +01:00
Nikita Popov 5ebe04d39d Merge branch 'PHP-8.0'
* PHP-8.0:
  Don't crash on uninitialized tidy object
2020-10-22 16:06:16 +02:00
Nikita Popov 6de6f2a4e9 Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
  Don't crash on uninitialized tidy object
2020-10-22 16:05:57 +02:00
Nikita Popov 85d9a1ca6e Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Don't crash on uninitialized tidy object
2020-10-22 16:05:34 +02:00
Nikita Popov d4bf0799b8 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.
2020-10-22 16:04:22 +02:00
Nikita Popov 393264a82f Merge branch 'PHP-8.0'
* PHP-8.0:
  Properly validate ArrayObject::asort() argument
2020-10-22 15:20:51 +02:00
Nikita Popov bfe7a1168a Properly validate ArrayObject::asort() argument 2020-10-22 15:20:43 +02:00
Nikita Popov 38b3d43035 Fix zpp for GdFont|int
Use Z_PARAM_OBJ_OF_TYPE_OR_LONG to get standard behavior.
2020-10-22 15:07:01 +02:00
Nikita Popov 66757b5cf4 Merge branch 'PHP-8.0'
* PHP-8.0:
  Fix parameter name of pspell_config_save_repl()
2020-10-22 14:56:00 +02:00
Máté Kocsis 4fb5ccf00c Fix parameter name of pspell_config_save_repl()
Closes GH-6369.
2020-10-22 14:54:43 +02:00
Nikita Popov 5a8b01aee7 Merge branch 'PHP-8.0'
* PHP-8.0:
  Fix stub for dba_key_split()
2020-10-22 14:52:03 +02:00
Nikita Popov 97dd0eb98d 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.
2020-10-22 14:50:52 +02:00
Nikita Popov 3f0e94e3c7 Accept zend_string in highlight_string API 2020-10-22 14:35:40 +02:00
Nikita Popov bcb5ae15e0 Merge branch 'PHP-8.0'
* PHP-8.0:
  Make highlight_string() accept string in zpp
2020-10-22 14:31:54 +02:00
Nikita Popov db5979dfe2 Make highlight_string() accept string in zpp
To satisfy the type declaration.
2020-10-22 14:31:42 +02:00
Nikita Popov 22bf92564c Remove unused pasv_listen() function 2020-10-22 14:23:07 +02:00
Nikita Popov 9a92676828 Merge branch 'PHP-8.0'
* PHP-8.0:
  Don't leak pcntl last_error across requests
2020-10-22 14:22:16 +02:00
Nikita Popov c23eefb1ad Don't leak pcntl last_error across requests 2020-10-22 14:21:22 +02:00
Nikita Popov 8909d608b7 Merge branch 'PHP-8.0'
* PHP-8.0:
  Don't leak json error_code across requests
2020-10-22 12:42:26 +02:00
Nikita Popov aa0d886cbc Don't leak json error_code across requests 2020-10-22 12:42:09 +02:00
Nikita Popov fc59294bab Merge branch 'PHP-8.0'
* PHP-8.0:
  Don't leak pcre error_code across requests
  Updated to version 2020.4 (2020d)
2020-10-22 11:20:21 +02:00
Nikita Popov 41b8cdd2e0 Don't leak pcre error_code across requests 2020-10-22 11:20:02 +02:00
Derick Rethans 674f719081 Updated to version 2020.4 (2020d) 2020-10-22 10:12:27 +01:00