use exclude as list

rectorphp · Nov 22, 2019 · a3693df · a3693df
1 parent cea8403
commit a3693df
Show file tree

Hide file tree

Showing 30 changed files with 86 additions and 31 deletions.
diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.16",
         "jetbrains/phpstorm-stubs": "^2019.2",
-        "ocramius/package-versions": "^1.5",
+        "ocramius/package-versions": "^1.4|^1.5",
         "phpunit/phpunit": "^7.5|^8.4",
         "symplify/changelog-linker": "^6.1",
         "symplify/easy-coding-standard": "^6.1",

diff --git a/config/services.yaml b/config/services.yaml
@@ -5,7 +5,18 @@ services:
 
     Rector\:
         resource: '../src'
-        exclude: '../src/{Node/Attribute.php,Rector/**/*Rector.php,Reporting/FileDiff.php,Testing/PHPUnit,RectorDefinition,PhpParser/Node/*Info.php,Exception/*,DependencyInjection/CompilerPass/*,DependencyInjection/Loader/*,Application/Error.php,HttpKernel/RectorKernel.php,ValueObject/*}'
+        exclude:
+            - '../src/Rector/**/*Rector.php'
+            - '../src/Reporting/FileDiff.php'
+            - '../src/Testing/PHPUnit/*'
+            - '../src/RectorDefinition/*'
+            - '../src/PhpParser/Node/*Info.php'
+            - '../src/Exception/*'
+            - '../src/DependencyInjection/CompilerPass/*'
+            - '../src/DependencyInjection/Loader/*'
+            - '../src/Application/Error.php'
+            - '../src/HttpKernel/RectorKernel.php'
+            - '../src/ValueObject/*'
 
     # extra services
     Rector\Symfony\Rector\Form\Helper\FormTypeStringToTypeProvider: ~

diff --git a/packages/Architecture/config/config.yaml b/packages/Architecture/config/config.yaml
@@ -5,4 +5,5 @@ services:
 
     Rector\Architecture\:
         resource: '../src'
-        exclude: '../src/{Rector/**/*Rector.php}'
+        exclude:
+            - '../src/Rector/**/*Rector.php'
diff --git a/packages/Autodiscovery/config/config.yaml b/packages/Autodiscovery/config/config.yaml
@@ -5,4 +5,6 @@ services:
 
     Rector\Autodiscovery\:
         resource: '../src'
-        exclude: '../src/{Rector/**/*Rector.php,ValueObject/*}'
+        exclude:
+            - '../src/Rector/**/*Rector.php'
+            - '../src/ValueObject/*'
diff --git a/packages/BetterPhpDocParser/config/config.yaml b/packages/BetterPhpDocParser/config/config.yaml
@@ -5,7 +5,12 @@ services:
 
     Rector\BetterPhpDocParser\:
         resource: '../src'
-        exclude: '../src/{ValueObject/*,*/*Info.php,*Info.php,Attributes/Ast/PhpDoc/*,PhpDocNode/*}'
+        exclude:
+            - '../src/ValueObject/*'
+            - '../src/*/*Info.php'
+            - '../src/*Info.php'
+            - '../src/Attributes/Ast/PhpDoc/*'
+            - '../src/PhpDocNode/*'
 
     PHPStan\PhpDocParser\Lexer\Lexer: ~
     PHPStan\PhpDocParser\Parser\TypeParser: ~

diff --git a/packages/CodingStyle/config/config.yaml b/packages/CodingStyle/config/config.yaml
@@ -5,4 +5,5 @@ services:
 
     Rector\CodingStyle\:
         resource: '../src'
-        exclude: '../src/{Rector/**/*Rector.php}'
+        exclude:
+            - '../src/Rector/**/*Rector.php'
diff --git a/packages/DeadCode/config/config.yaml b/packages/DeadCode/config/config.yaml
@@ -5,4 +5,6 @@ services:
 
     Rector\DeadCode\:
         resource: '../src'
-        exclude: '../src/{Rector/**/*Rector.php,Data/*}'
+        exclude:
+            - '../src/Rector/**/*Rector.php'
+            - '../src/Data/*'
diff --git a/packages/Doctrine/config/config.yaml b/packages/Doctrine/config/config.yaml
@@ -5,7 +5,8 @@ services:
 
     Rector\Doctrine\:
         resource: '../src'
-        exclude: '../src/{Rector/**/*Rector.php,ValueObject/*}'
+        exclude:
+            - '../src/Rector/**/*Rector.php'
 
     Rector\Doctrine\Contract\Mapper\DoctrineEntityAndRepositoryMapperInterface:
         alias: 'Rector\Doctrine\Mapper\DefaultDoctrineEntityAndRepositoryMapper'
diff --git a/packages/DynamicTypeAnalysis/config/config.yaml b/packages/DynamicTypeAnalysis/config/config.yaml
@@ -5,4 +5,5 @@ services:
 
     Rector\DynamicTypeAnalysis\:
         resource: '../src'
-        exclude: '../src/{Rector/**/*Rector.php}'
+        exclude:
+            - '../src/Rector/**/*Rector.php'
diff --git a/packages/ElasticSearchDSL/config/config.yaml b/packages/ElasticSearchDSL/config/config.yaml
@@ -5,4 +5,5 @@ services:
 
     Rector\ElasticSearchDSL\:
         resource: '../src'
-        exclude: '../src/{Rector/**/*Rector.php}'
+        exclude:
+            - '../src/Rector/**/*Rector.php'
diff --git a/packages/FileSystemRector/config/config.yaml b/packages/FileSystemRector/config/config.yaml
@@ -5,4 +5,5 @@ services:
 
     Rector\FileSystemRector\:
         resource: '../src'
-        exclude: '../src/{Rector/**/*Rector.php}'
+        exclude:
+            - '../src/Rector/**/*Rector.php'
diff --git a/packages/Legacy/config/config.yaml b/packages/Legacy/config/config.yaml
@@ -5,4 +5,5 @@ services:
 
     Rector\Legacy\:
         resource: '../src'
-        exclude: '../src/{Rector/**/*Rector.php}'
+        exclude:
+            - '../src/Rector/**/*Rector.php'
diff --git a/packages/NetteTesterToPHPUnit/config/config.yaml b/packages/NetteTesterToPHPUnit/config/config.yaml
@@ -5,4 +5,5 @@ services:
 
     Rector\NetteTesterToPHPUnit\:
         resource: '../src'
-        exclude: '../src/{Rector/**/*Rector.php}'
+        exclude:
+            - '../src/Rector/**/*Rector.php'
diff --git a/packages/NetteToSymfony/config/config.yaml b/packages/NetteToSymfony/config/config.yaml
@@ -5,4 +5,7 @@ services:
 
     Rector\NetteToSymfony\:
         resource: '../src'
-        exclude: '../src/{Rector/**/*Rector.php,Route/RouteInfo.php,Event/EventInfo.php,Rector/*,PhpDocParser/Ast/PhpDoc/*}'
+        exclude:
+            - '../src/Rector/**/*Rector.php'
+            - '../src/Route/RouteInfo.php'
+            - '../src/Event/EventInfo.php'
diff --git a/packages/NodeTypeResolver/config/config.yaml b/packages/NodeTypeResolver/config/config.yaml
@@ -5,8 +5,10 @@ services:
 
     Rector\NodeTypeResolver\:
         resource: '../src'
-        # "Type" is because the file is needed for PHPStan container only
-        exclude: '../src/{Contract,Php/*Info.php,PHPStanOverride/*,Type}'
+        exclude:
+            - '../src/Contract'
+            # "Type" is because the file is needed for PHPStan container only
+            - '../src/Type'
 
     Rector\Php\TypeAnalyzer: ~
     Rector\FileSystem\FilesFinder: ~

diff --git a/packages/PHPUnit/config/config.yaml b/packages/PHPUnit/config/config.yaml
@@ -5,4 +5,6 @@ services:
 
     Rector\PHPUnit\:
         resource: '../src'
-        exclude: '../src/{Rector/**/*Rector.php,ValueObject/*}'
+        exclude:
+            - '../src/Rector/**/*Rector.php'
+            - '../src/ValueObject/*'
diff --git a/packages/PSR4/config/config.yaml b/packages/PSR4/config/config.yaml
@@ -5,4 +5,6 @@ services:
 
     Rector\PSR4\:
         resource: '../src'
-        exclude: '../src/{Rector/**/*Rector.php,ValueObject/*}'
+        exclude:
+            - '../src/Rector/**/*Rector.php'
+            - '../src/ValueObject/*'
diff --git a/packages/Php70/config/config.yaml b/packages/Php70/config/config.yaml
@@ -5,4 +5,6 @@ services:
 
     Rector\Php70\:
         resource: '../src'
-        exclude: '../src/{Rector/**/*Rector.php,Exception/*}'
+        exclude:
+            - '../src/Rector/**/*Rector.php'
+            - '../src/Exception/*'
diff --git a/packages/Php71/config/config.yaml b/packages/Php71/config/config.yaml
@@ -5,4 +5,5 @@ services:
 
     Rector\Php71\:
         resource: '../src'
-        exclude: '../src/{Rector/**/*Rector.php}'
+        exclude:
+            - '../src/Rector/**/*Rector.php'
diff --git a/packages/PhpSpecToPHPUnit/config/config.yaml b/packages/PhpSpecToPHPUnit/config/config.yaml
@@ -5,4 +5,5 @@ services:
 
     Rector\PhpSpecToPHPUnit\:
         resource: '../src'
-        exclude: '../src/{Rector/**/*Rector.php}'
+        exclude:
+            - '../src/Rector/**/*Rector.php'
diff --git a/packages/RemovingStatic/config/config.yaml b/packages/RemovingStatic/config/config.yaml
@@ -5,4 +5,5 @@ services:
 
     Rector\RemovingStatic\:
         resource: '../src'
-        exclude: '../src/{Rector/**/*Rector.php}'
+        exclude:
+            - '../src/Rector/**/*Rector.php'
diff --git a/packages/SOLID/config/config.yaml b/packages/SOLID/config/config.yaml
@@ -5,4 +5,5 @@ services:
 
     Rector\SOLID\:
         resource: '../src/'
-        exclude: '../src/{Rector/**/*Rector.php}'
+        exclude:
+            - '../src/Rector/**/*Rector.php'
diff --git a/packages/Sensio/config/config.yaml b/packages/Sensio/config/config.yaml
@@ -5,4 +5,5 @@ services:
 
     Rector\Sensio\:
         resource: '../src/'
-        exclude: '../src/{Rector/**/*Rector.php,PhpDocParser/Ast/PhpDoc/*}'
+        exclude:
+            - '../src/Rector/**/*Rector.php'
diff --git a/packages/Symfony/config/config.yaml b/packages/Symfony/config/config.yaml
@@ -11,4 +11,6 @@ services:
 
     Rector\Symfony\:
         resource: '../src/'
-        exclude: '../src/{Rector/**/*Rector.php,PhpDocParser/Ast/PhpDoc/*,ValueObject/*}'
+        exclude:
+            - '../src/Rector/**/*Rector.php'
+            - '../src/PhpDocParser/Ast/PhpDoc/*'
diff --git a/packages/Symfony/src/Bridge/DependencyInjection/SymfonyContainerFactory.php b/packages/Symfony/src/Bridge/DependencyInjection/SymfonyContainerFactory.php
@@ -105,7 +105,7 @@ public function process(ContainerBuilder $containerBuilder): void
             }
         });
 
-        $containerBuilder->compile();
+        $containerBuilder->compile(true);
 
         // solves "You have requested a synthetic service ("kernel"). The DIC does not know how to construct this service"
         $containerBuilder->set('kernel', $kernel);

diff --git a/packages/SymfonyPHPUnit/config/config.yaml b/packages/SymfonyPHPUnit/config/config.yaml
@@ -5,4 +5,5 @@ services:
 
     Rector\SymfonyPHPUnit\:
         resource: '../src/'
-        exclude: '../src/{Rector/**/*Rector.php}'
+        exclude:
+            - '../src/Rector/**/*Rector.php'
diff --git a/packages/TypeDeclaration/config/config.yaml b/packages/TypeDeclaration/config/config.yaml
@@ -5,4 +5,7 @@ services:
 
     Rector\TypeDeclaration\:
         resource: '../src/'
-        exclude: '../src/{Rector/**/*Rector.php,Exception,ValueObject/*}'
+        exclude:
+            - '../src/Rector/**/*Rector.php'
+            - '../src/Exception/*'
+            - '../src/ValueObject/*'
diff --git a/packages/ZendToSymfony/config/config.yaml b/packages/ZendToSymfony/config/config.yaml
@@ -6,4 +6,6 @@ services:
 
     Rector\ZendToSymfony\:
         resource: '../src'
-        exclude: '../src/{Rector/**/*Rector.php,ValueObject/*}'
+        exclude:
+            - '../src/Rector/**/*Rector.php'
+            - '../src/ValueObject/*'
diff --git a/utils/DocumentationGenerator/config/config.yaml b/utils/DocumentationGenerator/config/config.yaml
@@ -6,4 +6,5 @@ services:
 
     Rector\Utils\DocumentationGenerator\:
         resource: '../src'
-        exclude: '../src/ValueObject/*'
+        exclude:
+            - '../src/ValueObject/*'
diff --git a/utils/RectorGenerator/config/config.yaml b/utils/RectorGenerator/config/config.yaml
@@ -6,4 +6,6 @@ services:
 
     Rector\Utils\RectorGenerator\:
         resource: '../src'
-        exclude: '../src/{Exception/*,ValueObject/*}'
+        exclude:
+            - '../src/Exception/*'
+            - '../src/ValueObject/*'