Merge a462c62 into 9da4564

josegonzalez · Oct 28, 2014 · beac028 · beac028
2 parents 9da4564 + a462c62
commit beac028
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 24 deletions.
diff --git a/ORM/Table.php b/ORM/Table.php
@@ -11,13 +11,20 @@ class Table extends AppModel {
 
 	protected $_savedEntityStates = [];
 
+/**
+ * Class constructor
+ *
+ * @param bool|int|string|array $id Set this ID for this model on startup.
+ * @param string $table Name of database table to use.
+ * @param string $ds DataSource connection name.
+ */
 	public function __construct($id = false, $table = null, $ds = null) {
 		if (is_array($id)) {
 			$alias = Hash::get($id, 'alias') ?: (Hash::get($id, 'table') ?: $this->alias);
 			$id['alias'] = Inflector::singularize(preg_replace('/Table$/', '', $alias));
 			$this->name = $this->alias = $this->alias($id['alias']);
-
 			$schema = Hash::get($id, 'schema');
+
 			if ($schema !== null) {
 				$this->_schema = $schema;
 			}
@@ -33,6 +40,7 @@ public function __construct($id = false, $table = null, $ds = null) {
 			}
 			$table = Inflector::tableize(preg_replace('/Table$/', '', $this->alias));
 		}
+
 		parent::__construct($id, $table, $ds);
 		$this->entityClass(Inflector::singularize($this->name) . 'Entity');
 		$this->initialize([]);
@@ -98,7 +106,7 @@ public function table($table = null) {
 /**
  * Returns the table alias or sets a new one
  *
- * @param string $table the new table alias
+ * @param string $alias the new table alias
  * @return string
  */
 	public function alias($alias = null) {
@@ -396,7 +404,7 @@ public function belongsToMany($associated, array $options = []) {
 
 /**
  * Table::_bindModel()
- * 
+ *
  * @param mixed $type
  * @param mixed $associated
  * @param mixed $options
@@ -486,7 +494,7 @@ public function exists($conditions = null) {
 
 /**
  * Table::save()
- * 
+ *
  * @param mixed $entity
  * @param bool $validate
  * @param mixed $fieldList
@@ -516,14 +524,19 @@ public function save($entity = null, $validate = true, $fieldList = []) {
 			return false;
 		}
 
-		$isNew = $entity->isNew();
 		$success = parent::save($entity, $validate, $fieldList);
+		$insertedId = $this->getInsertID();
+
 		if (!$success) {
 			return false;
 		}
 
 		$entity->isNew(false);
-		$entity->set($this->primaryKey(), $this->getInsertID());
+
+		if (!empty($insertedId)) {
+			$entity->set($this->primaryKey(), $this->getInsertID());
+		}
+
 		return $entity;
 	}
 
@@ -665,7 +678,7 @@ public function convertToEntity($data) {
 
 /**
  * Table::convertToEntities()
- * 
+ *
  * @param mixed $list
  * @return
  */
@@ -683,7 +696,7 @@ public function convertToEntities($list) {
 
 /**
  * Table::beforeFind()
- * 
+ *
  * @param mixed $queryData
  * @return
  */
@@ -699,7 +712,7 @@ public function beforeFind($queryData) {
 
 /**
  * Table::afterFind()
- * 
+ *
  * @param mixed $results
  * @param bool $primary
  * @return
@@ -717,7 +730,7 @@ public function afterFind($results, $primary = false) {
 
 /**
  * Table::_saveEntityState()
- * 
+ *
  * @return void
  */
 	protected function _saveEntityState() {
@@ -726,7 +739,7 @@ protected function _saveEntityState() {
 
 /**
  * Table::_restoreEntityState()
- * 
+ *
  * @return void
  */
 	protected function _restoreEntityState() {
@@ -735,7 +748,7 @@ protected function _restoreEntityState() {
 
 /**
  * Table::_entityClassForData()
- * 
+ *
  * @param mixed $data
  * @return
  */
@@ -745,7 +758,7 @@ protected function _entityClassForData($data) {
 
 /**
  * Table::allEntities()
- * 
+ *
  * @param mixed $params
  * @return
  */
@@ -756,7 +769,7 @@ public function allEntities($params = []) {
 
 /**
  * Table::entities()
- * 
+ *
  * @param mixed $params
  * @return
  */
@@ -766,7 +779,7 @@ public function entities($params = []) {
 
 /**
  * Table::__call()
- * 
+ *
  * @param mixed $method
  * @param mixed $params
  * @return
@@ -785,7 +798,7 @@ public function __call($method, $params) {
 
 /**
  * Table::_analyzeMethodName()
- * 
+ *
  * @param mixed $method
  * @return
  */
@@ -818,7 +831,7 @@ public function set($one, $two = null) {
 
 /**
  * Table::_EntityClassLocation()
- * 
+ *
  * @return
  */
 	protected function _entityClassLocation() {

diff --git a/Test/Case/ORM/EntityTest.php b/Test/Case/ORM/EntityTest.php
@@ -55,7 +55,7 @@ public function testSetOneParamWithSetter() {
 		$entity = $this->getMock('Entity', ['setName']);
 		$entity->expects($this->once())->method('setName')
 			->with('Jones')
-			->will($this->returnCallback(function($name) {
+			->will($this->returnCallback(function ($name) {
 				$this->assertEquals('Jones', $name);
 				return 'Dr. ' . $name;
 			}));
@@ -73,13 +73,13 @@ public function testMultipleWithSetter() {
 		$entity->accessible('*', true);
 		$entity->expects($this->once())->method('setName')
 			->with('Jones')
-			->will($this->returnCallback(function($name) {
+			->will($this->returnCallback( function($name) {
 				$this->assertEquals('Jones', $name);
 				return 'Dr. ' . $name;
 			}));
 		$entity->expects($this->once())->method('setStuff')
 			->with(['a', 'b'])
-			->will($this->returnCallback(function($stuff) {
+			->will($this->returnCallback(function ($stuff) {
 				$this->assertEquals(['a', 'b'], $stuff);
 				return ['c', 'd'];
 			}));
@@ -169,7 +169,7 @@ public function testGetCustomGetters() {
 		$entity = $this->getMock('Entity', ['getName']);
 		$entity->expects($this->once())->method('getName')
 			->with('Jones')
-			->will($this->returnCallback(function($name) {
+			->will($this->returnCallback(function ($name) {
 				$this->assertSame('Jones', $name);
 				return 'Dr. ' . $name;
 			}));
@@ -199,7 +199,7 @@ public function testMagicSetWithSetter() {
 		$entity = $this->getMock('Entity', ['setName']);
 		$entity->expects($this->once())->method('setName')
 			->with('Jones')
-			->will($this->returnCallback(function($name) {
+			->will($this->returnCallback(function ($name) {
 				$this->assertEquals('Jones', $name);
 				return 'Dr. ' . $name;
 			}));
@@ -216,7 +216,7 @@ public function testMagicGetWithGetter() {
 		$entity = $this->getMock('Entity', ['getName']);
 		$entity->expects($this->once())->method('getName')
 			->with('Jones')
-			->will($this->returnCallback(function($name) {
+			->will($this->returnCallback(function ($name) {
 				$this->assertSame('Jones', $name);
 				return 'Dr. ' . $name;
 			}));

diff --git a/Test/Case/ORM/TableTest.php b/Test/Case/ORM/TableTest.php
@@ -257,7 +257,7 @@ class TableTest extends CakeTestCase {
  * Handy variable containing the next primary key that will be inserted in the
  * users table
  *
- * @var integer
+ * @var int
  */
 	public static $nextUserId = 5;
 
@@ -403,6 +403,7 @@ public function testDisplaySet() {
  */
 	public function testFindPersistedEntities() {
 		$table = TableRegistry::get('users');
+		$table->entity = true;
 		$results = $table->find('all');
 		$this->assertCount(4, $results);
 		foreach ($results as $article) {