Merge pull request #2736 from rectorphp/generator-core

.gitignore

@@ -10,18 +10,15 @@ composer.lock
 
 # often customized locally - example on Github is just fine
 create-rector.yaml
-phpstan-dependencies.json
-phpstan-paths.txt
 
 # tests - travis
 /laravel-dir
-
-uuid-migration.json
+/utils
 
 # compiler
 /compiler/composer.lock
 /compiler/vendor
 /tmp
 
 # from "scan-fatal-errors" command
-rector-types.yaml
+rector-types.yaml

compiler/build/box.json

@@ -9,7 +9,6 @@
     "directories": [
         "config",
         "src",
-        "helpers",
         "packages",
         "vendor"
     ],

composer.json

@@ -102,10 +102,7 @@
             "Rector\\Twig\\": "packages/Twig/src",
             "Rector\\TypeDeclaration\\": "packages/TypeDeclaration/src",
             "Rector\\ZendToSymfony\\": "packages/ZendToSymfony/src",
-            "Rector\\Utils\\DocumentationGenerator\\": "utils/DocumentationGenerator/src",
-            "Rector\\Utils\\RectorGenerator\\": "utils/RectorGenerator/src",
-            "Rector\\Utils\\PHPStanAttributeTypeSyncer\\": "utils/PHPStanAttributeTypeSyncer/src",
-            "Rector\\Utils\\PHPStanStaticTypeMapperChecker\\": "utils/PHPStanStaticTypeMapperChecker/src",
+            "Rector\\RectorGenerator\\": "packages/RectorGenerator/src",
             "Rector\\StrictCodeQuality\\": "packages/StrictCodeQuality/src",
             "Rector\\DynamicTypeAnalysis\\": "packages/DynamicTypeAnalysis/src",
             "Rector\\PhpDeglobalize\\": "packages/PhpDeglobalize/src",
@@ -116,7 +113,7 @@
             "Rector\\CakePHPToSymfony\\": "packages/CakePHPToSymfony/src"
         },
         "files": [
-            "helpers/rector_dump_function.php"
+            "src/functions/rector_dump_function.php"
         ]
     },
     "autoload-dev": {
@@ -176,6 +173,9 @@
             "Rector\\DynamicTypeAnalysis\\Tests\\": "packages/DynamicTypeAnalysis/tests",
             "Rector\\PhpDeglobalize\\Tests\\": "packages/PhpDeglobalize/tests",
             "Rector\\Phalcon\\Tests\\": "packages/Phalcon/tests",
+            "Rector\\Utils\\DocumentationGenerator\\": "utils/DocumentationGenerator/src",
+            "Rector\\Utils\\PHPStanAttributeTypeSyncer\\": "utils/PHPStanAttributeTypeSyncer/src",
+            "Rector\\Utils\\PHPStanStaticTypeMapperChecker\\": "utils/PHPStanStaticTypeMapperChecker/src",
             "Rector\\DoctrineGedmoToKnplabs\\Tests\\": "packages/DoctrineGedmoToKnplabs/tests",
             "Rector\\MinimalScope\\Tests\\": "packages/MinimalScope/tests",
             "Rector\\Polyfill\\Tests\\": "packages/Polyfill/tests",

config/config.yaml

@@ -2,7 +2,8 @@ imports:
     - { resource: '../packages/**/config/config.yaml' }
     - { resource: 'services.yaml' }
     # only in local repository
-    - { resource: '../utils/**/config/config.yaml' }
+    # ignore errors, because utils are not part of composer package nor rector.phar
+    - { resource: '../utils/**/config/config.yaml', ignore_errors: true }
 
 parameters:
     # processed paths

config/services.yaml

@@ -15,6 +15,7 @@ services:
             - '../src/DependencyInjection/Loader/*'
             - '../src/HttpKernel/*'
             - '../src/ValueObject/*'
+            - '../src/functions/*'
 
     # extra services
     Rector\Symfony\Rector\Form\Helper\FormTypeStringToTypeProvider: null

utils/RectorGenerator/config/config.yaml → packages/RectorGenerator/config/config.yaml

@@ -4,7 +4,7 @@ services:
         autowire: true
         autoconfigure: true
 
-    Rector\Utils\RectorGenerator\:
+    Rector\RectorGenerator\:
         resource: '../src'
         exclude:
             - '../src/Exception/*'

utils/RectorGenerator/src/Command/CreateRectorCommand.php → packages/RectorGenerator/src/Command/CreateRectorCommand.php

@@ -2,16 +2,16 @@
 
 declare(strict_types=1);
 
-namespace Rector\Utils\RectorGenerator\Command;
+namespace Rector\RectorGenerator\Command;
 
 use Nette\Utils\FileSystem;
 use Nette\Utils\Strings;
-use Rector\Utils\RectorGenerator\Composer\ComposerPackageAutoloadUpdater;
-use Rector\Utils\RectorGenerator\Configuration\ConfigurationFactory;
-use Rector\Utils\RectorGenerator\FileSystem\TemplateFileSystem;
-use Rector\Utils\RectorGenerator\Finder\TemplateFinder;
-use Rector\Utils\RectorGenerator\TemplateVariablesFactory;
-use Rector\Utils\RectorGenerator\ValueObject\Configuration;
+use Rector\RectorGenerator\Composer\ComposerPackageAutoloadUpdater;
+use Rector\RectorGenerator\Configuration\ConfigurationFactory;
+use Rector\RectorGenerator\FileSystem\TemplateFileSystem;
+use Rector\RectorGenerator\Finder\TemplateFinder;
+use Rector\RectorGenerator\TemplateVariablesFactory;
+use Rector\RectorGenerator\ValueObject\Configuration;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;

utils/RectorGenerator/src/Composer/ComposerPackageAutoloadUpdater.php → packages/RectorGenerator/src/Composer/ComposerPackageAutoloadUpdater.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Rector\Utils\RectorGenerator\Composer;
+namespace Rector\RectorGenerator\Composer;
 
-use Rector\Utils\RectorGenerator\FileSystem\JsonFileSystem;
-use Rector\Utils\RectorGenerator\ValueObject\Configuration;
-use Rector\Utils\RectorGenerator\ValueObject\Package;
+use Rector\RectorGenerator\FileSystem\JsonFileSystem;
+use Rector\RectorGenerator\ValueObject\Configuration;
+use Rector\RectorGenerator\ValueObject\Package;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Process\Process;
 
@@ -50,7 +50,7 @@ public function processComposerAutoload(Configuration $configuration): void
             $package->getSrcNamespace(),
             PHP_EOL
         ));
-        if ($isConfirmed === false) {
+        if (! $isConfirmed) {
             return;
         }
 

utils/RectorGenerator/src/Configuration/ConfigurationFactory.php → packages/RectorGenerator/src/Configuration/ConfigurationFactory.php

@@ -2,15 +2,15 @@
 
 declare(strict_types=1);
 
-namespace Rector\Utils\RectorGenerator\Configuration;
+namespace Rector\RectorGenerator\Configuration;
 
 use Nette\Utils\Strings;
 use PhpParser\Node;
 use Rector\Exception\ShouldNotHappenException;
+use Rector\RectorGenerator\Guard\RecipeGuard;
+use Rector\RectorGenerator\Node\NodeClassProvider;
+use Rector\RectorGenerator\ValueObject\Configuration;
 use Rector\Set\Set;
-use Rector\Utils\RectorGenerator\Guard\RecipeGuard;
-use Rector\Utils\RectorGenerator\Node\NodeClassProvider;
-use Rector\Utils\RectorGenerator\ValueObject\Configuration;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Finder\SplFileInfo;
 

utils/RectorGenerator/src/Exception/ConfigurationException.php → packages/RectorGenerator/src/Exception/ConfigurationException.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Utils\RectorGenerator\Exception;
+namespace Rector\RectorGenerator\Exception;
 
 use Exception;
 

utils/RectorGenerator/src/FileSystem/JsonFileSystem.php → packages/RectorGenerator/src/FileSystem/JsonFileSystem.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Utils\RectorGenerator\FileSystem;
+namespace Rector\RectorGenerator\FileSystem;
 
 use Nette\Utils\FileSystem;
 use Nette\Utils\Json;

utils/RectorGenerator/src/FileSystem/JsonStringFormatter.php → packages/RectorGenerator/src/FileSystem/JsonStringFormatter.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Utils\RectorGenerator\FileSystem;
+namespace Rector\RectorGenerator\FileSystem;
 
 use Nette\Utils\Strings;
 
@@ -29,14 +29,13 @@ public function inlineSections(string $jsonContent, array $sections): string
     public function inlineAuthors(string $jsonContent): string
     {
         $pattern = '#(?<start>"authors": \[\s+)(?<content>.*?)(?<end>\s+\](,))#ms';
-        $jsonContent = Strings::replace($jsonContent, $pattern, function (array $match): string {
+
+        return Strings::replace($jsonContent, $pattern, function (array $match): string {
             $inlined = Strings::replace($match['content'], '#\s+#', ' ');
             $inlined = trim($inlined);
             $inlined = Strings::replace($inlined, '#},#', "},\n       ");
 
             return $match['start'] . $inlined . $match['end'];
         });
-
-        return $jsonContent;
     }
 }

utils/RectorGenerator/src/FileSystem/TemplateFileSystem.php → packages/RectorGenerator/src/FileSystem/TemplateFileSystem.php

@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Rector\Utils\RectorGenerator\FileSystem;
+namespace Rector\RectorGenerator\FileSystem;
 
 use Nette\Utils\Strings;
-use Rector\Utils\RectorGenerator\Finder\TemplateFinder;
-use Rector\Utils\RectorGenerator\ValueObject\Configuration;
-use Rector\Utils\RectorGenerator\ValueObject\Package;
+use Rector\RectorGenerator\Finder\TemplateFinder;
+use Rector\RectorGenerator\ValueObject\Configuration;
+use Rector\RectorGenerator\ValueObject\Package;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
 final class TemplateFileSystem

utils/RectorGenerator/src/Finder/TemplateFinder.php → packages/RectorGenerator/src/Finder/TemplateFinder.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Utils\RectorGenerator\Finder;
+namespace Rector\RectorGenerator\Finder;
 
 use Symfony\Component\Finder\Finder;
 use Symplify\SmartFileSystem\Finder\FinderSanitizer;
@@ -35,9 +35,10 @@ public function __construct(FinderSanitizer $finderSanitizer)
      */
     public function find(bool $isPhpSnippet): array
     {
-        $finder = Finder::create()->files()
-            ->in(self::TEMPLATES_DIRECTORY)
-            ->exclude(self::TEMPLATES_FIXTURE_DIRECTORY);
+        $finder = Finder::create()
+            ->files()
+            ->exclude('Fixture/')
+            ->in(self::TEMPLATES_DIRECTORY);
 
         $smartFileInfos = $this->finderSanitizer->sanitize($finder);
         $smartFileInfos[] = $this->createFixtureSmartFileInfo($isPhpSnippet);

utils/RectorGenerator/src/Guard/RecipeGuard.php → packages/RectorGenerator/src/Guard/RecipeGuard.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Rector\Utils\RectorGenerator\Guard;
+namespace Rector\RectorGenerator\Guard;
 
-use Rector\Utils\RectorGenerator\Exception\ConfigurationException;
+use Rector\RectorGenerator\Exception\ConfigurationException;
 
 final class RecipeGuard
 {

utils/RectorGenerator/src/Node/NodeClassProvider.php → packages/RectorGenerator/src/Node/NodeClassProvider.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Utils\RectorGenerator\Node;
+namespace Rector\RectorGenerator\Node;
 
 use Nette\Loaders\RobotLoader;
 

utils/RectorGenerator/src/TemplateVariablesFactory.php → packages/RectorGenerator/src/TemplateVariablesFactory.php

@@ -2,15 +2,15 @@
 
 declare(strict_types=1);
 
-namespace Rector\Utils\RectorGenerator;
+namespace Rector\RectorGenerator;
 
 use Nette\Utils\Strings;
 use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Expr\ArrayItem;
 use PhpParser\Node\Expr\ClassConstFetch;
 use PhpParser\Node\Name\FullyQualified;
 use Rector\PhpParser\Printer\BetterStandardPrinter;
-use Rector\Utils\RectorGenerator\ValueObject\Configuration;
+use Rector\RectorGenerator\ValueObject\Configuration;
 
 final class TemplateVariablesFactory
 {

utils/RectorGenerator/src/ValueObject/Configuration.php → packages/RectorGenerator/src/ValueObject/Configuration.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Utils\RectorGenerator\ValueObject;
+namespace Rector\RectorGenerator\ValueObject;
 
 use Nette\Utils\Strings;
 

utils/RectorGenerator/src/ValueObject/Package.php → packages/RectorGenerator/src/ValueObject/Package.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Utils\RectorGenerator\ValueObject;
+namespace Rector\RectorGenerator\ValueObject;
 
 final class Package
 {

src/functions/rector_dump_function.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+use Tracy\Debugger;
+
+if (! function_exists('rd')) {
+    function rd($var)
+    {
+        array_map([Debugger::class, 'dump'], func_get_args());
+        return $var;
+    }
+}
+
+if (! function_exists('rdd')) {
+    function rdd($var): void
+    {
+        rd($var);
+        die;
+    }
+}