Skip to content

Commit 9e60681

Browse files
committed
MQE-848: Upgrade MFTF PHP version to 7.2
1 parent d467837 commit 9e60681

File tree

3 files changed

+21
-20
lines changed

3 files changed

+21
-20
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ language: php
22
php:
33
- 7.0
44
- 7.1
5+
- 7.2
56
install: composer install --no-interaction --prefer-source
67
env:
78
matrix:

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"sort-packages": true
1010
},
1111
"require": {
12-
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
12+
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0|~7.2.0",
1313
"codeception/codeception": "~2.3.4",
1414
"epfremme/swagger-php": "^2.0",
1515
"flow/jsonpath": ">0.2",

src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,8 @@ private function stripAndReturnParameters($reference)
438438
* @param string $inputString
439439
* @return string | null
440440
* @throws \Exception
441+
*
442+
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
441443
*/
442444
private function findAndReplaceReferences($objectHandler, $inputString)
443445
{
@@ -460,25 +462,23 @@ private function findAndReplaceReferences($objectHandler, $inputString)
460462
continue;
461463
}
462464

463-
// specify behavior depending on field
464-
switch (get_class($obj)) {
465-
case PageObject::class:
466-
$this->validateUrlAreaAgainstActionType($obj);
467-
$replacement = $obj->getUrl();
468-
$parameterized = $obj->isParameterized();
469-
break;
470-
case SectionObject::class:
471-
list(,$objField) = $this->stripAndSplitReference($match);
472-
if ($obj->getElement($objField) == null) {
473-
throw new TestReferenceException("Could not resolve entity reference " . $inputString);
474-
}
475-
$parameterized = $obj->getElement($objField)->isParameterized();
476-
$replacement = $obj->getElement($objField)->getPrioritizedSelector();
477-
$this->setTimeout($obj->getElement($objField)->getTimeout());
478-
break;
479-
case EntityDataObject::class:
480-
$replacement = $this->resolveEntityDataObjectReference($obj, $match);
481-
break;
465+
if ($obj == null) {
466+
$replacement = null;
467+
$parameterized = null;
468+
} elseif (get_class($obj) == PageObject::class) {
469+
$this->validateUrlAreaAgainstActionType($obj);
470+
$replacement = $obj->getUrl();
471+
$parameterized = $obj->isParameterized();
472+
} elseif (get_class($obj) == SectionObject::class) {
473+
list(,$objField) = $this->stripAndSplitReference($match);
474+
if ($obj->getElement($objField) == null) {
475+
throw new TestReferenceException("Could not resolve entity reference " . $inputString);
476+
}
477+
$parameterized = $obj->getElement($objField)->isParameterized();
478+
$replacement = $obj->getElement($objField)->getPrioritizedSelector();
479+
$this->setTimeout($obj->getElement($objField)->getTimeout());
480+
} elseif (get_class($obj) == EntityDataObject::class) {
481+
$replacement = $this->resolveEntityDataObjectReference($obj, $match);
482482
}
483483

484484
if ($replacement == null) {

0 commit comments

Comments
 (0)