Skip to content

Commit f8512c5

Browse files
committed
MQE-2195: refactored mftf svc code and incorporated in magento-semver repo
1 parent 5076a17 commit f8512c5

File tree

5 files changed

+12
-14
lines changed

5 files changed

+12
-14
lines changed

src/Analyzer/Mftf/ActionGroupAnalyzer.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,15 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
6767
$afterArguments = [];
6868
$afterActions = [];
6969

70-
foreach ($beforeEntity['value'] as $beforeChild) {
70+
foreach ($beforeEntity['value'] ?? [] as $beforeChild) {
7171
if ($beforeChild['name'] == self::MFTF_ARGUMENTS_ELEMENT) {
7272
$beforeArguments = $beforeChild['value'];
7373
} else {
7474
$beforeActions[] = $beforeChild;
7575
}
7676
}
77-
foreach ($afterEntities[$module][$entityName]['value'] as $afterChild) {
77+
78+
foreach ($afterEntities[$module][$entityName]['value'] ?? [] as $afterChild) {
7879
if ($afterChild['name'] == self::MFTF_ARGUMENTS_ELEMENT) {
7980
$afterArguments = $afterChild['value'];
8081
} else {
@@ -84,7 +85,6 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
8485

8586
// Validate <actions>
8687
foreach ($beforeActions as $testAction) {
87-
// Action group annotations, continue
8888
if (!isset($testAction['attributes']['stepKey'])) {
8989
continue;
9090
}

src/Analyzer/Mftf/DataAnalyzer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
7777
$afterReqFields = [];
7878
$afterArrayFields = [];
7979

80-
foreach ($beforeEntity['value'] as $beforeChild) {
80+
foreach ($beforeEntity['value'] ?? [] as $beforeChild) {
8181
if ($beforeChild['name'] == self::MFTF_DATA_FIELD_ELEMENT) {
8282
$beforeDataFields[] = $beforeChild;
8383
} elseif ($beforeChild['name'] == self::MFTF_VAR_ELEMENT) {
@@ -89,7 +89,7 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
8989
}
9090
}
9191

92-
foreach ($afterEntities[$module][$entityName]['value'] as $afterChild) {
92+
foreach ($afterEntities[$module][$entityName]['value'] ?? [] as $afterChild) {
9393
if ($afterChild['name'] == self::MFTF_DATA_FIELD_ELEMENT) {
9494
$afterDataFields[] = $afterChild;
9595
} elseif ($afterChild['name'] == self::MFTF_VAR_ELEMENT) {

src/Analyzer/Mftf/PageAnalyzer.php

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,12 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
6060
$beforeSectionElements = [];
6161
$afterSectionElements = [];
6262

63-
// Continue when page does not have sections
64-
if (!isset($beforeEntity['value'])) {
65-
continue;
66-
}
67-
68-
foreach ($beforeEntity['value'] as $beforeChild) {
63+
foreach ($beforeEntity['value'] ?? [] as $beforeChild) {
6964
if ($beforeChild['name'] == self::MFTF_SECTION_ELEMENT) {
7065
$beforeSectionElements[] = $beforeChild;
7166
}
7267
}
73-
foreach ($afterEntities[$module][$entityName]['value'] as $afterChild) {
68+
foreach ($afterEntities[$module][$entityName]['value'] ?? [] as $afterChild) {
7469
if ($afterChild['name'] == self::MFTF_SECTION_ELEMENT) {
7570
$afterSectionElements[] = $afterChild;
7671
}

src/Analyzer/Mftf/SectionAnalyzer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
6060
$beforeElements = [];
6161
$afterElements = [];
6262

63-
foreach ($beforeEntity['value'] as $beforeChild) {
63+
foreach ($beforeEntity['value'] ?? [] as $beforeChild) {
6464
if ($beforeChild['name'] == self::MFTF_ELEMENT_ELEMENT) {
6565
$beforeElements[] = $beforeChild;
6666
}
6767
}
68-
foreach ($afterEntities[$module][$entityName]['value'] as $afterChild) {
68+
foreach ($afterEntities[$module][$entityName]['value'] ?? [] as $afterChild) {
6969
if ($afterChild['name'] == self::MFTF_ELEMENT_ELEMENT) {
7070
$afterElements[] = $afterChild;
7171
}

src/Analyzer/Mftf/TestAnalyzer.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,9 @@ public function validateActionsInBlock(
172172
$operationTarget
173173
) {
174174
foreach ($beforeTestActions as $testAction) {
175+
if (!isset($testAction['attributes']['stepKey'])) {
176+
continue;
177+
}
175178
$beforeFieldKey = $testAction['attributes']['stepKey'];
176179
$matchingElement = $this->findMatchingElement($testAction, $afterTestActions,'stepKey');
177180
if ($matchingElement === null) {

0 commit comments

Comments
 (0)