Merge pull request #3 from ace411/v0.x

v0.2.1 fixes

Author: ace411

src/internal/asyncify.php

@@ -62,15 +62,13 @@ function asyncify(
   )
     ->then(
       function (?string $result) {
-        if (\preg_match('/(Error:)/', $result)) {
-          return reject(new \Exception(head(\explode(PHP_EOL, $result))));
-        }
+        $data = \unserialize(\base64_decode($result));
 
-        if (\preg_match('/(Exception:)/', $result)) {
-          return reject(new \Exception($result));
+        if ($data instanceof \Throwable) {
+          return reject(new \Exception($data->getMessage()));
         }
 
-        return resolve(\unserialize(\base64_decode($result)));
+        return resolve($data);
       }
     );
 }

src/internal/constants.php

@@ -22,7 +22,7 @@ function handleException(Throwable $exception): void
 }
 function handleError(...$args)
 {
-  echo "Error: " . $args[1] . PHP_EOL;
+  throw new \Exception($args[1]);
 }
 \set_error_handler("handleError", E_ALL);
 \set_exception_handler("handleException");
@@ -34,7 +34,7 @@ function (...$args) {
         return %s(...$args);
       },
       function ($err) {
-        return "Exception: " . $err->getMessage();
+        return new \Exception("Exception: " . $err->getMessage());
       }
     )(...\unserialize(\base64_decode("%s")))
   )

tests/AsyncTest.php

@@ -31,7 +31,7 @@ public function asyncifyProvider(): array
         ['file_get_contents', ['foo.txt']],
         concat(
           ' ',
-          'Error: file_get_contents(foo.txt):',
+          'Exception: file_get_contents(foo.txt):',
           PHP_VERSION_ID >= 80000 ? 'Failed' : 'failed',
           'to open stream: No such file or directory'
         ),
@@ -41,8 +41,7 @@ public function asyncifyProvider(): array
         ['file_get_contents', []],
         concat(
           ' ',
-          PHP_VERSION_ID >= 80000 ? 'Exception:' : 'Error:',
-          'file_get_contents() expects at least 1',
+          'Exception: file_get_contents() expects at least 1',
           PHP_VERSION_ID >= 80000 ? 'argument,' : 'parameter,',
           '0 given'
         ),
@@ -53,7 +52,7 @@ public function asyncifyProvider(): array
           '(function ($file) { if (!\is_file($file)) { trigger_error("Could not find file " . $file); } return \file_get_contents($file); })',
           ['foo.txt'],
         ],
-        'Error: Could not find file foo.txt',
+        'Exception: Could not find file foo.txt',
       ],
       // check if objects can be passed
       [