Migrate to PHP-CS-Fixer 3.0 (#1092)

.gitignore

@@ -1,4 +1,5 @@
 /.php_cs.cache
+/.php-cs-fixer.cache
 /bin/
 /composer.lock
 /dist/

.php_cs.dist → .php-cs-fixer.dist.php

@@ -22,20 +22,20 @@
         __DIR__.'/tests',
     ])
     ->append([
-        __DIR__.'/.php_cs.dist',
+        __DIR__.'/.php-cs-fixer.dist.php',
     ])
     ->exclude([
         'fixtures/Parser/files/php',
         'Bridge/Symfony/Application/var',
     ])
 ;
 
-return Config::create()
+return (new Config())
     ->setRiskyAllowed(true)
     ->setRules([
         '@PSR2' => true,
         'blank_line_after_opening_tag' => true,
-        'blank_line_before_return' => true,
+        'blank_line_before_statement' => true,
         'cast_spaces' => true,
         'combine_consecutive_unsets' => true,
         'declare_equal_normalize' => true,
@@ -45,13 +45,13 @@
         '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
+                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,
@@ -60,7 +60,6 @@
             'import_constants' => true,
             'import_functions' => true,
         ],
-        'method_separation' => true,
         'modernize_types_casting' => true,
         'native_function_casing' => true,
         'new_with_braces' => true,
@@ -81,6 +80,7 @@
         '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,
@@ -92,7 +92,6 @@
         'php_unit_namespaced' => true,
         'php_unit_test_case_static_method_calls' => true,
         'php_unit_test_class_requires_covers' => true,
-        'php_unit_ordered_covers' => true,
         'single_quote' => true,
         'space_after_semicolon' => true,
         'standardize_not_equals' => true,

src/FixtureBuilder/Denormalizer/Fixture/SimpleFixtureBagDenormalizer.php

@@ -73,6 +73,7 @@ public function denormalize(array $data): FixtureBag
                     )
                 );
             }
+
             try {
                 foreach ($rawFixtureSet as $reference => $specs) {
                     if (null === $specs) {

src/FixtureBuilder/ExpressionLanguage/Parser/TokenParser/Chainable/ParameterTokenParser.php

@@ -44,6 +44,7 @@ public function canParse(Token $token): bool
     public function parse(Token $token): ParameterValue
     {
         $value = $token->getValue();
+
         try {
             $paramKey = strlen($value) > 3 ? substr($value, 2, -2) : false;
 

src/FixtureBuilder/ExpressionLanguage/Parser/TokenParser/Chainable/StringArrayTokenParser.php

@@ -41,6 +41,7 @@ public function parse(Token $token): ValueInterface
         parent::parse($token);
 
         $value = $token->getValue();
+
         try {
             $elements = substr($value, 1, -1);
 

src/Generator/Hydrator/Property/SymfonyPropertyAccessorHydrator.php

@@ -54,6 +54,7 @@ public function __construct(PropertyAccessorInterface $propertyAccessor)
     public function hydrate(ObjectInterface $object, Property $property, GenerationContext $context): ObjectInterface
     {
         $instance = $object->getInstance();
+
         try {
             $this->propertyAccessor->setValue($instance, $property->getName(), $property->getValue());
         } catch (SymfonyNoSuchPropertyException $exception) {

src/Generator/Instantiator/Chainable/NullConstructorInstantiator.php

@@ -28,6 +28,7 @@ public function canInstantiate(FixtureInterface $fixture): bool
     protected function createInstance(FixtureInterface $fixture)
     {
         $class = $fixture->getClassName();
+
         try {
             $constructRefl = new ReflectionMethod($class, '__construct');
 

src/Generator/NamedArgumentsResolver.php

@@ -67,6 +67,7 @@ public function resolveArguments(array $arguments, string $className, string $me
                 if ($parameter->isVariadic()) {
                     continue;
                 }
+
                 throw new RuntimeException(sprintf(
                     'Argument $%s of %s::%s() is not passed a value and does not define a default one.',
                     $name,

src/Generator/Resolver/Value/Chainable/EvaluatedValueResolver.php

@@ -51,6 +51,7 @@ public function resolve(
         // We make use of the underscore prefix (`_`) here to limit the possible conflicts with the variables injected
         // in the scope.
         $_scope = $scope;
+
         try {
             $_scope['current'] = $fixture->getValueForCurrent();
 

tests/Definition/Fixture/SimpleFixtureTest.php

@@ -46,6 +46,7 @@ public function testReadAccessorsReturnPropertiesValues(): void
         static::assertEquals($reference, $fixture->getId());
         static::assertEquals($className, $fixture->getClassName());
         static::assertEquals($specs, $fixture->getSpecs());
+
         try {
             $fixture->getValueForCurrent();
             static::fail('Expected exception to be thrown.');

tests/Faker/GeneratorFactoryTest.php

@@ -28,6 +28,7 @@ class GeneratorFactoryTest extends TestCase
     public function testAssertGeneratorLocaleMethod(): void
     {
         $this->assertGeneratorLocaleIs('en_US', FakerFactory::create());
+
         try {
             $this->assertGeneratorLocaleIs('fr_FR', FakerFactory::create());
             static::fail('Expected exception to be thrown.');

tests/Faker/Provider/AliceProviderTest.php

@@ -44,6 +44,7 @@ public function testCurrentReturnsFixtureCurrentValue(): void
     public function testCurrentThrowsAnExceptionIfFixtureHasNoCurrentValue(): void
     {
         $fixture = new SimpleFixture('dummy', 'Dummy', SpecificationBagFactory::create());
+
         try {
             AliceProvider::current($fixture);
             static::fail('Expected exception to be thrown.');

tests/FixtureBagTest.php

@@ -50,6 +50,7 @@ public function testReadAccessorsReturnPropertiesValues(): void
         static::assertFalse($bag->has('bar'));
 
         static::assertEquals($fixture, $bag->get('foo'));
+
         try {
             $bag->get('bar');
             static::fail('Expected exception to be thrown.');

tests/FixtureBuilder/Denormalizer/Fixture/SpecificationBagDenormalizer/Value/SimpleValueDenormalizerTest.php

@@ -109,6 +109,7 @@ public function testWhenParserThrowsExceptionDenormalizerAExceptionIsThrown(): v
         $parser = $parserProphecy->reveal();
 
         $denormalizer = new SimpleValueDenormalizer($parser);
+
         try {
             $denormalizer->denormalize(new FakeFixture(), null, 'foo');
             static::fail('Expected throwable to be thrown.');

tests/Generator/Instantiator/InstantiatorResolverTest.php

@@ -169,6 +169,7 @@ public function testThrowsAGenerationThrowableIfResolutionFails(): void
         $resolver = $resolverProphecy->reveal();
 
         $instantiator = new InstantiatorResolver(new FakeInstantiator(), $resolver);
+
         try {
             $instantiator->instantiate($fixture, $set, new GenerationContext());
             static::fail('Expected exception to be thrown.');

tests/Generator/Resolver/Fixture/TemplatingFixtureBagTest.php

@@ -59,6 +59,7 @@ public function testReadAccessorsReturnPropertiesValues(): void
         static::assertEquals($template, $bag->get($templateId));
 
         static::assertFalse($bag->has('foo'));
+
         try {
             $bag->get('foo');
             static::fail('Expected exception to be thrown.');

tests/Generator/Resolver/Parameter/Chainable/RecursiveParameterResolverTest.php

@@ -308,6 +308,7 @@ function ($args) {
         $decoratedResolver = $decoratedResolverProphecy->reveal();
 
         $resolver = new RecursiveParameterResolver($decoratedResolver);
+
         try {
             $resolver->resolve($parameter, $unresolvedParameters, $resolvedParameters, $context);
             static::fail('Expected exception to be thrown.');
@@ -320,6 +321,7 @@ function ($args) {
         }
 
         $resolver = new RecursiveParameterResolver($decoratedResolver, 10);
+
         try {
             $resolver->resolve($parameter, $unresolvedParameters, $resolvedParameters, $context);
             static::fail('Expected exception to be thrown.');

tests/Generator/Resolver/Parameter/Chainable/StringParameterResolverTest.php

@@ -153,6 +153,7 @@ public function testChecksIfParameterIsReferencedBeforeTryingToResolveIt(): void
         $resolvedParameters = new ParameterBag();
 
         $resolver = new StringParameterResolver();
+
         try {
             $resolver->resolve($parameter, $unresolvedParameters, $resolvedParameters);
             static::fail('Expected exception to be thrown');
@@ -169,6 +170,7 @@ public function testChecksIfParameterIsReferencedBeforeTryingToResolveIt(): void
         $injectedResolver = $injectedResolverProphecy->reveal();
 
         $resolver = (new StringParameterResolver())->withResolver($injectedResolver);
+
         try {
             $resolver->resolve($parameter, $unresolvedParameters, $resolvedParameters);
             static::fail('Expected exception to be thrown');

tests/Generator/Resolver/ResolvingContextTest.php

@@ -62,6 +62,7 @@ public function testFactoryMethodCannotTriggerACircularReference(): void
         $context->checkForCircularReference('foo');
 
         $context->add('foo');
+
         try {
             $context->checkForCircularReference('foo');
             static::fail('Expected exception to be thrown.');
@@ -79,6 +80,7 @@ public function testThrowsAnExceptionWhenACircularReferenceIsDetected(): void
         $context->checkForCircularReference('foo');
 
         $context->add('foo');
+
         try {
             $context->checkForCircularReference('foo');
             static::fail('Expected exception to be thrown.');
@@ -93,6 +95,7 @@ public function testThrowsAnExceptionWhenACircularReferenceIsDetected(): void
         $context->checkForCircularReference('foo');
 
         $context->add('foo');
+
         try {
             $context->checkForCircularReference('foo');
             static::fail('Expected exception to be thrown.');

tests/Generator/Resolver/Value/Chainable/EvaluatedValueResolverTest.php

@@ -158,6 +158,7 @@ public function testVariablesInference(): void
         static::assertSame(['foo' => 'bar'], $scope);
 
         $value = new EvaluatedValue('$scope');
+
         try {
             $resolver->resolve($value, $fixture, $set, $scope, new GenerationContext());
             static::fail('Expected an exception to be thrown.');
@@ -203,6 +204,7 @@ public function testVariablesInferenceWithCurrent(): void
         static::assertEquals($expected, $actual);
 
         $value = new EvaluatedValue('$scope');
+
         try {
             $resolver->resolve($value, $fixture, $set, $scope, new GenerationContext());
             static::fail('Expected an exception to be thrown.');

tests/Generator/Resolver/Value/Chainable/UniqueValueResolverTest.php

@@ -257,6 +257,7 @@ public function testThrowsIfLimitForGenerationOfUniqueValuesIsReached(): void
 
 
         $resolver = new UniqueValueResolver($pool, $decoratedResolver);
+
         try {
             $resolver->resolve($value, $fixture, $set, $scope, $context);
             static::fail('Expected exception to be thrown.');

tests/Parser/RuntimeCacheParserTest.php

@@ -137,6 +137,7 @@ public function testThrowsAnExceptionIfFileCouldNotBeFound(): void
         $fileLocator = $fileLocatorProphecy->reveal();
 
         $parser = new RuntimeCacheParser(new FakeParser(), $fileLocator, new FakeIncludeProcessor());
+
         try {
             $parser->parse('/nowhere');
 

vendor-bin/php-cs-fixer/composer.json

@@ -1,6 +1,6 @@
 {
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.3"
+        "friendsofphp/php-cs-fixer": "^3.0"
     },
     "config": {
         "bin-dir": "bin",