.github/workflows/php-cs-fixer.yml → .github/workflows/linting.yml

@@ -13,9 +13,7 @@ jobs:
           ref: ${{ github.head_ref }}
 
       - name: Run PHP CS Fixer
-        uses: docker://oskarstark/php-cs-fixer-ga
-        with:
-          args: --config=.php_cs.dist.php --allow-risky=yes
+        uses: aglipanci/laravel-pint-action@2.3.0
 
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v5

src/Actions/ReplaceOrAppendTags.php

@@ -5,6 +5,7 @@
 class ReplaceOrAppendTags
 {
     public const VITE_DIRECTIVE_PATTERN = '/(\s*)\@vite\(.*\)/';
+
     public const CLOSING_HEAD_TAG_PATTERN = '/(\s*)(<\/head>)/';
 
     public function __invoke(string $contents)
@@ -16,14 +17,14 @@ public function __invoke(string $contents)
         if (str_contains($contents, '@vite')) {
             return preg_replace(
                 static::VITE_DIRECTIVE_PATTERN,
-                "\\1<x-importmap::tags />",
+                '\\1<x-importmap::tags />',
                 $contents,
             );
         }
 
         return preg_replace(
             static::CLOSING_HEAD_TAG_PATTERN,
-            PHP_EOL."\\1    <x-importmap::tags />\\1\\2",
+            PHP_EOL.'\\1    <x-importmap::tags />\\1\\2',
             $contents,
         );
     }

src/AssetResolver.php

@@ -10,13 +10,13 @@ class AssetResolver
     public function __invoke(string $fileRelativePath)
     {
         if (str_starts_with(trim($fileRelativePath, '/'), 'vendor/') && File::exists($absolutePath = public_path($fileRelativePath))) {
-            return asset($fileRelativePath).'?digest='.(new FileDigest())($absolutePath);
+            return asset($fileRelativePath).'?digest='.(new FileDigest)($absolutePath);
         }
 
         if (! File::exists($absolutePath = Importmap::getFileAbsolutePath('/resources/'.trim($fileRelativePath, '/')))) {
             return asset($fileRelativePath);
         }
 
-        return asset($fileRelativePath).'?digest='.(new FileDigest())($absolutePath);
+        return asset($fileRelativePath).'?digest='.(new FileDigest)($absolutePath);
     }
 }

src/Commands/InstallCommand.php

@@ -112,7 +112,7 @@ private function updateAppLayouts(): void
     {
         $this->existingLayoutFiles()->each(fn ($file) => File::put(
             $file,
-            (new ReplaceOrAppendTags())(File::get($file)),
+            (new ReplaceOrAppendTags)(File::get($file)),
         ));
     }
 
@@ -170,6 +170,6 @@ private function usingSail(): bool
 
     private function phpBinary(): string
     {
-        return (new PhpExecutableFinder())->find(false) ?: 'php';
+        return (new PhpExecutableFinder)->find(false) ?: 'php';
     }
 }

src/Commands/JsonCommand.php

@@ -16,7 +16,7 @@ class JsonCommand extends Command
 
     public function handle(Importmap $importmap): int
     {
-        $imports = $importmap->asArray(new AssetResolver());
+        $imports = $importmap->asArray(new AssetResolver);
 
         $this->output->writeln(json_encode($imports, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
 

src/Commands/OptimizeCommand.php

@@ -68,7 +68,7 @@ private function digest(string $filename, string $fileSource): string
     {
         return preg_replace(
             '#(\.jsm?)$#',
-            sprintf('-%s$1', (new FileDigest())($fileSource)),
+            sprintf('-%s$1', (new FileDigest)($fileSource)),
             $filename
         );
     }

src/ImportmapLaravelServiceProvider.php

@@ -33,7 +33,7 @@ public function configurePackage(Package $package): void
 
     public function packageRegistered(): void
     {
-        $this->app->scoped(Importmap::class, fn (): \Tonysm\ImportmapLaravel\Importmap => new Importmap());
+        $this->app->scoped(Importmap::class, fn (): \Tonysm\ImportmapLaravel\Importmap => new Importmap);
 
         $this->app->bind('importmap-laravel', Importmap::class);
     }

src/MappedDirectory.php

@@ -4,7 +4,5 @@
 
 class MappedDirectory
 {
-    public function __construct(public string $dir, public ?string $under = null, public ?string $path = null, public bool $preload = false)
-    {
-    }
+    public function __construct(public string $dir, public ?string $under = null, public ?string $path = null, public bool $preload = false) {}
 }

src/MappedFile.php

@@ -4,7 +4,5 @@
 
 class MappedFile
 {
-    public function __construct(public string $name, public string $path, public bool $preload)
-    {
-    }
+    public function __construct(public string $name, public string $path, public bool $preload) {}
 }

src/PackageVersion.php

@@ -7,6 +7,5 @@ class PackageVersion
     public function __construct(
         public string $name,
         public string $version,
-    ) {
-    }
+    ) {}
 }

src/VulnerablePackage.php

@@ -9,6 +9,5 @@ public function __construct(
         public string $severity,
         public string $vulnerableVersions,
         public string $vulnerability,
-    ) {
-    }
+    ) {}
 }

tests/ReplaceOrAppendTagsTest.php

@@ -55,7 +55,7 @@ public function replace_vite_tags(): void
         </html>
         BLADE;
 
-        $this->assertEquals($expected, (new ReplaceOrAppendTags())($contents));
+        $this->assertEquals($expected, (new ReplaceOrAppendTags)($contents));
     }
 
     #[\PHPUnit\Framework\Attributes\Test]
@@ -103,6 +103,6 @@ public function appends_to_before_closing_head_tag_when_vite_directive_is_missin
         </html>
         BLADE;
 
-        $this->assertEquals($expected, (new ReplaceOrAppendTags())($contents));
+        $this->assertEquals($expected, (new ReplaceOrAppendTags)($contents));
     }
 }

tests/TagsComponentTest.php

@@ -47,7 +47,7 @@ public function uses_given_csp_nonce(): void
     #[\PHPUnit\Framework\Attributes\Test]
     public function uses_custom_map(): void
     {
-        $importmap = new Importmap();
+        $importmap = new Importmap;
         $importmap->pin('foo', preload: true);
         $importmap->pin('bar', preload: true);