[Config] Remove asterisk support in import() for file, use explicit p…

…aths instead (#5010)
rectorphp · Sep 12, 2023 · 01c0ea9 · 01c0ea9
1 parent 848c2ad
commit 01c0ea9
Show file tree

Hide file tree

Showing 16 changed files with 7 additions and 117 deletions.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -31,7 +31,6 @@ jobs:
                     - 'e2e/parallel-reflection-resolver'
                     - 'e2e/applied-rule-removed-node'
                     - 'e2e/parallel with space'
-                    - 'e2e/wildcards-path-import-config'
                     - 'e2e/different-path-over-skip-config'
 
         name: End to end test - ${{ matrix.directory }}

diff --git a/build/config/config-downgrade.php b/build/config/config-downgrade.php
@@ -8,13 +8,11 @@
 require_once  __DIR__ . '/../target-repository/stubs-rector/PHPUnit/Framework/TestCase.php';
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->parallel();
-
     $rectorConfig->skip(DowngradeRectorConfig::DEPENDENCY_EXCLUDE_PATHS);
 
     $rectorConfig->phpstanConfig(__DIR__ . '/phpstan-for-downgrade.neon');
 
-    $rectorConfig->import(DowngradeLevelSetList::DOWN_TO_PHP_72);
+    $rectorConfig->sets([DowngradeLevelSetList::DOWN_TO_PHP_72]);
 };
 
 /**

diff --git a/build/target-repository/e2e/attributes/rector.php b/build/target-repository/e2e/attributes/rector.php
@@ -7,7 +7,7 @@
 use Rector\Symfony\Set\SymfonySetList;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->import(SymfonySetList::SYMFONY_52);
+    $rectorConfig->sets([SymfonySetList::SYMFONY_52]);
 
     $rectorConfig->phpVersion(PhpVersion::PHP_80);
     $rectorConfig->paths([__DIR__ . '/src']);

diff --git a/build/target-repository/e2e/dont-execute-code/rector.php b/build/target-repository/e2e/dont-execute-code/rector.php
@@ -8,5 +8,5 @@
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->paths([__DIR__.'/src']);
 
-    $rectorConfig->import(SetList::PHP_53);
+    $rectorConfig->sets([SetList::PHP_53]);
 };
diff --git a/build/target-repository/e2e/parse-match-class-on-php74/rector.php b/build/target-repository/e2e/parse-match-class-on-php74/rector.php
@@ -8,5 +8,5 @@
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->paths([__DIR__.'/src']);
 
-    $rectorConfig->import(SetList::DEAD_CODE);
+    $rectorConfig->sets([SetList::DEAD_CODE]);
 };
diff --git a/build/target-repository/e2e/parse-php7-code/rector.php b/build/target-repository/e2e/parse-php7-code/rector.php
@@ -8,5 +8,5 @@
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->paths([__DIR__.'/src']);
 
-    $rectorConfig->import(SetList::PHP_53);
+    $rectorConfig->sets([SetList::PHP_53]);
 };
diff --git a/build/target-repository/e2e/parse-php8-code/rector.php b/build/target-repository/e2e/parse-php8-code/rector.php
@@ -8,5 +8,5 @@
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->paths([__DIR__.'/src']);
 
-    $rectorConfig->import(SetList::PHP_53);
+    $rectorConfig->sets([SetList::PHP_53]);
 };
diff --git a/e2e/wildcards-path-import-config/.gitignore b/e2e/wildcards-path-import-config/.gitignore
diff --git a/e2e/wildcards-path-import-config/composer.json b/e2e/wildcards-path-import-config/composer.json
diff --git a/e2e/wildcards-path-import-config/config/import_config.php b/e2e/wildcards-path-import-config/config/import_config.php
diff --git a/e2e/wildcards-path-import-config/config/import_config_another.php b/e2e/wildcards-path-import-config/config/import_config_another.php
diff --git a/e2e/wildcards-path-import-config/expected-output.diff b/e2e/wildcards-path-import-config/expected-output.diff
diff --git a/e2e/wildcards-path-import-config/rector.php b/e2e/wildcards-path-import-config/rector.php
diff --git a/e2e/wildcards-path-import-config/src/DeadConstructor.php b/e2e/wildcards-path-import-config/src/DeadConstructor.php
diff --git a/e2e/wildcards-path-import-config/src/GotUnreachableReturn.php b/e2e/wildcards-path-import-config/src/GotUnreachableReturn.php
diff --git a/packages/Config/RectorConfig.php b/packages/Config/RectorConfig.php
@@ -223,16 +223,7 @@ static function (
 
     public function import(string $filePath): void
     {
-        $paths = [$filePath];
-
-        if (str_contains($filePath, '*')) {
-            $filesystemTweaker = new FilesystemTweaker();
-            $paths = $filesystemTweaker->resolveWithFnmatch($paths);
-        }
-
-        foreach ($paths as $path) {
-            $this->importFile($path);
-        }
+        $this->importFile($filePath);
     }
 
     /**