Drop PHP < 7.2 support

Author: pinepain

.travis.yml

@@ -4,7 +4,7 @@ dist: trusty
 language: php
 
 php:
-  - 7.1
+  - 7.2
   - nightly
 
 matrix:

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.1)
-project(php_ref)
+project(php-ref)
 
 # NOTE: This CMake file is just for syntax highlighting in CLion
 

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.1 required**
+**PHP >= 7.2 required.** The last version that supports PHP 7.1 is `v0.5.0`.
 
 ### PLEASE READ:
 
@@ -162,15 +162,15 @@ to add it to your project.
     $ sudo add-apt-repository -y ppa:ondrej/php
     $ sudo add-apt-repository -y ppa:pinepain/php
     $ sudo apt-get update -y
-    $ sudo apt-get install -y php7.1 php-ref
+    $ sudo apt-get install -y php7.2 php-ref
     $ php --ri ref
 
 #### OS X (homebrew)
 
     $ brew tap homebrew/devtoo
     $ brew tap homebrew/php
     $ brew tap pinepain/devtools
-    $ brew install php71 php71-ref
+    $ brew install php72 php72-ref
     $ php --ri ref
 
 ### Windows
@@ -189,12 +189,12 @@ To install extension globally run
 
     # sudo make install
 
-You will need to copy the extension config to your php dir, here is example for Ubuntu with PHP 7.1 from
+You will need to copy the extension config to your php dir, here is example for Ubuntu with PHP 7.2 from
 [Ondřej Surý's PPA for PHP](https://launchpad.net/~ondrej/+archive/ubuntu/php):
 
     # sudo cp provision/php/ref.ini /etc/php/mods-available/
     # sudo phpenmod -v ALL ref
-    # sudo service php7.1-fpm restart
+    # sudo service php7.2-fpm restart
 
 You may also want to add php-ref extension as a [composer.json dependency](https://getcomposer.org/doc/02-libraries.md#platform-packages):
 

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 "70100"; then
-    AC_MSG_ERROR([not supported. PHP version >= 7.1 required (found $PHP_REF_FOUND_VERSION)])
+  if test "$PHP_REF_FOUND_VERNUM" -lt "70200"; then
+    AC_MSG_ERROR([not supported. PHP version >= 7.2 required (found $PHP_REF_FOUND_VERSION)])
   else
     AC_MSG_RESULT([supported ($PHP_REF_FOUND_VERSION)])
   fi

package.xml

@@ -155,7 +155,7 @@
     <dependencies>
         <required>
             <php>
-                <min>7.1.0</min>
+                <min>7.2.0</min>
             </php>
             <pearinstaller>
                 <min>1.4.0</min>

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 < 70100
+#if PHP_VERSION_ID < 70200
 // should never get her, but just in case
-#error PHP >= 7.1 required
+#error PHP >= 7.2 required
 #endif
 
 #define PHP_REF_NS "Ref"
@@ -42,22 +42,6 @@ extern zend_module_entry php_ref_module_entry;
 #endif
 
 
-// Add zend_type support (new since PHP 7.2)
-#ifdef ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX
-    #define PHP_REF_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, return_reference, required_num_args, classname, allow_null) \
-                    ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, return_reference, required_num_args, classname, allow_null)
-
-    #define PHP_REF_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, type, allow_null) \
-                    ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, type, allow_null)
-#else
-    #define PHP_REF_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, return_reference, required_num_args,             classname, allow_null) \
-                   ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, IS_OBJECT, #classname, allow_null)
-
-    #define PHP_REF_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, type,       allow_null) \
-                    ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, type, NULL, allow_null)
-#endif
-
-
 #ifdef ZTS
 #include "TSRM.h"
 #endif

php_ref_functions.c

@@ -208,44 +208,44 @@ PHP_FUNCTION(is_obj_destructor_called)
 }
 
 
-PHP_REF_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(refcounted_arg, ZEND_RETURN_VALUE, 1, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(refcounted_arg, ZEND_RETURN_VALUE, 1, _IS_BOOL, 0)
                 ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-PHP_REF_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(refcount_arg, ZEND_RETURN_VALUE, 1, IS_LONG, 0)
-                ZEND_ARG_INFO(0, value)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(refcount_arg, ZEND_RETURN_VALUE, 1, IS_LONG, 0)
+                ZEND_ARG_TYPE_INFO(0, object, IS_OBJECT, 0)
 ZEND_END_ARG_INFO()
 
-PHP_REF_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(softrefcounted_arg, ZEND_RETURN_VALUE, 1, _IS_BOOL, 0)
-                ZEND_ARG_INFO(0, object)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(softrefcounted_arg, ZEND_RETURN_VALUE, 1, _IS_BOOL, 0)
+                ZEND_ARG_TYPE_INFO(0, object, IS_OBJECT, 0)
 ZEND_END_ARG_INFO()
 
-PHP_REF_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(softrefcount_arg, ZEND_RETURN_VALUE, 1, IS_LONG, 0)
-                ZEND_ARG_INFO(0, object)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(softrefcount_arg, ZEND_RETURN_VALUE, 1, IS_LONG, 0)
+                ZEND_ARG_TYPE_INFO(0, object, IS_OBJECT, 0)
 ZEND_END_ARG_INFO()
 
-PHP_REF_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(softrefs_arg, ZEND_RETURN_VALUE, 1, IS_ARRAY, 0)
-                ZEND_ARG_INFO(0, object)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(softrefs_arg, ZEND_RETURN_VALUE, 1, IS_ARRAY, 0)
+                ZEND_ARG_TYPE_INFO(0, object, IS_OBJECT, 0)
 ZEND_END_ARG_INFO()
 
-PHP_REF_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(weakrefcounted_arg, ZEND_RETURN_VALUE, 1, _IS_BOOL, 0)
-                ZEND_ARG_INFO(0, object)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(weakrefcounted_arg, ZEND_RETURN_VALUE, 1, _IS_BOOL, 0)
+                ZEND_ARG_TYPE_INFO(0, object, IS_OBJECT, 0)
 ZEND_END_ARG_INFO()
 
-PHP_REF_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(weakrefcount_arg, ZEND_RETURN_VALUE, 1, IS_LONG, 0)
-                ZEND_ARG_INFO(0, object)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(weakrefcount_arg, ZEND_RETURN_VALUE, 1, IS_LONG, 0)
+                ZEND_ARG_TYPE_INFO(0, object, IS_OBJECT, 0)
 ZEND_END_ARG_INFO()
 
-PHP_REF_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(weakrefs_arg, ZEND_RETURN_VALUE, 1, IS_ARRAY, 0)
-                ZEND_ARG_INFO(0, object)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(weakrefs_arg, ZEND_RETURN_VALUE, 1, IS_ARRAY, 0)
+                ZEND_ARG_TYPE_INFO(0, object, IS_OBJECT, 0)
 ZEND_END_ARG_INFO()
 
-PHP_REF_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(object_handle_arg, ZEND_RETURN_VALUE, 1, IS_LONG, 0)
-                ZEND_ARG_INFO(0, object)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(object_handle_arg, ZEND_RETURN_VALUE, 1, IS_LONG, 0)
+                ZEND_ARG_TYPE_INFO(0, object, IS_OBJECT, 0)
 ZEND_END_ARG_INFO()
 
-PHP_REF_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(is_obj_destructor_called_arg, ZEND_RETURN_VALUE, 1, _IS_BOOL, 0)
-                ZEND_ARG_INFO(0, object)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(is_obj_destructor_called_arg, ZEND_RETURN_VALUE, 1, _IS_BOOL, 0)
+                ZEND_ARG_TYPE_INFO(0, object, IS_OBJECT, 0)
 ZEND_END_ARG_INFO()
 
 const zend_function_entry php_ref_functions[] = {

php_ref_reference.c

@@ -585,17 +585,17 @@ static PHP_METHOD(WeakReference, notifier)
 
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ref_reference___construct, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
-                ZEND_ARG_INFO(0, referent)
+                ZEND_ARG_TYPE_INFO(0, referent, IS_OBJECT, 0)
                 ZEND_ARG_CALLABLE_INFO(0, notify, 1)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ref_reference_get, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
 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_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ref_reference_valid, ZEND_RETURN_VALUE, 0, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
-PHP_REF_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ref_reference_notifier, ZEND_SEND_BY_VAL, 0, IS_CALLABLE, 1)
+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()
 

provision/provision.sh

@@ -7,14 +7,14 @@ sudo apt-get -y autoremove
 # Make sure these tools installed
 sudo DEBIAN_FRONTEND=noninteractive apt-get install -y git htop curl tshark pkgconf
 # Add PPA with fresh PHP 7:
-sudo add-apt-repository -u -y ppa:ondrej/php-7.0
+sudo add-apt-repository -u -y ppa:ondrej/php
 
 # Install available php from packages
-sudo apt-get install -y php7.0 php7.0-dev php7.0-fpm
+sudo apt-get install -y php7.2 php7.2-dev php7.2-fpm
 
 # Configure php-fpm
-sudo cp ~/php-ref/provision/php/www.conf /etc/php/7.0/fpm/pool.d/www.conf
-sudo service php7.0-fpm restart
+sudo cp ~/php-ref/provision/php/www.conf /etc/php/7.2/fpm/pool.d/www.conf
+sudo service php7.2-fpm restart
 
 # Fix php executable detection with PHP7 (https://github.com/oerdnj/deb.sury.org/issues/142)
 sudo sed -i -e 's/^php_cli_binary=NONE$/php_cli_binary="\/usr\/bin\/php"/g' /usr/bin/php-config
@@ -79,7 +79,7 @@ sudo cp -f /usr/share/nginx/html/index.html /var/www/html/index-nginx.html
 #phpize --clean && phpize && ./configure && sudo make install
 #sudo cp ~/php-ref/provision/php/ref.ini /etc/php/mods-available/
 #sudo phpenmod -v ALL ref
-#sudo service php7.0-fpm restart
+#sudo service php7.2-fpm restart
 
 # For debugging segfault when extension fails in php-fpm mode:
 #sudo sh -c "echo '/home/vagrant/php-ref/coredump-%e.%p' > /proc/sys/kernel/core_pattern"
@@ -91,7 +91,7 @@ sudo cp -f /usr/share/nginx/html/index.html /var/www/html/index-nginx.html
 sudo apt-get autoremove -y
 
 # This is for the future
-# At this point it is good idea to do `phpbrew install 7.1` (or other version you want to test extension with)
+# At this point it is good idea to do `phpbrew install 7.2` (or other version you want to test extension with)
 # and `phpbrew ext install ~/php-ref/`
 
 date > /home/vagrant/vagrant_provisioned_at

scripts/refresh-package-xml.php

@@ -1,10 +1,10 @@
 #!/usr/bin/env php
-<?php
+<?php declare(strict_types=1);
 
-/*
+/**
  * This file is part of the pinepain/php-ref PHP extension.
  *
- * Copyright (c) 2016-2017 Bogdan Padalko <[email protected]>
+ * Copyright (c) 2015-2018 Bogdan Padalko <[email protected]>
  *
  * Licensed under the MIT license: http://opensource.org/licenses/MIT
  *
@@ -13,6 +13,7 @@
  * http://opensource.org/licenses/MIT
  */
 
+
 chdir(__DIR__ . DIRECTORY_SEPARATOR . '..');
 
 $contents = [
@@ -39,6 +40,7 @@
     ],
 ];
 
+
 $files = [];
 
 $files[] = '<!-- begin files list -->';
@@ -103,6 +105,10 @@
 $package = preg_replace("/\<date\>.+\<\/date\>/", '<date>' . $datetime->format('Y-m-d') . '</date>', $package);
 $package = preg_replace("/\<time\>.+\<\/time\>/", '<time>' . $datetime->format('H:i:s') . '</time>', $package);
 
+$new_package_filename = 'package-new.xml';
+if (isset($argv[1]) && '-f' == $argv[1]) {
+    $new_package_filename = 'package.xml';
+}
 
 // Replace version:
 
@@ -117,9 +123,4 @@
 $package = preg_replace("/\<api\>\d+\.\d+.\d+\<\/api\>/", '<api>' . $version . '</api>', $package);
 
 
-$new_package_filename = 'package-new.xml';
-if (isset($argv[1]) && '-f' == $argv[1]) {
-    $new_package_filename = 'package.xml';
-}
-
 file_put_contents($new_package_filename, $package);

scripts/replace_expect.php

@@ -0,0 +1,112 @@
+#!/usr/bin/env php
+<?php declare(strict_types=1);
+/**
+ * This file is part of the pinepain/php-ref PHP extension.
+ *
+ * Copyright (c) 2015-2018 Bogdan Padalko <[email protected]>
+ *
+ * Licensed under the MIT license: http://opensource.org/licenses/MIT
+ *
+ * For the full copyright and license information, please view the
+ * LICENSE file that was distributed with this source or visit
+ * http://opensource.org/licenses/MIT
+ */
+
+$tests_dir = realpath(__DIR__ . '/../tests');
+
+
+$mode = 'write';
+
+$args = $argv;
+unset($args[0]);
+
+foreach ($argv as $i => $item) {
+    if ($item == '--pretend') {
+        $mode = 'pretend';
+        unset($args[$i]);
+    }
+}
+
+if (count($args) > 1) {
+    echo 'Invalid options', PHP_EOL;
+    exit(1);
+}
+
+if ($args) {
+    $mask = str_replace(['tests/', '.phpt', '.diff'], '', array_pop($args));
+} else {
+    $mask = '*';
+}
+
+$iterator = new GlobIterator($tests_dir . "/{$mask}.out", FilesystemIterator::KEY_AS_FILENAME);
+
+foreach ($iterator as $item) {
+    //var_dump($item);
+    $out_file  = $iterator->key();
+    $base_name = preg_replace('/\.out$/i', '', $iterator->key());
+    $test_file = $base_name . '.phpt';
+
+    $test_content = file_get_contents($tests_dir . '/' . $test_file);
+
+    if (false !== ($pos = strpos($test_content, '--EXPECT--'))) {
+        printf("--EXPECT--  [%s]" . PHP_EOL, $iterator->key());
+
+        $test_content = substr($test_content, 0, $pos);
+        $test_content .= '--EXPECT--' . PHP_EOL;
+        $test_content .= file_get_contents($tests_dir . '/' . $out_file);
+        $test_content .= PHP_EOL;
+        file_put_contents($tests_dir . '/' . $test_file, $test_content);
+
+        foreach (['.diff', '.exp', '.log', '.mem', '.out', '.php', '.sh'] as $ext) {
+            @unlink($tests_dir . '/' . $base_name . $ext);
+        }
+
+        continue;
+        //} elseif (0) {
+    } elseif (false !== ($pos = strpos($test_content, '--EXPECTF--'))) {
+
+        printf("--EXPECTF--  [%s]" . PHP_EOL, $iterator->key());
+
+        // get replacements
+
+        $tests  = substr($test_content, 0, $pos);
+        $result = file_get_contents($tests_dir . '/' . $out_file);
+
+        preg_match_all('#// EXPECTF: \-\-\-(.+)#', $tests, $expectf_search);
+        preg_match_all('#// EXPECTF: \+\+\+(.+)#', $tests, $expectf_replace);
+
+        if (count($expectf_search) != count($expectf_replace)) {
+            printf("please, edit manually [%s]: searches and replaces count doesn't match" . PHP_EOL, $iterator->key());
+            continue;
+        }
+
+        foreach (array_combine($expectf_search[1], $expectf_replace[1]) as $search => $replace) {
+            $replace = str_replace('\\\\n', '!!(ಠ_ಠ)!!', $replace);
+            $replace = str_replace('\\n', "\n", $replace);
+            $replace = str_replace('!!(ಠ_ಠ)!!', '\\\\n', $replace);
+
+            $result = preg_replace($search, $replace, $result);
+        }
+
+        $test_content = $tests;
+        $test_content .= '--EXPECTF--' . PHP_EOL;
+        $test_content .= $result;
+        $test_content .= PHP_EOL;
+
+        if ($mode == 'pretend') {
+            echo $result, PHP_EOL;
+            echo PHP_EOL;
+
+        } elseif ($mode = 'write') {
+            file_put_contents($tests_dir . '/' . $test_file, $test_content);
+
+            foreach (['.diff', '.exp', '.log', '.mem', '.out', '.php', '.sh'] as $ext) {
+                @unlink($tests_dir . '/' . $base_name . $ext);
+            }
+        }
+
+        continue;
+    }
+
+    printf("please, edit manually [%s]" . PHP_EOL, $iterator->key());
+}