MERGE: Merge branch '3.3' into 4.0

Author: kdambekalns

Classes/Domain/Service/FakeNodeDataFactory.php

@@ -19,6 +19,7 @@
 use Neos\ContentRepository\Domain\Service\NodeTypeManager;
 use Neos\ContentRepository\Exception\NodeTypeNotFoundException;
 use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Persistence\Doctrine\PersistenceManager;
 
 /**
  * @Flow\Scope("singleton")
@@ -37,6 +38,12 @@ class FakeNodeDataFactory
      */
     protected $nodeTypeManager;
 
+    /**
+     * @var PersistenceManager
+     * @Flow\Inject
+     */
+    protected $persistenceManager;
+
     /**
      * This creates a "fake" removed NodeData instance from the given payload
      *
@@ -76,6 +83,11 @@ public function createFromPayload(array $payload)
 
         $nodeData->setRemoved(true);
 
+        // Ensure, the fake-node is not persisted
+        if ($this->persistenceManager->isNewObject($nodeData)) {
+            $this->persistenceManager->remove($nodeData);
+        }
+
         return $nodeData;
     }
 }

Classes/Indexer/NodeIndexer.php

@@ -24,6 +24,8 @@
 
 /**
  * NodeIndexer for use in batch jobs
+ *
+ * @Flow\Scope("singleton")
  */
 class NodeIndexer extends ContentRepositoryAdaptor\Indexer\NodeIndexer
 {