Skip to content

Commit 73382da

Browse files
larskemperlarskemper
committed
fix: phpunit
1 parent 20f1be8 commit 73382da

26 files changed

+111
-277
lines changed

‎src/Profile/Magento/Converter/NewsletterRecipientConverter.php‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,12 @@ public function convert(array $data, Context $context, MigrationContextInterface
7272
$converted['languageId'] = $languageMapping['entityUuid'];
7373
$converted['hash'] = $data['subscriber_confirm_code'];
7474

75-
$salesChannelMapping = $this->getSalesChannelMapping($data);
75+
$salesChannelMapping = $this->getSalesChannelMapping($data, $migrationContext);
76+
7677
if ($salesChannelMapping === null) {
7778
return new ConvertStruct(null, $this->originalData);
7879
}
80+
7981
$this->mappingIds[] = $salesChannelMapping['id'];
8082
$converted['salesChannelId'] = $salesChannelMapping['entityUuid'];
8183

@@ -90,12 +92,14 @@ public function convert(array $data, Context $context, MigrationContextInterface
9092
if (isset($data['title'])) {
9193
$this->convertValue($converted, 'title', $data, 'title');
9294
}
93-
$status = $this->getStatus($data);
95+
96+
$status = $this->getStatus($data, $migrationContext);
97+
9498
if ($status === null) {
9599
return new ConvertStruct(null, $this->originalData);
96100
}
97-
$converted['status'] = $status;
98101

102+
$converted['status'] = $status;
99103
$this->updateMainMapping($migrationContext, $context);
100104

101105
unset(
@@ -115,7 +119,7 @@ public function convert(array $data, Context $context, MigrationContextInterface
115119
return new ConvertStruct($converted, $resultData, $this->mainMapping['id'] ?? null);
116120
}
117121

118-
private function getSalesChannelMapping(array $data): ?array
122+
private function getSalesChannelMapping(array $data, MigrationContextInterface $migrationContext): ?array
119123
{
120124
$salesChannelMapping = $this->mappingService->getMapping(
121125
$this->connectionId,
@@ -126,7 +130,7 @@ private function getSalesChannelMapping(array $data): ?array
126130

127131
if ($salesChannelMapping === null) {
128132
$this->loggingService->addLogEntry( // TODO: add optional fields
129-
SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext)
133+
SwagMigrationLogBuilder::fromMigrationContext($migrationContext)
130134
->withEntityName(SalesChannelDefinition::ENTITY_NAME)
131135
->build(EmptyNecessaryFieldRunLog::class)
132136
);
@@ -135,7 +139,7 @@ private function getSalesChannelMapping(array $data): ?array
135139
return $salesChannelMapping;
136140
}
137141

138-
private function getStatus(array $data): ?string
142+
private function getStatus(array $data, MigrationContextInterface $migrationContext): ?string
139143
{
140144
$status = $this->mappingService->getValue(
141145
$this->connectionId,
@@ -155,7 +159,7 @@ private function getStatus(array $data): ?string
155159

156160
if ($status === null) {
157161
$this->loggingService->addLogEntry( // TODO: add optional fields
158-
SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext)
162+
SwagMigrationLogBuilder::fromMigrationContext($migrationContext)
159163
->withEntityName('status')
160164
->build(EmptyNecessaryFieldRunLog::class)
161165
);

‎src/Profile/Magento/Converter/OrderConverter.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public function convert(array $data, Context $context, MigrationContextInterface
121121

122122
if (!empty($fields)) {
123123
$this->loggingService->addLogEntry( // TODO: add optional fields
124-
SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext)
124+
SwagMigrationLogBuilder::fromMigrationContext($migrationContext)
125125
->build(EmptyNecessaryFieldRunLog::class)
126126
);
127127

‎src/Profile/Magento/Converter/ProductReviewConverter.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function convert(array $data, Context $context, MigrationContextInterface
5656

5757
if ($mapping === null) {
5858
$this->loggingService->addLogEntry( // TODO: add optional fields
59-
SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext)
59+
SwagMigrationLogBuilder::fromMigrationContext($migrationContext)
6060
->build(AssociationRequiredMissingLog::class)
6161
);
6262

@@ -90,7 +90,7 @@ public function convert(array $data, Context $context, MigrationContextInterface
9090

9191
if ($mapping === null) {
9292
$this->loggingService->addLogEntry( // TODO: add optional fields
93-
SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext)
93+
SwagMigrationLogBuilder::fromMigrationContext($migrationContext)
9494
->build(AssociationRequiredMissingLog::class)
9595
);
9696

@@ -108,7 +108,7 @@ public function convert(array $data, Context $context, MigrationContextInterface
108108

109109
if ($languageMapping === null) {
110110
$this->loggingService->addLogEntry( // TODO: add optional fields
111-
SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext)
111+
SwagMigrationLogBuilder::fromMigrationContext($migrationContext)
112112
->build(AssociationRequiredMissingLog::class)
113113
);
114114

‎src/Profile/Magento/Converter/PropertyGroupConverter.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function convert(array $data, Context $context, MigrationContextInterface
5959

6060
if (!isset($data['name'])) {
6161
$this->loggingService->addLogEntry( // TODO: add optional fields
62-
SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext)
62+
SwagMigrationLogBuilder::fromMigrationContext($migrationContext)
6363
->build(EmptyNecessaryFieldRunLog::class)
6464
);
6565

‎src/Profile/Magento/Converter/SalesChannelConverter.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ public function getSourceIdentifier(array $data): string
7373

7474
public function convert(array $data, Context $context, MigrationContextInterface $migrationContext): ConvertStruct
7575
{
76+
$this->migrationContext = $migrationContext;
7677
$fields = $this->checkForEmptyRequiredDataFields($data, self::$requiredDataFieldKeys);
78+
7779
if (!empty($fields)) {
7880
$this->loggingService->addLogEntry( // TODO: add optional fields
7981
SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext)
@@ -114,7 +116,7 @@ public function convert(array $data, Context $context, MigrationContextInterface
114116

115117
if (!isset($converted['customerGroupId'])) {
116118
$this->loggingService->addLogEntry( // TODO: add optional fields
117-
SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext)
119+
SwagMigrationLogBuilder::fromMigrationContext($migrationContext)
118120
->build(AssociationRequiredMissingLog::class)
119121
);
120122

‎src/Profile/Magento/Converter/SeoUrlConverter.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function convert(array $data, Context $context, MigrationContextInterface
5656

5757
if ($mapping === null) {
5858
$this->loggingService->addLogEntry( // TODO: add optional fields
59-
SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext)
59+
SwagMigrationLogBuilder::fromMigrationContext($migrationContext)
6060
->build(AssociationRequiredMissingLog::class)
6161
);
6262

@@ -74,7 +74,7 @@ public function convert(array $data, Context $context, MigrationContextInterface
7474

7575
if ($languageMapping === null) {
7676
$this->loggingService->addLogEntry( // TODO: add optional fields
77-
SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext)
77+
SwagMigrationLogBuilder::fromMigrationContext($migrationContext)
7878
->build(AssociationRequiredMissingLog::class)
7979
);
8080

@@ -100,7 +100,7 @@ public function convert(array $data, Context $context, MigrationContextInterface
100100

101101
if ($mapping === null) {
102102
$this->loggingService->addLogEntry( // TODO: add optional fields
103-
SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext)
103+
SwagMigrationLogBuilder::fromMigrationContext($migrationContext)
104104
->build(AssociationRequiredMissingLog::class)
105105
);
106106

@@ -120,7 +120,7 @@ public function convert(array $data, Context $context, MigrationContextInterface
120120

121121
if ($mapping === null) {
122122
$this->loggingService->addLogEntry( // TODO: add optional fields
123-
SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext)
123+
SwagMigrationLogBuilder::fromMigrationContext($migrationContext)
124124
->build(AssociationRequiredMissingLog::class)
125125
);
126126

@@ -134,7 +134,7 @@ public function convert(array $data, Context $context, MigrationContextInterface
134134
$this->mappingIds[] = $mapping['id'];
135135
} else {
136136
$this->loggingService->addLogEntry( // TODO: add optional fields
137-
SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext)
137+
SwagMigrationLogBuilder::fromMigrationContext($migrationContext)
138138
->build(EmptyNecessaryFieldRunLog::class)
139139
);
140140

‎src/Profile/Magento2/Converter/Magento2SalesChannelConverter.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ abstract class Magento2SalesChannelConverter extends SalesChannelConverter
4040

4141
public function convert(array $data, Context $context, MigrationContextInterface $migrationContext): ConvertStruct
4242
{
43+
$this->migrationContext = $migrationContext;
4344
$fields = $this->checkForEmptyRequiredDataFields($data, self::$requiredDataFieldKeys);
45+
4446
if (!empty($fields)) {
4547
$this->loggingService->addLogEntry( // TODO: add optional fields
4648
SwagMigrationLogBuilder::fromMigrationContext($this->migrationContext)

‎tests/Profile/Magento19/Converter/Magento19CrossSellingConverterTest.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,7 @@ public function testConvertWithoutMapping(): void
165165

166166
$logs = $this->loggingService->getLoggingArray();
167167
static::assertCount(1, $logs);
168-
static::assertSame('SWAG_MIGRATION__SHOPWARE_ASSOCIATION_REQUIRED_MISSING_PRODUCT', $logs[0]['code']);
169-
static::assertSame('99', $logs[0]['parameters']['sourceId']);
168+
static::assertSame('SWAG_MIGRATION__SHOPWARE_ASSOCIATION_REQUIRED_MISSING', $logs[0]['code']);
170169

171170
$this->loggingService->resetLogging();
172171
$data[0]['linked_product_id'] = '80';
@@ -177,8 +176,7 @@ public function testConvertWithoutMapping(): void
177176

178177
$logs = $this->loggingService->getLoggingArray();
179178
static::assertCount(1, $logs);
180-
static::assertSame('SWAG_MIGRATION__SHOPWARE_ASSOCIATION_REQUIRED_MISSING_PRODUCT', $logs[0]['code']);
181-
static::assertSame('80', $logs[0]['parameters']['sourceId']);
179+
static::assertSame('SWAG_MIGRATION__SHOPWARE_ASSOCIATION_REQUIRED_MISSING', $logs[0]['code']);
182180
}
183181

184182
private function createMapping(array $identifiers): void

‎tests/Profile/Magento19/Converter/Magento19CustomerConverterTest.php‎

Lines changed: 11 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,7 @@ public function testConvertWithoutRequiredProperties(string $property, ?string $
264264
$logs = $this->loggingService->getLoggingArray();
265265
static::assertCount(1, $logs);
266266

267-
static::assertSame($logs[0]['code'], 'SWAG_MIGRATION_EMPTY_NECESSARY_FIELD_CUSTOMER');
268-
static::assertSame($logs[0]['parameters']['emptyField'], $property);
267+
static::assertSame($logs[0]['code'], 'SWAG_MIGRATION_EMPTY_NECESSARY_FIELD');
269268
}
270269

271270
public function testConvertCustomerWithoutNumber(): void
@@ -311,9 +310,7 @@ public function testConvertCustomerWithoutAddresses(): void
311310
$logs = $this->loggingService->getLoggingArray();
312311
static::assertCount(1, $logs);
313312

314-
static::assertSame($logs[0]['code'], 'SWAG_MIGRATION_EMPTY_NECESSARY_FIELD_CUSTOMER');
315-
static::assertSame($logs[0]['parameters']['sourceId'], $customerData['entity_id']);
316-
static::assertSame($logs[0]['parameters']['emptyField'], 'address data');
313+
static::assertSame($logs[0]['code'], 'SWAG_MIGRATION_EMPTY_NECESSARY_FIELD');
317314
}
318315

319316
public function testConvertCustomerWithoutValidAddresses(): void
@@ -335,13 +332,9 @@ public function testConvertCustomerWithoutValidAddresses(): void
335332
$logs = $this->loggingService->getLoggingArray();
336333
static::assertCount(2, $logs);
337334

338-
static::assertSame($logs[0]['code'], 'SWAG_MIGRATION_EMPTY_NECESSARY_FIELD_CUSTOMER_ADDRESS');
339-
static::assertSame($logs[0]['parameters']['sourceId'], $customerData['addresses'][0]['entity_id']);
340-
static::assertSame($logs[0]['parameters']['emptyField'], 'firstname');
335+
static::assertSame($logs[0]['code'], 'SWAG_MIGRATION_EMPTY_NECESSARY_FIELD');
341336

342-
static::assertSame($logs[1]['code'], 'SWAG_MIGRATION_EMPTY_NECESSARY_FIELD_CUSTOMER');
343-
static::assertSame($logs[1]['parameters']['sourceId'], $customerData['entity_id']);
344-
static::assertSame($logs[1]['parameters']['emptyField'], 'address data');
337+
static::assertSame($logs[1]['code'], 'SWAG_MIGRATION_EMPTY_NECESSARY_FIELD');
345338
}
346339

347340
public static function requiredAddressProperties(): array
@@ -394,13 +387,8 @@ public function testConvertWithoutRequiredAddressPropertiesForBillingDefault(str
394387
$logs = $this->loggingService->getLoggingArray();
395388
static::assertCount(2, $logs);
396389

397-
static::assertSame($logs[0]['code'], 'SWAG_MIGRATION_EMPTY_NECESSARY_FIELD_CUSTOMER_ADDRESS');
398-
static::assertSame($logs[0]['parameters']['sourceId'], $customerData['addresses'][0]['entity_id']);
399-
static::assertSame($logs[0]['parameters']['emptyField'], $property);
400-
401-
static::assertSame($logs[1]['code'], 'SWAG_MIGRATION_CUSTOMER_ENTITY_FIELD_REASSIGNED');
402-
static::assertSame($logs[1]['parameters']['emptyField'], 'default billing address');
403-
static::assertSame($logs[1]['parameters']['replacementField'], 'default shipping address');
390+
static::assertSame($logs[0]['code'], 'SWAG_MIGRATION_EMPTY_NECESSARY_FIELD');
391+
static::assertSame($logs[1]['code'], 'SWAG_MIGRATION_ENTITY_FIELD_REASSIGNED');
404392
}
405393

406394
#[DataProvider('requiredAddressProperties')]
@@ -431,13 +419,8 @@ public function testConvertWithoutRequiredAddressPropertiesForShippingDefault(st
431419
$logs = $this->loggingService->getLoggingArray();
432420
static::assertCount(2, $logs);
433421

434-
static::assertSame($logs[0]['code'], 'SWAG_MIGRATION_EMPTY_NECESSARY_FIELD_CUSTOMER_ADDRESS');
435-
static::assertSame($logs[0]['parameters']['sourceId'], $customerData['addresses'][1]['entity_id']);
436-
static::assertSame($logs[0]['parameters']['emptyField'], $property);
437-
438-
static::assertSame($logs[1]['code'], 'SWAG_MIGRATION_CUSTOMER_ENTITY_FIELD_REASSIGNED');
439-
static::assertSame($logs[1]['parameters']['emptyField'], 'default shipping address');
440-
static::assertSame($logs[1]['parameters']['replacementField'], 'default billing address');
422+
static::assertSame($logs[0]['code'], 'SWAG_MIGRATION_EMPTY_NECESSARY_FIELD');
423+
static::assertSame($logs[1]['code'], 'SWAG_MIGRATION_ENTITY_FIELD_REASSIGNED');
441424
}
442425

443426
#[DataProvider('requiredAddressProperties')]
@@ -469,17 +452,9 @@ public function testConvertWithoutRequiredAddressPropertiesForDefaultBillingAndS
469452
$logs = $this->loggingService->getLoggingArray();
470453
static::assertCount(3, $logs);
471454

472-
static::assertSame($logs[0]['code'], 'SWAG_MIGRATION_EMPTY_NECESSARY_FIELD_CUSTOMER_ADDRESS');
473-
static::assertSame($logs[0]['parameters']['sourceId'], $customerData['addresses'][0]['entity_id']);
474-
static::assertSame($logs[0]['parameters']['emptyField'], $property);
475-
476-
static::assertSame($logs[1]['code'], 'SWAG_MIGRATION_EMPTY_NECESSARY_FIELD_CUSTOMER_ADDRESS');
477-
static::assertSame($logs[1]['parameters']['sourceId'], $customerData['addresses'][1]['entity_id']);
478-
static::assertSame($logs[1]['parameters']['emptyField'], $property);
479-
480-
static::assertSame($logs[2]['code'], 'SWAG_MIGRATION_CUSTOMER_ENTITY_FIELD_REASSIGNED');
481-
static::assertSame($logs[2]['parameters']['emptyField'], 'default billing and shipping address');
482-
static::assertSame($logs[2]['parameters']['replacementField'], 'first address');
455+
static::assertSame($logs[0]['code'], 'SWAG_MIGRATION_EMPTY_NECESSARY_FIELD');
456+
static::assertSame($logs[1]['code'], 'SWAG_MIGRATION_EMPTY_NECESSARY_FIELD');
457+
static::assertSame($logs[2]['code'], 'SWAG_MIGRATION_ENTITY_FIELD_REASSIGNED');
483458
}
484459

485460
public function testConvertCountryStateWithMapping(): void
@@ -562,9 +537,5 @@ public function testConvertNotExistingCountryStateWithoutMapping(): void
562537
static::assertCount(1, $logs);
563538

564539
static::assertSame($logs[0]['code'], 'SWAG_MIGRATION_COUNTRY_STATE_ENTITY_UNKNOWN');
565-
static::assertSame($logs[0]['parameters']['sourceId'], '9999');
566-
static::assertSame($logs[0]['parameters']['entity'], DefaultEntities::COUNTRY_STATE);
567-
static::assertSame($logs[0]['parameters']['requiredForSourceId'], $customerData['entity_id']);
568-
static::assertSame($logs[0]['parameters']['requiredForEntity'], DefaultEntities::CUSTOMER);
569540
}
570541
}

‎tests/Profile/Magento19/Converter/Magento19NewsletterRecipientConverterTest.php‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,7 @@ public function testConvertWithInvalidLanguage(): void
139139
$logs = $this->loggingService->getLoggingArray();
140140
static::assertCount(1, $logs);
141141

142-
static::assertSame($logs[0]['code'], 'SWAG_MIGRATION__SHOPWARE_ASSOCIATION_REQUIRED_MISSING_LANGUAGE');
143-
static::assertSame($newsletterRecipientData[0]['store_id'], $logs[0]['parameters']['sourceId']);
142+
static::assertSame($logs[0]['code'], 'SWAG_MIGRATION__SHOPWARE_ASSOCIATION_REQUIRED_MISSING');
144143
}
145144

146145
public function testConvertWithInvalidSalesChannel(): void
@@ -166,8 +165,6 @@ public function testConvertWithInvalidSalesChannel(): void
166165
$logs = $this->loggingService->getLoggingArray();
167166
static::assertCount(1, $logs);
168167

169-
static::assertSame($logs[0]['code'], 'SWAG_MIGRATION_EMPTY_NECESSARY_FIELD_NEWSLETTER_RECIPIENT');
170-
static::assertSame($newsletterRecipientData[0]['subscriber_id'], $logs[0]['parameters']['sourceId']);
171-
static::assertSame('salesChannel', $logs[0]['parameters']['emptyField']);
168+
static::assertSame($logs[0]['code'], 'SWAG_MIGRATION_EMPTY_NECESSARY_FIELD');
172169
}
173170
}

0 commit comments

Comments
 (0)