[1.x] Replace custom phpdoc_align rule with php-cs-fixer option (#242)

* Bump dependencies * Replace custom phpdoc_align fixer with php-cs-fixer option * fix tests and format
laravel · Jan 15, 2024 · 07494e2 · 07494e2
1 parent bdeb49d
commit 07494e2
Show file tree

Hide file tree

Showing 9 changed files with 107 additions and 215 deletions.
diff --git a/app/Factories/ConfigurationFactory.php b/app/Factories/ConfigurationFactory.php
@@ -2,7 +2,6 @@
 
 namespace App\Factories;
 
-use App\Fixers\LaravelPhpdocAlignmentFixer;
 use App\Repositories\ConfigurationJsonRepository;
 use PhpCsFixer\Config;
 use PhpCsFixer\Finder;
@@ -46,11 +45,7 @@ public static function preset($rules)
             ->setFinder(self::finder())
             ->setRules(array_merge($rules, resolve(ConfigurationJsonRepository::class)->rules()))
             ->setRiskyAllowed(true)
-            ->setUsingCache(true)
-            ->registerCustomFixers([
-                // Laravel...
-                new LaravelPhpdocAlignmentFixer(),
-            ]);
+            ->setUsingCache(true);
     }
 
     /**

diff --git a/app/Fixers/LaravelPhpdocAlignmentFixer.php b/app/Fixers/LaravelPhpdocAlignmentFixer.php
diff --git a/app/Output/Concerns/InteractsWithSymbols.php b/app/Output/Concerns/InteractsWithSymbols.php
@@ -6,8 +6,8 @@
 use PhpCsFixer\FixerFileProcessedEvent;
 
 /**
- * @property \Symfony\Component\Console\Input\InputInterface  $input
- * @property \Symfony\Component\Console\Output\OutputInterface  $output
+ * @property \Symfony\Component\Console\Input\InputInterface $input
+ * @property \Symfony\Component\Console\Output\OutputInterface $output
  */
 trait InteractsWithSymbols
 {

diff --git a/composer.json b/composer.json
@@ -23,13 +23,13 @@
         "ext-xml": "*"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.46.0",
-        "illuminate/view": "^10.39.0",
+        "friendsofphp/php-cs-fixer": "^3.47.0",
+        "illuminate/view": "^10.40.0",
         "larastan/larastan": "^2.8.1",
         "laravel-zero/framework": "^10.3.0",
         "mockery/mockery": "^1.6.7",
         "nunomaduro/termwind": "^1.15.1",
-        "pestphp/pest": "^2.30.0"
+        "pestphp/pest": "^2.31.0"
     },
     "autoload": {
         "psr-4": {