Merge branch 'sprint-develop' of github.com:magento-pangolin/magento2-acceptance-test-framework into sprint-develop

okolesnyk · okolesnyk · commit e3521fa1829b · 2017-08-21T16:23:28.000+03:00
diff --git a/src/Magento/AcceptanceTestFramework/Test/Objects/ActionObject.php b/src/Magento/AcceptanceTestFramework/Test/Objects/ActionObject.php
@@ -293,7 +293,7 @@ private function findAndReplaceReferences($objectHandler, $inputString)
 
             //Check to see if field is defined as data if cannot be found in a different interface
             if ($replacement == null && get_class($obj) != EntityDataObject::class) {
-                $this->findAndReplaceReferences(DataObjectHandler::getInstance(), $inputString);
+                return $this->findAndReplaceReferences(DataObjectHandler::getInstance(), $inputString);
             }
 
             $outputString = str_replace($match, $replacement, $outputString);

Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ private function findAndReplaceReferences($objectHandler, $inputString)`
`293`	`293`
`294`	`294`	`//Check to see if field is defined as data if cannot be found in a different interface`
`295`	`295`	`if ($replacement == null && get_class($obj) != EntityDataObject::class) {`
`296`		`- $this->findAndReplaceReferences(DataObjectHandler::getInstance(), $inputString);`
	`296`	`+ return $this->findAndReplaceReferences(DataObjectHandler::getInstance(), $inputString);`
`297`	`297`	`}`
`298`	`298`
`299`	`299`	`$outputString = str_replace($match, $replacement, $outputString);`