Skip to content

Commit 793113d

Browse files
committed
[symfony 60] split of configs per package
1 parent b7bb936 commit 793113d

3 files changed

Lines changed: 30 additions & 13 deletions

File tree

config/sets/symfony/symfony6/symfony60.php

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,23 @@
22

33
declare(strict_types=1);
44

5-
use PhpParser\Node\Scalar\String_;
65
use PHPStan\Type\MixedType;
76
use PHPStan\Type\ObjectType;
87
use Rector\Config\RectorConfig;
98
use Rector\Renaming\Rector\MethodCall\RenameMethodRector;
109
use Rector\Renaming\Rector\Name\RenameClassRector;
1110
use Rector\Renaming\ValueObject\MethodCallRename;
12-
use Rector\Symfony\Set\SymfonySetList;
13-
use Rector\Symfony\Symfony60\Rector\FuncCall\ReplaceServiceArgumentRector;
1411
use Rector\Symfony\Symfony60\Rector\MethodCall\GetHelperControllerToServiceRector;
15-
use Rector\Symfony\ValueObject\ReplaceServiceArgument;
1612
use Rector\TypeDeclaration\Rector\ClassMethod\AddParamTypeDeclarationRector;
1713
use Rector\TypeDeclaration\ValueObject\AddParamTypeDeclaration;
1814

1915
# https://github.com/symfony/symfony/blob/6.1/UPGRADE-6.0.md
2016

2117
return static function (RectorConfig $rectorConfig): void {
22-
$rectorConfig->sets([SymfonySetList::ANNOTATIONS_TO_ATTRIBUTES]);
18+
// $rectorConfig->sets([SymfonySetList::ANNOTATIONS_TO_ATTRIBUTES]);
2319

2420
$rectorConfig->import(__DIR__ . '/symfony-return-types.php');
25-
$rectorConfig->ruleWithConfiguration(ReplaceServiceArgumentRector::class, [
26-
new ReplaceServiceArgument('Psr\Container\ContainerInterface', new String_('service_container')),
27-
new ReplaceServiceArgument(
28-
'Symfony\Component\DependencyInjection\ContainerInterface',
29-
new String_('service_container')
30-
),
31-
]);
21+
$rectorConfig->import(__DIR__ . '/symfony60/symfony60-dependency-injection.php');
3222

3323
$rectorConfig->ruleWithConfiguration(RenameClassRector::class, [
3424
// @see https://github.com/symfony/symfony/pull/39484
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
use PhpParser\Node\Scalar\String_;
6+
use Rector\Config\RectorConfig;
7+
use Rector\Symfony\Symfony60\Rector\FuncCall\ReplaceServiceArgumentRector;
8+
use Rector\Symfony\ValueObject\ReplaceServiceArgument;
9+
10+
return static function (RectorConfig $rectorConfig): void {
11+
$rectorConfig->ruleWithConfiguration(ReplaceServiceArgumentRector::class, [
12+
new ReplaceServiceArgument('Psr\Container\ContainerInterface', new String_('service_container')),
13+
new ReplaceServiceArgument(
14+
'Symfony\Component\DependencyInjection\ContainerInterface',
15+
new String_('service_container')
16+
),
17+
]);
18+
};

src/Set/SetProvider/Symfony6SetProvider.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,19 @@ public function provide(): array
1919
return [
2020
new ComposerTriggeredSet(
2121
SetGroup::SYMFONY,
22-
'symfony/*',
22+
'symfony/symfony',
2323
'6.0',
2424
__DIR__ . '/../../../config/sets/symfony/symfony6/symfony60.php'
2525
),
26+
27+
new ComposerTriggeredSet(
28+
SetGroup::SYMFONY,
29+
'symfony/dependency-injection',
30+
'6.0',
31+
__DIR__ . '/../../../config/sets/symfony/symfony6/symfony60/symfony60-dependency-injection.php'
32+
),
33+
34+
2635
new ComposerTriggeredSet(
2736
SetGroup::SYMFONY,
2837
'symfony/*',

0 commit comments

Comments
 (0)