Merge pull request #20130 from terabytesoftw/sync-to-master

Syncronize last changes `master` to `2.2`.

.github/workflows/lint.yaml

@@ -0,0 +1,22 @@
+name: lint
+
+on: [push, pull_request]
+
+jobs:
+    phpcs:
+      runs-on: ubuntu-latest
+      name: PHP_CodeSniffer
+      steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+            php-version: '8.2'
+            tools: cs2pr
+
+      - name: Install dependencies
+        run: composer install --prefer-dist
+
+      - name: Run phpcs
+        run: vendor/bin/phpcs -q --report=checkstyle framework/ | cs2pr

composer.json

@@ -84,7 +84,8 @@
         "dms/phpunit-arraysubset-asserts": "^0.5",
         "phpunit/phpunit": "^9.6",
         "cebe/indent": "~1.0.2",
-        "friendsofphp/php-cs-fixer": "^3.0"
+        "dealerdirect/phpcodesniffer-composer-installer": "*",
+        "yiisoft/yii2-coding-standards": "^3.0"
     },
     "repositories": [
         {
@@ -102,14 +103,14 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "yii\\cs\\": "cs/src/",
             "yii\\build\\": "build/",
             "yiiunit\\": "tests/"
         }
     },
     "config": {
         "allow-plugins": {
-            "yiisoft/yii2-composer": true
+            "yiisoft/yii2-composer": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true
         }
     },
     "bin": [