From 9bb76853403fcb071b9454f1dc0369a8b42c3257 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylor@laravel.com>
Date: Sun, 3 Mar 2019 09:29:48 -0600
Subject: [PATCH] formatting
---
src/Illuminate/Auth/EloquentUserProvider.php | 41 ++++++++++----------
1 file changed, 21 insertions(+), 20 deletions(-)
diff --git a/src/Illuminate/Auth/EloquentUserProvider.php b/src/Illuminate/Auth/EloquentUserProvider.php
index 1ab9b3cad02a..50491c316bf0 100755
--- a/src/Illuminate/Auth/EloquentUserProvider.php
+++ b/src/Illuminate/Auth/EloquentUserProvider.php
@@ -47,9 +47,9 @@ public function retrieveById($identifier)
{
$model = $this->createModel();
- return $this->modelQuery($model)
- ->where($model->getAuthIdentifierName(), $identifier)
- ->first();
+ return $this->newModelQuery($model)
+ ->where($model->getAuthIdentifierName(), $identifier)
+ ->first();
}
/**
@@ -63,7 +63,9 @@ public function retrieveByToken($identifier, $token)
{
$model = $this->createModel();
- $retrievedModel = $this->modelQuery($model)->where($model->getAuthIdentifierName(), $identifier)->first();
+ $retrievedModel = $this->newModelQuery($model)->where(
+ $model->getAuthIdentifierName(), $identifier
+ )->first();
if (! $retrievedModel) {
return null;
@@ -71,7 +73,8 @@ public function retrieveByToken($identifier, $token)
$rememberToken = $retrievedModel->getRememberToken();
- return $rememberToken && hash_equals($rememberToken, $token) ? $retrievedModel : null;
+ return $rememberToken && hash_equals($rememberToken, $token)
+ ? $retrievedModel : null;
}
/**
@@ -111,7 +114,7 @@ public function retrieveByCredentials(array $credentials)
// First we will add each credential element to the query as a where clause.
// Then we can execute the query and, if we found a user, return it in a
// Eloquent User "model" that will be utilized by the Guard instances.
- $query = $this->modelQuery();
+ $query = $this->newModelQuery();
foreach ($credentials as $key => $value) {
if (Str::contains($key, 'password')) {
@@ -143,30 +146,28 @@ public function validateCredentials(UserContract $user, array $credentials)
}
/**
- * Create a new instance of the model.
+ * Get a new query builder for the model instance.
*
- * @return \Illuminate\Database\Eloquent\Model
+ * @param \Illuminate\Database\Eloquent\Model|null $model
+ * @return \Illuminate\Database\Eloquent\Builder
*/
- public function createModel()
+ protected function newModelQuery($model = null)
{
- $class = '\\'.ltrim($this->model, '\\');
-
- return new $class;
+ return is_null($model)
+ ? $this->createModel()->newQuery()
+ : $model->newQuery();
}
/**
- * Get a new query builder for the model instance.
+ * Create a new instance of the model.
*
- * @param \Illuminate\Database\Eloquent\Model|null $model
- * @return \Illuminate\Database\Eloquent\Builder
+ * @return \Illuminate\Database\Eloquent\Model
*/
- protected function modelQuery($model = null)
+ public function createModel()
{
- if (is_null($model)) {
- $model = $this->createModel();
- }
+ $class = '\\'.ltrim($this->model, '\\');
- return $model->newQuery();
+ return new $class;
}
/**