[ci-review] Rector Rectify

Author: kaizen-ci

composer.json

@@ -109,16 +109,9 @@
             "rules-tests/Symfony4/Rector/MethodCall/ContainerGetToConstructorInjectionRector/Source"
         ],
         "files": [
-<<<<<<< HEAD
-<<<<<<< HEAD
             "stubs/Symfony/Component/Form/FormTypeInterface.php",
             "stubs/Doctrine/Persistence/ObjectManager.php",
             "stubs/Doctrine/Common/Persistence/ObjectManager.php",
-=======
-            "ci/downgrade/config/configuration.php",
->>>>>>> d4f0e90b5c... [downgrade] simplify to 2 configs
-=======
->>>>>>> f8a7c10791... rename downgrade_packages.sh to downgrade_rector_to_php71.sh
             "vendor/nette/forms/src/Forms/Controls/SubmitButton.php",
             "rules-tests/Restoration/Rector/Use_/RestoreFullyQualifiedNameRector/Source/ShortClassOnly.php",
             "rules-tests/DeadCode/Rector/MethodCall/RemoveDefaultArgumentValueRector/Source/UserDefined.php",

phpstan.neon

@@ -576,46 +576,11 @@ parameters:
                 - rules/Symfony/ConstantNameAndValueMatcher.php
                 - rules/Privatization/Rector/Class_/ChangeReadOnlyVariableWithDefaultValueToConstantRector.php
                 - rules/Privatization/Naming/ConstantNaming.php
-<<<<<<< HEAD
-<<<<<<< HEAD
-
 
         -
             message: '#Cannot cast array<string\>\|string\|null to string#'
             paths:
                 - utils/compiler/src/Command/DowngradePathsCommand.php
-<<<<<<< HEAD
 
         - '#Method Rector\\Testing\\Finder\\RectorsFinder\:\:findClassesInDirectoriesByName\(\) should return array<class\-string\> but returns array<int, string\>#'
-=======
-=======
-=======
-=======
-=======
-=======
->>>>>>> 3086e35f6a... update for covariance
-
         - '#Cannot cast array<string\>\|string\|null to string#'
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> ecbb522391... add test case stub
->>>>>>> 26af319bc5... add test case stub
-<<<<<<< HEAD
->>>>>>> 5e8e267c44... add test case stub
-<<<<<<< HEAD
->>>>>>> cbf451db2b... add test case stub
-<<<<<<< HEAD
->>>>>>> b8d9d6b850... add test case stub
-=======
-=======
-=======
-=======
->>>>>>> ad3cb2c224... [CI] add PHP 7.1 versions too
->>>>>>> 2572699c7c... [CI] add PHP 7.1 versions too
->>>>>>> 16c4aab3cf... [CI] add PHP 7.1 versions too
-<<<<<<< HEAD
->>>>>>> c49c7b31e9... [CI] add linter for php code
-=======
-=======
->>>>>>> 3086e35f6a... update for covariance
->>>>>>> 0aa962a0f2... update for covariance

rules/TypeDeclaration/AlreadyAssignDetector/ConstructorAssignDetector.php

@@ -12,7 +12,6 @@
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\NodeTraverser;
 use Rector\Core\ValueObject\MethodName;
-use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\TypeDeclaration\Matcher\PropertyAssignMatcher;
 use Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
 
@@ -57,8 +56,11 @@ public function isPropertyAssigned(ClassLike $classLike, string $propertyName):
             }
         }
 
-        $this->simpleCallableNodeTraverser->traverseNodesWithCallable($constructClassMethod->stmts, function (Node $node) use (
-            $propertyName, &$isAssignedInConstructor
+        $this->simpleCallableNodeTraverser->traverseNodesWithCallable($constructClassMethod->stmts, function (
+            Node $node
+        ) use (
+            $propertyName,
+            &$isAssignedInConstructor
         ): ?int {
             $expr = $this->matchAssignExprToPropertyName($node, $propertyName);
             if (! $expr instanceof Expr) {

utils/compiler/src/Command/DowngradePathsCommand.php

@@ -45,35 +45,18 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $downgradePaths = array_values($downgradePaths);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
         $rulesPaths = $this->resolveRulesPaths();
         $downgradePaths = array_merge($downgradePaths, $rulesPaths);
 
         // make symplify grouped into 1 directory, to make covariance downgrade work with all dependent classes
-=======
-        $downgradePaths[] = 'src';
-=======
->>>>>>> 3086e35f6a... update for covariance
-        $downgradePaths[] = 'packages';
-
         $rulesPaths = $this->resolveRulesPaths();
         $downgradePaths = array_merge($downgradePaths, $rulesPaths);
 
-<<<<<<< HEAD
-        // make symplify grouped into 1 directory, small enough
->>>>>>> cbf451db2b... add test case stub
-=======
         // make symplify grouped into 1 directory, to make covariance downgrade work with all dependent classes
->>>>>>> 3086e35f6a... update for covariance
         foreach ($downgradePaths as $key => $downgradePath) {
             if (Strings::startsWith($downgradePath, 'vendor/symplify')) {
                 unset($downgradePaths[$key]);
             }
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 3086e35f6a... update for covariance
 
             if (Strings::startsWith($downgradePath, 'vendor/symfony')) {
                 unset($downgradePaths[$key]);
@@ -86,7 +69,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             if (Strings::startsWith($downgradePath, 'vendor/psr')) {
                 unset($downgradePaths[$key]);
             }
-<<<<<<< HEAD
         }
 
         $downgradePaths = array_merge(['vendor/symplify vendor/symfony vendor/psr vendor/nikic src packages'],
@@ -96,21 +78,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         // bash format
         $downgradePathsLine = implode(';', $downgradePaths);
-=======
-=======
->>>>>>> 3086e35f6a... update for covariance
-        }
-
-        $downgradePaths = array_merge(['vendor/symplify vendor/symfony vendor/psr vendor/nikic src'], $downgradePaths);
-        $downgradePaths = array_values($downgradePaths);
 
-        // bash format
-<<<<<<< HEAD
-        $downgradePathsLine = implode(' ', $downgradePaths);
->>>>>>> cbf451db2b... add test case stub
-=======
-        $downgradePathsLine = implode(';', $downgradePaths);
->>>>>>> 3086e35f6a... update for covariance
         echo $downgradePathsLine . PHP_EOL;
 
         return ShellCode::SUCCESS;