From a5a14127b0d18af1e17483fcc19784105cadce89 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Mon, 19 Feb 2018 11:49:37 +0000 Subject: [PATCH] Apply fixes from StyleCI [ci skip] [skip ci] --- Blacklight/Tmux.php | 2 +- app/Console/Commands/TmuxUIStop.php | 2 +- app/Models/Settings.php | 2 +- misc/testing/DB/move_tmux_to_settings.php | 5 +++-- public/admin/tmux-edit.php | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Blacklight/Tmux.php b/Blacklight/Tmux.php index cd8b7c9ed..f7a680468 100755 --- a/Blacklight/Tmux.php +++ b/Blacklight/Tmux.php @@ -2,9 +2,9 @@ namespace Blacklight; -use App\Models\Settings; use Blacklight\db\DB; use App\Models\Category; +use App\Models\Settings; use App\Extensions\util\Versions; use App\Models\Tmux as TmuxModel; diff --git a/app/Console/Commands/TmuxUIStop.php b/app/Console/Commands/TmuxUIStop.php index e9700b738..684158b89 100644 --- a/app/Console/Commands/TmuxUIStop.php +++ b/app/Console/Commands/TmuxUIStop.php @@ -2,8 +2,8 @@ namespace App\Console\Commands; -use App\Models\Settings; use App\Models\Tmux; +use App\Models\Settings; use Illuminate\Console\Command; use Symfony\Component\Process\Process; diff --git a/app/Models/Settings.php b/app/Models/Settings.php index 621a36705..eda91bf7c 100644 --- a/app/Models/Settings.php +++ b/app/Models/Settings.php @@ -23,8 +23,8 @@ namespace App\Models; use Blacklight\utility\Utility; use Illuminate\Console\Command; use Illuminate\Support\Facades\DB; -use Illuminate\Database\Eloquent\Model; use Yadakhov\InsertOnDuplicateKey; +use Illuminate\Database\Eloquent\Model; /** * Settings - model for settings table. diff --git a/misc/testing/DB/move_tmux_to_settings.php b/misc/testing/DB/move_tmux_to_settings.php index 3c13a0583..f333a8650 100644 --- a/misc/testing/DB/move_tmux_to_settings.php +++ b/misc/testing/DB/move_tmux_to_settings.php @@ -1,10 +1,11 @@ setting. ' into settings table'. PHP_EOL; + echo 'Inserting '.$item->setting.' into settings table'.PHP_EOL; \App\Models\Settings::insertIgnore( [ 'section' => 'site', @@ -14,4 +15,4 @@ foreach ($tmux as $item) { 'setting'=> $item->setting, ] ); -} \ No newline at end of file +} diff --git a/public/admin/tmux-edit.php b/public/admin/tmux-edit.php index 612ad899f..03aa6e8f1 100644 --- a/public/admin/tmux-edit.php +++ b/public/admin/tmux-edit.php @@ -2,8 +2,8 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'smarty.php'; -use App\Models\Settings; use Blacklight\Tmux; +use App\Models\Settings; $page = new AdminPage(); $tmux = new Tmux();