Merge tag '2.1.2' into develop

Author: tomreece

.travis.yml

@@ -2,6 +2,7 @@ language: php
 php:
   - 7.0
   - 7.1
+  - 7.2
 install: composer install --no-interaction --prefer-source
 env:
   matrix:

CHANGELOG.md

@@ -1,6 +1,11 @@
 Magento Functional Testing Framework Changelog
 ================================================
 
+2.1.2
+-----
+### Enhancements
+* Added support for PHP version 7.2
+
 2.1.1
 -----
 ### Enhancements

composer.json

@@ -2,14 +2,14 @@
     "name": "magento/magento2-functional-testing-framework",
     "description": "Magento2 Functional Testing Framework",
     "type": "library",
-    "version": "2.1.1",
+    "version": "2.1.2",
     "license": "AGPL-3.0",
     "keywords": ["magento", "automation", "functional", "testing"],
     "config": {
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0|~7.2.0",
         "codeception/codeception": "~2.3.4",
         "epfremme/swagger-php": "^2.0",
         "flow/jsonpath": ">0.2",

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

@@ -438,6 +438,8 @@ private function stripAndReturnParameters($reference)
      * @param string $inputString
      * @return string | null
      * @throws \Exception
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     private function findAndReplaceReferences($objectHandler, $inputString)
     {
@@ -460,25 +462,24 @@ private function findAndReplaceReferences($objectHandler, $inputString)
                 continue;
             }
 
-            // specify behavior depending on field
-            switch (get_class($obj)) {
-                case PageObject::class:
-                    $this->validateUrlAreaAgainstActionType($obj);
-                    $replacement = $obj->getUrl();
-                    $parameterized = $obj->isParameterized();
-                    break;
-                case SectionObject::class:
-                    list(,$objField) = $this->stripAndSplitReference($match);
-                    if ($obj->getElement($objField) == null) {
-                        throw new TestReferenceException("Could not resolve entity reference " . $inputString);
-                    }
-                    $parameterized = $obj->getElement($objField)->isParameterized();
-                    $replacement = $obj->getElement($objField)->getPrioritizedSelector();
-                    $this->setTimeout($obj->getElement($objField)->getTimeout());
-                    break;
-                case EntityDataObject::class:
-                    $replacement = $this->resolveEntityDataObjectReference($obj, $match);
-                    break;
+            if ($obj == null) {
+                // keep initial values for subsequent logic
+                $replacement = null;
+                $parameterized = false;
+            } elseif (get_class($obj) == PageObject::class) {
+                $this->validateUrlAreaAgainstActionType($obj);
+                $replacement = $obj->getUrl();
+                $parameterized = $obj->isParameterized();
+            } elseif (get_class($obj) == SectionObject::class) {
+                list(,$objField) = $this->stripAndSplitReference($match);
+                if ($obj->getElement($objField) == null) {
+                    throw new TestReferenceException("Could not resolve entity reference " . $inputString);
+                }
+                $parameterized = $obj->getElement($objField)->isParameterized();
+                $replacement = $obj->getElement($objField)->getPrioritizedSelector();
+                $this->setTimeout($obj->getElement($objField)->getTimeout());
+            } elseif (get_class($obj) == EntityDataObject::class) {
+                $replacement = $this->resolveEntityDataObjectReference($obj, $match);
             }
 
             if ($replacement == null) {