Merge 3ca1fcf into 2426c46

src/Model/IModel.php

@@ -55,24 +55,30 @@ public function getMetadataStorage(): MetadataStorage;
 	 * Persist the entity with cascade.
 	 */
 	public function persist(IEntity $entity, bool $withCascade = true): IEntity;
+
+
+	/**
+	 * Persist the entity with cascade and flushes the model.
+	 */
+	public function persistAndFlush(IEntity $entity): IEntity;
 
 
 	/**
 	 * Removes the entity with cascade.
 	 */
 	public function remove(IEntity $entity, bool $withCascade = true): IEntity;
-
-
+	
+	
 	/**
-	 * Flushes all persisted changes in repositories.
+	 * Removes the entity with cascade and flushes the model.
 	 */
-	public function flush(): void;
+	public function removeAndFlush(IEntity $entity, bool $withCascade = true): IEntity;
 
 
 	/**
-	 * Persist the entity with cascade and flushes the model.
+	 * Flushes all persisted changes in repositories.
 	 */
-	public function persistAndFlush(IEntity $entity): IEntity;
+	public function flush(): void;
 
 
 	/**

src/Model/Model.php

@@ -131,6 +131,16 @@ public function persist(IEntity $entity, bool $withCascade = true): IEntity
 	}
 
 
+	/** {@inheritdoc} */
+	public function persistAndFlush(IEntity $entity): IEntity
+	{
+		$this->persist($entity);
+		$this->flush();
+		return $entity;
+	}
+
+
+	/** {@inheritdoc} */
 	public function remove(IEntity $entity, bool $withCascade = true): IEntity
 	{
 		$queuePersist = $queueRemove = [];
@@ -149,6 +159,15 @@ public function remove(IEntity $entity, bool $withCascade = true): IEntity
 		}
 		return $entity;
 	}
+
+
+	/** {@inheritdoc} */
+	public function removeAndFlush(IEntity $entity, bool $withCascade = true): IEntity
+	{
+		$this->remove($entity, $withCascade);
+		$this->flush();
+		return $entity;
+	}
 
 
 	/** {@inheritdoc} */
@@ -166,15 +185,6 @@ public function flush(): void
 	}
 
 
-	/** {@inheritdoc} */
-	public function persistAndFlush(IEntity $entity): IEntity
-	{
-		$this->persist($entity);
-		$this->flush();
-		return $entity;
-	}
-
-
 	/** {@inheritdoc} */
 	public function clear(): void
 	{