Merge remote-tracking branch 'origin/5.2' into 5.2

laravel · Feb 2, 2016 · 0683b59 · 0683b59
2 parents a882241 + 8116de4
commit 0683b59
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Model.php b/src/Illuminate/Database/Eloquent/Model.php
@@ -1478,7 +1478,7 @@ protected function incrementOrDecrementAttributeValue($column, $amount, $method)
     public function update(array $attributes = [], array $options = [])
     {
         if (! $this->exists) {
-            return $this->newQuery()->update($attributes);
+            return false;
         }
 
         return $this->fill($attributes)->save($options);

diff --git a/src/Illuminate/Routing/Route.php b/src/Illuminate/Routing/Route.php
@@ -752,7 +752,7 @@ public function getUri()
      * Set the URI that the route responds to.
      *
      * @param  string  $uri
-     * @return \Illuminate\Routing\Route
+     * @return $this
      */
     public function setUri($uri)
     {
@@ -798,7 +798,7 @@ public function name($name)
      * Set the handler for the route.
      *
      * @param  \Closure|string  $action
-     * @return \Illuminate\Routing\Route
+     * @return $this
      */
     public function uses($action)
     {

diff --git a/tests/Database/DatabaseEloquentModelTest.php b/tests/Database/DatabaseEloquentModelTest.php
@@ -1274,6 +1274,12 @@ public function testModelAttributeCastingPreservesNull()
         $this->assertNull($array['timestampAttribute']);
     }
 
+    public function testUpdatingNonExistentModelFails()
+    {
+        $model = new EloquentModelStub;
+        $this->assertFalse($model->update());
+    }
+
     protected function addMockConnection($model)
     {
         $model->setConnectionResolver($resolver = m::mock('Illuminate\Database\ConnectionResolverInterface'));