butcherman / Tech_Bench

app/Http/Controllers/Installer/SystemsController.php

Indentation +5 added lines, -5 removed lines

@@ -209,10 +209,10 @@ 
     }
 
     //  Delete an existing system - note this will fail if the system has any customers or tech tips assigned to it
-   public function destroy($id)
-   {
-       //
-       try {
+    public function destroy($id)
+    {
+        //
+        try {
             SystemTypes::find($id)->delete();
             return response()->json(['success' => true, 'reason' => 'Equipment Successfully Deleted']);
         }
@@ -220,5 +220,5 @@ 
         {
             return response()->json(['success' => false, 'reason' => 'Cannot delete this equipment.  It has Customers or Tech Tips assigned to it.  Please delete those first.']);
         }
-   }
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -18,7 +18,7 @@ 
     public function __construct()
     {
         $this->middleware('auth');
-        $this->middleware(function ($request, $next) {
+        $this->middleware(function($request, $next) {
             $this->authorize('hasAccess', 'Manage Equipment');
             return $next($request);
         });
@@ -120,7 +120,7 @@ 
         $fields = SystemDataFieldTypes::all();
         $cat = SystemCategories::where('name', str_replace('-', ' ', $cat))->first();
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id);
+        Log::debug('Route '.Route::currentRouteName().' visited by User ID-'.Auth::user()->user_id);
         return view('installer.newSystem', [
             'cat'      => $cat,
             'dataList' => $fields,
@@ -136,7 +136,7 @@ 
             $query->join('system_data_field_types', 'system_data_fields.data_type_id', '=', 'system_data_field_types.data_type_id');
         }])->withCount('SystemDataFields')->first();
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id);
+        Log::debug('Route '.Route::currentRouteName().' visited by User ID-'.Auth::user()->user_id);
         return view('installer.editSystem', [
             'system'   => $system,
             'dataList' => $fields,
@@ -216,7 +216,7 @@ 
             SystemTypes::find($id)->delete();
             return response()->json(['success' => true, 'reason' => 'Equipment Successfully Deleted']);
         }
-        catch (\Illuminate\Database\QueryException $e)
+        catch(\Illuminate\Database\QueryException $e)
         {
             return response()->json(['success' => false, 'reason' => 'Cannot delete this equipment.  It has Customers or Tech Tips assigned to it.  Please delete those first.']);
         }

Braces +3 added lines, -3 removed lines

@@ -131,8 +131,7 @@ 
     public function edit($id)
     {
         $fields = SystemDataFieldTypes::all();
-        $system = SystemTypes::where('sys_id', $id)->with(['SystemDataFields' => function($query)
-        {
+        $system = SystemTypes::where('sys_id', $id)->with(['SystemDataFields' => function($query) {
             $query->join('system_data_field_types', 'system_data_fields.data_type_id', '=', 'system_data_field_types.data_type_id');
         }])->withCount('SystemDataFields')->first();
 
@@ -212,7 +211,8 @@ 
    public function destroy($id)
    {
        //
-       try {
+       try
+       {
             SystemTypes::find($id)->delete();
             return response()->json(['success' => true, 'reason' => 'Equipment Successfully Deleted']);
         }

app/Http/Controllers/Customers/CustomerDetailsController.php

Spacing +2 added lines, -2 removed lines

@@ -73,7 +73,7 @@ 
         Log::debug('Route '.Route::currentRouteName().' visited by User ID-'.Auth::user()->user_id);
         Log::notice('New Customer ID-'.$request->custID.' created by User ID-'.Auth::user()->user_id);
 
-        return response()->json(['success' => true, 'cust_id' => $custData->cust_id ]);
+        return response()->json(['success' => true, 'cust_id' => $custData->cust_id]);
     }
 
     //  Show the customer details
@@ -142,7 +142,7 @@ 
 
         $parentsParent = Customers::find($request->parent_id);
 
-        if ($parentsParent->parent_id)
+        if($parentsParent->parent_id)
         {
             $request->parent_id = $parentsParent->parent_id;
         }

database/migrations/2019_11_30_215206_updates_for_version_5_0.php

Spacing +13 added lines, -13 removed lines

@@ -66,8 +66,8 @@ 
     private function updatePhoneIcons()
     {
         $newIcons = [
-            ['description' => 'Home',   'icon_class' => 'fas fa-home'],
-            ['description' => 'Work',   'icon_class' => 'fas fa-briefcase'],
+            ['description' => 'Home', 'icon_class' => 'fas fa-home'],
+            ['description' => 'Work', 'icon_class' => 'fas fa-briefcase'],
             ['description' => 'Mobile', 'icon_class' => 'fas fa-mobile-alt'],
         ];
 
@@ -99,7 +99,7 @@ 
         {
             if(!Schema::hasColumn('users', 'role_id'))
             {
-                Schema::table('users', function (Blueprint $table) {
+                Schema::table('users', function(Blueprint $table) {
                     $table->integer('role_id')->after('user_id')->unsigned()->default(4);
                     $table->foreign('role_id')->references('role_id')->on('user_role_descriptions')->onUpdate('cascade');
                 });
@@ -326,8 +326,8 @@ 
     //  Add soft deletes to tech tips table to prevent accidental deletes
     private function addSoftDeleteToTechTips()
     {
-        if (!Schema::hasColumn('tech_tips', 'deleted_at')) {
-            Schema::table('tech_tips', function (Blueprint $table) {
+        if(!Schema::hasColumn('tech_tips', 'deleted_at')) {
+            Schema::table('tech_tips', function(Blueprint $table) {
                 $table->softDeletes()->after('description');
             });
         }
@@ -345,7 +345,7 @@ 
             //  Migrate over all deactivated users
             DB::update('UPDATE `users` SET `deleted_at` = "'.Carbon::now().'" WHERE `active` = 0');
             //  Remove the Active column
-            Schema::table('users', function (Blueprint $table) {
+            Schema::table('users', function(Blueprint $table) {
                 $table->dropColumn('active');
             });
         }
@@ -364,27 +364,27 @@ 
         }
         if(!Schema::hasColumn('customer_systems', 'shared'))
         {
-            Schema::table('customer_systems', function (Blueprint $table)
+            Schema::table('customer_systems', function(Blueprint $table)
             {
                 $table->boolean('shared')->default(0)->after('sys_id');
             });
         }
-        if (!Schema::hasColumn('customer_contacts', 'shared'))
+        if(!Schema::hasColumn('customer_contacts', 'shared'))
         {
-            Schema::table('customer_contacts', function (Blueprint $table)
+            Schema::table('customer_contacts', function(Blueprint $table)
             {
                 $table->boolean('shared')->default(0)->after('cust_id');
             });
         }
-        if (!Schema::hasColumn('customer_notes', 'shared'))
+        if(!Schema::hasColumn('customer_notes', 'shared'))
         {
-            Schema::table('customer_notes', function (Blueprint $table)
+            Schema::table('customer_notes', function(Blueprint $table)
             {
                 $table->boolean('shared')->default(0)->after('user_id');
             });
         }
-        if (!Schema::hasColumn('customer_files', 'shared')) {
-            Schema::table('customer_files', function (Blueprint $table) {
+        if(!Schema::hasColumn('customer_files', 'shared')) {
+            Schema::table('customer_files', function(Blueprint $table) {
                 $table->boolean('shared')->default(0)->after('user_id');
             });
         }

Braces +29 added lines, -22 removed lines

@@ -83,7 +83,8 @@ 
     //  Added the ability to set an expiration date for user passwords - will force them to change after this expires
     private function addPasswordExpiresColumn()
     {
-        if(!Schema::hasColumn('users', 'password_expires')) {
+        if(!Schema::hasColumn('users', 'password_expires'))
+        {
             Schema::table('users', function(Blueprint $table) {
                 $table->timestamp('password_expires')
                     ->nullable()
@@ -119,7 +120,8 @@ 
     //  Added a 'hidden' attribute to system customer data types to allow passwords to not be viewed unless clicked or focus
     private function addHiddenColumn()
     {
-        if(!Schema::hasColumn('system_data_field_types', 'hidden')) {
+        if(!Schema::hasColumn('system_data_field_types', 'hidden'))
+        {
             Schema::table('system_cust_data_types', function(Blueprint $table) {
                 $table->boolean('hidden')
                     ->default(0)
@@ -131,7 +133,8 @@ 
     //  Update the File links table - add cust_id and note column
     private function addColumnsToFileLinksTable()
     {
-        if(!Schema::hasColumn('file_links', 'cust_id')) {
+        if(!Schema::hasColumn('file_links', 'cust_id'))
+        {
             Schema::table('file_links', function(Blueprint $table) {
                 $table->integer('cust_id')
                     ->unsigned()
@@ -140,7 +143,8 @@ 
                 $table->foreign('cust_id')->references('cust_id')->on('customers')->onUpdate('cascade')->onDelete('cascade');
             });
         }
-        if(!Schema::hasColumn('file_links', 'note')) {
+        if(!Schema::hasColumn('file_links', 'note'))
+        {
             Schema::table('file_links', function(Blueprint $table) {
                 $table->longText('note')
                     ->nullable()
@@ -148,7 +152,8 @@ 
             });
             //  Migrate the instructions from the old table to the new column
             $instructions = DB::select('SELECT * FROM `file_link_instructions`');
-            foreach($instructions as $ins) {
+            foreach($instructions as $ins)
+            {
                 FileLinks::find($ins->link_id)->update([
                     'note' => $ins->instruction
                 ]);
@@ -159,7 +164,8 @@ 
     //  Add Notes column to the file links files table
     private function addNotesColumnToFileLinkFiles()
     {
-        if(!Schema::hasColumn('file_link_files', 'note')) {
+        if(!Schema::hasColumn('file_link_files', 'note'))
+        {
             Schema::table('file_link_files', function(Blueprint $table) {
                 $table->longText('note')
                     ->nullable()
@@ -167,7 +173,8 @@ 
             });
             //  Migrate the existing notes to the new table
             $notes = DB::select('SELECT * FROM `file_link_notes`');
-            foreach($notes as $note) {
+            foreach($notes as $note)
+            {
                 FileLinkFiles::where('file_id', $note->file_id)->update([
                     'note' => $note->note
                 ]);
@@ -178,7 +185,8 @@ 
     //  Add the documentation column to the tech tips table
     private function migrateSystemDocumentation()
     {
-        if(!Schema::hasColumn('tech_tips', 'tip_type_id')) {
+        if(!Schema::hasColumn('tech_tips', 'tip_type_id'))
+        {
             Schema::table('tech_tips', function(Blueprint $table) {
                 $table->bigInteger('tip_type_id')->unsigned()->after('public')->default(1);
                 $table->foreign('tip_type_id')->references('tip_type_id')->on('tech_tip_types')->onUpdate('cascade');
@@ -186,7 +194,8 @@ 
 
             //  Move all of the system files over to the tech tips table
             $sysFiles = DB::select('SELECT * FROM `system_files`');
-            foreach($sysFiles as $sysFile) {
+            foreach($sysFiles as $sysFile)
+            {
                 $newTip = TechTips::create([
                     'user_id'       => $sysFile->user_id,
                     'public'        => 0,
@@ -280,7 +289,8 @@ 
     //  Remove the system files and system file types table
     private function removeSystemFilesTables()
     {
-        if(Schema::hasTable('system_files')) {
+        if(Schema::hasTable('system_files'))
+        {
             Schema::table('system_files', function(Blueprint $table) {
                 $table->dropForeign(['sys_id']);
                 $table->dropForeign(['type_id']);
@@ -326,7 +336,8 @@ 
     //  Add soft deletes to tech tips table to prevent accidental deletes
     private function addSoftDeleteToTechTips()
     {
-        if (!Schema::hasColumn('tech_tips', 'deleted_at')) {
+        if (!Schema::hasColumn('tech_tips', 'deleted_at'))
+        {
             Schema::table('tech_tips', function (Blueprint $table) {
                 $table->softDeletes()->after('description');
             });
@@ -338,8 +349,7 @@ 
     {
         if(!Schema::hasColumn('users', 'deleted_at'))
         {
-            Schema::table('users', function(Blueprint $table)
-            {
+            Schema::table('users', function(Blueprint $table) {
                 $table->softDeletes()->after('password_expires');
             });
             //  Migrate over all deactivated users
@@ -356,34 +366,31 @@ 
     {
         if(!Schema::hasColumn('customers', 'parent_id'))
         {
-            Schema::table('customers', function(Blueprint $table)
-            {
+            Schema::table('customers', function(Blueprint $table) {
                 $table->integer('parent_id')->after('cust_id')->nullable()->unsigned();
                 $table->foreign('parent_id')->references('cust_id')->on('customers')->onUpdate('cascade');
             });
         }
         if(!Schema::hasColumn('customer_systems', 'shared'))
         {
-            Schema::table('customer_systems', function (Blueprint $table)
-            {
+            Schema::table('customer_systems', function (Blueprint $table) {
                 $table->boolean('shared')->default(0)->after('sys_id');
             });
         }
         if (!Schema::hasColumn('customer_contacts', 'shared'))
         {
-            Schema::table('customer_contacts', function (Blueprint $table)
-            {
+            Schema::table('customer_contacts', function (Blueprint $table) {
                 $table->boolean('shared')->default(0)->after('cust_id');
             });
         }
         if (!Schema::hasColumn('customer_notes', 'shared'))
         {
-            Schema::table('customer_notes', function (Blueprint $table)
-            {
+            Schema::table('customer_notes', function (Blueprint $table) {
                 $table->boolean('shared')->default(0)->after('user_id');
             });
         }
-        if (!Schema::hasColumn('customer_files', 'shared')) {
+        if (!Schema::hasColumn('customer_files', 'shared'))
+        {
             Schema::table('customer_files', function (Blueprint $table) {
                 $table->boolean('shared')->default(0)->after('user_id');
             });

app/Http/Controllers/Installer/ModuleController.php

Spacing +8 added lines, -8 removed lines

@@ -43,7 +43,7 @@ 
             ];
         }
         $mods = Module::allDisabled();
-        foreach ($mods as $name => $mod) {
+        foreach($mods as $name => $mod) {
             $moduleList[] = [
                 'name' => $name,
                 'status' => 'Disabled',
@@ -80,8 +80,8 @@ 
         $receiver = new FileReceiver('file', $request, HandlerFactory::classFromRequest($request));
 
         //  Verify that the upload is valid and being processed
-        if ($receiver->isUploaded() === false) {
-            Log::error('Upload File Missing - ' .
+        if($receiver->isUploaded() === false) {
+            Log::error('Upload File Missing - '.
                 /** @scrutinizer ignore-type */
                 $request->toArray());
             throw new UploadMissingFileException();
@@ -91,7 +91,7 @@ 
         $save = $receiver->receive();
 
         //  See if the uploade has finished
-        if ($save->isFinished()) {
+        if($save->isFinished()) {
             $this->saveFile($save->getFile());
 
             return 'uploaded successfully';
@@ -100,8 +100,8 @@ 
         //  Get the current progress
         $handler = $save->handler();
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id);
-        Log::debug('File being uploaded.  Percentage done - ' . $handler->getPercentageDone());
+        Log::debug('Route '.Route::currentRouteName().' visited by User ID-'.Auth::user()->user_id);
+        Log::debug('File being uploaded.  Percentage done - '.$handler->getPercentageDone());
         return response()->json([
             'done'   => $handler->getPercentageDone(),
             'status' => true
@@ -112,7 +112,7 @@ 
     //  Save a file attached to the link
     private function saveFile(UploadedFile $file)
     {
-        $filePath = config('filesystems.disks.staging.root') . DIRECTORY_SEPARATOR . 'modules'.DIRECTORY_SEPARATOR;
+        $filePath = config('filesystems.disks.staging.root').DIRECTORY_SEPARATOR.'modules'.DIRECTORY_SEPARATOR;
 
         //  Clean the file and store it
         $fileName = Files::cleanFilename($filePath, $file->getClientOriginalName());
@@ -135,7 +135,7 @@ 
         $module->extract(config('modules.paths.modules').DIRECTORY_SEPARATOR.$modName);
         $module->close();
 
-        Artisan::call('module:enable',  ['module' => $modName]);
+        Artisan::call('module:enable', ['module' => $modName]);
         Artisan::call('module:migrate', ['module' => $modName]);
         $this->delStaged($name);
 

Braces +6 added lines, -3 removed lines

@@ -43,7 +43,8 @@ 
             ];
         }
         $mods = Module::allDisabled();
-        foreach ($mods as $name => $mod) {
+        foreach ($mods as $name => $mod)
+        {
             $moduleList[] = [
                 'name' => $name,
                 'status' => 'Disabled',
@@ -80,7 +81,8 @@ 
         $receiver = new FileReceiver('file', $request, HandlerFactory::classFromRequest($request));
 
         //  Verify that the upload is valid and being processed
-        if ($receiver->isUploaded() === false) {
+        if ($receiver->isUploaded() === false)
+        {
             Log::error('Upload File Missing - ' .
                 /** @scrutinizer ignore-type */
                 $request->toArray());
@@ -91,7 +93,8 @@ 
         $save = $receiver->receive();
 
         //  See if the uploade has finished
-        if ($save->isFinished()) {
+        if ($save->isFinished())
+        {
             $this->saveFile($save->getFile());
 
             return 'uploaded successfully';

database/seeds/EquipmentSeeder.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
                 SystemDataFields::create([
                     'sys_id' => $sys->sys_id,
                     'data_type_id' => $i,
-                    'order' => $i-1,
+                    'order' => $i - 1,
                 ]);
             }
         }

database/seeds/DatabaseSeeder.php

Indentation +4 added lines, -4 removed lines

@@ -12,9 +12,9 @@
     public function run()
     {
         //  TODO:  add seeders for demo setup
-         $this->call(UserTableSeeder::class);
-         $this->call(EquipmentSeeder::class);
-         $this->call(CustomerSeeder::class);
-         $this->call(TechTipsSeeder::class);
+            $this->call(UserTableSeeder::class);
+            $this->call(EquipmentSeeder::class);
+            $this->call(CustomerSeeder::class);
+            $this->call(TechTipsSeeder::class);
     }
 }

database/factories/Customers.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 use App\Customers;
 use Faker\Generator as Faker;
 
-$factory->define(Customers::class, function (Faker $faker) {
+$factory->define(Customers::class, function(Faker $faker) {
     return [
         'cust_id'   => $faker->unique()->numberBetween(50, 10000),
         'parent_id' => null,

database/factories/UserFactory.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
         'first_name'       => $faker->firstName,
         'last_name'        => $faker->lastName,
         'email'            => $faker->unique()->safeEmail,
-        'password'         => bcrypt('password'),  //  All test users will have the password of 'password' to allow testing access
+        'password'         => bcrypt('password'), //  All test users will have the password of 'password' to allow testing access
         'remember_token'   => Str::random(10),
         'password_expires' => null,
     ];

app/Http/Controllers/Auth/InitializeUserController.php

Spacing +9 added lines, -9 removed lines

@@ -27,14 +27,14 @@ 
         //  Validate the hash token
         $user = UserInitialize::where('token', $hash)->get();
 
-        if ($user->isEmpty()) {
-            Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id);
-            Log::warning('Visitor at IP Address ' . \Request::ip() . ' tried to access invalid initialize hash - ' . $hash);
+        if($user->isEmpty()) {
+            Log::debug('Route '.Route::currentRouteName().' visited by User ID-'.Auth::user()->user_id);
+            Log::warning('Visitor at IP Address '.\Request::ip().' tried to access invalid initialize hash - '.$hash);
             return abort(404);
         }
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited.');
-        Log::debug('Link Hash -' . $hash);
+        Log::debug('Route '.Route::currentRouteName().' visited.');
+        Log::debug('Link Hash -'.$hash);
         return view('account.initializeUser', ['hash' => $hash]);
     }
 
@@ -43,9 +43,9 @@ 
     {
         //  Verify that the link matches the assigned email address
         $valid = UserInitialize::where('token', $hash)->first();
-        if (empty($valid)) {
-            Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id);
-            Log::warning('Visitor at IP Address ' . \Request::ip() . ' tried to submit an invalid User Initialization link - ' . $hash);
+        if(empty($valid)) {
+            Log::debug('Route '.Route::currentRouteName().' visited by User ID-'.Auth::user()->user_id);
+            Log::warning('Visitor at IP Address '.\Request::ip().' tried to submit an invalid User Initialization link - '.$hash);
             return abort(404);
         }
 
@@ -78,7 +78,7 @@ 
         Auth::loginUsingID($userData->user_id);
 
         //  Redirect the user to the dashboard
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id);
+        Log::debug('Route '.Route::currentRouteName().' visited by User ID-'.Auth::user()->user_id);
         Log::debug('Initialize Data - ', $request->toArray());
         Log::notice('User has setup account', ['user_id' => $userData->user_id]);
         return redirect(route('dashboard'));

Braces +4 added lines, -2 removed lines

@@ -135,7 +135,8 @@ 
         //  Validate the hash token
         $user = UserInitialize::where('token', $hash)->get();
 
-        if ($user->isEmpty()) {
+        if ($user->isEmpty())
+        {
             Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id);
             Log::warning('Visitor at IP Address ' . \Request::ip() . ' tried to access invalid initialize hash - ' . $hash);
             return abort(404);
@@ -151,7 +152,8 @@ 
     {
         //  Verify that the link matches the assigned email address
         $valid = UserInitialize::where('token', $hash)->first();
-        if (empty($valid)) {
+        if (empty($valid))
+        {
             Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id);
             Log::warning('Visitor at IP Address ' . \Request::ip() . ' tried to submit an invalid User Initialization link - ' . $hash);
             return abort(404);