Skip to content

Commit c66d021

Browse files
mamazumamazu
committed
Also adding class remappings after the bundles that have been moved to core
1 parent bd64618 commit c66d021

2 files changed

Lines changed: 63 additions & 40 deletions

File tree

‎config/sets/sulu/sulu-26.php‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,46 @@
33
declare(strict_types=1);
44

55
use Rector\Config\RectorConfig;
6+
use Rector\Renaming\Rector\MethodCall\RenameMethodRector;
7+
use Rector\Renaming\ValueObject\MethodCallRename;
8+
use Sulu\Rector\Rector\ListBuilderInterfaceRector;
9+
use Sulu\Rector\Rector\PaginatedRepresentationRector;
10+
use Sulu\Rector\Rector\RequestParameterTraitRector;
611

712
return static function (RectorConfig $rectorConfig): void {
13+
$rectorConfig->ruleWithConfiguration(
14+
RenameMethodRector::class,
15+
[
16+
// @see Removing old Category functions https://github.com/sulu/sulu/pull/7572
17+
new MethodCallRename(
18+
'Sulu\Bundle\CategoryBundle\Entity\CategoryRepository',
19+
'findByCategoryIds',
20+
'findByCategoriesIds',
21+
),
22+
new MethodCallRename('Sulu\Bundle\CategoryBundle\Entity\Category', 'addChildren', 'addChild'),
23+
new MethodCallRename('Sulu\Bundle\CategoryBundle\Entity\Category', 'removeChildren', 'removeChild'),
24+
25+
new MethodCallRename('Sulu\Bundle\AdminBundle\Admin\View\FormOverlayListViewBuilder', 'setRequestParameters', 'addRequestParameters'),
26+
27+
// @see Removing old ListBuilderInterface functions https://github.com/sulu/sulu/pull/7752
28+
new MethodCallRename('Sulu\Component\Rest\ListBuilder\ListBuilderInterface', 'setFields', 'setSelectFields'),
29+
new MethodCallRename('Sulu\Component\Rest\ListBuilder\ListBuilderInterface', 'addField', 'addSelectField'),
30+
new MethodCallRename('Sulu\Component\Rest\ListBuilder\ListBuilderInterface', 'hasField', 'hasSelectField'),
31+
32+
// @see Deprecating Localization https://github.com/sulu/sulu/pull/7053
33+
new MethodCallRename('Sulu\Component\Webspace\Portal', 'getXDefaultLocalization', 'getDefaultLocalization'),
34+
new MethodCallRename('Sulu\Component\Webspace\Portal', 'setXDefaultLocalization', 'setDefaultLocalization'),
35+
new MethodCallRename('Sulu\Component\Localization\Localization', 'isXDefault', 'isDefault'),
36+
new MethodCallRename('Sulu\Component\Security\Event\PermissionUpdateEvent', 'getSecurityIdentity', 'getPermissions'),
37+
],
38+
);
39+
40+
// @see Replacing the RequestParameterTrait: https://github.com/sulu/sulu/pull/7815
41+
$rectorConfig->rule(RequestParameterTraitRector::class);
42+
43+
// @see Manually fixing whereNot -> where: https://github.com/sulu/sulu/pull/7752
44+
$rectorConfig->rule(ListBuilderInterfaceRector::class);
45+
46+
// @see ListRepresentation -> PaginatedRepresentation https://github.com/sulu/sulu/pull/7740
47+
$rectorConfig->rule(PaginatedRepresentationRector::class);
848
};

‎config/sets/sulu/sulu-30.php‎

Lines changed: 23 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -3,46 +3,29 @@
33
declare(strict_types=1);
44

55
use Rector\Config\RectorConfig;
6-
use Rector\Renaming\Rector\MethodCall\RenameMethodRector;
7-
use Rector\Renaming\ValueObject\MethodCallRename;
8-
use Sulu\Rector\Rector\ListBuilderInterfaceRector;
9-
use Sulu\Rector\Rector\PaginatedRepresentationRector;
10-
use Sulu\Rector\Rector\RequestParameterTraitRector;
6+
use Rector\Renaming\Rector\Name\RenameClassRector;
117

128
return static function (RectorConfig $rectorConfig): void {
13-
$rectorConfig->ruleWithConfiguration(
14-
RenameMethodRector::class,
15-
[
16-
// @see Removing old Category functions https://github.com/sulu/sulu/pull/7572
17-
new MethodCallRename(
18-
'Sulu\Bundle\CategoryBundle\Entity\CategoryRepository',
19-
'findByCategoryIds',
20-
'findByCategoriesIds',
21-
),
22-
new MethodCallRename('Sulu\Bundle\CategoryBundle\Entity\Category', 'addChildren', 'addChild'),
23-
new MethodCallRename('Sulu\Bundle\CategoryBundle\Entity\Category', 'removeChildren', 'removeChild'),
24-
25-
new MethodCallRename('Sulu\Bundle\AdminBundle\Admin\View\FormOverlayListViewBuilder', 'setRequestParameters', 'addRequestParameters'),
26-
27-
// @see Removing old ListBuilderInterface functions https://github.com/sulu/sulu/pull/7752
28-
new MethodCallRename('Sulu\Component\Rest\ListBuilder\ListBuilderInterface', 'setFields', 'setSelectFields'),
29-
new MethodCallRename('Sulu\Component\Rest\ListBuilder\ListBuilderInterface', 'addField', 'addSelectField'),
30-
new MethodCallRename('Sulu\Component\Rest\ListBuilder\ListBuilderInterface', 'hasField', 'hasSelectField'),
31-
32-
// @see Deprecating Localization https://github.com/sulu/sulu/pull/7053
33-
new MethodCallRename('Sulu\Component\Webspace\Portal', 'getXDefaultLocalization', 'getDefaultLocalization'),
34-
new MethodCallRename('Sulu\Component\Webspace\Portal', 'setXDefaultLocalization', 'setDefaultLocalization'),
35-
new MethodCallRename('Sulu\Component\Localization\Localization', 'isXDefault', 'isDefault'),
36-
new MethodCallRename('Sulu\Component\Security\Event\PermissionUpdateEvent', 'getSecurityIdentity', 'getPermissions'),
37-
],
38-
);
39-
40-
// @see Replacing the RequestParameterTrait: https://github.com/sulu/sulu/pull/7815
41-
$rectorConfig->rule(RequestParameterTraitRector::class);
42-
43-
// @see Manually fixing whereNot -> where: https://github.com/sulu/sulu/pull/7752
44-
$rectorConfig->rule(ListBuilderInterfaceRector::class);
45-
46-
// @see ListRepresentation -> PaginatedRepresentation https://github.com/sulu/sulu/pull/7740
47-
$rectorConfig->rule(PaginatedRepresentationRector::class);
9+
$classRenames = [
10+
'Sulu\Bundle\RouteBundle\Model\RoutableInterface' => 'Sulu\Bundle\ContentBundle\Content\Domain\Model\RoutableTrait',
11+
];
12+
13+
$modelClasses = [
14+
'ContentRichEntityInterface',
15+
'DimensionContentInterface',
16+
'DimensionContentTrait',
17+
'RoutableInterface',
18+
'TemplateInterface',
19+
'TemplateTrait',
20+
'WorkflowInterface',
21+
'WorkflowTrait',
22+
];
23+
24+
// Content Bundle
25+
foreach ($modelClasses as $modelClass) {
26+
$classRenames['Sulu\\Bundle\\ContentBundle\\Content\\Domain\\Model\\'.$modelClass] = 'Sulu\\Content\\Domain\\Model\\'.$modelClass;
27+
}
28+
29+
// TODO: Add all the renames for bundles here:
30+
$rectorConfig->ruleWithConfiguration(RenameClassRector::class, $classRenames);
4831
};

0 commit comments

Comments
 (0)