Merge pull request #138 from tighten/drift/exclude-pest-default

Add `Pest.php` to default excluded files.
tighten · Jan 5, 2024 · 84fcb71 · 84fcb71
2 parents 3e20721 + 336653a
commit 84fcb71
Show file tree

Hide file tree

Showing 9 changed files with 145 additions and 136 deletions.
diff --git a/app/Support/DusterConfig.php b/app/Support/DusterConfig.php
@@ -64,6 +64,7 @@ public static function scopeConfigPaths(array $config): array
                 'build',
                 'node_modules',
                 'storage',
+                'tests/Pest.php',
             ]
         );
 
@@ -88,6 +89,9 @@ public static function globPath(string $path): array
             // Finder uses forward slashes even on windows
             $path = Str::of($path)->replace('\\', '/')->__toString();
 
+            // Remove trailing / or /* from path before passing to finder
+            $path = Str::of($path)->replaceMatches('/(\/|\/\*)$/', '')->__toString();
+
             if (Str::of($path)->endsWith(self::$phpSuffixes)) {
                 $endsWith = Str::of($path)->afterLast('/');
                 $path = Str::of($path)->beforeLast('/');

diff --git a/builds/duster b/builds/duster
diff --git a/composer.lock b/composer.lock
diff --git a/config/app.php b/config/app.php
@@ -26,7 +26,7 @@
     |
     */
 
-    'version' => '2.7.1',
+    'version' => '2.7.2',
 
     /*
     |--------------------------------------------------------------------------

diff --git a/duster.json b/duster.json
@@ -6,8 +6,7 @@
         "tests"
     ],
     "exclude" : [
-        "tests/Fixtures",
-        "tests/Pest.php"
+        "tests/Fixtures"
     ],
     "scripts": {
         "lint": {

diff --git a/tests/Feature/TLintConfigOverrideTest.php b/tests/Feature/TLintConfigOverrideTest.php
@@ -10,6 +10,6 @@
     expect($statusCode)->toBe(1)
         ->and($output)
         ->toContain('Linting using TLint')
-        ->toContain('Prefer the `auth()` helper function over the `Auth` Facade')
+        ->toContain('Use blade `{{ $model }}` auto escaping for models')
         ->not->toContain('Spaces around blade rendered content');
 });
diff --git a/tests/Fixtures/TlintProjectConfig/CustomPreset.php b/tests/Fixtures/TlintProjectConfig/CustomPreset.php
@@ -2,16 +2,16 @@
 
 namespace Tests\Fixtures\TlintProjectConfig;
 
+use Tighten\TLint\Linters\NoJsonDirective;
 use Tighten\TLint\Linters\SpacesAroundBladeRenderContent;
-use Tighten\TLint\Linters\UseAuthHelperOverFacade;
 use Tighten\TLint\Presets\PresetInterface;
 
 class CustomPreset implements PresetInterface
 {
   public function getLinters() : array
   {
     return [
-      UseAuthHelperOverFacade::class,
+      NoJsonDirective::class,
       SpacesAroundBladeRenderContent::class,
     ];
   }

diff --git a/tests/Fixtures/TlintProjectConfig/file.blade.php b/tests/Fixtures/TlintProjectConfig/file.blade.php
@@ -1 +1,2 @@
-{{Illuminate\Support\Facades\Auth::user()->name}}
+{{Auth::user()->name}}
+@json(Auth::user())
diff --git a/tests/Unit/DusterConfigTest.php b/tests/Unit/DusterConfigTest.php
@@ -29,6 +29,7 @@
         'build',
         'node_modules',
         'storage',
+        'tests/Pest.php',
     ]);
 });
 
@@ -51,5 +52,6 @@
         'build',
         'node_modules',
         'storage',
+        'tests/Pest.php',
     ]);
 });