From cee37884470c9f3c72854658b3c43e30a0bb2422 Mon Sep 17 00:00:00 2001 From: Joris Mak Date: Fri, 28 Jun 2024 11:31:37 +0200 Subject: [PATCH] fix compatibility with 3.59.3 --- src/PedroTroller/CS/Fixer/Behat/OrderBehatStepsFixer.php | 5 ++++- .../CS/Fixer/CodingStyle/ForbiddenFunctionsFixer.php | 5 ++++- .../CodingStyle/LineBreakBetweenMethodArgumentsFixer.php | 5 ++++- src/PedroTroller/CS/Fixer/DoctrineMigrationsFixer.php | 5 ++++- src/PedroTroller/CS/Fixer/PhpspecFixer.php | 5 ++++- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/PedroTroller/CS/Fixer/Behat/OrderBehatStepsFixer.php b/src/PedroTroller/CS/Fixer/Behat/OrderBehatStepsFixer.php index ea44517..70f5fed 100644 --- a/src/PedroTroller/CS/Fixer/Behat/OrderBehatStepsFixer.php +++ b/src/PedroTroller/CS/Fixer/Behat/OrderBehatStepsFixer.php @@ -8,6 +8,7 @@ use PedroTroller\CS\Fixer\Priority; use PhpCsFixer\Fixer\ClassNotation\OrderedClassElementsFixer; use PhpCsFixer\Fixer\ConfigurableFixerInterface; +use PhpCsFixer\Fixer\ConfigurableFixerTrait; use PhpCsFixer\FixerConfiguration\FixerConfigurationResolver; use PhpCsFixer\FixerConfiguration\FixerConfigurationResolverInterface; use PhpCsFixer\FixerConfiguration\FixerOptionBuilder; @@ -15,6 +16,8 @@ final class OrderBehatStepsFixer extends AbstractOrderedClassElementsFixer implements ConfigurableFixerInterface { + use ConfigurableFixerTrait; + public const ANNOTATION_PRIORITIES = [ '@BeforeSuite', '@AfterSuite', @@ -126,7 +129,7 @@ public function getDocumentation(): string return 'Step definition methods in Behat contexts MUST BE ordered by annotation and method name.'; } - public function getConfigurationDefinition(): FixerConfigurationResolverInterface + public function createConfigurationDefinition(): FixerConfigurationResolverInterface { return new FixerConfigurationResolver([ (new FixerOptionBuilder('instanceof', 'Parent class or interface of your behat context classes.')) diff --git a/src/PedroTroller/CS/Fixer/CodingStyle/ForbiddenFunctionsFixer.php b/src/PedroTroller/CS/Fixer/CodingStyle/ForbiddenFunctionsFixer.php index a75f975..c0113ce 100644 --- a/src/PedroTroller/CS/Fixer/CodingStyle/ForbiddenFunctionsFixer.php +++ b/src/PedroTroller/CS/Fixer/CodingStyle/ForbiddenFunctionsFixer.php @@ -6,6 +6,7 @@ use PedroTroller\CS\Fixer\AbstractFixer; use PhpCsFixer\Fixer\ConfigurableFixerInterface; +use PhpCsFixer\Fixer\ConfigurableFixerTrait; use PhpCsFixer\FixerConfiguration\FixerConfigurationResolver; use PhpCsFixer\FixerConfiguration\FixerConfigurationResolverInterface; use PhpCsFixer\FixerConfiguration\FixerOptionBuilder; @@ -15,6 +16,8 @@ final class ForbiddenFunctionsFixer extends AbstractFixer implements ConfigurableFixerInterface { + use ConfigurableFixerTrait; + public function getSampleCode(): string { return <<<'PHP' @@ -53,7 +56,7 @@ public function getDocumentation(): string return 'Prohibited functions MUST BE commented on as prohibited'; } - public function getConfigurationDefinition(): FixerConfigurationResolverInterface + public function createConfigurationDefinition(): FixerConfigurationResolverInterface { return new FixerConfigurationResolver([ (new FixerOptionBuilder('functions', 'The function names to be marked how prohibited')) diff --git a/src/PedroTroller/CS/Fixer/CodingStyle/LineBreakBetweenMethodArgumentsFixer.php b/src/PedroTroller/CS/Fixer/CodingStyle/LineBreakBetweenMethodArgumentsFixer.php index 6b94a32..988f750 100644 --- a/src/PedroTroller/CS/Fixer/CodingStyle/LineBreakBetweenMethodArgumentsFixer.php +++ b/src/PedroTroller/CS/Fixer/CodingStyle/LineBreakBetweenMethodArgumentsFixer.php @@ -8,6 +8,7 @@ use PedroTroller\CS\Fixer\Priority; use PhpCsFixer\Fixer\Basic\BracesFixer; use PhpCsFixer\Fixer\ConfigurableFixerInterface; +use PhpCsFixer\Fixer\ConfigurableFixerTrait; use PhpCsFixer\Fixer\FunctionNotation\MethodArgumentSpaceFixer; use PhpCsFixer\Fixer\WhitespacesAwareFixerInterface; use PhpCsFixer\FixerConfiguration\FixerConfigurationResolver; @@ -19,6 +20,8 @@ final class LineBreakBetweenMethodArgumentsFixer extends AbstractFixer implements ConfigurableFixerInterface, WhitespacesAwareFixerInterface { + use ConfigurableFixerTrait; + public const T_TYPEHINT_SEMI_COLON = 10025; public function getPriority(): int @@ -81,7 +84,7 @@ public function fun3( SPEC; } - public function getConfigurationDefinition(): FixerConfigurationResolverInterface + public function createConfigurationDefinition(): FixerConfigurationResolverInterface { return new FixerConfigurationResolver([ (new FixerOptionBuilder('max-args', 'The maximum number of arguments allowed with splitting the arguments into several lines (use `false` to disable this feature)')) diff --git a/src/PedroTroller/CS/Fixer/DoctrineMigrationsFixer.php b/src/PedroTroller/CS/Fixer/DoctrineMigrationsFixer.php index 94bc5e2..814756c 100644 --- a/src/PedroTroller/CS/Fixer/DoctrineMigrationsFixer.php +++ b/src/PedroTroller/CS/Fixer/DoctrineMigrationsFixer.php @@ -6,6 +6,7 @@ use PhpCsFixer\Fixer\ClassNotation\ClassAttributesSeparationFixer; use PhpCsFixer\Fixer\ConfigurableFixerInterface; +use PhpCsFixer\Fixer\ConfigurableFixerTrait; use PhpCsFixer\Fixer\Phpdoc\NoEmptyPhpdocFixer; use PhpCsFixer\Fixer\Whitespace\NoExtraBlankLinesFixer; use PhpCsFixer\FixerConfiguration\FixerConfigurationResolver; @@ -17,6 +18,8 @@ final class DoctrineMigrationsFixer extends AbstractFixer implements ConfigurableFixerInterface { + use ConfigurableFixerTrait; + /** * @var string[] */ @@ -100,7 +103,7 @@ public function getPriority(): int return Priority::before(ClassAttributesSeparationFixer::class, NoEmptyPhpdocFixer::class, NoExtraBlankLinesFixer::class); } - public function getConfigurationDefinition(): FixerConfigurationResolverInterface + public function createConfigurationDefinition(): FixerConfigurationResolverInterface { return new FixerConfigurationResolver([ (new FixerOptionBuilder('instanceof', 'The parent class of which Doctrine migrations extend')) diff --git a/src/PedroTroller/CS/Fixer/PhpspecFixer.php b/src/PedroTroller/CS/Fixer/PhpspecFixer.php index e92f0e6..3f481a4 100644 --- a/src/PedroTroller/CS/Fixer/PhpspecFixer.php +++ b/src/PedroTroller/CS/Fixer/PhpspecFixer.php @@ -6,6 +6,7 @@ use PhpCsFixer\Fixer\ClassNotation\VisibilityRequiredFixer; use PhpCsFixer\Fixer\ConfigurableFixerInterface; +use PhpCsFixer\Fixer\ConfigurableFixerTrait; use PhpCsFixer\Fixer\FunctionNotation\StaticLambdaFixer; use PhpCsFixer\Fixer\FunctionNotation\VoidReturnFixer; use PhpCsFixer\FixerConfiguration\FixerConfigurationResolver; @@ -17,6 +18,8 @@ final class PhpspecFixer extends AbstractOrderedClassElementsFixer implements ConfigurableFixerInterface { + use ConfigurableFixerTrait; + public function getSampleConfigurations(): array { return [ @@ -101,7 +104,7 @@ public function getPriority(): int ); } - public function getConfigurationDefinition(): FixerConfigurationResolverInterface + public function createConfigurationDefinition(): FixerConfigurationResolverInterface { return new FixerConfigurationResolver([ (new FixerOptionBuilder('instanceof', 'Parent classes of your spec classes.'))