Merge pull request #3 from php/master

Update fork

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

@@ -7,6 +7,8 @@ PHP                                                                        NEWS
 - 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
@@ -844,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

UPGRADING.INTERNALS

@@ -369,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

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/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 {

Zend/tests/attributes/029_reflect_internal_symbols.phpt

@@ -0,0 +1,32 @@
+--TEST--
+Reflect attributes on different kinds of internal symbols
+--FILE--
+<?php
+
+$rf = new ReflectionFunction('unserialize');
+var_dump($rf->getAttributes());
+
+$rc = new ReflectionClass('DateTime');
+var_dump($rc->getAttributes());
+
+$rm = $rc->getMethod('__construct');
+var_dump($rm->getAttributes());
+
+$rcc = $rc->getReflectionConstant('ATOM');
+var_dump($rcc->getAttributes());
+
+$rp = new ReflectionProperty('Exception', 'message');
+var_dump($rp->getAttributes());
+
+?>
+--EXPECT--
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}

Zend/tests/bug33999.phpt

@@ -23,8 +23,8 @@ object(Foo)#1 (1) {
   string(3) "bat"
 }
 
-Notice: Object of class Foo could not be converted to int in %sbug33999.php on line 9
+Warning: Object of class Foo could not be converted to int in %s on line %d
 int(1)
 
-Notice: Object of class Foo could not be converted to float in %sbug33999.php on line 12
+Warning: Object of class Foo could not be converted to float in %s on line %d
 float(1)

Zend/tests/bug47054.phpt

@@ -22,12 +22,8 @@ C::s();
 $c = new C();
 $c->s();
 
-get_called_class();
-
 ?>
---EXPECTF--
+--EXPECT--
 Called class: D
 Called class: C
 Called class: C
-
-Warning: get_called_class() called from outside a class in %s on line %d

Zend/tests/bug53305.phpt

@@ -14,6 +14,6 @@ var_dump(constant('__COMPILER_HALT_OFFSET__1'.chr(0)));
 
 ?>
 --EXPECTF--
-Notice: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d
+Warning: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d
 int(1)
 int(4)

Zend/tests/cast_to_double.phpt

@@ -52,6 +52,6 @@ float(1)
 float(0)
 float(%f)
 
-Notice: Object of class test could not be converted to float in %s on line %d
+Warning: Object of class test could not be converted to float in %s on line %d
 float(1)
 Done

Zend/tests/cast_to_int.phpt

@@ -50,6 +50,6 @@ int(1)
 int(0)
 int(%d)
 
-Notice: Object of class test could not be converted to int in %s on line %d
+Warning: Object of class test could not be converted to int in %s on line %d
 int(1)
 Done

Zend/tests/closure_040.phpt

@@ -24,14 +24,16 @@ $a = new A(20);
 $ca = $a->getIncrementor();
 $cas = $a->getStaticIncrementor();
 
-$ca->bindTo($a, array());
+try {
+    $ca->bindTo($a, array());
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
 
 $cas->bindTo($a, 'A');
 
 ?>
 --EXPECTF--
-Warning: Array to string conversion in %s on line %d
-
-Warning: Class "Array" not found in %s on line %d
+Closure::bindTo(): Argument #2 ($newScope) must be of type object|string|null, array given
 
 Warning: Cannot bind an instance to a static closure in %s on line %d

Zend/tests/constants_001.phpt

@@ -17,7 +17,7 @@ var_dump(constant('1foo'));
 
 ?>
 --EXPECTF--
-Notice: Constant 1 already defined in %s on line %d
+Warning: Constant 1 already defined in %s on line %d
 int(2)
 int(2)
 int(2)

Zend/tests/constants_004.phpt

@@ -10,4 +10,4 @@ const foo = 2;
 
 ?>
 --EXPECTF--
-Notice: Constant foo\foo already defined in %s on line %d
+Warning: Constant foo\foo already defined in %s on line %d

Zend/tests/constants_008.phpt

@@ -13,5 +13,5 @@ if (defined('a')) {
 
 ?>
 --EXPECTF--
-Notice: Constant a already defined in %s on line %d
+Warning: Constant a already defined in %s on line %d
 2

Zend/tests/function_outside_namespace.phpt

@@ -0,0 +1,12 @@
+--TEST--
+Function declaration should not be allowed before namespace declaration
+--FILE--
+<?php
+
+function foo() {}
+
+namespace Bar;
+
+?>
+--EXPECTF--
+Fatal error: Namespace declaration statement has to be the very first statement or after any declare call in the script in %s on line %d

Zend/tests/generators/errors/count_error.phpt

@@ -9,10 +9,10 @@ $gen = gen();
 
 try {
     count($gen);
-} catch (Exception $e) {
-    echo $e;
+} catch (\TypeError $e) {
+    echo $e->getMessage(), PHP_EOL;
 }
 
 ?>
---EXPECTF--
-Warning: count(): Argument #1 ($var) must be of type Countable|array, Generator given in %s on line %d
+--EXPECT--
+count(): Argument #1 ($var) must be of type Countable|array, Generator given

Zend/tests/get_called_class_001.phpt

@@ -3,9 +3,12 @@ Calling get_called_class() outside a class
 --FILE--
 <?php
 
-var_dump(get_called_class());
+try {
+    var_dump(get_called_class());
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
 
 ?>
---EXPECTF--
-Warning: get_called_class() called from outside a class in %s on line %d
-bool(false)
+--EXPECT--
+get_called_class() must be called from within a class

Zend/tests/get_class_vars_001.phpt

@@ -19,6 +19,12 @@ class B extends A {
 var_dump(get_class_vars('A'));
 var_dump(get_class_vars('B'));
 
+try {
+    get_class_vars("Unknown");
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
 ?>
 --EXPECT--
 array(1) {
@@ -31,3 +37,4 @@ array(2) {
   ["aa"]=>
   int(4)
 }
+get_class_vars(): Argument #1 ($class) must be a valid class name, Unknown given

Zend/tests/halt_compiler3.phpt

@@ -5,4 +5,4 @@ __HALT_COMPILER(); bad define() of __COMPILER_HALT_OFFSET__ 1
 define ('__COMPILER_HALT_OFFSET__', 1);
 ?>
 --EXPECTF--
-Notice: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d
+Warning: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d