PHP-155: Support for PHP v7.1.x

* Updating Windows build for PHP v7.1.x
* Fixing a default casting issue for features when using PHP 7.1
* Adding PHP v7.1.7 to AppVeyor matrix and re-ordering build
* Adding PHP 7.1 to TravisCI
* Updating PHP maximum supported version

Author: mikefero

.travis.yml

@@ -12,6 +12,7 @@ cache:
 php:
   - 5.6
   - 7.0
+  - 7.1
 
 env:
   global:
@@ -23,7 +24,7 @@ env:
     # Indicate the cached dependencies directory
     - CACHED_DEPENDENCIES_DIRECTORY=${HOME}/dependencies
     # Add libuv source build for container based TravisCI
-    - LIBUV_VERSION=1.11.0
+    - LIBUV_VERSION=1.13.1
     - LIBUV_ROOT_DIR=${CACHED_DEPENDENCIES_DIRECTORY}/libuv/${LIBUV_VERSION}
     - PHP_DRIVER_BUILD_DIRECTORY=/tmp/php-driver/build
     - CPP_DRIVER_SOURCE_DIRECTORY=${TRAVIS_BUILD_DIR}/lib/cpp-driver

Rakefile

@@ -152,7 +152,7 @@ end
   <required>
    <php>
     <min>5.6.0</min>
-    <max>7.0.99</max>
+    <max>7.1.99</max>
    </php>
    <pearinstaller>
     <min>1.4.8</min>

appveyor.yml

@@ -32,8 +32,7 @@ configuration:
 #  - Debug
   - Release
 environment:
-  LIBUV_VERSION: 1.11.0
-  OPENSSL_VERSION: 1.0.2k
+  LIBUV_VERSION: 1.13.1
   CPP_DRIVER_DEPENDENCIES_DOWNLOAD_URL_PREFIX: https://raw.githubusercontent.com/mikefero/cpp-driver-msvc-libs/master
   PHP_BINARY_TOOLS_ARCHIVE: php-sdk-binary-tools-20110915.zip
   PHP_BINARY_TOOLS_DIR: C:/projects
@@ -44,30 +43,42 @@ environment:
   COMPOSER_CACHE_DIR: C:/projects/dependencies/composer
   CONFIGURATION_COMPLETE: False
   matrix:
+    - PHP: 5.6
+      PHP_VERSION: 5.6.31
+      THREAD_SAFE: True
+      CMAKE_GENERATOR: Visual Studio 11 2012
+      VISUAL_STUDIO_INTERNAL_VERSION: 110
+      VISUAL_STUDIO_SHORTHAND_VERSION: 11
+    - PHP: 5.6
+      PHP_VERSION: 5.6.31
+      THREAD_SAFE: False
+      CMAKE_GENERATOR: Visual Studio 11 2012
+      VISUAL_STUDIO_INTERNAL_VERSION: 110
+      VISUAL_STUDIO_SHORTHAND_VERSION: 11
     - PHP: 7.0
-      PHP_VERSION: 7.0.19
+      PHP_VERSION: 7.0.21
       THREAD_SAFE: True
       CMAKE_GENERATOR: Visual Studio 14 2015
       VISUAL_STUDIO_INTERNAL_VERSION: 140
       VISUAL_STUDIO_SHORTHAND_VERSION: 14
     - PHP: 7.0
-      PHP_VERSION: 7.0.19
+      PHP_VERSION: 7.0.21
       THREAD_SAFE: False
       CMAKE_GENERATOR: Visual Studio 14 2015
       VISUAL_STUDIO_INTERNAL_VERSION: 140
       VISUAL_STUDIO_SHORTHAND_VERSION: 14
-    - PHP: 5.6
-      PHP_VERSION: 5.6.30
+    - PHP: 7.1
+      PHP_VERSION: 7.1.7
       THREAD_SAFE: True
-      CMAKE_GENERATOR: Visual Studio 11 2012
-      VISUAL_STUDIO_INTERNAL_VERSION: 110
-      VISUAL_STUDIO_SHORTHAND_VERSION: 11
-    - PHP: 5.6
-      PHP_VERSION: 5.6.30
+      CMAKE_GENERATOR: Visual Studio 14 2015
+      VISUAL_STUDIO_INTERNAL_VERSION: 140
+      VISUAL_STUDIO_SHORTHAND_VERSION: 14
+    - PHP: 7.1
+      PHP_VERSION: 7.1.7
       THREAD_SAFE: False
-      CMAKE_GENERATOR: Visual Studio 11 2012
-      VISUAL_STUDIO_INTERNAL_VERSION: 110
-      VISUAL_STUDIO_SHORTHAND_VERSION: 11
+      CMAKE_GENERATOR: Visual Studio 14 2015
+      VISUAL_STUDIO_INTERNAL_VERSION: 140
+      VISUAL_STUDIO_SHORTHAND_VERSION: 14
 
 init:
   - ps: |
@@ -100,6 +111,13 @@ init:
         $env:ENABLE_DEBUG="--enable-debug"
       }
 
+      # Determine if OpenSSL extension should have default linking enabled
+      If ($env:PHP -Match "5.6") {
+        $env:WITH_OPENSSL_DEFAULT_SHARED="--with-openssl"
+      } Else {
+        $env:WITH_OPENSSL_DEFAULT_SHARED="--with-openssl=shared"
+      }
+
       # Assign common use environment variables
       $env:LIB_ARCHITECTURE="lib$($env:ARCHITECTURE)"
       $env:WINDOWS_ARCHITECTURE="win$($env:ARCHITECTURE)"
@@ -108,6 +126,7 @@ init:
       # Generate the PHP environment variable
       $env:PHP_DEPENDENCIES_ARCHIVE="deps-$($env:PHP)-vc$($env:VISUAL_STUDIO_SHORTHAND_VERSION)-$($env:PLATFORM).7z"
       $env:PHP_ARCHIVE="php-$($env:PHP_VERSION).zip"
+      $env:PHP_DEPENDENCIES_DIR="$($env:PHP_SDK_LOCATION_PREFIX)/deps"
 
       # Generate the environment for the dependencies root directory
       $env:DEPENDENCIES_LOCATION="$($env:DEPENDENCIES_LOCATION_PREFIX)/$($env:Platform)/$($env:VISUAL_STUDIO_INTERNAL_VERSION)"
@@ -116,9 +135,9 @@ init:
       $env:LIBUV_ARCHIVE="libuv-$($env:LIBUV_VERSION)-$($env:WINDOWS_ARCHITECTURE)-msvc$($env:VISUAL_STUDIO_INTERNAL_VERSION).zip"
       $env:LIBUV_ROOT_DIR="$($env:DEPENDENCIES_LOCATION)/libuv-$($env:LIBUV_VERSION)"
 
-      # Generate the OpenSSL environment variables
-      $env:OPENSSL_ARCHIVE="openssl-$($env:OPENSSL_VERSION)-$($env:WINDOWS_ARCHITECTURE)-msvc$($env:VISUAL_STUDIO_INTERNAL_VERSION).zip"
-      $env:OPENSSL_ROOT_DIR="$($env:DEPENDENCIES_LOCATION)/openssl-$($env:OPENSSL_VERSION)"
+      # Generate the OpenSSL and zlib environment variables
+      $env:OPENSSL_ROOT_DIR="$($env:PHP_DEPENDENCIES_DIR)"
+      $env:ZLIB_ROOT_DIR="$($env:PHP_DEPENDENCIES_DIR)"
 
       # Generate the archive name for the driver artifact
       $env:DRIVER_ARTIFACT_ARCHIVE="cassandra-php-driver-ci-artifact-$($env:APPVEYOR_BUILD_VERSION)-$($env:PHP)-$($env:TS_OR_NTS)-vc$($env:VISUAL_STUDIO_SHORTHAND_VERSION)-$($env:PLATFORM).zip"
@@ -164,34 +183,17 @@ install:
         Remove-Item $env:LIBUV_ARCHIVE
       }
 
-      # Determine if OpenSSL should be installed (cached)
-      If (!(Test-Path -Path "openssl-$($env:OPENSSL_VERSION)")) {
-        # Download and extract the dependency
-        Start-FileDownload "$($env:CPP_DRIVER_DEPENDENCIES_DOWNLOAD_URL_PREFIX)/openssl/$($env:OPENSSL_VERSION)/$($env:OPENSSL_ARCHIVE)" -FileName $env:OPENSSL_ARCHIVE
-        7z -o"openssl-$($env:OPENSSL_VERSION)" x $env:OPENSSL_ARCHIVE
-
-        # Only keep the static libaries
-        Move-Item "openssl-$($env:OPENSSL_VERSION)/static/lib" "openssl-$($env:OPENSSL_VERSION)/lib"
-        Remove-Item "openssl-$($env:OPENSSL_VERSION)/static" -Force -Recurse
-        Remove-Item "openssl-$($env:OPENSSL_VERSION)/shared" -Force -Recurse
-
-        # Delete the binary archive
-        Remove-Item $env:OPENSSL_ARCHIVE
-      }
-
       # Remove pre-installed OpenSSL (resolve conflicts)
       Remove-Item "C:/OpenSSL-*" -Force -Recurse
 
       # Setup the build tree for PHP (Update the PATH for the binary tools)
       New-Item -ItemType Directory -Force -Path "$($env:PHP_SDK_LOCATION_PREFIX)"
       7z -o"$($env:PHP_SDK_LOCATION_PREFIX)" x "$($env:DEPENDENCIES_LOCATION_PREFIX)/$($env:PHP_BINARY_TOOLS_ARCHIVE)"
       7z -o"$($env:PHP_SDK_LOCATION_PREFIX)" x "$($env:DEPENDENCIES_LOCATION_PREFIX)/$($env:PHP_ARCHIVE)"
-      7z -o"$($env:PHP_SDK_LOCATION_PREFIX)" x $env:PHP_DEPENDENCIES_ARCHIVE
+      7z -o"$($env:PHP_SDK_LOCATION_PREFIX)" x "$($env:PHP_DEPENDENCIES_ARCHIVE)"
       $env:PHP_SOURCE_DIR="$($env:PHP_SDK_LOCATION_PREFIX)/php-src-php-$($env:PHP_VERSION)"
-      $env:PHP_DEPENDENCIES_DIR="$($env:PHP_SDK_LOCATION_PREFIX)/deps"
       $env:PATH+=";$($env:PHP_SDK_LOCATION_PREFIX)/bin"
       Copy-Item "libuv-$($env:LIBUV_VERSION)/*" "$($env:PHP_DEPENDENCIES_DIR)" -Force -Recurse
-      Copy-Item "openssl-$($env:OPENSSL_VERSION)/*" "$($env:PHP_DEPENDENCIES_DIR)" -Force -Recurse
 
       # Move back to original directory
       Pop-Location
@@ -216,7 +218,7 @@ before_build:
         Push-Location build
 
         # Configure the build via CMake
-        cmake -G "$($env:CMAKE_GENERATOR)$($env:CMAKE_GENERATOR_SUFFIX)" -DCMAKE_INSTALL_PREFIX="$($env:DEPENDENCIES_LOCATION)/$($env:CPP_DRIVER_VERSION)/$($env:CPP_DRIVER_VERSION_SHA)" -DCASS_MULTICORE_COMPILATION=ON -DCMAKE_BUILD_TYPE=$env:CONFIGURATION -DCASS_BUILD_STATIC=ON -DCASS_USE_STATIC_LIBS=ON ..
+        cmake -G "$($env:CMAKE_GENERATOR)$($env:CMAKE_GENERATOR_SUFFIX)" -DCMAKE_INSTALL_PREFIX="$($env:DEPENDENCIES_LOCATION)/$($env:CPP_DRIVER_VERSION)/$($env:CPP_DRIVER_VERSION_SHA)" -DCASS_MULTICORE_COMPILATION=ON -DCMAKE_BUILD_TYPE=$env:CONFIGURATION -DCASS_BUILD_STATIC=On -DCASS_USE_STATIC_LIBS=On -DCASS_USE_ZLIB=On ..
 
         # Move back to C/C++ directory
         Pop-Location
@@ -235,7 +237,7 @@ before_build:
       Push-Location "$($env:PHP_SOURCE_DIR)"
   # Configure PHP and the PHP driver extension
   - cmd: buildconf.bat --force --add-modules-dir="%APPVEYOR_BUILD_FOLDER%"
-  - cmd: configure.bat --with-prefix="%APPVEYOR_BUILD_FOLDER%\%CONFIGURATION%" --disable-all --enable-cli --enable-com-dotnet --enable-session --enable-zlib --with-gmp --with-openssl=static --enable-cassandra=shared --enable-phar --enable-json --enable-filter --enable-hash --enable-ctype --enable-mbstring --enable-mbregex --enable-mbregex-backtrack --enable-tokenizer --enable-zip --with-libxml --with-dom --with-iconv %ENABLE_DISABLE_THREAD_SAFETY% %ENABLE_DEBUG%
+  - cmd: configure.bat --with-prefix="%APPVEYOR_BUILD_FOLDER%\%CONFIGURATION%" --disable-all --enable-cli --enable-com-dotnet --enable-session --enable-zlib --with-gmp %WITH_OPENSSL_DEFAULT_SHARED% --enable-cassandra=shared --enable-phar --enable-json --enable-filter --enable-hash --enable-ctype --enable-mbstring --enable-mbregex --enable-mbregex-backtrack --enable-tokenizer --enable-zip --with-libxml --with-dom --with-iconv %ENABLE_DISABLE_THREAD_SAFETY% %ENABLE_DEBUG%
   - ps: $env:CONFIGURATION_COMPLETE=$TRUE
 
 build_script:
@@ -249,18 +251,21 @@ build_script:
       # Move back to working directory
       Pop-Location
 
+      # Copy OpenSSL libraries for artifact and test execution
+      Copy-Item "$($env:PHP_DEPENDENCIES_DIR)/bin/libeay32.dll" "$($env:CONFIGURATION)" -Force -Recurse
+      Copy-Item "$($env:PHP_DEPENDENCIES_DIR)/bin/ssleay32.dll" "$($env:CONFIGURATION)" -Force -Recurse
+
       # Configure PHP to use the PHP driver extension
-      If (Test-Path -Path $env:CONFIGURATION/ext) {
-        Add-Content "$($env:CONFIGURATION)/php.ini" "extension=ext\php_cassandra.dll"
-      } Else {
-        Add-Content "$($env:CONFIGURATION)/php.ini" "extension=.\php_cassandra.dll"
+      Add-Content "$($env:CONFIGURATION)/php.ini" "extension=ext\php_cassandra.dll"
+      If ($env:PHP -NotMatch "5.6") {
+        Add-Content "$($env:CONFIGURATION)/php.ini" "extension=ext\php_openssl.dll"
       }
 
 after_build:
   - ps: |
-      # Create the artifact structure for the driver
+      # Create the artifact structure for the driver (Copy OpenSSL libraries)
       New-Item -ItemType Directory -Force -Path $env:TEMP/php-driver-artifact
-      Copy-Item $env:CONFIGURATION/php*.* $env:TEMP/php-driver-artifact
+      Copy-Item $env:CONFIGURATION/*.* $env:TEMP/php-driver-artifact
       If (Test-Path -Path $env:CONFIGURATION/ext) {
         Copy-Item $env:CONFIGURATION/ext $env:TEMP/php-driver-artifact -Recurse
       }

behat.yml

@@ -7,37 +7,48 @@ default:
               tags: "~@cassandra-version-less-2.1&&~@cassandra-version-only-2.0&&~@broken"
             contexts:
                 - FeatureContext:
-                    cassandra_version: "3.10"
+                    cassandra_version: 3.11.0
+
+cassandra-version-3.0:
+    formatters:
+        pretty: true
+    suites:
+        default:
+            filters:
+              tags: "~@cassandra-version-3.x&&~@cassandra-version-3.10&&~@cassandra-version-less-2.1&&~@cassandra-version-only-2.0&&~@broken"
+            contexts:
+                - FeatureContext:
+                    cassandra_version: 3.0.14
 
 cassandra-version-2.2:
     formatters:
         pretty: true
     suites:
         default:
             filters:
-              tags: "~@cassandra-version-3.0&&~@cassandra-version-less-2.1&&~@cassandra-version-only-2.0&&~@broken"
+              tags: "~@cassandra-version-3.x&&~@cassandra-version-3.10&&~@cassandra-version-3.0&&~@cassandra-version-less-2.1&&~@cassandra-version-only-2.0&&~@broken"
             contexts:
                 - FeatureContext:
-                    cassandra_version: 2.2.7
+                    cassandra_version: 2.2.10
 
 cassandra-version-2.1:
     formatters:
         pretty: true
     suites:
         default:
             filters:
-              tags: "~@cassandra-version-3.0&&~@cassandra-version-2.2&&~@cassandra-version-less-2.1&&~@cassandra-version-only-2.0&&~@broken"
+              tags: "~@cassandra-version-3.x&&~@cassandra-version-3.10&&~@cassandra-version-3.0&&~@cassandra-version-2.2&&~@cassandra-version-less-2.1&&~@cassandra-version-only-2.0&&~@broken"
             contexts:
                 - FeatureContext:
-                    cassandra_version: 2.1.15
+                    cassandra_version: 2.1.18
 
 cassandra-version-2.0:
     formatters:
         pretty: true
     suites:
         default:
             filters:
-              tags: "~@cassandra-version-3.0&&~@cassandra-version-2.2&&~@cassandra-version-2.1&&~@broken"
+              tags: "~@cassandra-version-3.x&&~@cassandra-version-3.10&&~@cassandra-version-3.0&&~@cassandra-version-2.2&&~@cassandra-version-2.1&&~@broken"
             contexts:
                 - FeatureContext:
                     cassandra_version: 2.0.17
@@ -48,7 +59,7 @@ cassandra-version-1.2:
     suites:
         default:
             filters:
-              tags: "~@cassandra-version-3.0&&~@cassandra-version-2.2&&~@cassandra-version-2.0&&~@cassandra-version-2.1&&~@cassandra-version-only-2.0&&~broken"
+              tags: "~@cassandra-version-3.x&&~@cassandra-version-3.10&&~@cassandra-version-3.0&&~@cassandra-version-2.2&&~@cassandra-version-2.0&&~@cassandra-version-2.1&&~@cassandra-version-only-2.0&&~broken"
             contexts:
                 - FeatureContext:
                     cassandra_version: 1.2.19

ext/package.xml

@@ -14,29 +14,19 @@ protocol and Cassandra Query Language v3.
     <email>michael.penick@datastax.com</email>
     <active>yes</active>
   </lead>
-  <date>2017-05-15</date>
-  <time>16:28:29</time>
+  <date>2017-08-04</date>
+  <time>07:48:59</time>
   <version>
-    <release>1.3.1</release>
-    <api>1.3.1</api>
+    <release>1.3.2-dev</release>
+    <api>1.3.2-dev</api>
   </version>
   <stability>
-    <release>stable</release>
-    <api>stable</api>
+    <release>devel</release>
+    <api>devel</api>
   </stability>
   <license uri="http://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</license>
   <notes>
-# 1.3.1
-
-Bug Fixes:
-
-* [PHP-170] Duration nanos should support a signed 64-bit range
-
-Documentation:
-
-* [PHP-184] Remove {@inheritDoc} from method parameters
-* [PHP-183] Remove references to SimpleStatement and ExecutionOptions from docs,
-  features, and most tests
+# Official release under development
   </notes>
   <contents>
     <dir name="/">
@@ -308,7 +298,7 @@ Documentation:
   <required>
    <php>
     <min>5.6.0</min>
-    <max>7.0.99</max>
+    <max>7.1.99</max>
    </php>
    <pearinstaller>
     <min>1.4.8</min>