Skip to content

Commit

Permalink
fix compatibility with 3.59.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Joris Mak authored and PedroTroller committed Aug 2, 2024
1 parent a0c9d6d commit cee3788
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 5 deletions.
5 changes: 4 additions & 1 deletion src/PedroTroller/CS/Fixer/Behat/OrderBehatStepsFixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,16 @@
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;
use PhpCsFixer\Tokenizer\Tokens;

final class OrderBehatStepsFixer extends AbstractOrderedClassElementsFixer implements ConfigurableFixerInterface
{
use ConfigurableFixerTrait;

public const ANNOTATION_PRIORITIES = [
'@BeforeSuite',
'@AfterSuite',
Expand Down Expand Up @@ -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.'))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -15,6 +16,8 @@

final class ForbiddenFunctionsFixer extends AbstractFixer implements ConfigurableFixerInterface
{
use ConfigurableFixerTrait;

public function getSampleCode(): string
{
return <<<'PHP'
Expand Down Expand Up @@ -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'))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down Expand Up @@ -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)'))
Expand Down
5 changes: 4 additions & 1 deletion src/PedroTroller/CS/Fixer/DoctrineMigrationsFixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -17,6 +18,8 @@

final class DoctrineMigrationsFixer extends AbstractFixer implements ConfigurableFixerInterface
{
use ConfigurableFixerTrait;

/**
* @var string[]
*/
Expand Down Expand Up @@ -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'))
Expand Down
5 changes: 4 additions & 1 deletion src/PedroTroller/CS/Fixer/PhpspecFixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -17,6 +18,8 @@

final class PhpspecFixer extends AbstractOrderedClassElementsFixer implements ConfigurableFixerInterface
{
use ConfigurableFixerTrait;

public function getSampleConfigurations(): array
{
return [
Expand Down Expand Up @@ -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.'))
Expand Down

0 comments on commit cee3788

Please sign in to comment.