[phpstan] Make ComposerRectorInterface child classes respetc the "ComposerRector" suffix (#5319)

config/set/nette-30-composer.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-use Rector\Composer\Rector\ChangePackageVersionRector;
-use Rector\Composer\Rector\RemovePackageRector;
-use Rector\Composer\Rector\ReplacePackageAndVersionRector;
+use Rector\Composer\Rector\ChangePackageVersionComposerRector;
+use Rector\Composer\Rector\RemovePackageComposerRector;
+use Rector\Composer\Rector\ReplacePackageAndVersionComposerRector;
 use Rector\Composer\ValueObject\PackageAndVersion;
 use Rector\Composer\ValueObject\ReplacePackageAndVersion;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
@@ -13,9 +13,9 @@ use Symplify\SymfonyPhpConfig\ValueObjectInliner;
 return static function (ContainerConfigurator $containerConfigurator): void {
     $services = $containerConfigurator->services();
 
-    $services->set(ChangePackageVersionRector::class)
+    $services->set(ChangePackageVersionComposerRector::class)
         ->call('configure', [[
-            ChangePackageVersionRector::PACKAGES_AND_VERSIONS => ValueObjectInliner::inline([
+            ChangePackageVersionComposerRector::PACKAGES_AND_VERSIONS => ValueObjectInliner::inline([
                 new PackageAndVersion('nette/nette', '^3.0'),
                 // https://github.com/nette/nette/blob/v2.4.0/composer.json vs https://github.com/nette/nette/blob/v3.0.0/composer.json
                 // older versions have security issues
@@ -47,14 +47,14 @@ return static function (ContainerConfigurator $containerConfigurator): void {
             ]),
         ]]);
 
-    $services->set(RemovePackageRector::class)
+    $services->set(RemovePackageComposerRector::class)
         ->call('configure', [[
-            RemovePackageRector::PACKAGE_NAMES => ['nette/deprecated', 'nette/reflection'],
+            RemovePackageComposerRector::PACKAGE_NAMES => ['nette/deprecated', 'nette/reflection'],
         ]]);
 
-    $services->set(ReplacePackageAndVersionRector::class)
+    $services->set(ReplacePackageAndVersionComposerRector::class)
         ->call('configure', [[
-            ReplacePackageAndVersionRector::REPLACE_PACKAGES_AND_VERSIONS => ValueObjectInliner::inline([
+            ReplacePackageAndVersionComposerRector::REPLACE_PACKAGES_AND_VERSIONS => ValueObjectInliner::inline([
                 // webchemistry to contributte
                 new ReplacePackageAndVersion(
                     'webchemistry/forms-multiplier',

config/set/nette-31.php

@@ -5,8 +5,8 @@ declare(strict_types=1);
 use PHPStan\Type\NullType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\UnionType;
-use Rector\Composer\Rector\ChangePackageVersionRector;
-use Rector\Composer\Rector\RemovePackageRector;
+use Rector\Composer\Rector\ChangePackageVersionComposerRector;
+use Rector\Composer\Rector\RemovePackageComposerRector;
 use Rector\Composer\ValueObject\PackageAndVersion;
 use Rector\Generic\Rector\Assign\DimFetchAssignToMethodCallRector;
 use Rector\Generic\ValueObject\DimFetchAssignToMethodCall;
@@ -126,9 +126,9 @@ return static function (ContainerConfigurator $containerConfigurator): void {
 
     $services->set(ContextGetByTypeToConstructorInjectionRector::class);
 
-    $services->set(ChangePackageVersionRector::class)
+    $services->set(ChangePackageVersionComposerRector::class)
         ->call('configure', [[
-            ChangePackageVersionRector::PACKAGES_AND_VERSIONS => ValueObjectInliner::inline([
+            ChangePackageVersionComposerRector::PACKAGES_AND_VERSIONS => ValueObjectInliner::inline([
                 // meta package
                 new PackageAndVersion('nette/nette', '^3.1'),
                 // https://github.com/nette/nette/blob/v3.0.0/composer.json vs https://github.com/nette/nette/blob/v3.1.0/composer.json
@@ -161,8 +161,8 @@ return static function (ContainerConfigurator $containerConfigurator): void {
             ]),
         ]]);
 
-    $services->set(RemovePackageRector::class)
+    $services->set(RemovePackageComposerRector::class)
         ->call('configure', [[
-            RemovePackageRector::PACKAGE_NAMES => ['nette/component-model', 'nette/neon'],
+            RemovePackageComposerRector::PACKAGE_NAMES => ['nette/component-model', 'nette/neon'],
         ]]);
 };

docs/rector_rules_overview.md

@@ -2835,7 +2835,7 @@ Add package to "require-dev" in `composer.json`
 - class: `Rector\Composer\Rector\AddPackageToRequireDevRector`
 
 ```php
-use Rector\Composer\Rector\AddPackageToRequireDevRector;
+use Rector\Composer\Rector\AddPackageToRequireDevComposerRector;
 use Rector\Composer\ValueObject\PackageAndVersion;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symplify\SymfonyPhpConfig\ValueObjectInliner;
@@ -2843,9 +2843,9 @@ use Symplify\SymfonyPhpConfig\ValueObjectInliner;
 return static function (ContainerConfigurator $containerConfigurator): void {
     $services = $containerConfigurator->services();
 
-    $services->set(AddPackageToRequireDevRector::class)
+    $services->set(AddPackageToRequireDevComposerRector::class)
         ->call('configure', [[
-            AddPackageToRequireDevRector::PACKAGES_AND_VERSIONS => ValueObjectInliner::inline([
+            AddPackageToRequireDevComposerRector::PACKAGES_AND_VERSIONS => ValueObjectInliner::inline([
                 new PackageAndVersion('symfony/console', '^3.4'),
             ]),
         ]]);
@@ -2873,7 +2873,7 @@ Add package to "require" in `composer.json`
 - class: `Rector\Composer\Rector\AddPackageToRequireRector`
 
 ```php
-use Rector\Composer\Rector\AddPackageToRequireRector;
+use Rector\Composer\Rector\AddPackageToRequireComposerRector;
 use Rector\Composer\ValueObject\PackageAndVersion;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symplify\SymfonyPhpConfig\ValueObjectInliner;
@@ -2881,9 +2881,9 @@ use Symplify\SymfonyPhpConfig\ValueObjectInliner;
 return static function (ContainerConfigurator $containerConfigurator): void {
     $services = $containerConfigurator->services();
 
-    $services->set(AddPackageToRequireRector::class)
+    $services->set(AddPackageToRequireComposerRector::class)
         ->call('configure', [[
-            AddPackageToRequireRector::PACKAGES_AND_VERSIONS => ValueObjectInliner::inline([
+            AddPackageToRequireComposerRector::PACKAGES_AND_VERSIONS => ValueObjectInliner::inline([
                 new PackageAndVersion('symfony/console', '^3.4'),
             ]),
         ]]);
@@ -2911,7 +2911,7 @@ Change package version `composer.json`
 - class: `Rector\Composer\Rector\ChangePackageVersionRector`
 
 ```php
-use Rector\Composer\Rector\ChangePackageVersionRector;
+use Rector\Composer\Rector\ChangePackageVersionComposerRector;
 use Rector\Composer\ValueObject\PackageAndVersion;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symplify\SymfonyPhpConfig\ValueObjectInliner;
@@ -2919,9 +2919,9 @@ use Symplify\SymfonyPhpConfig\ValueObjectInliner;
 return static function (ContainerConfigurator $containerConfigurator): void {
     $services = $containerConfigurator->services();
 
-    $services->set(ChangePackageVersionRector::class)
+    $services->set(ChangePackageVersionComposerRector::class)
         ->call('configure', [[
-            ChangePackageVersionRector::PACKAGES_AND_VERSIONS => ValueObjectInliner::inline([
+            ChangePackageVersionComposerRector::PACKAGES_AND_VERSIONS => ValueObjectInliner::inline([
                 new PackageAndVersion('symfony/console', '^4.4'),
             ]),
         ]]);
@@ -2951,15 +2951,15 @@ Moves package from "require" to "require-dev" in `composer.json`
 - class: `Rector\Composer\Rector\MovePackageToRequireDevRector`
 
 ```php
-use Rector\Composer\Rector\MovePackageToRequireDevRector;
+use Rector\Composer\Rector\MovePackageToRequireDevComposerRector;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
     $services = $containerConfigurator->services();
 
-    $services->set(MovePackageToRequireDevRector::class)
+    $services->set(MovePackageToRequireDevComposerRector::class)
         ->call('configure', [[
-            MovePackageToRequireDevRector::PACKAGE_NAMES => ['symfony/console'],
+            MovePackageToRequireDevComposerRector::PACKAGE_NAMES => ['symfony/console'],
         ]]);
 };
 ```
@@ -2986,15 +2986,15 @@ Moves package from "require-dev" to "require" in `composer.json`
 - class: `Rector\Composer\Rector\MovePackageToRequireRector`
 
 ```php
-use Rector\Composer\Rector\MovePackageToRequireRector;
+use Rector\Composer\Rector\MovePackageToRequireComposerRector;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
     $services = $containerConfigurator->services();
 
-    $services->set(MovePackageToRequireRector::class)
+    $services->set(MovePackageToRequireComposerRector::class)
         ->call('configure', [[
-            MovePackageToRequireRector::PACKAGE_NAMES => ['symfony/console'],
+            MovePackageToRequireComposerRector::PACKAGE_NAMES => ['symfony/console'],
         ]]);
 };
 ```
@@ -3021,15 +3021,15 @@ Remove package from "require" and "require-dev" in `composer.json`
 - class: `Rector\Composer\Rector\RemovePackageRector`
 
 ```php
-use Rector\Composer\Rector\RemovePackageRector;
+use Rector\Composer\Rector\RemovePackageComposerRector;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
     $services = $containerConfigurator->services();
 
-    $services->set(RemovePackageRector::class)
+    $services->set(RemovePackageComposerRector::class)
         ->call('configure', [[
-            RemovePackageRector::PACKAGE_NAMES => ['symfony/console'],
+            RemovePackageComposerRector::PACKAGE_NAMES => ['symfony/console'],
         ]]);
 };
 ```
@@ -3055,7 +3055,7 @@ Change package name and version `composer.json`
 - class: `Rector\Composer\Rector\ReplacePackageAndVersionRector`
 
 ```php
-use Rector\Composer\Rector\ReplacePackageAndVersionRector;
+use Rector\Composer\Rector\ReplacePackageAndVersionComposerRector;
 use Rector\Composer\ValueObject\ReplacePackageAndVersion;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symplify\SymfonyPhpConfig\ValueObjectInliner;
@@ -3063,9 +3063,9 @@ use Symplify\SymfonyPhpConfig\ValueObjectInliner;
 return static function (ContainerConfigurator $containerConfigurator): void {
     $services = $containerConfigurator->services();
 
-    $services->set(ReplacePackageAndVersionRector::class)
+    $services->set(ReplacePackageAndVersionComposerRector::class)
         ->call('configure', [[
-            ReplacePackageAndVersionRector::REPLACE_PACKAGES_AND_VERSIONS => ValueObjectInliner::inline([
+            ReplacePackageAndVersionComposerRector::REPLACE_PACKAGES_AND_VERSIONS => ValueObjectInliner::inline([
                 new ReplacePackageAndVersion('symfony/console', 'symfony/http-kernel', '^4.4'),
             ]),
         ]]);

phpstan.neon

@@ -146,6 +146,7 @@ parameters:
         # known value
         - '#Property PhpParser\\Node\\Stmt\\Foreach_\:\:\$valueVar \(PhpParser\\Node\\Expr\) does not accept PhpParser\\Node\\Expr\|null#'
         - '#Access to an undefined property PHPStan\\PhpDocParser\\Ast\\PhpDoc\\PhpDocTagValueNode\:\:\$type#'
+        - '#Content of method "configure\(\)" is duplicated with method "configure\(\)" in "Rector\\Composer\\Rector\\AddPackageToRequireComposerRector" class\. Use unique content or abstract service instead#'
 
         # only local use
         -

rules/composer/src/Rector/AddPackageToRequireComposerRector.php

@@ -12,9 +12,9 @@ use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 /**
- * @see \Rector\Composer\Tests\Rector\AddPackageToRequireRector\AddPackageToRequireRectorTest
+ * @see \Rector\Composer\Tests\Rector\AddPackageToRequireComposerRector\AddPackageToRequireComposerRectorTest
  */
-final class AddPackageToRequireRector implements ComposerRectorInterface
+final class AddPackageToRequireComposerRector implements ComposerRectorInterface
 {
     /**
      * @var string

rules/composer/src/Rector/AddPackageToRequireDevComposerRector.php

@@ -12,9 +12,9 @@ use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 /**
- * @see \Rector\Composer\Tests\Rector\AddPackageToRequireDevRector\AddPackageToRequireDevRectorTest
+ * @see \Rector\Composer\Tests\Rector\AddPackageToRequireDevComposerRector\AddPackageToRequireDevComposerRectorTest
  */
-final class AddPackageToRequireDevRector implements ComposerRectorInterface
+final class AddPackageToRequireDevComposerRector implements ComposerRectorInterface
 {
     /**
      * @var string

rules/composer/src/Rector/ChangePackageVersionComposerRector.php

@@ -12,9 +12,9 @@ use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 /**
- * @see \Rector\Composer\Tests\Rector\ChangePackageVersionRector\ChangePackageVersionRectorTest
+ * @see \Rector\Composer\Tests\Rector\ChangePackageVersionComposerRector\ChangePackageVersionComposerRectorTest
  */
-final class ChangePackageVersionRector implements ComposerRectorInterface
+final class ChangePackageVersionComposerRector implements ComposerRectorInterface
 {
     /**
      * @var string

rules/composer/src/Rector/MovePackageToRequireComposerRector.php

@@ -10,9 +10,9 @@ use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 /**
- * @see \Rector\Composer\Tests\Rector\MovePackageToRequireRector\MovePackageToRequireRectorTest
+ * @see \Rector\Composer\Tests\Rector\MovePackageToRequireComposerRector\MovePackageToRequireComposerRectorTest
  */
-final class MovePackageToRequireRector implements ComposerRectorInterface
+final class MovePackageToRequireComposerRector implements ComposerRectorInterface
 {
     /**
      * @var string

rules/composer/src/Rector/MovePackageToRequireDevComposerRector.php

@@ -10,9 +10,9 @@ use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 /**
- * @see \Rector\Composer\Tests\Rector\MovePackageToRequireDevRector\MovePackageToRequireDevRectorTest
+ * @see \Rector\Composer\Tests\Rector\MovePackageToRequireDevComposerRector\MovePackageToRequireDevComposerRectorTest
  */
-final class MovePackageToRequireDevRector implements ComposerRectorInterface
+final class MovePackageToRequireDevComposerRector implements ComposerRectorInterface
 {
     /**
      * @var string

rules/composer/src/Rector/RemovePackageComposerRector.php

@@ -10,9 +10,9 @@ use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 /**
- * @see \Rector\Composer\Tests\Rector\RemovePackageRector\RemovePackageRectorTest
+ * @see \Rector\Composer\Tests\Rector\RemovePackageComposerRector\RemovePackageComposerRectorTest
  */
-final class RemovePackageRector implements ComposerRectorInterface
+final class RemovePackageComposerRector implements ComposerRectorInterface
 {
     /**
      * @var string

rules/composer/src/Rector/ReplacePackageAndVersionComposerRector.php

@@ -12,9 +12,9 @@ use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 /**
- * @see \Rector\Composer\Tests\Rector\ReplacePackageAndVersionRector\ReplacePackageAndVersionRectorTest
+ * @see \Rector\Composer\Tests\Rector\ReplacePackageAndVersionComposerRector\ReplacePackageAndVersionComposerRectorTest
  */
-final class ReplacePackageAndVersionRector implements ComposerRectorInterface
+final class ReplacePackageAndVersionComposerRector implements ComposerRectorInterface
 {
     /**
      * @var string

rules/composer/src/ValueObject/ReplacePackageAndVersion.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Rector\Composer\ValueObject;
 
 use Rector\Composer\Contract\VersionAwareInterface;
-use Rector\Composer\Rector\ChangePackageVersionRector;
+use Rector\Composer\Rector\ChangePackageVersionComposerRector;
 use Webmozart\Assert\Assert;
 
 final class ReplacePackageAndVersion implements VersionAwareInterface
@@ -30,7 +30,7 @@ final class ReplacePackageAndVersion implements VersionAwareInterface
         Assert::notSame(
             $oldPackageName,
             $newPackageName,
-            'Old and new package have to be different. If you want to only change package version, use ' . ChangePackageVersionRector::class
+            'Old and new package have to be different. If you want to only change package version, use ' . ChangePackageVersionComposerRector::class
         );
 
         $this->oldPackageName = $oldPackageName;

rules/composer/tests/Rector/AddPackageToRequireComposerRector/AddPackageToRequireComposerRectorTest.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Rector\Composer\Tests\Rector\MovePackageToRequireDevRector;
+namespace Rector\Composer\Tests\Rector\AddPackageToRequireComposerRector;
 
 use Iterator;
 use Rector\Composer\Tests\Rector\AbstractComposerRectorTestCase;
 use Symplify\EasyTesting\DataProvider\StaticFixtureFinder;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
-final class MovePackageToRequireDevRectorTest extends AbstractComposerRectorTestCase
+final class AddPackageToRequireComposerRectorTest extends AbstractComposerRectorTestCase
 {
     /**
      * @dataProvider provideData()

rules/composer/tests/Rector/AddPackageToRequireComposerRector/config/some_config.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use Rector\Composer\Rector\AddPackageToRequireRector;
+use Rector\Composer\Rector\AddPackageToRequireComposerRector;
 use Rector\Composer\ValueObject\PackageAndVersion;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symplify\SymfonyPhpConfig\ValueObjectInliner;
@@ -10,9 +10,9 @@ use Symplify\SymfonyPhpConfig\ValueObjectInliner;
 return static function (ContainerConfigurator $containerConfigurator): void {
     $services = $containerConfigurator->services();
 
-    $services->set(AddPackageToRequireRector::class)
+    $services->set(AddPackageToRequireComposerRector::class)
         ->call('configure', [[
-            AddPackageToRequireRector::PACKAGES_AND_VERSIONS => ValueObjectInliner::inline([
+            AddPackageToRequireComposerRector::PACKAGES_AND_VERSIONS => ValueObjectInliner::inline([
                 new PackageAndVersion('vendor1/package3', '^3.0'),
             ]),
         ]]);

rules/composer/tests/Rector/AddPackageToRequireDevComposerRector/AddPackageToRequireDevComposerRectorTest.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Rector\Composer\Tests\Rector\AddPackageToRequireRector;
+namespace Rector\Composer\Tests\Rector\AddPackageToRequireDevComposerRector;
 
 use Iterator;
 use Rector\Composer\Tests\Rector\AbstractComposerRectorTestCase;
 use Symplify\EasyTesting\DataProvider\StaticFixtureFinder;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
-final class AddPackageToRequireRectorTest extends AbstractComposerRectorTestCase
+final class AddPackageToRequireDevComposerRectorTest extends AbstractComposerRectorTestCase
 {
     /**
      * @dataProvider provideData()

rules/composer/tests/Rector/AddPackageToRequireDevComposerRector/config/some_config.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use Rector\Composer\Rector\AddPackageToRequireDevRector;
+use Rector\Composer\Rector\AddPackageToRequireDevComposerRector;
 use Rector\Composer\ValueObject\PackageAndVersion;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symplify\SymfonyPhpConfig\ValueObjectInliner;
@@ -10,9 +10,9 @@ use Symplify\SymfonyPhpConfig\ValueObjectInliner;
 return static function (ContainerConfigurator $containerConfigurator): void {
     $services = $containerConfigurator->services();
 
-    $services->set(AddPackageToRequireDevRector::class)
+    $services->set(AddPackageToRequireDevComposerRector::class)
         ->call('configure', [[
-            AddPackageToRequireDevRector::PACKAGES_AND_VERSIONS => ValueObjectInliner::inline([
+            AddPackageToRequireDevComposerRector::PACKAGES_AND_VERSIONS => ValueObjectInliner::inline([
                 new PackageAndVersion('vendor1/package3', '^3.0'),
                 new PackageAndVersion('vendor1/package1', '^3.0'),
                 new PackageAndVersion('vendor1/package2', '^3.0'),

rules/composer/tests/Rector/ChangePackageVersionComposerRector/ChangePackageVersionComposerRectorTest.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Rector\Composer\Tests\Rector\AddPackageToRequireDevRector;
+namespace Rector\Composer\Tests\Rector\ChangePackageVersionComposerRector;
 
 use Iterator;
 use Rector\Composer\Tests\Rector\AbstractComposerRectorTestCase;
 use Symplify\EasyTesting\DataProvider\StaticFixtureFinder;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
-final class AddPackageToRequireDevRectorTest extends AbstractComposerRectorTestCase
+final class ChangePackageVersionComposerRectorTest extends AbstractComposerRectorTestCase
 {
     /**
      * @dataProvider provideData()

rules/composer/tests/Rector/ChangePackageVersionComposerRector/config/some_config.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use Rector\Composer\Rector\ChangePackageVersionRector;
+use Rector\Composer\Rector\ChangePackageVersionComposerRector;
 use Rector\Composer\ValueObject\PackageAndVersion;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symplify\SymfonyPhpConfig\ValueObjectInliner;
@@ -10,9 +10,9 @@ use Symplify\SymfonyPhpConfig\ValueObjectInliner;
 return static function (ContainerConfigurator $containerConfigurator): void {
     $services = $containerConfigurator->services();
 
-    $services->set(ChangePackageVersionRector::class)
+    $services->set(ChangePackageVersionComposerRector::class)
         ->call('configure', [[
-            ChangePackageVersionRector::PACKAGES_AND_VERSIONS => ValueObjectInliner::inline([
+            ChangePackageVersionComposerRector::PACKAGES_AND_VERSIONS => ValueObjectInliner::inline([
                 new PackageAndVersion('vendor1/package3', '^15.0'),
             ]),
         ]]);

rules/composer/tests/Rector/CombinationComposerRector/config/some_config.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-use Rector\Composer\Rector\ChangePackageVersionRector;
-use Rector\Composer\Rector\MovePackageToRequireDevRector;
-use Rector\Composer\Rector\ReplacePackageAndVersionRector;
+use Rector\Composer\Rector\ChangePackageVersionComposerRector;
+use Rector\Composer\Rector\MovePackageToRequireDevComposerRector;
+use Rector\Composer\Rector\ReplacePackageAndVersionComposerRector;
 use Rector\Composer\ValueObject\PackageAndVersion;
 use Rector\Composer\ValueObject\ReplacePackageAndVersion;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
@@ -13,21 +13,21 @@ use Symplify\SymfonyPhpConfig\ValueObjectInliner;
 return static function (ContainerConfigurator $containerConfigurator): void {
     $services = $containerConfigurator->services();
 
-    $services->set(MovePackageToRequireDevRector::class)
+    $services->set(MovePackageToRequireDevComposerRector::class)
         ->call('configure', [[
-            MovePackageToRequireDevRector::PACKAGE_NAMES => ['vendor1/package1'],
+            MovePackageToRequireDevComposerRector::PACKAGE_NAMES => ['vendor1/package1'],
         ]]);
 
-    $services->set(ReplacePackageAndVersionRector::class)
+    $services->set(ReplacePackageAndVersionComposerRector::class)
         ->call('configure', [[
-            ReplacePackageAndVersionRector::REPLACE_PACKAGES_AND_VERSIONS => ValueObjectInliner::inline([
+            ReplacePackageAndVersionComposerRector::REPLACE_PACKAGES_AND_VERSIONS => ValueObjectInliner::inline([
                 new ReplacePackageAndVersion('vendor1/package2', 'vendor2/package1', '^3.0'),
             ]),
         ]]);
 
-    $services->set(ChangePackageVersionRector::class)
+    $services->set(ChangePackageVersionComposerRector::class)
         ->call('configure', [[
-            ChangePackageVersionRector::PACKAGES_AND_VERSIONS => ValueObjectInliner::inline([
+            ChangePackageVersionComposerRector::PACKAGES_AND_VERSIONS => ValueObjectInliner::inline([
                 new PackageAndVersion('vendor1/package3', '~3.0.0'),
             ]),
         ]]);

rules/composer/tests/Rector/MovePackageToRequireComposerRector/MovePackageToRequireComposerRectorTest.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Rector\Composer\Tests\Rector\ChangePackageVersionRector;
+namespace Rector\Composer\Tests\Rector\MovePackageToRequireComposerRector;
 
 use Iterator;
 use Rector\Composer\Tests\Rector\AbstractComposerRectorTestCase;
 use Symplify\EasyTesting\DataProvider\StaticFixtureFinder;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
-final class ChangePackageVersionRectorTest extends AbstractComposerRectorTestCase
+final class MovePackageToRequireComposerRectorTest extends AbstractComposerRectorTestCase
 {
     /**
      * @dataProvider provideData()

rules/composer/tests/Rector/MovePackageToRequireComposerRector/config/some_config.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-use Rector\Composer\Rector\RemovePackageRector;
+use Rector\Composer\Rector\MovePackageToRequireComposerRector;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
     $services = $containerConfigurator->services();
 
-    $services->set(RemovePackageRector::class)
+    $services->set(MovePackageToRequireComposerRector::class)
         ->call('configure', [[
-            RemovePackageRector::PACKAGE_NAMES => ['vendor1/package3', 'vendor1/package1', 'vendor1/package2'],
+            MovePackageToRequireComposerRector::PACKAGE_NAMES => ['vendor1/package1'],
         ]]);
 };

rules/composer/tests/Rector/MovePackageToRequireDevComposerRector/MovePackageToRequireDevComposerRectorTest.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Composer\Tests\Rector\MovePackageToRequireDevComposerRector;
+
+use Iterator;
+use Rector\Composer\Tests\Rector\AbstractComposerRectorTestCase;
+use Symplify\EasyTesting\DataProvider\StaticFixtureFinder;
+use Symplify\SmartFileSystem\SmartFileInfo;
+
+final class MovePackageToRequireDevComposerRectorTest extends AbstractComposerRectorTestCase
+{
+    /**
+     * @dataProvider provideData()
+     */
+    public function test(SmartFileInfo $fileInfo): void
+    {
+        $this->doTestFileInfo($fileInfo);
+    }
+
+    public function provideData(): Iterator
+    {
+        return StaticFixtureFinder::yieldDirectory(__DIR__ . '/Fixture', '*.json');
+    }
+
+    public function provideConfigFile(): string
+    {
+        return __DIR__ . '/config/some_config.php';
+    }
+}

rules/composer/tests/Rector/MovePackageToRequireDevComposerRector/config/some_config.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-use Rector\Composer\Rector\MovePackageToRequireRector;
+use Rector\Composer\Rector\MovePackageToRequireDevComposerRector;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
     $services = $containerConfigurator->services();
 
-    $services->set(MovePackageToRequireRector::class)
+    $services->set(MovePackageToRequireDevComposerRector::class)
         ->call('configure', [[
-            MovePackageToRequireRector::PACKAGE_NAMES => ['vendor1/package1'],
+            MovePackageToRequireDevComposerRector::PACKAGE_NAMES => ['vendor1/package3'],
         ]]);
 };

rules/composer/tests/Rector/RemovePackageComposerRector/RemovePackageComposerRectorTest.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Rector\Composer\Tests\Rector\MovePackageToRequireRector;
+namespace Rector\Composer\Tests\Rector\RemovePackageComposerRector;
 
 use Iterator;
 use Rector\Composer\Tests\Rector\AbstractComposerRectorTestCase;
 use Symplify\EasyTesting\DataProvider\StaticFixtureFinder;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
-final class MovePackageToRequireRectorTest extends AbstractComposerRectorTestCase
+final class RemovePackageComposerRectorTest extends AbstractComposerRectorTestCase
 {
     /**
      * @dataProvider provideData()

rules/composer/tests/Rector/RemovePackageComposerRector/config/some_config.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-use Rector\Composer\Rector\MovePackageToRequireDevRector;
+use Rector\Composer\Rector\RemovePackageComposerRector;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
     $services = $containerConfigurator->services();
 
-    $services->set(MovePackageToRequireDevRector::class)
+    $services->set(RemovePackageComposerRector::class)
         ->call('configure', [[
-            MovePackageToRequireDevRector::PACKAGE_NAMES => ['vendor1/package3'],
+            RemovePackageComposerRector::PACKAGE_NAMES => ['vendor1/package3', 'vendor1/package1', 'vendor1/package2'],
         ]]);
 };

rules/composer/tests/Rector/RemovePackageRector/RemovePackageRectorTest.php

@@ -1,31 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Rector\Composer\Tests\Rector\RemovePackageRector;
-
-use Iterator;
-use Rector\Composer\Tests\Rector\AbstractComposerRectorTestCase;
-use Symplify\EasyTesting\DataProvider\StaticFixtureFinder;
-use Symplify\SmartFileSystem\SmartFileInfo;
-
-final class RemovePackageRectorTest extends AbstractComposerRectorTestCase
-{
-    /**
-     * @dataProvider provideData()
-     */
-    public function test(SmartFileInfo $fileInfo): void
-    {
-        $this->doTestFileInfo($fileInfo);
-    }
-
-    public function provideData(): Iterator
-    {
-        return StaticFixtureFinder::yieldDirectory(__DIR__ . '/Fixture', '*.json');
-    }
-
-    public function provideConfigFile(): string
-    {
-        return __DIR__ . '/config/some_config.php';
-    }
-}

rules/composer/tests/Rector/ReplacePackageAndVersionComposerRector/ReplacePackageAndVersionComposerRectorTest.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Composer\Tests\Rector\ReplacePackageAndVersionComposerRector;
+
+use Iterator;
+use Rector\Composer\Tests\Rector\AbstractComposerRectorTestCase;
+use Symplify\EasyTesting\DataProvider\StaticFixtureFinder;
+use Symplify\SmartFileSystem\SmartFileInfo;
+
+final class ReplacePackageAndVersionComposerRectorTest extends AbstractComposerRectorTestCase
+{
+    /**
+     * @dataProvider provideData()
+     */
+    public function test(SmartFileInfo $fileInfo): void
+    {
+        $this->doTestFileInfo($fileInfo);
+    }
+
+    public function provideData(): Iterator
+    {
+        return StaticFixtureFinder::yieldDirectory(__DIR__ . '/Fixture', '*.json');
+    }
+
+    public function provideConfigFile(): string
+    {
+        return __DIR__ . '/config/some_config.php';
+    }
+}

rules/composer/tests/Rector/ReplacePackageAndVersionComposerRector/config/some_config.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use Rector\Composer\Rector\ReplacePackageAndVersionRector;
+use Rector\Composer\Rector\ReplacePackageAndVersionComposerRector;
 use Rector\Composer\ValueObject\ReplacePackageAndVersion;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symplify\SymfonyPhpConfig\ValueObjectInliner;
@@ -10,9 +10,9 @@ use Symplify\SymfonyPhpConfig\ValueObjectInliner;
 return static function (ContainerConfigurator $containerConfigurator): void {
     $services = $containerConfigurator->services();
 
-    $services->set(ReplacePackageAndVersionRector::class)
+    $services->set(ReplacePackageAndVersionComposerRector::class)
         ->call('configure', [[
-            ReplacePackageAndVersionRector::REPLACE_PACKAGES_AND_VERSIONS => ValueObjectInliner::inline([
+            ReplacePackageAndVersionComposerRector::REPLACE_PACKAGES_AND_VERSIONS => ValueObjectInliner::inline([
                 new ReplacePackageAndVersion('vendor1/package1', 'vendor1/package3', '^4.0'),
             ]),
         ]]);

rules/composer/tests/Rector/ReplacePackageAndVersionRector/ReplacePackageAndVersionRectorTest.php

@@ -1,31 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Rector\Composer\Tests\Rector\ReplacePackageAndVersionRector;
-
-use Iterator;
-use Rector\Composer\Tests\Rector\AbstractComposerRectorTestCase;
-use Symplify\EasyTesting\DataProvider\StaticFixtureFinder;
-use Symplify\SmartFileSystem\SmartFileInfo;
-
-final class ReplacePackageAndVersionRectorTest extends AbstractComposerRectorTestCase
-{
-    /**
-     * @dataProvider provideData()
-     */
-    public function test(SmartFileInfo $fileInfo): void
-    {
-        $this->doTestFileInfo($fileInfo);
-    }
-
-    public function provideData(): Iterator
-    {
-        return StaticFixtureFinder::yieldDirectory(__DIR__ . '/Fixture', '*.json');
-    }
-
-    public function provideConfigFile(): string
-    {
-        return __DIR__ . '/config/some_config.php';
-    }
-}

utils/phpstan-extensions/config/rector-rules.neon

@@ -131,8 +131,9 @@ services:
         tags: [phpstan.rules.rule]
         arguments:
             parentClasses:
-                - Rector
-                - Rector\Composer\Contract\ComposerModifier\ComposerModifierInterface
+                - Rector\Core\Rector\AbstractRector
+                - Rector\PostRector\Contract\Rector\PostRectorInterface
+                - Rector\Composer\Contract\Rector\ComposerRectorInterface
 
     -
         class: Symplify\PHPStanRules\Rules\PreferredClassRule