Merge pull request #658 from mikemand/feature/fixes-cs-and-updates

Fixes, CS and updates

Modules/Core/Config/core.php

 <?php
 
 return [
-   /*
-   |--------------------------------------------------------------------------
-   | The prefix that'll be used for the administration
-   |--------------------------------------------------------------------------
-   */
+    /*
+    |--------------------------------------------------------------------------
+    | The prefix that'll be used for the administration
+    |--------------------------------------------------------------------------
+    */
     'admin-prefix' => 'backend',
 
     /*
@@ -32,18 +32,18 @@ return [
     */
     'skin' => 'skin-blue',
 
-   /*
-   |--------------------------------------------------------------------------
-   | WYSIWYG Backend Editor
-   |--------------------------------------------------------------------------
-   | Define which editor you would like to use for the backend wysiwygs.
-   | These classes are event handlers, listening to EditorIsRendering
-   | you can define your own handlers and use them here
-   | Options:
-   | - \Modules\Core\Events\Handlers\LoadCkEditor::class
-   | - \Modules\Core\Events\Handlers\LoadSimpleMde::class
-   */
-   'wysiwyg-handler' => \Modules\Core\Events\Handlers\LoadCkEditor::class,
+    /*
+    |--------------------------------------------------------------------------
+    | WYSIWYG Backend Editor
+    |--------------------------------------------------------------------------
+    | Define which editor you would like to use for the backend wysiwygs.
+    | These classes are event handlers, listening to EditorIsRendering
+    | you can define your own handlers and use them here
+    | Options:
+    | - \Modules\Core\Events\Handlers\LoadCkEditor::class
+    | - \Modules\Core\Events\Handlers\LoadSimpleMde::class
+    */
+    'wysiwyg-handler' => \Modules\Core\Events\Handlers\LoadCkEditor::class,
     /*
     |--------------------------------------------------------------------------
     | Custom CKeditor configuration file
@@ -63,22 +63,22 @@ return [
     | Backend and Frontend routes.
     */
     'middleware' => [
-       'backend' => [
-           'auth.admin',
-       ],
-       'frontend' => [
-       ],
-       'api' => [
-           'api',
-       ],
+        'backend' => [
+            'auth.admin',
+        ],
+        'frontend' => [
+        ],
+        'api' => [
+            'api',
+        ],
     ],
 
-   /*
-   |--------------------------------------------------------------------------
-   | Define which assets will be available through the asset manager
-   |--------------------------------------------------------------------------
-   | These assets are registered on the asset manager
-   */
+    /*
+    |--------------------------------------------------------------------------
+    | Define which assets will be available through the asset manager
+    |--------------------------------------------------------------------------
+    | These assets are registered on the asset manager
+    */
     'admin-assets' => [
         // Css
         'bootstrap.css' => ['theme' => 'vendor/bootstrap/dist/css/bootstrap.min.css'],
@@ -178,5 +178,5 @@ return [
     | Check if asgard was installed
     |--------------------------------------------------------------------------
     */
-    'is_installed' => env('INSTALLED', false)
+    'is_installed' => env('INSTALLED', false),
 ];

Modules/Page/Config/config.php

@@ -25,8 +25,8 @@ return [
     | Add relations that will be dynamically added to the Page entity
     */
     'relations' => [
-//        'extension' => function ($self) {
-//            return $self->belongsTo(PageExtension::class, 'id', 'page_id')->first();
+//        'extension' => function (): \Illuminate\Database\Eloquent\Relations\BelongsTo {
+//            return $this->belongsTo(PageExtension::class, 'id', 'page_id')->first();
 //        }
     ],
     /*

Modules/User/Config/config.php

@@ -79,14 +79,14 @@ return [
     'casts' => [
     ],
     /*
-     |--------------------------------------------------------------------------
-     | Dynamic relations
-     |--------------------------------------------------------------------------
-     | Add relations that will be dynamically added to the User entity
+    |--------------------------------------------------------------------------
+    | Dynamic relations
+    |--------------------------------------------------------------------------
+    | Add relations that will be dynamically added to the User entity
      */
     'relations' => [
-//        'extension' => function ($self) {
-//            return $self->belongsTo(UserExtension::class, 'user_id', 'id')->first();
+//        'extension' => function (): \Illuminate\Database\Eloquent\Relations\BelongsTo {
+//            return $this->belongsTo(UserExtension::class, 'user_id', 'id')->first();
 //        }
     ],
     /*

app/Providers/AppServiceProvider.php

@@ -2,9 +2,9 @@
 
 namespace App\Providers;
 
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\ServiceProvider;
-use Illuminate\Support\Carbon;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -18,7 +18,7 @@ class AppServiceProvider extends ServiceProvider
         Schema::defaultStringLength(191);
 
         Carbon::setLocale(config('app.locale'));
-        Carbon::serializeUsing(function ($carbon) {
+        Carbon::serializeUsing(function (Carbon $carbon) {
             return $carbon->format('d/m/y H:i:s');
         });
     }

composer.json

@@ -31,17 +31,17 @@
         "idavoll/adminlte-theme": "4.0.x-dev"
     },
     "require-dev": {
+        "barryvdh/laravel-debugbar": "^3.2",
         "beyondcode/laravel-dump-server": "^1.0",
         "filp/whoops": "^2.0",
         "fzaninotto/faker": "^1.4",
-        "mockery/mockery": "^1.0",
-        "barryvdh/laravel-debugbar": "^3.1",
-        "orchestra/testbench": "3.7.*",
-        "league/flysystem-aws-s3-v3": "^1.0",
         "league/commonmark": "^0.15.4",
-        "predis/predis": "^1.1",
+        "league/flysystem-aws-s3-v3": "^1.0",
+        "mockery/mockery": "^1.0",
         "nunomaduro/collision": "^2.0",
+        "orchestra/testbench": "3.7.*",
         "phpunit/phpunit": "^7.0",
+        "predis/predis": "^1.1",
         "roave/security-advisories": "dev-master"
     },
     "autoload": {

config/asgard/core/core.php

 <?php
 
 return [
-   /*
-   |--------------------------------------------------------------------------
-   | The prefix that'll be used for the administration
-   |--------------------------------------------------------------------------
-   */
+    /*
+    |--------------------------------------------------------------------------
+    | The prefix that'll be used for the administration
+    |--------------------------------------------------------------------------
+    */
     'admin-prefix' => 'backend',
 
     /*
@@ -32,18 +32,18 @@ return [
     */
     'skin' => 'skin-blue',
 
-   /*
-   |--------------------------------------------------------------------------
-   | WYSIWYG Backend Editor
-   |--------------------------------------------------------------------------
-   | Define which editor you would like to use for the backend wysiwygs.
-   | These classes are event handlers, listening to EditorIsRendering
-   | you can define your own handlers and use them here
-   | Options:
-   | - \Modules\Core\Events\Handlers\LoadCkEditor::class
-   | - \Modules\Core\Events\Handlers\LoadSimpleMde::class
-   */
-   'wysiwyg-handler' => \Modules\Core\Events\Handlers\LoadCkEditor::class,
+    /*
+    |--------------------------------------------------------------------------
+    | WYSIWYG Backend Editor
+    |--------------------------------------------------------------------------
+    | Define which editor you would like to use for the backend wysiwygs.
+    | These classes are event handlers, listening to EditorIsRendering
+    | you can define your own handlers and use them here
+    | Options:
+    | - \Modules\Core\Events\Handlers\LoadCkEditor::class
+    | - \Modules\Core\Events\Handlers\LoadSimpleMde::class
+    */
+    'wysiwyg-handler' => \Modules\Core\Events\Handlers\LoadCkEditor::class,
     /*
     |--------------------------------------------------------------------------
     | Custom CKeditor configuration file
@@ -63,22 +63,22 @@ return [
     | Backend and Frontend routes.
     */
     'middleware' => [
-       'backend' => [
-           'auth.admin',
-       ],
-       'frontend' => [
-       ],
-       'api' => [
-           'api',
-       ],
+        'backend' => [
+            'auth.admin',
+        ],
+        'frontend' => [
+        ],
+        'api' => [
+            'api',
+        ],
     ],
 
-   /*
-   |--------------------------------------------------------------------------
-   | Define which assets will be available through the asset manager
-   |--------------------------------------------------------------------------
-   | These assets are registered on the asset manager
-   */
+    /*
+    |--------------------------------------------------------------------------
+    | Define which assets will be available through the asset manager
+    |--------------------------------------------------------------------------
+    | These assets are registered on the asset manager
+    */
     'admin-assets' => [
         // Css
         'bootstrap.css' => ['theme' => 'vendor/bootstrap/dist/css/bootstrap.min.css'],
@@ -178,5 +178,5 @@ return [
     | Check if asgard was installed
     |--------------------------------------------------------------------------
     */
-    'is_installed' => env('INSTALLED', false)
+    'is_installed' => env('INSTALLED', false),
 ];

config/asgard/dashboard/settings.php

+<?php
+
+return [
+    'welcome-title' => [
+        'description' => 'dashboard::dashboard.welcome-title',
+        'view' => 'text',
+        'translatable' => true,
+        'default' => 'Welcome on your backend!',
+    ],
+    'welcome-description' => [
+        'description' => 'dashboard::dashboard.welcome-description',
+        'view' => 'textarea',
+        'translatable' => true,
+        'default' => 'Did you know you can access the documentation by pressing F1?',
+    ],
+    'welcome-enabled' => [
+        'description' => 'dashboard::dashboard.welcome-enabled',
+        'view' => 'checkbox',
+        'translatable' => false,
+        'default' => '1',
+    ],
+];

config/asgard/page/config.php

@@ -25,8 +25,8 @@ return [
     | Add relations that will be dynamically added to the Page entity
     */
     'relations' => [
-//        'extension' => function ($self) {
-//            return $self->belongsTo(PageExtension::class, 'id', 'page_id')->first();
+//        'extension' => function (): \Illuminate\Database\Eloquent\Relations\BelongsTo {
+//            return $this->belongsTo(PageExtension::class, 'id', 'page_id')->first();
 //        }
     ],
     /*

config/asgard/user/config.php

@@ -79,14 +79,14 @@ return [
     'casts' => [
     ],
     /*
-     |--------------------------------------------------------------------------
-     | Dynamic relations
-     |--------------------------------------------------------------------------
-     | Add relations that will be dynamically added to the User entity
+    |--------------------------------------------------------------------------
+    | Dynamic relations
+    |--------------------------------------------------------------------------
+    | Add relations that will be dynamically added to the User entity
      */
     'relations' => [
-//        'extension' => function ($self) {
-//            return $self->belongsTo(UserExtension::class, 'user_id', 'id')->first();
+//        'extension' => function (): \Illuminate\Database\Eloquent\Relations\BelongsTo {
+//            return $this->belongsTo(UserExtension::class, 'user_id', 'id')->first();
 //        }
     ],
     /*

resources/assets/js/app.js

@@ -21,7 +21,6 @@ Vue.use(VueEvents);
 Vue.use(VueSimplemde);
 require('./mixins');
 
-
 Vue.component('ckeditor', require('../../../Modules/Core/Assets/js/components/CkEditor.vue'));
 Vue.component('DeleteButton', require('../../../Modules/Core/Assets/js/components/DeleteComponent.vue'));
 Vue.component('EditButton', require('../../../Modules/Core/Assets/js/components/EditButtonComponent.vue'));
@@ -29,9 +28,8 @@ Vue.component('TagsInput', require('../../../Modules/Tag/Assets/js/components/Ta
 Vue.component('SingleMedia', require('../../../Modules/Media/Assets/js/components/SingleMedia.vue'));
 Vue.component('MediaManager', require('../../../Modules/Media/Assets/js/components/MediaManager.vue'));
 
-
-const currentLocale = window.AsgardCMS.currentLocale;
-const adminPrefix = window.AsgardCMS.adminPrefix;
+const currentLocale = window.AsgardCMS.currentLocale,
+    adminPrefix = window.AsgardCMS.adminPrefix;
 
 function makeBaseUrl() {
     if (window.AsgardCMS.hideDefaultLocaleInURL == 1) {

resources/views/asgard/dashboard/admin/dashboard.blade.php

@@ -24,17 +24,17 @@
                         <p>@setting('dashboard::welcome-description')</p>
                     </div>
                     @if (setting('core::site-name') === '')
-                    <div class="box-footer">
-                        <a class="btn btn-primary btn-flat" href="{{ route('dashboard.module.settings', 'core') }}">
-                            <i class="fa fa-cog"></i> {{ trans('dashboard::dashboard.configure your website') }}
-                        </a>
-                        <a class="btn btn-default btn-flat" href="{{ route('admin.page.page.index') }}">
-                            {{ trans('dashboard::dashboard.add pages') }}
-                        </a>
-                        <a class="btn btn-default btn-flat" href="{{ route('admin.menu.menu.index') }}">
-                            {{ trans('dashboard::dashboard.add menus') }}
-                        </a>
-                    </div>
+                        <div class="box-footer">
+                            <a class="btn btn-primary btn-flat" href="{{ route('dashboard.module.settings', 'core') }}">
+                                <i class="fa fa-cog"></i> {{ trans('dashboard::dashboard.configure your website') }}
+                            </a>
+                            <a class="btn btn-default btn-flat" href="{{ route('admin.page.page.index') }}">
+                                {{ trans('dashboard::dashboard.add pages') }}
+                            </a>
+                            <a class="btn btn-default btn-flat" href="{{ route('admin.menu.menu.index') }}">
+                                {{ trans('dashboard::dashboard.add menus') }}
+                            </a>
+                        </div>
                     @endif
                 </div>
             @endif