Added hasId()

matryoshka-model · Jul 31, 2015 · 2ff080c · 2ff080c
1 parent 49279be
commit 2ff080c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/library/Criteria/ActiveRecord/AbstractCriteria.php b/library/Criteria/ActiveRecord/AbstractCriteria.php
@@ -47,11 +47,21 @@ public function setId($id)
      */
     public function getId()
     {
-        if (!$this->id) {
+        if (null === $this->id) {
             throw new Exception\RuntimeException(
                 'getId(), apply() and applyDelete() require that an id must be present using a prior call to setId()'
             );
         }
         return $this->id;
     }
+
+    /**
+     * Check if Id has been set
+     *
+     * @return boolean
+     */
+    public function hasId()
+    {
+        return $this->id !== null;
+    }
 }
diff --git a/tests/Criteria/ActiveRecord/AbstractCriteriaTest.php b/tests/Criteria/ActiveRecord/AbstractCriteriaTest.php
@@ -31,13 +31,20 @@ public function testShouldThrowExceptionWhenNoId()
     /**
      * @depends testShouldThrowExceptionWhenNoId
      */
-    public function testGetSetId()
+    public function testGetSetHasId()
     {
+        $this->assertFalse($this->criteria->hasId());
+
         $id = 'foo';
         $this->assertInstanceOf(
             '\MatryoshkaTest\Model\Criteria\ActiveRecord\TestAsset\ConcreteCriteria',
             $this->criteria->setId($id)
         );
         $this->assertSame($id, $this->criteria->getId());
+
+        $this->assertTrue($this->criteria->hasId());
+        $this->criteria->setId(null);
+        $this->assertFalse($this->criteria->hasId());
     }
+
 }