updates to handle "complex" exceptions, and capture code coverage

symplely · Mar 4, 2021 · 1ba7872 · 1ba7872
1 parent d54d9cc
commit 1ba7872
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/.github/workflows/spawn_macos.yml b/.github/workflows/spawn_macos.yml
@@ -25,9 +25,8 @@ jobs:
       - name: Install dependencies
         run: composer install
       - name: Test with phpunit
-        run: vendor/bin/phpunit -d zend.enable_gc=0 --coverage-clover=coverage/phpunit/clover.xml
+        run: vendor/bin/phpunit -d zend.enable_gc=0 --coverage-clover=coverage.xml
       - name: Submit code coverage
-        if: ${{ success() }} || ${{ failure() }}
         uses: codecov/codecov-action@v1
         with:
           file: ./coverage.xml # optional
diff --git a/Spawn/SerializableException.php b/Spawn/SerializableException.php
@@ -29,9 +29,14 @@ public function __construct(Throwable $exception)
 
     public function asThrowable(): Throwable
     {
-        /** @var Throwable $throwable */
-        $throwable = new $this->class($this->message . "\n\n" . $this->trace);
-
+        try {
+            /** @var Throwable $throwable */
+            $throwable = new $this->class($this->message . "\n\n" . $this->trace);
+        } catch (Throwable $exception) {
+            // @codeCoverageIgnoreStart
+            $throwable = new \Exception($this->message . "\n\n" . $this->trace, 0, $exception);
+            // @codeCoverageIgnoreEnd
+        }
         return $throwable;
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -26,4 +26,9 @@
             </exclude>
         </whitelist>
     </filter>
+
+    <php>
+        <env name="XDEBUG_MODE" value="coverage"/>
+        <ini name="xdebug.mode" value="coverage"/>
+    </php>
 </phpunit>