Style fixes

.gitignore

@@ -3,6 +3,7 @@
 .env
 .env.dusk.*
 !.env.dusk.example
+phpstan.neon
 .idea
 /bin/
 /bootstrap/compiled.php

app/Console/Commands/CreateAdmin.php

@@ -3,14 +3,29 @@
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
+use \App\Models\User;
+
 
 class CreateAdmin extends Command
 {
+
+    /** @mixin User **/
     /**
-     * The name and signature of the console command.
-     *
-     * @var string
+     * App\Console\CreateAdmin
+     * @property mixed $first_name
+     * @property string $last_name
+     * @property string $username
+     * @property string $email
+     * @property string $permissions
+     * @property string $password
+     * @property boolean $activated
+     * @property boolean $show_in_list
+     * @property \Illuminate\Support\Carbon|null $created_at
+     * @property mixed $created_by
      */
+
+
+
     protected $signature = 'snipeit:create-admin {--first_name=} {--last_name=}  {--email=}  {--username=}  {--password=}   {show_in_list?}';
 
     /**
@@ -30,11 +45,7 @@ public function __construct()
         parent::__construct();
     }
 
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
+
     public function handle()
     {
         $first_name = $this->option('first_name');
@@ -47,7 +58,7 @@ public function handle()
         if (($first_name == '') || ($last_name == '') || ($username == '') || ($email == '') || ($password == '')) {
             $this->info('ERROR: All fields are required.');
         } else {
-            $user = new \App\Models\User;
+            $user = new User;
             $user->first_name = $first_name;
             $user->last_name = $last_name;
             $user->username = $username;

app/Console/Commands/LdapSync.php

@@ -74,7 +74,7 @@ public function handle()
                 $json_summary = ['error' => true, 'error_message' => $e->getMessage(), 'summary' => []];
                 $this->info(json_encode($json_summary));
             }
-            LOG::info($e);
+            Log::info($e);
 
             return [];
         }
@@ -84,7 +84,7 @@ public function handle()
         try {
             if ($this->option('base_dn') != '') {
                 $search_base = $this->option('base_dn');
-                LOG::debug('Importing users from specified base DN: \"'.$search_base.'\".');
+                Log::debug('Importing users from specified base DN: \"'.$search_base.'\".');
             } else {
                 $search_base = null;
             }
@@ -98,7 +98,7 @@ public function handle()
                 $json_summary = ['error' => true, 'error_message' => $e->getMessage(), 'summary' => []];
                 $this->info(json_encode($json_summary));
             }
-            LOG::info($e);
+            Log::info($e);
 
             return [];
         }
@@ -108,16 +108,16 @@ public function handle()
 
         if ($this->option('location') != '') {
             $location = Location::where('name', '=', $this->option('location'))->first();
-            LOG::debug('Location name '.$this->option('location').' passed');
-            LOG::debug('Importing to '.$location->name.' ('.$location->id.')');
+            Log::debug('Location name '.$this->option('location').' passed');
+            Log::debug('Importing to '.$location->name.' ('.$location->id.')');
         } elseif ($this->option('location_id') != '') {
             $location = Location::where('id', '=', $this->option('location_id'))->first();
-            LOG::debug('Location ID '.$this->option('location_id').' passed');
-            LOG::debug('Importing to '.$location->name.' ('.$location->id.')');
+            Log::debug('Location ID '.$this->option('location_id').' passed');
+            Log::debug('Importing to '.$location->name.' ('.$location->id.')');
         }
 
         if (! isset($location)) {
-            LOG::debug('That location is invalid or a location was not provided, so no location will be assigned by default.');
+            Log::debug('That location is invalid or a location was not provided, so no location will be assigned by default.');
         }
 
         /* Process locations with explicitly defined OUs, if doing a full import. */
@@ -133,7 +133,7 @@ public function handle()
             array_multisort($ldap_ou_lengths, SORT_ASC, $ldap_ou_locations);
 
             if (count($ldap_ou_locations) > 0) {
-                LOG::debug('Some locations have special OUs set. Locations will be automatically set for users in those OUs.');
+                Log::debug('Some locations have special OUs set. Locations will be automatically set for users in those OUs.');
             }
 
             // Inject location information fields
@@ -151,7 +151,7 @@ public function handle()
                         $json_summary = ['error' => true, 'error_message' => trans('admin/users/message.error.ldap_could_not_search').' Location: '.$ldap_loc['name'].' (ID: '.$ldap_loc['id'].') cannot connect to "'.$ldap_loc['ldap_ou'].'" - '.$e->getMessage(), 'summary' => []];
                         $this->info(json_encode($json_summary));
                     }
-                    LOG::info($e);
+                    Log::info($e);
 
                     return [];
                 }
@@ -197,18 +197,18 @@ public function handle()
 
         for ($i = 0; $i < $results['count']; $i++) {
                 $item = [];
-                $item['username'] = isset($results[$i][$ldap_result_username][0]) ? $results[$i][$ldap_result_username][0] : '';
-                $item['employee_number'] = isset($results[$i][$ldap_result_emp_num][0]) ? $results[$i][$ldap_result_emp_num][0] : '';
-                $item['lastname'] = isset($results[$i][$ldap_result_last_name][0]) ? $results[$i][$ldap_result_last_name][0] : '';
-                $item['firstname'] = isset($results[$i][$ldap_result_first_name][0]) ? $results[$i][$ldap_result_first_name][0] : '';
-                $item['email'] = isset($results[$i][$ldap_result_email][0]) ? $results[$i][$ldap_result_email][0] : '';
-                $item['ldap_location_override'] = isset($results[$i]['ldap_location_override']) ? $results[$i]['ldap_location_override'] : '';
-                $item['location_id'] = isset($results[$i]['location_id']) ? $results[$i]['location_id'] : '';
-                $item['telephone'] = isset($results[$i][$ldap_result_phone][0]) ? $results[$i][$ldap_result_phone][0] : '';
-                $item['jobtitle'] = isset($results[$i][$ldap_result_jobtitle][0]) ? $results[$i][$ldap_result_jobtitle][0] : '';
-                $item['country'] = isset($results[$i][$ldap_result_country][0]) ? $results[$i][$ldap_result_country][0] : '';
-                $item['department'] = isset($results[$i][$ldap_result_dept][0]) ? $results[$i][$ldap_result_dept][0] : '';
-                $item['manager'] = isset($results[$i][$ldap_result_manager][0]) ? $results[$i][$ldap_result_manager][0] : '';
+                $item['username'] = $results[$i][$ldap_result_username][0] ?? '';
+                $item['employee_number'] = $results[$i][$ldap_result_emp_num][0] ?? '';
+                $item['lastname'] = $results[$i][$ldap_result_last_name][0] ?? '';
+                $item['firstname'] = $results[$i][$ldap_result_first_name][0] ?? '';
+                $item['email'] = $results[$i][$ldap_result_email][0] ?? '';
+                $item['ldap_location_override'] = $results[$i]['ldap_location_override'] ?? '';
+                $item['location_id'] = $results[$i]['location_id'] ?? '';
+                $item['telephone'] = $results[$i][$ldap_result_phone][0] ?? '';
+                $item['jobtitle'] = $results[$i][$ldap_result_jobtitle][0] ?? '';
+                $item['country'] = $results[$i][$ldap_result_country][0] ?? '';
+                $item['department'] = $results[$i][$ldap_result_dept][0] ?? '';
+                $item['manager'] = $results[$i][$ldap_result_manager][0] ?? '';
 
 
                 $department = Department::firstOrCreate([

app/Http/Controllers/ModalController.php

@@ -17,7 +17,7 @@ class ModalController extends Controller
      * @author [A. Gianotto] [<[email protected]]
      * @return View
      */
-    function show ($type, $itemId = null) {
+    public function show ($type, $itemId = null) {
 
         // These values should correspond to a file in resources/views/modals/
         $allowed_types = [

app/Http/Controllers/ReportsController.php

@@ -1120,8 +1120,6 @@ public function postAssetAcceptanceReport($deleted = false)
                 $row[]  = str_replace(',', '', e($item['assetItem']->asset_tag));
                 $row[]  = str_replace(',', '', e(($item['acceptance']->assignedTo) ? $item['acceptance']->assignedTo->present()->name() : trans('admin/reports/general.deleted_user')));
                 $rows[] = implode(',', $row);
-            } else {
-                // Log the error maybe?
             }
         }
 

app/Http/Controllers/SettingsController.php

@@ -807,7 +807,7 @@ public function postBarcodes(Request $request)
      */
     public function getPhpInfo()
     {
-        if (true === config('app.debug')) {
+        if (config('app.debug') === true) {
             return view('settings.phpinfo');
         }
 

app/Http/Middleware/CheckForTwoFactor.php

@@ -11,7 +11,7 @@ class CheckForTwoFactor
     /**
      * Routes to ignore for Two Factor Auth
      */
-    const IGNORE_ROUTES = ['two-factor', 'two-factor-enroll', 'setup', 'logout'];
+    public const IGNORE_ROUTES = ['two-factor', 'two-factor-enroll', 'setup', 'logout'];
 
     /**
      * Handle an incoming request.

app/Http/Requests/SaveUserRequest.php

@@ -39,14 +39,12 @@ public function rules()
 
             // Brand new user
             case 'POST':
-            {
                 $rules['first_name'] = 'required|string|min:1';
                 $rules['username'] = 'required_unless:ldap_import,1|string|min:1';
                 if ($this->request->get('ldap_import') == false) {
                     $rules['password'] = Setting::passwordComplexityRulesSaving('store').'|confirmed';
                 }
                 break;
-            }
 
             // Save all fields
             case 'PUT':
@@ -57,12 +55,11 @@ public function rules()
 
             // Save only what's passed
             case 'PATCH':
-            {
                 $rules['password'] = Setting::passwordComplexityRulesSaving('update');
                 break;
-            }
 
-            default:break;
+            default:
+                break;
         }
 
         return $rules;

app/Http/Transformers/AssetModelsTransformer.php

@@ -4,7 +4,7 @@
 
 use App\Helpers\Helper;
 use App\Models\AssetModel;
-use Gate;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\Storage;
 

app/Models/Asset.php

@@ -34,9 +34,9 @@ class Asset extends Depreciable
     use CompanyableTrait;
     use HasFactory, Loggable, Requestable, Presentable, SoftDeletes, ValidatingTrait, UniqueUndeletedTrait, UniqueSerialTrait;
 
-    const LOCATION = 'location';
-    const ASSET = 'asset';
-    const USER = 'user';
+    public const LOCATION = 'location';
+    public const ASSET = 'asset';
+    public const USER = 'user';
 
     use Acceptable;
 

app/Models/CustomField.php

@@ -21,7 +21,7 @@ class CustomField extends Model
      *
      * @var array
      */
-    const PREDEFINED_FORMATS = [
+    public const PREDEFINED_FORMATS = [
             'ANY'           => '',
             'CUSTOM REGEX'  => '',
             'ALPHA'         => 'alpha',

app/Models/Ldap.php

@@ -217,16 +217,16 @@ public static function parseAndMapLdapAttributes($ldapattributes)
         $ldap_result_manager = Setting::getSettings()->ldap_manager;
         // Get LDAP user data
         $item = [];
-        $item['username'] = isset($ldapattributes[$ldap_result_username][0]) ? $ldapattributes[$ldap_result_username][0] : '';
-        $item['employee_number'] = isset($ldapattributes[$ldap_result_emp_num][0]) ? $ldapattributes[$ldap_result_emp_num][0] : '';
-        $item['lastname'] = isset($ldapattributes[$ldap_result_last_name][0]) ? $ldapattributes[$ldap_result_last_name][0] : '';
-        $item['firstname'] = isset($ldapattributes[$ldap_result_first_name][0]) ? $ldapattributes[$ldap_result_first_name][0] : '';
-        $item['email'] = isset($ldapattributes[$ldap_result_email][0]) ? $ldapattributes[$ldap_result_email][0] : '';
-        $item['telephone'] = isset($ldapattributes[$ldap_result_phone][0]) ? $ldapattributes[$ldap_result_phone][0] : '';
-        $item['jobtitle'] = isset($ldapattributes[$ldap_result_jobtitle][0]) ? $ldapattributes[$ldap_result_jobtitle][0] : '';
-        $item['country'] = isset($ldapattributes[$ldap_result_country][0]) ? $ldapattributes[$ldap_result_country][0] : '';
-        $item['department'] = isset($ldapattributes[$ldap_result_dept][0]) ? $ldapattributes[$ldap_result_dept][0] : '';
-        $item['manager'] = isset($ldapattributes[$ldap_result_manager][0]) ? $ldapattributes[$ldap_result_manager][0] : '';
+        $item['username'] = $ldapattributes[$ldap_result_username][0] ?? '';
+        $item['employee_number'] = $ldapattributes[$ldap_result_emp_num][0] ?? '';
+        $item['lastname'] = $ldapattributes[$ldap_result_last_name][0] ?? '';
+        $item['firstname'] = $ldapattributes[$ldap_result_first_name][0] ?? '';
+        $item['email'] = $ldapattributes[$ldap_result_email][0] ?? '';
+        $item['telephone'] = $ldapattributes[$ldap_result_phone][0] ?? '';
+        $item['jobtitle'] = $ldapattributes[$ldap_result_jobtitle][0] ?? '';
+        $item['country'] = $ldapattributes[$ldap_result_country][0] ?? '';
+        $item['department'] = $ldapattributes[$ldap_result_dept][0] ?? '';
+        $item['manager'] = $ldapattributes[$ldap_result_manager][0] ?? '';
 
         return $item;
     }

app/Models/Setting.php

@@ -31,7 +31,7 @@ class Setting extends Model
      *
      * @var string
      */
-    const SETUP_CHECK_KEY = 'snipeit_setup_check';
+    public const SETUP_CHECK_KEY = 'snipeit_setup_check';
 
     /**
      * Whether the model should inject it's identifier to the unique

app/Models/Traits/Searchable.php

@@ -164,7 +164,7 @@ private function searchRelations(Builder $query, array $terms)
                 }
                 // I put this here because I only want to add the concat one time in the end of the user relation search
                 if($relation == 'user') {
-                    $query->orWhereRaw('CONCAT (users.first_name, " ", users.last_name) LIKE ?', ["%$term%"]);
+                    $query->orWhereRaw('CONCAT (users.first_name, " ", users.last_name) LIKE ?', ["%{$term}%"]);
                 }
             });
         }
@@ -195,7 +195,7 @@ public function advancedTextSearch(Builder $query, array $terms)
      */
     private function getSearchableAttributes()
     {
-        return isset($this->searchableAttributes) ? $this->searchableAttributes : [];
+        return $this->searchableAttributes ?? [];
     }
 
     /**
@@ -205,7 +205,7 @@ private function getSearchableAttributes()
      */
     private function getSearchableRelations()
     {
-        return isset($this->searchableRelations) ? $this->searchableRelations : [];
+        return $this->searchableRelations ?? [];
     }
 
     /**

app/Models/User.php

@@ -657,7 +657,7 @@ public function scopeSimpleNameSearch($query, $search)
     {
            $query = $query->where('first_name', 'LIKE', '%'.$search.'%')
                ->orWhere('last_name', 'LIKE', '%'.$search.'%')
-               ->orWhereRaw('CONCAT('.DB::getTablePrefix().'users.first_name," ",'.DB::getTablePrefix().'users.last_name) LIKE ?', ["%$search%"]);
+               ->orWhereRaw('CONCAT('.DB::getTablePrefix().'users.first_name," ",'.DB::getTablePrefix().'users.last_name) LIKE ?', ["%{$search}%"]);
 
         return $query;
     }
@@ -673,7 +673,7 @@ public function scopeSimpleNameSearch($query, $search)
     public function advancedTextSearch(Builder $query, array $terms) {
 
         foreach($terms as $term) {
-            $query = $query->orWhereRaw('CONCAT('.DB::getTablePrefix().'users.first_name," ",'.DB::getTablePrefix().'users.last_name) LIKE ?', ["%$term%"]);
+            $query = $query->orWhereRaw('CONCAT('.DB::getTablePrefix().'users.first_name," ",'.DB::getTablePrefix().'users.last_name) LIKE ?', ["%{$term}%"]);
         }
 
         return $query;

app/Notifications/AcceptanceAssetAcceptedNotification.php

@@ -40,7 +40,7 @@ public function __construct($params)
     public function via()
     {
 
-        $notifyBy[] = 'mail';
+        $notifyBy = ['mail'];
 
         return $notifyBy;
 

app/Notifications/AcceptanceAssetDeclinedNotification.php

@@ -38,7 +38,7 @@ public function __construct($params)
      */
     public function via($notifiable)
     {
-        $notifyBy[] = 'mail';
+        $notifyBy = ['mail'];
 
         return $notifyBy;
 

app/Notifications/InventoryAlert.php

@@ -32,7 +32,7 @@ public function __construct($params, $threshold)
      */
     public function via()
     {
-        $notifyBy[] = 'mail';
+        $notifyBy = ['mail'];
 
         return $notifyBy;
     }

app/Notifications/SendUpcomingAuditNotification.php

@@ -40,7 +40,7 @@ public function via()
      */
     public function toMail()
     {
-        $message = (new MailMessage)->markdown('notifications.markdown.upcoming-audits',
+        $message = (new MailMessage())->markdown('notifications.markdown.upcoming-audits',
             [
                 'assets'  => $this->assets,
                 'threshold'  => $this->threshold,

app/Notifications/WelcomeNotification.php

@@ -44,7 +44,7 @@ public function via()
      */
     public function toMail()
     {
-        return (new MailMessage)
+        return (new MailMessage())
             ->subject(trans('mail.welcome', ['name' => $this->_data['first_name'].' '.$this->_data['last_name']]))
             ->markdown('notifications.Welcome', $this->_data);
     }

app/Presenters/UserPresenter.php

@@ -346,8 +346,7 @@ public static function dataTableLayout()
     public function emailLink()
     {
         if ($this->email) {
-            return '<a href="mailto:'.$this->email.'">'.$this->email.'</a>'
-                .'<a href="mailto:'.$this->email.'" class="hidden-xs hidden-sm"><i class="far fa-envelope"></i></a>';
+            return '<a href="mailto:'.$this->email.'">'.$this->email.'</a><a href="mailto:'.$this->email.'" class="hidden-xs hidden-sm"><i class="far fa-envelope"></i></a>';
         }
 
         return '';