[SOLID] Add ChangeNestedIfsToEarlyReturnRector & ChangeIfElseValueAssignToEarlyReturnRector

BACKERS.md

@@ -9,13 +9,17 @@ Development of Rector is made possible thanks to these awesome backers! Would yo
 
 Check out all the tiers - higher ones include additional goodies like placing the logo of your company in Rector's README or creating custom set for your needs.
 
-- Jan Votruba
-- Sebastian Schreiber
+- 11com7
+- Alexander Schnitzler
+- Arnaud TIERANT
 - Attila Fulop
 - Jakob Oberhummer
 - Jan Kuchař
+- Jan Votruba
 - Jan Mikes
-- Arnaud TIERANT
+- Ruud Boon
+- thechris
+- Toby
 
 **Thank you for making this happen.**
 
@@ -25,5 +29,6 @@ Check out all the tiers - higher ones include additional goodies like placing th
 
 - Musement S.p.a.
 - Sebastian Schreiber
+- John Linhart
 
 <!-- source: https://www.patreon.com/manageRewardsList -->

config/config.yaml

@@ -23,7 +23,7 @@ parameters:
     import_doc_blocks: true
 
     # what PHP version is used for features, composer.json version, then local PHP version is used by default
-    php_version_features: ~
+    php_version_features: null
 
     file_extensions:
         - 'php'

config/services.yaml

@@ -17,37 +17,37 @@ services:
             - '../src/ValueObject/*'
 
     # extra services
-    Rector\Symfony\Rector\Form\Helper\FormTypeStringToTypeProvider: ~
+    Rector\Symfony\Rector\Form\Helper\FormTypeStringToTypeProvider: null
 
     Symfony\Component\Console\Application:
         alias: 'Rector\Console\Application'
 
-    Symfony\Component\Console\Descriptor\TextDescriptor: ~
+    Symfony\Component\Console\Descriptor\TextDescriptor: null
 
     # PhpParser - Parser
-    PhpParser\ParserFactory: ~
-    PhpParser\BuilderFactory: ~
+    PhpParser\ParserFactory: null
+    PhpParser\BuilderFactory: null
     PhpParser\NodeVisitor\CloningVisitor:
-    PhpParser\NodeFinder: ~
+    PhpParser\NodeFinder: null
 
     # value resolver
-    Symfony\Component\Filesystem\Filesystem: ~
-    Symplify\PackageBuilder\Reflection\PrivatesAccessor: ~
+    Symfony\Component\Filesystem\Filesystem: null
+    Symplify\PackageBuilder\Reflection\PrivatesAccessor: null
 
-    Symplify\PackageBuilder\FileSystem\FileSystem: ~
-    Symplify\SmartFileSystem\Finder\FinderSanitizer: ~
+    Symplify\PackageBuilder\FileSystem\FileSystem: null
+    Symplify\SmartFileSystem\Finder\FinderSanitizer: null
 
-    Symplify\PackageBuilder\Parameter\ParameterProvider: ~
-    Symplify\PackageBuilder\Reflection\PrivatesCaller: ~
-    Symplify\PackageBuilder\Strings\StringFormatConverter: ~
+    Symplify\PackageBuilder\Parameter\ParameterProvider: null
+    Symplify\PackageBuilder\Reflection\PrivatesCaller: null
+    Symplify\PackageBuilder\Strings\StringFormatConverter: null
 
     # alises
     Symfony\Contracts\EventDispatcher\EventDispatcherInterface: '@Rector\EventDispatcher\AutowiredEventDispatcher'
 
-    OndraM\CiDetector\CiDetector: ~
+    OndraM\CiDetector\CiDetector: null
 
     # see https://github.com/symplify/packagebuilder#prevent-parameter-typos
-    Symplify\PackageBuilder\EventSubscriber\ParameterTypoProofreaderEventSubscriber: ~
+    Symplify\PackageBuilder\EventSubscriber\ParameterTypoProofreaderEventSubscriber: null
     Symplify\PackageBuilder\Parameter\ParameterTypoProofreader:
         $correctToTypos:
             # keep "exclude_" explicit, to get typos to the correct key

config/set/architecture/action-injection-to-constructor-injection.yaml

@@ -1,3 +1,3 @@
 services:
-    Rector\Rector\Architecture\DependencyInjection\ActionInjectionToConstructorInjectionRector: ~
-    Rector\Rector\Architecture\DependencyInjection\ReplaceVariableByPropertyFetchRector: ~
+    Rector\Rector\Architecture\DependencyInjection\ActionInjectionToConstructorInjectionRector: null
+    Rector\Rector\Architecture\DependencyInjection\ReplaceVariableByPropertyFetchRector: null

config/set/architecture/constructor-injectin-to-action-injection.yaml

@@ -1,2 +1,2 @@
 services:
-    Rector\Architecture\Rector\Class_\ConstructorInjectionToActionInjectionRector: ~
+    Rector\Architecture\Rector\Class_\ConstructorInjectionToActionInjectionRector: null

config/set/architecture/doctrine-repository-as-service.yaml

@@ -4,7 +4,7 @@ parameters:
 
 services:
     # order matters, this needs to be first to correctly detect parent repository
-    Rector\Rector\Architecture\RepositoryAsService\ReplaceParentRepositoryCallsByRepositoryPropertyRector: ~
-    Rector\Rector\Architecture\RepositoryAsService\MoveRepositoryFromParentToConstructorRector: ~
-    Rector\Rector\Architecture\RepositoryAsService\ServiceLocatorToDIRector: ~
-    Rector\Doctrine\Rector\Class_\RemoveRepositoryFromEntityAnnotationRector: ~
+    Rector\Rector\Architecture\RepositoryAsService\ReplaceParentRepositoryCallsByRepositoryPropertyRector: null
+    Rector\Rector\Architecture\RepositoryAsService\MoveRepositoryFromParentToConstructorRector: null
+    Rector\Rector\Architecture\RepositoryAsService\ServiceLocatorToDIRector: null
+    Rector\Doctrine\Rector\Class_\RemoveRepositoryFromEntityAnnotationRector: null

config/set/cakephp/cakephp34.yaml

@@ -42,14 +42,14 @@ services:
                 config:
                     minimal_argument_count: 2
                     first_argument_type_to_set: array
-                dsnClassMap: ~
+                dsnClassMap: null
             Cake\Console\ConsoleOptionParser:
-                command: ~
-                description: ~
-                epilog: ~
+                command: null
+                description: null
+                epilog: null
             Cake\Database\Connection:
-                driver: ~
-                schemaCollection: ~
+                driver: null
+                schemaCollection: null
                 useSavePoints:
                     set: 'enableSavePoints'
                     get: 'isSavePointsEnabled'
@@ -58,59 +58,59 @@ services:
                     set: 'enableAutoQuoting'
                     get: 'isAutoQuotingEnabled'
             Cake\Database\Expression\FunctionExpression:
-                name: ~
+                name: null
             Cake\Database\Expression\QueryExpression:
                 tieWith:
                     set: 'setConjunction'
                     get: 'getConjunction'
             Cake\Database\Expression\ValuesExpression:
-                columns: ~
-                values: ~
-                query: ~
+                columns: null
+                values: null
+                query: null
             Cake\Database\Query:
-                connection: ~
-                selectTypeMap: ~
+                connection: null
+                selectTypeMap: null
                 bufferResults:
                     set: 'enableBufferedResults'
                     get: 'isBufferedResultsEnabled'
             Cake\Database\Schema\CachedCollection:
-                cacheMetadata: ~
+                cacheMetadata: null
             Cake\Database\Schema\TableSchema:
-                options: ~
+                options: null
                 temporary:
                     set: 'setTemporary'
                     get: 'isTemporary'
             Cake\Database\TypeMap:
-                defaults: ~
-                types: ~
+                defaults: null
+                types: null
             Cake\Database\TypeMapTrait:
-                typeMap: ~
-                defaultTypes: ~
+                typeMap: null
+                defaultTypes: null
             Cake\ORM\Association:
-                name: ~
-                cascadeCallbacks: ~
-                source: ~
-                target: ~
-                conditions: ~
-                bindingKey: ~
-                foreignKey: ~
-                dependent: ~
-                joinType: ~
-                property: ~
-                strategy: ~
-                finder: ~
+                name: null
+                cascadeCallbacks: null
+                source: null
+                target: null
+                conditions: null
+                bindingKey: null
+                foreignKey: null
+                dependent: null
+                joinType: null
+                property: null
+                strategy: null
+                finder: null
             Cake\ORM\Association\BelongsToMany:
-                targetForeignKey: ~
-                saveStrategy: ~
-                conditions: ~
+                targetForeignKey: null
+                saveStrategy: null
+                conditions: null
             Cake\ORM\Association\HasMany:
-                saveStrategy: ~
-                foreignKey: ~
-                sort: ~
+                saveStrategy: null
+                foreignKey: null
+                sort: null
             Cake\ORM\Association\HasOne:
-                foreignKey: ~
+                foreignKey: null
             Cake\ORM\EagerLoadable:
-                config: ~
+                config: null
                 canBeJoined:
                     set: 'setCanBeJoined'
                     get: 'canBeJoined'
@@ -124,66 +124,66 @@ services:
                     set: 'enableAutoFields'
                     get: 'isAutoFieldsEnabled'
             Cake\ORM\Locator\TableLocator:
-                config: ~
+                config: null
             Cake\ORM\Query:
-                eagerLoader: ~
+                eagerLoader: null
                 hydrate:
                     set: 'enableHydration'
                     get: 'isHydrationEnabled'
                 autoFields:
                     set: 'enableAutoFields'
                     get: 'isAutoFieldsEnabled'
             Cake\ORM\Table:
-                table: ~
-                alias: ~
-                registryAlias: ~
-                connection: ~
-                schema: ~
-                primaryKey: ~
-                displayField: ~
-                entityClass: ~
+                table: null
+                alias: null
+                registryAlias: null
+                connection: null
+                schema: null
+                primaryKey: null
+                displayField: null
+                entityClass: null
             Cake\Mailer\Email:
-                from: ~
-                sender: ~
-                replyTo: ~
-                readReceipt: ~
-                returnPath: ~
-                to: ~
-                cc: ~
-                bcc: ~
-                charset: ~
-                headerCharset: ~
-                emailPattern: ~
-                subject: ~
+                from: null
+                sender: null
+                replyTo: null
+                readReceipt: null
+                returnPath: null
+                to: null
+                cc: null
+                bcc: null
+                charset: null
+                headerCharset: null
+                emailPattern: null
+                subject: null
                 # template: have to be changed manually, non A → B change + array case
                 viewRender:
                     set: 'setViewRenderer'
                     get: 'getViewRenderer'
-                viewVars: ~
-                theme: ~
-                helpers: ~
-                emailFormat: ~
-                transport: ~
-                messageId: ~
-                domain: ~
-                attachments: ~
-                configTransport: ~
-                profile: ~
+                viewVars: null
+                theme: null
+                helpers: null
+                emailFormat: null
+                transport: null
+                messageId: null
+                domain: null
+                attachments: null
+                configTransport: null
+                profile: null
             Cake\Validation\Validator:
-                provider: ~
+                provider: null
             Cake\View\StringTemplateTrait:
-                templates: ~
+                templates: null
             Cake\View\ViewBuilder:
-                templatePath: ~
-                layoutPath: ~
-                plugin: ~
-                helpers: ~
-                theme: ~
-                template: ~
-                layout: ~
-                options: ~
-                name: ~
-                className: ~
+                templatePath: null
+                layoutPath: null
+                plugin: null
+                helpers: null
+                theme: null
+                template: null
+                layout: null
+                options: null
+                name: null
+                className: null
                 autoLayout:
                     set: 'enableAutoLayout'
                     get: 'isAutoLayoutEnabled'