Fix: Give non-distributable configuration files priority

friendsoftwig · May 19, 2022 · 47dd306 · 47dd306
1 parent 33888b3
commit 47dd306
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -143,7 +143,14 @@ cd ~/dirA
 twigcs --config ~/dirB/.twig_cs.dist.php # Will lint templates in ~/dirA with the config of ~/dirB
 ```
 
-By default, the files `.twig_cs.php`, `.twig_cs.dist.php`, `.twig_cs` and `.twig_cs.dist` are looked up in your current working directory (CWD).
+By default, the files
+
+- `.twig_cs.php`
+- `.twig_cs`
+- `.twig_cs.dist.php`
+- `.twig_cs.dist`
+
+are looked up in your current working directory (CWD).
 
 You can also provide finders inside config files, they will completely replace the path in the CLI:
 

diff --git a/src/Config/ConfigResolver.php b/src/Config/ConfigResolver.php
@@ -338,8 +338,8 @@ private function computeConfigFiles()
 
         return [
             $configDir.\DIRECTORY_SEPARATOR.'.twig_cs.php',
-            $configDir.\DIRECTORY_SEPARATOR.'.twig_cs.dist.php',
             $configDir.\DIRECTORY_SEPARATOR.'.twig_cs',
+            $configDir.\DIRECTORY_SEPARATOR.'.twig_cs.dist.php',
             $configDir.\DIRECTORY_SEPARATOR.'.twig_cs.dist',
         ];
     }

diff --git a/tests/Config/ConfigResolverTest.php b/tests/Config/ConfigResolverTest.php
@@ -153,18 +153,18 @@ public function provideDefaultConfigFileNameAndAvailableDefaultConfigFileNames()
                 ],
             ],
             [
-                '.twig_cs.dist.php',
+                '.twig_cs',
                 [
                     '.twig_cs',
                     '.twig_cs.dist',
                     '.twig_cs.dist.php',
                 ],
             ],
             [
-                '.twig_cs',
+                '.twig_cs.dist.php',
                 [
-                    '.twig_cs',
                     '.twig_cs.dist',
+                    '.twig_cs.dist.php',
                 ],
             ],
             [