diff --git a/.github/workflows/packages_tests.yaml b/.github/workflows/packages_tests.yaml index 0f73083564d..c6f177ad70c 100644 --- a/.github/workflows/packages_tests.yaml +++ b/.github/workflows/packages_tests.yaml @@ -22,7 +22,6 @@ jobs: repository_name: # must be repository name, e.g. https://github.com/rectorphp/rector-nette - rectorphp/rector-nette - - rectorphp/rector-nette-to-symfony - rectorphp/rector-symfony - rectorphp/rector-laravel - rectorphp/rector-phpunit diff --git a/build/target-repository/composer.json b/build/target-repository/composer.json index 71bb74e2e73..5ab28c5ce71 100644 --- a/build/target-repository/composer.json +++ b/build/target-repository/composer.json @@ -27,7 +27,6 @@ "rector/rector-symfony": "*", "rector/rector-doctrine": "*", "rector/rector-nette": "*", - "rector/rector-nette-to-symfony": "*", "rector/rector-cakephp": "*" } } diff --git a/composer.json b/composer.json index 161da4c2365..5f4f915d2a4 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,6 @@ "rector/rector-doctrine": "^0.11.5", "rector/rector-laravel": "^0.11.1", "rector/rector-nette": "^0.11.5", - "rector/rector-nette-to-symfony": "^0.11.3", "rector/rector-phpunit": "^0.11.1", "rector/rector-symfony": "^0.11.6", "sebastian/diff": "^4.0.4", diff --git a/config/set/kdyby-to-symfony.php b/config/set/kdyby-to-symfony.php deleted file mode 100644 index 32edea5c00e..00000000000 --- a/config/set/kdyby-to-symfony.php +++ /dev/null @@ -1,44 +0,0 @@ -services(); - $services->set(ChangeMethodVisibilityRector::class) - ->call('configure', [[ - ChangeMethodVisibilityRector::METHOD_VISIBILITIES => ValueObjectInliner::inline([ - new ChangeMethodVisibility('Kdyby\Events\Subscriber', 'getSubscribedEvents', Visibility::STATIC), - ]), - ]]); - - $services->set(RenameMethodRector::class) - ->call('configure', [[ - RenameMethodRector::METHOD_CALL_RENAMES => ValueObjectInliner::inline([ - new MethodCallRename('Kdyby\Translation\Translator', 'translate', 'trans'), - new MethodCallRename('Kdyby\RabbitMq\IConsumer', 'process', 'execute'), - ]), - ]]); - - $services->set(RenameClassRector::class) - ->call('configure', [[ - RenameClassRector::OLD_TO_NEW_CLASSES => [ - 'Kdyby\RabbitMq\IConsumer' => 'OldSound\RabbitMqBundle\RabbitMq\ConsumerInterface', - 'Kdyby\RabbitMq\IProducer' => 'OldSound\RabbitMqBundle\RabbitMq\ProducerInterface', - 'Kdyby\Monolog\Logger' => 'Psr\Log\LoggerInterface', - 'Kdyby\Events\Subscriber' => 'Symfony\Component\EventDispatcher\EventSubscriberInterface', - 'Kdyby\Translation\Translator' => 'Symfony\Contracts\Translation\TranslatorInterface', - ], - ]]); - - $services->set(WrapTransParameterNameRector::class); -}; diff --git a/dev-docs/packages_ci_status.md b/dev-docs/packages_ci_status.md index e554a678e0c..31c13c72a29 100644 --- a/dev-docs/packages_ci_status.md +++ b/dev-docs/packages_ci_status.md @@ -29,9 +29,3 @@ * https://github.com/rectorphp/rector-cakephp * ![](https://github.com/rectorphp/rector-cakephp/actions/workflows/tests.yaml/badge.svg) * ![](https://github.com/rectorphp/rector-cakephp/actions/workflows/code_analysis.yaml/badge.svg) - -## Nette to Symfony - -* https://github.com/rectorphp/rector-nette-to-symfony -* ![](https://github.com/rectorphp/rector-nette-to-symfony/actions/workflows/tests.yaml/badge.svg) -* ![](https://github.com/rectorphp/rector-nette-to-symfony/actions/workflows/code_analysis.yaml/badge.svg) diff --git a/packages/NodeCollector/NodeVisitor/NodeCollectorNodeVisitor.php b/packages/NodeCollector/NodeVisitor/NodeCollectorNodeVisitor.php index 1c6a18548f1..1cdb07e9fe3 100644 --- a/packages/NodeCollector/NodeVisitor/NodeCollectorNodeVisitor.php +++ b/packages/NodeCollector/NodeVisitor/NodeCollectorNodeVisitor.php @@ -6,14 +6,12 @@ namespace Rector\NodeCollector\NodeVisitor; use PhpParser\Node; use PhpParser\NodeVisitorAbstract; -use Rector\NodeCollector\NodeCollector\NodeRepository; use Rector\NodeCollector\NodeCollector\ParsedNodeCollector; use Rector\NodeCollector\NodeCollector\ParsedPropertyFetchNodeCollector; final class NodeCollectorNodeVisitor extends NodeVisitorAbstract { public function __construct( - private NodeRepository $nodeRepository, private ParsedNodeCollector $parsedNodeCollector, private ParsedPropertyFetchNodeCollector $parsedPropertyFetchNodeCollector ) { diff --git a/packages/Set/ValueObject/SetList.php b/packages/Set/ValueObject/SetList.php index 06b58b17a90..39a71e6db44 100644 --- a/packages/Set/ValueObject/SetList.php +++ b/packages/Set/ValueObject/SetList.php @@ -58,11 +58,6 @@ final class SetList implements SetListInterface */ public const GMAGICK_TO_IMAGICK = __DIR__ . '/../../../config/set/gmagick_to_imagick.php'; - /** - * @var string - */ - public const KDYBY_TO_SYMFONY = __DIR__ . '/../../../config/set/kdyby-to-symfony.php'; - /** * @var string */ diff --git a/rules/Autodiscovery/Rector/Interface_/MoveInterfacesToContractNamespaceDirectoryRector.php b/rules/Autodiscovery/Rector/Interface_/MoveInterfacesToContractNamespaceDirectoryRector.php index 3ee96530d16..0010ea88f49 100644 --- a/rules/Autodiscovery/Rector/Interface_/MoveInterfacesToContractNamespaceDirectoryRector.php +++ b/rules/Autodiscovery/Rector/Interface_/MoveInterfacesToContractNamespaceDirectoryRector.php @@ -9,7 +9,7 @@ use PhpParser\Node\Stmt\Interface_; use Rector\Core\Rector\AbstractRector; use Rector\FileSystemRector\ValueObject\AddedFileWithNodes; use Rector\FileSystemRector\ValueObjectFactory\AddedFileWithNodesFactory; -use Rector\NetteToSymfony\NodeAnalyzer\NetteControlFactoryInterfaceAnalyzer; +use Rector\Nette\NodeAnalyzer\Component\NetteControlFactoryInterfaceAnalyzer; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/rules/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector.php b/rules/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector.php index 15dfbad8e77..63f26294696 100644 --- a/rules/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector.php +++ b/rules/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector.php @@ -12,7 +12,6 @@ use PhpParser\Node\Expr\PropertyFetch; use PhpParser\Node\Expr\StaticCall; use PHPStan\Reflection\ReflectionProvider; use PHPStan\Type\ObjectType; -use Rector\Core\NodeManipulator\ClassMethodManipulator; use Rector\Core\Rector\AbstractRector; use Rector\NodeCollector\ScopeResolver\ParentClassScopeResolver; use Rector\NodeCollector\StaticAnalyzer; @@ -28,7 +27,6 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; final class StaticCallOnNonStaticToInstanceCallRector extends AbstractRector { public function __construct( - private ClassMethodManipulator $classMethodManipulator, private StaticAnalyzer $staticAnalyzer, private ReflectionProvider $reflectionProvider, private ParentClassScopeResolver $parentClassScopeResolver