Add PHP 8.1 support to extension (#27)

* PHP 8.1 extension compatibility

* Update version numbers

* Allow PHP 8.1 in PECL config

* Update CHANGLELOG

Author: andrewdalpino

CHANGELOG.md

@@ -1,3 +1,6 @@
+- 3.1.0
+    - PHP 8.1 extension compatibility
+
 - 3.0.1
     - Add positive semi-definite typehinting
 

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Andrew DalPino
+Copyright (c) 2022 Andrew DalPino
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

build-ext

@@ -16,7 +16,7 @@ EOT
 
 chdir(__DIR__);
 
-echo 'Reading config.m4 file... ';
+echo 'Reading config.m4 file';
 
 $configM4Contents = file_get_contents(CONFIG_M4_PATH);
 
@@ -25,28 +25,23 @@ if (!$configM4Contents) {
 
     exit(1);
 }
-echo "done.\n";
 
-echo 'Applying libexec patch...';
+echo 'Applying libexec patch';
 
 if (strpos($configM4Contents, EXECINFO_MATCH) === false) {
-    fwrite(STDERR, "patch entrypoint not found!\n");
+    fwrite(STDERR, "Patch entrypoint not found!\n");
 
     exit(1);
 } elseif (strpos($configM4Contents, trim(EXECINFO_PATCH)) !== false) {
-    echo "already applied.\n";
+    echo "Already applied.\n";
 } else {
     $configM4Contents = str_replace(EXECINFO_MATCH, EXECINFO_MATCH . EXECINFO_PATCH, $configM4Contents);
-    
-    echo "done.\n";
 }
 
-echo 'Saving config.m4 file... ';
+echo 'Saving config.m4 file';
 
 if (!file_put_contents(CONFIG_M4_PATH, $configM4Contents)) {
     fwrite(STDERR, "Failed to write the config.m4 file\n");
 
     exit(1);
 }
-
-echo "done.\n";

composer.json

@@ -29,7 +29,7 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.0",
-        "phalcon/zephir": "^0.15",
+        "phalcon/zephir": "^0.16",
         "phpbench/phpbench": "^1.0",
         "phpstan/extension-installer": "^1.0",
         "phpstan/phpstan": "^1.0",

config.json

@@ -4,7 +4,7 @@
     "extension-name": "tensor",
     "description": "A library and extension that provides objects for scientific computing in PHP.",
     "author": "Andrew DalPino",
-    "version": "3.0.0",
+    "version": "3.1.0",
     "verbose": true,
     "extra-cflags": "-O3 -ffast-math",
     "extra-libs": "-lopenblas -llapacke -lgfortran",

ext/kernel/file.c

@@ -65,7 +65,13 @@ int zephir_file_exists(zval *filename)
 		return FAILURE;
 	}
 
+#if PHP_VERSION_ID >= 80100
+	zend_string *file = zend_string_init(Z_STRVAL_P(filename), Z_STRLEN_P(filename), 0);
+	php_stat(file, FS_EXISTS, &return_value);
+	zval_ptr_dtor(file);
+#else
 	php_stat(Z_STRVAL_P(filename), (php_stat_len) Z_STRLEN_P(filename), FS_EXISTS, &return_value);
+#endif
 
 	if (Z_TYPE(return_value) != IS_TRUE) {
 		return FAILURE;
@@ -288,7 +294,13 @@ void zephir_file_put_contents(zval *return_value, zval *filename, zval *data)
 void zephir_filemtime(zval *return_value, zval *path)
 {
 	if (EXPECTED(Z_TYPE_P(path) == IS_STRING)) {
+#if PHP_VERSION_ID >= 80100
+		zend_string *file = zend_string_init(Z_STRVAL_P(path), Z_STRLEN_P(path), 0);
+		php_stat(file, FS_MTIME, return_value);
+		zval_ptr_dtor(file);
+#else
 		php_stat(Z_STRVAL_P(path), (php_stat_len)(Z_STRLEN_P(path)), FS_MTIME, return_value);
+#endif
 	} else {
 		ZVAL_FALSE(return_value);
 	}

ext/kernel/main.c

@@ -151,7 +151,7 @@ void zephir_fast_count(zval *result, zval *value)
 			}
 		}
 
-		if (instanceof_function(Z_OBJCE_P(value), spl_ce_Countable)) {
+		if (instanceof_function(Z_OBJCE_P(value), zend_ce_countable)) {
 #if PHP_VERSION_ID >= 80000
 			zend_call_method_with_0_params(Z_OBJ_P(value), NULL, NULL, "count", &retval);
 #else
@@ -201,7 +201,7 @@ int zephir_fast_count_ev(zval *value)
 			return (int) count > 0;
 		}
 
-		if (instanceof_function(Z_OBJCE_P(value), spl_ce_Countable)) {
+		if (instanceof_function(Z_OBJCE_P(value), zend_ce_countable)) {
 #if PHP_VERSION_ID >= 80000
 			zend_call_method_with_0_params(Z_OBJ_P(value), NULL, NULL, "count", &retval);
 #else
@@ -249,7 +249,7 @@ int zephir_fast_count_int(zval *value)
 			return (int) count;
 		}
 
-		if (instanceof_function(Z_OBJCE_P(value), spl_ce_Countable)) {
+		if (instanceof_function(Z_OBJCE_P(value), zend_ce_countable)) {
 #if PHP_VERSION_ID >= 80000
 			zend_call_method_with_0_params(Z_OBJ_P(value), NULL, NULL, "count", &retval);
 #else

ext/kernel/require.c

@@ -45,14 +45,22 @@ int zephir_require_ret(zval *return_value_ptr, const char *require_path)
 	}
 #endif
 
-    ret = php_stream_open_for_zend_ex(require_path, &file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE);
+#if PHP_VERSION_ID >= 80100
+	zend_string *zend_string_path = zend_string_init(require_path, strlen(require_path), 0);
+
+	zend_stream_init_filename_ex(&file_handle, zend_string_path);
+    ret = php_stream_open_for_zend_ex(&file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE);
+
+    zval_ptr_dtor(zend_string_path);
+#else
+	ret = php_stream_open_for_zend_ex(require_path, &file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE);
+#endif
     if (ret != SUCCESS) {
         return FAILURE;
     }
 
 	new_op_array = zend_compile_file(&file_handle, ZEND_REQUIRE);
 	if (new_op_array) {
-
 		if (file_handle.handle.stream.handle) {
 			ZVAL_NULL(&dummy);
 			if (!file_handle.opened_path) {
@@ -110,7 +118,16 @@ int zephir_require_once_ret(zval *return_value_ptr, const char *require_path)
 	}
 #endif
 
-    ret = php_stream_open_for_zend_ex(require_path, &file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE);
+#if PHP_VERSION_ID >= 80100
+	zend_string *zend_string_path = zend_string_init(require_path, strlen(require_path), 0);
+
+	zend_stream_init_filename_ex(&file_handle, zend_string_path);
+    ret = php_stream_open_for_zend_ex(&file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE);
+
+    zval_ptr_dtor(zend_string_path);
+#else
+	ret = php_stream_open_for_zend_ex(require_path, &file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE);
+#endif
     if (ret != SUCCESS) {
         return FAILURE;
     }

ext/php_tensor.h

@@ -14,7 +14,7 @@
 #define PHP_TENSOR_VERSION     "3.0.0"
 #define PHP_TENSOR_EXTNAME     "tensor"
 #define PHP_TENSOR_AUTHOR      "Andrew DalPino"
-#define PHP_TENSOR_ZEPVERSION  "0.15.2-$Id$"
+#define PHP_TENSOR_ZEPVERSION  "0.16.0-$Id$"
 #define PHP_TENSOR_DESCRIPTION "A library and extension that provides objects for scientific computing in PHP."
 
 

package.xml

@@ -10,18 +10,18 @@
         <email>[email protected]</email>
 		<active>yes</active>
 	</lead>
-	<date>2021-06-06</date>
+	<date>2022-04-01</date>
 	<version>
-		<release>3.0.00</release>
-		<api>3.0</api>
+		<release>3.1.0</release>
+		<api>3.1</api>
 	</version>
 	<stability>
 		<release>stable</release>
 		<api>stable</api>
 	</stability>
 	<license uri="https://github.com/RubixML/Tensor/blob/master/LICENSE">MIT</license>
     <notes>
-        - No changes
+        - PHP 8.1 extension compatibilitys
     </notes>
 	<contents>
         <dir name="/">
@@ -152,7 +152,7 @@
 		<required>
             <php>
                 <min>7.4.0</min>
-                <max>8.0.99</max>
+                <max>8.1.99</max>
             </php>
 			<pearinstaller>
 				<min>1.4.0</min>