CS fixes

Author: dantleech

src/TextUI/Configuration/SourceFilter.php

@@ -9,8 +9,15 @@
  */
 namespace PHPUnit\TextUI\Configuration;
 
-use Webmozart\Glob\Glob;
 use function array_map;
+use function basename;
+use function dirname;
+use function preg_match;
+use function rtrim;
+use function sprintf;
+use function str_ends_with;
+use function str_starts_with;
+use Webmozart\Glob\Glob;
 
 /**
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
@@ -44,6 +51,23 @@ public static function instance(): self
         return self::$instance;
     }
 
+    /**
+     * Convert the directory filter to a glob.
+     *
+     * To ensure that `foo/**` will match `foo/bar.php` we match both the
+     * globstar and the wildcard.
+     */
+    public static function toGlob(FilterDirectory $directory): string
+    {
+        $path = rtrim($directory->path(), '/');
+
+        return sprintf(
+            '{(%s)|(%s)}',
+            Glob::toRegEx(sprintf('%s/**/*', $path), 0, ''),
+            Glob::toRegEx(sprintf('%s/*', $path), 0, ''),
+        );
+    }
+
     public function __construct(Source $source)
     {
         $this->source                  = $source;
@@ -63,8 +87,9 @@ public function __construct(Source $source)
     public function includes(string $path): bool
     {
         $included = false;
-        $dirPath = rtrim(dirname($path), '/') . '/';
+        $dirPath  = rtrim(dirname($path), '/') . '/';
         $filename = basename($path);
+
         foreach ($this->source->includeFiles() as $file) {
             if ($file->path() === $path) {
                 $included = true;
@@ -92,23 +117,6 @@ public function includes(string $path): bool
         return $included;
     }
 
-    /**
-     * Convert the directory filter to a glob.
-     *
-     * To ensure that `foo/**` will match `foo/bar.php` we match both the
-     * globstar and the wildcard.
-     */
-    public static function toGlob(FilterDirectory $directory): string
-    {
-        $path = rtrim($directory->path(), '/');
-
-        return sprintf(
-            '{(%s)|(%s)}',
-            Glob::toRegEx(sprintf('%s/**/*', $path), 0, ''),
-            Glob::toRegEx(sprintf('%s/*', $path), 0, ''),
-        );
-    }
-
     private static function filenameMatches(FilterDirectory $directory, string $filename): bool
     {
         return str_starts_with($filename, $directory->prefix()) && str_ends_with($filename, $directory->suffix());

tests/unit/TextUI/SourceFilterTest.php

@@ -9,8 +9,6 @@
  */
 namespace PHPUnit\TextUI\Configuration;
 
-use function json_encode;
-use function sprintf;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Small;
@@ -324,7 +322,7 @@ public static function provider(): array
                 ),
             ],
             // this seems rather more like a bug
-            //'globstar with any single char prefix includes sibling files' => [
+            // 'globstar with any single char prefix includes sibling files' => [
             //    [
             //        self::fixturePath('a/PrefixSuffix.php')     => false,
             //        self::fixturePath('a/c/PrefixSuffix.php')   => true,
@@ -341,7 +339,7 @@ public static function provider(): array
             //            ],
             //        ),
             //    ),
-            //],
+            // ],
             'globstar with any more than a single char prefix does not include sibling files' => [
                 [
                     self::fixturePath('a/PrefixSuffix.php')     => false,
@@ -432,12 +430,13 @@ public static function provider(): array
     public function testDeterminesWhetherFileIsIncluded(array $expectations, Source $source): void
     {
         $expected = [];
-        $actual = [];
+        $actual   = [];
+
         foreach ($expectations as $file => $shouldInclude) {
             $this->assertFileExists($file);
             $expected[$file] = $shouldInclude;
-            $actual[$file] = (new SourceFilter($source))->includes($file);
+            $actual[$file]   = (new SourceFilter($source))->includes($file);
         }
-        self::assertEquals($expected, $actual);
+        $this->assertEquals($expected, $actual);
     }
 }