chore: check naming consistency across error resolution (#94)

Author: larskemper

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

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`,

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(

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

src/Core/Migration/Migration1762346793RenameColumnOfMappingTable.php

@@ -15,7 +15,7 @@
 /**
  * @internal
  */
-#[Package('after-sales')]
+#[Package('fundamentals@after-sales')]
 class Migration1762346793RenameColumnOfMappingTable extends MigrationStep
 {
     use ColumnExistsTrait;

src/DependencyInjection/entity.xml

@@ -46,7 +46,7 @@
             <tag name="shopware.entity.definition" entity="swag_migration_connection"/>
         </service>
 
-        <service id="SwagMigrationAssistant\Migration\MigrationFix\SwagMigrationFixDefinition">
+        <service id="SwagMigrationAssistant\Migration\ErrorResolution\Entity\SwagMigrationFixDefinition">
             <tag name="shopware.entity.definition" entity="swag_migration_fix"/>
         </service>
 
@@ -56,6 +56,5 @@
 
             <tag name="shopware.field_serializer"/>
         </service>
-
     </services>
 </container>

src/DependencyInjection/migration.xml

@@ -225,7 +225,7 @@
             <argument type="service" id="SwagMigrationAssistant\Migration\Logging\LoggingService"/>
             <argument type="service" id="SwagMigrationAssistant\Migration\Data\SwagMigrationDataDefinition"/>
             <argument type="service" id="SwagMigrationAssistant\Migration\Mapping\MappingService"/>
-            <argument type="service" id="SwagMigrationAssistant\Migration\Validation\SwagMigrationValidationService"/>
+            <argument type="service" id="SwagMigrationAssistant\Migration\Validation\MigrationValidationService"/>
         </service>
 
         <service id="SwagMigrationAssistant\Migration\Service\MigrationDataWriter" public="true">
@@ -236,7 +236,7 @@
             <argument type="service" id="SwagMigrationAssistant\Migration\Logging\LoggingService"/>
             <argument type="service" id="SwagMigrationAssistant\Migration\Data\SwagMigrationDataDefinition"/>
             <argument type="service" id="swag_migration_mapping.repository"/>
-            <argument type="service" id="SwagMigrationAssistant\Migration\Writer\MigrationFix\MigrationFixApplier"/>
+            <argument type="service" id="SwagMigrationAssistant\Migration\ErrorResolution\MigrationErrorResolutionService"/>
         </service>
 
         <service id="SwagMigrationAssistant\Migration\Service\MediaFileProcessorService" public="true">
@@ -416,7 +416,7 @@
                       id="SwagMigrationAssistant\Core\Content\Product\Stock\StockStorageDecorator.inner"/>
         </service>
 
-        <service id="SwagMigrationAssistant\Migration\Validation\SwagMigrationValidationService">
+        <service id="SwagMigrationAssistant\Migration\Validation\MigrationValidationService">
             <argument type="service" id="Shopware\Core\Framework\DataAbstractionLayer\DefinitionInstanceRegistry"/>
             <argument type="service" id="Symfony\Component\EventDispatcher\EventDispatcherInterface"/>
             <argument type="service" id="SwagMigrationAssistant\Migration\Logging\LoggingService"/>

src/DependencyInjection/writer.xml

@@ -224,7 +224,7 @@
             <tag name="shopware.migration.writer"/>
         </service>
 
-        <service id="SwagMigrationAssistant\Migration\Writer\MigrationFix\MigrationFixApplier">
+        <service id="SwagMigrationAssistant\Migration\ErrorResolution\MigrationErrorResolutionService">
             <argument type="service" id="Doctrine\DBAL\Connection"/>
         </service>
     </services>

…rationFix/SwagMigrationFixCollection.php …on/Entity/SwagMigrationFixCollection.phpsrc/Migration/MigrationFix/SwagMigrationFixCollection.php renamed to src/Migration/ErrorResolution/Entity/SwagMigrationFixCollection.php src/Migration/MigrationFix/SwagMigrationFixCollection.php renamed to src/Migration/ErrorResolution/Entity/SwagMigrationFixCollection.php

@@ -5,15 +5,15 @@
  * 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;
 
 /**
  * @extends EntityCollection<SwagMigrationFixEntity>
  */
-#[Package('after-sales')]
+#[Package('fundamentals@after-sales')]
 class SwagMigrationFixCollection extends EntityCollection
 {
     protected function getExpectedClass(): string

…rationFix/SwagMigrationFixDefinition.php …on/Entity/SwagMigrationFixDefinition.phpsrc/Migration/MigrationFix/SwagMigrationFixDefinition.php renamed to src/Migration/ErrorResolution/Entity/SwagMigrationFixDefinition.php src/Migration/MigrationFix/SwagMigrationFixDefinition.php renamed to 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';