cs: Update PHP-CS-Fixer rules

.php-cs-fixer.dist.php

@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-use PhpCsFixer\Config;
+use Fidry\PhpCsFixerConfig\FidryConfig;
 use PhpCsFixer\Finder;
 
 $finder = Finder::create()
@@ -28,77 +28,26 @@
         'fixtures/Parser/files/php',
         'Bridge/Symfony/Application/var',
         'fixtures/Bridge/Symfony/Application/cache',
-    ])
-;
+    ]);
 
-return (new Config())
-    ->setRiskyAllowed(true)
-    ->setRules([
-        '@PSR2' => true,
-        'blank_line_after_opening_tag' => true,
-        'blank_line_before_statement' => true,
-        'cast_spaces' => true,
-        'combine_consecutive_unsets' => true,
-        'declare_equal_normalize' => true,
-        'declare_strict_types' => true,
-        'heredoc_to_nowdoc' => true,
-        'include' => true,
-        'header_comment' => [
-            'location' => 'after_open',
-            'header' => <<<'LICENSE'
-                This file is part of the Alice package.
-
-                (c) Nelmio <hello@nelm.io>
-
-                For the full copyright and license information, please view the LICENSE
-                file that was distributed with this source code.
-                LICENSE,
-        ],
-        'lowercase_cast' => true,
-        'general_phpdoc_annotation_remove' => true,
-        'global_namespace_import' => [
-            'import_classes' => true,
-            'import_constants' => true,
-            'import_functions' => true,
-        ],
-        'modernize_types_casting' => true,
-        'native_function_casing' => true,
-        'new_with_braces' => true,
-        'no_blank_lines_after_class_opening' => true,
-        'no_blank_lines_after_phpdoc' => true,
-        'no_empty_comment' => true,
-        'no_empty_phpdoc' => true,
-        'no_empty_statement' => true,
-        'no_leading_import_slash' => true,
-        'no_leading_namespace_whitespace' => true,
-        'no_multiline_whitespace_around_double_arrow' => true,
-        'no_short_bool_cast' => true,
-        'no_spaces_around_offset' => true,
-        'no_superfluous_phpdoc_tags' => [
-            'remove_inheritdoc' => true,
-        ],
-        'no_unused_imports' => true,
-        'ordered_imports' => true,
-        'phpdoc_no_empty_return' => true,
-        'phpdoc_order' => true,
-        'phpdoc_order_by_value' => true,
-        'phpdoc_scalar' => true,
-        'phpdoc_separation' => true,
-        'phpdoc_trim' => true,
-        'php_unit_construct' => true,
-        'php_unit_dedicate_assert' => true,
-        'php_unit_dedicate_assert_internal_type' => true,
-        'php_unit_expectation' => true,
-        'php_unit_fqcn_annotation' => true,
-        'php_unit_namespaced' => true,
-        'php_unit_test_case_static_method_calls' => true,
-        'php_unit_test_class_requires_covers' => true,
-        'single_quote' => true,
-        'space_after_semicolon' => true,
-        'standardize_not_equals' => true,
-        'trim_array_spaces' => true,
-        'void_return' => true,
-        'whitespace_after_comma_in_array' => true,
-    ])
-    ->setFinder($finder)
-;
+$config = new FidryConfig(
+    <<<'EOF'
+        This file is part of the Alice package.
+
+        (c) Nelmio <hello@nelm.io>
+
+        For the full copyright and license information, please view the LICENSE
+        file that was distributed with this source code.
+        EOF,
+    74_000,
+);
+
+$config->addRules([
+    'php_unit_method_casing' => ['case' => 'camel_case'],
+    'phpdoc_no_empty_return' => false,
+]);
+
+$config->setFinder($finder);
+$config->setCacheFile(__DIR__.'/dist/.php-cs-fixer.cache');
+
+return $config;

fixtures/Bridge/Symfony/Application/AppKernel.php

@@ -27,25 +27,25 @@ class AppKernel extends Kernel
      * @var string|null
      */
     private $config;
-    
+
     public function __construct($environment, $debug)
     {
         parent::__construct($environment, $debug);
     }
-    
+
     public function registerBundles(): array
     {
         return [
             new FrameworkBundle(),
             new NelmioAliceBundle(),
         ];
     }
-    
+
     public function registerContainerConfiguration(LoaderInterface $loader): void
     {
         $loader->load($this->config ?? __DIR__.'/config.yml');
     }
-    
+
     public function build(ContainerBuilder $container): void
     {
         $container->addCompilerPass(new class() implements CompilerPassInterface {

fixtures/Definition/FakeMethodCall.php

@@ -18,27 +18,27 @@
 class FakeMethodCall implements MethodCallInterface
 {
     use NotCallableTrait;
-    
-    public function withArguments(array $arguments = null): void
+
+    public function withArguments(?array $arguments = null): void
     {
         $this->__call(__METHOD__, func_get_args());
     }
-    
+
     public function getCaller(): void
     {
         $this->__call(__METHOD__, func_get_args());
     }
-    
+
     public function getMethod(): string
     {
         $this->__call(__METHOD__, func_get_args());
     }
-    
+
     public function getArguments(): array
     {
         $this->__call(__METHOD__, func_get_args());
     }
-    
+
     public function __toString(): string
     {
         $this->__call(__METHOD__, func_get_args());

fixtures/Definition/Fixture/DummyFixture.php

@@ -30,27 +30,27 @@ public function __construct(string $id)
     {
         $this->id = $id;
     }
-    
+
     public function getId(): string
     {
         return $this->id;
     }
-    
+
     public function getClassName(): string
     {
         $this->__call(__METHOD__, func_get_args());
     }
-    
+
     public function getSpecs(): SpecificationBag
     {
         $this->__call(__METHOD__, func_get_args());
     }
-    
+
     public function getValueForCurrent(): void
     {
         $this->__call(__METHOD__, func_get_args());
     }
-    
+
     public function withSpecs(SpecificationBag $specs): void
     {
         $this->__call(__METHOD__, func_get_args());

fixtures/Definition/Fixture/FakeFixture.php

@@ -20,27 +20,27 @@
 class FakeFixture implements FixtureInterface
 {
     use NotCallableTrait;
-    
+
     public function getId(): string
     {
         $this->__call(__METHOD__, func_get_args());
     }
-    
+
     public function getClassName(): string
     {
         $this->__call(__METHOD__, func_get_args());
     }
-    
+
     public function getSpecs(): SpecificationBag
     {
         $this->__call(__METHOD__, func_get_args());
     }
-    
+
     public function getValueForCurrent(): void
     {
         $this->__call(__METHOD__, func_get_args());
     }
-    
+
     public function withSpecs(SpecificationBag $specs): void
     {
         $this->__call(__METHOD__, func_get_args());

fixtures/Definition/Fixture/MutableFixture.php

@@ -42,17 +42,17 @@ public function __construct(string $id, string $className, SpecificationBag $spe
         $this->className = $className;
         $this->specs = $specs;
     }
-    
+
     public function getId(): string
     {
         return $this->id;
     }
-    
+
     public function getClassName(): string
     {
         return $this->className;
     }
-    
+
     public function getSpecs(): SpecificationBag
     {
         return $this->specs;
@@ -62,12 +62,12 @@ public function setSpecs(SpecificationBag $specs): void
     {
         $this->specs = $specs;
     }
-    
+
     public function getValueForCurrent(): void
     {
         $this->__call(__METHOD__, func_get_args());
     }
-    
+
     public function withSpecs(SpecificationBag $specs): void
     {
         $this->__call(__METHOD__, func_get_args());

fixtures/Definition/Flag/ElementFlag.php

@@ -26,7 +26,7 @@ public function __construct(string $element)
     {
         $this->element = $element;
     }
-    
+
     public function __toString(): string
     {
         return $this->element;

fixtures/Definition/Flag/ElementWithToStringFlag.php

@@ -32,7 +32,7 @@ public function __construct(string $element, string $toString)
         $this->element = $element;
         $this->toString = $toString;
     }
-    
+
     public function __toString(): string
     {
         return $this->toString;

fixtures/Definition/MethodCall/DummyMethodCall.php

@@ -35,27 +35,27 @@ public function __construct(string $toString)
         $this->token = uniqid();
         $this->toString = $toString;
     }
-    
-    public function withArguments(array $arguments = null): self
+
+    public function withArguments(?array $arguments = null): self
     {
         $this->__call(__METHOD__, func_get_args());
     }
-    
+
     public function getCaller(): void
     {
         $this->__call(__METHOD__, func_get_args());
     }
-    
+
     public function getMethod(): string
     {
         $this->__call(__METHOD__, func_get_args());
     }
-    
+
     public function getArguments(): array
     {
         $this->__call(__METHOD__, func_get_args());
     }
-    
+
     public function __toString(): string
     {
         return $this->toString;

fixtures/Definition/MethodCall/IdentityFactory.php

@@ -22,7 +22,7 @@ public static function create(string $expression): FunctionCallValue
     {
         return new FunctionCallValue(
             'identity',
-            [new EvaluatedValue($expression)]
+            [new EvaluatedValue($expression)],
         );
     }
 }

fixtures/Definition/MethodCall/MutableMethodCall.php

@@ -26,36 +26,35 @@ class MutableMethodCall implements MethodCallInterface
      */
     private $caller;
 
-
     private $method;
 
     /**
      * @var array|null
      */
     private $arguments;
 
-    public function __construct(ServiceReferenceInterface $caller = null, $method, array $arguments = null)
+    public function __construct(?ServiceReferenceInterface $caller = null, $method, ?array $arguments = null)
     {
         $this->caller = $caller;
         $this->method = $method;
         $this->arguments = $arguments;
     }
-    
-    public function withArguments(array $arguments = null): void
+
+    public function withArguments(?array $arguments = null): void
     {
         $this->__call(__METHOD__, func_get_args());
     }
-    
+
     public function getCaller()
     {
         return $this->caller;
     }
 
-    public function setCaller(ServiceReferenceInterface $caller = null): void
+    public function setCaller(?ServiceReferenceInterface $caller = null): void
     {
         $this->caller = $caller;
     }
-    
+
     public function getMethod(): string
     {
         return $this->method;
@@ -65,17 +64,17 @@ public function setMethod($method): void
     {
         $this->method = $method;
     }
-    
+
     public function getArguments()
     {
         return $this->arguments;
     }
 
-    public function setArguments(array $arguments = null): void
+    public function setArguments(?array $arguments = null): void
     {
         $this->arguments = $arguments;
     }
-    
+
     public function __toString(): string
     {
         return 'mutable_method_call';