apply cs

2025-04-24 09:25:42 +02:00 · 2020-12-19 23:37:11 +01:00 · 2020-12-19 23:37:11 +01:00 · b7c6e2b7c0
commit b7c6e2b7c0
parent 720b2c34eb
16 changed files with 50 additions and 39 deletions
--- a/config/set/symfony52.php
+++ b/config/set/symfony52.php
@ -55,16 +55,56 @@ return static function (ContainerConfigurator $containerConfigurator): void {
    $services->set(RenameMethodRector::class)
        ->call('configure', [[
            RenameMethodRector::METHOD_CALL_RENAMES => ValueObjectInliner::inline([
-                new MethodCallRename('Symfony\Component\Security\Core\Authentication\Token\PreAuthenticatedToken', 'setProviderKey', 'setFirewallName'),
-                new MethodCallRename('Symfony\Component\Security\Core\Authentication\Token\PreAuthenticatedToken', 'getProviderKey', 'getFirewallName'),
-                new MethodCallRename('Symfony\Component\Security\Core\Authentication\Token\RememberMeToken', 'setProviderKey', 'setFirewallName'),
-                new MethodCallRename('Symfony\Component\Security\Core\Authentication\Token\RememberMeToken', 'getProviderKey', 'getFirewallName'),
-                new MethodCallRename('Symfony\Component\Security\Core\Authentication\Token\SwitchUserToken', 'setProviderKey', 'setFirewallName'),
-                new MethodCallRename('Symfony\Component\Security\Core\Authentication\Token\SwitchUserToken', 'getProviderKey', 'getFirewallName'),
-                new MethodCallRename('Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken', 'setProviderKey', 'setFirewallName'),
-                new MethodCallRename('Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken', 'getProviderKey', 'getFirewallName'),
-                new MethodCallRename('Symfony\Component\Security\Http\Authentication\DefaultAuthenticationSuccessHandler', 'setProviderKey', 'setFirewallName'),
-                new MethodCallRename('Symfony\Component\Security\Http\Authentication\DefaultAuthenticationSuccessHandler', 'getProviderKey', 'getFirewallName'),
+                new MethodCallRename(
+                    'Symfony\Component\Security\Core\Authentication\Token\PreAuthenticatedToken',
+                    'setProviderKey',
+                    'setFirewallName'
+                ),
+                new MethodCallRename(
+                    'Symfony\Component\Security\Core\Authentication\Token\PreAuthenticatedToken',
+                    'getProviderKey',
+                    'getFirewallName'
+                ),
+                new MethodCallRename(
+                    'Symfony\Component\Security\Core\Authentication\Token\RememberMeToken',
+                    'setProviderKey',
+                    'setFirewallName'
+                ),
+                new MethodCallRename(
+                    'Symfony\Component\Security\Core\Authentication\Token\RememberMeToken',
+                    'getProviderKey',
+                    'getFirewallName'
+                ),
+                new MethodCallRename(
+                    'Symfony\Component\Security\Core\Authentication\Token\SwitchUserToken',
+                    'setProviderKey',
+                    'setFirewallName'
+                ),
+                new MethodCallRename(
+                    'Symfony\Component\Security\Core\Authentication\Token\SwitchUserToken',
+                    'getProviderKey',
+                    'getFirewallName'
+                ),
+                new MethodCallRename(
+                    'Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken',
+                    'setProviderKey',
+                    'setFirewallName'
+                ),
+                new MethodCallRename(
+                    'Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken',
+                    'getProviderKey',
+                    'getFirewallName'
+                ),
+                new MethodCallRename(
+                    'Symfony\Component\Security\Http\Authentication\DefaultAuthenticationSuccessHandler',
+                    'setProviderKey',
+                    'setFirewallName'
+                ),
+                new MethodCallRename(
+                    'Symfony\Component\Security\Http\Authentication\DefaultAuthenticationSuccessHandler',
+                    'getProviderKey',
+                    'getFirewallName'
+                ),
            ]),
        ]]);
 };
--- a/packages/phpstan-static-type-mapper/src/TypeMapper/UnionTypeMapper.php
+++ b/packages/phpstan-static-type-mapper/src/TypeMapper/UnionTypeMapper.php
@ -97,7 +97,6 @@ final class UnionTypeMapper implements TypeMapperInterface
     */
    public function mapToPhpParserNode(Type $type, ?string $kind = null): ?Node
    {
-        // match array types
        $arrayNode = $this->matchArrayTypes($type);
        if ($arrayNode !== null) {
            return $arrayNode;
--- a/packages/vendor-locker/src/NodeVendorLocker/ClassMethodParamVendorLockResolver.php
+++ b/packages/vendor-locker/src/NodeVendorLocker/ClassMethodParamVendorLockResolver.php
@ -57,8 +57,6 @@ final class ClassMethodParamVendorLockResolver extends AbstractNodeVendorLockRes
                return $parentClassMethod->params[$paramPosition]->type === null;
            }
        }
-
-        // if not, look for it's parent parent
        if (method_exists($parentClassName, $methodName)) {
            // parent class method in external scope → it's not ok
            // if not, look for it's parent parent
--- a/rector-ci.php
+++ b/rector-ci.php
@ -85,7 +85,6 @@ return static function (ContainerConfigurator $containerConfigurator): void {
        __DIR__ . '/packages/doctrine-annotation-generated/src',
        // template files
        __DIR__ . '/packages/rector-generator/templates',
-        // public api
        __DIR__ . '/packages/rector-generator/src/ValueObject/RectorRecipe.php',
    ]);

--- a/rules/coding-style/src/Rector/Assign/ManualJsonStringToJsonEncodeArrayRector.php
+++ b/rules/coding-style/src/Rector/Assign/ManualJsonStringToJsonEncodeArrayRector.php
@ -280,8 +280,6 @@ CODE_SAMPLE
        }

        $nextExpressionNode = $nextExpression->expr;
-
-        // $value .= '...';
        if ($nextExpressionNode instanceof ConcatAssign) {
            // is assign to same variable?
            if (! $this->areNodesEqual($expr, $nextExpressionNode->var)) {
--- a/rules/coding-style/src/Rector/Class_/AddArrayDefaultToArrayPropertyRector.php
+++ b/rules/coding-style/src/Rector/Class_/AddArrayDefaultToArrayPropertyRector.php
@ -176,8 +176,6 @@ CODE_SAMPLE
            if (! $node instanceof BooleanAnd) {
                return null;
            }
-
-            // $this->value !== null
            if (! $this->isLocalPropertyOfNamesNotIdenticalToNull($node->left, $propertyNames)) {
                return null;
            }
--- a/rules/downgrade-php73/src/Rector/List_/DowngradeListReferenceAssignmentRector.php
+++ b/rules/downgrade-php73/src/Rector/List_/DowngradeListReferenceAssignmentRector.php
@ -199,8 +199,6 @@ CODE_SAMPLE
            if ($listItem === null) {
                continue;
            }
-
-            // If it's a variable by value, not by reference, then skip
            if ($listItem->value instanceof Variable && ! $listItem->byRef) {
                continue;
            }
--- a/rules/generic/src/Rector/Property/InjectAnnotationClassRector.php
+++ b/rules/generic/src/Rector/Property/InjectAnnotationClassRector.php
@ -241,7 +241,6 @@ CODE_SAMPLE
        $serviceName = $jmsInjectTagValueNode->getServiceName();

        if ($serviceName) {
-            // 1. service class
            if (class_exists($serviceName)) {
                return new ObjectType($serviceName);
            }
--- a/rules/magic-disclosure/src/Rector/Assign/GetAndSetToMethodCallRector.php
+++ b/rules/magic-disclosure/src/Rector/Assign/GetAndSetToMethodCallRector.php
@ -167,8 +167,6 @@ CODE_SAMPLE
        if (! $this->propertyFetchManipulator->isMagicOnType($propertyFetch, $objectType)) {
            return true;
        }
-
-        // $this->value = $value
        return $this->propertyFetchManipulator->isPropertyToSelf($propertyFetch);
    }

--- a/rules/php-spec-to-phpunit/src/Rector/MethodCall/PhpSpecPromisesToPHPUnitAssertRector.php
+++ b/rules/php-spec-to-phpunit/src/Rector/MethodCall/PhpSpecPromisesToPHPUnitAssertRector.php
@ -174,8 +174,6 @@ final class PhpSpecPromisesToPHPUnitAssertRector extends AbstractPhpSpecToPHPUni
        if ($this->shouldSkip($node)) {
            return null;
        }
-
-        // $this->clone() → clone $this->testedObject
        if ($this->isName($node->name, 'clone')) {
            return new Clone_($this->testedObjectPropertyFetch);
        }
@ -260,7 +258,6 @@ final class PhpSpecPromisesToPHPUnitAssertRector extends AbstractPhpSpecToPHPUni
        }

        if ($this->isName($methodCall->name, 'beConstructedThrough')) {
-            // static method
            $methodName = $this->getValue($methodCall->args[0]->value);
            $staticCall = $this->createStaticCall($this->testedClass, $methodName);

--- a/rules/symfony3/src/Rector/ClassMethod/GetRequestRector.php
+++ b/rules/symfony3/src/Rector/ClassMethod/GetRequestRector.php
@ -164,8 +164,6 @@ CODE_SAMPLE
        if ($containsGetRequestMethod) {
            return true;
        }
-
-        // "$this->get('request')"
        /** @var MethodCall[] $getMethodCalls */
        $getMethodCalls = $this->betterNodeFinder->find($node, function (Node $node): bool {
            return $this->isLocalMethodCallNamed($node, 'get');
@ -202,7 +200,6 @@ CODE_SAMPLE

    private function containsGetRequestMethod(Node $node): bool
    {
-        // "$this->getRequest()"
        return (bool) $this->betterNodeFinder->find($node, function (Node $node): bool {
            return $this->isLocalMethodCallNamed($node, 'getRequest');
        });
--- a/rules/symfony4/src/Rector/MethodCall/SimplifyWebTestCaseAssertionsRector.php
+++ b/rules/symfony4/src/Rector/MethodCall/SimplifyWebTestCaseAssertionsRector.php
@ -125,8 +125,6 @@ CODE_SAMPLE
        if ($args !== null) {
            return $this->createLocalMethodCall('assertSelectorTextContains', $args);
        }
-
-        // 3. assertResponseRedirects
        return $this->processAssertResponseRedirects($node);
    }

--- a/rules/symfony4/src/Rector/New_/RootNodeTreeBuilderRector.php
+++ b/rules/symfony4/src/Rector/New_/RootNodeTreeBuilderRector.php
@ -77,8 +77,6 @@ CODE_SAMPLE
        if (! $rootNameNode instanceof String_) {
            return null;
        }
-
-        // switch arguments
        [$node->args, $rootMethodCallNode->args] = [$rootMethodCallNode->args, $node->args];

        $rootMethodCallNode->name = new Identifier('getRootNode');
--- a/rules/symfony5/src/Rector/New_/PropertyPathMapperToDataMapperRector.php
+++ b/rules/symfony5/src/Rector/New_/PropertyPathMapperToDataMapperRector.php
@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace Rector\Symfony5\Rector\New_;

 use PhpParser\Node;
-use PhpParser\Node\Arg;
 use PhpParser\Node\Expr\New_;
 use PhpParser\Node\Name;
 use PhpParser\Node\Name\FullyQualified;
--- a/rules/type-declaration/src/TypeInferer/ReturnTypeInferer/ReturnedNodesReturnTypeInferer.php
+++ b/rules/type-declaration/src/TypeInferer/ReturnTypeInferer/ReturnedNodesReturnTypeInferer.php
@ -141,7 +141,6 @@ final class ReturnedNodesReturnTypeInferer extends AbstractTypeInferer implement

    private function isAbstractMethod(ClassLike $classLike, FunctionLike $functionLike): bool
    {
-        // abstract class method
        if ($functionLike instanceof ClassMethod && $functionLike->isAbstract()) {
            return true;
        }
@ -149,8 +148,6 @@ final class ReturnedNodesReturnTypeInferer extends AbstractTypeInferer implement
        if (! $classLike instanceof Class_) {
            return false;
        }
-
-        // abstract class
        return $classLike->isAbstract();
    }
 }
--- a/src/Bootstrap/RectorConfigsResolver.php
+++ b/src/Bootstrap/RectorConfigsResolver.php
@ -57,8 +57,6 @@ final class RectorConfigsResolver

        $argvInput = new ArgvInput();
        $this->guardDeprecatedSetOption($argvInput);
-
-        // And from --config or default one
        $inputOrFallbackConfigFileInfo = $this->configResolver->resolveFromInputWithFallback(
            $argvInput,
            ['rector.php']