diff --git a/dev/Builder/Modifier/NonDefaultConfiguration.php b/dev/Builder/Modifier/NonDefaultConfiguration.php index 5b608f1..57bb8d9 100644 --- a/dev/Builder/Modifier/NonDefaultConfiguration.php +++ b/dev/Builder/Modifier/NonDefaultConfiguration.php @@ -12,6 +12,7 @@ namespace Dev\Builder\Modifier; use PhpCsFixer\Fixer\Whitespace\NoExtraBlankLinesFixer; +use PhpCsFixerCustomFixers\Fixer\DataProviderStaticFixer; /** * @internal @@ -41,6 +42,7 @@ public function __invoke(array $rules): array $rules['trailing_comma_in_multiline'] = ['after_heredoc' => true, 'elements' => ['arguments', 'arrays', 'parameters']]; $rules['whitespace_after_comma_in_array'] = ['ensure_single_space' => true]; $rules['yoda_style'] = ['equal' => false, 'identical' => false, 'less_and_greater' => false]; + $rules[DataProviderStaticFixer::name()] = ['force' => true]; return $rules; } diff --git a/dev/Test/Builder/Modifier/UnwantedRulesFilterTest.php b/dev/Test/Builder/Modifier/UnwantedRulesFilterTest.php index cbf386d..f82a9a9 100644 --- a/dev/Test/Builder/Modifier/UnwantedRulesFilterTest.php +++ b/dev/Test/Builder/Modifier/UnwantedRulesFilterTest.php @@ -44,9 +44,9 @@ public function testRuleIsNotDeprecated(string $name): void self::assertNotInstanceOf(DeprecatedFixerInterface::class, $this->getFixer($name, true)); } - public function provideRuleIsNotDeprecatedCases(): iterable + public static function provideRuleIsNotDeprecatedCases(): iterable { - foreach ($this->getRules() as $name) { + foreach (self::getRules() as $name) { yield $name => [$name]; } } @@ -65,7 +65,7 @@ private function getFixer(string $name, $config): FixerInterface /** * @return array */ - private function getRules(): array + private static function getRules(): array { $reflection = new \ReflectionClass(UnwantedRulesFilter::class); diff --git a/src/Rules/LibraryRules.php b/src/Rules/LibraryRules.php index b389715..ca9d08e 100644 --- a/src/Rules/LibraryRules.php +++ b/src/Rules/LibraryRules.php @@ -365,7 +365,9 @@ public function getRules(): array Fixer\ConstructorEmptyBracesFixer::name() => true, Fixer\DataProviderNameFixer::name() => true, Fixer\DataProviderReturnTypeFixer::name() => true, - Fixer\DataProviderStaticFixer::name() => true, + Fixer\DataProviderStaticFixer::name() => [ + 'force' => true, + ], Fixer\DeclareAfterOpeningTagFixer::name() => true, Fixer\IssetToArrayKeyExistsFixer::name() => true, Fixer\MultilineCommentOpeningClosingAloneFixer::name() => true, diff --git a/src/Rules/ProjectRules.php b/src/Rules/ProjectRules.php index 8d19b0b..f4ec3f5 100644 --- a/src/Rules/ProjectRules.php +++ b/src/Rules/ProjectRules.php @@ -343,7 +343,9 @@ public function getRules(): array Fixer\ConstructorEmptyBracesFixer::name() => true, Fixer\DataProviderNameFixer::name() => true, Fixer\DataProviderReturnTypeFixer::name() => true, - Fixer\DataProviderStaticFixer::name() => true, + Fixer\DataProviderStaticFixer::name() => [ + 'force' => true, + ], Fixer\DeclareAfterOpeningTagFixer::name() => true, Fixer\IssetToArrayKeyExistsFixer::name() => true, Fixer\MultilineCommentOpeningClosingAloneFixer::name() => true,