Add Rector-CI and handy "sets" parameter

.travis.yml

@@ -24,7 +24,6 @@ matrix:
           env: STANDALONE=true
         - php: '7.3'
           env: DOG_FOOD=true
-        - php: '7.4snapshot'
 
 install:
     - composer update $COMPOSER_FLAGS
@@ -47,14 +46,14 @@ script:
     - |
       if [[ $STATIC_ANALYSIS == true ]]; then
           composer docs
-          php bin/check_services_in_yaml_configs.php
-          php bin/run_all_sets.php
+          php ci/check_services_in_yaml_configs.php
+          php ci/run_all_sets.php
       fi
 
     # Eat your own dog food
     - |
       if [[ $DOG_FOOD == true ]]; then
-          bin/rector process src --set dead-code --dry-run
+          composer rector
       fi
 
     # Run standalone install in non-root package, ref https://github.com/rectorphp/rector/issues/732

bin/container.php

@@ -2,7 +2,8 @@
 
 declare(strict_types=1);
 
-use Rector\Console\Option\SetOptionResolver;
+use Rector\Bootstrap\ConfigResolver;
+use Rector\Bootstrap\SetOptionResolver;
 use Rector\DependencyInjection\RectorContainerFactory;
 use Rector\Exception\Configuration\SetNotFoundException;
 use Rector\Set\Set;
@@ -31,6 +32,11 @@
 // remove empty values
 $configs = array_filter($configs);
 
+// resolve: parameters > sets
+$configResolver = new ConfigResolver();
+$parameterSetsConfigs = $configResolver->resolveFromParameterSetsFromConfigFiles($configs);
+$configs = array_merge($configs, $parameterSetsConfigs);
+
 // Build DI container
 $rectorContainerFactory = new RectorContainerFactory();
 return $rectorContainerFactory->createFromConfigs($configs);

bin/run_all_sets.php → ci/run_all_sets.php

@@ -47,8 +47,7 @@
 }
 
 foreach ($errors as $error) {
-    echo $error;
-    echo PHP_EOL;
+    echo $error . PHP_EOL;
 }
 
 exit(ShellCode::ERROR);

composer.json

@@ -188,7 +188,7 @@
         "check-cs": "vendor/bin/ecs check bin packages src tests utils --ansi",
         "fix-cs": [
             "vendor/bin/ecs check bin packages src tests utils --fix --ansi",
-            "bin/clean_trailing_spaces.sh"
+            "ci/clean_trailing_spaces.sh"
         ],
         "phpstan": "vendor/bin/phpstan analyse packages src tests --error-format symplify --ansi",
         "changelog": [
@@ -199,7 +199,8 @@
         "docs": [
             "bin/rector dump-rectors -o markdown > docs/AllRectorsOverview.md",
             "bin/rector dump-nodes -o markdown > docs/NodesOverview.md"
-        ]
+        ],
+        "rector": "bin/rector process packages src --config rector-ci.yaml --dry-run"
     },
     "scripts-descriptions": {
         "docs": "Regenerate descriptions of all Rectors to docs/AllRectorsOverview.md file"

packages/CodeQuality/src/Rector/Class_/CompleteDynamicPropertiesRector.php

@@ -139,6 +139,10 @@ private function resolveFetchedLocalPropertyNameToType(Class_ $class): array
                 return null;
             }
 
+            if (! $node->var instanceof Variable) {
+                return null;
+            }
+
             if (! $this->isName($node->var, 'this')) {
                 return null;
             }

packages/NodeTypeResolver/src/Type/TypeExtension/StaticContainerGetDynamicMethodReturnTypeExtension.php

@@ -13,7 +13,6 @@
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use Psr\Container\ContainerInterface;
-use Rector\Exception\ShouldNotHappenException;
 
 final class StaticContainerGetDynamicMethodReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
@@ -32,7 +31,8 @@ public function getTypeFromMethodCall(
         MethodCall $methodCall,
         Scope $scope
     ): Type {
-        $valueType = $scope->getType($methodCall->args[0]->value);
+        $value = $methodCall->args[0]->value;
+        $valueType = $scope->getType($value);
 
         // we don't know what it is
         if ($valueType instanceof MixedType) {
@@ -43,10 +43,7 @@ public function getTypeFromMethodCall(
             return new ObjectType($valueType->getValue());
         }
 
-        throw new ShouldNotHappenException(sprintf(
-            '%s type given, only "%s" is supported',
-            get_class($valueType),
-            ConstantStringType::class
-        ));
+        // unknown, probably variable
+        return new MixedType();
     }
 }

phpstan.neon

@@ -169,7 +169,7 @@ parameters:
 
         - '#Method Rector\\Symfony\\Bridge\\DefaultAnalyzedSymfonyApplicationContainer\:\:getService\(\) should return object but returns object\|null#'
         - '#Call to function property_exists\(\) with string and (.*?) will always evaluate to false#'
-        - '#Method Rector\\Console\\Option\\SetOptionResolver\:\:separateVersionedAndUnversionedSets\(\) should return array<array<string\>\> but returns array<int, array<int\|string, array<int, string\>\|string\>\>#'
+        - '#Method Rector\\Bootstrap\\SetOptionResolver\:\:separateVersionedAndUnversionedSets\(\) should return array<array<string\>\> but returns array<int, array<int\|string, array<int, string\>\|string\>\>#'
         - '#Access to an undefined property PhpParser\\Node\\FunctionLike\|PhpParser\\Node\\Stmt\\ClassLike\:\:\$stmts#'
 
         - '#Property Rector\\TypeDeclaration\\TypeInferer\\(.*?)\:\:\$(.*?)TypeInferers \(array<Rector\\TypeDeclaration\\Contract\\TypeInferer\\(.*?)TypeInfererInterface\>\) does not accept array<Rector\\TypeDeclaration\\Contract\\TypeInferer\\PriorityAwareTypeInfererInterface\>#'

rector-ci.yaml

@@ -0,0 +1,9 @@
+parameters:
+    exclude_paths:
+        - "/Fixture/"
+        - "/Fixtures/"
+        - "/Source/"
+        - "/Expected/"
+
+    sets:
+        - "code-quality"

src/Bootstrap/ConfigResolver.php

@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Bootstrap;
+
+use Rector\Set\Set;
+
+final class ConfigResolver
+{
+    /**
+     * @var SetOptionResolver
+     */
+    private $setOptionResolver;
+
+    /**
+     * @var SetsResolver
+     */
+    private $setsResolver;
+
+    public function __construct()
+    {
+        $this->setOptionResolver = new SetOptionResolver();
+        $this->setsResolver = new SetsResolver();
+    }
+
+    /**
+     * @param string[] $configFiles
+     * @return string[]
+     */
+    public function resolveFromParameterSetsFromConfigFiles(array $configFiles): array
+    {
+        $configs = [];
+
+        $sets = $this->setsResolver->resolveFromConfigFiles($configFiles);
+        return array_merge($configs, $this->resolveFromSets($sets));
+    }
+
+    /**
+     * @param string[] $sets
+     * @return string[]
+     */
+    private function resolveFromSets(array $sets): array
+    {
+        $configs = [];
+        foreach ($sets as $set) {
+            $configs[] = $this->setOptionResolver->detectFromNameAndDirectory($set, Set::SET_DIRECTORY);
+        }
+
+        return $configs;
+    }
+}

src/Console/Option/SetOptionResolver.php → src/Bootstrap/SetOptionResolver.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Console\Option;
+namespace Rector\Bootstrap;
 
 use Nette\Utils\ObjectHelpers;
 use Nette\Utils\Strings;
@@ -43,7 +43,7 @@ public function detectFromInputAndDirectory(InputInterface $input, string $confi
         return $this->detectFromNameAndDirectory($setName, $configDirectory);
     }
 
-    public function detectFromNameAndDirectory(string $setName, string $configDirectory): ?string
+    public function detectFromNameAndDirectory(string $setName, string $configDirectory): string
     {
         $nearestMatches = $this->findNearestMatchingFiles($configDirectory, $setName);
         if (count($nearestMatches) === 0) {

src/Bootstrap/SetsResolver.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Bootstrap;
+
+use Symfony\Component\Yaml\Yaml;
+
+final class SetsResolver
+{
+    /**
+     * @param string[] $configFiles
+     * @return string[]
+     */
+    public function resolveFromConfigFiles(array $configFiles): array
+    {
+        $sets = [];
+
+        foreach ($configFiles as $configFile) {
+            $configContent = Yaml::parseFile($configFile);
+            $sets += $configContent['parameters']['sets'] ?? [];
+        }
+
+        return $sets;
+    }
+}

src/DependencyInjection/RectorContainerFactory.php

@@ -5,7 +5,7 @@
 namespace Rector\DependencyInjection;
 
 use Psr\Container\ContainerInterface;
-use Rector\Console\Option\SetOptionResolver;
+use Rector\Bootstrap\SetOptionResolver;
 use Rector\Exception\ShouldNotHappenException;
 use Rector\HttpKernel\RectorKernel;
 use Rector\Set\Set;