From c1ae406049be7e989879612eacb101b87a34d91b Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 6 Feb 2023 12:44:02 -0800
Subject: [PATCH] Fixed visibility for constants and methods

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/ModalController.php  | 2 +-
 app/Http/Middleware/CheckForTwoFactor.php | 2 +-
 app/Models/Asset.php                      | 6 +++---
 app/Models/CustomField.php                | 2 +-
 app/Models/Setting.php                    | 2 +-
 app/Models/User.php                       | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/ModalController.php b/app/Http/Controllers/ModalController.php
index 385877a3ec..6f6b39dd12 100644
--- a/app/Http/Controllers/ModalController.php
+++ b/app/Http/Controllers/ModalController.php
@@ -17,7 +17,7 @@ class ModalController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net]
      * @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 = [
diff --git a/app/Http/Middleware/CheckForTwoFactor.php b/app/Http/Middleware/CheckForTwoFactor.php
index fd630ef10c..2b72deb8a9 100644
--- a/app/Http/Middleware/CheckForTwoFactor.php
+++ b/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.
diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index f8e0cab314..68b3845f68 100644
--- a/app/Models/Asset.php
+++ b/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;
 
diff --git a/app/Models/CustomField.php b/app/Models/CustomField.php
index e0b06318bb..83fa93ec56 100644
--- a/app/Models/CustomField.php
+++ b/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',
diff --git a/app/Models/Setting.php b/app/Models/Setting.php
index f2a4184178..8f1f652017 100755
--- a/app/Models/Setting.php
+++ b/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
diff --git a/app/Models/User.php b/app/Models/User.php
index 34c0af6b2e..71025eaefe 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -657,7 +657,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
     {
            $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 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
     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;