Merge branch 'master' into solution

Author: vjik

.github/workflows/bc.yml

@@ -1,8 +1,28 @@
 on:
-  - pull_request
-  - push
+  pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - 'README.md'
+      - 'CHANGELOG.md'
+      - '.gitignore'
+      - '.gitattributes'
+      - 'infection.json.dist'
+      - 'phpunit.xml.dist'
+      - 'psalm.xml'
+  push:
+    branches: ['master']
+    paths-ignore:
+      - 'docs/**'
+      - 'README.md'
+      - 'CHANGELOG.md'
+      - '.gitignore'
+      - '.gitattributes'
+      - 'infection.json.dist'
+      - 'phpunit.xml.dist'
+      - 'psalm.xml'
 
 name: backwards compatibility
+
 jobs:
   roave_bc_check:
     uses: yiisoft/actions/.github/workflows/bc.yml@master

.github/workflows/build.yml

@@ -10,6 +10,7 @@ on:
       - 'psalm.xml'
 
   push:
+    branches: ['master']
     paths-ignore:
       - 'docs/**'
       - 'README.md'
@@ -24,8 +25,10 @@ name: build
 jobs:
   phpunit:
     uses: yiisoft/actions/.github/workflows/phpunit.yml@master
+    secrets:
+      codecovToken: ${{ secrets.CODECOV_TOKEN }}
     with:
       os: >-
         ['ubuntu-latest', 'windows-latest']
       php: >-
-        ['8.0', '8.1', '8.2']
+        ['8.0', '8.1', '8.2', '8.3']

.github/workflows/composer-require-checker.yml

@@ -11,6 +11,7 @@ on:
       - 'psalm.xml'
 
   push:
+    branches: ['master']
     paths-ignore:
       - 'docs/**'
       - 'README.md'
@@ -30,4 +31,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0', '8.1', '8.2']
+        ['8.0', '8.1', '8.2', '8.3']

.github/workflows/mutation.yml

@@ -9,6 +9,7 @@ on:
       - 'psalm.xml'
 
   push:
+    branches: ['master']
     paths-ignore:
       - 'docs/**'
       - 'README.md'

CHANGELOG.md

@@ -1,7 +1,8 @@
 # Yii Error Handler Change Log
 
-## 3.3.1 under development
+## 3.4.0 under development
 
+- Enh #125: Add error code & show function arguments (@xepozz)
 - Enh #130: Pass exception message instead of rendered exception to logger in `ErrorHandler` (@olegbaturin)
 - Enh #133: Extract response generator from `ErrorCatcher` middleware into separate `ThrowableResponseFactory` class (@olegbaturin)
 

src/ErrorHandler.php

@@ -134,7 +134,8 @@ public function register(): void
                 return true;
             }
 
-            $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+            $backtrace = debug_backtrace(0);
+            array_shift($backtrace);
             throw new ErrorException($message, $severity, $severity, $file, $line, null, $backtrace);
         });
 

src/Renderer/HtmlRenderer.php

@@ -267,22 +267,34 @@ public function renderCallStack(Throwable $t, array $trace = []): string
             [],
         );
 
-        $length = count($trace);
-        for ($i = 0; $i < $length; ++$i) {
-            $file = !empty($trace[$i]['file']) ? $trace[$i]['file'] : null;
-            $line = !empty($trace[$i]['line']) ? $trace[$i]['line'] : null;
-            $class = !empty($trace[$i]['class']) ? $trace[$i]['class'] : null;
-            $args = !empty($trace[$i]['args']) ? $trace[$i]['args'] : [];
+        $index = 1;
+        if ($t instanceof ErrorException) {
+            $index = 0;
+        }
+
+        foreach ($trace as $traceItem) {
+            $file = !empty($traceItem['file']) ? $traceItem['file'] : null;
+            $line = !empty($traceItem['line']) ? $traceItem['line'] : null;
+            $class = !empty($traceItem['class']) ? $traceItem['class'] : null;
+            $args = !empty($traceItem['args']) ? $traceItem['args'] : [];
 
             $parameters = [];
             $function = null;
-            if (!empty($trace[$i]['function']) && $trace[$i]['function'] !== 'unknown') {
-                $function = $trace[$i]['function'];
-                if ($class !== null && !str_contains($function, '{closure}')) {
-                    $parameters = (new \ReflectionMethod($class, $function))->getParameters();
+            if (!empty($traceItem['function']) && $traceItem['function'] !== 'unknown') {
+                $function = $traceItem['function'];
+                if (!str_contains($function, '{closure}')) {
+                    try {
+                        if ($class !== null && class_exists($class)) {
+                            $parameters = (new \ReflectionMethod($class, $function))->getParameters();
+                        } elseif (function_exists($function)) {
+                            $parameters = (new \ReflectionFunction($function))->getParameters();
+                        }
+                    } catch (\ReflectionException) {
+                        // pass
+                    }
                 }
             }
-            $index = $i + 2;
+            $index++;
 
             if ($this->isVendorFile($file)) {
                 $vendor[$index] = $this->renderCallStackItem(
@@ -599,7 +611,7 @@ private function groupVendorCallStackItems(array $items): array
             $groupedItems[$groupIndex][$index] = $item;
         }
 
-        /** @psalm-var array<int, array<int, string>> $groupedItems It's need for Psalm <=4.30 only. */
+        /** @psalm-var array<int, array<int, string>> $groupedItems It's needed for Psalm <=4.30 only. */
 
         return $groupedItems;
     }

templates/development.php

@@ -73,6 +73,7 @@
             <?php else: ?>
                 <span><?= $exceptionClass ?></span>
             <?php endif ?>
+            (Code #<?= $throwable->getCode() ?>)
         </div>
 
         <div class="exception-message">