update header notice and array to list type

juliangut · Mar 5, 2024 · 7fae411 · 7fae411
1 parent 6ac5e07
commit 7fae411
Show file tree

Hide file tree

Showing 31 changed files with 65 additions and 58 deletions.
diff --git a/composer.json b/composer.json
@@ -34,7 +34,7 @@
     "ext-simplexml": "*",
     "filp/whoops": "^2.15",
     "infection/infection": "~0.25|~0.27",
-    "juliangut/easy-coding-standard-config": "^1.12",
+    "juliangut/easy-coding-standard-config": "^1.15",
     "juliangut/phpstan-config": "^1.1",
     "laminas/laminas-diactoros": "^3.2",
     "overtrue/phplint": "^9.0",
@@ -48,7 +48,7 @@
   },
   "suggest": {
     "filp/whoops": "Enhance development error reporting (>=2.15)",
-    "symfony/var-dumper": "Help filp/whoops enhancing stack-traces (>=5.1)"
+    "symfony/var-dumper": "Help filp/whoops enhancing stack-traces (>=6.0)"
   },
   "autoload": {
     "psr-4": {

diff --git a/ecs.php b/ecs.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * (c) 2017-2023 Julián Gutiérrez <juliangut@gmail.com>
+ * (c) 2017-2024 Julián Gutiérrez <juliangut@gmail.com>
  *
  * @license BSD-3-Clause
  * @link https://github.com/juliangut/slim-exception
@@ -13,25 +13,33 @@
 use SlevomatCodingStandard\Sniffs\Exceptions\ReferenceThrowableOnlySniff;
 use Symplify\EasyCodingStandard\Config\ECSConfig;
 
-return static function (ECSConfig $ecsConfig): void {
-    $header = <<<'HEADER'
+$configSet = (new ConfigSet80())
+    ->setHeader(<<<'HEADER'
     (c) 2017-{{year}} Julián Gutiérrez <juliangut@gmail.com>
 
     @license BSD-3-Clause
     @link https://github.com/juliangut/slim-exception
-    HEADER;
-
-    $ecsConfig->paths([
-        __FILE__,
-        __DIR__ . '/src',
-        __DIR__ . '/tests',
+    HEADER)
+    ->enablePhpUnitRules()
+    ->setAdditionalSkips([
+        ReferenceThrowableOnlySniff::class . '.ReferencedGeneralException' => [
+            __DIR__ . '/src/ExceptionHandler.php',
+        ],
     ]);
+$paths = [
+    __FILE__,
+    __DIR__ . '/src',
+    __DIR__ . '/tests',
+];
+
+if (!method_exists(ECSConfig::class, 'configure')) {
+    return static function (ECSConfig $ecsConfig) use ($configSet, $paths): void {
+        $ecsConfig->paths($paths);
+
+        $configSet->configure($ecsConfig);
+    };
+}
 
-    (new ConfigSet80())
-        ->setHeader($header)
-        ->enablePhpUnitRules()
-        ->setAdditionalSkips([
-            ReferenceThrowableOnlySniff::class . '.ReferencedGeneralException' => __DIR__ . '/src/ExceptionHandler.php',
-        ])
-        ->configure($ecsConfig);
-};
+return $configSet
+    ->configureBuilder()
+    ->withPaths($paths);
diff --git a/src/ExceptionHandler.php b/src/ExceptionHandler.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * (c) 2017-2023 Julián Gutiérrez <juliangut@gmail.com>
+ * (c) 2017-2024 Julián Gutiérrez <juliangut@gmail.com>
  *
  * @license BSD-3-Clause
  * @link https://github.com/juliangut/slim-exception
@@ -147,18 +147,18 @@ private function getFatalException(array $error): HttpException
     }
 
     /**
-     * @return array<array<string, mixed>>
+     * @return list<array<string, mixed>>
      */
     private function getBackTrace(): array
     {
         $trace = [];
 
         if (\function_exists('xdebug_get_function_stack')) {
             try {
-                $trace = array_map(
+                $trace = array_values(array_map(
                     fn(array $frame): array => $this->normalizeFrame($frame),
                     xdebug_get_function_stack(),
-                );
+                ));
             } catch (ErrorException) {
                 // @ignoreException
             }

diff --git a/src/Handler/ErrorHandler.php b/src/Handler/ErrorHandler.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * (c) 2017-2023 Julián Gutiérrez <juliangut@gmail.com>
+ * (c) 2017-2024 Julián Gutiérrez <juliangut@gmail.com>
  *
  * @license BSD-3-Clause
  * @link https://github.com/juliangut/slim-exception

diff --git a/src/Renderer/AbstractRenderer.php b/src/Renderer/AbstractRenderer.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * (c) 2017-2023 Julián Gutiérrez <juliangut@gmail.com>
+ * (c) 2017-2024 Julián Gutiérrez <juliangut@gmail.com>
  *
  * @license BSD-3-Clause
  * @link https://github.com/juliangut/slim-exception

diff --git a/src/Renderer/HtmlRenderer.php b/src/Renderer/HtmlRenderer.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * (c) 2017-2023 Julián Gutiérrez <juliangut@gmail.com>
+ * (c) 2017-2024 Julián Gutiérrez <juliangut@gmail.com>
  *
  * @license BSD-3-Clause
  * @link https://github.com/juliangut/slim-exception

diff --git a/src/Renderer/JsonRenderer.php b/src/Renderer/JsonRenderer.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * (c) 2017-2023 Julián Gutiérrez <juliangut@gmail.com>
+ * (c) 2017-2024 Julián Gutiérrez <juliangut@gmail.com>
  *
  * @license BSD-3-Clause
  * @link https://github.com/juliangut/slim-exception

diff --git a/src/Renderer/PlainTextRenderer.php b/src/Renderer/PlainTextRenderer.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * (c) 2017-2023 Julián Gutiérrez <juliangut@gmail.com>
+ * (c) 2017-2024 Julián Gutiérrez <juliangut@gmail.com>
  *
  * @license BSD-3-Clause
  * @link https://github.com/juliangut/slim-exception

diff --git a/src/Renderer/XmlRenderer.php b/src/Renderer/XmlRenderer.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * (c) 2017-2023 Julián Gutiérrez <juliangut@gmail.com>
+ * (c) 2017-2024 Julián Gutiérrez <juliangut@gmail.com>
  *
  * @license BSD-3-Clause
  * @link https://github.com/juliangut/slim-exception

diff --git a/src/Whoops/Handler/ErrorHandler.php b/src/Whoops/Handler/ErrorHandler.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * (c) 2017-2023 Julián Gutiérrez <juliangut@gmail.com>
+ * (c) 2017-2024 Julián Gutiérrez <juliangut@gmail.com>
  *
  * @license BSD-3-Clause
  * @link https://github.com/juliangut/slim-exception
@@ -101,8 +101,6 @@ protected function determineRenderer(): callable
     /**
      * @throws InvalidArgumentException
      * @throws RuntimeException
-     *
-     * @return callable(Throwable): string
      */
     protected function determineLogRenderer(): callable
     {

diff --git a/src/Whoops/Renderer/HtmlRenderer.php b/src/Whoops/Renderer/HtmlRenderer.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * (c) 2017-2023 Julián Gutiérrez <juliangut@gmail.com>
+ * (c) 2017-2024 Julián Gutiérrez <juliangut@gmail.com>
  *
  * @license BSD-3-Clause
  * @link https://github.com/juliangut/slim-exception

diff --git a/src/Whoops/Renderer/JsonRenderer.php b/src/Whoops/Renderer/JsonRenderer.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * (c) 2017-2023 Julián Gutiérrez <juliangut@gmail.com>
+ * (c) 2017-2024 Julián Gutiérrez <juliangut@gmail.com>
  *
  * @license BSD-3-Clause
  * @link https://github.com/juliangut/slim-exception

diff --git a/src/Whoops/Renderer/PlainTextRenderer.php b/src/Whoops/Renderer/PlainTextRenderer.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * (c) 2017-2023 Julián Gutiérrez <juliangut@gmail.com>
+ * (c) 2017-2024 Julián Gutiérrez <juliangut@gmail.com>
  *
  * @license BSD-3-Clause
  * @link https://github.com/juliangut/slim-exception
@@ -65,12 +65,12 @@ private function formatError(array $error): string
             $error['message'],
             $error['file'],
             $error['line'],
-            $this->getStackTraceOutput($error['trace'] ?? []),
+            $this->getStackTraceOutput(array_values($error['trace'] ?? [])),
         );
     }
 
     /**
-     * @param array<TraceLine> $stackFrames
+     * @param list<TraceLine> $stackFrames
      */
     protected function getStackTraceOutput(array $stackFrames): string
     {

diff --git a/src/Whoops/Renderer/RendererTrait.php b/src/Whoops/Renderer/RendererTrait.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * (c) 2017-2023 Julián Gutiérrez <juliangut@gmail.com>
+ * (c) 2017-2024 Julián Gutiérrez <juliangut@gmail.com>
  *
  * @license BSD-3-Clause
  * @link https://github.com/juliangut/slim-exception

diff --git a/src/Whoops/Renderer/XmlRenderer.php b/src/Whoops/Renderer/XmlRenderer.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * (c) 2017-2023 Julián Gutiérrez <juliangut@gmail.com>
+ * (c) 2017-2024 Julián Gutiérrez <juliangut@gmail.com>
  *
  * @license BSD-3-Clause
  * @link https://github.com/juliangut/slim-exception
@@ -75,7 +75,7 @@ protected function getFormattedXml(array $data): string
     }
 
     /**
-     * @param array<mixed> $data
+     * @param array<int|string, mixed|array<int|string, mixed>> $data
      */
     protected function addDataNodes(SimpleXMLElement $node, array $data, string $nodeKey): SimpleXMLElement
     {
@@ -89,6 +89,7 @@ protected function addDataNodes(SimpleXMLElement $node, array $data, string $nod
             if (\is_array($value)) {
                 /** @var SimpleXMLElement $childNode */
                 $childNode = $node->addChild($key);
+                /** @var array<int|string, mixed> $value */
                 $this->addDataNodes($childNode, $value, $key);
             } else {
                 if (\is_object($value)) {

diff --git a/tests/Exception/ExceptionHandlerTest.php b/tests/Exception/ExceptionHandlerTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * (c) 2017-2023 Julián Gutiérrez <juliangut@gmail.com>
+ * (c) 2017-2024 Julián Gutiérrez <juliangut@gmail.com>
  *
  * @license BSD-3-Clause
  * @link https://github.com/juliangut/slim-exception

diff --git a/tests/Exception/Handler/ErrorHandlerTest.php b/tests/Exception/Handler/ErrorHandlerTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * (c) 2017-2023 Julián Gutiérrez <juliangut@gmail.com>
+ * (c) 2017-2024 Julián Gutiérrez <juliangut@gmail.com>
  *
  * @license BSD-3-Clause
  * @link https://github.com/juliangut/slim-exception

diff --git a/tests/Exception/Renderer/HtmlRendererTest.php b/tests/Exception/Renderer/HtmlRendererTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * (c) 2017-2023 Julián Gutiérrez <juliangut@gmail.com>
+ * (c) 2017-2024 Julián Gutiérrez <juliangut@gmail.com>
  *
  * @license BSD-3-Clause
  * @link https://github.com/juliangut/slim-exception

diff --git a/tests/Exception/Renderer/JsonRendererTest.php b/tests/Exception/Renderer/JsonRendererTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * (c) 2017-2023 Julián Gutiérrez <juliangut@gmail.com>
+ * (c) 2017-2024 Julián Gutiérrez <juliangut@gmail.com>
  *
  * @license BSD-3-Clause
  * @link https://github.com/juliangut/slim-exception

diff --git a/tests/Exception/Renderer/PlainTextRendererTest.php b/tests/Exception/Renderer/PlainTextRendererTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * (c) 2017-2023 Julián Gutiérrez <juliangut@gmail.com>
+ * (c) 2017-2024 Julián Gutiérrez <juliangut@gmail.com>
  *
  * @license BSD-3-Clause
  * @link https://github.com/juliangut/slim-exception

diff --git a/tests/Exception/Renderer/XmlRendererTest.php b/tests/Exception/Renderer/XmlRendererTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * (c) 2017-2023 Julián Gutiérrez <juliangut@gmail.com>
+ * (c) 2017-2024 Julián Gutiérrez <juliangut@gmail.com>
  *
  * @license BSD-3-Clause
  * @link https://github.com/juliangut/slim-exception

diff --git a/tests/Exception/Stubs/ErrorHandlerStub.php b/tests/Exception/Stubs/ErrorHandlerStub.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * (c) 2017-2023 Julián Gutiérrez <juliangut@gmail.com>
+ * (c) 2017-2024 Julián Gutiérrez <juliangut@gmail.com>
  *
  * @license BSD-3-Clause
  * @link https://github.com/juliangut/slim-exception

diff --git a/tests/Exception/Stubs/ExceptionHandlerStub.php b/tests/Exception/Stubs/ExceptionHandlerStub.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * (c) 2017-2023 Julián Gutiérrez <juliangut@gmail.com>
+ * (c) 2017-2024 Julián Gutiérrez <juliangut@gmail.com>
  *
  * @license BSD-3-Clause
  * @link https://github.com/juliangut/slim-exception

diff --git a/tests/Exception/Stubs/InspectorStub.php b/tests/Exception/Stubs/InspectorStub.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * (c) 2017-2023 Julián Gutiérrez <juliangut@gmail.com>
+ * (c) 2017-2024 Julián Gutiérrez <juliangut@gmail.com>
  *
  * @license BSD-3-Clause
  * @link https://github.com/juliangut/slim-exception

diff --git a/tests/Exception/Stubs/RendererStub.php b/tests/Exception/Stubs/RendererStub.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * (c) 2017-2023 Julián Gutiérrez <juliangut@gmail.com>
+ * (c) 2017-2024 Julián Gutiérrez <juliangut@gmail.com>
  *
  * @license BSD-3-Clause
  * @link https://github.com/juliangut/slim-exception

diff --git a/tests/Exception/Stubs/WhoopsErrorHandlerStub.php b/tests/Exception/Stubs/WhoopsErrorHandlerStub.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * (c) 2017-2023 Julián Gutiérrez <juliangut@gmail.com>
+ * (c) 2017-2024 Julián Gutiérrez <juliangut@gmail.com>
  *
  * @license BSD-3-Clause
  * @link https://github.com/juliangut/slim-exception

diff --git a/tests/Exception/Whoops/Handler/ErrorHandlerTest.php b/tests/Exception/Whoops/Handler/ErrorHandlerTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * (c) 2017-2023 Julián Gutiérrez <juliangut@gmail.com>
+ * (c) 2017-2024 Julián Gutiérrez <juliangut@gmail.com>
  *
  * @license BSD-3-Clause
  * @link https://github.com/juliangut/slim-exception

diff --git a/tests/Exception/Whoops/Renderer/HtmlRendererTest.php b/tests/Exception/Whoops/Renderer/HtmlRendererTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * (c) 2017-2023 Julián Gutiérrez <juliangut@gmail.com>
+ * (c) 2017-2024 Julián Gutiérrez <juliangut@gmail.com>
  *
  * @license BSD-3-Clause
  * @link https://github.com/juliangut/slim-exception