PHPC-1442: Drop support for PHP 5.6

.evergreen/config.yml

@@ -621,23 +621,7 @@ axes:
         display_name: "PHP 7.0"
         variables:
           PHP_VERSION: "7.0.32"
-      - id: "5.6"
-        display_name: "PHP 5.6"
-        variables:
-          PHP_VERSION: "5.6.38"
 
-  - id: os-php5
-    display_name: OS
-    values:
-      - id: ubuntu1604-test
-        display_name: "Ubuntu 16.04"
-        run_on: ubuntu1604-test
-      - id: rhel70-test
-        display_name: "RHEL 7.0"
-        run_on: rhel70
-      - id: rhel71-power8
-        display_name: "RHEL 7.1 Power 8"
-        run_on: rhel71-power8-test
   - id: os-php7
     display_name: OS
     values:
@@ -693,13 +677,6 @@ axes:
 
 buildvariants:
 
-- matrix_name: "tests-php5"
-  matrix_spec: {"os-php5": "*", "versions": "4.2", "php-versions": ["5.6"] }
-  display_name: "All: ${versions}/${php-versions} — ${os-php5}"
-  tasks:
-     - name: "test-standalone-ssl"
-     - name: "test-replicaset-auth"
-
 - matrix_name: "tests-php7"
   matrix_spec: {"os-php7": "*", "versions": "4.2", "php-versions": ["7.0","7.1","7.2","7.3"] }
   exclude_spec:
@@ -710,14 +687,6 @@ buildvariants:
      - name: "test-replicaset-auth"
 
 
-- matrix_name: "mongo-30-php5"
-  matrix_spec: {"os-php5": "*", "versions": ["3.0", "3.2", "3.4"], "php-versions": "5.6" }
-  exclude_spec: {"os-php5": "rhel71-power8", "versions": "3.0", "php-versions": "5.6"}
-  display_name: "${versions}/${php-versions} — ${os-php5}"
-  tasks:
-     - name: "test-standalone-old"
-     - name: "test-replicaset-old"
-
 - matrix_name: "mongo-30-php7"
   matrix_spec: {"os-php7": "*", "versions": ["3.0", "3.2", "3.4"], "php-versions": "7.3" }
   exclude_spec:
@@ -730,14 +699,6 @@ buildvariants:
      - name: "test-replicaset-old"
 
 
-- matrix_name: "mongo-36-php5"
-  matrix_spec: {"os-php5": "*", "versions": ["3.6"], "php-versions": "5.6" }
-  display_name: "${versions}/${php-versions} — ${os-php5}"
-  tasks:
-     - name: "test-standalone"
-     - name: "test-replicaset"
-     - name: "test-replicaset-auth"
-
 - matrix_name: "mongo-36-php7"
   matrix_spec: {"os-php7": "*", "versions": ["3.6"], "php-versions": "7.3" }
   exclude_spec:
@@ -749,19 +710,6 @@ buildvariants:
      - name: "test-replicaset-auth"
 
 
-- matrix_name: "mongo-40-php5"
-  matrix_spec: {"os-php5": "*", "versions": ["4.0", "4.2", "latest"], "php-versions": "5.6" }
-  display_name: "${versions}/${php-versions} — ${os-php5}"
-  tasks:
-     - name: "test-standalone"
-     - name: "test-standalone-auth"
-     - name: "test-standalone-ssl"
-     - name: "test-replicaset"
-     - name: "test-replicaset-auth"
-     - name: "test-replicaset-single"
-     - name: "test-sharded"
-     - name: "test-sharded-rs"
-
 - matrix_name: "mongo-40-php7"
   matrix_spec: {"os-php7": "*", "versions": ["4.0", "4.2", "latest"], "php-versions": "7.3" }
   exclude_spec:

.travis.yml

@@ -22,8 +22,6 @@ jobs:
       php: 7.3
 
     # Test remaining PHP versions
-    - stage: Test
-      php: 5.6
     - stage: Test
       php: 7.0
     - stage: Test

bin/package.xml.in

@@ -58,7 +58,7 @@ necessary to build a fully-functional MongoDB driver.
  <dependencies>
   <required>
    <php>
-    <min>5.6.0</min>
+    <min>7.0.0</min>
     <max>7.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 "50600"; then
-    AC_MSG_ERROR([not supported. Need a PHP version >= 5.6.0 (found $PHP_MONGODB_PHP_VERSION)])
+  if test "$PHP_MONGODB_PHP_VERSION_ID" -lt "70000"; then
+    AC_MSG_ERROR([not supported. Need a PHP version >= 7.0.0 (found $PHP_MONGODB_PHP_VERSION)])
   fi
 
   PHP_ARG_ENABLE([mongodb-developer-flags],

phongo_compat.c

@@ -17,18 +17,12 @@
 /* Our Compatability header */
 #include "phongo_compat.h"
 
-void phongo_add_exception_prop(const char* prop, int prop_len, zval* value TSRMLS_DC)
+void phongo_add_exception_prop(const char* prop, int prop_len, zval* value)
 {
 	if (EG(exception)) {
-#if PHP_VERSION_ID >= 70000
 		zval ex;
-		EXCEPTION_P(EG(exception), ex);
+		ZVAL_OBJ(&ex, EG(exception));
 		zend_update_property(Z_OBJCE(ex), &ex, prop, prop_len, value);
-#else
-		zval* ex = NULL;
-		EXCEPTION_P(EG(exception), ex);
-		zend_update_property(Z_OBJCE_P(ex), ex, prop, prop_len, value TSRMLS_CC);
-#endif
 	}
 }
 

phongo_compat.h

@@ -19,9 +19,7 @@
 
 #include <php.h>
 #include <Zend/zend_string.h>
-#if PHP_VERSION_ID >= 70000
 #include <Zend/zend_portability.h>
-#endif
 
 #ifdef PHP_WIN32
 #include "config.w32.h"
@@ -40,12 +38,6 @@
 #define HASH_KEY_NON_EXISTENT HASH_KEY_NON_EXISTANT
 #endif
 
-#if PHP_VERSION_ID >= 70000
-#define str_efree(s) efree((char*) s)
-#else
-#include <Zend/zend_string.h>
-#endif
-
 #if defined(__GNUC__)
 #define ARG_UNUSED __attribute__((unused))
 #else
@@ -66,23 +58,14 @@
 #define PHONGO_BREAK_INTENTIONALLY_MISSING
 #endif
 
-#if PHP_VERSION_ID >= 70000
-#define phongo_char zend_string
-#define phongo_long zend_long
 #if SIZEOF_ZEND_LONG == 8
 #define PHONGO_LONG_FORMAT PRId64
 #elif SIZEOF_ZEND_LONG == 4
 #define PHONGO_LONG_FORMAT PRId32
 #else
 #error Unsupported architecture (integers are neither 32-bit nor 64-bit)
 #endif
-#define SIZEOF_PHONGO_LONG SIZEOF_ZEND_LONG
-#define phongo_create_object_retval zend_object*
-#define phongo_get_gc_table zval**
 #define PHONGO_ALLOC_OBJECT_T(_obj_t, _class_type) (_obj_t*) ecalloc(1, sizeof(_obj_t) + zend_object_properties_size(_class_type))
-#define PHONGO_TSRMLS_FETCH_FROM_CTX(user_data)
-#define DECLARE_RETURN_VALUE_USED int return_value_used = 1;
-#define EXCEPTION_P(_ex, _zp) ZVAL_OBJ(&_zp, _ex)
 #define ADD_ASSOC_STRING(_zv, _key, _value) add_assoc_string_ex(_zv, ZEND_STRL(_key), (char*) (_value));
 #define ADD_ASSOC_STRINGL(_zv, _key, _value, _len) add_assoc_stringl_ex(_zv, ZEND_STRL(_key), (char*) (_value), _len);
 #define ADD_ASSOC_STRING_EX(_zv, _key, _key_len, _value, _value_len) add_assoc_stringl_ex(_zv, _key, _key_len, (char*) (_value), _value_len);
@@ -105,167 +88,55 @@
 		ADD_ASSOC_ZVAL_EX((_zv), (_key), &z_int);    \
 	} while (0)
 #define ADD_NEXT_INDEX_STRINGL(_zv, _value, _len) add_next_index_stringl(_zv, _value, _len);
-#define phongo_free_object_arg zend_object
-#define phongo_zpp_char_len size_t
-#define ZEND_HASH_APPLY_COUNT(ht) (ht)->u.v.nApplyCount
-#define PHONGO_RETVAL_STRINGL(s, slen) RETVAL_STRINGL(s, slen)
-#define PHONGO_RETURN_STRINGL(s, slen) RETURN_STRINGL(s, slen)
-#define PHONGO_RETVAL_STRING(s) RETVAL_STRING(s)
-#define PHONGO_RETURN_STRING(s) RETURN_STRING(s)
-#define PHONGO_RETVAL_SMART_STR(val) PHONGO_RETVAL_STRINGL(ZSTR_VAL((val).s), ZSTR_LEN((val).s));
-#define ZVAL_RETVAL_TYPE zval
+#define PHONGO_RETVAL_SMART_STR(val) RETVAL_STRINGL(ZSTR_VAL((val).s), ZSTR_LEN((val).s));
 #define ZVAL_STATIC_INIT \
 	{                    \
 		{                \
 			0            \
 		}                \
 	}
-#else /* PHP_VERSION_ID < 70000 */
-#define phongo_char char
-#define phongo_long long
-#define PHONGO_LONG_FORMAT "ld"
-#define SIZEOF_PHONGO_LONG SIZEOF_LONG
-#define ZSTR_VAL(str) str
-#define phongo_create_object_retval zend_object_value
-#define phongo_get_gc_table zval***
-#define PHONGO_ALLOC_OBJECT_T(_obj_t, _class_type) (_obj_t*) ecalloc(1, sizeof(_obj_t))
-#define PHONGO_TSRMLS_FETCH_FROM_CTX(user_data) TSRMLS_FETCH_FROM_CTX(user_data)
-#define DECLARE_RETURN_VALUE_USED
-#define EXCEPTION_P(_ex, _zp) _zp = _ex
-#define ADD_ASSOC_STRING(_zv, _key, _value) add_assoc_string_ex(_zv, ZEND_STRS(_key), (char*) (_value), 1);
-#define ADD_ASSOC_STRINGL(_zv, _key, _value, _len) add_assoc_stringl_ex(_zv, ZEND_STRS(_key), (char*) (_value), _len, 1);
-#define ADD_ASSOC_STRING_EX(_zv, _key, _key_len, _value, _value_len) add_assoc_stringl_ex(_zv, _key, _key_len + 1, (char*) (_value), _value_len, 1);
-#define ADD_ASSOC_LONG_EX(_zv, _key, _value) add_assoc_long_ex(_zv, ZEND_STRS(_key), _value);
-#define ADD_ASSOC_ZVAL_EX(_zv, _key, _value) add_assoc_zval_ex(_zv, ZEND_STRS(_key), _value);
-#define ADD_ASSOC_ZVAL(_zv, _key, _value) add_assoc_zval(_zv, _key, _value);
-#define ADD_ASSOC_NULL_EX(_zv, _key) add_assoc_null_ex(_zv, ZEND_STRS(_key));
-#define ADD_ASSOC_BOOL_EX(_zv, _key, _value) add_assoc_bool_ex(_zv, ZEND_STRS(_key), _value);
-#define ZVAL_INT64_STRING(_zv, _value)                              \
-	do {                                                            \
-		char tmp[24];                                               \
-		int  tmp_len;                                               \
-		tmp_len = snprintf(tmp, sizeof(tmp), "%" PRId64, (_value)); \
-		ZVAL_STRINGL((_zv), tmp, tmp_len, 1);                       \
-	} while (0)
 
-#define ADD_ASSOC_INT64_AS_STRING(_zv, _key, _value) \
-	do {                                             \
-		zval* z_int;                                 \
-		MAKE_STD_ZVAL(z_int);                        \
-		ZVAL_INT64_STRING(z_int, (_value));          \
-		ADD_ASSOC_ZVAL_EX((_zv), (_key), z_int);     \
-	} while (0)
-#define ADD_NEXT_INDEX_STRINGL(_zv, _value, _len) add_next_index_stringl(_zv, _value, _len, 1);
-#define Z_PHPDATE_P(object) ((php_date_obj*) zend_object_store_get_object(object TSRMLS_CC))
-#define Z_ISUNDEF(x) !x
-#define ZVAL_UNDEF(x) \
-	do {              \
-		(*x) = NULL;  \
-	} while (0)
-#define ZVAL_ARR(z, a)               \
-	do {                             \
-		HashTable* __arr = (a);      \
-		zval*      __z   = (z);      \
-		Z_ARRVAL_P(__z)  = __arr;    \
-		Z_TYPE_P(__z)    = IS_ARRAY; \
-	} while (0);
-#define ZVAL_DUP(z, v)        \
-	do {                      \
-		zval*       _z = (z); \
-		const zval* _v = (v); \
-		*_z            = *_v; \
-		INIT_PZVAL(_z);       \
-		zval_copy_ctor(_z);   \
-	} while (0);
-#define phongo_free_object_arg void
-#define phongo_zpp_char_len int
-#define ZEND_HASH_APPLY_PROTECTION(ht) 1
-#define ZEND_HASH_GET_APPLY_COUNT(ht) ((ht)->nApplyCount)
-#define ZEND_HASH_DEC_APPLY_COUNT(ht) ((ht)->nApplyCount -= 1)
-#define ZEND_HASH_INC_APPLY_COUNT(ht) ((ht)->nApplyCount += 1)
-#define PHONGO_RETVAL_STRINGL(s, slen) RETVAL_STRINGL(s, slen, 1)
-#define PHONGO_RETURN_STRINGL(s, slen) RETURN_STRINGL(s, slen, 1)
-#define PHONGO_RETVAL_STRING(s) RETVAL_STRING(s, 1)
-#define PHONGO_RETURN_STRING(s) RETURN_STRING(s, 1)
-#define PHONGO_RETVAL_SMART_STR(val) PHONGO_RETVAL_STRINGL((val).c, (val).len);
-#define ZVAL_RETVAL_TYPE zval*
-#define ZVAL_STATIC_INIT zval_used_for_init
-#endif
-
-#if SIZEOF_PHONGO_LONG == 8
+#if SIZEOF_ZEND_LONG == 8
 #define ADD_INDEX_INT64(_zv, _index, _value) add_index_long((_zv), (_index), (_value))
 #define ADD_NEXT_INDEX_INT64(_zv, _value) add_next_index_long((_zv), (_value))
 #define ADD_ASSOC_INT64(_zv, _key, _value) add_assoc_long((_zv), (_key), (_value))
 #define ZVAL_INT64(_zv, _value) ZVAL_LONG((_zv), (_value))
-#elif SIZEOF_PHONGO_LONG == 4
-#if PHP_VERSION_ID >= 70000
-#define ADD_INDEX_INT64(_zv, _index, _value)                    \
-	if ((_value) > INT32_MAX || (_value) < INT32_MIN) {         \
-		zval zchild;                                            \
-		php_phongo_bson_new_int64(&zchild, (_value) TSRMLS_CC); \
-		add_index_zval((_zv), (_index), &zchild);               \
-	} else {                                                    \
-		add_index_long((_zv), (_index), (_value));              \
-	}
-#define ADD_NEXT_INDEX_INT64(_zv, _value)                       \
-	if ((_value) > INT32_MAX || (_value) < INT32_MIN) {         \
-		zval zchild;                                            \
-		php_phongo_bson_new_int64(&zchild, (_value) TSRMLS_CC); \
-		add_next_index_zval((_zv), &zchild);                    \
-	} else {                                                    \
-		add_next_index_long((_zv), (_value));                   \
-	}
-#define ADD_ASSOC_INT64(_zv, _key, _value)                      \
-	if ((_value) > INT32_MAX || (_value) < INT32_MIN) {         \
-		zval zchild;                                            \
-		php_phongo_bson_new_int64(&zchild, (_value) TSRMLS_CC); \
-		add_assoc_zval((_zv), (_key), &zchild);                 \
-	} else {                                                    \
-		add_assoc_long((_zv), (_key), (_value));                \
-	}
-#else /* PHP_VERSION_ID < 70000 */
-#define ADD_INDEX_INT64(_zv, _index, _value)                   \
-	if ((_value) > INT32_MAX || (_value) < INT32_MIN) {        \
-		zval* zchild = NULL;                                   \
-		TSRMLS_FETCH();                                        \
-		MAKE_STD_ZVAL(zchild);                                 \
-		php_phongo_bson_new_int64(zchild, (_value) TSRMLS_CC); \
-		add_index_zval((_zv), (_index), zchild);               \
-	} else {                                                   \
-		add_index_long((_zv), (_index), (_value));             \
+#elif SIZEOF_ZEND_LONG == 4
+#define ADD_INDEX_INT64(_zv, _index, _value)            \
+	if ((_value) > INT32_MAX || (_value) < INT32_MIN) { \
+		zval zchild;                                    \
+		php_phongo_bson_new_int64(&zchild, (_value));   \
+		add_index_zval((_zv), (_index), &zchild);       \
+	} else {                                            \
+		add_index_long((_zv), (_index), (_value));      \
 	}
-#define ADD_NEXT_INDEX_INT64(_zv, _value)                      \
-	if ((_value) > INT32_MAX || (_value) < INT32_MIN) {        \
-		zval* zchild = NULL;                                   \
-		TSRMLS_FETCH();                                        \
-		MAKE_STD_ZVAL(zchild);                                 \
-		php_phongo_bson_new_int64(zchild, (_value) TSRMLS_CC); \
-		add_next_index_zval((_zv), zchild);                    \
-	} else {                                                   \
-		add_next_index_long((_zv), (_value));                  \
+#define ADD_NEXT_INDEX_INT64(_zv, _value)               \
+	if ((_value) > INT32_MAX || (_value) < INT32_MIN) { \
+		zval zchild;                                    \
+		php_phongo_bson_new_int64(&zchild, (_value));   \
+		add_next_index_zval((_zv), &zchild);            \
+	} else {                                            \
+		add_next_index_long((_zv), (_value));           \
 	}
-#define ADD_ASSOC_INT64(_zv, _key, _value)                     \
-	if ((_value) > INT32_MAX || (_value) < INT32_MIN) {        \
-		zval* zchild = NULL;                                   \
-		TSRMLS_FETCH();                                        \
-		MAKE_STD_ZVAL(zchild);                                 \
-		php_phongo_bson_new_int64(zchild, (_value) TSRMLS_CC); \
-		add_assoc_zval((_zv), (_key), zchild);                 \
-	} else {                                                   \
-		add_assoc_long((_zv), (_key), (_value));               \
+#define ADD_ASSOC_INT64(_zv, _key, _value)              \
+	if ((_value) > INT32_MAX || (_value) < INT32_MIN) { \
+		zval zchild;                                    \
+		php_phongo_bson_new_int64(&zchild, (_value));   \
+		add_assoc_zval((_zv), (_key), &zchild);         \
+	} else {                                            \
+		add_assoc_long((_zv), (_key), (_value));        \
 	}
-#endif /* PHP_VERSION_ID */
-#define ZVAL_INT64(_zv, _value)                               \
-	if ((_value) > INT32_MAX || (_value) < INT32_MIN) {       \
-		php_phongo_bson_new_int64((_zv), (_value) TSRMLS_CC); \
-	} else {                                                  \
-		ZVAL_LONG((_zv), (_value));                           \
+#define ZVAL_INT64(_zv, _value)                         \
+	if ((_value) > INT32_MAX || (_value) < INT32_MIN) { \
+		php_phongo_bson_new_int64((_zv), (_value));     \
+	} else {                                            \
+		ZVAL_LONG((_zv), (_value));                     \
 	}
-#else /* SIZEOF_PHONGO_LONG != 8 && SIZEOF_PHONGO_LONG != 4 */
+#else /* SIZEOF_ZEND_LONG != 8 && SIZEOF_ZEND_LONG != 4 */
 #error Unsupported architecture (integers are neither 32-bit nor 64-bit)
-#endif /* SIZEOF_PHONGO_LONG */
+#endif /* SIZEOF_ZEND_LONG */
 
-void      phongo_add_exception_prop(const char* prop, int prop_len, zval* value TSRMLS_DC);
+void      phongo_add_exception_prop(const char* prop, int prop_len, zval* value);
 zend_bool php_phongo_zend_hash_apply_protection_begin(HashTable* ht);
 zend_bool php_phongo_zend_hash_apply_protection_end(HashTable* ht);