Another string comparison

.appveyor.yml

@@ -9,14 +9,21 @@ branches:
 
 clone_depth: 64
 
+skip_commits:
+  files:
+    - docs/*
+    - NEWS
+    - UPGRADING
+    - UPGRADING.INTERNALS
+
 cache:
         - c:\build-cache
 
 environment:
         PHP_BUILD_CACHE_BASE_DIR: c:\build-cache
         PHP_BUILD_OBJ_DIR: c:\obj
         PHP_BUILD_CACHE_SDK_DIR: c:\build-cache\sdk
-        PHP_BUILD_SDK_BRANCH: php-sdk-2.2.0beta3
+        PHP_BUILD_SDK_BRANCH: php-sdk-2.2.0
         PHP_BUILD_CRT: vc15
         # ext and env setup for tests
         #MYSQL_TEST_PASSWD: Password12!
@@ -33,7 +40,7 @@ environment:
                   PARALLEL: -j2
                 - THREAD_SAFE: 1
                   OPCACHE: 1
-                  PARALLEL:
+                  PARALLEL: -j2
                   INTRINSICS: AVX
 
 services:

.editorconfig

@@ -3,45 +3,32 @@
 root = true
 
 [*]
+trim_trailing_whitespace = true
+insert_final_newline     = true
+end_of_line              = lf
+charset                  = utf-8
 tab_width                = 4
 
-[*.{c,h,y,awk,w32,bat,mk,frag,cpp}]
-charset                  = utf-8
-end_of_line              = lf
+[{*.{awk,bat,c,cpp,d,h,l,re,skl,w32,y},Makefile*}]
 indent_size              = 4
 indent_style             = tab
-trim_trailing_whitespace = true
-insert_final_newline     = true
 
-[*.{php,phpt,inc}]
-charset                  = utf-8
-end_of_line              = lf
+[*.{dtd,html,inc,php,phpt,rng,wsdl,xml,xsd,xsl}]
 indent_size              = 4
 indent_style             = space
-trim_trailing_whitespace = true
-insert_final_newline     = true
 
-[*.{yml,m4,sh}]
-charset                  = utf-8
-end_of_line              = lf
+[*.{ac,m4,sh,yml}]
 indent_size              = 2
 indent_style             = space
-trim_trailing_whitespace = true
-insert_final_newline     = true
 
 [*.md]
-charset                  = utf-8
-end_of_line              = lf
 indent_style             = space
-trim_trailing_whitespace = true
-insert_final_newline     = true
 max_line_length          = 80
 
 [COMMIT_EDITMSG]
-charset                  = utf-8
-end_of_line              = lf
 indent_size              = 4
 indent_style             = space
-trim_trailing_whitespace = true
-insert_final_newline     = true
 max_line_length          = 80
+
+[*.patch]
+trim_trailing_whitespace = false

.gitattributes

@@ -1,5 +1,4 @@
 # Replace $Id$ strings with 40-character hexadecimal blob object name.
-/ext/mysqlnd/mysqlnd.h          ident
 /ext/ext_skel.php               ident
 /ext/phar/phar/pharcommand.inc  ident
 /ext/dba/libinifile/inifile.c   ident

.gitignore

@@ -16,6 +16,9 @@
 # Swap files created by editors and tools to indicate a locked file
 *.swp
 
+# Various temporary generated files
+*.tmp
+
 # ------------------------------------------------------------------------------
 # Generated by the PHP build system
 # ------------------------------------------------------------------------------
@@ -38,15 +41,9 @@
 # Standard object files generated during build process
 *.o
 
-# Generated by `./buildconf` or `phpize`
-aclocal.m4
-
-# Cache directories generated by Autoconf tools - autoconf, autoreconf...
+# Cache directories created by Autoconf tools
 autom4te.cache/
 
-# Stamp file generated by `./buildconf` to run `./build/buildcheck.sh`
-/buildmk.stamp
-
 # Cache file(s) generated by Autoconf's configure when run as `configure -C`
 config.cache
 
@@ -66,9 +63,6 @@ configure
 confdefs.h
 conftest*
 
-# Generated by `./buildconf` script as a helper for further build/build2.mk file
-/generated_lists
-
 # Generated by configure scripts on all systems
 /main/internal_functions.c
 /main/internal_functions_cli.c
@@ -81,9 +75,6 @@ Makefile
 Makefile.fragments
 Makefile.objects
 
-# RPM specification file generated by `./configure`
-/php7.spec
-
 # Directories for shared object files and headers generated by `./configure`
 include/
 libs/
@@ -108,7 +99,6 @@ config.h.in
 /main/build-defs.h
 /main/php_config.h.in
 /main/php_config.h
-/TSRM/tsrm_config.h
 /Zend/zend_config.h
 
 # ------------------------------------------------------------------------------
@@ -180,13 +170,8 @@ php
 # ------------------------------------------------------------------------------
 # Extensions files additionally generated by `cd ext/name && phpize && ./configure`
 # ------------------------------------------------------------------------------
-/ext/*/acinclude.m4
 /ext/*/build/
-/ext/*/config.guess
-/ext/*/config.sub
 /ext/*/configure.ac
-/ext/*/ltmain.sh
-/ext/*/Makefile.global
 /ext/*/run-tests.php
 
 # ------------------------------------------------------------------------------
@@ -223,7 +208,7 @@ php
 /win32/*.positions
 /win32/*.suo
 /win32/ext
-/win32/phpts.def
+/win32/syslog.reg
 /win32/wsyslog.h
 
 # Standard object files generated by Visual Studio
@@ -243,7 +228,6 @@ php
 
 # Generated by some test cases
 **/tests/**/*.db
-**/tests/**/*.tmp
 
 # Microsoft Access database created for passing to tests
 /ext/pdo_odbc/tests/*.mdb
@@ -265,7 +249,8 @@ tmp-php.ini
 # ------------------------------------------------------------------------------
 *.gcda
 *.gcno
-/lcov_data/
+/gcovr.xml
+/gcovr_html/
 /lcov_html/
 /php_lcov.info
 

.travis.yml

@@ -10,19 +10,30 @@ 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
-      - librecode-dev
       - libsasl2-dev
-      - libxpm-dev
-      - libzip-dev
       - libsqlite3-dev
+      - libsodium-dev
+      - libtidy-dev
       - libwebp-dev
-      - libonig-dev
+      - libxml2-dev
+      - libxpm-dev
+      - libxslt1-dev
+      - libzip-dev
 
 
 services:
@@ -52,10 +63,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_MAINTAINER_ZTS=0 ENABLE_DEBUG=0
-      - ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1
+
+jobs:
+    include:
+        - env: ENABLE_MAINTAINER_ZTS=0 ENABLE_DEBUG=0
+          arch: amd64
+        - env: ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1
+          arch: amd64
+        - env: ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 ARM64=1
+          arch: arm64
 
 before_script:
     - ccache --version
@@ -64,17 +82,17 @@ before_script:
     # Enable IPv6
     - sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
     # Compile PHP
-    - ./travis/compile.sh
+    - 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 `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d opcache.protect_memory=1 -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
+    # 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 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:
     - ccache --show-stats