diff --git a/CHANGELOG.md b/CHANGELOG.md index 89629b15c..e1bc742a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ # 16.0.0 +- [BREAKING] [#94](https://github.com/shopware/SwagMigrationAssistant/pull/94): chore!: check naming consistency across error resolution - [BREAKING] [#38](https://github.com/shopware/SwagMigrationAssistant/pull/38) feat!: add migration logging required fields - [BREAKING] [#40](https://github.com/shopware/SwagMigrationAssistant/pull/40) refactor!: add migration logging optional fields - [BREAKING] [#43](https://github.com/shopware/SwagMigrationAssistant/pull/43) refactor!: migration connection usage @@ -57,7 +58,7 @@ - MIG-1016 - Improves the warnings for different default currency and default language in the data selection. - MIG-1016 - Added new block `{% block swag_migration_confirm_warning_alert %}` in `swag-migration/component/card/swag-migration-confirm-warning/swag-migration-confirm-warning.html.twig`. - MIG-1037 - Fixes a rare issue that in certain situations not all entities are migrated (some were skipped). Was detected during translations of SW5. - + # 13.0.0 - MIG-945 - [BREAKING] Changed method name `getMedia` to `setMedia` in `SwagMigrationAssistant\Profile\Shopware\Converter\PropertyGroupOptionConverter` - MIG-945 - [BREAKING] Removed cli command `migration:migrate` use `migration:start` instead @@ -158,7 +159,7 @@ - MIG-943 - [BREAKING] Rename method in class `\SwagMigrationAssistant\Profile\Shopware\Converter\OrderConverter` from `getCountryTranslation` to `applyCountryTranslation` - MIG-943 - [BREAKING] Rename method in class `\SwagMigrationAssistant\Profile\Shopware\Converter\OrderConverter` from `getCountryStateTranslation` to `applyCountryStateTranslation` - MIG-943 - [BREAKING] Changed thrown exception from `AssociationEntityRequiredMissingException` to `SwagMigrationAssistant\Exception\MigrationException::associationMissing` in method `\SwagMigrationAssistant\Profile\Shopware\Converter\OrderConverter::convert` -- MIG-967, MIG-866 - Improving the migration of order documents +- MIG-967, MIG-866 - Improving the migration of order documents # 10.0.1 - MIG-971 - Fix compatibility with Shopware 6.6.0.x diff --git a/UPGRADE.md b/UPGRADE.md index e3e041e18..595d91e67 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -1,5 +1,8 @@ # 16.0.0 +- [BREAKING] [#94](https://github.com/shopware/SwagMigrationAssistant/pull/94) - chore!: check naming consistency across error resolution + - [BREAKING] Renamed method `hasValidMappingByEntityUuid()` to `hasValidMappingByEntityId()` in `SwagMigrationAssistant\Migration\Mapping\MappingServiceInterface` and implementation `SwagMigrationAssistant\Migration\Mapping\MappingService` + - [BREAKING] [#38](https://github.com/shopware/SwagMigrationAssistant/pull/38) - feat!: add migration logging required fields - [BREAKING] Truncated database entries of `swag_migration_logging` with `SwagMigrationAssistant\Core\Migration\Migration1754896654TruncateMigrationLogs` - [BREAKING] Deleted columns `title`, `description`, `paramenters`, `title_snippet`, `description_snippet`, `entity` and `source_id` from `swag_migration_logging` with `SwagMigrationAssistant\Core\Migration\Migration1754897550AddRequiredFieldsToMigrationLogs` @@ -20,7 +23,7 @@ - extend `SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry` instead of `SwagMigrationAssistant\Migration\Logging\Log\BaseRunLogEntity` - implement `SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogEntry` instead of `SwagMigrationAssistant\Migration\Logging\Log\LogEntryInterface` - mark class readonly - - [BREAKING] Renamed log classes to include `Log` suffix + - [BREAKING] Renamed log classes to include `Log` suffix - `SwagMigrationAssistant\Migration\Logging\LogCannotConvertChildEntity`, - `SwagMigrationAssistant\Migration\Logging\LogCannotConvertEntity`, - `SwagMigrationAssistant\Migration\Logging\LogDocumentTypeNotSupported`, diff --git a/src/Core/Field/AnyJsonField.php b/src/Core/Field/AnyJsonField.php index 02221bd3a..a6c8de7bd 100644 --- a/src/Core/Field/AnyJsonField.php +++ b/src/Core/Field/AnyJsonField.php @@ -19,7 +19,7 @@ * * @internal */ -#[Package('after-sales')] +#[Package('fundamentals@after-sales')] class AnyJsonField extends Field implements StorageAware { public function __construct( diff --git a/src/Core/Field/AnyJsonFieldSerializer.php b/src/Core/Field/AnyJsonFieldSerializer.php index b6790b477..88e9b2096 100644 --- a/src/Core/Field/AnyJsonFieldSerializer.php +++ b/src/Core/Field/AnyJsonFieldSerializer.php @@ -19,7 +19,7 @@ /** * @internal */ -#[Package('after-sales')] +#[Package('fundamentals@after-sales')] class AnyJsonFieldSerializer extends AbstractFieldSerializer { public function encode(Field $field, EntityExistence $existence, KeyValuePair $data, WriteParameterBag $parameters): \Generator diff --git a/src/Core/Migration/Migration1762346793RenameColumnOfMappingTable.php b/src/Core/Migration/Migration1762346793RenameColumnOfMappingTable.php index e95c7126b..7466fce56 100644 --- a/src/Core/Migration/Migration1762346793RenameColumnOfMappingTable.php +++ b/src/Core/Migration/Migration1762346793RenameColumnOfMappingTable.php @@ -15,7 +15,7 @@ /** * @internal */ -#[Package('after-sales')] +#[Package('fundamentals@after-sales')] class Migration1762346793RenameColumnOfMappingTable extends MigrationStep { use ColumnExistsTrait; diff --git a/src/DependencyInjection/entity.xml b/src/DependencyInjection/entity.xml index 839b94e62..170b23118 100644 --- a/src/DependencyInjection/entity.xml +++ b/src/DependencyInjection/entity.xml @@ -46,7 +46,7 @@ - + @@ -56,6 +56,5 @@ - diff --git a/src/DependencyInjection/migration.xml b/src/DependencyInjection/migration.xml index f1532c5f8..22f83d773 100644 --- a/src/DependencyInjection/migration.xml +++ b/src/DependencyInjection/migration.xml @@ -225,7 +225,7 @@ - + @@ -236,7 +236,7 @@ - + @@ -416,7 +416,7 @@ id="SwagMigrationAssistant\Core\Content\Product\Stock\StockStorageDecorator.inner"/> - + diff --git a/src/DependencyInjection/writer.xml b/src/DependencyInjection/writer.xml index 1a251bcd6..4513f1d3d 100644 --- a/src/DependencyInjection/writer.xml +++ b/src/DependencyInjection/writer.xml @@ -224,7 +224,7 @@ - + diff --git a/src/Migration/MigrationFix/SwagMigrationFixCollection.php b/src/Migration/ErrorResolution/Entity/SwagMigrationFixCollection.php similarity index 83% rename from src/Migration/MigrationFix/SwagMigrationFixCollection.php rename to src/Migration/ErrorResolution/Entity/SwagMigrationFixCollection.php index f83035768..70b0f2fc3 100644 --- a/src/Migration/MigrationFix/SwagMigrationFixCollection.php +++ b/src/Migration/ErrorResolution/Entity/SwagMigrationFixCollection.php @@ -5,7 +5,7 @@ * file that was distributed with this source code. */ -namespace SwagMigrationAssistant\Migration\MigrationFix; +namespace SwagMigrationAssistant\Migration\ErrorResolution\Entity; use Shopware\Core\Framework\DataAbstractionLayer\EntityCollection; use Shopware\Core\Framework\Log\Package; @@ -13,7 +13,7 @@ /** * @extends EntityCollection */ -#[Package('after-sales')] +#[Package('fundamentals@after-sales')] class SwagMigrationFixCollection extends EntityCollection { protected function getExpectedClass(): string diff --git a/src/Migration/MigrationFix/SwagMigrationFixDefinition.php b/src/Migration/ErrorResolution/Entity/SwagMigrationFixDefinition.php similarity index 94% rename from src/Migration/MigrationFix/SwagMigrationFixDefinition.php rename to src/Migration/ErrorResolution/Entity/SwagMigrationFixDefinition.php index 9458721e5..d0f2ff340 100644 --- a/src/Migration/MigrationFix/SwagMigrationFixDefinition.php +++ b/src/Migration/ErrorResolution/Entity/SwagMigrationFixDefinition.php @@ -5,7 +5,7 @@ * file that was distributed with this source code. */ -namespace SwagMigrationAssistant\Migration\MigrationFix; +namespace SwagMigrationAssistant\Migration\ErrorResolution\Entity; use Shopware\Core\Framework\DataAbstractionLayer\EntityDefinition; use Shopware\Core\Framework\DataAbstractionLayer\Field\CreatedAtField; @@ -18,7 +18,7 @@ use Shopware\Core\Framework\Log\Package; use SwagMigrationAssistant\Core\Field\AnyJsonField; -#[Package('after-sales')] +#[Package('fundamentals@after-sales')] class SwagMigrationFixDefinition extends EntityDefinition { public const ENTITY_NAME = 'swag_migration_fix'; diff --git a/src/Migration/MigrationFix/SwagMigrationFixEntity.php b/src/Migration/ErrorResolution/Entity/SwagMigrationFixEntity.php similarity index 93% rename from src/Migration/MigrationFix/SwagMigrationFixEntity.php rename to src/Migration/ErrorResolution/Entity/SwagMigrationFixEntity.php index b1aea9275..71b3e991c 100644 --- a/src/Migration/MigrationFix/SwagMigrationFixEntity.php +++ b/src/Migration/ErrorResolution/Entity/SwagMigrationFixEntity.php @@ -5,13 +5,13 @@ * file that was distributed with this source code. */ -namespace SwagMigrationAssistant\Migration\MigrationFix; +namespace SwagMigrationAssistant\Migration\ErrorResolution\Entity; use Shopware\Core\Framework\DataAbstractionLayer\Entity; use Shopware\Core\Framework\DataAbstractionLayer\EntityIdTrait; use Shopware\Core\Framework\Log\Package; -#[Package('after-sales')] +#[Package('fundamentals@after-sales')] class SwagMigrationFixEntity extends Entity { use EntityIdTrait; diff --git a/src/Migration/Writer/MigrationFix/MigrationFixApplier.php b/src/Migration/ErrorResolution/MigrationErrorResolutionService.php similarity index 91% rename from src/Migration/Writer/MigrationFix/MigrationFixApplier.php rename to src/Migration/ErrorResolution/MigrationErrorResolutionService.php index f526cefc8..b066b78bf 100644 --- a/src/Migration/Writer/MigrationFix/MigrationFixApplier.php +++ b/src/Migration/ErrorResolution/MigrationErrorResolutionService.php @@ -5,15 +5,15 @@ * file that was distributed with this source code. */ -namespace SwagMigrationAssistant\Migration\Writer\MigrationFix; +namespace SwagMigrationAssistant\Migration\ErrorResolution; use Doctrine\DBAL\ArrayParameterType; use Doctrine\DBAL\Connection; use Shopware\Core\Framework\Log\Package; use Shopware\Core\Framework\Uuid\Uuid; -#[Package('after-sales')] -class MigrationFixApplier +#[Package('fundamentals@after-sales')] +class MigrationErrorResolutionService { public function __construct( private readonly Connection $connection, @@ -23,7 +23,7 @@ public function __construct( /** * @param array> $data */ - public function apply(array &$data, string $connectionId, string $runId): void + public function applyFixes(array &$data, string $connectionId, string $runId): void { $itemIds = \array_column($data, 'id'); $fixes = $this->getFixes($itemIds, $connectionId, $runId); diff --git a/src/Migration/Writer/MigrationFix/MigrationFix.php b/src/Migration/ErrorResolution/MigrationFix.php similarity index 96% rename from src/Migration/Writer/MigrationFix/MigrationFix.php rename to src/Migration/ErrorResolution/MigrationFix.php index a80c50c27..1707531e2 100644 --- a/src/Migration/Writer/MigrationFix/MigrationFix.php +++ b/src/Migration/ErrorResolution/MigrationFix.php @@ -5,13 +5,13 @@ * file that was distributed with this source code. */ -namespace SwagMigrationAssistant\Migration\Writer\MigrationFix; +namespace SwagMigrationAssistant\Migration\ErrorResolution; use Shopware\Core\Framework\Log\Package; use Shopware\Core\Framework\Uuid\Uuid; use SwagMigrationAssistant\Exception\MigrationException; -#[Package('after-sales')] +#[Package('fundamentals@after-sales')] class MigrationFix { private const PATH_SEPARATOR = '.'; diff --git a/src/Migration/Logging/Log/AssociationRequiredMissingLog.php b/src/Migration/Logging/Log/AssociationRequiredMissingLog.php index 5564f8d63..608c5961f 100644 --- a/src/Migration/Logging/Log/AssociationRequiredMissingLog.php +++ b/src/Migration/Logging/Log/AssociationRequiredMissingLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Migration\Logging\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class AssociationRequiredMissingLog extends AbstractSwagMigrationLogEntry +readonly class AssociationRequiredMissingLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Migration/Logging/Log/Builder/AbstractSwagMigrationLogEntry.php b/src/Migration/Logging/Log/Builder/AbstractMigrationLogEntry.php similarity index 96% rename from src/Migration/Logging/Log/Builder/AbstractSwagMigrationLogEntry.php rename to src/Migration/Logging/Log/Builder/AbstractMigrationLogEntry.php index d40fa146d..c013a93bf 100644 --- a/src/Migration/Logging/Log/Builder/AbstractSwagMigrationLogEntry.php +++ b/src/Migration/Logging/Log/Builder/AbstractMigrationLogEntry.php @@ -10,7 +10,7 @@ use Shopware\Core\Framework\Log\Package; #[Package('fundamentals@after-sales')] -abstract readonly class AbstractSwagMigrationLogEntry implements SwagMigrationLogEntry +abstract readonly class AbstractMigrationLogEntry implements MigrationLogEntry { final public const LOG_LEVEL_INFO = 'info'; final public const LOG_LEVEL_WARNING = 'warning'; diff --git a/src/Migration/Logging/Log/Builder/SwagMigrationLogBuilder.php b/src/Migration/Logging/Log/Builder/MigrationLogBuilder.php similarity index 92% rename from src/Migration/Logging/Log/Builder/SwagMigrationLogBuilder.php rename to src/Migration/Logging/Log/Builder/MigrationLogBuilder.php index 7f847ca4f..1f59f2260 100644 --- a/src/Migration/Logging/Log/Builder/SwagMigrationLogBuilder.php +++ b/src/Migration/Logging/Log/Builder/MigrationLogBuilder.php @@ -14,13 +14,13 @@ /** * @example - * $log = (new SwagMigrationLogBuilder('runId', 'profileName', 'gatewayName')) + * $log = (new MigrationLogBuilder('runId', 'profileName', 'gatewayName')) * ->withField('fieldName') * ->withFieldSourcePath('sourcePath') - * ->build(SwagMigrationLogEntry::class); + * ->build(MigrationLogEntry::class); */ #[Package('fundamentals@after-sales')] -class SwagMigrationLogBuilder +class MigrationLogBuilder { /** * @param array|null $sourceData @@ -117,15 +117,15 @@ public function withExceptionTrace(array $exceptionTrace): self } /** - * @template T of AbstractSwagMigrationLogEntry + * @template T of AbstractMigrationLogEntry * * @param class-string $logClass * * @return T */ - public function build(string $logClass): AbstractSwagMigrationLogEntry + public function build(string $logClass): AbstractMigrationLogEntry { - if (!class_exists($logClass) || !is_subclass_of($logClass, AbstractSwagMigrationLogEntry::class)) { + if (!class_exists($logClass) || !is_subclass_of($logClass, AbstractMigrationLogEntry::class)) { throw MigrationException::failedToCreateMigrationLog($logClass); } diff --git a/src/Migration/Logging/Log/Builder/SwagMigrationLogEntry.php b/src/Migration/Logging/Log/Builder/MigrationLogEntry.php similarity index 97% rename from src/Migration/Logging/Log/Builder/SwagMigrationLogEntry.php rename to src/Migration/Logging/Log/Builder/MigrationLogEntry.php index 45cd757ec..38794af7e 100644 --- a/src/Migration/Logging/Log/Builder/SwagMigrationLogEntry.php +++ b/src/Migration/Logging/Log/Builder/MigrationLogEntry.php @@ -10,7 +10,7 @@ use Shopware\Core\Framework\Log\Package; #[Package('fundamentals@after-sales')] -interface SwagMigrationLogEntry +interface MigrationLogEntry { public function getRunId(): string; diff --git a/src/Migration/Logging/Log/CannotConvertChildEntityLog.php b/src/Migration/Logging/Log/CannotConvertChildEntityLog.php index 22b8de24e..c97f8a621 100644 --- a/src/Migration/Logging/Log/CannotConvertChildEntityLog.php +++ b/src/Migration/Logging/Log/CannotConvertChildEntityLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Migration\Logging\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class CannotConvertChildEntityLog extends AbstractSwagMigrationLogEntry +readonly class CannotConvertChildEntityLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Migration/Logging/Log/CannotConvertEntityLog.php b/src/Migration/Logging/Log/CannotConvertEntityLog.php index 71054371b..59b335aad 100644 --- a/src/Migration/Logging/Log/CannotConvertEntityLog.php +++ b/src/Migration/Logging/Log/CannotConvertEntityLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Migration\Logging\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class CannotConvertEntityLog extends AbstractSwagMigrationLogEntry +readonly class CannotConvertEntityLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Migration/Logging/Log/CannotGetFileRunLog.php b/src/Migration/Logging/Log/CannotGetFileRunLog.php index c78fac63e..06fc4a512 100644 --- a/src/Migration/Logging/Log/CannotGetFileRunLog.php +++ b/src/Migration/Logging/Log/CannotGetFileRunLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Migration\Logging\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class CannotGetFileRunLog extends AbstractSwagMigrationLogEntry +readonly class CannotGetFileRunLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Migration/Logging/Log/CannotReadEntityCountLog.php b/src/Migration/Logging/Log/CannotReadEntityCountLog.php index 8d3c46b1b..70cd3af77 100644 --- a/src/Migration/Logging/Log/CannotReadEntityCountLog.php +++ b/src/Migration/Logging/Log/CannotReadEntityCountLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Migration\Logging\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class CannotReadEntityCountLog extends AbstractSwagMigrationLogEntry +readonly class CannotReadEntityCountLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Migration/Logging/Log/DataSetNotFoundLog.php b/src/Migration/Logging/Log/DataSetNotFoundLog.php index 571508d0d..72b4bc6f1 100644 --- a/src/Migration/Logging/Log/DataSetNotFoundLog.php +++ b/src/Migration/Logging/Log/DataSetNotFoundLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Migration\Logging\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class DataSetNotFoundLog extends AbstractSwagMigrationLogEntry +readonly class DataSetNotFoundLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Migration/Logging/Log/DebugLog.php b/src/Migration/Logging/Log/DebugLog.php index 1c8437394..758c090c3 100644 --- a/src/Migration/Logging/Log/DebugLog.php +++ b/src/Migration/Logging/Log/DebugLog.php @@ -8,11 +8,11 @@ namespace SwagMigrationAssistant\Migration\Logging\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class DebugLog implements SwagMigrationLogEntry +readonly class DebugLog implements MigrationLogEntry { /** * @param array $logData @@ -53,7 +53,7 @@ public function getGatewayName(): string public function getLevel(): string { - return AbstractSwagMigrationLogEntry::LOG_LEVEL_DEBUG; + return AbstractMigrationLogEntry::LOG_LEVEL_DEBUG; } public function getCode(): string diff --git a/src/Migration/Logging/Log/DocumentTypeNotSupportedLog.php b/src/Migration/Logging/Log/DocumentTypeNotSupportedLog.php index 9cfa80238..6eed88c34 100644 --- a/src/Migration/Logging/Log/DocumentTypeNotSupportedLog.php +++ b/src/Migration/Logging/Log/DocumentTypeNotSupportedLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Migration\Logging\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class DocumentTypeNotSupportedLog extends AbstractSwagMigrationLogEntry +readonly class DocumentTypeNotSupportedLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Migration/Logging/Log/EmptyNecessaryFieldRunLog.php b/src/Migration/Logging/Log/EmptyNecessaryFieldRunLog.php index da0cdbaba..0115a2383 100644 --- a/src/Migration/Logging/Log/EmptyNecessaryFieldRunLog.php +++ b/src/Migration/Logging/Log/EmptyNecessaryFieldRunLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Migration\Logging\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class EmptyNecessaryFieldRunLog extends AbstractSwagMigrationLogEntry +readonly class EmptyNecessaryFieldRunLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Migration/Logging/Log/EntityAlreadyExistsRunLog.php b/src/Migration/Logging/Log/EntityAlreadyExistsRunLog.php index dd5bd17e2..b83b49153 100644 --- a/src/Migration/Logging/Log/EntityAlreadyExistsRunLog.php +++ b/src/Migration/Logging/Log/EntityAlreadyExistsRunLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Migration\Logging\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class EntityAlreadyExistsRunLog extends AbstractSwagMigrationLogEntry +readonly class EntityAlreadyExistsRunLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Migration/Logging/Log/ExceptionRunLog.php b/src/Migration/Logging/Log/ExceptionRunLog.php index 8932be88c..1576d4464 100644 --- a/src/Migration/Logging/Log/ExceptionRunLog.php +++ b/src/Migration/Logging/Log/ExceptionRunLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Migration\Logging\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class ExceptionRunLog extends AbstractSwagMigrationLogEntry +readonly class ExceptionRunLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Migration/Logging/Log/FieldReassignedRunLog.php b/src/Migration/Logging/Log/FieldReassignedRunLog.php index 8c1c8adb8..2e0b91d87 100644 --- a/src/Migration/Logging/Log/FieldReassignedRunLog.php +++ b/src/Migration/Logging/Log/FieldReassignedRunLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Migration\Logging\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class FieldReassignedRunLog extends AbstractSwagMigrationLogEntry +readonly class FieldReassignedRunLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Migration/Logging/Log/InvalidUnserializedDataLog.php b/src/Migration/Logging/Log/InvalidUnserializedDataLog.php index 9aaa34237..ac366a2b8 100644 --- a/src/Migration/Logging/Log/InvalidUnserializedDataLog.php +++ b/src/Migration/Logging/Log/InvalidUnserializedDataLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Migration\Logging\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class InvalidUnserializedDataLog extends AbstractSwagMigrationLogEntry +readonly class InvalidUnserializedDataLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Migration/Logging/Log/MessageQueueExceptionLog.php b/src/Migration/Logging/Log/MessageQueueExceptionLog.php index 8114a114f..bb28b1109 100644 --- a/src/Migration/Logging/Log/MessageQueueExceptionLog.php +++ b/src/Migration/Logging/Log/MessageQueueExceptionLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Migration\Logging\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class MessageQueueExceptionLog extends AbstractSwagMigrationLogEntry +readonly class MessageQueueExceptionLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Migration/Logging/Log/MimeTypeErrorLog.php b/src/Migration/Logging/Log/MimeTypeErrorLog.php index a3a14389f..ba02236ae 100644 --- a/src/Migration/Logging/Log/MimeTypeErrorLog.php +++ b/src/Migration/Logging/Log/MimeTypeErrorLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Migration\Logging\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class MimeTypeErrorLog extends AbstractSwagMigrationLogEntry +readonly class MimeTypeErrorLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Migration/Logging/Log/ProcessorNotFoundLog.php b/src/Migration/Logging/Log/ProcessorNotFoundLog.php index f91ebb880..13f953088 100644 --- a/src/Migration/Logging/Log/ProcessorNotFoundLog.php +++ b/src/Migration/Logging/Log/ProcessorNotFoundLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Migration\Logging\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class ProcessorNotFoundLog extends AbstractSwagMigrationLogEntry +readonly class ProcessorNotFoundLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Migration/Logging/Log/RunAbortedAutomaticallyLog.php b/src/Migration/Logging/Log/RunAbortedAutomaticallyLog.php index d8f293c93..1f164b736 100644 --- a/src/Migration/Logging/Log/RunAbortedAutomaticallyLog.php +++ b/src/Migration/Logging/Log/RunAbortedAutomaticallyLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Migration\Logging\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class RunAbortedAutomaticallyLog extends AbstractSwagMigrationLogEntry +readonly class RunAbortedAutomaticallyLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Migration/Logging/Log/TemporaryFileErrorLog.php b/src/Migration/Logging/Log/TemporaryFileErrorLog.php index 3eeb34747..e24c66b08 100644 --- a/src/Migration/Logging/Log/TemporaryFileErrorLog.php +++ b/src/Migration/Logging/Log/TemporaryFileErrorLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Migration\Logging\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class TemporaryFileErrorLog extends AbstractSwagMigrationLogEntry +readonly class TemporaryFileErrorLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Migration/Logging/Log/ThemeCompilingErrorRunLog.php b/src/Migration/Logging/Log/ThemeCompilingErrorRunLog.php index e61ab9dcd..751a30e82 100644 --- a/src/Migration/Logging/Log/ThemeCompilingErrorRunLog.php +++ b/src/Migration/Logging/Log/ThemeCompilingErrorRunLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Migration\Logging\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class ThemeCompilingErrorRunLog extends AbstractSwagMigrationLogEntry +readonly class ThemeCompilingErrorRunLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Migration/Logging/Log/UnknownEntityLog.php b/src/Migration/Logging/Log/UnknownEntityLog.php index 8a314a77a..a8de064e2 100644 --- a/src/Migration/Logging/Log/UnknownEntityLog.php +++ b/src/Migration/Logging/Log/UnknownEntityLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Migration\Logging\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class UnknownEntityLog extends AbstractSwagMigrationLogEntry +readonly class UnknownEntityLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Migration/Logging/Log/UnsupportedObjectTypeLog.php b/src/Migration/Logging/Log/UnsupportedObjectTypeLog.php index c4e512896..1c56bb373 100644 --- a/src/Migration/Logging/Log/UnsupportedObjectTypeLog.php +++ b/src/Migration/Logging/Log/UnsupportedObjectTypeLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Migration\Logging\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class UnsupportedObjectTypeLog extends AbstractSwagMigrationLogEntry +readonly class UnsupportedObjectTypeLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Migration/Logging/Log/WriteExceptionRunLog.php b/src/Migration/Logging/Log/WriteExceptionRunLog.php index 8cd1de217..b3bded60c 100644 --- a/src/Migration/Logging/Log/WriteExceptionRunLog.php +++ b/src/Migration/Logging/Log/WriteExceptionRunLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Migration\Logging\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class WriteExceptionRunLog extends AbstractSwagMigrationLogEntry +readonly class WriteExceptionRunLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Migration/Logging/LoggingService.php b/src/Migration/Logging/LoggingService.php index 1b26703d9..f1c22709a 100644 --- a/src/Migration/Logging/LoggingService.php +++ b/src/Migration/Logging/LoggingService.php @@ -11,7 +11,7 @@ use Shopware\Core\Framework\Context; use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogEntry; #[Package('fundamentals@after-sales')] class LoggingService implements LoggingServiceInterface @@ -51,7 +51,7 @@ public function saveLogging(Context $context): void } } - public function addLogEntry(SwagMigrationLogEntry $logEntry): void + public function addLogEntry(MigrationLogEntry $logEntry): void { $this->logging[] = [ 'runId' => $logEntry->getRunId(), @@ -73,7 +73,7 @@ public function addLogEntry(SwagMigrationLogEntry $logEntry): void /** * @param array $keys - * @param callable(array-key $key, mixed|null $value): SwagMigrationLogEntry $callback + * @param callable(array-key $key, mixed|null $value): MigrationLogEntry $callback */ public function addLogForEach(array $keys, callable $callback): void { diff --git a/src/Migration/Logging/LoggingServiceInterface.php b/src/Migration/Logging/LoggingServiceInterface.php index 34d9a7f23..26c30301c 100644 --- a/src/Migration/Logging/LoggingServiceInterface.php +++ b/src/Migration/Logging/LoggingServiceInterface.php @@ -9,16 +9,16 @@ use Shopware\Core\Framework\Context; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogEntry; #[Package('fundamentals@after-sales')] interface LoggingServiceInterface { - public function addLogEntry(SwagMigrationLogEntry $logEntry): void; + public function addLogEntry(MigrationLogEntry $logEntry): void; /** * @param array $keys - * @param callable(array-key $key, mixed|null $value): SwagMigrationLogEntry $callback + * @param callable(array-key $key, mixed|null $value): MigrationLogEntry $callback */ public function addLogForEach(array $keys, callable $callback): void; diff --git a/src/Migration/Mapping/MappingService.php b/src/Migration/Mapping/MappingService.php index fd49679ed..d84ab7b04 100644 --- a/src/Migration/Mapping/MappingService.php +++ b/src/Migration/Mapping/MappingService.php @@ -214,7 +214,7 @@ public function getMappings(string $connectionId, string $entityName, array $ids return $this->migrationMappingRepo->search($criteria, $context); } - public function hasValidMappingByEntityUuid(string $connectionId, string $entityName, string $entityId, Context $context): bool + public function hasValidMappingByEntityId(string $connectionId, string $entityName, string $entityId, Context $context): bool { $criteria = new Criteria(); $criteria->addFilter( diff --git a/src/Migration/Mapping/MappingServiceInterface.php b/src/Migration/Mapping/MappingServiceInterface.php index 2679c5196..20dd09660 100644 --- a/src/Migration/Mapping/MappingServiceInterface.php +++ b/src/Migration/Mapping/MappingServiceInterface.php @@ -84,7 +84,7 @@ public function writeMapping(): void; */ public function getMappings(string $connectionId, string $entityName, array $ids, Context $context): EntitySearchResult; - public function hasValidMappingByEntityUuid(string $connectionId, string $entityName, string $entityId, Context $context): bool; + public function hasValidMappingByEntityId(string $connectionId, string $entityName, string $entityId, Context $context): bool; public function preloadMappings(array $mappingIds, Context $context): void; } diff --git a/src/Migration/Media/Processor/HttpDownloadServiceBase.php b/src/Migration/Media/Processor/HttpDownloadServiceBase.php index 26ab75eba..224858cf7 100644 --- a/src/Migration/Media/Processor/HttpDownloadServiceBase.php +++ b/src/Migration/Media/Processor/HttpDownloadServiceBase.php @@ -24,7 +24,7 @@ use Shopware\Core\Framework\Uuid\Uuid; use SwagMigrationAssistant\Exception\MigrationException; use SwagMigrationAssistant\Migration\Gateway\HttpClientInterface; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\Log\CannotGetFileRunLog; use SwagMigrationAssistant\Migration\Logging\Log\ExceptionRunLog; use SwagMigrationAssistant\Migration\Logging\Log\TemporaryFileErrorLog; @@ -79,7 +79,7 @@ public function process(MigrationContextInterface $migrationContext, Context $co $exception = new \Exception('Http download client can not be constructed.'); $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withExceptionMessage($exception->getMessage()) ->withExceptionTrace($exception->getTrace()) ->withEntityName(MediaDefinition::ENTITY_NAME) @@ -125,7 +125,7 @@ function (MediaProcessWorkloadStruct $work) use ($uuid) { $work->setState(MediaProcessWorkloadStruct::ERROR_STATE); $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(MediaDefinition::ENTITY_NAME) ->withEntityId($uuid) ->build(CannotGetFileRunLog::class) @@ -146,7 +146,7 @@ function (MediaProcessWorkloadStruct $work) use ($uuid) { $work->setState(MediaProcessWorkloadStruct::ERROR_STATE); $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(MediaDefinition::ENTITY_NAME) ->withEntityId($uuid) ->build(TemporaryFileErrorLog::class) @@ -188,7 +188,7 @@ function (MediaProcessWorkloadStruct $work) use ($uuid) { $failureUuids[] = $uuid; $work->setState(MediaProcessWorkloadStruct::ERROR_STATE); $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withExceptionMessage($e->getMessage()) ->withExceptionTrace($e->getTrace()) ->withEntityName(MediaDefinition::ENTITY_NAME) @@ -288,7 +288,7 @@ private function doNormalDownloadRequest(MigrationContextInterface $migrationCon } catch (\Throwable $exception) { // this should never happen because of Promises, but just in case something is wrong with request construction $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withExceptionMessage($exception->getMessage()) ->withExceptionTrace($exception->getTrace()) ->withEntityName(MediaDefinition::ENTITY_NAME) @@ -312,7 +312,7 @@ private function persistFileToMedia(string $filePath, string $uuid, string $name $exception = new \Exception('Downloaded file is empty or could not determine mime type.'); $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withExceptionMessage($exception->getMessage()) ->withExceptionTrace($exception->getTrace()) ->withEntityName(MediaDefinition::ENTITY_NAME) @@ -348,7 +348,7 @@ private function persistFileToMedia(string $filePath, string $uuid, string $name $this->fileSaver->persistFileToMedia($mediaFile, Uuid::randomHex(), $uuid, $context); } else { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withExceptionMessage($mediaException->getMessage()) ->withExceptionTrace($mediaException->getTrace()) ->withEntityName(MediaDefinition::ENTITY_NAME) diff --git a/src/Migration/MessageQueue/Handler/ProcessMediaHandler.php b/src/Migration/MessageQueue/Handler/ProcessMediaHandler.php index d6d96533d..5702b5349 100644 --- a/src/Migration/MessageQueue/Handler/ProcessMediaHandler.php +++ b/src/Migration/MessageQueue/Handler/ProcessMediaHandler.php @@ -14,7 +14,7 @@ use Shopware\Core\Framework\Log\Package; use SwagMigrationAssistant\Exception\MigrationException; use SwagMigrationAssistant\Exception\NoConnectionFoundException; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\Log\ExceptionRunLog; use SwagMigrationAssistant\Migration\Logging\Log\ProcessorNotFoundLog; use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface; @@ -87,7 +87,7 @@ public function __invoke(ProcessMediaMessage $message): void $this->processFailures($context, $migrationContext, $processor, $workload); } catch (NoConnectionFoundException $exception) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withExceptionMessage($exception->getMessage()) ->withExceptionTrace($exception->getTrace()) ->withEntityName(MediaDefinition::ENTITY_NAME) @@ -97,7 +97,7 @@ public function __invoke(ProcessMediaMessage $message): void $this->loggingService->saveLogging($context); } catch (\Exception $e) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withExceptionMessage($e->getMessage()) ->withExceptionTrace($e->getTrace()) ->withEntityName(MediaDefinition::ENTITY_NAME) diff --git a/src/Migration/MessageQueue/Handler/Processor/AbstractProcessor.php b/src/Migration/MessageQueue/Handler/Processor/AbstractProcessor.php index 0a9a94947..837402c2f 100644 --- a/src/Migration/MessageQueue/Handler/Processor/AbstractProcessor.php +++ b/src/Migration/MessageQueue/Handler/Processor/AbstractProcessor.php @@ -63,7 +63,7 @@ protected function changeProgressToNextEntity(SwagMigrationRunEntity $run, Migra if ($nextEntity === null && $run->getStep() === MigrationStep::FETCHING) { $nextEntity = \current($dataSets); - $this->runTransitionService->transitionToRunStep($run->getId(), MigrationStep::APPLY_FIXES); + $this->runTransitionService->transitionToRunStep($run->getId(), MigrationStep::ERROR_RESOLUTION); $progress->setProgress(0); $progress->setTotal($this->getWriteTotal($context)); } elseif ($nextEntity === null && $run->getStep() === MigrationStep::WRITING) { diff --git a/src/Migration/Run/MigrationStep.php b/src/Migration/Run/MigrationStep.php index bd1775d20..e2070efd6 100644 --- a/src/Migration/Run/MigrationStep.php +++ b/src/Migration/Run/MigrationStep.php @@ -16,7 +16,7 @@ enum MigrationStep: string case FETCHING = 'fetching'; - case APPLY_FIXES = 'apply-fixes'; + case ERROR_RESOLUTION = 'error-resolution'; case WRITING = 'writing'; @@ -45,7 +45,7 @@ public function isRunning(): bool public function needsProcessor(): bool { return !\in_array($this, [ - self::APPLY_FIXES, + self::ERROR_RESOLUTION, self::WAITING_FOR_APPROVE, ], true); } diff --git a/src/Migration/Run/RunService.php b/src/Migration/Run/RunService.php index a8139eb86..c052f627c 100644 --- a/src/Migration/Run/RunService.php +++ b/src/Migration/Run/RunService.php @@ -28,7 +28,7 @@ use SwagMigrationAssistant\Migration\DataSelection\DataSelectionCollection; use SwagMigrationAssistant\Migration\DataSelection\DataSelectionRegistryInterface; use SwagMigrationAssistant\Migration\EnvironmentInformation; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\Log\ThemeCompilingErrorRunLog; use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface; use SwagMigrationAssistant\Migration\Mapping\MappingServiceInterface; @@ -163,7 +163,7 @@ public function abortMigration(Context $context): void $runId = $run->getId(); $runningSteps = [ MigrationStep::FETCHING->value, - MigrationStep::APPLY_FIXES->value, + MigrationStep::ERROR_RESOLUTION->value, MigrationStep::WRITING->value, MigrationStep::MEDIA_PROCESSING->value, ]; @@ -262,7 +262,7 @@ public function assignThemeToSalesChannel(string $runUuid, Context $context): vo $this->themeService->assignTheme($defaultThemeId, $salesChannelId, $context); } catch (\Throwable $exception) { $this->loggingService->addLogEntry( - (new SwagMigrationLogBuilder( + (new MigrationLogBuilder( $runUuid, $connection->getProfileName(), $connection->getGatewayName(), @@ -289,8 +289,8 @@ public function resumeAfterFixes(Context $context): void $runId = $run->getId(); - if ($run->getStepValue() !== MigrationStep::APPLY_FIXES->value) { - throw MigrationException::migrationNotInStep($runId, MigrationStep::APPLY_FIXES->value); + if ($run->getStepValue() !== MigrationStep::ERROR_RESOLUTION->value) { + throw MigrationException::migrationNotInStep($runId, MigrationStep::ERROR_RESOLUTION->value); } $this->runTransitionService->transitionToRunStep($runId, MigrationStep::WRITING); diff --git a/src/Migration/Run/RunServiceInterface.php b/src/Migration/Run/RunServiceInterface.php index c0977cd72..43786c917 100644 --- a/src/Migration/Run/RunServiceInterface.php +++ b/src/Migration/Run/RunServiceInterface.php @@ -19,10 +19,10 @@ interface RunServiceInterface * If no migration run is running, it returns the progress with the step status IDLE. * * After starting the migration run, the steps are as follows, if the migration run is not aborted: - * IDLE -> FETCHING -> APPLY_FIXES -> WRITING -> MEDIA_PROCESSING -> CLEANUP -> INDEXING -> WAITING_FOR_APPROVE -> IDLE + * IDLE -> FETCHING -> ERROR_RESOLUTION -> WRITING -> MEDIA_PROCESSING -> CLEANUP -> INDEXING -> WAITING_FOR_APPROVE -> IDLE * * If the migration run is aborted, the steps are as follows: - * IDLE -> [FETCHING || APPLY_FIXES || WRITING || MEDIA_PROCESSING] -> ABORTING -> CLEANUP -> INDEXING -> IDLE + * IDLE -> [FETCHING || ERROR_RESOLUTION || WRITING || MEDIA_PROCESSING] -> ABORTING -> CLEANUP -> INDEXING -> IDLE */ public function getRunStatus(Context $context): MigrationState; diff --git a/src/Migration/Service/MediaFileProcessorService.php b/src/Migration/Service/MediaFileProcessorService.php index ad63fb136..a737f596a 100644 --- a/src/Migration/Service/MediaFileProcessorService.php +++ b/src/Migration/Service/MediaFileProcessorService.php @@ -14,7 +14,7 @@ use SwagMigrationAssistant\Exception\DataSetNotFoundException; use SwagMigrationAssistant\Migration\DataSelection\DataSet\DataSet; use SwagMigrationAssistant\Migration\DataSelection\DataSet\DataSetRegistry; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\Log\DataSetNotFoundLog; use SwagMigrationAssistant\Migration\Logging\LoggingService; use SwagMigrationAssistant\Migration\MessageQueue\Message\ProcessMediaMessage; @@ -134,7 +134,7 @@ private function logDataSetNotFoundException( \Throwable $exception, ): void { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withExceptionMessage($exception->getMessage()) ->withExceptionTrace($exception->getTrace()) ->build(DataSetNotFoundLog::class) diff --git a/src/Migration/Service/MigrationDataConverter.php b/src/Migration/Service/MigrationDataConverter.php index 83c90e94d..5a009daaa 100644 --- a/src/Migration/Service/MigrationDataConverter.php +++ b/src/Migration/Service/MigrationDataConverter.php @@ -16,14 +16,14 @@ use SwagMigrationAssistant\Migration\Converter\ConverterInterface; use SwagMigrationAssistant\Migration\Converter\ConverterRegistryInterface; use SwagMigrationAssistant\Migration\DataSelection\DataSet\DataSet; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\Log\ExceptionRunLog; use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface; use SwagMigrationAssistant\Migration\Mapping\MappingDeltaResult; use SwagMigrationAssistant\Migration\Mapping\MappingServiceInterface; use SwagMigrationAssistant\Migration\Media\MediaFileServiceInterface; use SwagMigrationAssistant\Migration\MigrationContextInterface; -use SwagMigrationAssistant\Migration\Validation\SwagMigrationValidationService; +use SwagMigrationAssistant\Migration\Validation\MigrationValidationService; #[Package('fundamentals@after-sales')] class MigrationDataConverter implements MigrationDataConverterInterface @@ -35,7 +35,7 @@ public function __construct( private readonly LoggingServiceInterface $loggingService, private readonly EntityDefinition $dataDefinition, private readonly MappingServiceInterface $mappingService, - private readonly SwagMigrationValidationService $validationService, + private readonly MigrationValidationService $validationService, ) { } @@ -72,7 +72,7 @@ public function convert(array $data, MigrationContextInterface $migrationContext } } catch (\Throwable $exception) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withExceptionMessage($exception->getMessage()) ->withExceptionTrace($exception->getTrace()) ->withEntityName($dataSet::getEntity()) @@ -117,7 +117,7 @@ private function convertData( ]; } catch (\Throwable $exception) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withExceptionMessage($exception->getMessage()) ->withExceptionTrace($exception->getTrace()) ->withEntityName($dataSet::getEntity()) diff --git a/src/Migration/Service/MigrationDataFetcher.php b/src/Migration/Service/MigrationDataFetcher.php index c145525d8..be4565177 100644 --- a/src/Migration/Service/MigrationDataFetcher.php +++ b/src/Migration/Service/MigrationDataFetcher.php @@ -11,7 +11,7 @@ use Shopware\Core\Framework\Log\Package; use SwagMigrationAssistant\Migration\EnvironmentInformation; use SwagMigrationAssistant\Migration\Gateway\GatewayRegistryInterface; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\Log\ExceptionRunLog; use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface; use SwagMigrationAssistant\Migration\MigrationContextInterface; @@ -36,7 +36,7 @@ public function fetchData(MigrationContextInterface $migrationContext, Context $ return $this->gatewayRegistry->getGateway($migrationContext)->read($migrationContext); } catch (\Throwable $exception) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withExceptionMessage($exception->getMessage()) ->withExceptionTrace($exception->getTrace()) ->withEntityName($dataSet::getEntity()) diff --git a/src/Migration/Service/MigrationDataWriter.php b/src/Migration/Service/MigrationDataWriter.php index ee1fdc172..8d93d9404 100644 --- a/src/Migration/Service/MigrationDataWriter.php +++ b/src/Migration/Service/MigrationDataWriter.php @@ -22,14 +22,14 @@ use SwagMigrationAssistant\Exception\WriterNotFoundException; use SwagMigrationAssistant\Migration\Data\SwagMigrationDataCollection; use SwagMigrationAssistant\Migration\Data\SwagMigrationDataEntity; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\ErrorResolution\MigrationErrorResolutionService; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\Log\ExceptionRunLog; use SwagMigrationAssistant\Migration\Logging\Log\WriteExceptionRunLog; use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface; use SwagMigrationAssistant\Migration\Mapping\SwagMigrationMappingCollection; use SwagMigrationAssistant\Migration\Media\MediaFileServiceInterface; use SwagMigrationAssistant\Migration\MigrationContextInterface; -use SwagMigrationAssistant\Migration\Writer\MigrationFix\MigrationFixApplier; use SwagMigrationAssistant\Migration\Writer\WriterRegistryInterface; #[Package('fundamentals@after-sales')] @@ -49,7 +49,7 @@ public function __construct( private readonly LoggingServiceInterface $loggingService, private readonly EntityDefinition $dataDefinition, private readonly EntityRepository $mappingRepo, - private readonly MigrationFixApplier $fixApplier, + private readonly MigrationErrorResolutionService $errorResolutionService, ) { // write / upsert entities only with this single context, // otherwise the migration behaves differently when started in the administration @@ -106,14 +106,14 @@ public function writeData(MigrationContextInterface $migrationContext, Context $ } $convertedValues = array_values($converted); - $this->fixApplier->apply($convertedValues, $migrationContext->getConnection()->getId(), $migrationContext->getRunUuid()); + $this->errorResolutionService->applyFixes($convertedValues, $migrationContext->getConnection()->getId(), $migrationContext->getRunUuid()); try { $currentWriter = $this->writerRegistry->getWriter($dataSet::getEntity()); $currentWriter->writeData($convertedValues, $this->writeContext); } catch (WriterNotFoundException $writerNotFoundException) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withExceptionMessage($writerNotFoundException->getMessage()) ->withExceptionTrace($writerNotFoundException->getTrace()) ->withConvertedData([$converted]) @@ -198,7 +198,7 @@ private function handleWriteException( }); $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withExceptionMessage($exception->getMessage()) ->withExceptionTrace($exception->getTrace()) ->withEntityName($entityName) @@ -257,7 +257,7 @@ private function writePerEntity( $currentWriter->writeData([$entity], $this->writeContext); } catch (\Throwable $exception) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withExceptionMessage($exception->getMessage()) ->withExceptionTrace($exception->getTrace()) ->withEntityName($entityName) diff --git a/src/Migration/Subscriber/MessageQueueSubscriber.php b/src/Migration/Subscriber/MessageQueueSubscriber.php index 78333fabe..0756cca52 100644 --- a/src/Migration/Subscriber/MessageQueueSubscriber.php +++ b/src/Migration/Subscriber/MessageQueueSubscriber.php @@ -11,7 +11,7 @@ use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository; use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\Log\MessageQueueExceptionLog; use SwagMigrationAssistant\Migration\Logging\Log\RunAbortedAutomaticallyLog; use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface; @@ -90,7 +90,7 @@ public function onWorkerMessageFailed(WorkerMessageFailedEvent $event): void */ $progress->raiseExceptionCount(); $this->loggingService->addLogEntry( - (new SwagMigrationLogBuilder( + (new MigrationLogBuilder( $run->getId(), $connection?->getProfileName() ?? 'unknown', $connection?->getGatewayName() ?? 'unknown' @@ -109,7 +109,7 @@ public function onWorkerMessageFailed(WorkerMessageFailedEvent $event): void $this->updateRun($run->getId(), $progress, $message->getContext()); $this->loggingService->addLogEntry( - (new SwagMigrationLogBuilder( + (new MigrationLogBuilder( $run->getId(), $connection?->getProfileName() ?? 'unknown', $connection?->getGatewayName() ?? 'unknown' diff --git a/src/Migration/Validation/Event/SwagMigrationPreValidationEvent.php b/src/Migration/Validation/Event/MigrationPostValidationEvent.php similarity index 66% rename from src/Migration/Validation/Event/SwagMigrationPreValidationEvent.php rename to src/Migration/Validation/Event/MigrationPostValidationEvent.php index 9eb3c7d44..dfb0f26f8 100644 --- a/src/Migration/Validation/Event/SwagMigrationPreValidationEvent.php +++ b/src/Migration/Validation/Event/MigrationPostValidationEvent.php @@ -10,17 +10,17 @@ use Shopware\Core\Framework\Context; use Shopware\Core\Framework\Event\ShopwareEvent; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Validation\SwagMigrationValidationContext; +use SwagMigrationAssistant\Migration\Validation\MigrationValidationContext; use Symfony\Contracts\EventDispatcher\Event; #[Package('fundamentals@after-sales')] -class SwagMigrationPreValidationEvent extends Event implements ShopwareEvent +class MigrationPostValidationEvent extends Event implements ShopwareEvent { - public function __construct(private readonly SwagMigrationValidationContext $validationContext) + public function __construct(private readonly MigrationValidationContext $validationContext) { } - public function getValidationContext(): SwagMigrationValidationContext + public function getValidationContext(): MigrationValidationContext { return $this->validationContext; } diff --git a/src/Migration/Validation/Event/SwagMigrationPostValidationEvent.php b/src/Migration/Validation/Event/MigrationPreValidationEvent.php similarity index 66% rename from src/Migration/Validation/Event/SwagMigrationPostValidationEvent.php rename to src/Migration/Validation/Event/MigrationPreValidationEvent.php index 65e911337..7790bf95f 100644 --- a/src/Migration/Validation/Event/SwagMigrationPostValidationEvent.php +++ b/src/Migration/Validation/Event/MigrationPreValidationEvent.php @@ -10,17 +10,17 @@ use Shopware\Core\Framework\Context; use Shopware\Core\Framework\Event\ShopwareEvent; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Validation\SwagMigrationValidationContext; +use SwagMigrationAssistant\Migration\Validation\MigrationValidationContext; use Symfony\Contracts\EventDispatcher\Event; #[Package('fundamentals@after-sales')] -class SwagMigrationPostValidationEvent extends Event implements ShopwareEvent +class MigrationPreValidationEvent extends Event implements ShopwareEvent { - public function __construct(private readonly SwagMigrationValidationContext $validationContext) + public function __construct(private readonly MigrationValidationContext $validationContext) { } - public function getValidationContext(): SwagMigrationValidationContext + public function getValidationContext(): MigrationValidationContext { return $this->validationContext; } diff --git a/src/Migration/Validation/Log/ValidationExceptionLog.php b/src/Migration/Validation/Log/MigrationValidationExceptionLog.php similarity index 87% rename from src/Migration/Validation/Log/ValidationExceptionLog.php rename to src/Migration/Validation/Log/MigrationValidationExceptionLog.php index aa2597c75..74507d172 100644 --- a/src/Migration/Validation/Log/ValidationExceptionLog.php +++ b/src/Migration/Validation/Log/MigrationValidationExceptionLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Migration\Validation\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class ValidationExceptionLog extends AbstractSwagMigrationLogEntry +readonly class MigrationValidationExceptionLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Migration/Validation/Log/ValidationInvalidFieldValueLog.php b/src/Migration/Validation/Log/MigrationValidationInvalidFieldValueLog.php similarity index 86% rename from src/Migration/Validation/Log/ValidationInvalidFieldValueLog.php rename to src/Migration/Validation/Log/MigrationValidationInvalidFieldValueLog.php index 3bf00972f..5b5340165 100644 --- a/src/Migration/Validation/Log/ValidationInvalidFieldValueLog.php +++ b/src/Migration/Validation/Log/MigrationValidationInvalidFieldValueLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Migration\Validation\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class ValidationInvalidFieldValueLog extends AbstractSwagMigrationLogEntry +readonly class MigrationValidationInvalidFieldValueLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Migration/Validation/Log/ValidationInvalidForeignKeyLog.php b/src/Migration/Validation/Log/MigrationValidationInvalidForeignKeyLog.php similarity index 86% rename from src/Migration/Validation/Log/ValidationInvalidForeignKeyLog.php rename to src/Migration/Validation/Log/MigrationValidationInvalidForeignKeyLog.php index 44897bdd1..bdd2a0ae3 100644 --- a/src/Migration/Validation/Log/ValidationInvalidForeignKeyLog.php +++ b/src/Migration/Validation/Log/MigrationValidationInvalidForeignKeyLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Migration\Validation\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class ValidationInvalidForeignKeyLog extends AbstractSwagMigrationLogEntry +readonly class MigrationValidationInvalidForeignKeyLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Migration/Validation/Log/ValidationMissingRequiredFieldLog.php b/src/Migration/Validation/Log/MigrationValidationMissingRequiredFieldLog.php similarity index 86% rename from src/Migration/Validation/Log/ValidationMissingRequiredFieldLog.php rename to src/Migration/Validation/Log/MigrationValidationMissingRequiredFieldLog.php index dc69f5aa6..ff5909673 100644 --- a/src/Migration/Validation/Log/ValidationMissingRequiredFieldLog.php +++ b/src/Migration/Validation/Log/MigrationValidationMissingRequiredFieldLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Migration\Validation\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class ValidationMissingRequiredFieldLog extends AbstractSwagMigrationLogEntry +readonly class MigrationValidationMissingRequiredFieldLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Migration/Validation/Log/ValidationUnexpectedFieldLog.php b/src/Migration/Validation/Log/MigrationValidationUnexpectedFieldLog.php similarity index 86% rename from src/Migration/Validation/Log/ValidationUnexpectedFieldLog.php rename to src/Migration/Validation/Log/MigrationValidationUnexpectedFieldLog.php index 16cbc537f..d363bf846 100644 --- a/src/Migration/Validation/Log/ValidationUnexpectedFieldLog.php +++ b/src/Migration/Validation/Log/MigrationValidationUnexpectedFieldLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Migration\Validation\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class ValidationUnexpectedFieldLog extends AbstractSwagMigrationLogEntry +readonly class MigrationValidationUnexpectedFieldLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Migration/Validation/SwagMigrationValidationContext.php b/src/Migration/Validation/MigrationValidationContext.php similarity index 86% rename from src/Migration/Validation/SwagMigrationValidationContext.php rename to src/Migration/Validation/MigrationValidationContext.php index 0791496eb..81e8f04da 100644 --- a/src/Migration/Validation/SwagMigrationValidationContext.php +++ b/src/Migration/Validation/MigrationValidationContext.php @@ -13,9 +13,9 @@ use SwagMigrationAssistant\Migration\MigrationContextInterface; #[Package('fundamentals@after-sales')] -readonly class SwagMigrationValidationContext +readonly class MigrationValidationContext { - protected SwagMigrationValidationResult $validationResult; + protected MigrationValidationResult $validationResult; /** * @param array $convertedData @@ -28,7 +28,7 @@ public function __construct( protected array $convertedData, protected array $sourceData, ) { - $this->validationResult = new SwagMigrationValidationResult( + $this->validationResult = new MigrationValidationResult( $this->entityDefinition->getEntityName(), ); } @@ -64,7 +64,7 @@ public function getEntityDefinition(): EntityDefinition return $this->entityDefinition; } - public function getValidationResult(): SwagMigrationValidationResult + public function getValidationResult(): MigrationValidationResult { return $this->validationResult; } diff --git a/src/Migration/Validation/SwagMigrationValidationResult.php b/src/Migration/Validation/MigrationValidationResult.php similarity index 75% rename from src/Migration/Validation/SwagMigrationValidationResult.php rename to src/Migration/Validation/MigrationValidationResult.php index 1c1fe0a76..b8c0315ce 100644 --- a/src/Migration/Validation/SwagMigrationValidationResult.php +++ b/src/Migration/Validation/MigrationValidationResult.php @@ -8,13 +8,13 @@ namespace SwagMigrationAssistant\Migration\Validation; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogEntry; #[Package('fundamentals@after-sales')] -class SwagMigrationValidationResult +class MigrationValidationResult { /** - * @param SwagMigrationLogEntry[] $logs + * @param MigrationLogEntry[] $logs */ public function __construct( private readonly string $entityName, @@ -22,13 +22,13 @@ public function __construct( ) { } - public function addLog(SwagMigrationLogEntry $log): void + public function addLog(MigrationLogEntry $log): void { $this->logs[] = $log; } /** - * @return SwagMigrationLogEntry[] + * @return MigrationLogEntry[] */ public function getLogs(): array { diff --git a/src/Migration/Validation/SwagMigrationValidationService.php b/src/Migration/Validation/MigrationValidationService.php similarity index 81% rename from src/Migration/Validation/SwagMigrationValidationService.php rename to src/Migration/Validation/MigrationValidationService.php index e5084ea5f..a6c509373 100644 --- a/src/Migration/Validation/SwagMigrationValidationService.php +++ b/src/Migration/Validation/MigrationValidationService.php @@ -20,21 +20,21 @@ use Shopware\Core\Framework\Log\Package; use Shopware\Core\Framework\Uuid\Uuid; use SwagMigrationAssistant\Exception\MigrationException; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface; use SwagMigrationAssistant\Migration\Mapping\MappingServiceInterface; use SwagMigrationAssistant\Migration\MigrationContextInterface; -use SwagMigrationAssistant\Migration\Validation\Event\SwagMigrationPostValidationEvent; -use SwagMigrationAssistant\Migration\Validation\Event\SwagMigrationPreValidationEvent; -use SwagMigrationAssistant\Migration\Validation\Log\ValidationExceptionLog; -use SwagMigrationAssistant\Migration\Validation\Log\ValidationInvalidFieldValueLog; -use SwagMigrationAssistant\Migration\Validation\Log\ValidationInvalidForeignKeyLog; -use SwagMigrationAssistant\Migration\Validation\Log\ValidationMissingRequiredFieldLog; -use SwagMigrationAssistant\Migration\Validation\Log\ValidationUnexpectedFieldLog; +use SwagMigrationAssistant\Migration\Validation\Event\MigrationPostValidationEvent; +use SwagMigrationAssistant\Migration\Validation\Event\MigrationPreValidationEvent; +use SwagMigrationAssistant\Migration\Validation\Log\MigrationValidationExceptionLog; +use SwagMigrationAssistant\Migration\Validation\Log\MigrationValidationInvalidFieldValueLog; +use SwagMigrationAssistant\Migration\Validation\Log\MigrationValidationInvalidForeignKeyLog; +use SwagMigrationAssistant\Migration\Validation\Log\MigrationValidationMissingRequiredFieldLog; +use SwagMigrationAssistant\Migration\Validation\Log\MigrationValidationUnexpectedFieldLog; use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; #[Package('fundamentals@after-sales')] -readonly class SwagMigrationValidationService +readonly class MigrationValidationService { public function __construct( private DefinitionInstanceRegistry $definitionRegistry, @@ -54,14 +54,14 @@ public function validate( ?array $convertedEntity, string $entityName, array $sourceData, - ): ?SwagMigrationValidationResult { + ): ?MigrationValidationResult { if (empty($convertedEntity)) { return null; } $entityDefinition = $this->definitionRegistry->getByEntityName($entityName); - $validationContext = new SwagMigrationValidationContext( + $validationContext = new MigrationValidationContext( $shopwareContext, $migrationContext, $entityDefinition, @@ -70,7 +70,7 @@ public function validate( ); $this->eventDispatcher->dispatch( - new SwagMigrationPreValidationEvent($validationContext), + new MigrationPreValidationEvent($validationContext), ); try { @@ -79,19 +79,19 @@ public function validate( $this->validateAssociations($validationContext); } catch (\Throwable $exception) { $validationContext->getValidationResult()->addLog( - SwagMigrationLogBuilder::fromMigrationContext($validationContext->getMigrationContext()) + MigrationLogBuilder::fromMigrationContext($validationContext->getMigrationContext()) ->withEntityName($validationContext->getEntityDefinition()->getEntityName()) ->withSourceData($validationContext->getSourceData()) ->withConvertedData($validationContext->getConvertedData()) ->withExceptionMessage($exception->getMessage()) ->withExceptionTrace($exception->getTrace()) ->withEntityId($convertedEntity['id'] ?? null) - ->build(ValidationExceptionLog::class) + ->build(MigrationValidationExceptionLog::class) ); } $this->eventDispatcher->dispatch( - new SwagMigrationPostValidationEvent($validationContext), + new MigrationPostValidationEvent($validationContext), ); foreach ($validationContext->getValidationResult()->getLogs() as $log) { @@ -103,7 +103,7 @@ public function validate( return $validationContext->getValidationResult(); } - private function validateEntityStructure(SwagMigrationValidationContext $validationContext): void + private function validateEntityStructure(MigrationValidationContext $validationContext): void { $fields = $validationContext->getEntityDefinition()->getFields(); @@ -117,12 +117,12 @@ private function validateEntityStructure(SwagMigrationValidationContext $validat foreach ($missingRequiredFields as $missingField) { $validationContext->getValidationResult()->addLog( - SwagMigrationLogBuilder::fromMigrationContext($validationContext->getMigrationContext()) + MigrationLogBuilder::fromMigrationContext($validationContext->getMigrationContext()) ->withEntityName($validationContext->getEntityDefinition()->getEntityName()) ->withFieldName($missingField) ->withConvertedData($validationContext->getConvertedData()) ->withEntityId($validationContext->getConvertedData()['id'] ?? null) - ->build(ValidationMissingRequiredFieldLog::class) + ->build(MigrationValidationMissingRequiredFieldLog::class) ); } @@ -130,17 +130,17 @@ private function validateEntityStructure(SwagMigrationValidationContext $validat foreach ($unexpectedFields as $unexpectedField) { $validationContext->getValidationResult()->addLog( - SwagMigrationLogBuilder::fromMigrationContext($validationContext->getMigrationContext()) + MigrationLogBuilder::fromMigrationContext($validationContext->getMigrationContext()) ->withEntityName($validationContext->getEntityDefinition()->getEntityName()) ->withFieldName($unexpectedField) ->withConvertedData($validationContext->getConvertedData()) ->withEntityId($validationContext->getConvertedData()['id'] ?? null) - ->build(ValidationUnexpectedFieldLog::class) + ->build(MigrationValidationUnexpectedFieldLog::class) ); } } - private function validateFields(SwagMigrationValidationContext $validationContext): void + private function validateFields(MigrationValidationContext $validationContext): void { $fields = $validationContext->getEntityDefinition()->getFields(); @@ -183,7 +183,7 @@ private function validateFields(SwagMigrationValidationContext $validationContex \iterator_to_array($serializer->encode($field, $entityExistence, $keyValue, $parameters), false); } catch (\Throwable $e) { $validationContext->getValidationResult()->addLog( - SwagMigrationLogBuilder::fromMigrationContext($validationContext->getMigrationContext()) + MigrationLogBuilder::fromMigrationContext($validationContext->getMigrationContext()) ->withEntityName($validationContext->getEntityDefinition()->getEntityName()) ->withFieldName($fieldName) ->withConvertedData([$fieldName => $value]) @@ -191,13 +191,13 @@ private function validateFields(SwagMigrationValidationContext $validationContex ->withExceptionMessage($e->getMessage()) ->withExceptionTrace($e->getTrace()) ->withEntityId($validationContext->getConvertedData()['id'] ?? null) - ->build(ValidationInvalidFieldValueLog::class) + ->build(MigrationValidationInvalidFieldValueLog::class) ); } } } - private function validateAssociations(SwagMigrationValidationContext $validationContext): void + private function validateAssociations(MigrationValidationContext $validationContext): void { $fields = $validationContext->getEntityDefinition()->getFields(); @@ -229,7 +229,7 @@ private function validateAssociations(SwagMigrationValidationContext $validation throw MigrationException::unexpectedNullValue($fkFieldName); } - $hasMapping = $this->mappingService->hasValidMappingByEntityUuid( + $hasMapping = $this->mappingService->hasValidMappingByEntityId( $validationContext->getMigrationContext()->getConnection()->getId(), $referenceEntity, $fkValue, @@ -238,13 +238,13 @@ private function validateAssociations(SwagMigrationValidationContext $validation if (!$hasMapping) { $validationContext->getValidationResult()->addLog( - SwagMigrationLogBuilder::fromMigrationContext($validationContext->getMigrationContext()) + MigrationLogBuilder::fromMigrationContext($validationContext->getMigrationContext()) ->withEntityName($validationContext->getEntityDefinition()->getEntityName()) ->withFieldName($fkFieldName) ->withConvertedData([$fkFieldName => $fkValue]) ->withSourceData($validationContext->getSourceData()) ->withEntityId($validationContext->getConvertedData()['id'] ?? null) - ->build(ValidationInvalidForeignKeyLog::class) + ->build(MigrationValidationInvalidForeignKeyLog::class) ); } } diff --git a/src/Profile/Shopware/Converter/CategoryConverter.php b/src/Profile/Shopware/Converter/CategoryConverter.php index a04ff9b35..9a610ebf7 100644 --- a/src/Profile/Shopware/Converter/CategoryConverter.php +++ b/src/Profile/Shopware/Converter/CategoryConverter.php @@ -14,7 +14,7 @@ use SwagMigrationAssistant\Exception\MigrationException; use SwagMigrationAssistant\Migration\Converter\ConvertStruct; use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\Log\EmptyNecessaryFieldRunLog; use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface; use SwagMigrationAssistant\Migration\Mapping\Lookup\DefaultCmsPageLookup; @@ -86,7 +86,7 @@ public function convert( if (!isset($data['_locale'])) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(CategoryDefinition::ENTITY_NAME) ->withFieldSourcePath('_locale') ->withSourceData($data) diff --git a/src/Profile/Shopware/Converter/CrossSellingConverter.php b/src/Profile/Shopware/Converter/CrossSellingConverter.php index a604b1c64..4211f935a 100644 --- a/src/Profile/Shopware/Converter/CrossSellingConverter.php +++ b/src/Profile/Shopware/Converter/CrossSellingConverter.php @@ -13,7 +13,7 @@ use SwagMigrationAssistant\Migration\Converter\ConvertStruct; use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities; use SwagMigrationAssistant\Migration\Logging\Log\AssociationRequiredMissingLog; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\MigrationContextInterface; #[Package('fundamentals@after-sales')] @@ -61,7 +61,7 @@ public function convert(array $data, Context $context, MigrationContextInterface $sourceProductMapping = $this->getProductMapping($data['articleID']); if ($sourceProductMapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(ProductCrossSellingDefinition::ENTITY_NAME) ->withFieldName('id') ->withFieldSourcePath('articleID') @@ -77,7 +77,7 @@ public function convert(array $data, Context $context, MigrationContextInterface $relatedProductMapping = $this->getProductMapping($data['relatedarticle']); if ($relatedProductMapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(ProductCrossSellingDefinition::ENTITY_NAME) ->withFieldName('id') ->withFieldSourcePath('relatedarticle') diff --git a/src/Profile/Shopware/Converter/CustomerConverter.php b/src/Profile/Shopware/Converter/CustomerConverter.php index a640ab918..ce0cb9fcc 100644 --- a/src/Profile/Shopware/Converter/CustomerConverter.php +++ b/src/Profile/Shopware/Converter/CustomerConverter.php @@ -19,7 +19,7 @@ use Shopware\Core\System\SalesChannel\SalesChannelCollection; use SwagMigrationAssistant\Migration\Converter\ConvertStruct; use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\Log\EmptyNecessaryFieldRunLog; use SwagMigrationAssistant\Migration\Logging\Log\FieldReassignedRunLog; use SwagMigrationAssistant\Migration\Logging\Log\UnknownEntityLog; @@ -291,7 +291,7 @@ protected function getDefaultPaymentMethod(array $originalData): ?string if ($paymentMethodMapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(CustomerDefinition::ENTITY_NAME) ->withFieldName('defaultPaymentMethodId') ->withFieldSourcePath('default_payment_method') @@ -321,7 +321,7 @@ protected function applyAddresses(array &$originalData, array &$converted, strin if (!empty($fields)) { $this->loggingService->addLogForEach( $fields, - fn (string $key) => SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + fn (string $key) => MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(CustomerAddressDefinition::ENTITY_NAME) ->withFieldSourcePath($key) ->withSourceData($address) @@ -506,7 +506,7 @@ protected function getCountryState(array $oldAddressData, string $newCountryId): if (!isset($oldAddressData['state_id'], $oldAddressData['country']['countryiso'], $oldAddressData['state']['shortcode'])) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(CustomerAddressDefinition::ENTITY_NAME) ->withFieldName('stateId') ->withFieldSourcePath('state_id') @@ -543,7 +543,7 @@ protected function getCountryState(array $oldAddressData, string $newCountryId): $oldAddressData['state']['active'] )) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(CustomerAddressDefinition::ENTITY_NAME) ->withFieldName('stateId') ->withFieldSourcePath('state.name') @@ -622,7 +622,7 @@ protected function checkUnsetDefaultShippingAndDefaultBillingAddress(array &$ori 'defaultBillingAddressId' => 'default_billing_address_id', 'defaultShippingAddressId' => 'default_shipping_address_id', ], - fn (string $key, string $value) => SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + fn (string $key, string $value) => MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(CustomerAddressDefinition::ENTITY_NAME) ->withFieldName($key) ->withFieldSourcePath($value) @@ -643,7 +643,7 @@ protected function checkUnsetDefaultShippingAddress(array &$originalData, array unset($originalData['default_shipping_address_id']); $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(CustomerAddressDefinition::ENTITY_NAME) ->withFieldName('defaultShippingAddressId') ->withFieldSourcePath('default_shipping_address_id') @@ -664,7 +664,7 @@ protected function checkUnsetDefaultBillingAddress(array &$originalData, array & unset($originalData['default_billing_address_id']); $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(CustomerAddressDefinition::ENTITY_NAME) ->withFieldName('defaultBillingAddressId') ->withFieldSourcePath('default_billing_address_id') @@ -685,7 +685,7 @@ protected function getSalutation(string $salutation): ?string if ($mapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(CustomerDefinition::ENTITY_NAME) ->withFieldName('salutationId') ->withFieldSourcePath('salutation') diff --git a/src/Profile/Shopware/Converter/LanguageConverter.php b/src/Profile/Shopware/Converter/LanguageConverter.php index abe383332..fc4362fb8 100644 --- a/src/Profile/Shopware/Converter/LanguageConverter.php +++ b/src/Profile/Shopware/Converter/LanguageConverter.php @@ -12,7 +12,7 @@ use Shopware\Core\System\Language\LanguageDefinition; use SwagMigrationAssistant\Migration\Converter\ConvertStruct; use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\Log\EntityAlreadyExistsRunLog; use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface; use SwagMigrationAssistant\Migration\Mapping\Lookup\LanguageLookup; @@ -52,7 +52,7 @@ public function convert(array $data, Context $context, MigrationContextInterface $languageUuid = $this->languageLookup->get($data['locale'], $context); if ($languageUuid !== null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(LanguageDefinition::ENTITY_NAME) ->withFieldSourcePath('locale') ->withSourceData($data) diff --git a/src/Profile/Shopware/Converter/MainVariantRelationConverter.php b/src/Profile/Shopware/Converter/MainVariantRelationConverter.php index 9d9955d46..bf6d2bb8b 100644 --- a/src/Profile/Shopware/Converter/MainVariantRelationConverter.php +++ b/src/Profile/Shopware/Converter/MainVariantRelationConverter.php @@ -12,7 +12,7 @@ use SwagMigrationAssistant\Migration\Converter\ConvertStruct; use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities; use SwagMigrationAssistant\Migration\Logging\Log\AssociationRequiredMissingLog; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\MigrationContextInterface; #[Package('fundamentals@after-sales')] @@ -110,7 +110,7 @@ public function convert(array $data, Context $context, MigrationContextInterface private function addAssociationRequiredLog(MigrationContextInterface $migrationContext, string $field, string $entity, array $data): void { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName($entity) ->withFieldSourcePath($field) ->withSourceData($data) diff --git a/src/Profile/Shopware/Converter/NewsletterRecipientConverter.php b/src/Profile/Shopware/Converter/NewsletterRecipientConverter.php index 56515388f..6e23b12ff 100644 --- a/src/Profile/Shopware/Converter/NewsletterRecipientConverter.php +++ b/src/Profile/Shopware/Converter/NewsletterRecipientConverter.php @@ -13,7 +13,7 @@ use Shopware\Core\Framework\Uuid\Uuid; use SwagMigrationAssistant\Migration\Converter\ConvertStruct; use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\Log\EmptyNecessaryFieldRunLog; use SwagMigrationAssistant\Migration\Logging\Log\UnknownEntityLog; use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface; @@ -66,7 +66,7 @@ public function convert( if (!empty($fields)) { $this->loggingService->addLogForEach( $fields, - fn (string $key) => SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + fn (string $key) => MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(NewsletterRecipientDefinition::ENTITY_NAME) ->withFieldName($key) ->build(EmptyNecessaryFieldRunLog::class) @@ -162,7 +162,7 @@ protected function getSalutation(string $salutation, MigrationContextInterface $ if ($salutationMapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(NewsletterRecipientDefinition::ENTITY_NAME) ->withFieldName('salutationId') ->withSourceData(['salutation' => $salutation]) @@ -192,7 +192,7 @@ protected function getSalesChannel(array $data): ?string if (!isset($salesChannelMapping)) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(NewsletterRecipientDefinition::ENTITY_NAME) ->withFieldName('salesChannelId') ->withFieldSourcePath('shopId') @@ -218,7 +218,7 @@ protected function getStatus(MigrationContextInterface $migrationContext): ?stri if ($status === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(NewsletterRecipientDefinition::ENTITY_NAME) ->withFieldName('status') ->withSourceData(['status' => NewsletterRecipientStatusReader::SOURCE_ID]) diff --git a/src/Profile/Shopware/Converter/NumberRangeConverter.php b/src/Profile/Shopware/Converter/NumberRangeConverter.php index 5cc31c28e..f4b7e22e5 100644 --- a/src/Profile/Shopware/Converter/NumberRangeConverter.php +++ b/src/Profile/Shopware/Converter/NumberRangeConverter.php @@ -18,7 +18,7 @@ use Shopware\Core\System\NumberRange\NumberRangeEntity; use SwagMigrationAssistant\Migration\Converter\ConvertStruct; use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\Log\EmptyNecessaryFieldRunLog; use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface; use SwagMigrationAssistant\Migration\Mapping\Lookup\LanguageLookup; @@ -74,7 +74,7 @@ public function convert(array $data, Context $context, MigrationContextInterface if (!\array_key_exists($data['name'], self::TYPE_MAPPING)) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(NumberRangeDefinition::ENTITY_NAME) ->withFieldName('typeId') ->withFieldSourcePath('name') @@ -91,7 +91,7 @@ public function convert(array $data, Context $context, MigrationContextInterface if (empty($converted['typeId'])) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(NumberRangeDefinition::ENTITY_NAME) ->withFieldName('typeId') ->withFieldSourcePath('name') diff --git a/src/Profile/Shopware/Converter/OrderConverter.php b/src/Profile/Shopware/Converter/OrderConverter.php index 08b3d2dbf..ec08e13e9 100644 --- a/src/Profile/Shopware/Converter/OrderConverter.php +++ b/src/Profile/Shopware/Converter/OrderConverter.php @@ -34,7 +34,7 @@ use SwagMigrationAssistant\Exception\MigrationException; use SwagMigrationAssistant\Migration\Converter\ConvertStruct; use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\Log\EmptyNecessaryFieldRunLog; use SwagMigrationAssistant\Migration\Logging\Log\UnknownEntityLog; use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface; @@ -140,7 +140,7 @@ public function convert( if (!empty($fields)) { $this->loggingService->addLogForEach( $fields, - fn (string $key) => SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + fn (string $key) => MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(OrderDefinition::ENTITY_NAME) ->withFieldSourcePath($key) ->withSourceData($data) @@ -222,7 +222,7 @@ public function convert( } if ($currencyUuid === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(OrderDefinition::ENTITY_NAME) ->withFieldName('currencyId') ->withFieldSourcePath('currency') @@ -254,7 +254,7 @@ public function convert( if ($stateMapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(OrderDefinition::ENTITY_NAME) ->withFieldName('stateId') ->withFieldSourcePath('status') @@ -334,7 +334,7 @@ public function convert( $billingAddress = $this->getAddress($data['billingaddress']); if (empty($billingAddress)) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(OrderDefinition::ENTITY_NAME) ->withFieldName('billingAddressId') ->withFieldSourcePath('billingaddress') @@ -443,7 +443,7 @@ protected function applyTransactions(array $data, array &$converted): void if ($mapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(OrderTransactionDefinition::ENTITY_NAME) ->withFieldName('stateId') ->withFieldSourcePath('cleared') @@ -503,7 +503,7 @@ protected function getPaymentMethod(array $originalData): ?string if ($paymentMethodMapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(OrderTransactionDefinition::ENTITY_NAME) ->withFieldName('paymentMethodId') ->withFieldSourcePath('payment.id') @@ -531,7 +531,7 @@ protected function getAddress(array $originalData, string $type = self::BILLING_ if (!empty($fields)) { $this->loggingService->addLogForEach( $fields, - fn (string $key) => SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + fn (string $key) => MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(OrderDefinition::ENTITY_NAME) ->withFieldSourcePath($key) ->withSourceData($originalData) @@ -677,7 +677,7 @@ protected function getCountryState(array $oldAddressData, string $newCountryId): if (!isset($oldAddressData['stateID'], $oldAddressData['country']['countryiso'], $oldAddressData['state']['shortcode'])) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(OrderAddressDefinition::ENTITY_NAME) ->withFieldName('countryStateId') ->withFieldSourcePath('stateID') @@ -714,7 +714,7 @@ protected function getCountryState(array $oldAddressData, string $newCountryId): $oldAddressData['state']['active'] )) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(OrderAddressDefinition::ENTITY_NAME) ->withFieldName('countryStateId') ->withFieldSourcePath('name') @@ -794,7 +794,7 @@ protected function getDeliveries(array $data, array $converted, CalculatedPrice if ($deliveryStateMapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(OrderDeliveryDefinition::ENTITY_NAME) ->withFieldName('stateId') ->withFieldSourcePath('status') @@ -879,7 +879,7 @@ protected function getShippingMethod(string $shippingMethodId): ?string if ($shippingMethodMapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(OrderDeliveryDefinition::ENTITY_NAME) ->withFieldName('shippingMethodId') ->withFieldSourcePath('dispatchID') @@ -1047,7 +1047,7 @@ protected function getSalutation(string $salutation): ?string if ($salutationMapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(OrderAddressDefinition::ENTITY_NAME) ->withFieldName('salutationId') ->withFieldSourcePath('salutation') @@ -1079,7 +1079,7 @@ private function getOrderLineItemDownload(array $originalEsdItem): ?array if (!\is_array($mediaMapping)) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(OrderLineItemDefinition::ENTITY_NAME) ->withFieldName('coverId') ->withFieldSourcePath('esd.esdID') diff --git a/src/Profile/Shopware/Converter/OrderDocumentConverter.php b/src/Profile/Shopware/Converter/OrderDocumentConverter.php index 1e248e087..3ca78bd64 100644 --- a/src/Profile/Shopware/Converter/OrderDocumentConverter.php +++ b/src/Profile/Shopware/Converter/OrderDocumentConverter.php @@ -16,7 +16,7 @@ use SwagMigrationAssistant\Migration\Converter\ConvertStruct; use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities; use SwagMigrationAssistant\Migration\Logging\Log\AssociationRequiredMissingLog; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\Log\DocumentTypeNotSupportedLog; use SwagMigrationAssistant\Migration\Logging\Log\EmptyNecessaryFieldRunLog; use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface; @@ -81,7 +81,7 @@ public function convert(array $data, Context $context, MigrationContextInterface if (empty($data['hash'])) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(DocumentDefinition::ENTITY_NAME) ->withFieldSourcePath('hash') ->withSourceData($data) @@ -94,7 +94,7 @@ public function convert(array $data, Context $context, MigrationContextInterface if (!isset($data['documenttype'])) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(DocumentDefinition::ENTITY_NAME) ->withFieldName('documentType') ->withFieldSourcePath('documenttype') @@ -115,7 +115,7 @@ public function convert(array $data, Context $context, MigrationContextInterface if ($orderMapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(DocumentDefinition::ENTITY_NAME) ->withFieldName('orderId') ->withFieldSourcePath('orderID') @@ -202,7 +202,7 @@ protected function getDocumentType(array $data): array } $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(DocumentDefinition::ENTITY_NAME) ->withFieldName('documentType') ->withFieldSourcePath('key') diff --git a/src/Profile/Shopware/Converter/ProductConverter.php b/src/Profile/Shopware/Converter/ProductConverter.php index 2a6d60b18..63e844fcf 100644 --- a/src/Profile/Shopware/Converter/ProductConverter.php +++ b/src/Profile/Shopware/Converter/ProductConverter.php @@ -23,7 +23,7 @@ use SwagMigrationAssistant\Exception\MigrationException; use SwagMigrationAssistant\Migration\Converter\ConvertStruct; use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\Log\CannotConvertChildEntityLog; use SwagMigrationAssistant\Migration\Logging\Log\EmptyNecessaryFieldRunLog; use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface; @@ -150,7 +150,7 @@ public function convert( if (!empty($fields)) { $this->loggingService->addLogForEach( $fields, - fn (string $key) => SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + fn (string $key) => MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(ProductDefinition::ENTITY_NAME) ->withFieldSourcePath($key) ->withSourceData($data) @@ -392,7 +392,7 @@ private function getProductData(array &$data, array $converted): array if (empty($converted['price'])) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(ProductDefinition::ENTITY_NAME) ->withFieldName('price') ->withFieldSourcePath('prices') @@ -902,7 +902,7 @@ private function getEsdFiles(array $esdFiles, string $oldVariantId, array $conve if (empty($esdFile['name'])) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(MediaDefinition::ENTITY_NAME) ->withFieldName('name') ->withFieldSourcePath('name') @@ -918,7 +918,7 @@ private function getEsdFiles(array $esdFiles, string $oldVariantId, array $conve $path = \unserialize($esdFile['path'], ['allowed_classes' => false]); } catch (\Throwable $e) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(MediaDefinition::ENTITY_NAME) ->withFieldName('path') ->withFieldSourcePath('path') @@ -955,7 +955,7 @@ private function getEsdFiles(array $esdFiles, string $oldVariantId, array $conve $albumId = $this->mediaFolderLookup->get(ProductDownloadDefinition::ENTITY_NAME, $this->context); if ($albumId === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(MediaDefinition::ENTITY_NAME) ->withFieldName('mediaFolderId') ->withSourceData([ @@ -994,7 +994,7 @@ private function getMedia(array $media, string $oldVariantId, array $converted): foreach ($media as $mediaData) { if (!isset($mediaData['media']['id'])) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(ProductMediaDefinition::ENTITY_NAME) ->withFieldName('mediaId') ->withFieldSourcePath('media.id') @@ -1386,7 +1386,7 @@ private function getPrices(array $priceData, array $converted): array if (empty($priceArray)) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(ProductPriceDefinition::ENTITY_NAME) ->withFieldName('price') ->withFieldSourcePath('price') diff --git a/src/Profile/Shopware/Converter/ProductReviewConverter.php b/src/Profile/Shopware/Converter/ProductReviewConverter.php index b936eeea2..23fd1da6d 100644 --- a/src/Profile/Shopware/Converter/ProductReviewConverter.php +++ b/src/Profile/Shopware/Converter/ProductReviewConverter.php @@ -13,7 +13,7 @@ use SwagMigrationAssistant\Migration\Converter\ConvertStruct; use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities; use SwagMigrationAssistant\Migration\Logging\Log\AssociationRequiredMissingLog; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\Log\EmptyNecessaryFieldRunLog; use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface; use SwagMigrationAssistant\Migration\Mapping\Lookup\LanguageLookup; @@ -49,7 +49,7 @@ public function convert(array $data, Context $context, MigrationContextInterface if (!empty($fields)) { $this->loggingService->addLogForEach( $fields, - fn (string $key) => SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + fn (string $key) => MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(ProductReviewDefinition::ENTITY_NAME) ->withFieldSourcePath($key) ->withSourceData($data) @@ -91,7 +91,7 @@ public function convert(array $data, Context $context, MigrationContextInterface if ($mapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(ProductReviewDefinition::ENTITY_NAME) ->withFieldName('productId') ->withFieldSourcePath('articleID') @@ -133,7 +133,7 @@ public function convert(array $data, Context $context, MigrationContextInterface if ($mapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(ProductReviewDefinition::ENTITY_NAME) ->withFieldName('salesChannelId') ->withFieldSourcePath('shop_id') @@ -151,7 +151,7 @@ public function convert(array $data, Context $context, MigrationContextInterface $converted['languageId'] = $this->languageLookup->get($mainLocale, $context); if ($converted['languageId'] === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(ProductReviewDefinition::ENTITY_NAME) ->withFieldName('languageId') ->withFieldSourcePath('_locale') diff --git a/src/Profile/Shopware/Converter/PromotionConverter.php b/src/Profile/Shopware/Converter/PromotionConverter.php index 281b5ab0d..d79244961 100644 --- a/src/Profile/Shopware/Converter/PromotionConverter.php +++ b/src/Profile/Shopware/Converter/PromotionConverter.php @@ -21,7 +21,7 @@ use SwagMigrationAssistant\Migration\Converter\ConvertStruct; use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities; use SwagMigrationAssistant\Migration\Logging\Log\AssociationRequiredMissingLog; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface; use SwagMigrationAssistant\Migration\Mapping\MappingServiceInterface; use SwagMigrationAssistant\Migration\MigrationContextInterface; @@ -368,7 +368,7 @@ private function setProductNumbers(array &$data, MigrationContextInterface $migr if ($productMapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(PromotionDefinition::ENTITY_NAME) ->withFieldName('productId') ->withFieldSourcePath('restrictarticles') @@ -503,7 +503,7 @@ private function setCartRule(array &$data, array &$converted, MigrationContextIn $oneRuleAdded = true; } else { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(PromotionCartRuleDefinition::ENTITY_NAME) ->withFieldName('rule.value.manufacturerId') ->withFieldSourcePath('bindtosupplier') @@ -558,7 +558,7 @@ private function setSalesChannel(array &$data, array &$converted, MigrationConte if ($salesChannelMapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(PromotionDefinition::ENTITY_NAME) ->withFieldName('salesChannelId') ->withFieldSourcePath('subshopID') @@ -631,7 +631,7 @@ private function setCustomerRule(array &$data, array &$converted, MigrationConte if ($customerGroupMapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(PromotionPersonaRuleDefinition::ENTITY_NAME) ->withFieldName('rule.value.customerGroupId') ->withFieldSourcePath('customergroup') diff --git a/src/Profile/Shopware/Converter/PropertyGroupOptionConverter.php b/src/Profile/Shopware/Converter/PropertyGroupOptionConverter.php index 245e03b06..bbf4b87e0 100644 --- a/src/Profile/Shopware/Converter/PropertyGroupOptionConverter.php +++ b/src/Profile/Shopware/Converter/PropertyGroupOptionConverter.php @@ -13,7 +13,7 @@ use Shopware\Core\Framework\Util\Hasher; use SwagMigrationAssistant\Migration\Converter\ConvertStruct; use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\Log\CannotConvertChildEntityLog; use SwagMigrationAssistant\Migration\Logging\Log\EmptyNecessaryFieldRunLog; use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface; @@ -79,7 +79,7 @@ public function convert(array $data, Context $context, MigrationContextInterface if (!isset($data['group']['name'])) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(PropertyGroupDefinition::ENTITY_NAME) ->withFieldName('id') ->withFieldSourcePath('group.name') @@ -135,7 +135,7 @@ protected function setMedia(array &$converted, array $data): void { if (!isset($data['media']['id'])) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(PropertyGroupDefinition::ENTITY_NAME) ->withFieldName('media.id') ->withFieldSourcePath('media.id') diff --git a/src/Profile/Shopware/Converter/SalesChannelConverter.php b/src/Profile/Shopware/Converter/SalesChannelConverter.php index 9b74335cf..88e88e727 100644 --- a/src/Profile/Shopware/Converter/SalesChannelConverter.php +++ b/src/Profile/Shopware/Converter/SalesChannelConverter.php @@ -24,7 +24,7 @@ use SwagMigrationAssistant\Migration\Converter\ConvertStruct; use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities; use SwagMigrationAssistant\Migration\Logging\Log\AssociationRequiredMissingLog; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface; use SwagMigrationAssistant\Migration\Mapping\Lookup\CurrencyLookup; use SwagMigrationAssistant\Migration\Mapping\Lookup\LanguageLookup; @@ -98,7 +98,7 @@ public function convert(array $data, Context $context, MigrationContextInterface if ($customerGroupMapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(SalesChannelDefinition::ENTITY_NAME) ->withFieldName('customerGroupId') ->withFieldSourcePath('customer_group_id') @@ -115,7 +115,7 @@ public function convert(array $data, Context $context, MigrationContextInterface $languageUuid = $this->languageLookup->get($data['locale'], $context); if ($languageUuid === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(SalesChannelDefinition::ENTITY_NAME) ->withFieldName('languageId') ->withFieldSourcePath('locale') @@ -139,7 +139,7 @@ public function convert(array $data, Context $context, MigrationContextInterface $currencyUuid = $this->currencyLookup->get($data['currency'], $context); if ($currencyUuid === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(SalesChannelDefinition::ENTITY_NAME) ->withFieldName('currencyId') ->withFieldSourcePath('currency') @@ -166,7 +166,7 @@ public function convert(array $data, Context $context, MigrationContextInterface if ($categoryMapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(SalesChannelDefinition::ENTITY_NAME) ->withFieldName('navigationCategoryId') ->withFieldSourcePath('category_id') @@ -390,7 +390,7 @@ protected function filterDisabledPackLanguages(array &$converted): void } $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(SalesChannelDefinition::ENTITY_NAME) ->withFieldName('languageId') ->build(DeactivatedPackLanguageLog::class) diff --git a/src/Profile/Shopware/Converter/SeoUrlConverter.php b/src/Profile/Shopware/Converter/SeoUrlConverter.php index de9cd69a5..e1ead8955 100644 --- a/src/Profile/Shopware/Converter/SeoUrlConverter.php +++ b/src/Profile/Shopware/Converter/SeoUrlConverter.php @@ -13,7 +13,7 @@ use SwagMigrationAssistant\Migration\Converter\ConvertStruct; use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities; use SwagMigrationAssistant\Migration\Logging\Log\AssociationRequiredMissingLog; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface; use SwagMigrationAssistant\Migration\Mapping\Lookup\LanguageLookup; use SwagMigrationAssistant\Migration\Mapping\MappingServiceInterface; @@ -67,7 +67,7 @@ public function convert(array $data, Context $context, MigrationContextInterface if ($mapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(SeoUrlDefinition::ENTITY_NAME) ->withFieldName('salesChannelId') ->withFieldSourcePath('subshopID') @@ -85,7 +85,7 @@ public function convert(array $data, Context $context, MigrationContextInterface $converted['languageId'] = $this->languageLookup->get($data['_locale'], $context); if ($converted['languageId'] === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(SeoUrlDefinition::ENTITY_NAME) ->withFieldName('languageId') ->withFieldSourcePath('_locale') @@ -117,7 +117,7 @@ public function convert(array $data, Context $context, MigrationContextInterface if ($mapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(SeoUrlDefinition::ENTITY_NAME) ->withFieldName('foreignKey') ->withFieldSourcePath('type') @@ -143,7 +143,7 @@ public function convert(array $data, Context $context, MigrationContextInterface if ($mapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(SeoUrlDefinition::ENTITY_NAME) ->withFieldName('foreignKey') ->withFieldSourcePath('type') @@ -159,7 +159,7 @@ public function convert(array $data, Context $context, MigrationContextInterface $this->mappingIds[] = $mapping['id']; } else { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(SeoUrlDefinition::ENTITY_NAME) ->withFieldName('foreignKey') ->withFieldSourcePath('type') diff --git a/src/Profile/Shopware/Converter/ShippingMethodConverter.php b/src/Profile/Shopware/Converter/ShippingMethodConverter.php index 9e15b7096..5917e4e95 100644 --- a/src/Profile/Shopware/Converter/ShippingMethodConverter.php +++ b/src/Profile/Shopware/Converter/ShippingMethodConverter.php @@ -16,7 +16,7 @@ use Shopware\Core\Framework\Util\Hasher; use SwagMigrationAssistant\Migration\Converter\ConvertStruct; use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\Log\EmptyNecessaryFieldRunLog; use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface; use SwagMigrationAssistant\Migration\Mapping\Lookup\CountryLookup; @@ -97,7 +97,7 @@ public function convert(array $data, Context $context, MigrationContextInterface if (empty($data['id'])) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(ShippingMethodDefinition::ENTITY_NAME) ->withFieldName('id') ->withFieldSourcePath('id') @@ -152,7 +152,7 @@ public function convert(array $data, Context $context, MigrationContextInterface if (!empty($fields)) { $this->loggingService->addLogForEach( $fields, - fn (string $key) => SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + fn (string $key) => MigrationLogBuilder::fromMigrationContext($migrationContext) ->withFieldName(ShippingMethodDefinition::ENTITY_NAME) ->withFieldSourcePath($key) ->withSourceData($data) @@ -188,7 +188,7 @@ public function convert(array $data, Context $context, MigrationContextInterface || !\array_key_exists($data['calculation'], self::CALCULATION_TYPE_MAPPING) ) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(ShippingMethodDefinition::ENTITY_NAME) ->withFieldName('prices') ->withFieldSourcePath('calculation') @@ -248,7 +248,7 @@ public function convert(array $data, Context $context, MigrationContextInterface if (!\is_array($this->mainMapping) || !\array_key_exists('id', $this->mainMapping)) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(ShippingMethodDefinition::ENTITY_NAME) ->withFieldName('id') ->withSourceData($data) @@ -653,7 +653,7 @@ protected function getShippingCosts(MigrationContextInterface $migrationContext, foreach ($shippingCosts as $key => $shippingCost) { if (empty($shippingCost['id'])) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(ShippingMethodPriceDefinition::ENTITY_NAME) ->withFieldName('id') ->withFieldSourcePath('id') @@ -690,7 +690,7 @@ protected function getShippingCosts(MigrationContextInterface $migrationContext, if (!isset($currencyMapping)) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(ShippingMethodPriceDefinition::ENTITY_NAME) ->withFieldName('currencyId') ->withFieldSourcePath('currencyShortName') @@ -709,7 +709,7 @@ protected function getShippingCosts(MigrationContextInterface $migrationContext, if (isset($shippingCost['factor']) && $shippingCost['factor'] > 0) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(ShippingMethodPriceDefinition::ENTITY_NAME) ->withFieldSourcePath('factor') ->withSourceData($shippingCost) diff --git a/src/Profile/Shopware/Converter/TranslationConverter.php b/src/Profile/Shopware/Converter/TranslationConverter.php index 8b74e8b9e..5754a2eb7 100644 --- a/src/Profile/Shopware/Converter/TranslationConverter.php +++ b/src/Profile/Shopware/Converter/TranslationConverter.php @@ -27,7 +27,7 @@ use SwagMigrationAssistant\Migration\Converter\ConvertStruct; use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities; use SwagMigrationAssistant\Migration\Logging\Log\AssociationRequiredMissingLog; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\Log\EmptyNecessaryFieldRunLog; use SwagMigrationAssistant\Migration\Logging\Log\InvalidUnserializedDataLog; use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface; @@ -68,7 +68,7 @@ public function convert( if (!isset($data['locale'])) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName('unknown_translation') ->withFieldName('languageId') ->withFieldSourcePath('locale') @@ -104,7 +104,7 @@ public function convert( } $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName('unknown_translation') ->withFieldSourcePath('objecttype') ->withSourceData($data) @@ -139,7 +139,7 @@ protected function createProductTranslation(array &$data): ConvertStruct if ($mapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(ProductTranslationDefinition::ENTITY_NAME) ->withFieldName('productId') ->withFieldSourcePath('objectkey') @@ -250,7 +250,7 @@ protected function createProductVariantTranslation(array &$data): ConvertStruct if ($mapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(ProductTranslationDefinition::ENTITY_NAME) ->withFieldName('productId') ->withFieldSourcePath('ordernumber') @@ -326,7 +326,7 @@ protected function createManufacturerProductTranslation(array $data): ConvertStr if ($mapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(ProductManufacturerTranslationDefinition::ENTITY_NAME) ->withFieldName('productManufacturerId') ->withFieldSourcePath('objectkey') @@ -408,7 +408,7 @@ protected function createUnitTranslation(array $data): ConvertStruct if ($mapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(UnitTranslationDefinition::ENTITY_NAME) ->withFieldName('unitId') ->withFieldSourcePath('objectkey') @@ -495,7 +495,7 @@ protected function createCategoryTranslation(array $data): ConvertStruct if ($mapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(CategoryTranslationDefinition::ENTITY_NAME) ->withFieldName('categoryId') ->withFieldSourcePath('objectkey') @@ -592,7 +592,7 @@ protected function createConfiguratorOptionTranslation(array $data): ConvertStru if ($mapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(PropertyGroupOptionTranslationDefinition::ENTITY_NAME) ->withFieldName('propertyGroupOptionId') ->withFieldSourcePath('objectkey') @@ -671,7 +671,7 @@ protected function createConfiguratorOptionGroupTranslation(array $data): Conver if ($mapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(PropertyGroupTranslationDefinition::ENTITY_NAME) ->withFieldName('propertyGroupId') ->withFieldSourcePath('objectkey') @@ -753,7 +753,7 @@ protected function createPropertyValueTranslation(array $data): ConvertStruct if ($mapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(PropertyGroupOptionTranslationDefinition::ENTITY_NAME) ->withFieldName('propertyGroupOptionId') ->withFieldSourcePath('objectkey') @@ -830,7 +830,7 @@ protected function createPropertyOptionTranslation(array $data): ConvertStruct if ($mapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(PropertyGroupTranslationDefinition::ENTITY_NAME) ->withFieldName('propertyGroupId') ->withFieldSourcePath('objectkey') @@ -963,7 +963,7 @@ protected function unserializeTranslation(array $data, string $entity): ?array if (!\is_array($objectData)) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName($entity) ->withFieldSourcePath('objectdata') ->withSourceData($data) @@ -998,7 +998,7 @@ protected function createProductMediaTranslation(array $data): ConvertStruct if ($mapping === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(MediaTranslationDefinition::ENTITY_NAME) ->withFieldName('mediaId') ->withFieldSourcePath('mediaId') diff --git a/src/Profile/Shopware/Gateway/Api/Reader/TableCountReader.php b/src/Profile/Shopware/Gateway/Api/Reader/TableCountReader.php index 169ccf6cd..0d2fcaf0c 100644 --- a/src/Profile/Shopware/Gateway/Api/Reader/TableCountReader.php +++ b/src/Profile/Shopware/Gateway/Api/Reader/TableCountReader.php @@ -10,7 +10,7 @@ use Shopware\Core\Framework\Context; use Shopware\Core\Framework\Log\Package; use SwagMigrationAssistant\Exception\MigrationException; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\Log\CannotReadEntityCountLog; use SwagMigrationAssistant\Migration\Logging\LoggingService; use SwagMigrationAssistant\Migration\MigrationContextInterface; @@ -70,7 +70,7 @@ private function logExceptions(array $exceptionArray, MigrationContextInterface { foreach ($exceptionArray as $exception) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withExceptionMessage($exception['message']) ->build(CannotReadEntityCountLog::class) ); diff --git a/src/Profile/Shopware/Logging/Log/DeactivatedPackLanguageLog.php b/src/Profile/Shopware/Logging/Log/DeactivatedPackLanguageLog.php index d9dd97796..99591aa06 100644 --- a/src/Profile/Shopware/Logging/Log/DeactivatedPackLanguageLog.php +++ b/src/Profile/Shopware/Logging/Log/DeactivatedPackLanguageLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Profile\Shopware\Logging\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class DeactivatedPackLanguageLog extends AbstractSwagMigrationLogEntry +readonly class DeactivatedPackLanguageLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Profile/Shopware/Logging/Log/InvalidEmailAddressLog.php b/src/Profile/Shopware/Logging/Log/InvalidEmailAddressLog.php index a6b8a6539..f35bda3ee 100644 --- a/src/Profile/Shopware/Logging/Log/InvalidEmailAddressLog.php +++ b/src/Profile/Shopware/Logging/Log/InvalidEmailAddressLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Profile\Shopware\Logging\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class InvalidEmailAddressLog extends AbstractSwagMigrationLogEntry +readonly class InvalidEmailAddressLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Profile/Shopware/Logging/Log/UnsupportedMailTemplateTypeLog.php b/src/Profile/Shopware/Logging/Log/UnsupportedMailTemplateTypeLog.php index db0a5182d..5bf8d8127 100644 --- a/src/Profile/Shopware/Logging/Log/UnsupportedMailTemplateTypeLog.php +++ b/src/Profile/Shopware/Logging/Log/UnsupportedMailTemplateTypeLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Profile\Shopware\Logging\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class UnsupportedMailTemplateTypeLog extends AbstractSwagMigrationLogEntry +readonly class UnsupportedMailTemplateTypeLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Profile/Shopware/Logging/Log/UnsupportedNumberRangeTypeLog.php b/src/Profile/Shopware/Logging/Log/UnsupportedNumberRangeTypeLog.php index 305ccde17..f7ca603a6 100644 --- a/src/Profile/Shopware/Logging/Log/UnsupportedNumberRangeTypeLog.php +++ b/src/Profile/Shopware/Logging/Log/UnsupportedNumberRangeTypeLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Profile\Shopware\Logging\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class UnsupportedNumberRangeTypeLog extends AbstractSwagMigrationLogEntry +readonly class UnsupportedNumberRangeTypeLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Profile/Shopware/Logging/Log/UnsupportedShippingCalculationTypeLog.php b/src/Profile/Shopware/Logging/Log/UnsupportedShippingCalculationTypeLog.php index 38916b61b..138945fcb 100644 --- a/src/Profile/Shopware/Logging/Log/UnsupportedShippingCalculationTypeLog.php +++ b/src/Profile/Shopware/Logging/Log/UnsupportedShippingCalculationTypeLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Profile\Shopware\Logging\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class UnsupportedShippingCalculationTypeLog extends AbstractSwagMigrationLogEntry +readonly class UnsupportedShippingCalculationTypeLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Profile/Shopware/Logging/Log/UnsupportedShippingPriceLog.php b/src/Profile/Shopware/Logging/Log/UnsupportedShippingPriceLog.php index 26c99147e..f77ee718a 100644 --- a/src/Profile/Shopware/Logging/Log/UnsupportedShippingPriceLog.php +++ b/src/Profile/Shopware/Logging/Log/UnsupportedShippingPriceLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Profile\Shopware\Logging\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class UnsupportedShippingPriceLog extends AbstractSwagMigrationLogEntry +readonly class UnsupportedShippingPriceLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Profile/Shopware/Media/LocalMediaProcessor.php b/src/Profile/Shopware/Media/LocalMediaProcessor.php index 090c95f1a..d23712cf7 100644 --- a/src/Profile/Shopware/Media/LocalMediaProcessor.php +++ b/src/Profile/Shopware/Media/LocalMediaProcessor.php @@ -16,7 +16,7 @@ use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository; use Shopware\Core\Framework\Log\Package; use Shopware\Core\Framework\Uuid\Uuid; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\Log\CannotGetFileRunLog; use SwagMigrationAssistant\Migration\Logging\Log\ExceptionRunLog; use SwagMigrationAssistant\Migration\Logging\Log\MimeTypeErrorLog; @@ -131,7 +131,7 @@ private function copyMediaFiles( if ($resolver === null) { $mappedWorkload[$mediaId]->setState(MediaProcessWorkloadStruct::ERROR_STATE); $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(MediaDefinition::ENTITY_NAME) ->withSourceData([ 'media_id' => $mediaId, @@ -155,7 +155,7 @@ private function copyMediaFiles( $mappedWorkload[$mediaId]->setState(MediaProcessWorkloadStruct::ERROR_STATE); $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(MediaDefinition::ENTITY_NAME) ->withSourceData([ 'media_id' => $mediaId, @@ -191,7 +191,7 @@ private function copyMediaFiles( $failedMedia[] = $mediaId; $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(MediaDefinition::ENTITY_NAME) ->withSourceData([ 'media_id' => $mediaId, @@ -208,7 +208,7 @@ private function copyMediaFiles( } else { $mappedWorkload[$mediaId]->setState(MediaProcessWorkloadStruct::ERROR_STATE); $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(MediaDefinition::ENTITY_NAME) ->withSourceData([ 'media_id' => $mediaId, @@ -251,7 +251,7 @@ private function persistFileToMedia( $mappedWorkload[$mediaId]->setState(MediaProcessWorkloadStruct::ERROR_STATE); $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(MediaDefinition::ENTITY_NAME) ->withSourceData([ 'media_id' => $mediaId, diff --git a/src/Profile/Shopware/Media/LocalOrderDocumentProcessor.php b/src/Profile/Shopware/Media/LocalOrderDocumentProcessor.php index 1d7bc2e41..cea0b1fc1 100644 --- a/src/Profile/Shopware/Media/LocalOrderDocumentProcessor.php +++ b/src/Profile/Shopware/Media/LocalOrderDocumentProcessor.php @@ -15,7 +15,7 @@ use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository; use Shopware\Core\Framework\Log\Package; use Shopware\Core\Framework\Uuid\Uuid; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\Log\CannotGetFileRunLog; use SwagMigrationAssistant\Migration\Logging\Log\ExceptionRunLog; use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface; @@ -99,7 +99,7 @@ private function copyMediaFiles( $mappedWorkload[$mediaId]->setState(MediaProcessWorkloadStruct::ERROR_STATE); $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(MediaDefinition::ENTITY_NAME) ->withSourceData([ 'media_id' => $mediaId, @@ -128,7 +128,7 @@ private function copyMediaFiles( $mappedWorkload[$mediaId]->setState(MediaProcessWorkloadStruct::ERROR_STATE); $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withExceptionMessage($e->getMessage()) ->withExceptionTrace($e->getTrace()) ->withSourceData([ diff --git a/src/Profile/Shopware/Media/LocalProductDownloadProcessor.php b/src/Profile/Shopware/Media/LocalProductDownloadProcessor.php index 499a4c6ed..820ef8fc4 100644 --- a/src/Profile/Shopware/Media/LocalProductDownloadProcessor.php +++ b/src/Profile/Shopware/Media/LocalProductDownloadProcessor.php @@ -16,7 +16,7 @@ use Shopware\Core\Framework\Log\Package; use Shopware\Core\Framework\Uuid\Uuid; use SwagMigrationAssistant\Exception\MigrationException; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\Log\CannotGetFileRunLog; use SwagMigrationAssistant\Migration\Logging\Log\ExceptionRunLog; use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface; @@ -103,7 +103,7 @@ private function copyMediaFiles( if (!\is_file($sourcePath)) { $mappedWorkload[$mediaId]->setState(MediaProcessWorkloadStruct::ERROR_STATE); $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(MediaDefinition::ENTITY_NAME) ->withSourceData([ 'media_id' => $mediaId, @@ -131,7 +131,7 @@ private function copyMediaFiles( $mappedWorkload[$mediaId]->setState(MediaProcessWorkloadStruct::ERROR_STATE); $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withEntityName(MediaDefinition::ENTITY_NAME) ->withSourceData([ 'media_id' => $mediaId, diff --git a/src/Profile/Shopware6/Converter/DocumentBaseConfigConverter.php b/src/Profile/Shopware6/Converter/DocumentBaseConfigConverter.php index f2cb61489..c7855cafc 100644 --- a/src/Profile/Shopware6/Converter/DocumentBaseConfigConverter.php +++ b/src/Profile/Shopware6/Converter/DocumentBaseConfigConverter.php @@ -11,7 +11,7 @@ use Shopware\Core\Framework\Log\Package; use SwagMigrationAssistant\Migration\Converter\ConvertStruct; use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface; use SwagMigrationAssistant\Migration\Mapping\Lookup\DocumentTypeLookup; use SwagMigrationAssistant\Migration\Mapping\Lookup\GlobalDocumentBaseConfigLookup; @@ -60,7 +60,7 @@ protected function convertData(array $data): ConvertStruct $converted['documentTypeId'] = $this->documentTypeLookup->get($converted['documentType']['technicalName'], $this->context); if ($converted['documentTypeId'] === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(DocumentBaseConfigDefinition::ENTITY_NAME) ->withFieldName('documentTypeId') ->withFieldSourcePath('id') diff --git a/src/Profile/Shopware6/Converter/DocumentConverter.php b/src/Profile/Shopware6/Converter/DocumentConverter.php index f74e5d845..b39403992 100644 --- a/src/Profile/Shopware6/Converter/DocumentConverter.php +++ b/src/Profile/Shopware6/Converter/DocumentConverter.php @@ -11,7 +11,7 @@ use Shopware\Core\Framework\Log\Package; use SwagMigrationAssistant\Migration\Converter\ConvertStruct; use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface; use SwagMigrationAssistant\Migration\Mapping\Lookup\DocumentTypeLookup; use SwagMigrationAssistant\Migration\Mapping\MappingServiceInterface; @@ -66,7 +66,7 @@ protected function convertData(array $data): ConvertStruct $converted['documentTypeId'] = $this->documentTypeLookup->get($converted['documentType']['technicalName'], $this->context); if ($converted['documentTypeId'] === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(DocumentDefinition::ENTITY_NAME) ->withFieldName('documentTypeId') ->withFieldSourcePath('id') diff --git a/src/Profile/Shopware6/Converter/MailTemplateConverter.php b/src/Profile/Shopware6/Converter/MailTemplateConverter.php index f1148249c..b82613b9b 100644 --- a/src/Profile/Shopware6/Converter/MailTemplateConverter.php +++ b/src/Profile/Shopware6/Converter/MailTemplateConverter.php @@ -11,7 +11,7 @@ use Shopware\Core\Framework\Log\Package; use SwagMigrationAssistant\Migration\Converter\ConvertStruct; use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface; use SwagMigrationAssistant\Migration\Mapping\Lookup\MailTemplateTypeLookup; use SwagMigrationAssistant\Migration\Mapping\Lookup\SystemDefaultMailTemplateLookup; @@ -67,7 +67,7 @@ protected function convertData(array $data): ConvertStruct $typeUuid = $this->mailTemplateTypeLookup->get($converted['mailTemplateType']['technicalName'], $this->context); if ($typeUuid === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(MailTemplateDefinition::ENTITY_NAME) ->withFieldName('mailTemplateTypeId') ->withFieldSourcePath('mailTemplateType.technicalName') diff --git a/src/Profile/Shopware6/Converter/MediaFolderConverter.php b/src/Profile/Shopware6/Converter/MediaFolderConverter.php index 2fadd4426..4187fbd9d 100644 --- a/src/Profile/Shopware6/Converter/MediaFolderConverter.php +++ b/src/Profile/Shopware6/Converter/MediaFolderConverter.php @@ -11,7 +11,7 @@ use Shopware\Core\Framework\Log\Package; use SwagMigrationAssistant\Migration\Converter\ConvertStruct; use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface; use SwagMigrationAssistant\Migration\Mapping\Lookup\MediaDefaultFolderLookup; use SwagMigrationAssistant\Migration\Mapping\Lookup\MediaThumbnailSizeLookup; @@ -61,7 +61,7 @@ protected function convertData(array $data): ConvertStruct if ($converted['parentId'] === null) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(MediaFolderDefinition::ENTITY_NAME) ->withFieldName('parentId') ->withFieldSourcePath('defaultFolder.entity') diff --git a/src/Profile/Shopware6/Converter/NumberRangeConverter.php b/src/Profile/Shopware6/Converter/NumberRangeConverter.php index ba97b3bd7..da7a38f0d 100644 --- a/src/Profile/Shopware6/Converter/NumberRangeConverter.php +++ b/src/Profile/Shopware6/Converter/NumberRangeConverter.php @@ -15,7 +15,7 @@ use Shopware\Core\System\NumberRange\NumberRangeDefinition; use SwagMigrationAssistant\Migration\Converter\ConvertStruct; use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface; use SwagMigrationAssistant\Migration\Mapping\Lookup\NumberRangeLookup; use SwagMigrationAssistant\Migration\Mapping\Lookup\NumberRangeTypeLookup; @@ -65,7 +65,7 @@ protected function convertData(array $data): ConvertStruct ); $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName(NumberRangeDefinition::ENTITY_NAME) ->withFieldName('typeId') ->withFieldSourcePath('id') diff --git a/src/Profile/Shopware6/Converter/ShopwareConverter.php b/src/Profile/Shopware6/Converter/ShopwareConverter.php index 8c53cb336..7427f3c06 100644 --- a/src/Profile/Shopware6/Converter/ShopwareConverter.php +++ b/src/Profile/Shopware6/Converter/ShopwareConverter.php @@ -12,7 +12,7 @@ use SwagMigrationAssistant\Migration\Converter\Converter; use SwagMigrationAssistant\Migration\Converter\ConvertStruct; use SwagMigrationAssistant\Migration\Logging\Log\AssociationRequiredMissingLog; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface; use SwagMigrationAssistant\Migration\Mapping\MappingServiceInterface; use SwagMigrationAssistant\Migration\MigrationContextInterface; @@ -146,7 +146,7 @@ protected function updateAssociationIds(array &$associationArray, string $entity if (empty($newAssociationId)) { if ($logMissing) { $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext) + MigrationLogBuilder::fromMigrationContext($this->migrationContext) ->withEntityName($entity) ->withConvertedData($association) ->build(AssociationRequiredMissingLog::class) diff --git a/src/Profile/Shopware6/Logging/Log/UnsupportedDocumentTypeLog.php b/src/Profile/Shopware6/Logging/Log/UnsupportedDocumentTypeLog.php index 757e66603..00063074c 100644 --- a/src/Profile/Shopware6/Logging/Log/UnsupportedDocumentTypeLog.php +++ b/src/Profile/Shopware6/Logging/Log/UnsupportedDocumentTypeLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Profile\Shopware6\Logging\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class UnsupportedDocumentTypeLog extends AbstractSwagMigrationLogEntry +readonly class UnsupportedDocumentTypeLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Profile/Shopware6/Logging/Log/UnsupportedMediaDefaultFolderLog.php b/src/Profile/Shopware6/Logging/Log/UnsupportedMediaDefaultFolderLog.php index a3126791a..122182b78 100644 --- a/src/Profile/Shopware6/Logging/Log/UnsupportedMediaDefaultFolderLog.php +++ b/src/Profile/Shopware6/Logging/Log/UnsupportedMediaDefaultFolderLog.php @@ -8,10 +8,10 @@ namespace SwagMigrationAssistant\Profile\Shopware6\Logging\Log; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; #[Package('fundamentals@after-sales')] -readonly class UnsupportedMediaDefaultFolderLog extends AbstractSwagMigrationLogEntry +readonly class UnsupportedMediaDefaultFolderLog extends AbstractMigrationLogEntry { public function isUserFixable(): bool { diff --git a/src/Profile/Shopware6/Media/HttpOrderDocumentGenerationService.php b/src/Profile/Shopware6/Media/HttpOrderDocumentGenerationService.php index dcfd25f8e..3283a7852 100644 --- a/src/Profile/Shopware6/Media/HttpOrderDocumentGenerationService.php +++ b/src/Profile/Shopware6/Media/HttpOrderDocumentGenerationService.php @@ -20,7 +20,7 @@ use SwagMigrationAssistant\Migration\Connection\SwagMigrationConnectionEntity; use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities; use SwagMigrationAssistant\Migration\Gateway\HttpClientInterface; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\Log\CannotGetFileRunLog; use SwagMigrationAssistant\Migration\Logging\Log\ExceptionRunLog; use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface; @@ -87,7 +87,7 @@ public function process( $exception = new \Exception('Connection to the source system could not be established'); $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withExceptionMessage($exception->getMessage()) ->withExceptionTrace($exception->getTrace()) ->build(ExceptionRunLog::class) @@ -289,7 +289,7 @@ private function handleFailedRequest( $mappedWorkload->setState(MediaProcessWorkloadStruct::ERROR_STATE); $this->loggingService->addLogEntry( - SwagMigrationLogBuilder::fromMigrationContext($migrationContext) + MigrationLogBuilder::fromMigrationContext($migrationContext) ->withExceptionMessage($clientException?->getMessage() ?? 'Unknown error occurred') ->withExceptionTrace($clientException?->getTrace() ?? []) ->withSourceData($additionalData) diff --git a/src/Resources/app/administration/src/core/service/api/swag-migration.api.service.ts b/src/Resources/app/administration/src/core/service/api/swag-migration.api.service.ts index 5d30e5f88..9c878aac6 100644 --- a/src/Resources/app/administration/src/core/service/api/swag-migration.api.service.ts +++ b/src/Resources/app/administration/src/core/service/api/swag-migration.api.service.ts @@ -28,7 +28,7 @@ export const MIGRATION_API_SERVICE = 'migrationApiService'; export const MIGRATION_STEP = { IDLE: 'idle', FETCHING: 'fetching', - ERROR_RESOLUTION: 'apply-fixes', + ERROR_RESOLUTION: 'error-resolution', WRITING: 'writing', MEDIA_PROCESSING: 'media-processing', CLEANUP: 'cleanup', diff --git a/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-process-screen/swag-migration-process-screen.html.twig b/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-process-screen/swag-migration-process-screen.html.twig index 559b6f65a..ab122a2c2 100644 --- a/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-process-screen/swag-migration-process-screen.html.twig +++ b/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-process-screen/swag-migration-process-screen.html.twig @@ -68,14 +68,14 @@ /> {% endblock %} - {% block swag_migration_index_main_page_card_loadingScreen_success %} - - {% endblock %} - {% block swag_migration_index_main_page_error_resolution %} {% endblock %} + {% block swag_migration_index_main_page_card_loadingScreen_success %} + + {% endblock %} + {% block swag_migration_index_main_page_modal_abort_migration_confirmDialog %} = Repository; type MigrationStep = | 'idle' | 'fetching' - | 'apply-fixes' + | 'error-resolution' | 'writing' | 'media-processing' | 'cleanup' diff --git a/tests/Core/Migration/Migration1762346793RenameColumnOfMappingTableTest.php b/tests/Core/Migration/Migration1762346793RenameColumnOfMappingTableTest.php index 0e2613b1f..57b30d6f1 100644 --- a/tests/Core/Migration/Migration1762346793RenameColumnOfMappingTableTest.php +++ b/tests/Core/Migration/Migration1762346793RenameColumnOfMappingTableTest.php @@ -16,7 +16,7 @@ /** * @internal */ -#[Package('after-sales')] +#[Package('fundamentals@after-sales')] class Migration1762346793RenameColumnOfMappingTableTest extends TestCase { use TableHelperTrait; diff --git a/tests/Migration/Controller/HistoryControllerTest.php b/tests/Migration/Controller/HistoryControllerTest.php index 50c02adf3..0a91f73f4 100644 --- a/tests/Migration/Controller/HistoryControllerTest.php +++ b/tests/Migration/Controller/HistoryControllerTest.php @@ -18,7 +18,7 @@ use SwagMigrationAssistant\Controller\HistoryController; use SwagMigrationAssistant\Migration\History\HistoryService; use SwagMigrationAssistant\Migration\History\HistoryServiceInterface; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; use SwagMigrationAssistant\Migration\Logging\SwagMigrationLoggingCollection; use SwagMigrationAssistant\Migration\MigrationContext; use SwagMigrationAssistant\Migration\Run\MigrationStep; @@ -101,7 +101,7 @@ protected function setUp(): void 'runId' => $this->runUuid, 'profileName' => Shopware55Profile::PROFILE_NAME, 'gatewayName' => ShopwareLocalGateway::GATEWAY_NAME, - 'level' => AbstractSwagMigrationLogEntry::LOG_LEVEL_ERROR, + 'level' => AbstractMigrationLogEntry::LOG_LEVEL_ERROR, 'code' => 'migration_error_1', 'userFixable' => false, ], diff --git a/tests/Migration/Controller/StatusControllerTest.php b/tests/Migration/Controller/StatusControllerTest.php index 9dff81df5..f2ddedd2b 100644 --- a/tests/Migration/Controller/StatusControllerTest.php +++ b/tests/Migration/Controller/StatusControllerTest.php @@ -639,7 +639,7 @@ public function testResumeMigration(): void [ [ 'id' => $this->runUuid, - 'step' => MigrationStep::APPLY_FIXES->value, + 'step' => MigrationStep::ERROR_RESOLUTION->value, ], ], $this->context diff --git a/tests/Migration/Logging/LoggingServiceTest.php b/tests/Migration/Logging/LoggingServiceTest.php index 28c4b15dd..31a0d6f06 100644 --- a/tests/Migration/Logging/LoggingServiceTest.php +++ b/tests/Migration/Logging/LoggingServiceTest.php @@ -16,7 +16,7 @@ use Shopware\Core\Framework\Test\TestCaseBase\IntegrationTestBehaviour; use Shopware\Core\Framework\Uuid\Uuid; use SwagMigrationAssistant\Migration\Logging\Log\AssociationRequiredMissingLog; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Logging\Log\CannotConvertChildEntityLog; use SwagMigrationAssistant\Migration\Logging\LoggingService; use SwagMigrationAssistant\Migration\Logging\SwagMigrationLoggingCollection; @@ -61,14 +61,14 @@ protected function setUp(): void public function testAddLogEntry(): void { - $log1 = (new SwagMigrationLogBuilder( + $log1 = (new MigrationLogBuilder( $this->runUuid, 'Profile name', 'Gateway name', Uuid::randomHex(), ))->build(AssociationRequiredMissingLog::class); - $log2 = (new SwagMigrationLogBuilder( + $log2 = (new MigrationLogBuilder( $this->runUuid, 'Profile name', 'Gateway name', @@ -99,7 +99,7 @@ public function testAddLogEntry(): void public function testAddLogEntryWithEntityId(): void { $entityId = Uuid::randomHex(); - $log = (new SwagMigrationLogBuilder( + $log = (new MigrationLogBuilder( $this->runUuid, 'Profile name', 'Gateway name', diff --git a/tests/Migration/Services/MigrationDataProcessingTest.php b/tests/Migration/Services/MigrationDataProcessingTest.php index 4d6f70240..cda83833a 100644 --- a/tests/Migration/Services/MigrationDataProcessingTest.php +++ b/tests/Migration/Services/MigrationDataProcessingTest.php @@ -29,7 +29,7 @@ use SwagMigrationAssistant\Migration\Data\SwagMigrationDataDefinition; use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities; use SwagMigrationAssistant\Migration\Gateway\Reader\ReaderRegistry; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; use SwagMigrationAssistant\Migration\Logging\SwagMigrationLoggingCollection; use SwagMigrationAssistant\Migration\Mapping\MappingService; use SwagMigrationAssistant\Migration\Mapping\SwagMigrationMappingDefinition; @@ -356,8 +356,8 @@ public function testFetchInvalidCustomerData(): void $type = $log->getLevel(); if ( - ($type === AbstractSwagMigrationLogEntry::LOG_LEVEL_INFO && $log->getCode() === 'SWAG_MIGRATION_ENTITY_FIELD_REASSIGNED') - || ($type === AbstractSwagMigrationLogEntry::LOG_LEVEL_WARNING && $log->getCode() === 'SWAG_MIGRATION_EMPTY_NECESSARY_FIELD') + ($type === AbstractMigrationLogEntry::LOG_LEVEL_INFO && $log->getCode() === 'SWAG_MIGRATION_ENTITY_FIELD_REASSIGNED') + || ($type === AbstractMigrationLogEntry::LOG_LEVEL_WARNING && $log->getCode() === 'SWAG_MIGRATION_EMPTY_NECESSARY_FIELD') ) { ++$countValidLogging; diff --git a/tests/Migration/Services/MigrationDataWriterTest.php b/tests/Migration/Services/MigrationDataWriterTest.php index 544aad417..7d237ed21 100644 --- a/tests/Migration/Services/MigrationDataWriterTest.php +++ b/tests/Migration/Services/MigrationDataWriterTest.php @@ -51,6 +51,7 @@ use SwagMigrationAssistant\Migration\Data\SwagMigrationDataEntity; use SwagMigrationAssistant\Migration\DataSelection\DataSelectionRegistry; use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities; +use SwagMigrationAssistant\Migration\ErrorResolution\MigrationErrorResolutionService; use SwagMigrationAssistant\Migration\Gateway\GatewayRegistry; use SwagMigrationAssistant\Migration\Gateway\Reader\ReaderRegistry; use SwagMigrationAssistant\Migration\Logging\LoggingService; @@ -74,7 +75,6 @@ use SwagMigrationAssistant\Migration\Service\PremappingService; use SwagMigrationAssistant\Migration\Setting\GeneralSettingCollection; use SwagMigrationAssistant\Migration\Writer\CustomerWriter; -use SwagMigrationAssistant\Migration\Writer\MigrationFix\MigrationFixApplier; use SwagMigrationAssistant\Migration\Writer\ProductWriter; use SwagMigrationAssistant\Migration\Writer\WriterRegistry; use SwagMigrationAssistant\Profile\Shopware\DataSelection\DataSet\CategoryDataSet; @@ -295,7 +295,7 @@ public function initServices(): void $this->loggingService, static::getContainer()->get(SwagMigrationDataDefinition::class), $mappingRepo, - static::getContainer()->get(MigrationFixApplier::class) + static::getContainer()->get(MigrationErrorResolutionService::class) ); $migrationContextFactoryMock = $this->createMock(MigrationContextFactory::class); diff --git a/tests/Migration/Services/RunServiceTest.php b/tests/Migration/Services/RunServiceTest.php index 3498ba8ce..74ea93aa3 100644 --- a/tests/Migration/Services/RunServiceTest.php +++ b/tests/Migration/Services/RunServiceTest.php @@ -342,7 +342,7 @@ public function testResumeMigration(): void (static function (): SwagMigrationRunEntity { $run = new SwagMigrationRunEntity(); $run->setId(Uuid::randomHex()); - $run->setStep(MigrationStep::APPLY_FIXES); + $run->setStep(MigrationStep::ERROR_RESOLUTION); return $run; })(), diff --git a/tests/MigrationServicesTrait.php b/tests/MigrationServicesTrait.php index fe047b6f2..e030a5b15 100644 --- a/tests/MigrationServicesTrait.php +++ b/tests/MigrationServicesTrait.php @@ -53,7 +53,7 @@ use SwagMigrationAssistant\Migration\Service\MigrationDataConverterInterface; use SwagMigrationAssistant\Migration\Service\MigrationDataFetcher; use SwagMigrationAssistant\Migration\Service\MigrationDataFetcherInterface; -use SwagMigrationAssistant\Migration\Validation\SwagMigrationValidationService; +use SwagMigrationAssistant\Migration\Validation\MigrationValidationService; use SwagMigrationAssistant\Profile\Shopware\Gateway\Api\Reader\EnvironmentReader; use SwagMigrationAssistant\Profile\Shopware\Gateway\Api\Reader\TableCountReader; use SwagMigrationAssistant\Profile\Shopware\Gateway\Api\Reader\TableReader; @@ -207,7 +207,7 @@ protected function getMigrationDataConverter( ) ); - $validationService = new SwagMigrationValidationService( + $validationService = new MigrationValidationService( $this->getContainer()->get(DefinitionInstanceRegistry::class), $this->getContainer()->get('event_dispatcher'), $loggingService, diff --git a/tests/Profile/Shopware55/Converter/ShippingMethodConverterTest.php b/tests/Profile/Shopware55/Converter/ShippingMethodConverterTest.php index cb7532046..0a5d5e148 100644 --- a/tests/Profile/Shopware55/Converter/ShippingMethodConverterTest.php +++ b/tests/Profile/Shopware55/Converter/ShippingMethodConverterTest.php @@ -21,7 +21,7 @@ use Shopware\Core\System\Locale\LocaleEntity; use SwagMigrationAssistant\Migration\Connection\SwagMigrationConnectionEntity; use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; use SwagMigrationAssistant\Migration\Mapping\Lookup\CountryLookup; use SwagMigrationAssistant\Migration\Mapping\Lookup\LanguageLookup; use SwagMigrationAssistant\Migration\MigrationContext; @@ -163,7 +163,7 @@ public function testConvertWithInvalidCalculation(): void $convertResult = $this->shippingMethodConverter->convert($shippingMethodData[0], $this->context, $this->migrationContext); $logs = $this->loggingService->getLoggingArray(); - $error = (new SwagMigrationLogBuilder('', 'Profile name', 'Gateway name')) + $error = (new MigrationLogBuilder('', 'Profile name', 'Gateway name')) ->build(UnsupportedShippingCalculationTypeLog::class); static::assertNull($convertResult->getUnmapped()); @@ -180,7 +180,7 @@ public function testConvertWithFactor(): void $convertResult = $this->shippingMethodConverter->convert($shippingMethodData[0], $this->context, $this->migrationContext); $logs = $this->loggingService->getLoggingArray(); - $error = (new SwagMigrationLogBuilder('', 'Profile name', 'Gateway name')) + $error = (new MigrationLogBuilder('', 'Profile name', 'Gateway name')) ->build(UnsupportedShippingPriceLog::class); static::assertNull($convertResult->getUnmapped()); diff --git a/tests/TableHelperTrait.php b/tests/TableHelperTrait.php index abf7c796d..6dbbdb602 100644 --- a/tests/TableHelperTrait.php +++ b/tests/TableHelperTrait.php @@ -14,7 +14,7 @@ /** * @internal */ -#[Package('after-sales')] +#[Package('fundamentals@after-sales')] trait TableHelperTrait { // Contains functions columnExists and addColumn diff --git a/tests/integration/Migration/Writer/MigrationFix/MigrationFixApplierTest.php b/tests/integration/Migration/ErrorResolution/MigrationErrorResolutionServiceTest.php similarity index 91% rename from tests/integration/Migration/Writer/MigrationFix/MigrationFixApplierTest.php rename to tests/integration/Migration/ErrorResolution/MigrationErrorResolutionServiceTest.php index bcc577fa3..df9298772 100644 --- a/tests/integration/Migration/Writer/MigrationFix/MigrationFixApplierTest.php +++ b/tests/integration/Migration/ErrorResolution/MigrationErrorResolutionServiceTest.php @@ -5,23 +5,28 @@ * file that was distributed with this source code. */ -namespace SwagMigrationAssistant\Test\integration\Migration\Writer\MigrationFix; +namespace SwagMigrationAssistant\Test\integration\Migration\ErrorResolution; use Doctrine\DBAL\Connection; use PHPUnit\Framework\TestCase; use Shopware\Core\Framework\Context; use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria; +use Shopware\Core\Framework\Log\Package; use Shopware\Core\Framework\Test\TestCaseBase\IntegrationTestBehaviour; use Shopware\Core\Framework\Uuid\Uuid; use SwagMigrationAssistant\Migration\Connection\SwagMigrationConnectionEntity; +use SwagMigrationAssistant\Migration\ErrorResolution\Entity\SwagMigrationFixEntity; +use SwagMigrationAssistant\Migration\ErrorResolution\MigrationErrorResolutionService; use SwagMigrationAssistant\Migration\Logging\SwagMigrationLoggingEntity; use SwagMigrationAssistant\Migration\MigrationContext; -use SwagMigrationAssistant\Migration\MigrationFix\SwagMigrationFixEntity; use SwagMigrationAssistant\Migration\Run\SwagMigrationRunEntity; -use SwagMigrationAssistant\Migration\Writer\MigrationFix\MigrationFixApplier; use SwagMigrationAssistant\Profile\Shopware\Gateway\Local\ShopwareLocalGateway; -class MigrationFixApplierTest extends TestCase +/** + * @internal + */ +#[Package('fundamentals@after-sales')] +class MigrationErrorResolutionServiceTest extends TestCase { use IntegrationTestBehaviour; @@ -35,7 +40,7 @@ public function testApply(): void $idTwo = Uuid::randomHex(); $idThree = Uuid::randomHex(); - $fixApplier = new MigrationFixApplier($this->getContainer()->get(Connection::class)); + $service = new MigrationErrorResolutionService($this->getContainer()->get(Connection::class)); $this->createFixAndLogging($connection->getId(), $idOne, 'val1', 'first.path', $run); $this->createFixAndLogging($connection->getId(), $idOne, ['nested' => ['array' => ['value' => 'nested array value']]], 'second.other.path', $run); @@ -56,7 +61,7 @@ public function testApply(): void ['id' => $idThree], ]; - $fixApplier->apply($data, $connection->getId(), $run->getId()); + $service->applyFixes($data, $connection->getId(), $run->getId()); $expected = [[ 'id' => $idOne, @@ -122,7 +127,7 @@ private function createRun(SwagMigrationConnectionEntity $connection): SwagMigra 'id' => $runId, 'connection_id' => $connection->getId(), 'connection' => $connection->jsonSerialize(), - 'step' => 'apply-fixes', + 'step' => 'error-resolution', ], ]; diff --git a/tests/integration/Migration/MigrationFix/SwagMigrationEntityTest.php b/tests/integration/Migration/ErrorResolution/MigrationFixTest.php similarity index 90% rename from tests/integration/Migration/MigrationFix/SwagMigrationEntityTest.php rename to tests/integration/Migration/ErrorResolution/MigrationFixTest.php index 23a51ed27..19bce751d 100644 --- a/tests/integration/Migration/MigrationFix/SwagMigrationEntityTest.php +++ b/tests/integration/Migration/ErrorResolution/MigrationFixTest.php @@ -5,23 +5,28 @@ * file that was distributed with this source code. */ -namespace SwagMigrationAssistant\Test\integration\Migration\MigrationFix; +namespace SwagMigrationAssistant\Test\integration\Migration\ErrorResolution; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; use Shopware\Core\Framework\Context; use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository; use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria; +use Shopware\Core\Framework\Log\Package; use Shopware\Core\Framework\Test\TestCaseBase\DatabaseTransactionBehaviour; use Shopware\Core\Framework\Test\TestCaseBase\KernelTestBehaviour; use Shopware\Core\Framework\Uuid\Uuid; use SwagMigrationAssistant\Migration\Connection\SwagMigrationConnectionCollection; +use SwagMigrationAssistant\Migration\ErrorResolution\Entity\SwagMigrationFixCollection; +use SwagMigrationAssistant\Migration\ErrorResolution\Entity\SwagMigrationFixEntity; use SwagMigrationAssistant\Migration\MigrationContext; -use SwagMigrationAssistant\Migration\MigrationFix\SwagMigrationFixCollection; -use SwagMigrationAssistant\Migration\MigrationFix\SwagMigrationFixEntity; use SwagMigrationAssistant\Profile\Shopware\Gateway\Local\ShopwareLocalGateway; -class SwagMigrationEntityTest extends TestCase +/** + * @internal + */ +#[Package('fundamentals@after-sales')] +class MigrationFixTest extends TestCase { use DatabaseTransactionBehaviour; use KernelTestBehaviour; diff --git a/tests/integration/Migration/Validation/SwagMigrationValidationServiceTest.php b/tests/integration/Migration/Validation/MigrationValidationServiceTest.php similarity index 84% rename from tests/integration/Migration/Validation/SwagMigrationValidationServiceTest.php rename to tests/integration/Migration/Validation/MigrationValidationServiceTest.php index 9d972d13c..76898fbc1 100644 --- a/tests/integration/Migration/Validation/SwagMigrationValidationServiceTest.php +++ b/tests/integration/Migration/Validation/MigrationValidationServiceTest.php @@ -26,13 +26,13 @@ use SwagMigrationAssistant\Migration\Run\MigrationStep; use SwagMigrationAssistant\Migration\Run\SwagMigrationRunCollection; use SwagMigrationAssistant\Migration\Run\SwagMigrationRunDefinition; -use SwagMigrationAssistant\Migration\Validation\Log\ValidationExceptionLog; -use SwagMigrationAssistant\Migration\Validation\Log\ValidationInvalidFieldValueLog; -use SwagMigrationAssistant\Migration\Validation\Log\ValidationInvalidForeignKeyLog; -use SwagMigrationAssistant\Migration\Validation\Log\ValidationMissingRequiredFieldLog; -use SwagMigrationAssistant\Migration\Validation\Log\ValidationUnexpectedFieldLog; -use SwagMigrationAssistant\Migration\Validation\SwagMigrationValidationResult; -use SwagMigrationAssistant\Migration\Validation\SwagMigrationValidationService; +use SwagMigrationAssistant\Migration\Validation\Log\MigrationValidationExceptionLog; +use SwagMigrationAssistant\Migration\Validation\Log\MigrationValidationInvalidFieldValueLog; +use SwagMigrationAssistant\Migration\Validation\Log\MigrationValidationInvalidForeignKeyLog; +use SwagMigrationAssistant\Migration\Validation\Log\MigrationValidationMissingRequiredFieldLog; +use SwagMigrationAssistant\Migration\Validation\Log\MigrationValidationUnexpectedFieldLog; +use SwagMigrationAssistant\Migration\Validation\MigrationValidationResult; +use SwagMigrationAssistant\Migration\Validation\MigrationValidationService; use SwagMigrationAssistant\Profile\Shopware54\Shopware54Profile; use SwagMigrationAssistant\Test\Mock\Gateway\Dummy\Local\DummyLocalGateway; @@ -40,14 +40,14 @@ * @internal */ #[Package('fundamentals@after-sales')] -#[CoversClass(SwagMigrationValidationService::class)] -class SwagMigrationValidationServiceTest extends TestCase +#[CoversClass(MigrationValidationService::class)] +class MigrationValidationServiceTest extends TestCase { use IntegrationTestBehaviour; private const CONNECTION_ID = '01991554142d73348ea58793d98f1989'; - private SwagMigrationValidationService $validationService; + private MigrationValidationService $validationService; /** * @var EntityRepository @@ -70,7 +70,7 @@ class SwagMigrationValidationServiceTest extends TestCase protected function setUp(): void { - $this->validationService = $this->getContainer()->get(SwagMigrationValidationService::class); + $this->validationService = $this->getContainer()->get(MigrationValidationService::class); $this->loggingRepo = $this->getContainer()->get('swag_migration_logging.repository'); $this->runRepo = $this->getContainer()->get('swag_migration_run.repository'); $this->mappingRepo = $this->getContainer()->get(SwagMigrationMappingDefinition::ENTITY_NAME . '.repository'); @@ -155,7 +155,7 @@ public function testShouldValidateStructureAndFieldsValues(array $convertedData, [] ); - static::assertInstanceOf(SwagMigrationValidationResult::class, $result); + static::assertInstanceOf(MigrationValidationResult::class, $result); static::assertSame(SwagMigrationLoggingDefinition::ENTITY_NAME, $result->getEntityName()); $this->clearCacheData(); @@ -203,7 +203,7 @@ public function testValidateAssociations(array $convertedData, array $mappings, [] ); - static::assertInstanceOf(SwagMigrationValidationResult::class, $result); + static::assertInstanceOf(MigrationValidationResult::class, $result); $logClasses = array_map(static fn ($log) => $log::class, $result->getLogs()); static::assertEquals($expectedLogs, $logClasses); @@ -238,8 +238,8 @@ public static function entityStructureAndFieldProvider(): \Generator 'createdAt' => (new \DateTime())->format(\DATE_ATOM), ], [ - ValidationMissingRequiredFieldLog::class, - ValidationMissingRequiredFieldLog::class, + MigrationValidationMissingRequiredFieldLog::class, + MigrationValidationMissingRequiredFieldLog::class, ], ]; @@ -250,8 +250,8 @@ public static function entityStructureAndFieldProvider(): \Generator 'unexpectedField2' => 'value', ], [ - ValidationUnexpectedFieldLog::class, - ValidationUnexpectedFieldLog::class, + MigrationValidationUnexpectedFieldLog::class, + MigrationValidationUnexpectedFieldLog::class, ], ]; @@ -261,7 +261,7 @@ public static function entityStructureAndFieldProvider(): \Generator 'userFixable' => 'not_a_boolean', ], [ - ValidationInvalidFieldValueLog::class, + MigrationValidationInvalidFieldValueLog::class, ], ]; @@ -271,7 +271,7 @@ public static function entityStructureAndFieldProvider(): \Generator 'code' => str_repeat('sw', 128), ], [ - ValidationInvalidFieldValueLog::class, + MigrationValidationInvalidFieldValueLog::class, ], ]; @@ -281,7 +281,7 @@ public static function entityStructureAndFieldProvider(): \Generator 'id' => 'not-a-uuid', ], [ - ValidationExceptionLog::class, + MigrationValidationExceptionLog::class, ], ]; @@ -291,7 +291,7 @@ public static function entityStructureAndFieldProvider(): \Generator 'sourceData' => "\xB1\x31", ], [ - ValidationInvalidFieldValueLog::class, + MigrationValidationInvalidFieldValueLog::class, ], ]; @@ -306,11 +306,11 @@ public static function entityStructureAndFieldProvider(): \Generator 'unexpectedField' => 'value', ], [ - ValidationMissingRequiredFieldLog::class, - ValidationUnexpectedFieldLog::class, - ValidationInvalidFieldValueLog::class, - ValidationInvalidFieldValueLog::class, - ValidationInvalidFieldValueLog::class, + MigrationValidationMissingRequiredFieldLog::class, + MigrationValidationUnexpectedFieldLog::class, + MigrationValidationInvalidFieldValueLog::class, + MigrationValidationInvalidFieldValueLog::class, + MigrationValidationInvalidFieldValueLog::class, ], ]; } @@ -354,7 +354,7 @@ public static function associationProvider(): \Generator 'runId' => Uuid::randomHex(), ], [$mapping], - [ValidationInvalidForeignKeyLog::class], + [MigrationValidationInvalidForeignKeyLog::class], ]; yield 'fk field not in converted data' => [ @@ -370,7 +370,7 @@ public static function associationProvider(): \Generator ], [], [ - ValidationInvalidFieldValueLog::class, + MigrationValidationInvalidFieldValueLog::class, ], ]; @@ -381,7 +381,7 @@ public static function associationProvider(): \Generator ], [], [ - ValidationInvalidFieldValueLog::class, + MigrationValidationInvalidFieldValueLog::class, ], ]; } diff --git a/tests/unit/Core/Field/AnyJsonFieldSerializerTest.php b/tests/unit/Core/Field/AnyJsonFieldSerializerTest.php index 61e64e394..39a83c8cf 100644 --- a/tests/unit/Core/Field/AnyJsonFieldSerializerTest.php +++ b/tests/unit/Core/Field/AnyJsonFieldSerializerTest.php @@ -24,7 +24,7 @@ /** * @internal */ -#[Package('after-sales')] +#[Package('fundamentals@after-sales')] #[CoversClass(AnyJsonFieldSerializer::class)] class AnyJsonFieldSerializerTest extends TestCase { diff --git a/tests/unit/Migration/Writer/MigrationFix/MigrationFixApplierTest.php b/tests/unit/Migration/ErrorResolution/MigrationErrorResolutionServiceTest.php similarity index 91% rename from tests/unit/Migration/Writer/MigrationFix/MigrationFixApplierTest.php rename to tests/unit/Migration/ErrorResolution/MigrationErrorResolutionServiceTest.php index d9fcb121f..9d6517ea7 100644 --- a/tests/unit/Migration/Writer/MigrationFix/MigrationFixApplierTest.php +++ b/tests/unit/Migration/ErrorResolution/MigrationErrorResolutionServiceTest.php @@ -5,16 +5,21 @@ * file that was distributed with this source code. */ -namespace SwagMigrationAssistant\Test\unit\Migration\Writer\MigrationFix; +namespace SwagMigrationAssistant\Test\unit\Migration\ErrorResolution; use Doctrine\DBAL\Connection; +use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\TestCase; use Shopware\Core\Framework\Log\Package; use Shopware\Core\Framework\Uuid\Uuid; -use SwagMigrationAssistant\Migration\Writer\MigrationFix\MigrationFixApplier; +use SwagMigrationAssistant\Migration\ErrorResolution\MigrationErrorResolutionService; -#[Package('after-sales')] -class MigrationFixApplierTest extends TestCase +/** + * @internal + */ +#[Package('fundamentals@after-sales')] +#[CoversClass(MigrationErrorResolutionService::class)] +class MigrationErrorResolutionServiceTest extends TestCase { public function testApply(): void { @@ -114,9 +119,9 @@ public function testApply(): void ], ]; - $migrationFixApplier = new MigrationFixApplier($this->createConnection($fixes)); + $migrationFixApplier = new MigrationErrorResolutionService($this->createConnection($fixes)); - $migrationFixApplier->apply($data, Uuid::randomHex(), Uuid::randomHex()); + $migrationFixApplier->applyFixes($data, Uuid::randomHex(), Uuid::randomHex()); static::assertSame($expected, $data[0]['the']['path']['to']['value']); static::assertSame($expected, $data[0]['other']['path']['to']['value']); diff --git a/tests/unit/Migration/Writer/MigrationFix/MigrationFixTest.php b/tests/unit/Migration/ErrorResolution/MigrationFixTest.php similarity index 94% rename from tests/unit/Migration/Writer/MigrationFix/MigrationFixTest.php rename to tests/unit/Migration/ErrorResolution/MigrationFixTest.php index 03c8f3591..19a968834 100644 --- a/tests/unit/Migration/Writer/MigrationFix/MigrationFixTest.php +++ b/tests/unit/Migration/ErrorResolution/MigrationFixTest.php @@ -5,16 +5,21 @@ * file that was distributed with this source code. */ -namespace SwagMigrationAssistant\Test\unit\Migration\Writer\MigrationFix; +namespace SwagMigrationAssistant\Test\unit\Migration\ErrorResolution; +use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; use Shopware\Core\Framework\Log\Package; use Shopware\Core\Framework\Uuid\Uuid; use SwagMigrationAssistant\Exception\MigrationException; -use SwagMigrationAssistant\Migration\Writer\MigrationFix\MigrationFix; +use SwagMigrationAssistant\Migration\ErrorResolution\MigrationFix; -#[Package('after-sales')] +/** + * @internal + */ +#[Package('fundamentals@after-sales')] +#[CoversClass(MigrationFix::class)] class MigrationFixTest extends TestCase { public function testApplyFix(): void diff --git a/tests/unit/Migration/History/HistoryServiceTest.php b/tests/unit/Migration/History/HistoryServiceTest.php index 5c951b1c1..56015f5a1 100644 --- a/tests/unit/Migration/History/HistoryServiceTest.php +++ b/tests/unit/Migration/History/HistoryServiceTest.php @@ -24,7 +24,7 @@ use SwagMigrationAssistant\Exception\MigrationException; use SwagMigrationAssistant\Migration\Connection\SwagMigrationConnectionEntity; use SwagMigrationAssistant\Migration\History\HistoryService; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; use SwagMigrationAssistant\Migration\Logging\SwagMigrationLoggingCollection; use SwagMigrationAssistant\Migration\Logging\SwagMigrationLoggingDefinition; use SwagMigrationAssistant\Migration\Logging\SwagMigrationLoggingEntity; @@ -88,7 +88,7 @@ public static function logCountProvider(): \Generator $migrationLog = new SwagMigrationLoggingEntity(); $migrationLog->setId($ids->get('log1')); $migrationLog->setAutoIncrement(1); - $migrationLog->setLevel(AbstractSwagMigrationLogEntry::LOG_LEVEL_WARNING); + $migrationLog->setLevel(AbstractMigrationLogEntry::LOG_LEVEL_WARNING); $migrationLog->setCode('TEST_CODE'); $migrationLog->setProfileName('profile name'); $migrationLog->setGatewayName('gateway name'); @@ -139,7 +139,7 @@ public static function logCountProvider(): \Generator $migrationLog2 = clone $migrationLog; $migrationLog2->setId($ids->get('log2')); $migrationLog2->setAutoIncrement(2); - $migrationLog2->setLevel(AbstractSwagMigrationLogEntry::LOG_LEVEL_ERROR); + $migrationLog2->setLevel(AbstractMigrationLogEntry::LOG_LEVEL_ERROR); $migrationLog2->setCode('TEST_CODE_2'); yield 'multiple logs' => [ @@ -161,7 +161,7 @@ public static function logCountProvider(): \Generator $minimalLog = new SwagMigrationLoggingEntity(); $minimalLog->setId($ids->get('log-minimal')); $minimalLog->setAutoIncrement(1); - $minimalLog->setLevel(AbstractSwagMigrationLogEntry::LOG_LEVEL_INFO); + $minimalLog->setLevel(AbstractMigrationLogEntry::LOG_LEVEL_INFO); $minimalLog->setCode('TEST_CODE_MINIMAL'); $minimalLog->setProfileName('profile name'); $minimalLog->setGatewayName('gateway name'); diff --git a/tests/unit/Migration/Logging/Log/SwagMigrationLogTest.php b/tests/unit/Migration/Logging/Log/MigrationLogTest.php similarity index 73% rename from tests/unit/Migration/Logging/Log/SwagMigrationLogTest.php rename to tests/unit/Migration/Logging/Log/MigrationLogTest.php index 8d43813f0..78fc33be5 100644 --- a/tests/unit/Migration/Logging/Log/SwagMigrationLogTest.php +++ b/tests/unit/Migration/Logging/Log/MigrationLogTest.php @@ -7,14 +7,16 @@ namespace SwagMigrationAssistant\Test\unit\Migration\Logging\Log; +use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; use Shopware\Core\Framework\Log\Package; use Shopware\Core\Framework\Uuid\Uuid; use SwagMigrationAssistant\Migration\Connection\SwagMigrationConnectionEntity; use SwagMigrationAssistant\Migration\Logging\Log\AssociationRequiredMissingLog; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractSwagMigrationLogEntry; -use SwagMigrationAssistant\Migration\Logging\Log\Builder\SwagMigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder; +use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogEntry; use SwagMigrationAssistant\Migration\Logging\Log\CannotConvertChildEntityLog; use SwagMigrationAssistant\Migration\Logging\Log\CannotConvertEntityLog; use SwagMigrationAssistant\Migration\Logging\Log\CannotGetFileRunLog; @@ -36,11 +38,11 @@ use SwagMigrationAssistant\Migration\Logging\Log\UnsupportedObjectTypeLog; use SwagMigrationAssistant\Migration\Logging\Log\WriteExceptionRunLog; use SwagMigrationAssistant\Migration\MigrationContext; -use SwagMigrationAssistant\Migration\Validation\Log\ValidationExceptionLog; -use SwagMigrationAssistant\Migration\Validation\Log\ValidationInvalidFieldValueLog; -use SwagMigrationAssistant\Migration\Validation\Log\ValidationInvalidForeignKeyLog; -use SwagMigrationAssistant\Migration\Validation\Log\ValidationMissingRequiredFieldLog; -use SwagMigrationAssistant\Migration\Validation\Log\ValidationUnexpectedFieldLog; +use SwagMigrationAssistant\Migration\Validation\Log\MigrationValidationExceptionLog; +use SwagMigrationAssistant\Migration\Validation\Log\MigrationValidationInvalidFieldValueLog; +use SwagMigrationAssistant\Migration\Validation\Log\MigrationValidationInvalidForeignKeyLog; +use SwagMigrationAssistant\Migration\Validation\Log\MigrationValidationMissingRequiredFieldLog; +use SwagMigrationAssistant\Migration\Validation\Log\MigrationValidationUnexpectedFieldLog; use SwagMigrationAssistant\Profile\Shopware54\Shopware54Profile; use SwagMigrationAssistant\Test\Mock\Gateway\Dummy\Local\DummyLocalGateway; @@ -48,10 +50,11 @@ * @internal */ #[Package('fundamentals@after-sales')] -class SwagMigrationLogTest extends TestCase +#[CoversClass(MigrationLogEntry::class)] +class MigrationLogTest extends TestCase { /** - * @param class-string $logClass + * @param class-string $logClass */ #[DataProvider('logProvider')] public function testLogEntry(string $logClass, string $code, string $level, bool $userFixable): void @@ -70,7 +73,7 @@ public function testLogEntry(string $logClass, string $code, string $level, bool $entityId = Uuid::randomHex(); - $logEntry = SwagMigrationLogBuilder::fromMigrationContext($context) + $logEntry = MigrationLogBuilder::fromMigrationContext($context) ->withEntityName('test1') ->withFieldName('test2') ->withFieldSourcePath('test3') @@ -97,185 +100,185 @@ public function testLogEntry(string $logClass, string $code, string $level, bool public static function logProvider(): \Generator { - yield ValidationExceptionLog::class => [ - 'logClass' => ValidationExceptionLog::class, + yield MigrationValidationExceptionLog::class => [ + 'logClass' => MigrationValidationExceptionLog::class, 'code' => 'SWAG_MIGRATION_VALIDATION_EXCEPTION', - 'level' => AbstractSwagMigrationLogEntry::LOG_LEVEL_ERROR, + 'level' => AbstractMigrationLogEntry::LOG_LEVEL_ERROR, 'userFixable' => false, ]; - yield ValidationInvalidFieldValueLog::class => [ - 'logClass' => ValidationInvalidFieldValueLog::class, + yield MigrationValidationInvalidFieldValueLog::class => [ + 'logClass' => MigrationValidationInvalidFieldValueLog::class, 'code' => 'SWAG_MIGRATION_VALIDATION_INVALID_FIELD_VALUE', - 'level' => AbstractSwagMigrationLogEntry::LOG_LEVEL_ERROR, + 'level' => AbstractMigrationLogEntry::LOG_LEVEL_ERROR, 'userFixable' => true, ]; - yield ValidationInvalidForeignKeyLog::class => [ - 'logClass' => ValidationInvalidForeignKeyLog::class, + yield MigrationValidationInvalidForeignKeyLog::class => [ + 'logClass' => MigrationValidationInvalidForeignKeyLog::class, 'code' => 'SWAG_MIGRATION_VALIDATION_INVALID_FOREIGN_KEY', - 'level' => AbstractSwagMigrationLogEntry::LOG_LEVEL_WARNING, + 'level' => AbstractMigrationLogEntry::LOG_LEVEL_WARNING, 'userFixable' => true, ]; - yield ValidationMissingRequiredFieldLog::class => [ - 'logClass' => ValidationMissingRequiredFieldLog::class, + yield MigrationValidationMissingRequiredFieldLog::class => [ + 'logClass' => MigrationValidationMissingRequiredFieldLog::class, 'code' => 'SWAG_MIGRATION_VALIDATION_MISSING_REQUIRED_FIELD', - 'level' => AbstractSwagMigrationLogEntry::LOG_LEVEL_ERROR, + 'level' => AbstractMigrationLogEntry::LOG_LEVEL_ERROR, 'userFixable' => true, ]; - yield ValidationUnexpectedFieldLog::class => [ - 'logClass' => ValidationUnexpectedFieldLog::class, + yield MigrationValidationUnexpectedFieldLog::class => [ + 'logClass' => MigrationValidationUnexpectedFieldLog::class, 'code' => 'SWAG_MIGRATION_VALIDATION_UNEXPECTED_FIELD', - 'level' => AbstractSwagMigrationLogEntry::LOG_LEVEL_WARNING, + 'level' => AbstractMigrationLogEntry::LOG_LEVEL_WARNING, 'userFixable' => true, ]; yield AssociationRequiredMissingLog::class => [ 'logClass' => AssociationRequiredMissingLog::class, 'code' => 'SWAG_MIGRATION__SHOPWARE_ASSOCIATION_REQUIRED_MISSING', - 'level' => AbstractSwagMigrationLogEntry::LOG_LEVEL_WARNING, + 'level' => AbstractMigrationLogEntry::LOG_LEVEL_WARNING, 'userFixable' => false, ]; yield CannotConvertChildEntityLog::class => [ 'logClass' => CannotConvertChildEntityLog::class, 'code' => 'SWAG_MIGRATION_CANNOT_CONVERT_CHILD_ENTITY', - 'level' => AbstractSwagMigrationLogEntry::LOG_LEVEL_WARNING, + 'level' => AbstractMigrationLogEntry::LOG_LEVEL_WARNING, 'userFixable' => false, ]; yield CannotConvertEntityLog::class => [ 'logClass' => CannotConvertEntityLog::class, 'code' => 'SWAG_MIGRATION_CANNOT_CONVERT', - 'level' => AbstractSwagMigrationLogEntry::LOG_LEVEL_WARNING, + 'level' => AbstractMigrationLogEntry::LOG_LEVEL_WARNING, 'userFixable' => false, ]; yield CannotGetFileRunLog::class => [ 'logClass' => CannotGetFileRunLog::class, 'code' => 'SWAG_MIGRATION_CANNOT_GET_FILE', - 'level' => AbstractSwagMigrationLogEntry::LOG_LEVEL_WARNING, + 'level' => AbstractMigrationLogEntry::LOG_LEVEL_WARNING, 'userFixable' => false, ]; yield CannotReadEntityCountLog::class => [ 'logClass' => CannotReadEntityCountLog::class, 'code' => 'SWAG_MIGRATION__COULD_NOT_READ_ENTITY_COUNT', - 'level' => AbstractSwagMigrationLogEntry::LOG_LEVEL_WARNING, + 'level' => AbstractMigrationLogEntry::LOG_LEVEL_WARNING, 'userFixable' => false, ]; yield DataSetNotFoundLog::class => [ 'logClass' => DataSetNotFoundLog::class, 'code' => 'SWAG_MIGRATION__DATASET_NOT_FOUND', - 'level' => AbstractSwagMigrationLogEntry::LOG_LEVEL_WARNING, + 'level' => AbstractMigrationLogEntry::LOG_LEVEL_WARNING, 'userFixable' => false, ]; yield DocumentTypeNotSupportedLog::class => [ 'logClass' => DocumentTypeNotSupportedLog::class, 'code' => 'SWAG_MIGRATION__DOCUMENT_TYPE_NOT_SUPPORTED', - 'level' => AbstractSwagMigrationLogEntry::LOG_LEVEL_WARNING, + 'level' => AbstractMigrationLogEntry::LOG_LEVEL_WARNING, 'userFixable' => false, ]; yield EmptyNecessaryFieldRunLog::class => [ 'logClass' => EmptyNecessaryFieldRunLog::class, 'code' => 'SWAG_MIGRATION_EMPTY_NECESSARY_FIELD', - 'level' => AbstractSwagMigrationLogEntry::LOG_LEVEL_WARNING, + 'level' => AbstractMigrationLogEntry::LOG_LEVEL_WARNING, 'userFixable' => false, ]; yield EntityAlreadyExistsRunLog::class => [ 'logClass' => EntityAlreadyExistsRunLog::class, 'code' => 'SWAG_MIGRATION_ENTITY_ALREADY_EXISTS', - 'level' => AbstractSwagMigrationLogEntry::LOG_LEVEL_INFO, + 'level' => AbstractMigrationLogEntry::LOG_LEVEL_INFO, 'userFixable' => false, ]; yield ExceptionRunLog::class => [ 'logClass' => ExceptionRunLog::class, 'code' => 'SWAG_MIGRATION_RUN_EXCEPTION', - 'level' => AbstractSwagMigrationLogEntry::LOG_LEVEL_ERROR, + 'level' => AbstractMigrationLogEntry::LOG_LEVEL_ERROR, 'userFixable' => false, ]; yield FieldReassignedRunLog::class => [ 'logClass' => FieldReassignedRunLog::class, 'code' => 'SWAG_MIGRATION_ENTITY_FIELD_REASSIGNED', - 'level' => AbstractSwagMigrationLogEntry::LOG_LEVEL_INFO, + 'level' => AbstractMigrationLogEntry::LOG_LEVEL_INFO, 'userFixable' => false, ]; yield InvalidUnserializedDataLog::class => [ 'logClass' => InvalidUnserializedDataLog::class, 'code' => 'SWAG_MIGRATION__SHOPWARE_INVALID_UNSERIALIZED_DATA', - 'level' => AbstractSwagMigrationLogEntry::LOG_LEVEL_WARNING, + 'level' => AbstractMigrationLogEntry::LOG_LEVEL_WARNING, 'userFixable' => false, ]; yield MessageQueueExceptionLog::class => [ 'logClass' => MessageQueueExceptionLog::class, 'code' => 'SWAG_MIGRATION_MESSAGE_QUEUE_EXCEPTION', - 'level' => AbstractSwagMigrationLogEntry::LOG_LEVEL_INFO, + 'level' => AbstractMigrationLogEntry::LOG_LEVEL_INFO, 'userFixable' => false, ]; yield MimeTypeErrorLog::class => [ 'logClass' => MimeTypeErrorLog::class, 'code' => 'SWAG_MIGRATION__MIME_TYPE_COULD_NOT_BE_DETERMINED', - 'level' => AbstractSwagMigrationLogEntry::LOG_LEVEL_ERROR, + 'level' => AbstractMigrationLogEntry::LOG_LEVEL_ERROR, 'userFixable' => false, ]; yield ProcessorNotFoundLog::class => [ 'logClass' => ProcessorNotFoundLog::class, 'code' => 'SWAG_MIGRATION__PROCESSOR_NOT_FOUND', - 'level' => AbstractSwagMigrationLogEntry::LOG_LEVEL_ERROR, + 'level' => AbstractMigrationLogEntry::LOG_LEVEL_ERROR, 'userFixable' => false, ]; yield RunAbortedAutomaticallyLog::class => [ 'logClass' => RunAbortedAutomaticallyLog::class, 'code' => 'SWAG_MIGRATION_RUN_ABORTED_AUTOMATICALLY_EXCEPTION', - 'level' => AbstractSwagMigrationLogEntry::LOG_LEVEL_ERROR, + 'level' => AbstractMigrationLogEntry::LOG_LEVEL_ERROR, 'userFixable' => false, ]; yield TemporaryFileErrorLog::class => [ 'logClass' => TemporaryFileErrorLog::class, 'code' => 'SWAG_MIGRATION__TEMPORARY_FILE_COULD_NOT_BE_CREATED', - 'level' => AbstractSwagMigrationLogEntry::LOG_LEVEL_ERROR, + 'level' => AbstractMigrationLogEntry::LOG_LEVEL_ERROR, 'userFixable' => false, ]; yield ThemeCompilingErrorRunLog::class => [ 'logClass' => ThemeCompilingErrorRunLog::class, 'code' => 'SWAG_MIGRATION__THEME_COMPILING_ERROR', - 'level' => AbstractSwagMigrationLogEntry::LOG_LEVEL_ERROR, + 'level' => AbstractMigrationLogEntry::LOG_LEVEL_ERROR, 'userFixable' => false, ]; yield UnknownEntityLog::class => [ 'logClass' => UnknownEntityLog::class, 'code' => 'SWAG_MIGRATION_ENTITY_UNKNOWN', - 'level' => AbstractSwagMigrationLogEntry::LOG_LEVEL_WARNING, + 'level' => AbstractMigrationLogEntry::LOG_LEVEL_WARNING, 'userFixable' => false, ]; yield UnsupportedObjectTypeLog::class => [ 'logClass' => UnsupportedObjectTypeLog::class, 'code' => 'SWAG_MIGRATION__SHOPWARE_UNSUPPORTED_OBJECT_TYPE', - 'level' => AbstractSwagMigrationLogEntry::LOG_LEVEL_WARNING, + 'level' => AbstractMigrationLogEntry::LOG_LEVEL_WARNING, 'userFixable' => false, ]; yield WriteExceptionRunLog::class => [ 'logClass' => WriteExceptionRunLog::class, 'code' => 'SWAG_MIGRATION__WRITE_EXCEPTION_OCCURRED', - 'level' => AbstractSwagMigrationLogEntry::LOG_LEVEL_ERROR, + 'level' => AbstractMigrationLogEntry::LOG_LEVEL_ERROR, 'userFixable' => false, ]; } diff --git a/tests/unit/Migration/Validation/Event/SwagMigrationPostValidationEventTest.php b/tests/unit/Migration/Validation/Event/MigrationPostValidationEventTest.php similarity index 73% rename from tests/unit/Migration/Validation/Event/SwagMigrationPostValidationEventTest.php rename to tests/unit/Migration/Validation/Event/MigrationPostValidationEventTest.php index 5ed6b641a..c8e9aa712 100644 --- a/tests/unit/Migration/Validation/Event/SwagMigrationPostValidationEventTest.php +++ b/tests/unit/Migration/Validation/Event/MigrationPostValidationEventTest.php @@ -14,19 +14,19 @@ use Shopware\Core\Framework\Log\Package; use SwagMigrationAssistant\Migration\Connection\SwagMigrationConnectionEntity; use SwagMigrationAssistant\Migration\MigrationContext; -use SwagMigrationAssistant\Migration\Validation\Event\SwagMigrationPostValidationEvent; -use SwagMigrationAssistant\Migration\Validation\SwagMigrationValidationContext; +use SwagMigrationAssistant\Migration\Validation\Event\MigrationPostValidationEvent; +use SwagMigrationAssistant\Migration\Validation\MigrationValidationContext; /** * @internal */ #[Package('fundamentals@after-sales')] -#[CoversClass(SwagMigrationPostValidationEvent::class)] -class SwagMigrationPostValidationEventTest extends TestCase +#[CoversClass(MigrationPostValidationEvent::class)] +class MigrationPostValidationEventTest extends TestCase { public function testPostValidationEvent(): void { - $context = new SwagMigrationValidationContext( + $context = new MigrationValidationContext( Context::createDefaultContext(), new MigrationContext(new SwagMigrationConnectionEntity()), new CustomerDefinition(), @@ -34,7 +34,7 @@ public function testPostValidationEvent(): void [] ); - $event = new SwagMigrationPostValidationEvent($context); + $event = new MigrationPostValidationEvent($context); static::assertSame($context, $event->getValidationContext()); static::assertSame($context->getContext(), $event->getContext()); diff --git a/tests/unit/Migration/Validation/Event/SwagMigrationPreValidationEventTest.php b/tests/unit/Migration/Validation/Event/MigrationPreValidationEventTest.php similarity index 73% rename from tests/unit/Migration/Validation/Event/SwagMigrationPreValidationEventTest.php rename to tests/unit/Migration/Validation/Event/MigrationPreValidationEventTest.php index 928ebe062..723faed55 100644 --- a/tests/unit/Migration/Validation/Event/SwagMigrationPreValidationEventTest.php +++ b/tests/unit/Migration/Validation/Event/MigrationPreValidationEventTest.php @@ -14,19 +14,19 @@ use Shopware\Core\Framework\Log\Package; use SwagMigrationAssistant\Migration\Connection\SwagMigrationConnectionEntity; use SwagMigrationAssistant\Migration\MigrationContext; -use SwagMigrationAssistant\Migration\Validation\Event\SwagMigrationPreValidationEvent; -use SwagMigrationAssistant\Migration\Validation\SwagMigrationValidationContext; +use SwagMigrationAssistant\Migration\Validation\Event\MigrationPreValidationEvent; +use SwagMigrationAssistant\Migration\Validation\MigrationValidationContext; /** * @internal */ #[Package('fundamentals@after-sales')] -#[CoversClass(SwagMigrationPreValidationEvent::class)] -class SwagMigrationPreValidationEventTest extends TestCase +#[CoversClass(MigrationPreValidationEvent::class)] +class MigrationPreValidationEventTest extends TestCase { public function testPreValidationEvent(): void { - $context = new SwagMigrationValidationContext( + $context = new MigrationValidationContext( Context::createDefaultContext(), new MigrationContext(new SwagMigrationConnectionEntity()), new CustomerDefinition(), @@ -34,7 +34,7 @@ public function testPreValidationEvent(): void [] ); - $event = new SwagMigrationPreValidationEvent($context); + $event = new MigrationPreValidationEvent($context); static::assertSame($context, $event->getValidationContext()); static::assertSame($context->getContext(), $event->getContext()); diff --git a/tests/unit/Migration/Validation/SwagMigrationValidationContextTest.php b/tests/unit/Migration/Validation/MigrationValidationContextTest.php similarity index 89% rename from tests/unit/Migration/Validation/SwagMigrationValidationContextTest.php rename to tests/unit/Migration/Validation/MigrationValidationContextTest.php index 4297a6f5c..1d16028a1 100644 --- a/tests/unit/Migration/Validation/SwagMigrationValidationContextTest.php +++ b/tests/unit/Migration/Validation/MigrationValidationContextTest.php @@ -15,7 +15,7 @@ use Shopware\Core\Framework\Uuid\Uuid; use SwagMigrationAssistant\Migration\Connection\SwagMigrationConnectionEntity; use SwagMigrationAssistant\Migration\MigrationContext; -use SwagMigrationAssistant\Migration\Validation\SwagMigrationValidationContext; +use SwagMigrationAssistant\Migration\Validation\MigrationValidationContext; use SwagMigrationAssistant\Profile\Shopware54\Shopware54Profile; use SwagMigrationAssistant\Test\Mock\Gateway\Dummy\Local\DummyLocalGateway; @@ -23,8 +23,8 @@ * @internal */ #[Package('fundamentals@after-sales')] -#[CoversClass(SwagMigrationValidationContext::class)] -class SwagMigrationValidationContextTest extends TestCase +#[CoversClass(MigrationValidationContext::class)] +class MigrationValidationContextTest extends TestCase { public function testValidationContext(): void { @@ -43,7 +43,7 @@ public function testValidationContext(): void $context = Context::createDefaultContext(); $entityDefinition = new CustomerDefinition(); - $validationContext = new SwagMigrationValidationContext( + $validationContext = new MigrationValidationContext( $context, $migrationContext, $entityDefinition, diff --git a/tests/unit/Migration/Validation/SwagMigrationValidationResultTest.php b/tests/unit/Migration/Validation/MigrationValidationResultTest.php similarity index 72% rename from tests/unit/Migration/Validation/SwagMigrationValidationResultTest.php rename to tests/unit/Migration/Validation/MigrationValidationResultTest.php index ed7f25b89..36a5a813d 100644 --- a/tests/unit/Migration/Validation/SwagMigrationValidationResultTest.php +++ b/tests/unit/Migration/Validation/MigrationValidationResultTest.php @@ -11,25 +11,25 @@ use PHPUnit\Framework\TestCase; use Shopware\Core\Checkout\Customer\CustomerDefinition; use Shopware\Core\Framework\Log\Package; -use SwagMigrationAssistant\Migration\Validation\Log\ValidationExceptionLog; -use SwagMigrationAssistant\Migration\Validation\SwagMigrationValidationResult; +use SwagMigrationAssistant\Migration\Validation\Log\MigrationValidationExceptionLog; +use SwagMigrationAssistant\Migration\Validation\MigrationValidationResult; /** * @internal */ #[Package('fundamentals@after-sales')] -#[CoversClass(SwagMigrationValidationResult::class)] -class SwagMigrationValidationResultTest extends TestCase +#[CoversClass(MigrationValidationResult::class)] +class MigrationValidationResultTest extends TestCase { public function testValidationResult(): void { - $result = new SwagMigrationValidationResult(CustomerDefinition::ENTITY_NAME); + $result = new MigrationValidationResult(CustomerDefinition::ENTITY_NAME); static::assertSame(CustomerDefinition::ENTITY_NAME, $result->getEntityName()); static::assertFalse($result->hasLogs()); static::assertEmpty($result->getLogs()); - $log = new ValidationExceptionLog( + $log = new MigrationValidationExceptionLog( 'test1', 'test2', 'test3',