Upgrade to PSR12 coding standard (#20121)

yiisoft · Mar 19, 2024 · e2a1670 · e2a1670
1 parent b0aa6ab
commit e2a1670
Show file tree

Hide file tree

Showing 521 changed files with 1,265 additions and 2,619 deletions.
diff --git a/.github/workflows/lint.yaml b/.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
diff --git a/.php_cs b/.php_cs
diff --git a/composer.json b/composer.json
@@ -85,8 +85,9 @@
         "cweagans/composer-patches": "^1.7",
         "phpunit/phpunit": "4.8.34",
         "cebe/indent": "~1.0.2",
-        "friendsofphp/php-cs-fixer": "~2.2.3 | ^3.0",
-        "johnkary/phpunit-speedtrap": "^1.0"
+        "johnkary/phpunit-speedtrap": "^1.0",
+        "dealerdirect/phpcodesniffer-composer-installer": "*",
+        "yiisoft/yii2-coding-standards": "^3.0"
     },
     "repositories": [
         {
@@ -104,15 +105,15 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "yii\\cs\\": "cs/src/",
             "yii\\build\\": "build/",
             "yiiunit\\": "tests/"
         }
     },
     "config": {
         "allow-plugins": {
             "cweagans/composer-patches": true,
-            "yiisoft/yii2-composer": true
+            "yiisoft/yii2-composer": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true
         }
     },
     "bin": [