Merge pull request #6 from php/master

sync master

Author: chopins

.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

@@ -1,13 +1,30 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? ????, PHP 8.0.0RC1
+?? ??? ????, PHP 8.0.0rc2
+
+
+01 Oct 2020, 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)
 
+- ODBC:
+  . Fixed bug #22986 (odbc_connect() may reuse persistent connection). (cmb)
+
+- PDO_Firebird:
+  . Fixed bug #64937 (Firebird PDO preprocessing sql). (Simonov Denis)
+
+- SPL:
+  . SplFixedArray is now IteratorAggregate rather than Iterator. (alexdowad)
+
+- Zlib:
+  . Fixed bug #78792 (zlib.output_compression disabled by Content-Type: image/).
+    (cmb)
+
 17 Sep 2020, PHP 8.0.0beta4
 
 - Core:

UPGRADING

@@ -254,6 +254,8 @@ PHP 8.0 UPGRADE NOTES
       __wakeup(): void
 
     RFC: https://wiki.php.net/rfc/magic-methods-signature
+  . call_user_func_array() array keys will now be interpreted as parameter names,
+    instead of being silently ignored.
 
 - COM:
   . Removed the ability to import case-insensitive constants from type
@@ -325,6 +327,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
@@ -335,6 +341,8 @@ PHP 8.0 UPGRADE NOTES
 
 - LDAP:
   . The deprecated function ldap_sort has been removed.
+  . The deprecated function ldap_control_paged_result has been removed.
+  . The deprecated function ldap_control_paged_result_response has been removed.
   . The interface of ldap_set_rebind_proc has changed; the $callback parameter
     does not accept empty string anymore; null value shall be used instead.
 
@@ -387,6 +395,10 @@ PHP 8.0 UPGRADE NOTES
   . Several alias functions have been marked as deprecated.
   . oci_internal_debug() and its alias ociinternaldebug() have been removed.
 
+- ODBC:
+  . odbc_connect() no longer reuses persistent connections.
+  . The unused flags parameter of odbc_exec() has been removed.
+
 - OpenSSL:
   . openssl_x509_read() and openssl_csr_sign() will now return an
     OpenSSLCertificate object rather than a resource. Return value checks using
@@ -431,6 +443,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 +510,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
@@ -644,6 +664,8 @@ PHP 8.0 UPGRADE NOTES
   . deflate_init() will now return a DeflateContext object rather than a
     resource. Return value checks using is_resource() should be replaced with
     checks for `false`.
+  . zlib.output_compression is no longer automatically disabled for
+    Content-Type: image/*.
 
 ========================================
 2. New Features
@@ -792,7 +814,7 @@ PHP 8.0 UPGRADE NOTES
     values rather than int.
 
 - Zip:
-  . Extension updated to version 1.19.0
+  . Extension updated to version 1.19.1
   . New ZipArchive::lastId property to get index value of last added entry.
   . Error can be checked after an archive is closed using ZipArchive::status,
     ZipArchive::statusSys properties or ZipArchive::getStatusString() method.
@@ -844,6 +866,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

@@ -373,6 +373,10 @@ PHP 8.0 INTERNALS UPGRADE NOTES
         - 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
@@ -436,6 +440,14 @@ PHP 8.0 INTERNALS UPGRADE NOTES
     2.  The PHP_CHECK_GCC_ARG() m4 macro has been removed in favor of
         AX_CHECK_COMPILE_FLAG().
 
+    3. The 6th argument of PHP_ADD_SOURCES_X has been removed.
+
+    4. The 'special-flags' (3rd) argument of PHP_ADD_SOURCES_X are
+       now appended instead of prepended to previous compiler flags.
+       This means compiler flags passed to PHP_NEW_EXTENSION and PHP_ADD_SOURCES
+       are now appended, this allows to disable compiler flags set by Zend/Zend.m4
+       (e.g. disable certain compiler flags enabled by -Wextra)
+
   c. Windows build system changes
 
     - The configuration option --enable-crt-debug has been removed. The VC

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/015.phpt

@@ -23,8 +23,8 @@ var_dump(trigger_error("error", E_USER_DEPRECATED));
 --EXPECTF--
 Notice: error in %s on line %d
 bool(true)
-trigger_error(): Argument #2 ($error_type) must be one of E_USER_ERROR, E_USER_WARNING, E_USER_NOTICE, or E_USER_DEPRECATED
-trigger_error(): Argument #2 ($error_type) must be one of E_USER_ERROR, E_USER_WARNING, E_USER_NOTICE, or E_USER_DEPRECATED
+trigger_error(): Argument #2 ($error_level) must be one of E_USER_ERROR, E_USER_WARNING, E_USER_NOTICE, or E_USER_DEPRECATED
+trigger_error(): Argument #2 ($error_level) must be one of E_USER_ERROR, E_USER_WARNING, E_USER_NOTICE, or E_USER_DEPRECATED
 
 Warning: error in %s on line %d
 bool(true)

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/005_objects.phpt

@@ -96,16 +96,16 @@ try {
 }
 
 ?>
---EXPECT--
+--EXPECTF--
 string(2) "A1"
 string(4) "test"
 int(50)
 
 string(7) "ERROR 1"
-string(81) "Too few arguments to function A1::__construct(), 0 passed and at least 1 expected"
+string(%d) "Too few arguments to function A1::__construct(), 0 passed in %s005_objects.php on line 26 and at least 1 expected"
 
 string(7) "ERROR 2"
-string(74) "A1::__construct(): Argument #1 ($name) must be of type string, array given"
+string(%d) "A1::__construct(): Argument #1 ($name) must be of type string, array given, called in %s005_objects.php on line 36"
 
 string(7) "ERROR 3"
 string(30) "Attribute class "A2" not found"

Zend/tests/attributes/014_class_const_group.phpt

@@ -1,14 +1,36 @@
 --TEST--
-Attributes cannot be applied to groups of class constants.
+Attributes can be applied to groups of class constants
 --FILE--
 <?php
 
-class C1
+class C
 {
-    #[A1]
+    #[A(1, X)]
     public const A = 1, B = 2;
 }
 
+const X = 2;
+
+$rp1 = new ReflectionClassConstant('C', 'A');
+$ra1 = $rp1->getAttributes()[0];
+var_dump($ra1->getName(), $ra1->getArguments());
+$rp2 = new ReflectionClassConstant('C', 'B');
+$ra2 = $rp2->getAttributes()[0];
+var_dump($ra2->getName(), $ra2->getArguments());
+
 ?>
---EXPECTF--
-Fatal error: Cannot apply attributes to a group of constants in %s
+--EXPECT--
+string(1) "A"
+array(2) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+}
+string(1) "A"
+array(2) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+}

Zend/tests/attributes/015_property_group.phpt

@@ -1,14 +1,36 @@
 --TEST--
-Attributes cannot be applied to groups of properties.
+Attributes can be applied to groups of properties
 --FILE--
 <?php
 
-class C1
+class C
 {
-    #[A1]
+    #[A(1, X)]
     public $x, $y;
 }
 
+const X = 2;
+
+$rp1 = new ReflectionProperty('C', 'x');
+$ra1 = $rp1->getAttributes()[0];
+var_dump($ra1->getName(), $ra1->getArguments());
+$rp2 = new ReflectionProperty('C', 'y');
+$ra2 = $rp2->getAttributes()[0];
+var_dump($ra2->getName(), $ra2->getArguments());
+
 ?>
---EXPECTF--
-Fatal error: Cannot apply attributes to a group of properties in %s
+--EXPECT--
+string(1) "A"
+array(2) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+}
+string(1) "A"
+array(2) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+}