merge

.gitignore

@@ -87,7 +87,7 @@ missing
 mkinstalldirs
 
 # RPM specification file generated by `./configure`
-/php7.spec
+/php.spec
 
 # Directories for shared object files and headers generated by `./configure`
 include/

Makefile.global

@@ -119,7 +119,7 @@ clean:
 
 distclean: clean
 	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
-	rm -f php7.spec main/build-defs.h scripts/phpize
+	rm -f php.spec main/build-defs.h scripts/phpize
 	rm -f ext/date/lib/timelib_config.h ext/mbstring/oniguruma/config.h ext/mbstring/libmbfl/config.h ext/oci8/oci8_dtrace_gen.h ext/oci8/oci8_dtrace_gen.h.bak
 	rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 sapi/phpdbg/phpdbg.1 ext/phar/phar.1 ext/phar/phar.phar.1
 	rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html

NEWS

@@ -12,6 +12,9 @@ PHP                                                                        NEWS
 - Intl:
   . Removed deprecated INTL_IDNA_VARIANT_2003. (cmb)
 
+- LDAP:
+  . Removed deprecated ldap_sort. (mcmic)
+
 - phpdbg:
   . Fixed bug #76596 (phpdbg support for display_errors=stderr). (kabel)
 

README.RELEASE_PROCESS

@@ -118,11 +118,11 @@ Getting the non stable release (alpha/beta/RC) announced
 
    Note: Remember to update the sha256 checksum information.
 
-2. Update ``web/php.git/include/version.inc`` (x=major version number)
+2. Update ``web/php.git/include/version.inc`` (X_Y=major_minor version number)
 
- a. ``$PHP_x_RC`` = "5.4.0RC1"  (should be set to "false" before)
+ a. ``$PHP_X_Y_RC`` = "5.4.0RC1"  (should be set to "false" before)
 
- b. ``$PHP_x_RC_DATE`` = "06 September 2007"
+ b. ``$PHP_X_Y_RC_DATE`` = "06 September 2007"
 
 3. Skip this step for non stable releases after GA of minor or major versions
    (e.g. announce 7.3.0RC1, but not 7.3.1RC1):
@@ -184,7 +184,7 @@ credits files in ext/standard.
 
 8. Push the tag f.e. "``git push origin php-5.4.1``"
 
-9. run: ``PHPROOT=. ./makedist php 5.4.1``, this will export the tag, create configure
+9. run: ``PHPROOT=. ./makedist 5.4.1``, this will export the tag, create configure
 and build three tarballs (gz, bz2 and xz).
    Check if the pear files are updated (phar).
    On some systems the behavior of GNU tar can default to produce POSIX compliant archives
@@ -224,19 +224,22 @@ Getting the stable release announced
  b. If that fails for any non-trivially fixable reason, you can
     manually copy the old information to include/releases.inc
 
-2. Edit ``phpweb/include/version.inc`` and change (X=major release number):
+2. Update ``phpweb/include/version.inc`` (X_Y=major_minor release number):
 
- a. ``$PHP_X_VERSION`` to the correct version
+ a. ``$PHP_X_Y_VERSION`` to the correct version
 
- b. ``$PHP_X_DATE`` to the release date
+ b. ``$PHP_X_Y_DATE`` to the release date
 
- c. ``$PHP_X_SHA256`` array and update all the SHA256 sums
+ c. ``$PHP_X_Y_SHA256`` array and update all the SHA256 sums
 
- d. set ``$PHP_X_RC`` to false!
+ d. set ``$PHP_X_Y_RC`` to false!
 
  e. Make sure there are no outdated "notes" or edited "date" keys in the
  ``$RELEASES[X][$PHP_X_VERSION]["source"]`` array
 
+ f. Only for the first revision of a major or minor release bump
+    ``$PHP_X_VERSION``, ``$PHP_X_DATE`` and ``$PHP_X_RC_DATE``.
+
 3. Create the release file (releases/x_y_z.php)
    Usually we use the same content as for point 6, but included in php template
    instead of the release xml.
@@ -295,15 +298,15 @@ Re-releasing the same version (or -pl)
 
 1. Commit the new binaries to ``phpweb/distributions/``
 
-2. Edit ``phpweb/include/version.inc`` and change (X=major release number):
+2. Update ``phpweb/include/version.inc`` (X_Y=major_minor release number):
 
  a. If only releasing for one OS, make sure you edit only those variables
 
- b. ``$PHP_X_VERSION`` to the correct version
+ b. ``$PHP_X_Y_VERSION`` to the correct version
 
- c. ``$PHP_X_DATE`` to the release date
+ c. ``$PHP_X_Y_DATE`` to the release date
 
- d. ``$PHP_X_SHA256`` array and update all the SHA256 sums
+ d. ``$PHP_X_Y_SHA256`` array and update all the SHA256 sums
 
  e. Make sure there are no outdated "notes" or edited "date" keys in the
  ``$RELEASES[X][$PHP_X_VERSION]["source"]`` array

README.STREAMS

@@ -374,5 +374,3 @@ the example above, you need to use mysql_free_result on the rowset, close the
 connection and then use pefree to dispose of the struct you allocated.
 You may read the stream->persistent field to determine if your struct was
 allocated in persistent mode or not.
-
-vim:tw=78:et

README.UNIX-BUILD-SYSTEM

@@ -108,7 +108,7 @@ module, program, etc).
 
 For example for APXS:
 
-PHP_SELECT_SAPI(apache, shared, sapi_apache.c mod_php7.c php_apache.c)
+PHP_SELECT_SAPI(apache, shared, sapi_apache.c mod_php.c php_apache.c)
 
 
 

README.WIN32-BUILD-SYSTEM

@@ -1,5 +1,3 @@
 The Win32 Build System.
 
 See https://wiki.php.net/internals/windows/stepbystepbuild_sdk_2
-
-vim:tw=78:sw=1:ts=1:et

TSRM/TSRM.c

@@ -794,12 +794,3 @@ TSRM_API const char *tsrm_api_name(void)
 }/*}}}*/
 
 #endif /* ZTS */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */

TSRM/TSRM.h

@@ -210,12 +210,3 @@ TSRM_API const char *tsrm_api_name(void);
 #endif /* ZTS */
 
 #endif /* TSRM_H */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */

TSRM/tsrm_config.w32.h

@@ -12,12 +12,3 @@
 #include <crtdbg.h>
 
 #endif
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */

TSRM/tsrm_config_common.h

@@ -69,12 +69,3 @@ char *alloca ();
 #endif
 
 #endif /* TSRM_CONFIG_COMMON_H */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */

TSRM/tsrm_strtok_r.c

@@ -61,12 +61,3 @@ main()
 }
 
 #endif
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */

TSRM/tsrm_win32.c

@@ -820,12 +820,3 @@ TSRM_API int win32_utime(const char *filename, struct utimbuf *buf) /* {{{ */
 /* }}} */
 #endif
 #endif
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */

TSRM/tsrm_win32.h

@@ -109,12 +109,3 @@ TSRM_API void *shmat(int key, const void *shmaddr, int flags);
 TSRM_API int shmdt(const void *shmaddr);
 TSRM_API int shmctl(int key, int cmd, struct shmid_ds *buf);
 #endif
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */

UPGRADING

@@ -34,6 +34,7 @@ PHP 8.0 UPGRADE NOTES
     interpreted as strings.
   . Removed ability to specify an autoloader using an __autoload() function.
     spl_autoload_register() should be used instead.
+  . Removed the $errcontext argument for custom error handlers.
   . Removed create_function(). Anonymous functions may be used instead.
   . Removed each(). foreach or ArrayIterator should be used instead.
   . Removed ability to unbind $this from closures that were created from a
@@ -68,6 +69,9 @@ PHP 8.0 UPGRADE NOTES
     RFC: https://wiki.php.net/rfc/deprecate-and-remove-intl_idna_variant_2003
   . The deprecated Normalizer::NONE constant has been removed.
 
+- LDAP:
+  . The deprecated function ldap_sort has been removed.
+
 - Mbstring:
   . The mbstring.func_overload directive has been removed. The related
     MB_OVERLOAD_MAIL, MB_OVERLOAD_STRING, and MB_OVERLOAD_REGEX constants have
@@ -94,6 +98,9 @@ PHP 8.0 UPGRADE NOTES
 
   . The 'e' modifier for mb_ereg_replace() has been removed.
     mb_ereg_replace_callback() should be used instead.
+  . A non-string pattern argument to mb_ereg_replace() will now be interpreted
+    as a string instead of an ASCII codepoint. The previous behavior may be
+    restored with an explicit call to chr().
 
 - SPL:
   . SplFileObject::fgetss() has been removed.

UPGRADING.INTERNALS

@@ -1,7 +1,7 @@
 PHP 8.0 INTERNALS UPGRADE NOTES
 
 1. Internal API changes
-  a. TBD
+  a. Object Handlers API
 
 2. Build system changes
   a. Abstract
@@ -14,7 +14,10 @@ PHP 8.0 INTERNALS UPGRADE NOTES
 1. Internal API changes
 ========================
 
- a. TBD
+ a. Object Handlers API and some related functions, e.g. zend_call_method() and
+    zend_objects_clone_obj() were changed to receive zend_object* instead of
+    zval* and zend_string* instead of zval* for property names.
+
 
 ========================
 2. Build system changes

Zend/tests/bug29890.phpt

@@ -2,7 +2,7 @@
 Bug #29890 (crash if error handler fails)
 --FILE--
 <?php
-function customErrorHandler($fErrNo,$fErrStr,$fErrFile,$fErrLine,$fClass) {
+function customErrorHandler($fErrNo,$fErrStr,$fErrFile,$fErrLine) {
 echo "error :".$fErrStr."\n";
 }
 

Zend/tests/bug29896.phpt

@@ -2,7 +2,7 @@
 Bug #29896 (Backtrace argument list out of sync)
 --FILE--
 <?php
-function userErrorHandler($num, $msg, $file, $line, $vars)
+function userErrorHandler($num, $msg, $file, $line)
 {
     debug_print_backtrace();
 }
@@ -22,6 +22,6 @@ function GenerateError2($A1)
 GenerateError2("Test2");
 ?>
 --EXPECTF--
-#0  userErrorHandler(8, Undefined variable: b, %sbug29896.php, 11, Array ([A1] => Test1)) called at [%sbug29896.php:11]
+#0  userErrorHandler(8, Undefined variable: b, %sbug29896.php, 11) called at [%sbug29896.php:11]
 #1  GenerateError1(Test1) called at [%sbug29896.php:16]
 #2  GenerateError2(Test2) called at [%sbug29896.php:19]

Zend/tests/bug35017.phpt

@@ -13,7 +13,7 @@ try {
 } catch(Exception $e) {
   echo "This Exception should be caught\n";
 }
-function errorHandler($errno, $errstr, $errfile, $errline, $vars) {
+function errorHandler($errno, $errstr, $errfile, $errline) {
 	throw new Exception('Some Exception');
 }
 ?>

Zend/tests/bug41209.phpt

@@ -41,6 +41,6 @@ echo "Done\n";
 --EXPECTF--
 Fatal error: Uncaught ErrorException: Undefined variable: id in %s:%d
 Stack trace:
-#0 %s(%d): env::errorHandler(8, '%s', '%s', 34, Array)
+#0 %s(%d): env::errorHandler(8, '%s', '%s', 34)
 #1 {main}
   thrown in %s on line %d

Zend/tests/bug45805.phpt

@@ -38,7 +38,7 @@ $o->bar();
 --EXPECTF--
 Fatal error: Uncaught RuntimeException in %sbug45805.php:%d
 Stack trace:
-#0 %sbug45805.php(%d): PHPUnit_Util_ErrorHandler::handleError(8, 'Only variables ...', '%s', %d, Array)
+#0 %sbug45805.php(%d): PHPUnit_Util_ErrorHandler::handleError(8, 'Only variables ...', '%s', %d)
 #1 [internal function]: B->foo()
 #2 %sbug45805.php(%d): ReflectionMethod->invoke(Object(B))
 #3 %sbug45805.php(%d): B->bar()

Zend/tests/bug48004.phpt

@@ -2,7 +2,7 @@
 Bug #48004 (Error handler prevents creation of default object)
 --FILE--
 <?php
-function error_handler($errno, $errstr, $errfile, $errline, $errcontext) {
+function error_handler($errno, $errstr, $errfile, $errline) {
         return true;
 }
 

Zend/tests/bug51394.phpt

@@ -15,6 +15,6 @@ $a = $empty($b);
 --EXPECTF--
 Fatal error: Uncaught Exception: error! in %sbug51394.php:%d
 Stack trace:
-#0 %sbug51394.php(%d): eh(8, 'Undefined varia%s', '%s', %d, Array)
+#0 %sbug51394.php(%d): eh(8, 'Undefined varia%s', '%s', %d)
 #1 {main}
   thrown in %sbug51394.php on line %d

Zend/tests/bug60909_1.phpt

@@ -13,7 +13,7 @@ require 'notfound.php';
 error(require(notfound.php): failed to open stream: %s)
 Warning: Uncaught Exception: Foo in %sbug60909_1.php:5
 Stack trace:
-#0 %sbug60909_1.php(8): {closure}(2, 'require(notfoun...', '%s', 8, Array)
+#0 %sbug60909_1.php(8): {closure}(2, 'require(notfoun...', '%s', 8)
 #1 %sbug60909_1.php(8): require()
 #2 {main}
   thrown in %sbug60909_1.php on line 5

Zend/tests/bug61767.phpt

@@ -19,7 +19,7 @@ Error handler called (Undefined variable: undefined)
 
 Fatal error: Uncaught ErrorException: Undefined variable: undefined in %sbug61767.php:%d
 Stack trace:
-#0 %sbug61767.php(%d): {closure}(%s, 'Undefined varia...', '%s', %d, Array)
+#0 %sbug61767.php(%d): {closure}(%s, 'Undefined varia...', '%s', %d)
 #1 {main}
   thrown in %sbug61767.php on line %d
 Shutting down

Zend/tests/bug64960.phpt

@@ -33,7 +33,7 @@ Notice: ob_end_flush(): failed to delete and flush buffer. No buffer to delete o
 
 Fatal error: Uncaught Exception in %sbug64960.php:19
 Stack trace:
-#0 [internal function]: {closure}(8, 'ob_end_clean():...', '%s', 9, Array)
+#0 [internal function]: {closure}(8, 'ob_end_clean():...', '%s', 9)
 #1 %sbug64960.php(9): ob_end_clean()
 #2 [internal function]: ExceptionHandler->__invoke(Object(Exception))
 #3 {main}

Zend/tests/bug69388.phpt

@@ -3,7 +3,7 @@ Bug #69388: Use after free on recursive calls to PHP compiler
 --FILE--
 <?php
 
-function handle_error($code, $message, $file, $line, $context) {
+function handle_error($code, $message, $file, $line) {
 	if (!function_exists("bla")) {
 		eval('function bla($s) {echo "$s\n";}');
 	}

Zend/tests/bug69388_2.phpt

@@ -2,7 +2,7 @@
 Bug #69388 - Variation
 --FILE--
 <?php
-function handle_error($code, $message, $file, $line, $context) {
+function handle_error($code, $message, $file, $line) {
     eval('namespace Foo;');
     echo "$message\n";
 }

Zend/tests/bug72057.phpt

@@ -13,7 +13,7 @@ set_error_handler(
 --EXPECTF--
 Fatal error: Uncaught Exception: My custom error in %s:%d
 Stack trace:
-#0 %s(%d): {closure}(8, 'A non well form...', '%s', %d, Array)
+#0 %s(%d): {closure}(8, 'A non well form...', '%s', %d)
 #1 %s(%d): {closure}('7as')
 #2 {main}
   thrown in %s on line %d

Zend/tests/bug72101.phpt

@@ -76,7 +76,7 @@ $foo->bar($a, $b, $c);
 --EXPECTF--
 Fatal error: Uncaught Error: Class 'DoesNotExists' not found in %sbug72101.php:61
 Stack trace:
-#0 %sbug72101.php(8): {closure}(2, 'Parameter 1 to ...', '%s', 8, Array)
+#0 %sbug72101.php(8): {closure}(2, 'Parameter 1 to ...', '%s', 8)
 #1 %sbug72101.php(27): PHPUnit_Framework_MockObject_Stub_ReturnCallback->invoke(Object(PHPUnit_Framework_MockObject_Invocation_Static))
 #2 %sbug72101.php(19): PHPUnit_Framework_MockObject_Matcher->invoked(Object(PHPUnit_Framework_MockObject_Invocation_Static))
 #3 %sbug72101.php(52): PHPUnit_Framework_MockObject_InvocationMocker->invoke(Object(PHPUnit_Framework_MockObject_Invocation_Static))