Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[UpgradeToModular] Remove duplicated classes and correct some wrong namespaces #31

Closed
wants to merge 3 commits into from
+16 −22
Closed

[UpgradeToModular] Remove duplicated classes and correct some wrong namespaces #31

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b792426
Remove duplicated classes and correct some wrong namespaces
TheMilek Jan 30, 2025
7a61ada
Tests fix
TheMilek Jan 30, 2025
d69e93e
Change duplicated keys to point to integration namespaces
TheMilek Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions config/sets/sylius/plus/up-to-plus-modular.php
View file
Original file line number Diff line number Diff line change
@@ -12,13 +12,12 @@
'Sylius\Plus\Controller\DashboardController' => 'Sylius\MultiStorePlugin\ChannelAdmin\Infrastructure\Controller\DashboardController',
'Sylius\Plus\Entity\LastLoginIpAwareInterface' => 'Sylius\MultiStorePlugin\ChannelAdmin\Domain\Model\LastLoginIpAwareInterface',
'Sylius\Plus\Entity\LastLoginIpAwareTrait' => 'Sylius\MultiStorePlugin\ChannelAdmin\Domain\Model\LastLoginIpAwareTrait',
'Sylius\Plus\Factory\VariantsQuantityMapFactory' => 'Sylius\MultiSourceInventoryPlugin\Integration\CustomerService\Factory\VariantsQuantityMapFactory',
'Sylius\Plus\Factory\VariantsQuantityMapFactoryInterface' => 'Sylius\MultiSourceInventoryPlugin\Integration\CustomerService\Factory\VariantsQuantityMapFactoryInterface',
'Sylius\Plus\Inventory\Infrastructure\Ui\SplitShipmentAction' => 'Sylius\MultiSourceInventoryPlugin\Integration\CustomerService\Action\SplitShipmentAction',
'Sylius\Plus\Factory\VariantsQuantityMapFactory' => 'Sylius\MultiSourceInventoryPlugin\Application\Factory\VariantsQuantityMapFactory',
'Sylius\Plus\Factory\VariantsQuantityMapFactoryInterface' => 'Sylius\MultiSourceInventoryPlugin\Application\Factory\VariantsQuantityMapFactoryInterface',
'Sylius\Plus\Inventory\Infrastructure\Ui\SplitShipmentAction' => 'Sylius\CustomerServicePlugin\PartialShipment\Infrastructure\Ui\Admin\SplitShipmentAction',
'Sylius\Plus\Inventory\Infrastructure\Validator\StockSufficientForInventorySource' => 'Sylius\MultiSourceInventoryPlugin\Integration\CustomerService\Validator\StockSufficientForInventorySource',
'Sylius\Plus\Inventory\Infrastructure\Validator\StockSufficientForInventorySourceValidator' => 'Sylius\MultiSourceInventoryPlugin\Integration\CustomerService\Validator\StockSufficientForInventorySourceValidator',
'Sylius\Plus\Returns\Infrastructure\Ui\Admin\ReturnUnitsToInventoryAction' => 'Sylius\Plus\Ui\Admin\ReturnUnitsToInventoryAction',
'Sylius\Plus\Returns\Infrastructure\Ui\Admin\SelectUnitsToReturnToInventoryAction' => 'Sylius\ReturnPlugin\Infrastructure\Ui\Admin\SelectUnitsToReturnToInventoryAction',
'Sylius\Plus\Returns\Infrastructure\Ui\Admin\SelectUnitsToReturnToInventoryAction' => 'Sylius\MultiSourceInventoryPlugin\Integration\Return\Ui\Admin\SelectUnitsToReturnToInventoryAction',
'Sylius\Plus\SharedKernel\Exception\ResourceNotSupportedException' => 'Sylius\SharedKernel\Exception\ResourceNotSupportedException',
'Sylius\Plus\SharedKernel\ResourceChannelCheckerInterface' => 'Sylius\SharedKernel\Contract\ResourceChannelCheckerInterface',
// autogenerated mapping
@@ -99,8 +98,7 @@
'Sylius\Plus\CustomerPools\Infrastructure\Doctrine\ORM\FindShopUserByUsernameAndCustomerPoolQueryInterface' => 'Sylius\MultiStorePlugin\CustomerPools\Infrastructure\Doctrine\ORM\FindShopUserByUsernameAndCustomerPoolQueryInterface',
'Sylius\Plus\CustomerPools\Infrastructure\Doctrine\ORM\FindShopUserByUsernameAndCustomerPoolQuery' => 'Sylius\MultiStorePlugin\CustomerPools\Infrastructure\Doctrine\ORM\FindShopUserByUsernameAndCustomerPoolQuery',
'Sylius\Plus\CustomerPools\Infrastructure\Menu\AdminMenuListener' => 'Sylius\MultiStorePlugin\CustomerPools\Infrastructure\Menu\AdminMenuListener',
'Sylius\Plus\CustomerPools\Infrastructure\Resolver\CustomerResolverInterface' => 'Sylius\MultiStorePlugin\CustomerPools\Infrastructure\Resolver\CustomerResolverInterface',
'Sylius\Plus\CustomerPools\Infrastructure\Resolver\BaseCustomerResolverInterface' => 'Sylius\MultiStorePlugin\CustomerPools\Infrastructure\Resolver\BaseCustomerResolverInterface',
'Sylius\Plus\CustomerPools\Infrastructure\Resolver\CustomerResolverInterface' => 'Sylius\Bundle\CoreBundle\Resolver\CustomerResolverInterface',
'Sylius\Plus\CustomerPools\Domain\Model\CustomerPoolAwareInterface' => 'Sylius\MultiStorePlugin\CustomerPools\Domain\Model\CustomerPoolAwareInterface',
'Sylius\Plus\CustomerPools\Domain\Model\CustomerPoolInterface' => 'Sylius\MultiStorePlugin\CustomerPools\Domain\Model\CustomerPoolInterface',
'Sylius\Plus\CustomerPools\Domain\Model\CustomerPoolAwareTrait' => 'Sylius\MultiStorePlugin\CustomerPools\Domain\Model\CustomerPoolAwareTrait',
@@ -298,7 +296,6 @@
'Sylius\Plus\Inventory\Application\Resolver\InventorySourceResolverInterface' => 'Sylius\MultiSourceInventoryPlugin\Application\Resolver\InventorySourceResolverInterface',
'Sylius\Plus\Inventory\Application\EventListener\InventorySourceDeletionListener' => 'Sylius\MultiSourceInventoryPlugin\Application\EventListener\InventorySourceDeletionListener',
'Sylius\Plus\Inventory\Application\EventListener\ChannelCreateListener' => 'Sylius\MultiSourceInventoryPlugin\Application\EventListener\ChannelCreateListener',
'Sylius\Plus\Inventory\Infrastructure\Ui\SplitShipmentAction' => 'Sylius\MultiSourceInventoryPlugin\Infrastructure\Ui\SplitShipmentAction',
'Sylius\Plus\Inventory\Infrastructure\Ui\ChangeInventorySourceStockOnHandAction' => 'Sylius\MultiSourceInventoryPlugin\Infrastructure\Ui\ChangeInventorySourceStockOnHandAction',
'Sylius\Plus\Inventory\Infrastructure\Form\Extension\ProductVariantTypeExtension' => 'Sylius\MultiSourceInventoryPlugin\Infrastructure\Form\Extension\ProductVariantTypeExtension',
'Sylius\Plus\Inventory\Infrastructure\Form\Type\InventorySourceStockType' => 'Sylius\MultiSourceInventoryPlugin\Infrastructure\Form\Type\InventorySourceStockType',
@@ -315,9 +312,7 @@
'Sylius\Plus\Inventory\Infrastructure\Validator\NoInventorySourceForTrackedItemUnitsValidator' => 'Sylius\MultiSourceInventoryPlugin\Infrastructure\Validator\NoInventorySourceForTrackedItemUnitsValidator',
'Sylius\Plus\Inventory\Infrastructure\Validator\StockOnHandCannotBeLowerThanOnHoldValidator' => 'Sylius\MultiSourceInventoryPlugin\Infrastructure\Validator\StockOnHandCannotBeLowerThanOnHoldValidator',
'Sylius\Plus\Inventory\Infrastructure\Validator\CartItemAvailabilityValidator' => 'Sylius\MultiSourceInventoryPlugin\Infrastructure\Validator\CartItemAvailabilityValidator',
'Sylius\Plus\Inventory\Infrastructure\Validator\StockSufficientForInventorySource' => 'Sylius\MultiSourceInventoryPlugin\Infrastructure\Validator\StockSufficientForInventorySource',
'Sylius\Plus\Inventory\Infrastructure\Validator\OrderItemClassMetadataLoader' => 'Sylius\MultiSourceInventoryPlugin\Infrastructure\Validator\OrderItemClassMetadataLoader',
'Sylius\Plus\Inventory\Infrastructure\Validator\StockSufficientForInventorySourceValidator' => 'Sylius\MultiSourceInventoryPlugin\Infrastructure\Validator\StockSufficientForInventorySourceValidator',
'Sylius\Plus\Inventory\Infrastructure\Fixture\InventorySourceStockFixture' => 'Sylius\MultiSourceInventoryPlugin\Infrastructure\Fixture\InventorySourceStockFixture',
'Sylius\Plus\Inventory\Infrastructure\Fixture\InventorySourceFixture' => 'Sylius\MultiSourceInventoryPlugin\Infrastructure\Fixture\InventorySourceFixture',
'Sylius\Plus\Inventory\Infrastructure\Fixture\Factory\InventorySourceExampleFactory' => 'Sylius\MultiSourceInventoryPlugin\Infrastructure\Fixture\Factory\InventorySourceExampleFactory',
@@ -453,7 +448,6 @@
'Sylius\Plus\Returns\Infrastructure\Ui\Admin\ReturnReturnedItemsToInventoryAction' => 'Sylius\ReturnPlugin\Infrastructure\Ui\Admin\ReturnReturnedItemsToInventoryAction',
'Sylius\Plus\Returns\Infrastructure\Ui\Admin\MarkReturnRequestUnitsAsReceivedAction' => 'Sylius\ReturnPlugin\Infrastructure\Ui\Admin\MarkReturnRequestUnitsAsReceivedAction',
'Sylius\Plus\Returns\Infrastructure\Ui\Admin\ResolveReturnRequestAction' => 'Sylius\ReturnPlugin\Infrastructure\Ui\Admin\ResolveReturnRequestAction',
'Sylius\Plus\Returns\Infrastructure\Ui\Admin\SelectUnitsToReturnToInventoryAction' => 'Sylius\ReturnPlugin\Infrastructure\Ui\Admin\SelectUnitsToReturnToInventoryAction',
'Sylius\Plus\Returns\Infrastructure\Ui\Admin\CreateReplacementOrderAction' => 'Sylius\ReturnPlugin\Infrastructure\Ui\Admin\CreateReplacementOrderAction',
'Sylius\Plus\Returns\Infrastructure\Ui\Admin\ReturnRateMetricAction' => 'Sylius\ReturnPlugin\Infrastructure\Ui\Admin\ReturnRateMetricAction',
'Sylius\Plus\Returns\Infrastructure\Ui\Admin\ChangeReturnRequestResolutionAction' => 'Sylius\ReturnPlugin\Infrastructure\Ui\Admin\ChangeReturnRequestResolutionAction',
@@ -584,7 +578,7 @@
'Sylius\Plus\ChannelAdmin\Infrastructure\Doctrine\ORM\CustomerListQueryBuilderInterface' => 'Sylius\MultiStorePlugin\ChannelAdmin\Infrastructure\Doctrine\ORM\CustomerListQueryBuilderInterface',
'Sylius\Plus\ChannelAdmin\Infrastructure\Doctrine\ORM\CreateShipmentListQueryBuilderTrait' => 'Sylius\MultiStorePlugin\ChannelAdmin\Infrastructure\Doctrine\ORM\CreateShipmentListQueryBuilderTrait',
'Sylius\Plus\ChannelAdmin\Infrastructure\Doctrine\ORM\InvoiceListQueryBuilder' => 'Sylius\MultiStorePlugin\ChannelAdmin\Infrastructure\Doctrine\ORM\InvoiceListQueryBuilder',
'Sylius\Plus\ChannelAdmin\Infrastructure\Doctrine\ORM\FindProductsByChannelAndPhraseQueryInterface' => 'Sylius\MultiStorePlugin\ChannelAdmin\Infrastructure\Doctrine\ORM\FindProductsByChannelAndPhraseQueryInterface',
'Sylius\Plus\ChannelAdmin\Infrastructure\Doctrine\ORM\FindProductsByChannelAndPhraseQueryInterface' => 'Sylius\LoyaltyPlugin\Infrastructure\Doctrine\ORM\FindProductsByChannelAndPhraseQueryInterface',
'Sylius\Plus\ChannelAdmin\Infrastructure\Doctrine\ORM\CreditMemoListQueryBuilderInterface' => 'Sylius\MultiStorePlugin\ChannelAdmin\Infrastructure\Doctrine\ORM\CreditMemoListQueryBuilderInterface',
'Sylius\Plus\ChannelAdmin\Infrastructure\Doctrine\ORM\FindProductsByChannelAndPhraseQuery' => 'Sylius\MultiStorePlugin\ChannelAdmin\Infrastructure\Doctrine\ORM\FindProductsByChannelAndPhraseQuery',
'Sylius\Plus\ChannelAdmin\Infrastructure\Doctrine\ORM\CreatePaymentListQueryBuilderTrait' => 'Sylius\MultiStorePlugin\ChannelAdmin\Infrastructure\Doctrine\ORM\CreatePaymentListQueryBuilderTrait',
4 changes: 2 additions & 2 deletions ...ass_/AddMethodCallToConstructorForClassesUsingTrait/Fixture/class_with_two_traits.php.inc
View file
Original file line number Diff line number Diff line change
@@ -20,14 +20,14 @@ use Sylius\Component\Core\Model\Channel as BaseChannel;

class Channel extends BaseChannel
{
use \Sylius\MultiStorePlugin\BusinessUnits\Domain\Model\BusinessUnitAwareTrait;
use \Sylius\MultiStorePlugin\CustomerPools\Domain\Model\CustomerPoolAwareTrait;
public function __construct()
{
parent::__construct();
$this->initializeSomething();
$this->initializeSomethingElse();
}
use \Sylius\MultiStorePlugin\BusinessUnits\Domain\Model\BusinessUnitAwareTrait;
use \Sylius\MultiStorePlugin\CustomerPools\Domain\Model\CustomerPoolAwareTrait;
Comment on lines +29 to +30
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are you moving it? Trait calls should be before the constructor

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests are failing otherwise

}

?>
2 changes: 1 addition & 1 deletion .../AddMethodCallToConstructorForClassesUsingTrait/Fixture/class_without_constructor.php.inc
View file
Original file line number Diff line number Diff line change
@@ -19,12 +19,12 @@ use Sylius\Component\Core\Model\Channel as BaseChannel;

class Channel extends BaseChannel
{
use \Sylius\MultiStorePlugin\CustomerPools\Domain\Model\CustomerPoolAwareTrait;
public function __construct()
{
parent::__construct();
$this->initializeSomething();
}
use \Sylius\MultiStorePlugin\CustomerPools\Domain\Model\CustomerPoolAwareTrait;
}

?>
6 changes: 3 additions & 3 deletions ...lus/MultiSourceInventoryPlugin/Fixture/class_extending_core_product_variant_model.php.inc
View file
Original file line number Diff line number Diff line change
@@ -18,14 +18,14 @@ use Sylius\Component\Core\Model\ProductVariant as BaseProductVariant;

class ProductVariant extends BaseProductVariant implements \Sylius\MultiSourceInventoryPlugin\Domain\Model\ProductVariantInterface
{
use \Sylius\MultiSourceInventoryPlugin\Domain\Model\InventorySourceStocksAwareTrait {
__construct as private initializeInventorySourceStocksTrait;
}
public function __construct()
{
parent::__construct();
$this->initializeInventorySourceStocksTrait();
}
use \Sylius\MultiSourceInventoryPlugin\Domain\Model\InventorySourceStocksAwareTrait {
__construct as private initializeInventorySourceStocksTrait;
}
}

?>
8 changes: 4 additions & 4 deletions tests/Set/SyliusPlus/PlusRbacPlugin/Fixture/class_extending_core_admin_user_model.php.inc
View file
Original file line number Diff line number Diff line change
@@ -18,15 +18,15 @@ use Sylius\Component\Core\Model\AdminUser as BaseAdminUser;

class AdminUser extends BaseAdminUser implements \Sylius\PlusRbacPlugin\Domain\Model\AdminUserInterface
{
use \Sylius\PlusRbacPlugin\Domain\Model\RoleableTrait {
__construct as private initializeRoleableTrait;
}
use \Sylius\PlusRbacPlugin\Domain\Model\ToggleablePermissionCheckerTrait;
public function __construct()
{
parent::__construct();
$this->initializeRoleableTrait();
}
use \Sylius\PlusRbacPlugin\Domain\Model\RoleableTrait {
__construct as private initializeRoleableTrait;
}
use \Sylius\PlusRbacPlugin\Domain\Model\ToggleablePermissionCheckerTrait;
}

?>