Merge branch 'develop'

Author: janpecha

src/LeanMapper/Entity.php

@@ -858,6 +858,12 @@ protected function initDefaults(): void
     private function getHasOneValue(Property $property, Relationship\HasOne $relationship, ?Filtering $filtering = null): ?Entity
     {
         if (!$relationship->hasTargetTable()) {
+            $viaColumn = $relationship->getColumnReferencingTargetTable();
+
+            if ($this->row->hasReferencedRow($viaColumn) && $this->row->getReferencedRow($viaColumn) === null && $property->isNullable()) {
+                return null;
+            }
+
             throw new InvalidStateException('Cannot get referenced Entity for detached Entity.');
         }
         $targetTable = $relationship->getTargetTable();

src/LeanMapper/Row.php

@@ -13,6 +13,8 @@
 
 namespace LeanMapper;
 
+use LeanMapper\Exception\InvalidStateException;
+
 /**
  * Pointer to specific position within Result instance
  *
@@ -225,6 +227,22 @@ public function setReferencedRow(?self $row = null, string $viaColumn): void
     }
 
 
+    public function hasReferencedRow(string $viaColumn): bool
+    {
+        return array_key_exists($viaColumn, $this->referencedRows);
+    }
+
+
+    public function getReferencedRow(string $viaColumn): ?Row
+    {
+        if (array_key_exists($viaColumn, $this->referencedRows)) {
+            return $this->referencedRows[$viaColumn];
+        }
+
+        throw new InvalidStateException("Missing referenced row for column '$viaColumn'.");
+    }
+
+
     /**
      * Adds new data entry to referencing Result
      *

tests/LeanMapper/Entity.hasOne.detached.phpt

@@ -21,6 +21,7 @@ class Author extends Entity
  * @property int $id
  * @property string $name
  * @property Author $author m:hasOne
+ * @property Author|null $reviewer m:hasOne
  */
 class Book extends Entity
 {
@@ -58,3 +59,24 @@ $authorRepository->persist($author);
 $book = new Book;
 $book->author = $author;
 Assert::same('Fowler', $book->author->name);
+
+////////////////////
+
+test('Assign NULL to detached', function () {
+    $book = new Book;
+    $book->reviewer = null;
+
+    Assert::null($book->reviewer);
+});
+
+
+test('Assign attached & NULL to detached', function () use ($authorRepository) {
+    $author = $authorRepository->find(1);
+
+    $book = new Book;
+    $book->author = $author;
+    $book->reviewer = null;
+
+    Assert::same('Andrew Hunt', $book->author->name);
+    Assert::null($book->reviewer);
+});

tests/bootstrap.php

@@ -36,3 +36,9 @@
 $mapper = new DefaultMapper(null);
 
 $entityFactory = new DefaultEntityFactory;
+
+
+function test(string $title, Closure $function): void
+{
+    $function();
+}