From ce193c994b9dd2f6f8a036b574d375e25a42bf39 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Thu, 10 May 2018 09:35:39 +0000 Subject: [PATCH] Apply fixes from StyleCI [ci skip] [skip ci] --- app/Models/BookInfo.php | 2 +- app/Models/Category.php | 2 +- app/Models/ConsoleInfo.php | 2 +- app/Models/GamesInfo.php | 2 +- app/Models/MusicInfo.php | 2 +- app/Models/Release.php | 2 +- app/Models/Settings.php | 2 +- app/Models/User.php | 2 +- app/Models/Video.php | 2 +- app/Models/XxxInfo.php | 2 +- app/Support/Database/Builder.php | 8 ++++---- app/Support/Database/CacheQueryBuilder.php | 4 ++-- config/cache.php | 4 ++-- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/Models/BookInfo.php b/app/Models/BookInfo.php index 1e64f00a9..fde9c1b89 100644 --- a/app/Models/BookInfo.php +++ b/app/Models/BookInfo.php @@ -2,9 +2,9 @@ namespace App\Models; -use App\Support\Database\CacheQueryBuilder; use Laravel\Scout\Searchable; use Illuminate\Database\Eloquent\Model; +use App\Support\Database\CacheQueryBuilder; class BookInfo extends Model { diff --git a/app/Models/Category.php b/app/Models/Category.php index 4be446e9d..8839187c7 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -2,10 +2,10 @@ namespace App\Models; -use App\Support\Database\CacheQueryBuilder; use Illuminate\Support\Carbon; use Illuminate\Support\Facades\Cache; use Illuminate\Database\Eloquent\Model; +use App\Support\Database\CacheQueryBuilder; class Category extends Model { diff --git a/app/Models/ConsoleInfo.php b/app/Models/ConsoleInfo.php index a18072e5e..b5af76de2 100644 --- a/app/Models/ConsoleInfo.php +++ b/app/Models/ConsoleInfo.php @@ -2,9 +2,9 @@ namespace App\Models; -use App\Support\Database\CacheQueryBuilder; use Laravel\Scout\Searchable; use Illuminate\Database\Eloquent\Model; +use App\Support\Database\CacheQueryBuilder; class ConsoleInfo extends Model { diff --git a/app/Models/GamesInfo.php b/app/Models/GamesInfo.php index a40272a85..00dddb7dc 100644 --- a/app/Models/GamesInfo.php +++ b/app/Models/GamesInfo.php @@ -2,9 +2,9 @@ namespace App\Models; -use App\Support\Database\CacheQueryBuilder; use Laravel\Scout\Searchable; use Illuminate\Database\Eloquent\Model; +use App\Support\Database\CacheQueryBuilder; class GamesInfo extends Model { diff --git a/app/Models/MusicInfo.php b/app/Models/MusicInfo.php index d6dae72ed..fcf8ab762 100644 --- a/app/Models/MusicInfo.php +++ b/app/Models/MusicInfo.php @@ -2,9 +2,9 @@ namespace App\Models; -use App\Support\Database\CacheQueryBuilder; use Laravel\Scout\Searchable; use Illuminate\Database\Eloquent\Model; +use App\Support\Database\CacheQueryBuilder; class MusicInfo extends Model { diff --git a/app/Models/Release.php b/app/Models/Release.php index 274a981ef..18453b720 100644 --- a/app/Models/Release.php +++ b/app/Models/Release.php @@ -2,13 +2,13 @@ namespace App\Models; -use App\Support\Database\CacheQueryBuilder; use Blacklight\NZB; use Blacklight\SphinxSearch; use Illuminate\Support\Carbon; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Cache; use Illuminate\Database\Eloquent\Model; +use App\Support\Database\CacheQueryBuilder; class Release extends Model { diff --git a/app/Models/Settings.php b/app/Models/Settings.php index 7c02431b3..a4a2952ae 100644 --- a/app/Models/Settings.php +++ b/app/Models/Settings.php @@ -20,12 +20,12 @@ namespace App\Models; -use App\Support\Database\CacheQueryBuilder; use Blacklight\utility\Utility; use Illuminate\Console\Command; use Illuminate\Support\Facades\DB; use Yadakhov\InsertOnDuplicateKey; use Illuminate\Database\Eloquent\Model; +use App\Support\Database\CacheQueryBuilder; /** * Settings - model for settings table. diff --git a/app/Models/User.php b/app/Models/User.php index 15dc7e1c5..ca6cf0564 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -4,7 +4,6 @@ namespace App\Models; use App\Mail\SendInvite; use App\Mail\AccountChange; -use App\Support\Database\CacheQueryBuilder; use Illuminate\Support\Str; use Illuminate\Support\Carbon; use Blacklight\utility\Utility; @@ -12,6 +11,7 @@ use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Mail; use Illuminate\Notifications\Notifiable; use Illuminate\Support\Facades\Password; +use App\Support\Database\CacheQueryBuilder; use Illuminate\Foundation\Auth\User as Authenticatable; class User extends Authenticatable diff --git a/app/Models/Video.php b/app/Models/Video.php index a5984a9d1..63aa19533 100644 --- a/app/Models/Video.php +++ b/app/Models/Video.php @@ -2,9 +2,9 @@ namespace App\Models; -use App\Support\Database\CacheQueryBuilder; use Illuminate\Support\Carbon; use Illuminate\Database\Eloquent\Model; +use App\Support\Database\CacheQueryBuilder; class Video extends Model { diff --git a/app/Models/XxxInfo.php b/app/Models/XxxInfo.php index 1f8451fba..ee82df3f9 100644 --- a/app/Models/XxxInfo.php +++ b/app/Models/XxxInfo.php @@ -2,8 +2,8 @@ namespace App\Models; -use App\Support\Database\CacheQueryBuilder; use Illuminate\Database\Eloquent\Model; +use App\Support\Database\CacheQueryBuilder; class XxxInfo extends Model { diff --git a/app/Support/Database/Builder.php b/app/Support/Database/Builder.php index 10a225ffc..a706bfbe5 100644 --- a/app/Support/Database/Builder.php +++ b/app/Support/Database/Builder.php @@ -8,7 +8,7 @@ use Illuminate\Database\Query\Builder as QueryBuilder; class Builder extends QueryBuilder { /** - * Taken from https://laracasts.com/discuss/channels/guides/never-execute-a-duplicate-query-again + * Taken from https://laracasts.com/discuss/channels/guides/never-execute-a-duplicate-query-again. * * Run the query as a "select" statement against the connection. * @@ -16,7 +16,7 @@ class Builder extends QueryBuilder */ protected function runSelect() { - return Cache::store('request')->remember($this->getCacheKey(), 1, function() { + return Cache::store('request')->remember($this->getCacheKey(), 1, function () { return parent::runSelect(); }); } @@ -29,7 +29,7 @@ class Builder extends QueryBuilder protected function getCacheKey() { return json_encode([ - $this->toSql() => $this->getBindings() + $this->toSql() => $this->getBindings(), ]); } -} \ No newline at end of file +} diff --git a/app/Support/Database/CacheQueryBuilder.php b/app/Support/Database/CacheQueryBuilder.php index 53fe7eed7..d9c4dec91 100644 --- a/app/Support/Database/CacheQueryBuilder.php +++ b/app/Support/Database/CacheQueryBuilder.php @@ -5,7 +5,7 @@ namespace App\Support\Database; trait CacheQueryBuilder { /** - * Taken from https://laracasts.com/discuss/channels/guides/never-execute-a-duplicate-query-again + * Taken from https://laracasts.com/discuss/channels/guides/never-execute-a-duplicate-query-again. * * Get a new query builder instance for the connection. * @@ -19,4 +19,4 @@ trait CacheQueryBuilder return new Builder($conn, $grammar, $conn->getPostProcessor()); } -} \ No newline at end of file +} diff --git a/config/cache.php b/config/cache.php index 757469771..8020f24e8 100644 --- a/config/cache.php +++ b/config/cache.php @@ -74,8 +74,8 @@ return [ ], 'request' => [ - 'driver' => 'array' - ] + 'driver' => 'array', + ], ],