Change generator to replace error_clear_last and error_get_last with custom error handler

Author: jfoulquie-tnw

generator/src/FileCreator.php

@@ -135,10 +135,20 @@ public function createExceptionFile(string $moduleName): void
 
 class {$exceptionName} extends \ErrorException implements SafeExceptionInterface
 {
-    public static function createFromPhpError(): self
+    /**
+     *
+     * @param array{type?: int, message?: string, file?: string, line?: int} \$error
+     * @return \Safe\Exceptions\{$exceptionName}
+     */
+    public static function createFromPhpError(array \$error = null): self
     {
-        \$error = error_get_last();
-        return new self(\$error['message'] ?? 'An error occured', 0, \$error['type'] ?? 1);
+        return new self(
+            \$error['message'] ?? 'An error occured',
+            0,
+            \$error['type'] ?? 1,
+            \$error['file'] ?? __FILE__,
+            \$error['line'] ?? __LINE__,
+        );
     }
 }
 

generator/src/WritePhpFunction.php

@@ -53,9 +53,30 @@ private function writePhpFunction(): string
         $moduleName = $this->method->getModuleName();
 
         $phpFunction .= "function {$this->method->getFunctionName()}({$this->displayParamsWithType($this->method->getParams())}){$returnType}
-{
-    error_clear_last();
-";
+{";
+
+        $includeErrorHandler = true;
+        // Certain methods from curl don't need the custom error handler
+        if ($moduleName !== 'Curl') {
+            $params = $this->method->getParams();
+            if (\count($params) > 0 && in_array($params[0]->getParameter(), ['handle', 'multi_handle', 'share_handle'])) {
+                $includeErrorHandler = false;
+            }
+        }
+
+        if ($includeErrorHandler) {
+            $phpFunction .= "
+    \$error = [];
+    set_error_handler( function(int \$errno, string \$errstr, string \$errfile, int \$errline) use (&\$error) {
+        \$error = [
+            'type' => \$errno,
+            'message' => \$errstr,
+            'file' => \$errfile,
+            'line' => \$errline,
+        ];
+        return false;
+    });\n";
+        }
 
         if (!$this->method->isOverloaded()) {
             $phpFunction .= '    $result = '.$this->printFunctionCall($this->method);
@@ -88,6 +109,7 @@ private function writePhpFunction(): string
             $phpFunction .= '        $result = '.$this->printFunctionCall($method)."\n";
             $phpFunction .= '    }';
         }
+        $phpFunction .= "\n    restore_error_handler();\n";
 
         $phpFunction .= $this->generateExceptionCode($moduleName, $this->method).$returnStatement. '}
 ';
@@ -126,7 +148,7 @@ private function generateExceptionCode(string $moduleName, Method $method) : str
         $exceptionName = FileCreator::toExceptionName($moduleName);
         return "
     if (\$result === $errorValue) {
-        throw {$exceptionName}::createFromPhpError();
+        throw {$exceptionName}::createFromPhpError(\$error);
     }
 ";
     }