Merge pull request #152 from tighten/drift/update-custom-order-class

[3.x] Fix issue with new PHP CS Fixer
tighten · Jun 24, 2024 · 0128c2e · 0128c2e
2 parents 8301311 + a92b053
commit 0128c2e
Show file tree

Hide file tree

Showing 20 changed files with 11,291 additions and 442 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -36,7 +36,8 @@ jobs:
           coverage: none
 
       - name: Install dev dependencies
-        run: COMPOSER=composer-dev.json composer install
+        shell: bash
+        run: export COMPOSER=composer-dev.json && composer install
 
       - name: Run Duster
         run: ./builds/duster lint --using="tlint,phpcodesniffer,phpcsfixer,pint"

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-/composer-dev.lock
 /vendor
 .phpunit.result.cache
 .phpunit.cache

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -35,3 +35,23 @@ When working locally you will need to install the dev dependencies.
 ```bash
 COMPOSER=composer-dev.json composer install
 ```
+
+## Dependencies
+
+To update dependencies to latest:
+
+```bash
+# Production
+composer require friendsofphp/php-cs-fixer laravel/pint squizlabs/php_codesniffer tightenco/tlint --dev
+
+# Development
+COMPOSER=composer-dev.json composer require friendsofphp/php-cs-fixer laravel/pint squizlabs/php_codesniffer tightenco/tlint  --dev
+```
+
+## PHPStan
+
+If PHPStan fails locally, try increasing the memory:
+
+```bash
+./vendor/bin/phpstan analyze --memory-limit 1G
+```
diff --git a/app/Actions/Clean.php b/app/Actions/Clean.php
@@ -13,8 +13,7 @@ class Clean
     public function __construct(
         protected string $mode,
         protected array $tools,
-    ) {
-    }
+    ) {}
 
     public function execute(): int
     {

diff --git a/app/Contracts/PintInputInterface.php b/app/Contracts/PintInputInterface.php
@@ -4,6 +4,4 @@
 
 use Symfony\Component\Console\Input\InputInterface;
 
-interface PintInputInterface extends InputInterface
-{
-}
+interface PintInputInterface extends InputInterface {}
diff --git a/app/Fixer/ClassNotation/CustomControllerOrderFixer.php b/app/Fixer/ClassNotation/CustomControllerOrderFixer.php
@@ -15,40 +15,6 @@ public function getName(): string
         return 'Tighten/custom_controller_order';
     }
 
-    public function configure(array $configuration): void
-    {
-        $configuration['order'] = [
-            'use_trait',
-            'property_public_static',
-            'property_protected_static',
-            'property_private_static',
-            'constant_public',
-            'constant_protected',
-            'constant_private',
-            'property_public',
-            'property_protected',
-            'property_private',
-            'construct',
-            'method:__invoke',
-            'method_public_static',
-            'method_protected_static',
-            'method_private_static',
-            'method:index',
-            'method:create',
-            'method:store',
-            'method:show',
-            'method:edit',
-            'method:update',
-            'method:destroy',
-            'method_public',
-            'method_protected',
-            'method_private',
-            'magic',
-        ];
-
-        parent::configure($configuration);
-    }
-
     /**
      * {@inheritdoc}
      *
@@ -103,6 +69,41 @@ public function isControllerClass(Tokens $tokens, int $index): bool
         return false;
     }
 
+    /**
+     * @param  array<string, mixed>  $configuration
+     */
+    protected function configurePreNormalisation(array &$configuration): void
+    {
+        $configuration['order'] = $configuration['order'] ?? [
+            'use_trait',
+            'property_public_static',
+            'property_protected_static',
+            'property_private_static',
+            'constant_public',
+            'constant_protected',
+            'constant_private',
+            'property_public',
+            'property_protected',
+            'property_private',
+            'construct',
+            'method:__invoke',
+            'method_public_static',
+            'method_protected_static',
+            'method_private_static',
+            'method:index',
+            'method:create',
+            'method:store',
+            'method:show',
+            'method:edit',
+            'method:update',
+            'method:destroy',
+            'method_public',
+            'method_protected',
+            'method_private',
+            'magic',
+        ];
+    }
+
     protected function applyFix(SplFileInfo $file, Tokens $tokens): void
     {
         for ($index = $tokens->count() - 1; $index > 0; $index--) {