Merge pull request #19 from matryoshka-model/hotfix-issue-17

Fixes #17 AbstractActiveRecord::save() doesn't work on update
matryoshka-model · Oct 21, 2014 · ed46b1a · ed46b1a
2 parents 21ac331 + 8226d2e
commit ed46b1a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/library/Matryoshka/Model/Object/AbstractActiveRecord.php b/library/Matryoshka/Model/Object/AbstractActiveRecord.php
@@ -78,6 +78,7 @@ public function save()
         }
 
         $criteria = clone $this->activeRecordCriteriaPrototype;
+        $criteria->setId($this->getId());
         $result = $this->getModel()->save($criteria, $this);
         return $result;
     }

diff --git a/tests/MatryoshkaTest/Model/Object/AbstractActiveRecordTest.php b/tests/MatryoshkaTest/Model/Object/AbstractActiveRecordTest.php
@@ -18,7 +18,8 @@ class AbstractActiveRecordTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         $this->object = new ActiveRecordObject();
-        $this->object->setActiveRecordCriteriaPrototype(new ConcreteCriteria());
+        $this->criteria = new ConcreteCriteria();
+        $this->object->setActiveRecordCriteriaPrototype($this->criteria);
     }
 
     public function testGetSetModel()
@@ -38,19 +39,27 @@ public function testGetSetModel()
 
     public function testSave()
     {
+        $id = 'id';
+        $criteria = clone $this->criteria;
+        $criteria->setId($id);
+
+
         $abstractModelMock  = $this->getMockBuilder('Matryoshka\Model\AbstractModel')
                                     ->disableOriginalConstructor()
                                     ->setMethods(['save'])
                                     ->getMock();
         $result = null;
 
+
         $abstractModelMock->expects($this->atLeastOnce())
                            ->method('save')
-                           ->with($this->isInstanceOf('Matryoshka\Model\Criteria\ActiveRecord\AbstractCriteria'), $this->identicalTo($this->object))
+                           ->with($this->equalTo($criteria), $this->identicalTo($this->object))
                            ->will($this->returnValue($result));
 
         $this->object->setModel($abstractModelMock);
 
+        //Test with ID
+        $this->object->setId($id);
         $this->assertSame($result, $this->object->save());
     }