Merge branch 'master' of https://github.com/php/php-src into safe_bcmp_intro

Author: David Carlier

.appveyor.yml

@@ -1,6 +1,6 @@
 version: "{branch}.build.{build}"
 
-image: Visual Studio 2017
+image: Visual Studio 2019
 
 branches:
         except:
@@ -24,7 +24,7 @@ environment:
         PHP_BUILD_OBJ_DIR: c:\obj
         PHP_BUILD_CACHE_SDK_DIR: c:\build-cache\sdk
         PHP_BUILD_SDK_BRANCH: php-sdk-2.2.0
-        PHP_BUILD_CRT: vc15
+        PHP_BUILD_CRT: vs16
         # ext and env setup for tests
         #MYSQL_TEST_PASSWD: Password12!
         #MYSQL_TEST_USER: root

.gdbinit

@@ -252,16 +252,13 @@ define ____printzv_contents
 		____printzv &$zvalue->value.ref->val $arg1
 	end
 	if $type == 11
-		printf "const: %s", $zvalue->value.str->val
-	end
-	if $type == 12
 		printf "CONSTANT_AST"
 	end
-	if $type == 13
+	if $type == 12
 		printf "indirect: "
 		____printzv $zvalue->value.zv $arg1
 	end
-	if $type == 14
+	if $type == 13
 		printf "pointer: %p", $zvalue->value.ptr
 	end
 	if $type == 15
@@ -271,18 +268,9 @@ define ____printzv_contents
 		printf "_BOOL"
 	end
 	if $type == 17
-		printf "CALLABLE"
-	end
-	if $type == 18
-		printf "ITERABLE"
-	end
-	if $type == 19
-		printf "VOID"
-	end
-	if $type == 20
 		printf "_NUMBER"
 	end
-	if $type > 20
+	if $type > 17
 		printf "unknown type %d", $type
 	end
 	printf "\n"

.gitignore

@@ -119,7 +119,7 @@ config.h.in
 # ------------------------------------------------------------------------------
 # SAPIs specific ignores
 # ------------------------------------------------------------------------------
-/sapi/apache2handler/libphp7.module
+/sapi/apache2handler/libphp.module
 /sapi/fpm/fpm/php-cgi
 /sapi/fpm/init.d.php-fpm
 /sapi/fpm/php-fpm.conf
@@ -191,7 +191,7 @@ php
 /configure.bat
 /configure.js
 
-# Generated by `/configure.(bat|js)` (architecture dependend)
+# Generated by `/configure.(bat|js)` (architecture dependent)
 /config.nice.bat
 
 # NTS debug build x86
@@ -209,7 +209,7 @@ php
 # Generated by x64 compiler, includes Debug, Debug_TS, Release, Release_TS
 /x64/
 
-# Miscellaneous files generated by Windows build sytem
+# Miscellaneous files generated by Windows build system
 /main/config.w32.h
 /win32/build/deplister.exe
 /win32/build/deplister.obj
@@ -247,6 +247,9 @@ php
 # Test results generated by `./run-tests.php`
 php_test_results_*.txt
 
+# Temporary test information generated by `./run-tests.php`
+/run-test-info.php
+
 # Temporary POST data placeholder files generated by `./run-tests.php`
 phpt.*
 
@@ -258,7 +261,8 @@ tmp-php.ini
 # ------------------------------------------------------------------------------
 *.gcda
 *.gcno
-/lcov_data/
+/gcovr.xml
+/gcovr_html/
 /lcov_html/
 /php_lcov.info
 

.travis.yml

@@ -10,18 +10,29 @@ addons:
       - locales
       - language-pack-de
       - re2c
+      - ccache
+      - mysql-server
+      - libaspell-dev
+      - libbz2-dev
+      - libcurl4-gnutls-dev
+      - libenchant-dev
+      - libfreetype6-dev
       - libgmp-dev
       - libicu-dev
-      - libtidy-dev
-      - libenchant-dev
-      - libaspell-dev
+      - libjpeg-dev
+      - libkrb5-dev
+      - libonig-dev
+      - libpng-dev
+      - libpq-dev
       - libpspell-dev
       - libsasl2-dev
-      - libxpm-dev
-      - libzip-dev
       - libsqlite3-dev
+      - libtidy-dev
       - libwebp-dev
-      - libonig-dev
+      - libxml2-dev
+      - libxpm-dev
+      - libxslt1-dev
+      - libzip-dev
 
 
 services:
@@ -51,10 +62,17 @@ env:
       - PDO_MYSQL_TEST_USER=travis
       - PDO_MYSQL_TEST_PASS=
       - PDO_MYSQL_TEST_HOST=127.0.0.1
+      - PDO_PGSQL_TEST_DSN="pgsql:host=localhost port=5432 dbname=test user=postgres password="
       - REPORT_EXIT_STATUS=1
-    matrix:
-      - ENABLE_ZTS=0 ENABLE_DEBUG=0
-      - ENABLE_ZTS=1 ENABLE_DEBUG=1
+
+jobs:
+    include:
+        - env: ENABLE_ZTS=0 ENABLE_DEBUG=0
+          arch: amd64
+        - env: ENABLE_ZTS=1 ENABLE_DEBUG=1
+          arch: amd64
+        - env: ENABLE_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 ARM64=1
+          arch: arm64
 
 before_script:
     - ccache --version
@@ -65,15 +83,12 @@ before_script:
     # Compile PHP
     - travis_wait ./travis/compile.sh
     # Setup Extensions
-    - . ./travis/ext/mysql/setup.sh
-    - . ./travis/ext/mysqli/setup.sh
-    - . ./travis/ext/pdo_mysql/setup.sh
-    - . ./travis/ext/pgsql/setup.sh
-    - . ./travis/ext/pdo_pgsql/setup.sh
+    - ./travis/setup-mysql.sh
+    - ./travis/setup-pgsql.sh
 
 # 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 -j2
+    - ./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)
     - sapi/cli/php -d extension_dir=`pwd`/modules -r 'dl("zend_test");'
 
 after_success:

CODING_STANDARDS.md

@@ -33,7 +33,7 @@ use these rules.
 
 4. Use definitions and macros whenever possible, so that constants have
     meaningful names and can be easily manipulated. The only exceptions to this
-    rule are 1 and 2, when used as `false` and `true` (respectively). Any other
+    rule are 0 and 1, when used as `false` and `true` (respectively). Any other
     use of a numeric constant to specify different behavior or actions should be
     done through a `#define`.
 

CONTRIBUTING.md

@@ -35,7 +35,7 @@ If you are fixing a bug, then please submit your PR against the lowest actively
 supported branch of PHP that the bug affects (only green branches on
 [the supported version page](https://www.php.net/supported-versions.php) are
 supported). For example, at the time of writing, the lowest supported version is
-PHP 7.2, which corresponds to the `PHP-7.2` branch in Git. Please also make sure
+PHP 7.3, which corresponds to the `PHP-7.3` branch in Git. Please also make sure
 you add a link to the PR in the bug on [the bug tracker](https://bugs.php.net/).
 
 Pull requests implementing RFCs should be submitted against `master`.
@@ -331,10 +331,10 @@ Currently we have the following branches in use:
 | Branch    |           |
 | --------- | --------- |
 | master    | Active development branch for PHP 8.0, which is open for backwards incompatible changes and major internal API changes. |
-| PHP-7.4   | Active development branch for PHP 7.4, which is open for new features and minor internal API changes. |
+| PHP-7.4   | Is used to release the PHP 7.4.x series. This is a current stable version and is open for bugfixes only. |
 | PHP-7.3   | Is used to release the PHP 7.3.x series. This is a current stable version and is open for bugfixes only. |
-| PHP-7.2   | Is used to release the PHP 7.2.x series. This is a current stable version and is open for bugfixes only. |
-| PHP-7.1   | Is used to release the PHP 7.1.x series. This is an old stable version and is open for security fixes only. |
+| PHP-7.2   | Is used to release the PHP 7.2.x series. This is an old stable version and is open for security fixes only. |
+| PHP-7.1   | This branch is closed. |
 | PHP-7.0   | This branch is closed. |
 | PHP-5.6   | This branch is closed. |
 | PHP-5.5   | This branch is closed. |
@@ -348,8 +348,8 @@ Currently we have the following branches in use:
 The next few rules are more of a technical nature:
 
 1. All non-security bugfix changes should first go to the lowest bugfix branch
-   (i.e. 7.2) and then get merged up to all other branches. All security fixes
-   should go to the lowest security fixes branch (i.e 7.1). If a change is not
+   (i.e. 7.3) and then get merged up to all other branches. All security fixes
+   should go to the lowest security fixes branch (i.e 7.2). If a change is not
    needed for later branches (i.e. fixes for features which were dropped from
    later branches) an empty merge should be done.
 
@@ -409,8 +409,6 @@ New source code files should include the following header block:
 
 ```c
 /*
-  +----------------------------------------------------------------------+
-  | PHP Version 7                                                        |
   +----------------------------------------------------------------------+
   | Copyright (c) The PHP Group                                          |
   +----------------------------------------------------------------------+

EXTENSIONS

@@ -60,7 +60,7 @@ SINCE:               5.3
 -------------------------------------------------------------------------------
 EXTENSION:           phpdbg
 PRIMARY MAINTAINER:  Joe Watkins <[email protected]>, Bob Weinand <[email protected]>
-MAINTENANCE:         Unkown
+MAINTENANCE:         Unknown
 STATUS:              5.6
 -------------------------------------------------------------------------------
 
@@ -359,7 +359,7 @@ EXTENSION:           imap
 PRIMARY MAINTAINER:  Chuck Hagenbuch <[email protected]> (1999 - 2004)
                      Ilia Alshanetsky <[email protected]> (2002 - 2010)
                      Pierre-Alain Joye <[email protected]> (2008 - 2010)
-                     Bishop Bettini (2018 - 2019)
+                     Bishop Bettini <[email protected]> (2018 - 2019)
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -414,7 +414,7 @@ EXTENSION:           phar
 PRIMARY MAINTAINER:  Greg Beaver <[email protected]> (2008 - 2009)
                      Marcus Börger <[email protected]> (2008 - 2008)
                      Steph Fox <[email protected]> (2008 - 2008)
-                     Bishop Bettini (2018 - 2019)
+                     Bishop Bettini <[email protected]> (2018 - 2019)
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.3
@@ -431,7 +431,7 @@ STATUS:              Working
 SINCE:               4.0.2
 -------------------------------------------------------------------------------
 EXTENSION:           readline
-PRIMARY MAINTAINER:  Unkown
+PRIMARY MAINTAINER:  Unknown
 MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -480,17 +480,17 @@ STATUS:              Working
 SINCE:               5.0.0
 -------------------------------------------------------------------------------
 EXTENSION:           sysvmsg
-PRIMARY MAINTAINER:  Unkown
+PRIMARY MAINTAINER:  Unknown
 MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           sysvsem
-PRIMARY MAINTAINER:  Unkown
+PRIMARY MAINTAINER:  Unknown
 MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           sysvshm
-PRIMARY MAINTAINER:  Unkown
+PRIMARY MAINTAINER:  Unknown
 MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------