Invalid integer constant expression error in php.h

.appveyor.yml

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

.gitignore

@@ -56,7 +56,6 @@ config.cache
 config.h.in
 config.log
 config.nice
-config.nice.bat
 config.status
 config.sub
 config_vars.mk
@@ -174,6 +173,7 @@ tests/*/*/*.sh
 
 # Extension specifc ignores
 ext/*/configure.in
+ext/*/configure.ac
 ext/*/ltmain.sh
 ext/*/libs.mk
 ext/*/build
@@ -214,6 +214,7 @@ ext/mssql/Makefile.global
 ext/mssql/acinclude.m4
 ext/mssql/config.sub
 ext/mssql/configure.in
+ext/mssql/configure.ac
 ext/mssql/ltmain.sh
 ext/mysql/weztest.sqlite
 ext/oci8/tests/*.tmp
@@ -285,3 +286,4 @@ win32/*.positions
 win32/ext
 win32/phpts.def
 win32/wsyslog.h
+config.*.bat

.travis.yml

@@ -8,7 +8,6 @@ addons:
       - re2c
       - libgmp-dev
       - libicu-dev
-      - libmcrypt-dev
       - libtidy-dev
       - libenchant-dev
       - libaspell-dev
@@ -29,8 +28,9 @@ notifications:
       on_success: change
       on_failure: always
 
-cache: 
-    - apt
+cache:
+    apt: true
+    ccache: true
 
 env:
     global:
@@ -46,9 +46,12 @@ env:
       - ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1
 
 before_script:
+    - ccache --version
+    - ccache --zero-stats
+    - export USE_CCACHE=1
     # Compile PHP
     - ./travis/compile.sh
-    # Setup Extensions 
+    # Setup Extensions
     - . ./travis/ext/mysql/setup.sh
     - . ./travis/ext/mysqli/setup.sh
     - . ./travis/ext/pdo_mysql/setup.sh
@@ -58,3 +61,6 @@ before_script:
 # Run PHPs run-tests.php 
 script:
     - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 1 ]; then echo "-d opcache.enable_cli=1 -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --set-timeout 120
+
+after_success:
+    - ccache --show-stats

CONTRIBUTING.md

@@ -11,15 +11,20 @@ co-ordination.
 PHP welcomes pull requests to [add tests](#writing-tests), fix bugs and to
 implement RFCs. Please be sure to include tests as appropriate!
 
-If you are fixing a bug, then please submit your PR against the lowest branch
-of PHP that the bug affects, or the oldest fully supported version (the first
-green branch on
-[the supported version page](http://php.net/supported-versions.php). For
-example, at the time of writing in mid-2015, this is PHP 5.5, which corresponds
-to the `PHP-5.5` 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 to implement RFCs should be submitted against `master`.
+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](http://php.net/supported-versions.php) are supported).
+For example, at the time of writing in mid-2017, the lowest supported version is
+PHP 7.0, which corresponds to the `PHP-7.0` 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`.
+
+Pull requests should *never* be submitted against `PHP-x.y.z` branches, as
+these are only used for release management.
+
+If your pull request exhibits conflicts with the base branch, please resolve them
+by using `git rebase` instead of `git merge`.
 
 ## Filing bugs
 

EXTENSIONS

@@ -262,6 +262,12 @@ PRIMARY MAINTAINER:  Derick Rethans <derick@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
+EXTENSION:           enchant
+PRIMARY MAINTAINER:  Unknown
+MAINTENANCE:         Maintained
+STATUS:              Working
+SINCE:               5.3
+-------------------------------------------------------------------------------
 EXTENSION:           exif
 PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>
 MAINTENANCE:         Maintained
@@ -281,7 +287,7 @@ STATUS:              Working
 SINCE:               5.2
 -------------------------------------------------------------------------------
 EXTENSION:           ftp
-PRIMARY MAINTAINER:  Stefan Esser <sesser@php.net>
+PRIMARY MAINTAINER:  Unknown
 MAINTENANCE:         Odd fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -338,11 +344,6 @@ PRIMARY MAINTAINER:  Rui Hirokawa <hirokawa@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           mcrypt
-PRIMARY MAINTAINER:  Derick Rethans <derick@derickrethans.nl>
-MAINTENANCE:         Maintained
-STATUS:              Working
--------------------------------------------------------------------------------
 EXTENSION:           opcache
 PRIMARY MAINTAINER:  Dmitry Stogov <dmitry@zend.com>, Xinchen Hui <laruence@php.net>
 MAINTENANCE:         Maintained