Move phpstan and rector to root composer.json

paulbalandan · paulbalandan · commit 90ea5c7cc195 · 2024-07-23T20:58:52.000+08:00
diff --git a/.github/workflows/reusable-coveralls.yml b/.github/workflows/reusable-coveralls.yml
@@ -15,8 +15,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/reusable-phpunit-test.yml b/.github/workflows/reusable-phpunit-test.yml
@@ -150,8 +150,6 @@ jobs:
 
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/reusable-serviceless-phpunit-test.yml b/.github/workflows/reusable-serviceless-phpunit-test.yml
@@ -62,8 +62,6 @@ jobs:
 
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/test-autoreview.yml b/.github/workflows/test-autoreview.yml
@@ -37,8 +37,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/test-coding-standards.yml b/.github/workflows/test-coding-standards.yml
@@ -34,8 +34,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/test-deptrac.yml b/.github/workflows/test-deptrac.yml
@@ -38,8 +38,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/test-phpstan.yml b/.github/workflows/test-phpstan.yml
@@ -47,8 +47,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -87,4 +85,4 @@ jobs:
         run: composer update --ansi --no-interaction
 
       - name: Run static analysis
-        run: utils/vendor/bin/phpstan analyse
+        run: vendor/bin/phpstan analyse
diff --git a/.github/workflows/test-psalm.yml b/.github/workflows/test-psalm.yml
@@ -29,8 +29,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/test-rector.yml b/.github/workflows/test-rector.yml
@@ -49,8 +49,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -87,4 +85,4 @@ jobs:
       - run: mkdir -p /tmp/rector
 
       - name: Run static analysis
-        run: utils/vendor/bin/rector process --dry-run --no-progress-bar
+        run: vendor/bin/rector process --dry-run --no-progress-bar
diff --git a/composer.json b/composer.json
@@ -17,13 +17,18 @@
         "psr/log": "^3.0"
     },
     "require-dev": {
+        "codeigniter/phpstan-codeigniter": "^1.4",
         "fakerphp/faker": "^1.9",
         "kint-php/kint": "^5.0.4",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/tachycardia": "^2.0",
+        "phpstan/extension-installer": "^1.4",
+        "phpstan/phpstan": "^1.11",
+        "phpstan/phpstan-strict-rules": "^1.6",
         "phpunit/phpcov": "^9.0.2",
         "phpunit/phpunit": "^10.5.16",
-        "predis/predis": "^1.1 || ^2.0"
+        "predis/predis": "^1.1 || ^2.0",
+        "rector/rector": "1.2.1"
     },
     "replace": {
         "codeigniter4/framework": "self.version"
@@ -61,10 +66,14 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "CodeIgniter\\": "tests/system/"
+            "CodeIgniter\\": "tests/system/",
+            "Utils\\": "utils/src/"
         }
     },
     "config": {
+        "allow-plugins": {
+            "phpstan/extension-installer": true
+        },
         "optimize-autoloader": true,
         "preferred-install": "dist",
         "sort-packages": true
@@ -75,16 +84,16 @@
         }
     },
     "scripts": {
-        "post-autoload-dump": [
-            "@composer update --working-dir=utils"
-        ],
         "post-update-cmd": [
             "CodeIgniter\\ComposerScripts::postUpdate"
         ],
+        "post-autoload-dump": [
+            "@composer update --working-dir=utils"
+        ],
         "analyze": [
             "Composer\\Config::disableProcessTimeout",
-            "bash -c \"XDEBUG_MODE=off utils/vendor/bin/phpstan analyse\"",
-            "utils/vendor/bin/rector process --dry-run"
+            "bash -c \"XDEBUG_MODE=off vendor/bin/phpstan analyse\"",
+            "vendor/bin/rector process --dry-run"
         ],
         "cs": [
             "Composer\\Config::disableProcessTimeout",
diff --git a/rector.php b/rector.php
@@ -85,8 +85,8 @@
     ])
     ->withPHPStanConfigs([
         __DIR__ . '/phpstan.neon.dist',
-        __DIR__ . '/utils/vendor/codeigniter/phpstan-codeigniter/extension.neon',
-        __DIR__ . '/utils/vendor/phpstan/phpstan-strict-rules/rules.neon',
+        __DIR__ . '/vendor/codeigniter/phpstan-codeigniter/extension.neon',
+        __DIR__ . '/vendor/phpstan/phpstan-strict-rules/rules.neon',
     ])
     // is there a file you need to skip?
     ->withSkip([
diff --git a/utils/composer.json b/utils/composer.json
@@ -2,33 +2,20 @@
     "require": {
         "php": "^8.1",
         "codeigniter/coding-standard": "^1.7",
-        "codeigniter/phpstan-codeigniter": "^1.4",
-        "codeigniter4/codeigniter4": "4.x-dev",
         "ergebnis/composer-normalize": "^2.28",
         "friendsofphp/php-cs-fixer": "^3.47.1",
         "nexusphp/cs-config": "^3.6",
         "phpmetrics/phpmetrics": "^2.8 || ^3.0rc6",
-        "phpstan/extension-installer": "^1.3",
-        "phpstan/phpstan": "^1.11",
-        "phpstan/phpstan-strict-rules": "^1.6",
-        "rector/rector": "1.2.1",
         "vimeo/psalm": "^5.0"
     },
-    "repositories": [
-        {
-            "type": "path",
-            "url": "../"
-        }
-    ],
     "autoload": {
         "psr-4": {
             "Utils\\": "src/"
         }
     },
     "config": {
         "allow-plugins": {
-            "ergebnis/composer-normalize": true,
-            "phpstan/extension-installer": true
+            "ergebnis/composer-normalize": true
         },
         "optimize-autoloader": true,
         "preferred-install": "dist",
