Merge master

Author: beberlei

.travis.yml

@@ -3,7 +3,7 @@ git:
 
 dist: xenial
 language: c
-sudo: required
+os: linux
 addons:
   apt:
     packages:
@@ -27,6 +27,7 @@ addons:
       - libpspell-dev
       - libsasl2-dev
       - libsqlite3-dev
+      - libsodium-dev
       - libtidy-dev
       - libwebp-dev
       - libxml2-dev

EXTENSIONS

@@ -37,7 +37,7 @@ STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           cli
 PRIMARY MAINTAINER:  Marcus Börger <[email protected]>, Edin Kadribasic <[email protected]>
-MAINTENANCE:         Unknown
+MAINTENANCE:         Xinchen Hui <[email protected]> (2013 - 2020)
 STATUS:              Working
 SINCE:               4.3.0
 -------------------------------------------------------------------------------
@@ -330,7 +330,7 @@ STATUS:              Working
 EXTENSION:           gmp
 PRIMARY MAINTAINER:  Stanislav Malyshev <[email protected]> (2000 - 2019)
                      Antony Dovgal <[email protected]> (2005 - 2010)
-                     Nikita Popov <[email protected]> (2013 - 2019)
+                     Nikita Popov <[email protected]> (2013 - 2020)
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.0.4
@@ -379,14 +379,14 @@ STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           mbstring
 PRIMARY MAINTAINER:  Rui Hirokawa <[email protected]> (2001 - 2013)
-                     Nikita Popov <[email protected]> (2017 - 2019)
+                     Nikita Popov <[email protected]> (2017 - 2020)
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           opcache
 PRIMARY MAINTAINER:  Dmitry Stogov <[email protected]> (2013 - 2018)
-                     Xinchen Hui <[email protected]> (2013 - 2018)
-                     Nikita Popov <[email protected]> (2016 - 2019)
+                     Xinchen Hui <[email protected]> (2013 - 2020)
+                     Nikita Popov <[email protected]> (2016 - 2020)
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.5.0
@@ -438,6 +438,7 @@ STATUS:              Working
 EXTENSION:           reflection
 PRIMARY MAINTAINER:  Marcus Börger <[email protected]> (2003 - 2009)
                      Johannes Schlüter <[email protected]> (2006 - 2014)
+                     Nikita Popov <[email protected]> (2019 - 2020)
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -503,12 +504,13 @@ STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           tokenizer
 PRIMARY MAINTAINER:  Andrei Zmievski <[email protected]> (2002 - 2002)
-                     Nikita Popov <[email protected]> (2013 - 2019)
+                     Nikita Popov <[email protected]> (2013 - 2020)
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           zip
 PRIMARY MAINTAINER:  Pierre-Alain Joye <[email protected]> (2006 - 2011)
+                     Remi Collet <[email protected]> (2013-2020)
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------

NEWS

@@ -12,6 +12,8 @@ PHP                                                                        NEWS
     renamed). (Nikita)
   . Fixed bug #70839 (Converting optional argument to variadic forbidden by LSP
     checks). (Nikita)
+  . Fixed bug #69084 (Unclear error message when not implementing a renamed
+    abstract trait function). (Nikita)
 
 - CURL:
   . Bumped required libcurl version to 7.29.0. (cmb)
@@ -85,6 +87,13 @@ PHP                                                                        NEWS
     message with traits). (villfa)
   . Implement ReflectionProperty::hasDefaultValue and
     Reflection::getDefaultValue (beberlei)
+  . Fixed bug #64592 (ReflectionClass::getMethods() returns methods out of
+    scope). (Nikita)
+  . Fixed bug #77325 (ReflectionClassConstant::$class returns wrong class when
+    extending). (Nikita)
+  . Fixed bug #69180 (Reflection does not honor trait conflict resolution /
+    method aliasing). (Nikita)
+  . Fixed bug #74939 (Nested traits' aliased methods are lowercased). (Nikita)
 
 - Session:
   . Fixed bug #78624 (session_gc return value for user defined session
@@ -126,5 +135,14 @@ PHP                                                                        NEWS
   . Add ZipArchive::setMtimeName and ZipArchive::setMtimeIndex methods. (Remi)
   . Add ZipArchive::setProgressCallback method (since libzip 1.3.0). (Remi)
   . Add ZipArchive::setCancelCallback method (since libzip 1.6.0). (Remi)
+  . Add optional "flags" parameter to ZipArchive::addEmptyDir, addFile and
+    addFromString methods. (Remi)
+  . Add "flags" options to ZipArchive::addGlob and addPattern methods
+    keeping previous behavior having FL_OVERWRITE by default. (Remi)
+  . Add ZipArchive::replaceFile() method. (Remi)
+  . Add lastId property to ZipArchive. (Remi)
+  . ZipArchive::status and ZipArchive::statusSys properties and
+    ZipArchive::getStatusString() method stay valid after the archive
+    is closed. (Remi)
 
 <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>

UPGRADING

@@ -342,6 +342,10 @@ PHP 8.0 UPGRADE NOTES
         http://example.com/foo?# => query = "",   fragment = ""
 
     Previously all cases resulted in query and fragment being null.
+  . var_dump() and debug_zval_dump() will now print floating-point numbers
+    using serialize_precision rather than precision. In a default configuration,
+    this means that floating-point numbers are now printed with full accuracy
+    by these debugging functions.
 
 - tidy:
   . The $use_include_path parameter, which was not used internally, has been
@@ -364,6 +368,8 @@ PHP 8.0 UPGRADE NOTES
     option), whereas formerly it was treated as directory name. This means that
     if no trailing directory separator is given, the following character is
     no longer stripped from the filename.
+  . ZipArchive::OPSYS_Z_CPM have been removed, should use ZipArchive::OPSYS_CPM
+    (this name was a typo).
 
 - Zlib:
   . gzgetss() has been removed.
@@ -406,11 +412,23 @@ PHP 8.0 UPGRADE NOTES
   . Some consistency fixes to variable syntax have been applied, for example
     writing `Foo::BAR::$baz` is now allowed.
     RFC: https://wiki.php.net/rfc/variable_syntax_tweaks
+  . Added Stringable.
+    RFC: https://wiki.php.net/rfc/stringable
 
 - Date:
   . Added DateTime::createFromInterface() and
     DateTimeImmutable::createFromInterface().
 
+- dom:
+  . Introduce DOMParentNode and DOMChildNode with new traversal and manipulation APIs
+    RFC: https://wiki.php.net/rfc/dom_living_standard_api
+
+- Zip:
+  . Extension updated to version 1.18
+  . 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.
+
 ========================================
 3. Changes in SAPI modules
 ========================================
@@ -427,10 +445,22 @@ PHP 8.0 UPGRADE NOTES
 5. Changed Functions
 ========================================
 
+- Zip
+ . ZipArchive::addGlob and ZipArchive::addPattern methods accept a "flags"
+   value in the "options" array argument.
+ . ZipArchive::addEmptyDir, ZipArchive::addFile and aZipArchive::addFromString
+   methods have a new "flags" argument. This allow to manage name encoding
+   (ZipArchive::FL_ENC_*) and entry replacement (ZipArchive::FL_OVERWRITE)
+
 ========================================
 6. New Functions
 ========================================
 
+- PCRE:
+  . Added preg_last_error_msg(), which returns a human-readable message for
+    the last PCRE error. It complements preg_last_error(), which returns an
+    integer enum instead.
+
 - SQLite3:
   . Add SQLite3::setAuthorizer() and respective class constants to set a
     userland callback that will be used to authorize or not an action on the
@@ -442,6 +472,13 @@ PHP 8.0 UPGRADE NOTES
     IEEE 754 semantics. Division by zero is considered well-defined and
     will return one of Inf, -Inf or NaN.
 
+- Zip:
+  . ZipArchive::setMtimeName and ZipArchive::setMtimeIndex to set the
+    modification time of an entry.
+  . ZipArchive::setProgressCallback to provide updates during archive close.
+  . ZipArchive::setCancelCallback to allow cancellation during archive close.
+  . ZipArchive::replaceFile to replace an entry content.
+
 ========================================
 7. New Classes and Interfaces
 ========================================

UPGRADING.INTERNALS

@@ -13,6 +13,8 @@ PHP 8.0 INTERNALS UPGRADE NOTES
   j. compare_objects() and compare() object handlers
   k. The 'I' length modifier
   l. Some VM instructions switched to IS_TMP_VAR result instead of IS_VAR
+  m. All internal functions must have arginfo
+  n. zend_hash_sort compare function signature change
 
 2. Build system changes
   a. Abstract
@@ -98,6 +100,16 @@ PHP 8.0 INTERNALS UPGRADE NOTES
      pre increments/decrements (ZEND_PRE_INC, ZEND_PRE_DEC, ZEND_PRE_INC_OBJ
      ZEND_PRE_DEC_OBJ, ZEND_PRE_INC_STATIC_PROP ZEND_PRE_DEC_STATIC_PROP).
 
+  m. All internal functions and methods are now required to specify arginfo
+     information, otherwise warnings will be thrown on startup.
+
+  n. The zend_hash_sort and zend_hash_minmax APIs now accept a comparison
+     function with the following signature:
+
+         typedef int (*bucket_compare_func_t)(Bucket *a, Bucket *b);
+
+     Previously compare_func_t was used, which accepted void pointers.
+
 ========================
 2. Build system changes
 ========================

Zend/tests/008.phpt

@@ -25,7 +25,7 @@ var_dump(constant("test const"));
 echo "Done\n";
 ?>
 --EXPECTF--
-TypeError: define() expects argument #1 ($constant_name) to be of type string, array given
+TypeError: define(): Argument #1 ($constant_name) must be of type string, array given
 
 Notice: Constant TRUE already defined in %s on line %d
 bool(false)

Zend/tests/009.phpt

@@ -46,8 +46,8 @@ string(3) "foo"
 
 Warning: get_class() called without object from outside a class in %s on line %d
 bool(false)
-get_class() expects argument #1 ($object) to be of type object, string given
+get_class(): Argument #1 ($object) must be of type object, string given
 string(3) "foo"
 string(4) "foo2"
-get_class() expects argument #1 ($object) to be of type object, null given
+get_class(): Argument #1 ($object) must be of type object, null given
 Done

Zend/tests/add_005.phpt

@@ -17,6 +17,6 @@ var_dump($c);
 echo "Done\n";
 ?>
 --EXPECT--
-float(2834756759.1231)
-float(2834756759.1231)
+float(2834756759.123123)
+float(2834756759.123123)
 Done

Zend/tests/arrow_functions/006.phpt

@@ -32,7 +32,7 @@ try {
 --EXPECTF--
 int(2)
 int(10)
-{closure}() expects argument #1 ($x) to be of type int, string given, called in %s on line %d
+{closure}(): Argument #1 ($x) must be of type int, string given, called in %s on line %d
 array(3) {
   [0]=>
   int(20)
@@ -41,4 +41,4 @@ array(3) {
   [2]=>
   int(30)
 }
-{closure}() expects argument #2 ($args) to be of type ?int, string given, called in %s on line %d
+{closure}(): Argument #2 ($args) must be of type ?int, string given, called in %s on line %d

Zend/tests/attributes_007.phpt

@@ -0,0 +1,31 @@
+--TEST--
+attributes: docblocks
+--FILE--
+<?php
+
+/** foo */
+<<Foo>>
+/** Bar */
+class Baz
+{
+}
+
+/** foo */
+<<Foo>>
+class Boing
+{
+}
+
+$reflection = new ReflectionClass(Baz::class);
+var_dump(count($reflection->getAttributes()));
+var_dump($reflection->getDocComment());
+
+$reflection = new ReflectionClass(Boing::class);
+var_dump(count($reflection->getAttributes()));
+var_dump($reflection->getDocComment());
+
+--EXPECTF--
+int(0)
+string(10) "/** Bar */"
+int(1)
+string(10) "/** foo */"