Moved array entity data replacement conditional

nathanjosiah · nathanjosiah · commit 9bce2765b306 · 2018-04-18T13:45:00.000-05:00
diff --git a/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php b/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php
@@ -495,6 +495,10 @@ private function findAndReplaceReferences($objectHandler, $inputString)
                 $this->setTimeout($obj->getElement($objField)->getTimeout());
             } elseif (get_class($obj) == EntityDataObject::class) {
                 $replacement = $this->resolveEntityDataObjectReference($obj, $match);
+
+                if (is_array($replacement)) {
+                    $replacement = '["' . implode('","', array_map('addSlashes', $replacement)) . '"]';
+                }
             }
 
             if ($replacement === null) {
@@ -504,9 +508,6 @@ private function findAndReplaceReferences($objectHandler, $inputString)
                     throw new TestReferenceException("Could not resolve entity reference " . $inputString);
                 }
             }
-            elseif (is_array($replacement)) {
-                $replacement = '["' . implode('","', array_map('addSlashes',$replacement)) . '"]';
-            }
 
             $replacement = $this->resolveParameterization($parameterized, $replacement, $match, $obj);
 

Original file line number	Diff line number	Diff line change
`@@ -495,6 +495,10 @@ private function findAndReplaceReferences($objectHandler, $inputString)`
`495`	`495`	`$this->setTimeout($obj->getElement($objField)->getTimeout());`
`496`	`496`	`} elseif (get_class($obj) == EntityDataObject::class) {`
`497`	`497`	`$replacement = $this->resolveEntityDataObjectReference($obj, $match);`
	`498`	`+`
	`499`	`+ if (is_array($replacement)) {`
	`500`	`+ $replacement = '["' . implode('","', array_map('addSlashes', $replacement)) . '"]';`
	`501`	`+ }`
`498`	`502`	`}`
`499`	`503`
`500`	`504`	`if ($replacement === null) {`
`@@ -504,9 +508,6 @@ private function findAndReplaceReferences($objectHandler, $inputString)`
`504`	`508`	`throw new TestReferenceException("Could not resolve entity reference " . $inputString);`
`505`	`509`	`}`
`506`	`510`	`}`
`507`		`- elseif (is_array($replacement)) {`
`508`		`- $replacement = '["' . implode('","', array_map('addSlashes',$replacement)) . '"]';`
`509`		`- }`
`510`	`511`
`511`	`512`	`$replacement = $this->resolveParameterization($parameterized, $replacement, $match, $obj);`
`512`	`513`