Merge branch '2.1' into MAGETWO-55463

magento-services-vantiv-deploy · magento-services-vantiv-deploy · commit 4d16d0f2d71a · 2016-07-25T18:53:44.000+03:00
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductsStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductsStep.php
@@ -60,7 +60,7 @@ public function __construct(FixtureFactory $fixtureFactory, $products, array $da
     public function run()
     {
         $products = [];
-        $productsDataSets = explode(',', $this->products);
+        $productsDataSets = is_array($this->products) ? $this->products : explode(',', $this->products);
         foreach ($productsDataSets as $key => $productDataSet) {
             $productDataSet = explode('::', $productDataSet);
             $fixtureClass = $productDataSet[0];

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public function __construct(FixtureFactory $fixtureFactory, $products, array $da`
`60`	`60`	`public function run()`
`61`	`61`	`{`
`62`	`62`	`$products = [];`
`63`		`- $productsDataSets = explode(',', $this->products);`
	`63`	`+ $productsDataSets = is_array($this->products) ? $this->products : explode(',', $this->products);`
`64`	`64`	`foreach ($productsDataSets as $key => $productDataSet) {`
`65`	`65`	`$productDataSet = explode('::', $productDataSet);`
`66`	`66`	`$fixtureClass = $productDataSet[0];`