Raise PHP version to ^8.0 + Add rector (#64)

Co-authored-by: Sergei Predvoditelev <[email protected]>

Author: xepozz

.github/workflows/bc.yml_

@@ -1,15 +1,14 @@
 on:
-    - pull_request
-    - push
+  - pull_request
+  - push
 
 name: backwards compatibility
+
 jobs:
-    roave_bc_check:
-        name: Roave BC Check
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@master
-            - name: fetch tags
-              run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-            - name: Roave BC Check
-              uses: docker://nyholm/roave-bc-check-ga
+  roave_bc_check:
+    uses: yiisoft/actions/.github/workflows/bc.yml@master
+    with:
+      os: >-
+        ['ubuntu-latest']
+      php: >-
+        ['8.0']

.github/workflows/build.yml

@@ -28,4 +28,4 @@ jobs:
       os: >-
         ['ubuntu-latest', 'windows-latest']
       php: >-
-        ['7.4', '8.0', '8.1']
+        ['8.0', '8.1', '8.2']

.github/workflows/rector.yml

@@ -0,0 +1,21 @@
+on:
+  pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - 'README.md'
+      - 'CHANGELOG.md'
+      - '.gitignore'
+      - '.gitattributes'
+      - 'infection.json.dist'
+      - 'psalm.xml'
+
+name: rector
+
+jobs:
+  rector:
+    uses: yiisoft/actions/.github/workflows/rector.yml@master
+    with:
+      os: >-
+        ['ubuntu-latest']
+      php: >-
+        ['8.0']

.github/workflows/static.yml

@@ -28,4 +28,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['7.4', '8.0', '8.1']
+        ['8.0', '8.1', '8.2']

CHANGELOG.md

@@ -1,8 +1,8 @@
 # Yii Error Handler Change Log
 
-## 2.1.2 under development
+## 2.2.0 under development
 
-- no changes in this release.
+- Chg #64: Raise PHP version to `^8.0` (@vjik, @xepozz)
 
 ## 2.1.1 January 26, 2023
 

README.md

@@ -30,14 +30,16 @@ The package provides advanced error handling. The features are:
 
 ## Requirements
 
-- PHP 7.4 or higher.
+- PHP 8.0 or higher.
+- `DOM` PHP extension.
+- `JSON` PHP extension.
 
 ## Installation
 
 The package could be installed with composer:
 
 ```shell
-composer require yiisoft/error-handler --prefer-dist
+composer require yiisoft/error-handler
 ```
 
 ## General usage

composer.json

@@ -21,7 +21,7 @@
         "source": "https://github.com/yiisoft/error-handler"
     },
     "require": {
-        "php": "^7.4|^8.0",
+        "php": "^8.0",
         "ext-dom": "*",
         "ext-json": "*",
         "alexkart/curl-builder": "^1.0",
@@ -38,6 +38,7 @@
         "httpsoft/http-message": "^1.0.9",
         "phpunit/phpunit": "^9.5",
         "psr/http-server-handler": "^1.0",
+        "rector/rector": "^0.15.10",
         "roave/infection-static-analysis-plugin": "^1.16",
         "spatie/phpunit-watcher": "^1.23",
         "vimeo/psalm": "^4.18",

rector.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
+use Rector\Config\RectorConfig;
+use Rector\Php70\Rector\FuncCall\NonVariableToVariableOnFunctionCallRector;
+use Rector\Php71\Rector\FuncCall\RemoveExtraParametersRector;
+use Rector\Php74\Rector\Closure\ClosureToArrowFunctionRector;
+use Rector\Set\ValueObject\LevelSetList;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->paths([
+        __DIR__ . '/src',
+        __DIR__ . '/tests',
+    ]);
+
+    // register a single rule
+    $rectorConfig->rule(InlineConstructorDefaultToPropertyRector::class);
+
+    // define sets of rules
+    $rectorConfig->sets([
+        LevelSetList::UP_TO_PHP_80,
+    ]);
+
+    $rectorConfig->skip([
+        ClosureToArrowFunctionRector::class,
+        NonVariableToVariableOnFunctionCallRector::class,
+        RemoveExtraParametersRector::class,
+    ]);
+};

src/ErrorData.php

@@ -5,30 +5,21 @@
 namespace Yiisoft\ErrorHandler;
 
 use Psr\Http\Message\ResponseInterface;
+use Stringable;
 
 /**
  * ErrorData stores content and headers that are suitable for adding to response.
  */
-final class ErrorData
+final class ErrorData implements Stringable
 {
-    /**
-     * @var string The content to use as response body.
-     */
-    private string $content;
-
-    /**
-     * @var array<string, string|string[]> The headers to add to the response.
-     */
-    private array $headers;
-
     /**
      * @param string $content The content to use as response body.
      * @param array<string, string|string[]> $headers The headers to add to the response.
      */
-    public function __construct(string $content, array $headers = [])
-    {
-        $this->content = $content;
-        $this->headers = $headers;
+    public function __construct(
+        private string $content,
+        private array $headers = [],
+    ) {
     }
 
     /**

src/ErrorHandler.php

@@ -41,28 +41,18 @@ final class ErrorHandler
     private bool $enabled = false;
     private bool $initialized = false;
 
-    private LoggerInterface $logger;
-    private ThrowableRendererInterface $defaultRenderer;
-    private ?EventDispatcherInterface $eventDispatcher;
-
     public function __construct(
-        LoggerInterface $logger,
-        ThrowableRendererInterface $defaultRenderer,
-        EventDispatcherInterface $eventDispatcher = null
+        private LoggerInterface $logger,
+        private ThrowableRendererInterface $defaultRenderer,
+        private ?EventDispatcherInterface $eventDispatcher = null,
     ) {
-        $this->logger = $logger;
-        $this->defaultRenderer = $defaultRenderer;
-        $this->eventDispatcher = $eventDispatcher;
     }
 
     /**
      * Handles throwable and returns error data.
      *
-     * @param Throwable $t
      * @param ThrowableRendererInterface|null $renderer
      * @param ServerRequestInterface|null $request
-     *
-     * @return ErrorData
      */
     public function handle(
         Throwable $t,
@@ -195,8 +185,6 @@ private function initializeOnce(): void
 
     /**
      * Renders the throwable and terminates the script.
-     *
-     * @param Throwable $t
      */
     private function renderThrowableAndTerminate(Throwable $t): void
     {