Merge branch 'master' of https://github.com/kamil-tekiela/php-src

Author: kamil-tekiela

.travis.yml

@@ -74,6 +74,7 @@ jobs:
           arch: amd64
         - env: ENABLE_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 ARM64=1
           arch: arm64
+          if: type = cron
         - env: ENABLE_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 S390X=1
           arch: s390x
           if: type = cron

NEWS

@@ -2,6 +2,13 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.0.0RC1
 
+- CLI:
+  . Allow debug server binding to an ephemeral port via `-S localhost:0`. (Sara)
+- Core:
+  . Fixed bug #80109 (Cannot skip arguments when extended debug is enabled).
+    (Nikita)
+- SPL:
+  . SplFixedArray is now IteratorAggregate rather than Iterator. (alexdowad)
 
 17 Sep 2020, PHP 8.0.0beta4
 

UPGRADING

@@ -325,6 +325,10 @@ PHP 8.0 UPGRADE NOTES
   . iconv() implementations which do not properly set errno in case of errors
     are no longer supported.
 
+- IMAP:
+  . The unused default_host argument of imap_headerinfo() has been removed.
+  . The imap_header() function which is an alias of imap_headerinfo() has been removed.
+
 - Intl:
   . The deprecated constant INTL_IDNA_VARIANT_2003 has been removed.
     RFC: https://wiki.php.net/rfc/deprecate-and-remove-intl_idna_variant_2003
@@ -431,6 +435,8 @@ PHP 8.0 UPGRADE NOTES
   . The deprecated pg_lo_import() and pg_lo_export() signature that passes the
     connection as the last argument is no longer supported. The connection
     should be passed as first argument instead.
+  . pg_fetch_all() will now return an empty array instead of false for result
+    sets with zero rows.
 
 - Phar:
   . Metadata associated with a phar will no longer be automatically unserialized,
@@ -496,6 +502,12 @@ PHP 8.0 UPGRADE NOTES
   . spl_autoload_register() will now always throw a TypeError on invalid
     arguments, therefore the second argument $do_throw is ignored and a
     notice will be emitted if it is set to false.
+  . SplFixedArray is now an IteratorAggregate and not an Iterator.
+    SplFixedArray::rewind(), ::current(), ::key(), ::next(), and ::valid()
+    have been removed. In their place, SplFixedArray::getIterator() has been
+    added. Any code which uses explicit iteration over SplFixedArray must now
+    obtain an Iterator through SplFixedArray::getIterator(). This means that
+    SplFixedArray is now safe to use in nested loops.
 
 - Standard:
   . assert() will no longer evaluate string arguments, instead they will be
@@ -598,6 +610,8 @@ PHP 8.0 UPGRADE NOTES
   . sem_get() will now return an SysvSemaphore object rather than a resource.
     Return value checks using is_resource() should be replaced with checks
     for `false`.
+  . The $auto_release parameter of sem_get() was changed to accept bool values
+    rather than int.
 
 - Sysvshm:
   . shm_attach() will now return an SysvSharedMemory object rather than a resource.
@@ -786,6 +800,8 @@ PHP 8.0 UPGRADE NOTES
         array_diff($array, ...$excludes);
         // OK even if $arrays only contains a single array.
         array_intersect(...$arrays);
+  . The $flag parameter of ob_implicit_flush() was changed to accept bool
+    values rather than int.
 
 - Zip:
   . Extension updated to version 1.19.0
@@ -840,6 +856,7 @@ PHP 8.0 UPGRADE NOTES
 - PGSQL / PDO PGSQL:
   . The constant PG_VERSION_STR has now the same value as PG_VERSION, and thus
     is deprecated.
+  . Function aliases in the pgsql extension have been deprecated.
 
 - Zip:
   . Using empty file as ZipArchive is deprecated. Libzip 1.6.0
@@ -1029,7 +1046,7 @@ PHP 8.0 UPGRADE NOTES
 
 - MySQLi / PDO MySQL:
   . When mysqlnd is not used (which is the default and recommended option),
-    the minimum supported libmysqlclient version is now 5.1.
+    the minimum supported libmysqlclient version is now 5.5.
   . mysqli_result now implements IteratorAggregate (instead of Traversable).
 
 - PGSQL / PDO PGSQL:

UPGRADING.INTERNALS

@@ -23,6 +23,8 @@ PHP 8.0 INTERNALS UPGRADE NOTES
   t. Signature changes
   u. Error Notification callbacks to replace zend_error_cb overwrite use-cases
   v. Removed Zend APIs
+  w. Renamed Zend APIs
+  x. ZEND_EXT_NOP no longer emitted
 
 2. Build system changes
   a. Abstract
@@ -367,6 +369,14 @@ PHP 8.0 INTERNALS UPGRADE NOTES
         - zend_stack_is_empty()
         - zend_ts_hash_exists()
         - zend_ts_hash_index_exists()
+     9. Argument void to const char* in Zend Engine 4.0:
+        - zend_get_op_array_extension_handle()
+     10. Argument zend_extension to const char* in Zend Engine 4.0:
+        - zend_get_resource_handle()
+     11. Argument const char * to HMODULE in Zend Engine 4.0:
+        - php_win32_image_compatible()
+     12. const char * argument dropped in Zend Engine 4.0:
+        - php_win32_crt_compatible()
 
   u. Instead of overwriting zend_error_cb extensions with debugging, monitoring
      use-cases catching Errors/Exceptions are strongly encouraged to use
@@ -395,6 +405,10 @@ PHP 8.0 INTERNALS UPGRADE NOTES
   w. The following APIs have been renamed:
      - _zend_ts_hash_init() to zend_ts_hash_init()
 
+  x. In COMPILE_EXTENDED_STMT mode, a ZEND_EXT_NOP opcode will no longer be
+     generated at the start of a function. Use the new observer APIs or hook
+     into zend_execute_ex instead.
+
 ========================
 2. Build system changes
 ========================

Zend/tests/008.phpt

@@ -32,13 +32,13 @@ echo "Done\n";
 --EXPECTF--
 TypeError: define(): Argument #1 ($constant_name) must be of type string, array given
 
-Notice: Constant TRUE already defined in %s on line %d
+Warning: Constant TRUE already defined in %s on line %d
 bool(false)
 bool(true)
 bool(true)
 bool(true)
 
-Notice: Constant test const already defined in %s on line %d
+Warning: Constant test const already defined in %s on line %d
 bool(false)
 bool(true)
 bool(true)

Zend/tests/009.phpt

@@ -26,7 +26,11 @@ $f2 = new foo2;
 $f1->bar();
 $f2->bar();
 
-var_dump(get_class());
+try {
+    var_dump(get_class());
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
 try {
     var_dump(get_class("qwerty"));
 } catch (TypeError $e) {
@@ -40,12 +44,10 @@ $f1->testNull();
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 string(3) "foo"
 string(3) "foo"
-
-Warning: get_class() called without object from outside a class in %s on line %d
-bool(false)
+get_class() without arguments must be called from within a class
 get_class(): Argument #1 ($object) must be of type object, string given
 string(3) "foo"
 string(4) "foo2"

Zend/tests/ErrorException_construct.phpt

@@ -0,0 +1,63 @@
+--TEST--
+Test default value handling of ErrorException::__construct()
+--FILE--
+<?php
+
+$e = new ErrorException();
+var_dump($e->getMessage());
+var_dump($e->getFile());
+var_dump($e->getLine());
+
+$e = new ErrorException("Second", 0, E_ERROR, null);
+var_dump($e->getMessage());
+var_dump($e->getFile());
+var_dump($e->getLine());
+
+$e = new ErrorException("Third", 0, E_ERROR, null, null);
+var_dump($e->getMessage());
+var_dump($e->getFile());
+var_dump($e->getLine());
+
+$e = new ErrorException("Forth", 0, E_ERROR, null, 123);
+var_dump($e->getMessage());
+var_dump($e->getFile());
+var_dump($e->getLine());
+
+$e = new ErrorException("Fifth", 0, E_ERROR, "abc.php");
+var_dump($e->getMessage());
+var_dump($e->getFile());
+var_dump($e->getLine());
+
+$e = new ErrorException("Sixth", 0, E_ERROR, "abc.php", null);
+var_dump($e->getMessage());
+var_dump($e->getFile());
+var_dump($e->getLine());
+
+$e = new ErrorException("Seventh", 0, E_ERROR, "abc.php", 123);
+var_dump($e->getMessage());
+var_dump($e->getFile());
+var_dump($e->getLine());
+
+?>
+--EXPECTF--
+string(0) ""
+string(%d) "%sErrorException_construct.php"
+int(3)
+string(6) "Second"
+string(%d) "%sErrorException_construct.php"
+int(8)
+string(5) "Third"
+string(%d) "%sErrorException_construct.php"
+int(13)
+string(5) "Forth"
+string(%d) "%sErrorException_construct.php"
+int(123)
+string(5) "Fifth"
+string(7) "abc.php"
+int(0)
+string(5) "Sixth"
+string(7) "abc.php"
+int(0)
+string(7) "Seventh"
+string(7) "abc.php"
+int(123)

Zend/tests/attributes/001_placement.phpt

@@ -41,8 +41,8 @@ $sources = [
 ];
 
 foreach ($sources as $r) {
-	$attr = $r->getAttributes();
-	var_dump(get_class($r), count($attr));
+    $attr = $r->getAttributes();
+    var_dump(get_class($r), count($attr));
 
     foreach ($attr as $a) {
         var_dump($a->getName(), $a->getArguments());

Zend/tests/attributes/003_ast_nodes.phpt

@@ -8,7 +8,7 @@ define('V1', strtoupper(php_sapi_name()));
 #[A1([V1 => V1])]
 class C1
 {
-	public const BAR = 'bar';
+    public const BAR = 'bar';
 }
 
 $ref = new \ReflectionClass(C1::class);
@@ -38,7 +38,7 @@ echo "\n";
 #[A1(self::FOO, C1::BAR)]
 class C3
 {
-	private const FOO = 'foo';
+    private const FOO = 'foo';
 }
 
 $ref = new \ReflectionClass(C3::class);
@@ -62,23 +62,23 @@ echo "\n";
 #[Attribute]
 class C5
 {
-	public function __construct() { }
+    public function __construct() { }
 }
 
 $ref = new \ReflectionFunction(#[C5(MissingClass::SOME_CONST)] function () { });
 $attr = $ref->getAttributes();
 var_dump(count($attr));
 
 try {
-	$attr[0]->getArguments();
+    $attr[0]->getArguments();
 } catch (\Error $e) {
-	var_dump($e->getMessage());
+    var_dump($e->getMessage());
 }
 
 try {
-	$attr[0]->newInstance();
+    $attr[0]->newInstance();
 } catch (\Error $e) {
-	var_dump($e->getMessage());
+    var_dump($e->getMessage());
 }
 
 ?>

Zend/tests/attributes/004_name_resolution.phpt

@@ -2,12 +2,15 @@
 Resolve attribute names
 --FILE--
 <?php
-function dump_attributes($attributes) {
-    $arr = [];
-    foreach ($attributes as $attribute) {
-        $arr[] = ['name' => $attribute->getName(), 'args' => $attribute->getArguments()];
+
+namespace {
+    function dump_attributes($attributes) {
+        $arr = [];
+        foreach ($attributes as $attribute) {
+            $arr[] = ['name' => $attribute->getName(), 'args' => $attribute->getArguments()];
+        }
+        var_dump($arr);
     }
-    var_dump($arr);
 }
 
 namespace Doctrine\ORM\Mapping {