Merge remote-tracking branch 'origin/master' into attributes_v2_rfc

Author: beberlei

.travis.yml

@@ -74,6 +74,8 @@ jobs:
           arch: amd64
         - env: ENABLE_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 ARM64=1
           arch: arm64
+        - env: ENABLE_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 S390X=1
+          arch: s390x
 
 before_script:
     - ccache --version
@@ -89,7 +91,9 @@ before_script:
 
 # Run PHPs run-tests.php
 script:
-    - ./sapi/cli/php run-tests.php -P -d extension=`pwd`/modules/zend_test.so $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d opcache.protect_memory=1 -d opcache.jit_buffer_size=16M -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --show-slow 1000 --set-timeout 120 -j$(nproc)
+    # ARM64 CI reports nproc=32, which is excessive.
+    - if [ -z "$ARM64" ]; then export JOBS=$(nproc); else export JOBS=16; fi
+    - ./sapi/cli/php run-tests.php -P -d extension=`pwd`/modules/zend_test.so $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d opcache.protect_memory=1 -d opcache.jit_buffer_size=16M -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --show-slow 1000 --set-timeout 120 -j$JOBS
     - sapi/cli/php -d extension_dir=`pwd`/modules -r 'dl("zend_test");'
 
 after_success:

NEWS

@@ -20,6 +20,14 @@ PHP                                                                        NEWS
     (cmb)
   . Fixed bug #79368 ("Unexpected end of file" is not an acceptable error
     message). (Alex Dowad)
+  . Fixed bug #36365 (scandir duplicates file name at every 65535th file).
+    (cmb)
+  . Use SSE2 instructions do locale independent strtolower. (Laruence)
+  . Fixed bug #79521 (Check __set_state structure). (carusogabriel)
+  . Fixed bug #79467 (data:// wrappers are writable). (cmb)
+
+- BZ2:
+  . Fixed bug #71263 (fread() does not report bzip2.decompress errors). (cmb)
 
 - CURL:
   . Bumped required libcurl version to 7.29.0. (cmb)
@@ -33,6 +41,13 @@ PHP                                                                        NEWS
   . Add property DOMXPath::$registerNodeNamespaces and constructor argument
     that allow global flag to configure query() or evaluate() calls.
 
+- Enchant:
+  . Add LIBENCHANT_VERSION macro
+  . Deprecate enchant_broker_set_dict_path, enchant_broker_get_dict_path
+    enchant_dict_add_to_personal and enchant_dict_is_in_session
+  . Add enchant_dict_add and enchant_dict_is_added functions
+  . Use libenchant-2 when available
+
 - FPM:
   . Fixed bug #64865 (Search for .user.ini files from script dir up to
     CONTEXT_DOCUMENT_ROOT). (Will Bender)
@@ -78,6 +93,7 @@ PHP                                                                        NEWS
   . Don't ignore invalid escape sequences. (sjon)
 
 - PDO:
+  . Changed default PDO error mode to exceptions. (AllenJB)
   . Fixed bug #77849 (Disable cloning of PDO handle/connection objects).
     (camporter)
 
@@ -165,4 +181,7 @@ PHP                                                                        NEWS
   . Add ZipArchive::isCompressionMethodSupported() and
     ZipArchive::isEncryptionMethodSupported() method (libzip 1.7.0). (Remi)
 
+- Zlib:
+  . Fixed bug #71417 (fread() does not report zlib.inflate errors). (cmb)
+
 <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>

TSRM/tsrm_win32.c

@@ -613,14 +613,16 @@ TSRM_API int shmget(key_t key, size_t size, int flags)
 {/*{{{*/
 	shm_pair *shm;
 	char shm_segment[26], shm_info[29];
-	HANDLE shm_handle, info_handle;
+	HANDLE shm_handle = NULL, info_handle = NULL;
 	BOOL created = FALSE;
 
-	snprintf(shm_segment, sizeof(shm_segment), "TSRM_SHM_SEGMENT:%d", key);
-	snprintf(shm_info, sizeof(shm_info), "TSRM_SHM_DESCRIPTOR:%d", key);
+	if (key != IPC_PRIVATE) {
+		snprintf(shm_segment, sizeof(shm_segment), "TSRM_SHM_SEGMENT:%d", key);
+		snprintf(shm_info, sizeof(shm_info), "TSRM_SHM_DESCRIPTOR:%d", key);
 
-	shm_handle  = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, shm_segment);
-	info_handle = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, shm_info);
+		shm_handle  = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, shm_segment);
+		info_handle = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, shm_info);
+	}
 
 	if (!shm_handle && !info_handle) {
 		if (flags & IPC_CREAT) {
@@ -631,8 +633,8 @@ TSRM_API int shmget(key_t key, size_t size, int flags)
 			DWORD high = 0;
 			DWORD low = size;
 #endif
-			shm_handle	= CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, high, low, shm_segment);
-			info_handle	= CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, sizeof(shm->descriptor), shm_info);
+			shm_handle	= CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, high, low, key == IPC_PRIVATE ? NULL : shm_segment);
+			info_handle	= CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, sizeof(shm->descriptor), key == IPC_PRIVATE ? NULL : shm_info);
 			created		= TRUE;
 		}
 		if (!shm_handle || !info_handle) {

UPGRADING

@@ -178,6 +178,19 @@ PHP 8.0 UPGRADE NOTES
         }
 
     RFC: https://wiki.php.net/rfc/abstract_trait_method_validation
+  . Disabled functions are now treated exactly like non-existent functions.
+    Calling a disabled function will report it as unknown, and redefining a
+    disabled function is now possible.
+  . data: stream wrappers are no longer writable, which matches the documented
+    behavior.
+  . The arithmetic and bitwise operators
+    +, -, *, /, **, %, <<, >>, &, |, ^, ~, ++, --
+    will now consistently throw a TypeError when one of the operands is an
+    array, resource or non-overloaded object. The only exception to this is the
+    array + array merge operation, which remains supported.
+    RFC: https://wiki.php.net/rfc/arithmetic_operator_type_checks
+  . Float to string casting will now always behave locale-independently.
+    RFC: https://wiki.php.net/rfc/locale_independent_float_to_string
 
 - COM:
   . Removed the ability to import case-insensitive constants from type
@@ -192,7 +205,7 @@ PHP 8.0 UPGRADE NOTES
 - dom:
   . Remove unimplemented classes from ext/dom that had no behavior and contained
     test data. These classes have also been removed in the latest version of DOM
-	standard:
+    standard:
 
      * DOMNameList
      * DomImplementationList
@@ -287,6 +300,10 @@ PHP 8.0 UPGRADE NOTES
     now ignored.
 
 - PDO:
+  . The default error handling mode has been changed from "silent" to
+   "exceptions". See https://www.php.net/manual/en/pdo.error-handling.php
+    for details of behavior changes and how to explicitly set this attribute.
+    RFC: https://wiki.php.net/rfc/pdo_default_errmode
   . The method PDOStatement::setFetchMode() now accepts the following signature:
 
         PDOStatement::setFetchMode($mode, $classname, $params)
@@ -325,6 +342,9 @@ PHP 8.0 UPGRADE NOTES
         ReflectionParameter::getDefaultValue()
         ReflectionParameter::isDefaultValueConstant()
         ReflectionParameter::getDefaultValueConstantName()
+  . ReflectionMethod::isConstructor() and ReflectionMethod::isDestructor() now
+    also return true for `__construct` and `__destruct` in methods of interfaces.
+    Previously, this would only be true in methods of classes and traits.
 
 - Socket:
   . The deprecated AI_IDN_ALLOW_UNASSIGNED and AI_IDN_USE_STD3_ASCII_RULES
@@ -388,6 +408,20 @@ PHP 8.0 UPGRADE NOTES
     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.
+  . If the array returned by __sleep() contains non-existing properties, these
+    are now silently ignored. Previously, such properties would have been
+    serialized as if they had the value NULL.
+  . The default locale on startup is now always "C". No locales are inherited
+    from the environment by default. Previously, LC_ALL was set to "C", while
+    LC_CTYPE was inherited from the environment. However, some functions did not
+    respect the inherited locale without an explicit setlocale() call. An
+    explicit setlocale() call is now always required if you wish to change any
+    locale component from the default.
+
+- Sysvsem:
+  . 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`.
 
 - tidy:
   . The $use_include_path parameter, which was not used internally, has been
@@ -453,11 +487,21 @@ PHP 8.0 UPGRADE NOTES
     defines a __toString() method.
     RFC: https://wiki.php.net/rfc/stringable
   . Traits can now define abstract private methods.
+    RFC: https://wiki.php.net/rfc/abstract_trait_method_validation
+  . `throw` can now be used as an expression.
+    RFC: https://wiki.php.net/rfc/throw_expression
+  . An optional trailing comma is now allowed in parameter lists.
+    RFC: https://wiki.php.net/rfc/trailing_comma_in_parameter_list
 
 - Date:
   . Added DateTime::createFromInterface() and
     DateTimeImmutable::createFromInterface().
 
+- Enchant:
+  . enchant_dict_add()
+  . enchant_dict_is_added()
+  . LIBENCHANT_VERSION macro
+
 - dom:
   . Introduce DOMParentNode and DOMChildNode with new traversal and manipulation APIs
     RFC: https://wiki.php.net/rfc/dom_living_standard_api
@@ -484,11 +528,27 @@ PHP 8.0 UPGRADE NOTES
 4. Deprecated Functionality
 ========================================
 
+- Core:
+  . Calling get_defined_functions() with $exclude_disabled explicitly set to
+    false is deprecated. get_defined_functions() will never include disabled
+    functions.
+
+- Enchant:
+  . enchant_broker_set_dict_path and enchant_broker_get_dict_path
+    not available in libenchant < 1.5 nor in libenchant-2
+  . enchant_dict_add_to_personal, use enchant_dict_add instead
+  . enchant_dict_is_in_session, use enchant_dict_is_added instead
+
 - Zip:
   . Using empty file as ZipArchive is deprecated. Libzip 1.6.0
     do not accept empty files as valid zip archives any longer.
     Existing workaround will be removed in next version.
 
+- Reflection:
+  . ReflectionFunction::isDisabled() is deprecated, as it is no longer possible
+    to create a ReflectionFunction for a disabled function. This method now
+    always returns false.
+
 ========================================
 5. Changed Functions
 ========================================
@@ -500,7 +560,7 @@ PHP 8.0 UPGRADE NOTES
    . comp_method
    . comp_flags
    . env_method
-   . enc_pasword
+   . enc_password
  . 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)
@@ -522,12 +582,23 @@ PHP 8.0 UPGRADE NOTES
     PR: https://github.com/php/php-src/pull/4797
 
 - Standard:
-  . Added str_contains($haystack, $needle) function, which checks whether
-    $haystack contains $needle as a sub-string. It is equivalent to writing
-    strpos($haystack, $needle) !== false.
+  . Added
+
+        str_contains(string $haystack, string $needle): bool
+        str_starts_with(string $haystack, string $needle): bool
+        str_ends_with(string $haystack, string $needle): bool
+
+    functions, which check whether $haystack contains, starts with or ends with
+    $needle.
+    RFC: https://wiki.php.net/rfc/str_contains
+    RFC: https://wiki.php.net/rfc/add_str_starts_with_and_ends_with_functions
   . Added fdiv() function, which performs a floating-point division under
     IEEE 754 semantics. Division by zero is considered well-defined and
     will return one of Inf, -Inf or NaN.
+  . Added get_debug_type() function, which returns a type useful for error
+    messages. Unlike gettype(), it uses canonical type names, returns class
+    names for objects, and indicates the resource type for resources.
+    RFC: https://wiki.php.net/rfc/get_debug_type
 
 - Zip:
   . ZipArchive::setMtimeName and ZipArchive::setMtimeIndex to set the
@@ -561,6 +632,11 @@ PHP 8.0 UPGRADE NOTES
 - CURL:
   . The CURL extension now requires at least libcurl 7.29.0.
 
+- Enchant:
+  . The enchant extension now uses libenchant-2 by default when available.
+    libenchant version 1 is still supported but is deprecated and could
+    be removed in the future.
+
 - GD:
   . The $num_points parameter of imagepolygon(), imageopenpolygon() and
     imagefilledpolygon() is now optional, i.e. these functions may be called
@@ -572,6 +648,10 @@ PHP 8.0 UPGRADE NOTES
 - MBString:
   . The Unicode data tables have been updated to version 13.0.0.
 
+- MySQLi / PDO MySQL:
+  . When mysqlnd is not used (which is the default and recommended option),
+    the minimum supported libmysqlclient version is now 5.1.
+
 ========================================
 10. New Global Constants
 ========================================
@@ -601,6 +681,9 @@ PHP 8.0 UPGRADE NOTES
 13. Other Changes
 ========================================
 
+- EBCDIC targets are no longer supported, though it's unlikely that they were
+  still working in the first place.
+
 ========================================
 14. Performance Improvements
 ========================================

Zend/tests/005.phpt

@@ -13,7 +13,7 @@ var_dump(strcasecmp("01", "01"));
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 int(0)
 int(-3)
 int(-1)

Zend/tests/add_003.phpt

@@ -20,12 +20,8 @@ var_dump($c);
 echo "Done\n";
 ?>
 --EXPECTF--
-Notice: Object of class stdClass could not be converted to number in %sadd_003.php on line %d
-
 Exception: Unsupported operand types: object + array
 
-Notice: Object of class stdClass could not be converted to number in %s on line %d
-
 Fatal error: Uncaught TypeError: Unsupported operand types: object + array in %s:%d
 Stack trace:
 #0 {main}

Zend/tests/bug27669.phpt

@@ -10,5 +10,5 @@ Bug #27669 (PHP 5 didn't support all possibilities for calling static methods dy
     $y[0] = 'hello';
     A::{$y[0]}();
 ?>
---EXPECTF--
+--EXPECT--
 Hello World

Zend/tests/bug51827.phpt

@@ -13,7 +13,7 @@ register_shutdown_function('ABC');
 register_shutdown_function('exploDe');
 
 ?>
---EXPECTF--
+--EXPECT--
 int(1)
 
 Fatal error: Uncaught ArgumentCountError: explode() expects at least 2 parameters, 0 given in [no active file]:0

Zend/tests/bug54305.phpt

@@ -9,14 +9,11 @@ class TestClass {
 abstract class AbstractClass {
 }
 $methodWithArgs = new ReflectionMethod('TestClass', 'methodWithArgs');
-echo $methodWithArgs++;
-?>
---EXPECTF--
-Method [ <user> public method methodWithArgs ] {
-  @@ %sbug54305.php %d - %d
-
-  - Parameters [2] {
-    Parameter #0 [ <required> $a ]
-    Parameter #1 [ <required> $b ]
-  }
+try {
+    echo $methodWithArgs++;
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
 }
+?>
+--EXPECT--
+Cannot increment object

Zend/tests/bug61025.phpt

@@ -20,9 +20,9 @@ echo $b->__invoke();
 
 ?>
 --EXPECTF--
-Warning: The magic method __invoke() must have public visibility and cannot be static in %sbug61025.php on line %d
+Warning: The magic method InvokeAble::__invoke() cannot be static in %sbug61025.php on line %d
 
-Warning: The magic method __invoke() must have public visibility and cannot be static in %sbug61025.php on line %d
+Warning: The magic method Bar::__invoke() must have public visibility in %sbug61025.php on line %d
 Bar
 Fatal error: Uncaught Error: Call to private method Bar::__invoke() from context '' in %sbug61025.php:%d
 Stack trace:

Zend/tests/bug63206.phpt

@@ -22,7 +22,7 @@ set_error_handler(function() {
 $triggerNotice1++;
 $triggerNotice2++;
 ?>
---EXPECTF--
+--EXPECT--
 Second handler
 Internal handler
 Second handler

Zend/tests/bug63206_1.phpt

@@ -22,5 +22,5 @@ restore_error_handler();
 
 $triggerNotice++;
 ?>
---EXPECTF--
+--EXPECT--
 Second handler

Zend/tests/bug63206_2.phpt

@@ -22,5 +22,5 @@ restore_exception_handler();
 
 throw new Exception();
 ?>
---EXPECTF--
+--EXPECT--
 Second handler

Zend/tests/bug65322.phpt

@@ -19,6 +19,6 @@ eval('class A { private function __invoke() { } }');
 
 ?>
 --EXPECTF--
-string(76) "The magic method __invoke() must have public visibility and cannot be static"
+string(%d) "The magic method A::__invoke() must have public visibility"
 string(%d) "%s(%d) : eval()'d code"
 string(1) "X"