fix conflicts

Author: taylorotwell

src/Illuminate/Auth/EloquentUserProvider.php

@@ -48,7 +48,7 @@ public function retrieveById($identifier)
         $model = $this->createModel();
 
         return $this->newModelQuery($model)
-                    ->where($model->qualifyColumn($model->getAuthIdentifierName()), $identifier)
+                    ->where($model->getAuthIdentifierName(), $identifier)
                     ->first();
     }
 
@@ -64,7 +64,7 @@ public function retrieveByToken($identifier, $token)
         $model = $this->createModel();
 
         $retrievedModel = $this->newModelQuery($model)->where(
-            $model->qualifyColumn($model->getAuthIdentifierName()), $identifier
+            $model->getAuthIdentifierName(), $identifier
         )->first();
 
         if (! $retrievedModel) {

src/Illuminate/Foundation/Application.php

@@ -35,7 +35,7 @@ class Application extends Container implements ApplicationContract, CachesConfig
      *
      * @var string
      */
-    const VERSION = '9.21.5';
+    const VERSION = '9.21.6';
 
     /**
      * The base path for the Laravel installation.

tests/Auth/AuthEloquentUserProviderTest.php

@@ -22,8 +22,7 @@ public function testRetrieveByIDReturnsUser()
         $mock = m::mock(stdClass::class);
         $mock->shouldReceive('newQuery')->once()->andReturn($mock);
         $mock->shouldReceive('getAuthIdentifierName')->once()->andReturn('id');
-        $mock->shouldReceive('qualifyColumn')->with('id')->andReturn('users.id');
-        $mock->shouldReceive('where')->once()->with('users.id', 1)->andReturn($mock);
+        $mock->shouldReceive('where')->once()->with('id', 1)->andReturn($mock);
         $mock->shouldReceive('first')->once()->andReturn('bar');
         $provider->expects($this->once())->method('createModel')->willReturn($mock);
         $user = $provider->retrieveById(1);
@@ -40,8 +39,7 @@ public function testRetrieveByTokenReturnsUser()
         $mock = m::mock(stdClass::class);
         $mock->shouldReceive('newQuery')->once()->andReturn($mock);
         $mock->shouldReceive('getAuthIdentifierName')->once()->andReturn('id');
-        $mock->shouldReceive('qualifyColumn')->with('id')->andReturn('users.id');
-        $mock->shouldReceive('where')->once()->with('users.id', 1)->andReturn($mock);
+        $mock->shouldReceive('where')->once()->with('id', 1)->andReturn($mock);
         $mock->shouldReceive('first')->once()->andReturn($mockUser);
         $provider->expects($this->once())->method('createModel')->willReturn($mock);
         $user = $provider->retrieveByToken(1, 'a');
@@ -55,8 +53,7 @@ public function testRetrieveTokenWithBadIdentifierReturnsNull()
         $mock = m::mock(stdClass::class);
         $mock->shouldReceive('newQuery')->once()->andReturn($mock);
         $mock->shouldReceive('getAuthIdentifierName')->once()->andReturn('id');
-        $mock->shouldReceive('qualifyColumn')->with('id')->andReturn('users.id');
-        $mock->shouldReceive('where')->once()->with('users.id', 1)->andReturn($mock);
+        $mock->shouldReceive('where')->once()->with('id', 1)->andReturn($mock);
         $mock->shouldReceive('first')->once()->andReturn(null);
         $provider->expects($this->once())->method('createModel')->willReturn($mock);
         $user = $provider->retrieveByToken(1, 'a');
@@ -81,8 +78,7 @@ public function testRetrieveByBadTokenReturnsNull()
         $mock = m::mock(stdClass::class);
         $mock->shouldReceive('newQuery')->once()->andReturn($mock);
         $mock->shouldReceive('getAuthIdentifierName')->once()->andReturn('id');
-        $mock->shouldReceive('qualifyColumn')->with('id')->andReturn('users.id');
-        $mock->shouldReceive('where')->once()->with('users.id', 1)->andReturn($mock);
+        $mock->shouldReceive('where')->once()->with('id', 1)->andReturn($mock);
         $mock->shouldReceive('first')->once()->andReturn($mockUser);
         $provider->expects($this->once())->method('createModel')->willReturn($mock);
         $user = $provider->retrieveByToken(1, 'a');