Merge pull request #1976 from neoascetic/more_fluent_eloquent

taylorotwell · taylorotwell · commit 86fc0ca7cb77 · 2013-05-13T22:43:15.000-07:00
Even more fluent eloquent model via magic setters
diff --git a/laravel/database/eloquent/model.php b/laravel/database/eloquent/model.php
@@ -441,7 +441,7 @@ public function timestamp()
 	}
 
 	/**
-	 *Updates the timestamp on the model and immediately saves it.
+	 * Updates the timestamp on the model and immediately saves it.
 	 *
 	 * @return void
 	 */
@@ -562,11 +562,12 @@ public function get_attribute($key)
 	 *
 	 * @param  string  $key
 	 * @param  mixed   $value
-	 * @return void
+	 * @return Model
 	 */
 	public function set_attribute($key, $value)
 	{
 		$this->attributes[$key] = $value;
+		return $this;
 	}
 
 	/**
@@ -769,7 +770,7 @@ public function __call($method, $parameters)
 		}
 		elseif (starts_with($method, 'set_'))
 		{
-			$this->set_attribute(substr($method, 4), $parameters[0]);
+			return $this->set_attribute(substr($method, 4), $parameters[0]);
 		}
 
 		// Finally we will assume that the method is actually the beginning of a
diff --git a/laravel/tests/cases/eloquent.test.php b/laravel/tests/cases/eloquent.test.php
@@ -133,6 +133,19 @@ public function testAttributeMagicSetterMethodChangesAttribute()
 		Model::$accessible = null;
 	}
 
+	/**
+	 * Test the Model::__set method allows chaining.
+	 *
+	 * @group laravel
+	 */
+	public function testAttributeMagicSetterMethodAllowsChaining()
+	{
+		$model = new Model;
+		$this->assertInstanceOf('Model', $model->set_foo('foo'));
+		$model->set_bar('bar')->set_baz('baz');
+		$this->assertEquals(array('foo' => 'foo', 'bar' => 'bar', 'baz' => 'baz'), $model->to_array());
+	}
+
 	/**
 	 * Test the Model::__get method.
 	 *
@@ -288,4 +301,4 @@ public function testConvertingToArray()
 
 	}
 
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@ public function timestamp()`
`441`	`441`	`}`
`442`	`442`
`443`	`443`	`/**`
`444`		`- *Updates the timestamp on the model and immediately saves it.`
	`444`	`+ * Updates the timestamp on the model and immediately saves it.`
`445`	`445`	`*`
`446`	`446`	`* @return void`
`447`	`447`	`*/`
`@@ -562,11 +562,12 @@ public function get_attribute($key)`
`562`	`562`	`*`
`563`	`563`	`* @param string $key`
`564`	`564`	`* @param mixed $value`
`565`		`- * @return void`
	`565`	`+ * @return Model`
`566`	`566`	`*/`
`567`	`567`	`public function set_attribute($key, $value)`
`568`	`568`	`{`
`569`	`569`	`$this->attributes[$key] = $value;`
	`570`	`+ return $this;`
`570`	`571`	`}`
`571`	`572`
`572`	`573`	`/**`
`@@ -769,7 +770,7 @@ public function __call($method, $parameters)`
`769`	`770`	`}`
`770`	`771`	`elseif (starts_with($method, 'set_'))`
`771`	`772`	`{`
`772`		`- $this->set_attribute(substr($method, 4), $parameters[0]);`
	`773`	`+ return $this->set_attribute(substr($method, 4), $parameters[0]);`
`773`	`774`	`}`
`774`	`775`
`775`	`776`	`// Finally we will assume that the method is actually the beginning of a`