Merge pull request #631

Author: jmikola

.travis.yml

@@ -4,7 +4,6 @@ php:
   - 7.0
   - 5.6
   - 5.5
-  - 5.4
 
 env:
   global:

CONTRIBUTING.md

@@ -96,7 +96,7 @@ releasing the `vX.Y` branch as X.Y.Z).
 
 ### Ensure PHP version compatibility
 
-Ensure that the extension compiles on PHP 5.4, 5.5, 5.6, and 7.0. Be sure to
+Ensure that the extension compiles on PHP 5.5, 5.6, 7.0, and 7.1. Be sure to
 test both ZTS and non-ZTS builds for PHP 5.x.
 
 ### Ensure Windows compatibility

phongo_compat.h

@@ -43,28 +43,6 @@
 # include <Zend/zend_string.h>
 #endif
 
-#if PHP_VERSION_ID >= 50500
-#define ITERATOR_GET_CURRENT_KEY(it, z) \
-		(it).funcs->get_current_key(&(it), z TSRMLS_CC);
-#else
-#define ITERATOR_GET_CURRENT_KEY(it, z) \
-{ \
-	char *str_key; \
-	uint str_key_len; \
-	ulong int_key; \
-	switch ((it).funcs->get_current_key(&(it), &str_key, &str_key_len, &int_key TSRMLS_CC)) { \
-		case HASH_KEY_IS_LONG: \
-			ZVAL_LONG(z, int_key); \
-			break; \
-		case HASH_KEY_IS_STRING: \
-			ZVAL_STRINGL(z, str_key, str_key_len-1, 0); \
-			break; \
-		default: \
-			RETURN_NULL(); \
-	} \
-}
-#endif
-
 #if defined(__GNUC__)
 #  define ARG_UNUSED  __attribute__ ((unused))
 #else

src/MongoDB/Cursor.c

@@ -66,22 +66,12 @@ static int php_phongo_cursor_iterator_valid(zend_object_iterator *iter TSRMLS_DC
 	return FAILURE;
 } /* }}} */
 
-#if PHP_VERSION_ID < 50500
-static int php_phongo_cursor_iterator_get_current_key(zend_object_iterator *iter, char **str_key, uint *str_key_len, ulong *int_key TSRMLS_DC) /* {{{ */
-{
-	php_phongo_cursor_t *cursor = ((php_phongo_cursor_iterator *)iter)->cursor;
-
-	*int_key = (ulong) cursor->current;
-	return HASH_KEY_IS_LONG;
-} /* }}} */
-#else
 static void php_phongo_cursor_iterator_get_current_key(zend_object_iterator *iter, zval *key TSRMLS_DC) /* {{{ */
 {
 	php_phongo_cursor_t *cursor = ((php_phongo_cursor_iterator *)iter)->cursor;
 
 	ZVAL_LONG(key, cursor->current);
 } /* }}} */
-#endif
 
 #if PHP_VERSION_ID < 70000
 static void php_phongo_cursor_iterator_get_current_data(zend_object_iterator *iter, zval ***data TSRMLS_DC) /* {{{ */

tests/bson/bson-utcdatetime-006.phpt

@@ -1,7 +1,5 @@
 --TEST--
 MongoDB\BSON\UTCDateTime construction from DateTimeImmutable
---SKIPIF--
-<?php if (!version_compare(phpversion(), "5.5", '>=')) echo "skip >= PHP 5.5 needed\n"; ?>
 --INI--
 date.timezone=UTC
 --FILE--

tests/bson/bson-utcdatetimeinterface-002.phpt

@@ -1,5 +1,7 @@
 --TEST--
 MongoDB\BSON\UTCDateTimeInterface example with MongoDB\BSON\TypeWrapper
+--INI--
+date.timezone=UTC
 --FILE--
 <?php
 

tests/cursor/bug0732-001.phpt

@@ -1,7 +1,6 @@
 --TEST--
 PHPC-732: Possible mongoc_client_t use-after-free with Cursor wrapped in generator
 --SKIPIF--
-<?php if (PHP_VERSION_ID < 50500) exit("skip PHP 5.5 is required for generators"); ?>
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?>
 --FILE--