From 5a9632dde1a8dd72dfc7ee2d82a01791bf404371 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Tue, 16 Jan 2018 13:05:52 +0000 Subject: [PATCH] Apply fixes from StyleCI [ci skip] [skip ci] --- app/Models/Group.php | 13 ++++++------- misc/update/update_binaries.php | 2 +- nntmux/Backfill.php | 2 +- nntmux/NameFixer.php | 2 +- nntmux/Regexes.php | 2 +- nntmux/Releases.php | 2 +- nntmux/processing/PostProcess.php | 2 +- nntmux/processing/ProcessReleases.php | 2 +- nntmux/processing/post/ProcessAdditional.php | 2 +- public/admin/ajax.php | 2 +- public/pages/browsegroup.php | 2 +- public/pages/search.php | 2 +- 12 files changed, 17 insertions(+), 18 deletions(-) diff --git a/app/Models/Group.php b/app/Models/Group.php index d2ee14a3e..ac03a687a 100644 --- a/app/Models/Group.php +++ b/app/Models/Group.php @@ -2,14 +2,14 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Model; +use nntmux\NZB; +use nntmux\NNTP; +use nntmux\ColorCLI; +use nntmux\Releases; +use nntmux\ReleaseImage; use Illuminate\Support\Carbon; use Illuminate\Support\Facades\DB; -use nntmux\ColorCLI; -use nntmux\NNTP; -use nntmux\NZB; -use nntmux\ReleaseImage; -use nntmux\Releases; +use Illuminate\Database\Eloquent\Model; class Group extends Model { @@ -43,7 +43,6 @@ class Group extends Model */ protected static $allasmgr = (int) Settings::settingValue('..allasmgr') === 1; - public function release() { return $this->hasMany(Release::class, 'groups_id'); diff --git a/misc/update/update_binaries.php b/misc/update/update_binaries.php index 3fbe6bdc6..933481fdf 100644 --- a/misc/update/update_binaries.php +++ b/misc/update/update_binaries.php @@ -2,11 +2,11 @@ require_once dirname(__DIR__, 2).DIRECTORY_SEPARATOR.'bootstrap/autoload.php'; -use App\Models\Group; use nntmux\NNTP; use nntmux\db\DB; use nntmux\Binaries; use nntmux\ColorCLI; +use App\Models\Group; use App\Models\Settings; $pdo = new DB(); diff --git a/nntmux/Backfill.php b/nntmux/Backfill.php index 30fdbf9e0..12b6b9b36 100755 --- a/nntmux/Backfill.php +++ b/nntmux/Backfill.php @@ -2,8 +2,8 @@ namespace nntmux; -use App\Models\Group; use nntmux\db\DB; +use App\Models\Group; use App\Models\Settings; class Backfill diff --git a/nntmux/NameFixer.php b/nntmux/NameFixer.php index f8accc3f1..dcb2b0a47 100755 --- a/nntmux/NameFixer.php +++ b/nntmux/NameFixer.php @@ -2,8 +2,8 @@ namespace nntmux; -use App\Models\Group; use nntmux\db\DB; +use App\Models\Group; use App\Models\Predb; use App\Models\Release; use App\Models\Category; diff --git a/nntmux/Regexes.php b/nntmux/Regexes.php index 7af962ccf..b0ff8d0a4 100755 --- a/nntmux/Regexes.php +++ b/nntmux/Regexes.php @@ -2,8 +2,8 @@ namespace nntmux; -use App\Models\Group; use nntmux\db\DB; +use App\Models\Group; use App\Models\Release; use App\Models\Category; diff --git a/nntmux/Releases.php b/nntmux/Releases.php index c87e0d737..37628559f 100755 --- a/nntmux/Releases.php +++ b/nntmux/Releases.php @@ -2,8 +2,8 @@ namespace nntmux; -use App\Models\Group; use nntmux\db\DB; +use App\Models\Group; use App\Models\Release; use App\Models\Category; use App\Models\Settings; diff --git a/nntmux/processing/PostProcess.php b/nntmux/processing/PostProcess.php index 1d146bf6e..d88dc6342 100755 --- a/nntmux/processing/PostProcess.php +++ b/nntmux/processing/PostProcess.php @@ -2,7 +2,6 @@ namespace nntmux\processing; -use App\Models\Group; use nntmux\Nfo; use nntmux\XXX; use nntmux\NNTP; @@ -13,6 +12,7 @@ use nntmux\Movie; use nntmux\Music; use nntmux\Console; use nntmux\Sharing; +use App\Models\Group; use nntmux\NameFixer; use App\Models\Release; use App\Models\Category; diff --git a/nntmux/processing/ProcessReleases.php b/nntmux/processing/ProcessReleases.php index 25aae3a83..64d9131a8 100755 --- a/nntmux/processing/ProcessReleases.php +++ b/nntmux/processing/ProcessReleases.php @@ -2,13 +2,13 @@ namespace nntmux\processing; -use App\Models\Group; use nntmux\NZB; use nntmux\NNTP; use nntmux\db\DB; use nntmux\Genres; use nntmux\ColorCLI; use nntmux\Releases; +use App\Models\Group; use App\Models\Predb; use nntmux\Categorize; use App\Models\Release; diff --git a/nntmux/processing/post/ProcessAdditional.php b/nntmux/processing/post/ProcessAdditional.php index cc6c44330..1577e6599 100755 --- a/nntmux/processing/post/ProcessAdditional.php +++ b/nntmux/processing/post/ProcessAdditional.php @@ -2,13 +2,13 @@ namespace nntmux\processing\post; -use App\Models\Group; use nntmux\Nfo; use nntmux\NZB; use nntmux\NNTP; use nntmux\db\DB; use nntmux\ColorCLI; use nntmux\Releases; +use App\Models\Group; use nntmux\NameFixer; use nntmux\Categorize; use App\Models\Release; diff --git a/public/admin/ajax.php b/public/admin/ajax.php index fac950758..4728cd50b 100644 --- a/public/admin/ajax.php +++ b/public/admin/ajax.php @@ -1,10 +1,10 @@ show403(); diff --git a/public/pages/search.php b/public/pages/search.php index 09c32e133..1bcd090bd 100644 --- a/public/pages/search.php +++ b/public/pages/search.php @@ -1,8 +1,8 @@