MAGETWO-64547: Bundle Products - The options you selected are not available.

Static fixes. Sequence applying relates to entity creation and cann not be separated from createMain

Author: valdislav

lib/internal/Magento/Framework/EntityManager/Operation/Create.php

@@ -5,9 +5,7 @@
  */
 namespace Magento\Framework\EntityManager\Operation;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DB\Adapter\DuplicateException;
-use Magento\Framework\EntityManager\Sequence\SequenceApplier;
 use Magento\Framework\EntityManager\Operation\Create\CreateMain;
 use Magento\Framework\EntityManager\Operation\Create\CreateAttributes;
 use Magento\Framework\EntityManager\Operation\Create\CreateExtensions;
@@ -58,11 +56,6 @@ class Create implements CreateInterface
      */
     private $createExtensions;
 
-    /**
-     * @var SequenceApplier
-     */
-    private $sequenceApplier;
-
     /**
      * @param MetadataPool $metadataPool
      * @param TypeResolver $typeResolver
@@ -113,8 +106,6 @@ public function execute($entity, $arguments = [])
             );
             $this->eventManager->dispatchEntityEvent($entityType, 'save_before', ['entity' => $entity]);
 
-            $entity = $this->getSequenceApplier()->apply($entity);
-
             $entity = $this->createMain->execute($entity, $arguments);
             $entity = $this->createAttributes->execute($entity, $arguments);
             $entity = $this->createExtensions->execute($entity, $arguments);
@@ -136,20 +127,4 @@ public function execute($entity, $arguments = [])
         }
         return $entity;
     }
-
-    /**
-     * @return SequenceApplier
-     *
-     * @deprecated
-     */
-    private function getSequenceApplier()
-    {
-        if (!$this->sequenceApplier) {
-            $this->sequenceApplier = ObjectManager::getInstance()->get(
-                SequenceApplier::class
-            );
-        }
-
-        return $this->sequenceApplier;
-    }
 }

lib/internal/Magento/Framework/EntityManager/Operation/Create/CreateMain.php

@@ -5,9 +5,11 @@
  */
 namespace Magento\Framework\EntityManager\Operation\Create;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\EntityManager\TypeResolver;
 use Magento\Framework\EntityManager\HydratorPool;
 use Magento\Framework\EntityManager\Db\CreateRow;
+use Magento\Framework\EntityManager\Sequence\SequenceApplier;
 
 /**
  * Class CreateMain
@@ -29,19 +31,27 @@ class CreateMain
      */
     private $createRow;
 
+    /**
+     * @var SequenceApplier
+     */
+    private $sequenceApplier;
+
     /**
      * @param TypeResolver $typeResolver
      * @param HydratorPool $hydratorPool
      * @param CreateRow $createRow
+     * @param SequenceApplier $sequenceApplier
      */
     public function __construct(
         TypeResolver $typeResolver,
         HydratorPool $hydratorPool,
-        CreateRow $createRow
+        CreateRow $createRow,
+        SequenceApplier $sequenceApplier = null
     ) {
         $this->typeResolver = $typeResolver;
         $this->hydratorPool = $hydratorPool;
         $this->createRow = $createRow;
+        $this->sequenceApplier = $sequenceApplier;
     }
 
     /**
@@ -51,11 +61,28 @@ public function __construct(
      */
     public function execute($entity, $arguments = [])
     {
+        $entity = $this->getSequenceApplier()->apply($entity);
         $entityType = $this->typeResolver->resolve($entity);
         $hydrator = $this->hydratorPool->getHydrator($entityType);
         $arguments = array_merge($hydrator->extract($entity), $arguments);
         $entityData = $this->createRow->execute($entityType, $arguments);
         $entity = $hydrator->hydrate($entity, $entityData);
         return $entity;
     }
+
+    /**
+     * @return SequenceApplier
+     *
+     * @deprecated
+     */
+    private function getSequenceApplier()
+    {
+        if (!$this->sequenceApplier) {
+            $this->sequenceApplier = ObjectManager::getInstance()->get(
+                SequenceApplier::class
+            );
+        }
+
+        return $this->sequenceApplier;
+    }
 }