Drop PHP < 7.1 support

pinepain · pinepain · commit 1e912edc2321 · 2017-08-26T23:19:39.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,6 @@ dist: trusty
 language: php
 
 php:
-  - 7.0
   - 7.1
   - nightly
 
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ This extension adds [Soft Reference](https://en.wikipedia.org/wiki/Soft_referenc
 data structures that require advanced referencing model.
 
 
-**PHP >= 7.0.3 required**
+**PHP >= 7.1 required**
 
 ## Usage
 
@@ -196,7 +196,7 @@ You may also want to add php-ref extension as a [composer.json dependency](https
 
     "require": {
         ...
-        "ext-ref": "~0.1.0"
+        "ext-ref": "*"
         ...
     }
 
diff --git a/appveyor.yml b/appveyor.yml
@@ -4,13 +4,9 @@ platform:
 
 environment:
   matrix:
-    - PHP_VERSION: 7.0.20
+    - PHP_VERSION: 7.1.8
       THREAD_SAFE: true
-    - PHP_VERSION: 7.0.20
-      THREAD_SAFE: false
-    - PHP_VERSION: 7.1.6
-      THREAD_SAFE: true
-    - PHP_VERSION: 7.1.6
+    - PHP_VERSION: 7.1.8
       THREAD_SAFE: false
 
 
diff --git a/config.m4 b/config.m4
@@ -11,8 +11,8 @@ if test "$PHP_REF" != "no"; then
   PHP_REF_FOUND_VERSION=`${PHP_CONFIG} --version`
   PHP_REF_FOUND_VERNUM=`${PHP_CONFIG} --vernum`
   
-  if test "$PHP_REF_FOUND_VERNUM" -lt "70003"; then
-    AC_MSG_ERROR([not supported. Need a PHP version >= 7.0.3 (found $PHP_REF_FOUND_VERSION)])
+  if test "$PHP_REF_FOUND_VERNUM" -lt "70100"; then
+    AC_MSG_ERROR([not supported. PHP version >= 7.1 required (found $PHP_REF_FOUND_VERSION)])
   else
     AC_MSG_RESULT([supported ($PHP_REF_FOUND_VERSION)])
   fi
diff --git a/config.w32 b/config.w32
@@ -1,6 +1,3 @@
-// $Id$
-// vim:ft=javascript
-
 ARG_ENABLE("ref", "enable ref support", "no");
 
 if (PHP_REF != "no") {
diff --git a/package.xml b/package.xml
@@ -156,7 +156,7 @@
     <dependencies>
         <required>
             <php>
-                <min>7.0.3</min>
+                <min>7.1.0</min>
             </php>
             <pearinstaller>
                 <min>1.4.0</min>
diff --git a/php_ref.h b/php_ref.h
@@ -26,9 +26,9 @@ extern zend_module_entry php_ref_module_entry;
 #define PHP_REF_REVISION "dev"
 #endif
 
-#if PHP_VERSION_ID < 70003
+#if PHP_VERSION_ID < 70100
 // should never get her, but just in case
-#error PHP >= 7.0.3 required
+#error PHP >= 7.1 required
 #endif
 
 #define PHP_REF_NS "Ref"
diff --git a/php_ref_reference.c b/php_ref_reference.c
@@ -623,7 +623,7 @@ ZEND_END_ARG_INFO()
 PHP_REF_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ref_reference_valid, ZEND_RETURN_VALUE, 0, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_ref_reference_notifier, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
+PHP_REF_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ref_reference_notifier, ZEND_SEND_BY_VAL, 0, IS_CALLABLE, 1)
                 ZEND_ARG_CALLABLE_INFO(0, notify, 1)
 ZEND_END_ARG_INFO()
 
diff --git a/stubs/src/AbstractReference.php b/stubs/src/AbstractReference.php
@@ -65,9 +65,9 @@ public function valid(): bool
      *
      * If any value provided, any existent notifier will be replaced and returned.
      *
-     * @return callable | null Current notifier or the old one when replacing it with provided value.
+     * @return callable|null Current notifier or the old one when replacing it with provided value.
      */
-    public function notifier(callable $notify = null)
+    public function notifier(callable $notify = null): ?callable
     {
     }
 }
diff --git a/stubs/src/NotifierException.php b/stubs/src/NotifierException.php
@@ -29,7 +29,7 @@ class NotifierException extends Exception
      *
      * @return Throwable[]
      */
-    public function getExceptions() : array
+    public function getExceptions(): array
     {
         return $this->exceptions;
     }
diff --git a/stubs/src/functions.php b/stubs/src/functions.php
@@ -22,7 +22,9 @@
  *
  * @return bool
  */
-function refcounted(mixed $value) : bool {}
+function refcounted(mixed $value): bool
+{
+}
 
 /**
  * Get real value references count (not counting value reference passed as a function argument)
@@ -31,7 +33,9 @@ function refcounted(mixed $value) : bool {}
  *
  * @return int
  */
-function refcount(mixed $value) : int {}
+function refcount(mixed $value): int
+{
+}
 
 /**
  * Check whether object has soft references
@@ -40,16 +44,20 @@ function refcount(mixed $value) : int {}
  *
  * @return bool
  */
-function softrefcounted(object $value) : bool {}
+function softrefcounted(object $value): bool
+{
+}
 
 /**
  * Get object's soft references count
-
+ *
  * @param object $value
  *
  * @return int
  */
-function softrefcount(object $value) : int {}
+function softrefcount(object $value): int
+{
+}
 
 /**
  * Get object's soft references
@@ -58,7 +66,9 @@ function softrefcount(object $value) : int {}
  *
  * @return mixed
  */
-function softrefs(object $value) : array {}
+function softrefs(object $value): array
+{
+}
 
 /**
  * Check whether object has weak references
@@ -67,16 +77,20 @@ function softrefs(object $value) : array {}
  *
  * @return bool
  */
-function weakrefcounted(object $value) : bool {}
+function weakrefcounted(object $value): bool
+{
+}
 
 /**
  * Get object's weak references count
-
+ *
  * @param object $value
  *
  * @return int
  */
-function weakrefcount(object $value) : int {}
+function weakrefcount(object $value): int
+{
+}
 
 /**
  * Get object's weak references
@@ -85,7 +99,9 @@ function weakrefcount(object $value) : int {}
  *
  * @return mixed
  */
-function weakrefs(object $value) : array {}
+function weakrefs(object $value): array
+{
+}
 
 /**
  * Get object's handle id
@@ -94,12 +110,17 @@ function weakrefs(object $value) : array {}
  *
  * @return int
  */
-function object_handle(object $value) : int {}
+function object_handle(object $value): int
+{
+}
 
 /**
  * Check whether object's destructor was called
+ *
  * @param object $value
  *
  * @return bool
  */
-function is_obj_destructor_called(object $value) : bool {}
+function is_obj_destructor_called(object $value): bool
+{
+}

-Original file line number
+Diff line change
 language: php
 php:
 -  - 7.0
   - 7.1
   - nightly
Original file line number	Diff line number	Diff line change
`@@ -65,9 +65,9 @@ public function valid(): bool`
`65`	`65`	`*`
`66`	`66`	`* If any value provided, any existent notifier will be replaced and returned.`
`67`	`67`	`*`
`68`		`- * @return callable \| null Current notifier or the old one when replacing it with provided value.`
	`68`	`+ * @return callable\|null Current notifier or the old one when replacing it with provided value.`
`69`	`69`	`*/`
`70`		`- public function notifier(callable $notify = null)`
	`70`	`+ public function notifier(callable $notify = null): ?callable`
`71`	`71`	`{`
`72`	`72`	`}`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class NotifierException extends Exception`
`29`	`29`	`*`
`30`	`30`	`* @return Throwable[]`
`31`	`31`	`*/`
`32`		`- public function getExceptions() : array`
	`32`	`+ public function getExceptions(): array`
`33`	`33`	`{`
`34`	`34`	`return $this->exceptions;`
`35`	`35`	`}`