Merge branch 'MAGETWO-66727' of https://github.com/magento-performance/magento2ce into MAGETWO-66727

Author: AVoskoboinikov

setup/src/Magento/Setup/Fixtures/ConfigurableProductsFixture.php

@@ -481,6 +481,7 @@ function (&$item, $key) {
      *
      * @return array
      * @throws ValidatorException
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     private function getConfigurableProductConfig()
     {
@@ -653,6 +654,12 @@ function ($index, $attribute) use ($attributeCode, $options, $swatches) {
         );
     }
 
+    /**
+     * Provide attribute set based on attributes configuration
+     *
+     * @param array $attributes
+     * @return array
+     */
     private function getCustomAttributeSet(array $attributes)
     {
         $attributeSetName = $this->getAttributeSetName(
@@ -697,6 +704,13 @@ function ($index, $attribute) use ($attributeSetName, $attributes) {
         return $this->attributeSetsFixture->createAttributeSet($pattern);
     }
 
+    /**
+     * Provide attribute set name based on amount of attributes and options per attribute set
+     *
+     * @param int $attributesCount
+     * @param int $optionsCount
+     * @return string
+     */
     private function getAttributeSetName($attributesCount, $optionsCount)
     {
         return sprintf('Dynamic Attribute Set %s-%s', $attributesCount, $optionsCount);
@@ -756,7 +770,7 @@ private function getConfigurableProductsVariationsValue()
      */
     private function getAdditionalAttributesClosure(array $attributes, $variationCount)
     {
-        $optionsPerAttribute = array_map(function($attr) {
+        $optionsPerAttribute = array_map(function ($attr) {
             return count($attr['values']);
         }, $attributes);
         $variationsMatrix = $this->generateVariationsMatrix(count($attributes), $optionsPerAttribute);

setup/src/Magento/Setup/Model/FixtureGenerator/EntityGenerator.php

@@ -6,6 +6,7 @@
 
 namespace Magento\Setup\Model\FixtureGenerator;
 
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\ValidatorException;
 
 /**
@@ -138,14 +139,25 @@ public function __construct(
      * @param TemplateEntityGeneratorInterface $entityGenerator
      * @param int $entitiesAmount
      * @param callable $fixture
+     * @throws LocalizedException
      * @return void
      */
     public function generate(TemplateEntityGeneratorInterface $entityGenerator, $entitiesAmount, callable $fixture)
     {
-        $this->sqlCollector->enable();
-        $entity = $entityGenerator->generateEntity();
-        $this->sqlCollector->disable();
-        $entity->delete();
+        $this->getConnection()->beginTransaction();
+        try {
+            $this->sqlCollector->enable();
+            $entity = $entityGenerator->generateEntity();
+            $this->sqlCollector->disable();
+            $entity->delete();
+            $this->getConnection()->commit();
+        } catch (\Exception $e) {
+            $this->getConnection()->rollBack();
+            throw new LocalizedException(
+                __('Cannot generate entities - error occurred during template creation: %1', $e->getMessage()),
+                $e
+            );
+        }
 
         $map = [];
         $processed = 0;
@@ -239,11 +251,22 @@ private function bindWithCustomHandler($table, $entityId, $entityNumber, $fixtur
      *
      * @param array $map
      * @return void
+     * @throws LocalizedException
      */
     private function saveEntities(array &$map)
     {
-        foreach ($map as $table => $data) {
-            $this->getConnection()->insertMultiple($table, $data);
+        $this->getConnection()->beginTransaction();
+        try {
+            foreach ($map as $table => $data) {
+                $this->getConnection()->insertMultiple($table, $data);
+            }
+            $this->getConnection()->commit();
+        } catch (\Exception $e) {
+            $this->getConnection()->rollBack();
+            throw new LocalizedException(
+                __('Cannot save entity. Error occurred: %1', $e->getMessage()),
+                $e
+            );
         }
 
         $map = [];