IBX-12084: Added Ibexa DXP 6.0 rule set with DeduplicateStamp renamed to Symfony Messenger one

src/contracts/Factory/IbexaRectorConfigFactory.php

@@ -41,7 +41,7 @@ public function createConfig(): RectorConfigBuilder
            ->withSets(
                array_merge(
                    [
-                       IbexaSetList::IBEXA_50->value,
+                       IbexaSetList::IBEXA_60->value,
                        SymfonySetList::SYMFONY_50,
                        SymfonySetList::SYMFONY_50_TYPES,
                        SymfonySetList::SYMFONY_51,

src/contracts/Sets/IbexaSetList.php

@@ -12,4 +12,5 @@ enum IbexaSetList: string
 {
     case IBEXA_46 = __DIR__ . '/ibexa-46.php';
     case IBEXA_50 = __DIR__ . '/ibexa-50.php';
+    case IBEXA_60 = __DIR__ . '/ibexa-60.php';
 }

src/contracts/Sets/ibexa-60.php

@@ -0,0 +1,324 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\Contracts\Rector\Sets;
+
+use Ibexa\Rector\Rule\AddReturnTypeFromParentMethodRule;
+use Ibexa\Rector\Rule\AddReturnTypeFromPhpDocRule;
+use Ibexa\Rector\Rule\ChangeArgumentTypeRector;
+use Ibexa\Rector\Rule\Configuration\ChangeArgumentTypeConfiguration;
+use Ibexa\Rector\Rule\Configuration\MethodReturnTypeConfiguration;
+use Ibexa\Rector\Rule\ConstToEnumValueRector;
+use Ibexa\Rector\Rule\PropertyToGetterRector;
+use Ibexa\Rector\Rule\RemoveArgumentFromMethodCallRector;
+use Rector\Config\RectorConfig;
+use Rector\Renaming\Rector\ClassConstFetch\RenameClassConstFetchRector;
+use Rector\Renaming\Rector\MethodCall\RenameMethodRector;
+use Rector\Renaming\Rector\Name\RenameClassRector;
+use Rector\Renaming\Rector\PropertyFetch\RenamePropertyRector;
+use Rector\Renaming\ValueObject\MethodCallRename;
+use Rector\Renaming\ValueObject\RenameClassAndConstFetch;
+use Rector\Renaming\ValueObject\RenameClassConstFetch;
+use Rector\Renaming\ValueObject\RenameProperty;
+use Rector\Symfony\Symfony62\Rector\MethodCall\SimplifyFormRenderingRector;
+
+return static function (RectorConfig $rectorConfig): void {
+    // List of rector rules to upgrade Ibexa projects to Ibexa DXP 6.0
+    $rectorConfig->ruleWithConfiguration(
+        RenameClassRector::class,
+        [
+            'Ibexa\\Bundle\\Core\\ApiLoader\\RepositoryConfigurationProvider' => 'Ibexa\\Contracts\\Core\\Container\\ApiLoader\\RepositoryConfigurationProviderInterface',
+        ]
+    );
+
+    $rectorConfig->ruleWithConfiguration(
+        RenameClassConstFetchRector::class,
+        [
+            new RenameClassConstFetch(
+                'Ibexa\Bundle\SystemInfo\SystemInfo\Collector\IbexaSystemInfoCollector',
+                'CONTENT_PACKAGES',
+                'HEADLESS_PACKAGES'
+            ),
+            new RenameClassConstFetch(
+                'Ibexa\Bundle\SystemInfo\SystemInfo\Collector\IbexaSystemInfoCollector',
+                'ENTERPRISE_PACKAGES',
+                'HEADLESS_PACKAGES'
+            ),
+        ]
+    );
+
+    $rectorConfig->ruleWithConfiguration(
+        RenamePropertyRector::class,
+        [
+            new RenameProperty(
+                'Ibexa\Bundle\SystemInfo\SystemInfo\Value\IbexaSystemInfo',
+                'stability',
+                'lowestStability',
+            ),
+        ]
+    );
+
+    $rectorConfig->ruleWithConfiguration(
+        RenameMethodRector::class,
+        [
+            new MethodCallRename(
+                'Ibexa\Contracts\Rest\Output\Generator',
+                'generateMediaType',
+                'generateMediaTypeWithVendor'
+            ),
+            new MethodCallRename(
+                'Ibexa\Rest\Output\FieldTypeSerializer',
+                'serializeFieldValue',
+                'serializeContentFieldValue'
+            ),
+        ]
+    );
+
+    $rectorConfig->ruleWithConfiguration(
+        RemoveArgumentFromMethodCallRector::class,
+        [
+            'class_name' => 'Ibexa\Rest\Output\FieldTypeSerializer',
+            'method_name' => 'serializeContentFieldValue',
+            'argument_index_to_remove' => 1,
+            'more_than' => 2,
+        ]
+    );
+
+    $rectorConfig->ruleWithConfiguration(
+        RenameClassConstFetchRector::class,
+        [
+            new RenameClassAndConstFetch(
+                'Ibexa\Bundle\FieldTypePage\DependencyInjection\Compiler\BlockDefinitionConfigurationCompilerPass',
+                'EXTENSION_CONFIG_KEY',
+                'Ibexa\Bundle\FieldTypePage\DependencyInjection\IbexaFieldTypePageExtension',
+                'EXTENSION_NAME'
+            ),
+            new RenameClassAndConstFetch(
+                'Ibexa\Bundle\FieldTypePage\DependencyInjection\Compiler\AbstractConfigurationAwareCompilerPass',
+                'EXTENSION_CONFIG_KEY',
+                'Ibexa\Bundle\FieldTypePage\DependencyInjection\IbexaFieldTypePageExtension',
+                'EXTENSION_NAME'
+            ),
+        ]
+    );
+
+    $rectorConfig->ruleWithConfiguration(
+        PropertyToGetterRector::class,
+        [
+            'Ibexa\Core\MVC\Symfony\Routing\SimplifiedRequest' => [
+                'scheme' => 'getScheme',
+                'host' => 'getHost',
+                'port' => 'getPort',
+                'pathinfo' => 'getPathInfo',
+                'queryParams' => 'getQueryParams',
+                'languages' => 'getLanguages',
+                'headers' => 'getHeaders',
+            ],
+        ]
+    );
+
+    $rectorConfig->ruleWithConfiguration(
+        RenameClassRector::class,
+        [
+            'Ibexa\Cart\Money\MoneyFactory' => 'Ibexa\ProductCatalog\Money\IntlMoneyFactory',
+        ]
+    );
+
+    $rectorConfig->ruleWithConfiguration(
+        RenameClassConstFetchRector::class,
+        [
+            new RenameClassAndConstFetch(
+                'Ibexa\Bundle\SiteFactory\DependencyInjection\Configuration',
+                'TREE_ROOT',
+                'Ibexa\Bundle\SiteFactory\DependencyInjection\IbexaSiteFactoryExtension',
+                'EXTENSION_NAME'
+            ),
+        ]
+    );
+
+    $rectorConfig->ruleWithConfiguration(
+        RenameClassRector::class,
+        [
+            'Ibexa\\Bundle\\Shipping\\Form\\Type\\RegionChoiceType' => 'Ibexa\\Bundle\\ProductCatalog\\Form\\Type\\RegionChoiceType',
+            'Ibexa\\Contracts\\Shipping\\Iterator\\BatchIteratorAdapter\\RegionFetchAdapter' => 'Ibexa\\Contracts\\ProductCatalog\\Iterator\\BatchIteratorAdapter\\RegionFetchAdapter',
+        ],
+    );
+
+    $rectorConfig->ruleWithConfiguration(
+        RenameClassConstFetchRector::class,
+        [
+            new RenameClassAndConstFetch(
+                'Ibexa\Bundle\FormBuilder\DependencyInjection\Configuration',
+                'TREE_ROOT',
+                'Ibexa\Bundle\FormBuilder\DependencyInjection\IbexaFormBuilderExtension',
+                'EXTENSION_NAME'
+            ),
+        ]
+    );
+
+    $rectorConfig->ruleWithConfiguration(
+        RenameClassConstFetchRector::class,
+        [
+            new RenameClassAndConstFetch(
+                'Ibexa\Migration\ValueObject\ContentType\Matcher',
+                'CONTENT_TYPE_IDENTIFIER',
+                'Ibexa\Migration\StepExecutor\ContentType\IdentifierFinder',
+                'CONTENT_TYPE_IDENTIFIER'
+            ),
+        ]
+    );
+
+    $rectorConfig->ruleWithConfiguration(
+        RenameClassRector::class,
+        [
+            'Ibexa\\Solr\\Gateway\\UpdateSerializer' => 'Ibexa\\Solr\\Gateway\\UpdateSerializer\\XmlUpdateSerializer',
+        ]
+    );
+
+    $rectorConfig->ruleWithConfiguration(
+        RenameClassRector::class,
+        [
+            'Ibexa\\Solr\\Query\\Content\\CriterionVisitor\\Field' => 'Ibexa\\Solr\\Query\\Common\\CriterionVisitor\\Field',
+        ]
+    );
+
+    $rectorConfig->ruleWithConfiguration(
+        RenamePropertyRector::class,
+        [
+            new RenameProperty(
+                'Ibexa\Contracts\Core\Repository\Values\Content\Trash\SearchResult',
+                'count',
+                'totalCount',
+            ),
+        ]
+    );
+
+    $rectorConfig->ruleWithConfiguration(
+        RenamePropertyRector::class,
+        [
+            new RenameProperty(
+                'Ibexa\Contracts\Core\Repository\Values\Content\Search\SearchResult',
+                'spellSuggestion',
+                'spellcheck',
+            ),
+        ]
+    );
+
+    $rectorConfig->ruleWithConfiguration(
+        RenameClassRector::class,
+        [
+            'Ibexa\Bundle\Core\Imagine\VariationPathGenerator' => 'Ibexa\Contracts\Core\Variation\VariationPathGenerator',
+        ]
+    );
+
+    $rectorConfig->ruleWithConfiguration(
+        RenameClassRector::class,
+        [
+            'Ibexa\Bundle\Messenger\Stamp\DeduplicateStamp' => 'Symfony\Component\Messenger\Stamp\DeduplicateStamp',
+            'Ibexa\Contracts\Messenger\Stamp\DeduplicateStamp' => 'Symfony\Component\Messenger\Stamp\DeduplicateStamp',
+        ]
+    );
+
+    $rectorConfig->ruleWithConfiguration(PropertyToGetterRector::class, [
+        'Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType' => [
+            'isContainer' => 'isContainer',
+        ],
+    ]);
+
+    $rectorConfig->ruleWithConfiguration(PropertyToGetterRector::class, [
+        'Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeDraft' => [
+            'isContainer' => 'isContainer',
+        ],
+    ]);
+
+    $rectorConfig->ruleWithConfiguration(PropertyToGetterRector::class, [
+        'Ibexa\Core\Repository\Values\ContentType\ContentTypeDraft' => [
+            'isContainer' => 'isContainer',
+        ],
+    ]);
+
+    $rectorConfig->ruleWithConfiguration(
+        ConstToEnumValueRector::class,
+        [
+                'Ibexa\Contracts\Core\Repository\Values\Content\Relation' => [
+                    'enumClass' => 'Ibexa\Contracts\Core\Repository\Values\Content\RelationType',
+                    'constants' => [
+                        'COMMON' => 'COMMON',
+                        'EMBED' => 'EMBED',
+                        'LINK' => 'LINK',
+                        'FIELD' => 'FIELD',
+                        'ASSET' => 'ASSET',
+                    ],
+                ],
+            ]
+    );
+
+    $rectorConfig->ruleWithConfiguration(
+        AddReturnTypeFromPhpDocRule::class,
+        [
+            new MethodReturnTypeConfiguration(
+                'Ibexa\Contracts\Rest\Input\Parser',
+                'parse'
+            ),
+        ]
+    );
+
+    $rectorConfig->ruleWithConfiguration(
+        AddReturnTypeFromParentMethodRule::class,
+        [
+            new MethodReturnTypeConfiguration(
+                'Ibexa\Contracts\Rest\Input\Parser',
+                'parse'
+            ),
+        ]
+    );
+
+    $rectorConfig->ruleWithConfiguration(
+        ChangeArgumentTypeRector::class,
+        [
+            new ChangeArgumentTypeConfiguration(
+                'Ibexa\\Migration\\Generator\\StepBuilder\\StepFactoryInterface',
+                'create',
+                0,
+                'Ibexa\\Contracts\\Core\\Repository\\Values\\ValueObject',
+            ),
+            new ChangeArgumentTypeConfiguration(
+                'Ibexa\\Migration\\Generator\\StepBuilder\\AbstractStepFactory',
+                'prepareLogMessage',
+                0,
+                'Ibexa\\Contracts\\Core\\Repository\\Values\\ValueObject',
+            ),
+            new ChangeArgumentTypeConfiguration(
+                'Ibexa\\Migration\\StepExecutor\\ReferenceDefinition\\ResolverInterface',
+                'resolve',
+                1,
+                'Ibexa\\Contracts\\Core\\Repository\\Values\\ValueObject'
+            ),
+            new ChangeArgumentTypeConfiguration(
+                'Ibexa\\Migration\\Generator\\StepBuilder\\StepBuilderInterface',
+                'build',
+                0,
+                'Ibexa\\Contracts\\Core\\Repository\\Values\\ValueObject'
+            ),
+
+            new ChangeArgumentTypeConfiguration(
+                'Ibexa\\Contracts\\Core\\Limitation\\Type',
+                'evaluate',
+                2,
+                'Ibexa\\Contracts\\Core\\Repository\\Values\\ValueObject'
+            ),
+        ]
+    );
+
+    $rectorConfig->skip(
+        [
+            // skip removing `createView` method call from `Form` objects, per SF 7 recommendation
+            SimplifyFormRenderingRector::class,
+        ]
+    );
+};

tests/contracts/IbexaRectorConfigFactoryTest.php

@@ -40,7 +40,7 @@ public static function getSetsForIbexaConfigFactory(): iterable
     {
         $expectedSetList = [
             // SYMFONY_53 adds this extra set
-            IbexaSetList::IBEXA_50->value,
+            IbexaSetList::IBEXA_60->value,
             SymfonySetList::SYMFONY_50,
             SymfonySetList::SYMFONY_50_TYPES,
             SymfonySetList::SYMFONY_51,

tests/lib/Sets/Ibexa60/Fixture/cart_money_factory.php.inc

@@ -0,0 +1,43 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ReplaceCartMoneyFactoryRector\Fixture;
+
+use Ibexa\Cart\Money\MoneyFactory;
+
+readonly class Foo
+{
+    private MoneyFactory $moneyFactory;
+
+    public function __construct(MoneyFactory $moneyFactory)
+    {
+        $this->moneyFactory = $moneyFactory;
+    }
+
+    public function fooBar(MoneyFactory $moneyFactory): void
+    {
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ReplaceCartMoneyFactoryRector\Fixture;
+
+use Ibexa\ProductCatalog\Money\IntlMoneyFactory;
+
+readonly class Foo
+{
+    private IntlMoneyFactory $moneyFactory;
+
+    public function __construct(IntlMoneyFactory $moneyFactory)
+    {
+        $this->moneyFactory = $moneyFactory;
+    }
+
+    public function fooBar(IntlMoneyFactory $moneyFactory): void
+    {
+    }
+}
+
+?>