Fix: Give non-distributable configuration files priority

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

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
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',
                 ],
             ],
             [