- Add friendsofphp/php-cs-fixer

- Fix issues with the help of php-cs-fixer
- Add important scripts in composer.json

.gitignore

@@ -37,3 +37,5 @@ public/mix-manifest.json
 public/access.log
 public/error.log
 !public/js/jquerysession.min.js
+output.txt
+.php_cs.cache
\ No newline at end of file

app/Models/Access/User/Traits/Attribute/UserAttribute.php

@@ -229,9 +229,13 @@ trait UserAttribute
         if (access()->allow('login-as-user') && (!session()->has('admin_user_id') || !session()->has('temp_user_id'))) {
             //Won't break, but don't let them "Login As" themselves
             if ($this->id != access()->id()) {
-                return '<a class="'.$class.'" href="'.route('admin.access.user.login-as',
-                    $this).'"><i class="fa fa-lock" data-toggle="tooltip" data-placement="top" title="'.trans('buttons.backend.access.users.login_as',
-                    ['user' => $this->name]).'"></i>'.$name.'</a>';
+                return '<a class="'.$class.'" href="'.route(
+                    'admin.access.user.login-as',
+                    $this
+                ).'"><i class="fa fa-lock" data-toggle="tooltip" data-placement="top" title="'.trans(
+                        'buttons.backend.access.users.login_as',
+                        ['user' => $this->name]
+                    ).'"></i>'.$name.'</a>';
             }
         }
 

app/Models/Faqs/Traits/Attribute/FaqAttribute.php

@@ -15,15 +15,12 @@ trait FaqAttribute
         switch ($this->status && access()->allow('edit-faq')) {
             case 0:
                 return '<a href="'.route('admin.faqs.mark', [$this, 1]).'" class="btn btn-flat btn-default"><i class="fa fa-check-square" data-toggle="tooltip" data-placement="top" title="'.trans('buttons.backend.access.users.activate').'"></i></a>';
-            // No break
 
             case 1:
                 return '<a href="'.route('admin.faqs.mark', [$this, 0]).'" class="btn btn-flat btn-default"><i class="fa fa-square" data-toggle="tooltip" data-placement="top" title="'.trans('buttons.backend.access.users.deactivate').'"></i></a>';
-            // No break
 
             default:
                 return '';
-            // No break
         }
 
         return '';

app/Providers/ComposerServiceProvider.php

@@ -23,7 +23,8 @@ class ComposerServiceProvider extends ServiceProvider
          */
         View::composer(
             // This class binds the $logged_in_user variable to every view
-            '*', GlobalComposer::class
+            '*',
+            GlobalComposer::class
         );
 
         /*

composer.json

@@ -33,6 +33,7 @@
         "bvipul/generator": "^5.8.1",
         "codedungeon/phpunit-result-printer": "^0.19.10",
         "filp/whoops": "~2.0",
+        "friendsofphp/php-cs-fixer": "^2.10",
         "fzaninotto/faker": "~1.4",
         "laravel/telescope": "^2.0",
         "mockery/mockery": "1.2.2",
@@ -74,6 +75,30 @@
         "post-autoload-dump": [
             "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
             "@php artisan package:discover"
+        ],
+        "clear-all": [
+            "@php artisan clear-compiled",
+            "@php artisan cache:clear",
+            "@php artisan route:clear",
+            "@php artisan view:clear",
+            "@php artisan config:clear",
+            "composer dumpautoload -o"
+        ],
+        "cache-all": [
+            "@php artisan config:cache",
+            "@php artisan route:cache"
+        ],
+        "cc": [
+            "composer clear-all",
+            "composer cache-all"
+        ],
+        "format": [
+            "./vendor/bin/php-cs-fixer fix app/  --show-progress=estimating",
+            "./vendor/bin/php-cs-fixer fix config/  --show-progress=estimating",
+            "./vendor/bin/php-cs-fixer fix database/  --show-progress=estimating",
+            "./vendor/bin/php-cs-fixer fix resources/  --show-progress=estimating",
+            "./vendor/bin/php-cs-fixer fix routes/  --show-progress=estimating",
+            "./vendor/bin/php-cs-fixer fix tests/  --show-progress=estimating"
         ]
     },
     "config": {

resources/views/backend/layouts/app.blade.php

@@ -40,7 +40,7 @@
             window.Laravel = {!! json_encode([ 'csrfToken' => csrf_token() ]) !!};
         </script>
         <?php
-            if(!empty($google_analytics)){
+            if (!empty($google_analytics)) {
                 echo $google_analytics;
             }
         ?>

resources/views/frontend/layouts/app.blade.php

@@ -36,7 +36,7 @@
             ]); ?>
         </script>
         <?php
-            if(!empty($google_analytics)){
+            if (!empty($google_analytics)) {
                 echo $google_analytics;
             }
         ?>

tests/Unit/Models/PermissionTest.php

@@ -12,7 +12,8 @@ class PermissionTest extends TestCase
     {
         $permission = Permission::find(1);
         $this->assertInstanceOf(
-            'Illuminate\Database\Eloquent\Collection', $permission->roles
+            'Illuminate\Database\Eloquent\Collection',
+            $permission->roles
         );
     }
 }

tests/Unit/Models/RoleTest.php

@@ -10,7 +10,8 @@ class RoleTest extends TestCase
     public function a_role_has_users()
     {
         $this->assertInstanceOf(
-            'Illuminate\Database\Eloquent\Collection', $this->adminRole->users
+            'Illuminate\Database\Eloquent\Collection',
+            $this->adminRole->users
         );
     }
 
@@ -18,7 +19,8 @@ class RoleTest extends TestCase
     public function a_role_has_permissions()
     {
         $this->assertInstanceOf(
-            'Illuminate\Database\Eloquent\Collection', $this->adminRole->permissions
+            'Illuminate\Database\Eloquent\Collection',
+            $this->adminRole->permissions
         );
     }
 }

tests/Unit/Models/UserTest.php

@@ -10,7 +10,8 @@ class UserTest extends TestCase
     public function a_user_has_a_roles()
     {
         $this->assertInstanceOf(
-            'Illuminate\Database\Eloquent\Collection', $this->admin->roles
+            'Illuminate\Database\Eloquent\Collection',
+            $this->admin->roles
         );
     }
 
@@ -18,7 +19,8 @@ class UserTest extends TestCase
     public function a_user_has_a_permissions()
     {
         $this->assertInstanceOf(
-            'Illuminate\Database\Eloquent\Collection', $this->admin->permissions
+            'Illuminate\Database\Eloquent\Collection',
+            $this->admin->permissions
         );
     }
 
@@ -26,7 +28,8 @@ class UserTest extends TestCase
     public function a_user_has_a_providers()
     {
         $this->assertInstanceOf(
-            'Illuminate\Database\Eloquent\Collection', $this->admin->providers
+            'Illuminate\Database\Eloquent\Collection',
+            $this->admin->providers
         );
     }
 
@@ -34,7 +37,8 @@ class UserTest extends TestCase
     public function a_user_has_a_sessions()
     {
         $this->assertInstanceOf(
-            'Illuminate\Database\Eloquent\Collection', $this->admin->sessions
+            'Illuminate\Database\Eloquent\Collection',
+            $this->admin->sessions
         );
     }
 }