Convert to array the attributes from makeHidden function. (#14852)

laravel · Aug 16, 2016 · 60b386f · 60b386f
1 parent bbc1ba6
commit 60b386f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Model.php b/src/Illuminate/Database/Eloquent/Model.php
@@ -2150,7 +2150,7 @@ public function makeHidden($attributes)
     {
         $this->visible = array_diff($this->visible, (array) $attributes);
 
-        $this->hidden = array_unique(array_merge($this->hidden, $attributes));
+        $this->hidden = array_unique(array_merge($this->hidden, (array) $attributes));
 
         return $this;
     }

diff --git a/tests/Database/DatabaseEloquentModelTest.php b/tests/Database/DatabaseEloquentModelTest.php
@@ -719,15 +719,23 @@ public function testWithHidden()
 
     public function testMakeHidden()
     {
-        $model = new EloquentModelStub(['name' => 'foo', 'age' => 'bar', 'id' => 'baz']);
+        $model = new EloquentModelStub(['name' => 'foo', 'age' => 'bar', 'address' => 'foobar', 'id' => 'baz']);
         $array = $model->toArray();
         $this->assertArrayHasKey('name', $array);
         $this->assertArrayHasKey('age', $array);
+        $this->assertArrayHasKey('address', $array);
+        $this->assertArrayHasKey('id', $array);
+
+        $array = $model->makeHidden('address')->toArray();
+        $this->assertArrayNotHasKey('address', $array);
+        $this->assertArrayHasKey('name', $array);
+        $this->assertArrayHasKey('age', $array);
         $this->assertArrayHasKey('id', $array);
 
         $array = $model->makeHidden(['name', 'age'])->toArray();
         $this->assertArrayNotHasKey('name', $array);
         $this->assertArrayNotHasKey('age', $array);
+        $this->assertArrayNotHasKey('address', $array);
         $this->assertArrayHasKey('id', $array);
     }