fix tests back to 7.0

Author: brettmc

phper-sys/php_wrapper.c

@@ -38,6 +38,14 @@ phper_init_class_entry_handler(zend_class_entry *class_ce, void *argument);
 #define IS_NEVER 0x1B
 #endif
 
+#ifndef IS_ITERABLE
+#define IS_ITERABLE 0x1C
+#endif
+
+#ifndef IS_VOID
+#define IS_VOID 0x1D
+#endif
+
 // ==================================================
 // zval apis:
 // ==================================================
@@ -500,10 +508,8 @@ phper_zend_begin_arg_with_return_obj_info_ex(bool return_reference,
 #define static
 #define const
 #if PHP_VERSION_ID >= 70400
-    ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(info, return_reference,
-                                           required_num_args,
-                                           class_name, allow_null)
-#elif PHP_VERSION_ID >= 70200
+    ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(info, return_reference, required_num_args, class_name, allow_null)
+#else
     ZEND_BEGIN_ARG_INFO_EX(info, 0, return_reference, required_num_args)
 #endif
     ZEND_END_ARG_INFO()
@@ -527,15 +533,10 @@ zend_internal_arg_info phper_zend_arg_info_with_type(bool pass_by_ref,
     zend_internal_arg_info info[] = {
         ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(pass_by_ref, name, type_hint, allow_null, default_value)
     };
-#elif PHP_VERSION_ID >= 70200
+#elif PHP_VERSION_ID >= 70000
     zend_internal_arg_info info[] = {
         ZEND_ARG_TYPE_INFO(pass_by_ref, name, type_hint, allow_null)
     };
-#else
-    // PHP 7.0 and below: fallback
-    zend_internal_arg_info info[] = {
-        ZEND_ARG_INFO(pass_by_ref, name)
-    };
 #endif
     info[0].name = name;
     return info[0];
@@ -561,9 +562,7 @@ zend_internal_arg_info phper_zend_arg_obj_info(bool pass_by_ref,
 #else
     zend_internal_arg_info info = {
         .name = name,
-        .type = 0,
         .pass_by_reference = pass_by_ref,
-        .is_variadic = 0
     };
     return info;
 #endif

tests/integration/tests/php/typehints.php

@@ -22,7 +22,7 @@
 
 $argumentTypehintProvider = [
     // <method>, <expected typehint>, <is nullable>, <is required>, <(optional)min php version>
-    ['testString', 'string', false, true],
+    ['testString', 'string', false, true, '7.1'],
     ['testStringOptional', 'string', false, false],
     ['testStringNullable', 'string', true, true],
 
@@ -48,13 +48,13 @@
     ['testCallableOptional', 'callable', false, false],
     ['testCallableNullable', 'callable', true, true],
 
-    ['testObject', 'object', false, true],
-    ['testObjectOptional', 'object', false, false],
-    ['testObjectNullable', 'object', true, true],
+    ['testObject', 'object', false, true, '7.1'],
+    ['testObjectOptional', 'object', false, false, '7.1'],
+    ['testObjectNullable', 'object', true, true, '7.1'],
 
-    ['testIterable', 'iterable', false, true],
-    ['testIterableOptional', 'iterable', false, false],
-    ['testIterableNullable', 'iterable', true, true],
+    ['testIterable', 'iterable', false, true, '7.1'],
+    ['testIterableOptional', 'iterable', false, false, '7.1'],
+    ['testIterableNullable', 'iterable', true, true, '7.1'],
 
     ['testNull', 'null', true, true, '8.2'],
 
@@ -79,9 +79,14 @@
     assert_eq(1, count($params), 'has 1 param');
     $param = $params[0];
     $type = $param->getType();
-    assert_eq($input[1], (string)$type->getName(), sprintf('%s has typehint type', $input[0]));
-    assert_eq($input[2], $type->allowsNull(), sprintf('%s allows null', $input[0]));
-    assert_eq($input[3], !$param->isOptional(), sprintf('%s is optional', $input[0]));
+    if (PHP_VERSION_ID >= 70100) {
+        assert_eq($input[1], (string)$type->getName(), sprintf('%s has typehint type', $input[0]));
+        assert_eq($input[2], $type->allowsNull(), sprintf('%s allows null', $input[0]));
+        assert_eq($input[3], !$param->isOptional(), sprintf('%s is optional', $input[0]));
+    } else {
+        //ReflectionType::getName doesn't exist until 7.1
+        assert_eq($input[1], (string)$type);
+    }
     echo "PASS" . PHP_EOL;
 }
 
@@ -122,29 +127,31 @@
     }
     $reflectionMethod = $reflection->getMethod($input[0]);
     $return = $reflectionMethod->getReturnType();
-    if ($input[1] !== 'never') {
+    if ($input[1] !== 'never' && PHP_VERSION_ID > 70100) {
         assert_eq($input[1], $return->getName(), sprintf('%s has typehint type', $input[0]));
         assert_eq($input[2], $return->allowsNull(), sprintf('%s allows null', $input[0]));
     }
     echo 'PASS' . PHP_EOL;
 }
 
-// test class entry type-hints with an instance
-$foo = new class implements \IntegrationTest\TypeHints\IFoo {
-    private $value;
-    public function getValue(): string {
-        return $this->value;
-    }
-    public function setValue($value): void {
-        $this->value = $value;
-    }
-};
-
-$foo->setValue('hello');
-assert_eq('hello', $foo->getValue());
-
-$handler = new \IntegrationTest\TypeHints\FooHandler();
-assert_eq($foo, $handler->handle($foo));
+if (PHP_VERSION_ID > 70100) {
+    // test class entry type-hints with an instance
+    $foo = new class implements \IntegrationTest\TypeHints\IFoo {
+        private $value;
+        public function getValue(): string {
+            return $this->value;
+        }
+        public function setValue($value): void {
+            $this->value = $value;
+        }
+    };
+
+    $foo->setValue('hello');
+    assert_eq('hello', $foo->getValue());
+
+    $handler = new \IntegrationTest\TypeHints\FooHandler();
+    assert_eq($foo, $handler->handle($foo));
+}
 
 $argumentDefaultValueProvider = [
     // <method>, <expected default value>, <(optional) min php version>