repository: fixed non-cascade remove with empty non-nullable relation…

…ship
nextras · Feb 11, 2016 · 7030718 · 7030718
1 parent 4bd3d98
commit 7030718
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/Repository/RemovalHelper.php b/src/Repository/RemovalHelper.php
@@ -145,6 +145,10 @@ private static function setNulls($entity, array $metadata, IModel $model, array
 					}
 
 				} else {
+					if ($type === Relationship::ONE_HAS_MANY && $entity->getValue($name)->count() === 0) {
+						continue;
+					}
+
 					$entityClass = get_class($entity);
 					$reverseEntityClass = $propertyMeta->relationship->entity;
 					$primaryValue = $entity->getValue('id');

diff --git a/tests/cases/integration/Relationships/relationships.oneHasMany.remove.phpt b/tests/cases/integration/Relationships/relationships.oneHasMany.remove.phpt
@@ -80,6 +80,18 @@ class RelationshipOneHasManyRemoveTest extends DataTestCase
 		Assert::false($author->isPersisted());
 	}
 
+
+	public function testRemoveNoCascadeEmptyCollection()
+	{
+		$author = new Author();
+		$author->name = 'A';
+		$this->orm->authors->persistAndFlush($author);
+
+		$author->getMetadata()->getProperty('books')->relationship->cascade['remove'] = false;
+
+		$this->orm->authors->removeAndFlush($author);
+		Assert::false($author->isPersisted());
+	}
 }