Merge branch 'theVannu/8.x' into 8.x

Author: taylorotwell

src/Illuminate/Database/Eloquent/Builder.php

@@ -1517,6 +1517,17 @@ public function qualifyColumn($column)
         return $this->model->qualifyColumn($column);
     }
 
+    /**
+     * Qualify the given columns with the model's table.
+     *
+     * @param  array|\Illuminate\Database\Query\Expression  $columns
+     * @return array
+     */
+    public function qualifyColumns($columns)
+    {
+        return $this->model->qualifyColumns($columns);
+    }
+
     /**
      * Get the given macro by name.
      *

src/Illuminate/Database/Eloquent/Model.php

@@ -434,6 +434,19 @@ public function qualifyColumn($column)
         return $this->getTable().'.'.$column;
     }
 
+    /**
+     * Qualify the given columns with the model's table.
+     *
+     * @param  array  $columns
+     * @return array
+     */
+    public function qualifyColumns($columns)
+    {
+        return collect($columns)->map(function ($column) {
+            return $this->qualifyColumn($column);
+        })->all();
+    }
+
     /**
      * Create a new instance of the given model.
      *

tests/Database/DatabaseEloquentBuilderTest.php

@@ -196,6 +196,16 @@ public function testQualifyColumn()
         $this->assertSame('stub.column', $builder->qualifyColumn('column'));
     }
 
+    public function testQualifyColumns()
+    {
+        $builder = new Builder(m::mock(BaseBuilder::class));
+        $builder->shouldReceive('from')->with('stub');
+
+        $builder->setModel(new EloquentModelStub);
+
+        $this->assertEquals(['stub.column', 'stub.name'], $builder->qualifyColumns(['column', 'name']));
+    }
+
     public function testGetMethodLoadsModelsAndHydratesEagerRelations()
     {
         $builder = m::mock(Builder::class.'[getModels,eagerLoadRelations]', [$this->getMockQueryBuilder()]);