Merge remote-tracking branch 'origin/MAGETWO-52216' into MPI-BUGFIXES

Author: viktym

lib/internal/Magento/Framework/ObjectManager/Code/Generator/Persistor.php

@@ -282,11 +282,11 @@ protected function _getLoadEntityMethod()
      */
     protected function _getRegisterDeletedMethod()
     {
-        $body = "\$hash = spl_object_hash(\$entity);"
-            . "array_push(\$this->stack, \$hash);"
-            . "\$this->entitiesPool[\$hash] = ["
-            . "    'entity' => \$entity,"
-            . "    'action' => 'removed'"
+        $body = "\$hash = spl_object_hash(\$entity);\n"
+            . "array_push(\$this->stack, \$hash);\n"
+            . "\$this->entitiesPool[\$hash] = [\n"
+            . "    'entity' => \$entity,\n"
+            . "    'action' => 'removed'\n"
             . "];";
         return [
             'name' => 'registerDeleted',
@@ -321,12 +321,13 @@ protected function _getDoPersistMethod()
             . "        \$hash = array_pop(\$this->stack);\n"
             . "        if (isset(\$this->entitiesPool[\$hash])) {\n"
             . "            \$data = \$this->entitiesPool[\$hash];\n"
+            . "            \$entity = \$data['entity'];\n"
             . "            if (\$data['action'] == 'created') {\n"
-            . "                \$this->{$this->_getSourceResourcePropertyName()}->save(\$data['entity']);\n"
-            . "                \$ids[] = \$data['entity']->getId();\n"
+            . "                \$this->{$this->_getSourceResourcePropertyName()}->save(\$entity);\n"
+            . "                \$ids[] = \$entity->getId();\n"
             . "            } else {\n"
-            . "                \$ids[] = \$data['entity']->getId();\n"
-            . "                \$this->{$this->_getSourceResourcePropertyName()}->delete(\$data['removed']);\n"
+            . "                \$ids[] = \$entity->getId();\n"
+            . "                \$this->{$this->_getSourceResourcePropertyName()}->delete(\$entity);\n"
             . "            }\n"
             . "        }\n"
             . "        unset(\$this->entitiesPool[\$hash]);\n"
@@ -372,14 +373,16 @@ protected function _getDoPersistMethod()
     protected function _getDoPersistEntityMethod()
     {
         $body = "\$hash = spl_object_hash(\$entity);\n"
+            . "\$action = 'created';\n"
             . "if (isset(\$this->entitiesPool[\$hash])) {\n"
-            . "\$tempStack = \$this->stack;\n"
-            . "array_flip(\$tempStack);\n"
-            . "unset(\$tempStack[\$hash]);\n"
-            . "\$this->stack = array_flip(\$tempStack);\n"
-            . "unset(\$this->entitiesPool[\$hash]);\n"
+            . "     \$action = \$this->entitiesPool[\$hash]['action'];\n"
+            . "     \$tempStack = \$this->stack;\n"
+            . "     array_flip(\$tempStack);\n"
+            . "     unset(\$tempStack[\$hash]);\n"
+            . "     \$this->stack = array_flip(\$tempStack);\n"
+            . "     unset(\$this->entitiesPool[\$hash]);\n"
             . "}\n"
-            . "\$this->registerNew(\$entity);\n"
+            . "\$action == 'created' ? \$this->registerNew(\$entity) : \$this->registerDeleted(\$entity);\n"
             . "return \$this->doPersist(1);";
         return [
             'name' => 'doPersistEntity',
@@ -401,6 +404,7 @@ protected function _getDoPersistEntityMethod()
             ]
         ];
     }
+
     /**
      * Returns registerDelete() method
      *
@@ -445,8 +449,8 @@ protected function _getRegisterNewMethod()
     {
         $body = "\$hash = spl_object_hash(\$entity);\n"
             . "\$data = [\n"
-            . "'entity' => \$entity,\n"
-            . "'action' => 'created'\n"
+            . "     'entity' => \$entity,\n"
+            . "     'action' => 'created'\n"
             . "];\n"
             . "array_push(\$this->stack, \$hash);\n"
             . "\$this->entitiesPool[\$hash] = \$data;";