Support Yii Assets 5 + Bump PHP to 8.1

.github/workflows/build.yml

@@ -10,6 +10,8 @@ on:
       - 'psalm.xml'
 
   push:
+    branches:
+      - master
     paths-ignore:
       - 'docs/**'
       - 'README.md'
@@ -28,4 +30,4 @@ jobs:
       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,8 @@ on:
       - 'psalm.xml'
 
   push:
+    branches:
+      - master
     paths-ignore:
       - 'docs/**'
       - 'README.md'
@@ -30,4 +32,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0', '8.1']
+        ['8.1', '8.2', '8.3']

.github/workflows/rector.yml

@@ -18,4 +18,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0']
+        ['8.3']

.github/workflows/static.yml

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

README.md

@@ -19,7 +19,7 @@ The package ...
 
 ## Requirements
 
-- PHP 8.0 or higher.
+- PHP 8.1 or higher.
 
 ## Installation
 

composer.json

@@ -28,12 +28,12 @@
         }
     ],
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "nyholm/psr7": "^1.3",
         "psr/http-message": "^1.1",
         "psr/http-server-handler": "^1.0",
         "psr/http-server-middleware": "^1.0",
-        "yiisoft/assets": "^4.0",
+        "yiisoft/assets": "^4.0|^5.0",
         "yiisoft/data-response": "^2.0",
         "yiisoft/http": "^1.1",
         "yiisoft/router": "^3.1",
@@ -51,7 +51,7 @@
         "rector/rector": "^0.15.1",
         "roave/infection-static-analysis-plugin": "^1.21",
         "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^4.18",
+        "vimeo/psalm": "^5.26.1",
         "yiisoft/aliases": "^3.0",
         "yiisoft/config": "^1.0",
         "yiisoft/di": "^1.1",
@@ -119,7 +119,7 @@
         "allow-plugins": {
             "infection/extension-installer": true,
             "composer/package-versions-deprecated": true,
-            "yiisoft/config": true
+            "yiisoft/config": false
         }
     },
     "scripts": {

psalm.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <psalm
     errorLevel="2"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"

src/Asset/DevPanelAsset.php

@@ -5,14 +5,27 @@
 namespace Yiisoft\Yii\Debug\Viewer\Asset;
 
 use Yiisoft\Assets\AssetBundle;
+use Yiisoft\Assets\AssetManager;
 use Yiisoft\View\WebView;
 
+/**
+ * @psalm-import-type CssFile from AssetManager
+ * @psalm-import-type JsFile from AssetManager
+ */
 final class DevPanelAsset extends AssetBundle
 {
     public bool $cdn = true;
+
+    /**
+     * @psalm-var array<array-key, string|JsFile>
+     */
     public array $js = [
         ['/bundle.js', WebView::POSITION_END, 'type' => 'module'],
     ];
+
+    /**
+     * @psalm-var array<array-key, string|CssFile>
+     */
     public array $css = [
         '/bundle.css',
     ];

src/Asset/ToolbarAsset.php

@@ -5,14 +5,27 @@
 namespace Yiisoft\Yii\Debug\Viewer\Asset;
 
 use Yiisoft\Assets\AssetBundle;
+use Yiisoft\Assets\AssetManager;
 use Yiisoft\View\WebView;
 
+/**
+ * @psalm-import-type CssFile from AssetManager
+ * @psalm-import-type JsFile from AssetManager
+ */
 final class ToolbarAsset extends AssetBundle
 {
     public bool $cdn = true;
+
+    /**
+     * @psalm-var array<array-key, string|JsFile>
+     */
     public array $js = [
         ['/bundle.js', WebView::POSITION_END, 'type' => 'module'],
     ];
+
+    /**
+     * @psalm-var array<array-key, string|CssFile>
+     */
     public array $css = [
         '/bundle.css',
     ];