do not attach removed entities when using them in HasMany::has()

nextras · Jan 4, 2025 · c7ee9ab · c7ee9ab
1 parent 57f8abe
commit c7ee9ab
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/src/Relationships/HasMany.php b/src/Relationships/HasMany.php
@@ -170,7 +170,7 @@ public function remove($entity): ?IEntity
 			return null;
 		}
 
-		$entity = $this->createEntity($entity);
+		$entity = $this->createEntity($entity, attach: false);
 		if ($entity === null) {
 			return null;
 		}
@@ -193,7 +193,7 @@ public function remove($entity): ?IEntity
 
 	public function has($entity): bool
 	{
-		$entity = $this->createEntity($entity, false);
+		$entity = $this->createEntity($entity, need: false, attach: false);
 		if ($entity === null) {
 			return false;
 		}
@@ -332,16 +332,18 @@ function (): array {
 	 * @param E|string|int $entity
 	 * @return E|null
 	 */
-	protected function createEntity($entity, bool $need = true): ?IEntity
+	protected function createEntity($entity, bool $need = true, bool $attach = true): ?IEntity
 	{
 		if ($entity instanceof IEntity) {
-			if ($entity->isAttached()) {
-				$repository = $entity->getRepository()->getModel()->getRepositoryForEntity($this->parent);
-				$repository->attach($this->parent);
-
-			} elseif ($this->parent->isAttached()) {
-				$repository = $this->parent->getRepository()->getModel()->getRepositoryForEntity($entity);
-				$repository->attach($entity);
+			if ($attach) {
+				if ($entity->isAttached()) {
+					$repository = $entity->getRepository()->getModel()->getRepositoryForEntity($this->parent);
+					$repository->attach($this->parent);
+
+				} elseif ($this->parent->isAttached()) {
+					$repository = $this->parent->getRepository()->getModel()->getRepositoryForEntity($entity);
+					$repository->attach($entity);
+				}
 			}
 
 			return $entity;

diff --git a/tests/cases/integration/Relationships/relationships.oneHasMany.has().phpt b/tests/cases/integration/Relationships/relationships.oneHasMany.has().phpt
@@ -16,7 +16,6 @@ require_once __DIR__ . '/../../../bootstrap.php';
 
 class RelationshipsOneHasManyHasTest extends DataTestCase
 {
-
 	public function testHasValue(): void
 	{
 		$author = $this->orm->authors->getByIdChecked(1);
@@ -27,8 +26,8 @@ class RelationshipsOneHasManyHasTest extends DataTestCase
 		Assert::true($author->books->has($book));
 		$this->orm->books->remove($book);
 		Assert::false($author->books->has($book));
+		Assert::false($book->isAttached());
 	}
-
 }