diff --git a/UPGRADE-v3.md b/UPGRADE-v3.md index 8ad79856741..826dd93c063 100644 --- 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 index 46a99ea3813..47e096a6a81 100644 --- 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 index 40fe8f5142a..d22cce934bb 100644 --- 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); }