minor #5609 Forbid old config filename usage (keradus)

This PR was squashed before being merged into the 3.0 branch. Discussion ---------- Forbid old config filename usage Depends on: - [x] #5607 - [x] #5608 Commits ------- 7ba957d Forbid old config filename usage
PHP-CS-Fixer · Apr 13, 2021 · 814aac8 · 814aac8
2 parents 3ac438a + 7ba957d
commit 814aac8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/UPGRADE-v3.md b/UPGRADE-v3.md
@@ -8,6 +8,8 @@ Rename of files
 
 | 2.x              | 3.0                      | Description                            |
 | ---------------- | ------------------------ | -------------------------------------- |
+| `.php_cs`        | `.php-cs-fixer.php`      | Configuration file (local)             |
+| `.php_cs.dist`   | `.php-cs-fixer.dist.php` | Configuration file (to be distributed) |
 | `.php_cs.cache`  | `.php-cs-fixer.cache`    | Cache file                             |
 
 CLI options

diff --git a/src/Console/ConfigurationResolver.php b/src/Console/ConfigurationResolver.php
@@ -223,8 +223,7 @@ public function getConfig(): ConfigInterface
                 ];
 
                 if (isset($deprecatedConfigs[$configFileBasename])) {
-                    $message = "Configuration file `{$configFileBasename}` is deprecated, rename to `{$deprecatedConfigs[$configFileBasename]}`.";
-                    Utils::triggerDeprecation($message, InvalidConfigurationException::class);
+                    throw new InvalidConfigurationException("Configuration file `{$configFileBasename}` is outdated, rename to `{$deprecatedConfigs[$configFileBasename]}`.");
                 }
 
                 $this->config = self::separatedContextLessInclude($configFile);

diff --git a/tests/Fixer/Basic/BracesFixerTest.php b/tests/Fixer/Basic/BracesFixerTest.php
@@ -5423,7 +5423,7 @@ public function provideFixAlternativeSyntaxCases()
      *
      * @dataProvider provideFix80Cases
      */
-    public function testFix80($expected, $input): voild
+    public function testFix80($expected, $input): void
     {
         $this->doTest($expected, $input);
     }