Fix atk4 backtrace highlight in exception render (#405)

atk4 · Feb 12, 2024 · eb71cd8 · eb71cd8
1 parent 48a86cf
commit eb71cd8
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build-changelog.yml b/.github/workflows/build-changelog.yml
@@ -11,6 +11,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Run
-        uses: release-drafter/release-drafter@v5
+        uses: release-drafter/release-drafter@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml
@@ -37,7 +37,7 @@ jobs:
           echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Setup cache 2/2
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-smoke-${{ matrix.php }}-${{ matrix.type }}-${{ hashFiles('composer.json') }}
@@ -99,7 +99,7 @@ jobs:
           echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Setup cache 2/2
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.type }}-${{ hashFiles('composer.json') }}

diff --git a/src/ExceptionRenderer/Console.php b/src/ExceptionRenderer/Console.php
@@ -88,7 +88,7 @@ protected function processStackTraceInternal(): void
             $call = $this->parseStackTraceFrame($call);
 
             $escapeFrame = false;
-            if ($inAtk && !preg_match('~atk4[/\\\\][^/\\\\]+[/\\\\]src[/\\\\]~', $call['file'])) {
+            if ($inAtk && $call['file'] !== '' && !preg_match('~atk4[/\\\\][^/\\\\]+[/\\\\]src[/\\\\]~', $call['file'])) {
                 $escapeFrame = true;
                 $inAtk = false;
             }

diff --git a/src/ExceptionRenderer/Html.php b/src/ExceptionRenderer/Html.php
@@ -146,7 +146,7 @@ protected function processStackTraceInternal(): void
             $call = $this->parseStackTraceFrame($call);
 
             $escapeFrame = false;
-            if ($inAtk && !preg_match('~atk4[/\\\\][^/\\\\]+[/\\\\]src[/\\\\]~', $call['file'])) {
+            if ($inAtk && $call['file'] !== '' && !preg_match('~atk4[/\\\\][^/\\\\]+[/\\\\]src[/\\\\]~', $call['file'])) {
                 $escapeFrame = true;
                 $inAtk = false;
             }

diff --git a/src/ExceptionRenderer/Json.php b/src/ExceptionRenderer/Json.php
@@ -85,7 +85,7 @@ protected function processStackTraceInternal(): void
             $call = $this->parseStackTraceFrame($call);
 
             $escapeFrame = false;
-            if ($inAtk && !preg_match('~atk4[/\\\\][^/\\\\]+[/\\\\]src[/\\\\]~', $call['file'])) {
+            if ($inAtk && $call['file'] !== '' && !preg_match('~atk4[/\\\\][^/\\\\]+[/\\\\]src[/\\\\]~', $call['file'])) {
                 $escapeFrame = true;
                 $inAtk = false;
             }