optimize code

Author: matyhtf

CMakeLists.txt

@@ -1,6 +1,5 @@
-#project
 project(phpx)
-cmake_minimum_required(VERSION 2.4)
+cmake_minimum_required(VERSION 2.8.1)
 aux_source_directory(src DIR_SRCS)
 file(GLOB_RECURSE HEADER_FILES include/*.h)
 

script/gen_stub.php

@@ -76,6 +76,21 @@ function processStubFile(string $stubFile, Context $context): ?FileInfo {
             if (($context->forceRegeneration || $stubHash !== $oldStubHash) && file_put_contents($legacyFile, $arginfoCode)) {
                 echo "Saved $legacyFile\n";
             }
+
+            $arginfoFile_for_phpx = str_replace('.stub.php', '_x_arginfo.h', $stubFile);
+            $content = "BEGIN_EXTERN_C()\n";
+
+            $content .= "#if PHP_VERSION_ID < 80000\n";
+            $content .= "#include \"".basename($legacyFile)."\"\n";
+            $content .= "#else\n";
+            $content .= "#include \"".basename($arginfoFile)."\"\n";
+            $content .= "#endif\n";
+            $content .= "END_EXTERN_C()\n";
+            $content .= "";
+
+            if (file_put_contents($arginfoFile_for_phpx, $content)) {
+                echo "Saved $arginfoFile_for_phpx\n";
+            }
         }
 
         return $fileInfo;
@@ -2422,7 +2437,7 @@ function(?ArgInfo $aliasArg, ?ArgInfo $aliasedArg) use ($aliasFunc, $aliasedFunc
 
         foreach ($methodSynopses as $filename => $content) {
             if (file_put_contents("$methodSynopsesDirectory/$filename", $content)) {
-                echo "Saved $filename\n";
+                echo "[1] Saved $filename\n";
             }
         }
     }
@@ -2433,7 +2448,7 @@ function(?ArgInfo $aliasArg, ?ArgInfo $aliasedArg) use ($aliasFunc, $aliasedFunc
 
     foreach ($methodSynopses as $filename => $content) {
         if (file_put_contents($filename, $content)) {
-            echo "Saved $filename\n";
+            echo "[2] Saved $filename\n";
         }
     }
 }

src/base.cc

@@ -334,7 +334,7 @@ static inline ZEND_RESULT_CODE _check_args_num(zend_execute_data *data, int num_
 void _exec_function(zend_execute_data *data, zval *return_value) {
     auto iter_func = function_map.find((const char *) data->func->common.function_name->val);
     if (iter_func == function_map.end()) {
-        error(E_WARNING, "function '%s' not found",  data->func->common.function_name->val);
+        error(E_WARNING, "[phpx::_exec_function] function '%s' not found",  data->func->common.function_name->val);
         return;
     }
 
@@ -359,12 +359,12 @@ void _exec_function(zend_execute_data *data, zval *return_value) {
 void _exec_method(zend_execute_data *data, zval *return_value) {
     auto iter_class = method_map.find((const char *) data->func->common.scope->name->val);
     if (iter_class == method_map.end()) {
-        error(E_WARNING, "class '%s' not found",  data->func->common.scope->name->val);
+        error(E_WARNING, "[phpx::_exec_method] class '%s' not found",  data->func->common.scope->name->val);
         return;
     }
     auto iter_method = iter_class->second.find((const char *) data->func->common.function_name->val);
     if (iter_method == iter_class->second.end()) {
-        error(E_WARNING, "method '%s' not found",  data->func->common.function_name->val);
+        error(E_WARNING, "[phpx::_exec_method] method '%s' not found",  data->func->common.function_name->val);
         return;
     }