Merge pull request #117 from bjornpost/fix-issue-114

allowEmpty: implement for BelongsTo, improve for HasOne
lox · Apr 10, 2015 · 07631a5 · 07631a5
2 parents ab6c67d + 35d3a87
commit 07631a5
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 7 deletions.
diff --git a/lib/Pheasant/Relationships/BelongsTo.php b/lib/Pheasant/Relationships/BelongsTo.php
@@ -2,14 +2,27 @@
 
 namespace Pheasant\Relationships;
 
+use \Pheasant\Relationship;
+
 /**
  * A BelongsTo relationship represents the weak side of a 1->1 relationship. The
  * local entity has responsibility for the foreign key.
  *
  */
-class BelongsTo extends HasOne
+class BelongsTo extends Relationship
 {
     private $_property;
+    private $_allowEmpty;
+
+    /**
+     * Constructor
+     *
+     */
+    public function __construct($class, $local, $foreign=null, $allowEmpty=false)
+    {
+        parent::__construct($class, $local, $foreign);
+        $this->_allowEmpty = $allowEmpty;
+    }
 
     /* (non-phpdoc)
      * @see Relationship::get()
@@ -25,11 +38,24 @@ public function get($object, $key, $cache=null)
         }
 
         if (($localValue = $object->{$this->local}) === null) {
-            return null;
+            if($this->_allowEmpty) {
+                return null;
+            } else {
+                throw new \Pheasant\Exception("Local value is null while not allowed");
+            }
+        }
+
+        $result = $this->query("{$this->foreign}=?", $localValue)->execute();
+
+        if(!count($result)) {
+            if($this->_allowEmpty) {
+                return null;
+            } else {
+                throw new \Pheasant\Exception("Failed to find a $key (via $this->foreign)");
+            }
         }
 
-        return $this->hydrate($this->query("{$this->foreign}=?", $localValue)
-            ->execute()->row());
+        return $this->hydrate($result->row());
     }
 
     /* (non-phpdoc)

diff --git a/lib/Pheasant/Relationships/HasOne.php b/lib/Pheasant/Relationships/HasOne.php
@@ -39,7 +39,11 @@ public function get($object, $key, $cache=null)
         }
 
         if (($localValue = $object->{$this->local}) === null) {
-            return null;
+            if($this->_allowEmpty) {
+                return null;
+            } else {
+                throw new \Pheasant\Exception("Local value is null while not allowed");
+            }
         }
 
         $result = $this

diff --git a/tests/Pheasant/Tests/Examples/Hero.php b/tests/Pheasant/Tests/Examples/Hero.php
@@ -22,7 +22,7 @@ public function relationships()
     {
         return array(
             'Powers' => Power::hasMany('id','heroid'),
-            'SecretIdentity' => SecretIdentity::belongsTo('identityid','id'),
+            'SecretIdentity' => SecretIdentity::belongsTo('identityid','id', true),
             );
     }
 

diff --git a/tests/Pheasant/Tests/RelationshipTest.php b/tests/Pheasant/Tests/RelationshipTest.php
@@ -94,11 +94,20 @@ public function testFilteringCollectionsReturnedByRelationships()
         $this->assertCount(1, $spiderman->Powers->filter('description LIKE ?', 'Super-human%')->toArray());
     }
 
-    public function testEmptyRelationships()
+    public function testEmptyRelationshipsWithAllowEmpty()
     {
         $hero = new Hero(array('alias'=>'Spider Man'));
         $hero->save();
 
         $this->assertNull($hero->SecretIdentity);
     }
+
+    public function testEmptyRelationshipsWithoutAllowEmpty()
+    {
+        $power = new Power(array('description'=>'Spider Senses'));
+        $power->save();
+
+        $this->setExpectedException('\Pheasant\Exception');
+        $foo = $power->Hero;
+    }
 }