PHPC-1880: Drop support for PHP 7.1 (#1273)

* PHPC-1880: Drop support for PHP 7.1

* Bump PHP versions in AppVeyor config

* PHPC-1880: Update Evergreen config for PHP 7.2+ and MongoDB 5.0

Bump edge-versions:latest-stable to MongoDB 5.0. Drops PHP 7.1 and adds PHP 8.0 to php-versions and newly created php-edge-versions axis.

Use oldest-supported or latest-stable PHP version for matrices other than test-php-versions.

Make variant display names consistent to help detect duplicates.

Remove WiredTiger from mongo-42-storage-engines since it's tested in most other variants by default.

* Revise "cursor not found" error message assertions for latest server version

* Temporarily remove 1.19.x from libmongoc-version axis

Author: jmikola

.appveyor.yml

@@ -15,30 +15,30 @@ environment:
   CONFIGURE_OPTS: --enable-mongodb --with-mongodb-sasl=yes --with-mongodb-client-side-encryption=yes
 
   matrix:
-    - PHP_VER: 8.0.7
+    - PHP_VER: 8.0.12
       TS: 1
       CRT: vs16
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-    - PHP_VER: 8.0.7
+    - PHP_VER: 8.0.12
       TS: 0
       CRT: vs16
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-    - PHP_VER: 7.4.20
+    - PHP_VER: 7.4.25
       TS: 1
       CRT: vc15
-    - PHP_VER: 7.4.20
+    - PHP_VER: 7.4.25
       TS: 0
       CRT: vc15
-    - PHP_VER: 7.3.28
+    - PHP_VER: 7.3.32
       TS: 1
       CRT: vc15
-    - PHP_VER: 7.3.28
+    - PHP_VER: 7.3.32
       TS: 0
       CRT: vc15
-    - PHP_VER: 7.2.29
+    - PHP_VER: 7.2.34
       TS: 1
       CRT: vc15
-    - PHP_VER: 7.2.29
+    - PHP_VER: 7.2.34
       TS: 0
       CRT: vc15
 

.evergreen/config.yml

@@ -1071,9 +1071,8 @@ axes:
   - id: edge-versions
     display_name: MongoDB Version
     values:
-      # TODO: Exclude rhel74-zseries and rhel71-power8 in tests-php7 once latest-stable is bumped from 4.4 to 5.0
       - id: "latest-stable"
-        display_name: "MongoDB 4.4"
+        display_name: "MongoDB 5.0"
         variables:
           VERSION: "4.4"
       - id: "oldest-supported"
@@ -1084,6 +1083,10 @@ axes:
   - id: php-versions
     display_name: PHP Version
     values:
+      - id: "8.0"
+        display_name: "PHP 8.0"
+        variables:
+          PHP_VERSION: "8.0"
       - id: "7.4"
         display_name: "PHP 7.4"
         variables:
@@ -1096,12 +1099,20 @@ axes:
         display_name: "PHP 7.2"
         variables:
           PHP_VERSION: "7.2"
-      - id: "7.1"
-        display_name: "PHP 7.1"
+
+  - id: php-edge-versions
+    display_name: PHP Version
+    values:
+      - id: "latest-stable"
+        display_name: "PHP 8.0"
         variables:
-          PHP_VERSION: "7.1"
+          PHP_VERSION: "8.0"
+      - id: "oldest-supported"
+        display_name: "PHP 7.2"
+        variables:
+          PHP_VERSION: "7.2"
 
-  - id: os-php7
+  - id: os
     display_name: OS
     values:
       - id: debian92-test
@@ -1143,123 +1154,131 @@ axes:
   - id: libmongoc-version
     display_name: libmongoc version
     values:
-      - id: "lowest-supported"
-        display_name: "Lowest (1.19.1)"
-        variables:
-          LIBMONGOC_VERSION: "1.19.1"
-      - id: "upcoming-stable"
-        display_name: "latest (1.19-dev)"
-        variables:
-          LIBMONGOC_VERSION: "r1.19"
+      # TODO: enable lowest-supported and upcoming-stable after 1.20.0 is
+      # released and r1.20 is branched. As-is, r1.19 cannot be compiled because
+      # PHP_MONGODB_MONGOC_SOURCES conflicts with 1.20-dev (see: PHPC-2006).
+      #- id: "lowest-supported"
+      #  display_name: "1.19.1"
+      #  variables:
+      #    LIBMONGOC_VERSION: "1.19.1"
+      #- id: "upcoming-stable"
+      #  display_name: "1.19-dev"
+      #  variables:
+      #    LIBMONGOC_VERSION: "r1.19"
       - id: "latest-dev"
-        display_name: "Upcoming release (1.20)"
+        display_name: "1.20-dev (master)"
         variables:
           LIBMONGOC_VERSION: "master"
 
 
 buildvariants:
 
-- matrix_name: "tests-php7"
-  matrix_spec: {"os-php7": "*", "edge-versions": "latest-stable", "php-versions": ["7.1","7.2","7.3"] }
+# Tests all PHP versions on all operating systems and latest MongoDB version
+- matrix_name: "test-php-versions"
+  matrix_spec: { "os": "*", "edge-versions": "latest-stable", "php-versions": "*" }
   exclude_spec:
-    # TODO: Exclude rhel74-zseries and rhel71-power8 once latest-stable is bumped from 4.4 to 5.0
-    - {"os-php7": "ubuntu1804-arm64-test", "edge-versions": "latest-stable", "php-versions": ["7.1","7.2"]}
-  display_name: "All: ${edge-versions}/${php-versions} — ${os-php7}"
+    - { "os": "ubuntu1804-arm64-test", "edge-versions": "latest-stable", "php-versions": "7.2" }
+    # MongoDB 5.0+ is not available for rhel74-zseries and rhel71-power8
+    - { "os": "rhel74-zseries", "edge-versions": "latest-stable", "php-versions": "*" }
+    - { "os": "rhel71-power8", "edge-versions": "latest-stable", "php-versions": "*" }
+  display_name: "${os}, ${edge-versions}, ${php-versions}"
   tasks:
-     - name: "test-standalone-ssl"
-     - name: "test-replicaset-auth"
-
+    - name: "test-standalone-ssl"
+    - name: "test-replicaset-auth"
 
-- matrix_name: "mongo-30-php7"
-  matrix_spec: {"os-php7": "*", "versions": ["3.0", "3.2", "3.4"], "php-versions": "7.3" }
+# Tests pre-3.6 MongoDB versions with oldest supported PHP version
+- matrix_name: "test-old-mongodb-versions"
+  matrix_spec: { "os": "*", "versions": ["3.0", "3.2", "3.4"], "php-edge-versions": "oldest-supported" }
   exclude_spec:
-    - {"os-php7": "ubuntu1804-arm64-test", "versions": ["3.0", "3.2", "3.4"], "php-versions": "7.3"}
-    - {"os-php7": "rhel71-power8", "versions": "3.0", "php-versions": "7.3"}
-    - {"os-php7": "rhel74-zseries", "versions": ["3.0", "3.2"], "php-versions": "7.3"}
-  display_name: "${versions}/${php-versions} — ${os-php7}"
+    - { "os": "ubuntu1804-arm64-test", "versions": "*", "php-edge-versions": "oldest-supported" }
+    - { "os": "rhel71-power8", "versions": "3.0", "php-edge-versions": "oldest-supported" }
+    - { "os": "rhel74-zseries", "versions": ["3.0", "3.2"], "php-edge-versions": "oldest-supported" }
+  display_name: "${os}, ${versions}, ${php-edge-versions}"
   tasks:
-     - name: "test-standalone-old"
-     - name: "test-replicaset-old"
-
+    - name: "test-standalone-old"
+    - name: "test-replicaset-old"
 
-- matrix_name: "mongo-36-php7"
-  matrix_spec: {"os-php7": "*", "versions": ["3.6"], "php-versions": "7.3" }
+# Tests MongoDB 3.6 with oldest supported PHP version
+- matrix_name: "test-mongodb-36"
+  matrix_spec: { "os": "*", "versions": ["3.6"], "php-edge-versions": "oldest-supported" }
   exclude_spec:
-    - {"os-php7": "ubuntu1804-arm64-test", "versions": "3.6", "php-versions": "7.3"}
-  display_name: "${versions}/${php-versions} — ${os-php7}"
+    - { "os": "ubuntu1804-arm64-test", "versions": "*", "php-edge-versions": "oldest-supported" }
+  display_name: "${os}, ${versions}, ${php-edge-versions}"
   tasks:
-     - name: "test-standalone"
-     - name: "test-replicaset"
-     - name: "test-replicaset-auth"
-
+    - name: "test-standalone"
+    - name: "test-replicaset"
+    - name: "test-replicaset-auth"
 
-- matrix_name: "mongo-php7"
-  matrix_spec: {"os-php7": "*", "versions": ["4.0", "4.2", "4.4", "5.0", "latest"], "php-versions": "7.3" }
+# Tests 4.0+ MongoDB versions with oldest supported PHP version
+- matrix_name: "test-mongodb-versions"
+  matrix_spec: { "os": "*", "versions": ["4.0", "4.2", "4.4", "5.0", "latest"], "php-edge-versions": "oldest-supported" }
   exclude_spec:
-    - {"os-php7": "rhel71-power8", "versions": ["5.0", "latest"], "php-versions": "7.3"}
-    - {"os-php7": "rhel74-zseries", "versions": ["4.0", "4.2", "4.4", "5.0", "latest"], "php-versions": "7.3"}
-    - {"os-php7": "ubuntu1804-arm64-test", "versions": "4.0", "php-versions": "7.3"}
-  display_name: "${versions}/${php-versions} — ${os-php7}"
+    - { "os": "ubuntu1804-arm64-test", "versions": "4.0", "php-edge-versions": "oldest-supported" }
+    - { "os": "rhel71-power8", "versions": ["5.0", "latest"], "php-edge-versions": "oldest-supported" }
+    # rhel74-zseries will be covered by test-mongodb-versions-nossl
+    - { "os": "rhel74-zseries", "versions": "*", "php-edge-versions": "oldest-supported" }
+    # Avoid duplicate build variants from test-php-versions (assumes edge-versions:latest-stable is 5.0)
+    - { "os": "*", "versions": "5.0", "php-edge-versions": "oldest-supported" }
+  display_name: "${os}, ${versions}, ${php-edge-versions}"
   tasks:
-     - name: "test-standalone"
-     - name: "test-standalone-auth"
-     - name: "test-standalone-ssl"
-     - name: "test-replicaset"
-     - name: "test-replicaset-auth"
-     - name: "test-sharded"
-
-- matrix_name: "mongo-php7-nossl"
-  matrix_spec: {"os-php7": "rhel74-zseries", "versions": ["4.2", "4.4", "5.0", "latest"], "php-versions": "7.3"}
-  exclude_spec:
-    - {"os-php7": "rhel74-zseries", "versions": ["5.0", "latest"], "php-versions": "7.3"}
-  display_name: "${versions}/${php-versions} — ${os-php7}"
+    - name: "test-standalone"
+    - name: "test-standalone-auth"
+    - name: "test-standalone-ssl"
+    - name: "test-replicaset"
+    - name: "test-replicaset-auth"
+    - name: "test-sharded"
+
+# Tests MongoDB 4.2 and 4.4 on zSeries with oldest supported PHP version
+- matrix_name: "test-mongodb-versions-nossl"
+  matrix_spec: { "os": "rhel74-zseries", "versions": ["4.2", "4.4"], "php-edge-versions": "oldest-supported" }
+  display_name: "${os}, ${versions}, ${php-edge-versions}"
   tasks:
-     - name: "test-standalone"
-     - name: "test-standalone-auth"
-     - name: "test-replicaset"
-     - name: "test-replicaset-auth"
-     - name: "test-sharded"
+    - name: "test-standalone"
+    - name: "test-standalone-auth"
+    - name: "test-replicaset"
+    - name: "test-replicaset-auth"
+    - name: "test-sharded"
 
 - matrix_name: "mongo-42-storage-engines"
-  matrix_spec: {"os-php7": "debian92-test", "versions": "4.2", "php-versions": "7.3", "storage-engine": ["wiredtiger", "inmemory"]}
-  display_name: "${versions}/${php-versions}/${os-php7} — ${storage-engine}"
+  matrix_spec: { "os": "debian92-test", "versions": "4.2", "php-edge-versions": "latest-stable", "storage-engine": "inmemory" }
+  display_name: "${storage-engine}: ${os}, ${versions}, ${php-edge-versions}"
   tasks:
-     - name: "test-standalone"
+    - name: "test-standalone"
 
 - matrix_name: "mongo-40-storage-engines"
-  matrix_spec: {"os-php7": "debian92-test", "versions": "4.0", "php-versions": "7.3", "storage-engine": "mmapv1"}
-  display_name: "${versions}/${php-versions}/${os-php7} — ${storage-engine}"
+  matrix_spec: { "os": "debian92-test", "versions": "4.0", "php-edge-versions": "latest-stable", "storage-engine": "mmapv1" }
+  display_name: "${storage-engine}: ${os}, ${versions}, ${php-edge-versions}"
   tasks:
-     - name: "test-standalone"
+    - name: "test-standalone"
 
-- matrix_name: "libmongoc-versions-php7"
-  matrix_spec: {"os-php7": "debian92-test", "edge-versions": "latest-stable", "php-versions": "7.2", "libmongoc-version": "*"}
-  display_name: "${edge-versions}/${php-versions}/${os-php7} — libmongoc ${libmongoc-version}"
+- matrix_name: "libmongoc-versions"
+  matrix_spec: { "os": "debian92-test", "edge-versions": "latest-stable", "php-edge-versions": "latest-stable", "libmongoc-version": "*" }
+  display_name: "libmongoc ${libmongoc-version}: ${os}, ${edge-versions}, ${php-edge-versions}"
   tasks:
-     - name: "test-standalone"
-     - name: "test-replicaset"
-     - name: "test-sharded"
+    - name: "test-standalone"
+    - name: "test-replicaset"
+    - name: "test-sharded"
 
 - matrix_name: "atlas-connectivity-tests"
-  matrix_spec: { "os-php7": "debian92-test", "php-versions": "7.3" }
-  display_name: "Atlas Connectivity tests"
+  matrix_spec: { "os": "debian92-test", "php-edge-versions": "latest-stable" }
+  display_name: "Atlas Connectivity"
   tasks:
     - name: "test-atlas"
 
 - matrix_name: "test-ocsp"
-  matrix_spec: { "os-php7": "debian92-test", "versions": ["4.4", "5.0", "latest"], "php-versions": "7.3" }
+  matrix_spec: { "os": "debian92-test", "versions": ["4.4", "5.0", "latest"], "php-edge-versions": "latest-stable" }
   display_name: "OCSP tests - ${versions}"
   tasks:
     - name: ".ocsp"
 
 - matrix_name: "test-requireApiVersion"
-  matrix_spec: { "os-php7": "debian92-test", "versions": ["5.0", "latest"], "php-versions": "7.3" }
+  matrix_spec: { "os": "debian92-test", "versions": ["5.0", "latest"], "php-edge-versions": "latest-stable" }
   display_name: "Versioned API - ${versions}"
   tasks:
     - name: "test-requireApiVersion"
 
 - matrix_name: "test-loadBalanced"
-  matrix_spec: { "os-php7": "debian92-test", "versions": ["5.0", "latest"], "php-versions": "7.3" }
+  matrix_spec: { "os": "debian92-test", "versions": ["5.0", "latest"], "php-edge-versions": "latest-stable" }
   display_name: "Load balanced - ${versions}"
   tasks:
     - name: "test-loadBalanced"

bin/package.xml.in

@@ -58,7 +58,7 @@ necessary to build a fully-functional MongoDB driver.
  <dependencies>
   <required>
    <php>
-    <min>7.1.0</min>
+    <min>7.2.0</min>
     <max>8.99.99</max>
    </php>
    <pearinstaller>

config.m4

@@ -20,8 +20,8 @@ if test "$PHP_MONGODB" != "no"; then
   fi
 
   AC_MSG_RESULT($PHP_MONGODB_PHP_VERSION)
-  if test "$PHP_MONGODB_PHP_VERSION_ID" -lt "70100"; then
-    AC_MSG_ERROR([not supported. Need a PHP version >= 7.1.0 (found $PHP_MONGODB_PHP_VERSION)])
+  if test "$PHP_MONGODB_PHP_VERSION_ID" -lt "70200"; then
+    AC_MSG_ERROR([not supported. Need a PHP version >= 7.2.0 (found $PHP_MONGODB_PHP_VERSION)])
   fi
 
   PHP_ARG_ENABLE([mongodb-developer-flags],

src/BSON/UTCDateTime.c

@@ -100,11 +100,7 @@ static bool php_phongo_utcdatetime_init_from_date(php_phongo_utcdatetime_t* inte
 
 	/* The following assignments use the same logic as date_format() in php_date.c */
 	sec = datetime_obj->time->sse;
-#if PHP_VERSION_ID >= 70200
 	usec = (int64_t) floor(datetime_obj->time->us);
-#else
-	usec                  = (int64_t) floor(datetime_obj->time->f * 1000000 + 0.5);
-#endif
 
 	intern->milliseconds = (sec * 1000) + (usec / 1000);
 	intern->initialized  = true;
@@ -262,11 +258,7 @@ static PHP_METHOD(UTCDateTime, toDateTime)
 	php_date_initialize(datetime_obj, sec, sec_len, NULL, NULL, 0);
 	efree(sec);
 
-#if PHP_VERSION_ID >= 70200
 	datetime_obj->time->us = (intern->milliseconds % 1000) * 1000;
-#else
-	datetime_obj->time->f = (double) (intern->milliseconds % 1000) / 1000;
-#endif
 }
 /* }}} */
 

src/MongoDB/BulkWrite.c

@@ -26,11 +26,6 @@
 #include "php_phongo.h"
 #include "php_bson.h"
 
-#if PHP_VERSION_ID < 70200
-#include <ext/spl/spl_iterators.h>
-#define zend_ce_countable spl_ce_Countable
-#endif /* PHP_VERSION_ID < 70200 */
-
 #define PHONGO_BULKWRITE_BYPASS_UNSET -1
 
 zend_class_entry* php_phongo_bulkwrite_ce;

src/MongoDB/Manager.c

@@ -83,9 +83,7 @@ static bool php_phongo_manager_merge_context_options(zval* zdriverOptions) /* {{
 	 * scope, leading to a COW violation in zend_hash_merge and
 	 * zend_symtable_str_del (called by php_array_unsetc). This macro allows
 	 * that violation in debug mode and is a NOOP when in non-debug. */
-#if PHP_VERSION_ID >= 70200
 	HT_ALLOW_COW_VIOLATION(Z_ARRVAL_P(zdriverOptions));
-#endif
 
 	php_error_docref(NULL, E_DEPRECATED, "The \"context\" driver option is deprecated.");
 

tests/cursor/bug1274-002.phpt

@@ -101,5 +101,5 @@ Child exits
 Parent waited for child to exit
 Parent executes getMore with batchSize: 2
 OK: Got MongoDB\Driver\Exception\RuntimeException
-%r(Cursor not found, cursor id: \d+|cursor id \d+ not found|Cursor not found \(namespace: '.*', id: \d+\)\.)%r
+%r(Cursor not found, cursor id: \d+|cursor id \d+ not found|Cursor not found \(.*id: \d+\)\.)%r
 ===DONE===

tests/cursor/bug1274-005.phpt

@@ -101,5 +101,5 @@ Child exits
 Parent waited for child to exit
 Parent executes getMore with batchSize: 2
 OK: Got MongoDB\Driver\Exception\RuntimeException
-%r(Cursor not found, cursor id: \d+|cursor id \d+ not found|Cursor not found \(namespace: '.*', id: \d+\)\.)%r
+%r(Cursor not found, cursor id: \d+|cursor id \d+ not found|Cursor not found \(.*id: \d+\)\.)%r
 ===DONE===

tests/cursor/cursor-tailable_error-002.phpt

@@ -86,5 +86,5 @@ Awaiting results...
 Awaiting results...
 Awaiting results...
 OK: Got MongoDB\Driver\Exception\RuntimeException
-%r(Cursor not found, cursor id: \d+|cursor id \d+ not found|Cursor not found \(namespace: '.*', id: \d+\)\.)%r
+%r(Cursor not found, cursor id: \d+|cursor id \d+ not found|Cursor not found \(.*id: \d+\)\.)%r
 ===DONE===