PHP CS Fixer 3 preparation (#500)

Author: kubawerlos

.php_cs

@@ -26,7 +26,7 @@ foreach (new PhpCsFixerCustomFixersDev\Fixers() as $fixer) {
  $rules[$fixer->getName()] = true;
 }
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
  ->registerCustomFixers(new PhpCsFixerCustomFixers\Fixers())
  ->registerCustomFixers(new PhpCsFixerCustomFixersDev\Fixers())
  ->setRiskyAllowed(true)

dev-tools/phpstan.neon

@@ -8,7 +8,7 @@ parameters:
  path: ../tests
  - message: '#^Call to function method_exists\(\) with ''Tests\\\\.*'' and ''.*'' will always evaluate to true\.$#'
  path: ../tests
- - message: '#^Parameter \#1 \$objectOrClass of class ReflectionClass constructor expects class-string<T of object>\|T of object, string given\.$#'
+ - message: '#^Parameter \#\d+ \$[a-zA-Z0-9]+ of class ReflectionClass constructor expects class-string<T of object>\|T of object, string given\.$#'
  path: ../tests
  level: max
  paths:

dev-tools/src/Fixer/OrderedClassElementsInternalFixer.php

@@ -14,6 +14,8 @@
 namespace PhpCsFixerCustomFixersDev\Fixer {
  use PhpCsFixer\Fixer\ClassNotation\OrderedClassElementsFixer;
  use PhpCsFixer\Fixer\FixerInterface;
+ use PhpCsFixer\FixerDefinition\FixerDefinition;
+ use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
  use PhpCsFixer\Tokenizer\Tokens;
 
  /**
@@ -35,6 +37,11 @@ final class OrderedClassElementsInternalFixer implements FixerInterface
  'getSuccessorsNames',
  ];
 
+ public function getDefinition(): FixerDefinitionInterface
+ {
+ return new FixerDefinition('Internal fixer for class elements order.', []);
+ }
+
  /** @var OrderedClassElementsFixer */
  private $orderedClassElementsFixer;
 

dev-tools/src/Fixer/PriorityInternalFixer.php

@@ -14,6 +14,8 @@
 namespace PhpCsFixerCustomFixersDev\Fixer;
 
 use PhpCsFixer\Fixer\FixerInterface;
+use PhpCsFixer\FixerDefinition\FixerDefinition;
+use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
 use PhpCsFixer\Tokenizer\Token;
 use PhpCsFixer\Tokenizer\Tokens;
 use PhpCsFixer\Utils;
@@ -29,6 +31,11 @@ public function getName(): string
  return 'Internal/' . \strtolower(\str_replace('\\', '_', Utils::camelCaseToUnderscore(__CLASS__)));
  }
 
+ public function getDefinition(): FixerDefinitionInterface
+ {
+ return new FixerDefinition('Internal fixer for priorities.', []);
+ }
+
  public function getPriority(): int
  {
  return 1000;

src/Fixer/CommentedOutFunctionFixer.php

@@ -15,6 +15,7 @@
 
 use PhpCsFixer\Fixer\ConfigurationDefinitionFixerInterface;
 use PhpCsFixer\FixerConfiguration\FixerConfigurationResolver;
+use PhpCsFixer\FixerConfiguration\FixerConfigurationResolverInterface;
 use PhpCsFixer\FixerConfiguration\FixerOptionBuilder;
 use PhpCsFixer\FixerDefinition\CodeSample;
 use PhpCsFixer\FixerDefinition\FixerDefinition;
@@ -42,7 +43,7 @@ public function getDefinition(): FixerDefinitionInterface
  );
  }
 
- public function getConfigurationDefinition(): FixerConfigurationResolver
+ public function getConfigurationDefinition(): FixerConfigurationResolverInterface
  {
  return new FixerConfigurationResolver([
  (new FixerOptionBuilder('functions', 'list of functions to comment out'))

src/Fixer/DataProviderNameFixer.php

@@ -15,6 +15,7 @@
 
 use PhpCsFixer\Fixer\ConfigurationDefinitionFixerInterface;
 use PhpCsFixer\FixerConfiguration\FixerConfigurationResolver;
+use PhpCsFixer\FixerConfiguration\FixerConfigurationResolverInterface;
 use PhpCsFixer\FixerConfiguration\FixerOptionBuilder;
 use PhpCsFixer\FixerDefinition\CodeSample;
 use PhpCsFixer\FixerDefinition\FixerDefinition;
@@ -55,7 +56,7 @@ public function dataProvider() {}
  );
  }
 
- public function getConfigurationDefinition(): FixerConfigurationResolver
+ public function getConfigurationDefinition(): FixerConfigurationResolverInterface
  {
  return new FixerConfigurationResolver([
  (new FixerOptionBuilder('prefix', 'prefix that replaces "test"'))

src/Fixer/NoSuperfluousConcatenationFixer.php

@@ -15,6 +15,7 @@
 
 use PhpCsFixer\Fixer\ConfigurationDefinitionFixerInterface;
 use PhpCsFixer\FixerConfiguration\FixerConfigurationResolver;
+use PhpCsFixer\FixerConfiguration\FixerConfigurationResolverInterface;
 use PhpCsFixer\FixerConfiguration\FixerOptionBuilder;
 use PhpCsFixer\FixerDefinition\CodeSample;
 use PhpCsFixer\FixerDefinition\FixerDefinition;
@@ -36,7 +37,7 @@ public function getDefinition(): FixerDefinitionInterface
  );
  }
 
- public function getConfigurationDefinition(): FixerConfigurationResolver
+ public function getConfigurationDefinition(): FixerConfigurationResolverInterface
  {
  return new FixerConfigurationResolver([
  (new FixerOptionBuilder('allow_preventing_trailing_spaces', 'whether to keep concatenation if it prevents having trailing spaces in string'))

src/Fixer/NumericLiteralSeparatorFixer.php

@@ -15,6 +15,7 @@
 
 use PhpCsFixer\Fixer\ConfigurationDefinitionFixerInterface;
 use PhpCsFixer\FixerConfiguration\FixerConfigurationResolver;
+use PhpCsFixer\FixerConfiguration\FixerConfigurationResolverInterface;
 use PhpCsFixer\FixerConfiguration\FixerOptionBuilder;
 use PhpCsFixer\FixerDefinition\FixerDefinition;
 use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
@@ -58,7 +59,7 @@ public function getDefinition(): FixerDefinitionInterface
  );
  }
 
- public function getConfigurationDefinition(): FixerConfigurationResolver
+ public function getConfigurationDefinition(): FixerConfigurationResolverInterface
  {
  return new FixerConfigurationResolver([
  (new FixerOptionBuilder('binary', 'whether add, remove or ignore separators in binary numbers.'))

src/Fixer/PhpdocOnlyAllowedAnnotationsFixer.php

@@ -16,6 +16,7 @@
 use PhpCsFixer\DocBlock\DocBlock;
 use PhpCsFixer\Fixer\ConfigurationDefinitionFixerInterface;
 use PhpCsFixer\FixerConfiguration\FixerConfigurationResolver;
+use PhpCsFixer\FixerConfiguration\FixerConfigurationResolverInterface;
 use PhpCsFixer\FixerConfiguration\FixerOptionBuilder;
 use PhpCsFixer\FixerDefinition\CodeSample;
 use PhpCsFixer\FixerDefinition\FixerDefinition;
@@ -48,7 +49,7 @@ function foo_bar() {}
  );
  }
 
- public function getConfigurationDefinition(): FixerConfigurationResolver
+ public function getConfigurationDefinition(): FixerConfigurationResolverInterface
  {
  return new FixerConfigurationResolver([
  (new FixerOptionBuilder('elements', 'list of annotations to keep in PHPDoc'))

src/Fixer/SingleSpaceAfterStatementFixer.php

@@ -15,6 +15,7 @@
 
 use PhpCsFixer\Fixer\ConfigurationDefinitionFixerInterface;
 use PhpCsFixer\FixerConfiguration\FixerConfigurationResolver;
+use PhpCsFixer\FixerConfiguration\FixerConfigurationResolverInterface;
 use PhpCsFixer\FixerConfiguration\FixerOptionBuilder;
 use PhpCsFixer\FixerDefinition\CodeSample;
 use PhpCsFixer\FixerDefinition\FixerDefinition;
@@ -91,7 +92,7 @@ public function getDefinition(): FixerDefinitionInterface
  );
  }
 
- public function getConfigurationDefinition(): FixerConfigurationResolver
+ public function getConfigurationDefinition(): FixerConfigurationResolverInterface
  {
  return new FixerConfigurationResolver([
  (new FixerOptionBuilder('allow_linebreak', 'whether to allow statement followed by linebreak'))