Bump PHP to 8.1, minor refactoring, improve CI (#110)

.github/workflows/bc.yml

@@ -1,6 +1,25 @@
 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
 
@@ -11,4 +30,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0']
+        ['8.1']

.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.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.1', '8.2', '8.3']

.github/workflows/mutation.yml

@@ -9,6 +9,7 @@ on:
       - 'psalm.xml'
 
   push:
+    branches: ['master']
     paths-ignore:
       - 'docs/**'
       - 'README.md'
@@ -26,6 +27,6 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.1']
+        ['8.2']
     secrets:
       STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}

.github/workflows/rector.yml

@@ -1,5 +1,5 @@
 on:
-  pull_request:
+  pull_request_target:
     paths-ignore:
       - 'docs/**'
       - 'README.md'
@@ -14,8 +14,11 @@ name: rector
 jobs:
   rector:
     uses: yiisoft/actions/.github/workflows/rector.yml@master
+    secrets:
+      token: ${{ secrets.YIISOFT_GITHUB_TOKEN }}
     with:
+      repository: ${{ github.event.pull_request.head.repo.full_name }}
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0']
+        ['8.3']

.github/workflows/static.yml

@@ -10,6 +10,7 @@ on:
       - 'phpunit.xml.dist'
 
   push:
+    branches: ['master']
     paths-ignore:
       - 'docs/**'
       - 'README.md'
@@ -28,4 +29,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0', '8.1']
+        ['8.1', '8.2', '8.3']

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## 2.1.2 under development
 
-- no changes in this release.
+- Enh #110: Raise the minimum PHP version to 8.1 and minor refactoring (@vjik)
 
 ## 2.1.1 September 04, 2024
 

composer.json

@@ -28,7 +28,7 @@
         }
     ],
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "psr/http-message": "^1.0|^2.0",
         "psr/http-server-handler": "^1.0",
         "psr/http-server-middleware": "^1.0",
@@ -50,7 +50,7 @@
         "rector/rector": "^2.0",
         "roave/infection-static-analysis-plugin": "^1.16",
         "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^4.30|^5.6",
+        "vimeo/psalm": "^5.6",
         "yiisoft/csrf": "^2.0",
         "yiisoft/di": "^1.2",
         "yiisoft/psr-dummy-provider": "^1.0",

rector.php

@@ -17,6 +17,6 @@
 
     // define sets of rules
     $rectorConfig->sets([
-        LevelSetList::UP_TO_PHP_80,
+        LevelSetList::UP_TO_PHP_81,
     ]);
 };

src/Action/SwaggerJson.php

@@ -20,9 +20,9 @@ final class SwaggerJson implements RequestHandlerInterface
     private DateInterval|int|null $cacheTTL = null;
 
     public function __construct(
-        private CacheInterface $cache,
-        private DataResponseFactoryInterface $responseFactory,
-        private SwaggerService $swaggerService
+        private readonly CacheInterface $cache,
+        private readonly DataResponseFactoryInterface $responseFactory,
+        private readonly SwaggerService $swaggerService
     ) {
     }
 

src/Action/SwaggerUi.php

@@ -29,10 +29,10 @@ final class SwaggerUi implements RequestHandlerInterface
     private string $jsonUrl = '/';
 
     public function __construct(
-        private ViewRenderer $viewRenderer,
-        private SwaggerService $swaggerService,
-        private AssetManager $assetManager,
-        private array $params
+        private readonly ViewRenderer $viewRenderer,
+        private readonly SwaggerService $swaggerService,
+        private readonly AssetManager $assetManager,
+        private readonly array $params
     ) {
     }
 

src/Formatter/ParamsFormatter.php

@@ -34,7 +34,7 @@ public function format(array $params): string
             return '{' . implode(', ', $result) . '}';
         }
 
-        $result = array_map([Html::class, 'encode'], $params);
+        $result = array_map(Html::encode(...), $params);
 
         return '[' . implode(', ', $result) . ']';
     }

src/Middleware/SwaggerJson.php

@@ -24,9 +24,9 @@ final class SwaggerJson implements MiddlewareInterface
     private DateInterval|int|null $cacheTTL = null;
 
     public function __construct(
-        private CacheInterface $cache,
-        private DataResponseFactoryInterface $responseFactory,
-        private SwaggerService $swaggerService
+        private readonly CacheInterface $cache,
+        private readonly DataResponseFactoryInterface $responseFactory,
+        private readonly SwaggerService $swaggerService
     ) {
     }
 

src/Middleware/SwaggerUi.php

@@ -33,10 +33,10 @@ final class SwaggerUi implements MiddlewareInterface
     private string $jsonUrl = '/';
 
     public function __construct(
-        private ViewRenderer $viewRenderer,
-        private SwaggerService $swaggerService,
-        private AssetManager $assetManager,
-        private array $params
+        private readonly ViewRenderer $viewRenderer,
+        private readonly SwaggerService $swaggerService,
+        private readonly AssetManager $assetManager,
+        private readonly array $params
     ) {
     }
 

src/Service/SwaggerService.php

@@ -22,8 +22,9 @@ final class SwaggerService
     private string $viewName = 'swagger-ui';
     private array $options = [];
 
-    public function __construct(private Aliases $aliases)
-    {
+    public function __construct(
+        private readonly Aliases $aliases,
+    ) {
         $this->viewPath = dirname(__DIR__, 2) . '/views';
     }