From 45ed7a8df920677ec2f5897ffdeb288926ae0026 Mon Sep 17 00:00:00 2001 From: ryzr Date: Thu, 15 Nov 2018 02:40:59 +0000 Subject: [PATCH] Apply fixes from StyleCI --- ...oreign_keys_to_application_settings_table.php | 1 - routes/web.php | 1 - src/Database/ContentServiceProvider.php | 2 +- src/Database/Models/Content.php | 1 - src/Database/Models/Traits/Auditable.php | 2 +- src/Database/Models/Traits/Draftable.php | 16 +++++++++------- .../Models/Traits/RoleHasPermissions.php | 2 +- src/Database/Models/Traits/UserHasRoles.php | 2 +- src/Database/Models/User.php | 10 +++++----- src/Database/Repositories/ContentRepository.php | 12 ++++++------ src/Foundation/SodaInstance.php | 2 -- src/Http/Controllers/ContentController.php | 1 - src/Http/Controllers/HomeController.php | 4 ++-- src/Http/Middleware/TransferSession.php | 2 +- .../Dashboard/DashboardBuilder.php | 4 ---- src/InterfaceBuilder/Menu/MenuItem.php | 2 +- src/Routing/RouteServiceProvider.php | 2 +- 17 files changed, 29 insertions(+), 37 deletions(-) diff --git a/migrations/2016_08_20_031333_add_foreign_keys_to_application_settings_table.php b/migrations/2016_08_20_031333_add_foreign_keys_to_application_settings_table.php index 35c39295..4f046d57 100644 --- a/migrations/2016_08_20_031333_add_foreign_keys_to_application_settings_table.php +++ b/migrations/2016_08_20_031333_add_foreign_keys_to_application_settings_table.php @@ -13,7 +13,6 @@ class AddForeignKeysToApplicationSettingsTable extends Migration public function up() { Schema::table('application_settings', function (Blueprint $table) { - $table->foreign('application_id')->references('id')->on('applications')->onUpdate('cascade')->onDelete('cascade'); }); } diff --git a/routes/web.php b/routes/web.php index 965d476b..11b4c79d 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,6 +1,5 @@ config('soda.cms.path'), 'middleware' => ['web']], function () { Route::post('switch-application', 'HomeController@switchApplication')->name('soda.switch-application'); diff --git a/src/Database/ContentServiceProvider.php b/src/Database/ContentServiceProvider.php index 8304921f..e943a8b7 100644 --- a/src/Database/ContentServiceProvider.php +++ b/src/Database/ContentServiceProvider.php @@ -93,7 +93,7 @@ public function register() $this->registerAliases($this->aliases); - if ( config('soda.cms.enable_publish_date') ) { + if (config('soda.cms.enable_publish_date')) { Content::setPublishDateField('published_at'); } } diff --git a/src/Database/Models/Content.php b/src/Database/Models/Content.php index 80fe940c..6d3fa95e 100644 --- a/src/Database/Models/Content.php +++ b/src/Database/Models/Content.php @@ -2,7 +2,6 @@ namespace Soda\Cms\Database\Models; -use Carbon\Carbon; use Exception; use Soda\ClosureTable\Models\Entity; use Illuminate\Database\Eloquent\SoftDeletes; diff --git a/src/Database/Models/Traits/Auditable.php b/src/Database/Models/Traits/Auditable.php index b42d59af..5a9d3108 100644 --- a/src/Database/Models/Traits/Auditable.php +++ b/src/Database/Models/Traits/Auditable.php @@ -69,7 +69,7 @@ public function audits() */ public function readyForAuditing() { - return ($this->isEventAuditable($this->auditEvent) && $this->isDirty()); + return $this->isEventAuditable($this->auditEvent) && $this->isDirty(); } /** diff --git a/src/Database/Models/Traits/Draftable.php b/src/Database/Models/Traits/Draftable.php index 2280cced..4d791b30 100644 --- a/src/Database/Models/Traits/Draftable.php +++ b/src/Database/Models/Traits/Draftable.php @@ -3,10 +3,10 @@ namespace Soda\Cms\Database\Models\Traits; use Carbon\Carbon; -use Illuminate\Database\Eloquent\Builder; +use Soda\Cms\Foundation\Constants; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Session; -use Soda\Cms\Foundation\Constants; +use Illuminate\Database\Eloquent\Builder; trait Draftable { @@ -18,8 +18,10 @@ trait Draftable */ public static function bootDraftable() { - if(isset(static::$publishDateField)) static::setPublishDateField(static::$publishDateField); - + if (isset(static::$publishDateField)) { + static::setPublishDateField(static::$publishDateField); + } + static::addGlobalScope('published', function (Builder $builder) { if (static::isDraftsEnabled()) { $builder->where('status', '=', Constants::STATUS_LIVE); @@ -56,12 +58,12 @@ public static function disableDrafts() { static::$drafts = false; } - + public static function publishDateFieldEnabled() { - return static::$_publishDateField !== null && static::$_publishDateField !== ""; + return static::$_publishDateField !== null && static::$_publishDateField !== ''; } - + public static function setPublishDateField($field = null) { static::$_publishDateField = $field; diff --git a/src/Database/Models/Traits/RoleHasPermissions.php b/src/Database/Models/Traits/RoleHasPermissions.php index c009361f..b8a55600 100644 --- a/src/Database/Models/Traits/RoleHasPermissions.php +++ b/src/Database/Models/Traits/RoleHasPermissions.php @@ -22,6 +22,6 @@ public static function bootRoleHasPermissionsTrait() public function getCacheKey() { - return 'soda.permissions.' . $this->getTable() . '.' . $this->getKey(); + return 'soda.permissions.'.$this->getTable().'.'.$this->getKey(); } } diff --git a/src/Database/Models/Traits/UserHasRoles.php b/src/Database/Models/Traits/UserHasRoles.php index 0dba9f99..691eb1f9 100644 --- a/src/Database/Models/Traits/UserHasRoles.php +++ b/src/Database/Models/Traits/UserHasRoles.php @@ -22,7 +22,7 @@ public static function bootUserHasRolesTrait() public function getCacheKey() { - return 'soda.permissions.' . $this->getTable() . '.' . $this->getKey(); + return 'soda.permissions.'.$this->getTable().'.'.$this->getKey(); } public function listRoles() diff --git a/src/Database/Models/User.php b/src/Database/Models/User.php index 33d3b1c9..f78df1ce 100644 --- a/src/Database/Models/User.php +++ b/src/Database/Models/User.php @@ -4,15 +4,15 @@ use Carbon\Carbon; use Illuminate\Auth\Authenticatable; -use Illuminate\Auth\Passwords\CanResetPassword; -use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract; -use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract; use Illuminate\Database\Eloquent\Model; +use Soda\Cms\Database\Models\Traits\Auditable; +use Illuminate\Auth\Passwords\CanResetPassword; use Soda\Cms\Database\Models\Contracts\HasLocale; +use Soda\Cms\Database\Models\Traits\UserHasRoles; use Soda\Cms\Database\Models\Contracts\UserInterface; -use Soda\Cms\Database\Models\Traits\Auditable; use Soda\Cms\Database\Models\Traits\OptionallyBoundToApplication; -use Soda\Cms\Database\Models\Traits\UserHasRoles; +use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract; +use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract; class User extends Model implements UserInterface, HasLocale, AuthenticatableContract, CanResetPasswordContract { diff --git a/src/Database/Repositories/ContentRepository.php b/src/Database/Repositories/ContentRepository.php index 307df472..24e2ddc0 100644 --- a/src/Database/Repositories/ContentRepository.php +++ b/src/Database/Repositories/ContentRepository.php @@ -4,11 +4,11 @@ use Carbon\Carbon; use Illuminate\Http\Request; +use Soda\Cms\Foundation\Constants; +use Soda\Cms\Support\Facades\Soda; use Soda\Cms\Database\Models\ContentShortcut; use Soda\Cms\Database\Models\Contracts\ContentInterface; use Soda\Cms\Database\Repositories\Contracts\ContentRepositoryInterface; -use Soda\Cms\Foundation\Constants; -use Soda\Cms\Support\Facades\Soda; class ContentRepository extends AbstractRepository implements ContentRepositoryInterface { @@ -53,7 +53,7 @@ public function getRoot() public function listFolder(Request $request, ContentInterface $contentFolder) { if ($request->has('search')) { - $query = $contentFolder->collectDescendants()->where('name', 'LIKE', '%' . $request->input('search') . '%'); + $query = $contentFolder->collectDescendants()->where('name', 'LIKE', '%'.$request->input('search').'%'); } else { $query = $contentFolder->collectChildren(); } @@ -90,12 +90,12 @@ protected function contentToBreadcrumb(ContentInterface $content) $parentBreadcrumb = $this->contentToBreadcrumb($content->parent); } - return (isset($parentBreadcrumb) && $parentBreadcrumb ? $parentBreadcrumb . ' / ' : '') . $content->name; + return (isset($parentBreadcrumb) && $parentBreadcrumb ? $parentBreadcrumb.' / ' : '').$content->name; } public function findBySlug($slug) { - return $this->model->where('slug', '/' . ltrim($slug, '/'))->first(); + return $this->model->where('slug', '/'.ltrim($slug, '/'))->first(); } public function getCreatableContentTypes($contentFolderId = null) @@ -219,7 +219,7 @@ public function save(Request $request, $id = null) $inputs = $request->all(); // format published_at - if(config('soda.cms.enable_publish_date')) { + if (config('soda.cms.enable_publish_date')) { $inputs['published_at'] = Carbon::parse($inputs['published_at'], config('soda.cms.publish_timezone')) ?: Carbon::now(); } diff --git a/src/Foundation/SodaInstance.php b/src/Foundation/SodaInstance.php index c249e003..b33f58c4 100644 --- a/src/Foundation/SodaInstance.php +++ b/src/Foundation/SodaInstance.php @@ -190,8 +190,6 @@ public function getVersion() } } catch (\Exception $e) { } - - return; }); } } diff --git a/src/Http/Controllers/ContentController.php b/src/Http/Controllers/ContentController.php index 2fb07b0f..71a22c9e 100644 --- a/src/Http/Controllers/ContentController.php +++ b/src/Http/Controllers/ContentController.php @@ -2,7 +2,6 @@ namespace Soda\Cms\Http\Controllers; -use Carbon\Carbon; use Exception; use Illuminate\Http\Request; use Soda\Cms\Database\Models\Contracts\ContentInterface; diff --git a/src/Http/Controllers/HomeController.php b/src/Http/Controllers/HomeController.php index e7612e7f..aecdf7b4 100644 --- a/src/Http/Controllers/HomeController.php +++ b/src/Http/Controllers/HomeController.php @@ -4,8 +4,8 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Session; -use Soda\Cms\Database\Models\Contracts\HasLocale; use Soda\Cms\Database\Models\Quicklink; +use Soda\Cms\Database\Models\Contracts\HasLocale; class HomeController extends BaseController { @@ -100,6 +100,6 @@ public function switchApplication(Request $request) $request->session()->flash('vtoken', $validationToken); - return redirect()->away($parsedUrl['scheme'] . '://' . $parsedUrl['host'] . $parsedUrl['path'] . '?' . $parsedUrl['query']); + return redirect()->away($parsedUrl['scheme'].'://'.$parsedUrl['host'].$parsedUrl['path'].'?'.$parsedUrl['query']); } } diff --git a/src/Http/Middleware/TransferSession.php b/src/Http/Middleware/TransferSession.php index 3c0fc141..795ca974 100644 --- a/src/Http/Middleware/TransferSession.php +++ b/src/Http/Middleware/TransferSession.php @@ -53,6 +53,6 @@ protected function removeSessionQueryParameters($request) $currentQuery = http_build_query($currentQueryArray); - return $request->url() . (count($currentQueryArray) ? "?$currentQuery" : ''); + return $request->url().(count($currentQueryArray) ? "?$currentQuery" : ''); } } diff --git a/src/InterfaceBuilder/Dashboard/DashboardBuilder.php b/src/InterfaceBuilder/Dashboard/DashboardBuilder.php index 45ee2173..943579ae 100644 --- a/src/InterfaceBuilder/Dashboard/DashboardBuilder.php +++ b/src/InterfaceBuilder/Dashboard/DashboardBuilder.php @@ -126,8 +126,6 @@ protected function renderRow($rowId) if (count($blocks)) { return soda_cms_view('partials.dashboard.row', compact('blocks'))->render(); } - - return; } protected function beforeRenderRow($rowId) @@ -152,8 +150,6 @@ protected function renderBlock($blockName) return $content->render(); } } - - return; } protected function beforeRenderBlock($blockName) diff --git a/src/InterfaceBuilder/Menu/MenuItem.php b/src/InterfaceBuilder/Menu/MenuItem.php index bb2d55ca..0db0e14b 100644 --- a/src/InterfaceBuilder/Menu/MenuItem.php +++ b/src/InterfaceBuilder/Menu/MenuItem.php @@ -52,7 +52,7 @@ public function getParent() return $this->parent; } - public function setParent(MenuItem $item) + public function setParent(self $item) { $this->parent = $item; diff --git a/src/Routing/RouteServiceProvider.php b/src/Routing/RouteServiceProvider.php index edd646e1..73ef7c7e 100644 --- a/src/Routing/RouteServiceProvider.php +++ b/src/Routing/RouteServiceProvider.php @@ -12,10 +12,10 @@ use Soda\Cms\Http\Middleware\Authenticate; use Soda\Cms\Http\Middleware\ToggleLocale; use Soda\Cms\Http\Middleware\HasPermission; +use Soda\Cms\Http\Middleware\TransferSession; use Soda\Cms\Http\Middleware\SluggableSession; use Soda\Cms\Http\Middleware\RedirectIfAuthenticated; use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider; -use Soda\Cms\Http\Middleware\TransferSession; class RouteServiceProvider extends ServiceProvider {