butcherman / Tech_Bench

database/factories/CustomerSystems.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 use App\CustomerSystems;
 use Faker\Generator as Faker;
 
-$factory->define(CustomerSystems::class, function (Faker $faker) {
+$factory->define(CustomerSystems::class, function(Faker $faker) {
     return [
         //
         'cust_id' => factory(App\Customers::class)->create()->cust_id,

database/factories/SystemCategoriesFactory.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 use App\SystemCategories;
 use Faker\Generator as Faker;
 
-$factory->define(SystemCategories::class, function (Faker $faker) {
+$factory->define(SystemCategories::class, function(Faker $faker) {
     return [
         //
         'name' => $faker->unique()->text(15)

database/factories/SystemDataFieldTypesFactory.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 use App\SystemDataFieldTypes;
 use Faker\Generator as Faker;
 
-$factory->define(SystemDataFieldTypes::class, function (Faker $faker) {
+$factory->define(SystemDataFieldTypes::class, function(Faker $faker) {
     return [
         //
         'name'   => $faker->words(),

database/factories/CustomerSystemData.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 use App\CustomerSystemData;
 use Faker\Generator as Faker;
 
-$factory->define(CustomerSystemData::class, function (Faker $faker) {
+$factory->define(CustomerSystemData::class, function(Faker $faker) {
     return [
         //
         'cust_sys_id' => factory(App\CustomerSystems::class)->create()->cust_sys_id,

database/factories/SystemDataFields.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 use App\SystemDataFields;
 use Faker\Generator as Faker;
 
-$factory->define(SystemDataFields::class, function (Faker $faker) {
+$factory->define(SystemDataFields::class, function(Faker $faker) {
     return [
         //
         'sys_id' => factory(App\SystemTypes::class)->create()->sys_id,

database/migrations/2019_10_19_175205_updates_for_version_5_0.php

Spacing +29 added lines, -29 removed lines

@@ -85,8 +85,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')) {
-            Schema::table('users', function (Blueprint $table) {
+        if(!Schema::hasColumn('users', 'password_expires')) {
+            Schema::table('users', function(Blueprint $table) {
                 $table->timestamp('password_expires')
                     ->nullable()
                     ->after('active');
@@ -97,18 +97,18 @@ 
     //  Add the is installer column to the users table
     private function addIsInstallerToUsers()
     {
-        if (!Schema::hasColumn('users', 'is_installer')) {
-            Schema::table('users', function (Blueprint $table) {
+        if(!Schema::hasColumn('users', 'is_installer')) {
+            Schema::table('users', function(Blueprint $table) {
                 $table->boolean('is_installer')->default(0)->after('active');
             });
 
             //  TODO - Clean this up, it does not work
             //  Migrate user roles from the 'user roles' table to the new 'user permissions' table
-            if (Schema::hasTable('user_permissions') && (UserPermissions::all()->isEmpty())) {
+            if(Schema::hasTable('user_permissions') && (UserPermissions::all()->isEmpty())) {
                 $userRoles = DB::select('SELECT * FROM `user_role` LEFT JOIN `roles` ON `user_role`.`role_id` = `roles`.`role_id`');
 
-                foreach ($userRoles as $user) {
-                    if ($user->name === 'Installer') {
+                foreach($userRoles as $user) {
+                    if($user->name === 'Installer') {
                         User::find($user->user_id)->update(
                             [
                                 'is_installer' => 1
@@ -129,7 +129,7 @@ 
                                 'modify_category'     => 1
                             ]
                         );
-                    } else if ($user->name === 'Admin') {
+                    } else if($user->name === 'Admin') {
                         UserPermissions::create(
                             [
                                 'user_id'             => $user->user_id,
@@ -145,7 +145,7 @@ 
                                 'modify_category'     => 1
                             ]
                         );
-                    } else if ($user->name === 'Report') {
+                    } else if($user->name === 'Report') {
                         UserPermissions::create(
                             [
                                 'user_id'             => $user->user_id,
@@ -186,8 +186,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')) {
-            Schema::table('system_cust_data_types', function (Blueprint $table) {
+        if(!Schema::hasColumn('system_data_field_types', 'hidden')) {
+            Schema::table('system_cust_data_types', function(Blueprint $table) {
                 $table->boolean('hidden')
                     ->default(0)
                     ->after('name');
@@ -198,8 +198,8 @@ 
     //  Update the File links table - add cust_id and note column
     private function addColumnsToFileLinksTable()
     {
-        if (!Schema::hasColumn('file_links', 'cust_id')) {
-            Schema::table('file_links', function (Blueprint $table) {
+        if(!Schema::hasColumn('file_links', 'cust_id')) {
+            Schema::table('file_links', function(Blueprint $table) {
                 $table->integer('cust_id')
                     ->unsigned()
                     ->nullable()
@@ -207,15 +207,15 @@ 
                 $table->foreign('cust_id')->references('cust_id')->on('customers')->onUpdate('cascade')->onDelete('cascade');
             });
         }
-        if (!Schema::hasColumn('file_links', 'note')) {
-            Schema::table('file_links', function (Blueprint $table) {
+        if(!Schema::hasColumn('file_links', 'note')) {
+            Schema::table('file_links', function(Blueprint $table) {
                 $table->longText('note')
                     ->nullable()
                     ->after('link_name');
             });
             //  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
                 ]);
@@ -226,15 +226,15 @@ 
     //  Add Notes column to the file links files table
     private function addNotesColumnToFileLinkFiles()
     {
-        if (!Schema::hasColumn('file_link_files', 'note')) {
-            Schema::table('file_link_files', function (Blueprint $table) {
+        if(!Schema::hasColumn('file_link_files', 'note')) {
+            Schema::table('file_link_files', function(Blueprint $table) {
                 $table->longText('note')
                     ->nullable()
                     ->after('upload');
             });
             //  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
                 ]);
@@ -245,14 +245,14 @@ 
     //  Add the documentation column to the tech tips table
     private function addDocumentationColumnToTechTips()
     {
-        if (!Schema::hasColumn('tech_tips', 'documentation')) {
-            Schema::table('tech_tips', function (Blueprint $table) {
+        if(!Schema::hasColumn('tech_tips', 'documentation')) {
+            Schema::table('tech_tips', function(Blueprint $table) {
                 $table->boolean('documentation')->default(0)->nullable()->after('public');
             });
 
             //  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,
@@ -288,7 +288,7 @@ 
     //  Remove the active column from the customers table
     private function removeActiveFromCustomers()
     {
-        if (Schema::hasColumn('customers', 'active'))
+        if(Schema::hasColumn('customers', 'active'))
         {
             //  Migrate the existing disabled customers first
             $deactiveatedCustomers = Customers::where('active', 0);
@@ -298,7 +298,7 @@ 
                 Customers::find($cust->cust_id)->delete();
             }
 
-            Schema::table('customers', function (Blueprint $table) {
+            Schema::table('customers', function(Blueprint $table) {
                 $table->dropColumn('active');
             });
         }
@@ -309,7 +309,7 @@ 
     {
         if(Schema::hasTable('user_role'))
         {
-            Schema::table('user_role', function (Blueprint $table) {
+            Schema::table('user_role', function(Blueprint $table) {
                 $table->dropForeign(['user_id']);
                 $table->dropForeign(['role_id']);
             });
@@ -324,7 +324,7 @@ 
         if(Schema::hasTable('file_link_instructions'))
         {
             //  Remove the foreign key to allow for dropping the table
-            Schema::table('file_link_instructions', function (Blueprint $table) {
+            Schema::table('file_link_instructions', function(Blueprint $table) {
                 $table->dropForeign(['link_id']);
             });
             Schema::dropIfExists('file_link_instructions');
@@ -336,7 +336,7 @@ 
     {
         if(Schema::hasTable('file_link_notes'))
         {
-            Schema::table('file_link_notes', function (Blueprint $table) {
+            Schema::table('file_link_notes', function(Blueprint $table) {
                 $table->dropForeign(['link_id']);
                 $table->dropForeign(['file_id']);
             });
@@ -347,8 +347,8 @@ 
     //  Remove the system files and system file types table
     private function removeSystemFilesTables()
     {
-        if (Schema::hasTable('system_files')) {
-            Schema::table('system_files', function (Blueprint $table) {
+        if(Schema::hasTable('system_files')) {
+            Schema::table('system_files', function(Blueprint $table) {
                 $table->dropForeign(['sys_id']);
                 $table->dropForeign(['type_id']);
                 $table->dropForeign(['file_id']);

Braces +38 added lines, -19 removed lines

@@ -85,7 +85,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()
@@ -97,18 +98,22 @@ 
     //  Add the is installer column to the users table
     private function addIsInstallerToUsers()
     {
-        if (!Schema::hasColumn('users', 'is_installer')) {
+        if (!Schema::hasColumn('users', 'is_installer'))
+        {
             Schema::table('users', function (Blueprint $table) {
                 $table->boolean('is_installer')->default(0)->after('active');
             });
 
             //  TODO - Clean this up, it does not work
             //  Migrate user roles from the 'user roles' table to the new 'user permissions' table
-            if (Schema::hasTable('user_permissions') && (UserPermissions::all()->isEmpty())) {
+            if (Schema::hasTable('user_permissions') && (UserPermissions::all()->isEmpty()))
+            {
                 $userRoles = DB::select('SELECT * FROM `user_role` LEFT JOIN `roles` ON `user_role`.`role_id` = `roles`.`role_id`');
 
-                foreach ($userRoles as $user) {
-                    if ($user->name === 'Installer') {
+                foreach ($userRoles as $user)
+                {
+                    if ($user->name === 'Installer')
+                    {
                         User::find($user->user_id)->update(
                             [
                                 'is_installer' => 1
@@ -129,7 +134,9 @@ 
                                 'modify_category'     => 1
                             ]
                         );
-                    } else if ($user->name === 'Admin') {
+                    }
+                    else if ($user->name === 'Admin')
+                    {
                         UserPermissions::create(
                             [
                                 'user_id'             => $user->user_id,
@@ -145,7 +152,9 @@ 
                                 'modify_category'     => 1
                             ]
                         );
-                    } else if ($user->name === 'Report') {
+                    }
+                    else if ($user->name === 'Report')
+                    {
                         UserPermissions::create(
                             [
                                 'user_id'             => $user->user_id,
@@ -161,7 +170,9 @@ 
                                 'modify_category'     => 0
                             ]
                         );
-                    } else {
+                    }
+                    else
+                    {
                         UserPermissions::create(
                             [
                                 'user_id'             => $user->user_id,
@@ -186,7 +197,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)
@@ -198,7 +210,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()
@@ -207,7 +220,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()
@@ -215,7 +229,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
                 ]);
@@ -226,7 +241,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()
@@ -234,7 +250,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
                 ]);
@@ -245,14 +262,16 @@ 
     //  Add the documentation column to the tech tips table
     private function addDocumentationColumnToTechTips()
     {
-        if (!Schema::hasColumn('tech_tips', 'documentation')) {
+        if (!Schema::hasColumn('tech_tips', 'documentation'))
+        {
             Schema::table('tech_tips', function (Blueprint $table) {
                 $table->boolean('documentation')->default(0)->nullable()->after('public');
             });
 
             //  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,
@@ -347,7 +366,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']);
@@ -384,8 +404,7 @@ 
     {
         if(!Schema::hasColumn('customer_systems', 'deleted_at'))
         {
-            Schema::table('customer_systems', function(Blueprint $table)
-            {
+            Schema::table('customer_systems', function(Blueprint $table) {
                 $table->softDeletes()->after('sys_id');
             });
         }

app/Http/Controllers/Customers/CustomerSystemsController.php

Spacing +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
 
         foreach($fields as $data)
         {
-            $fieldName = 'field_' . $data->field_id;
+            $fieldName = 'field_'.$data->field_id;
             if(isset($request->$fieldName))
             {
                 Log::debug($request->$fieldName);

routes/web.php

Spacing +20 added lines, -20 removed lines

@@ -8,58 +8,58 @@
 /*
 *   Non user Routes
 */
-Route::get('/',         'Auth\LoginController@showLoginForm')->name('index');
-Route::get('logout',    'Auth\LoginController@logout')       ->name('logout');
+Route::get('/', 'Auth\LoginController@showLoginForm')->name('index');
+Route::get('logout', 'Auth\LoginController@logout')       ->name('logout');
 Route::get('no-script', 'Controller@noScript')               ->name('noscript');
 
 
 /*
 *   Download File Routes
 */
-Route::get('download/{id}/{filename}',    'DownloadController@index')         ->name('download');
+Route::get('download/{id}/{filename}', 'DownloadController@index')         ->name('download');
 Route::get('download-archive/{filename}', 'DownloadController@downloadArchive')->name('downloadArchive');
-Route::put('download-archive',            'DownloadController@archiveFiles')   ->name('archiveFiles');
+Route::put('download-archive', 'DownloadController@archiveFiles')   ->name('archiveFiles');
 
 
 /*
 *   User Settings Routes
 */
-Route::get('account',                   'AccountController@index')         ->name('account');
-Route::post('account',                  'AccountController@submit')        ->name('account');
-Route::put('account',                   'AccountController@notifications') ->name('account');
-Route::get('/account/change-password',  'AccountController@changePassword')->name('changePassword');
+Route::get('account', 'AccountController@index')         ->name('account');
+Route::post('account', 'AccountController@submit')        ->name('account');
+Route::put('account', 'AccountController@notifications') ->name('account');
+Route::get('/account/change-password', 'AccountController@changePassword')->name('changePassword');
 Route::post('/account/change-password', 'AccountController@submitPassword')->name('changePassword');
 
 /*
 *   Basic Logged In Routes
 */
-Route::get('about',     'DashboardController@about')->name('about');
+Route::get('about', 'DashboardController@about')->name('about');
 Route::get('dashboard', 'DashboardController@index')->name('dashboard');
 
 /*
 *   File Link Routes
 */
-Route::prefix('links')->name('links.')->group(function () {
+Route::prefix('links')->name('links.')->group(function() {
     //  Resource controllers for base access
-    Route::resource('data',           'FileLinks\FileLinksController');
-    Route::get('new',                 'FileLinks\FileLinksController@create')     ->name('new');
-    Route::get('find/{id}',           'FileLinks\FileLinksController@find')       ->name('user');
+    Route::resource('data', 'FileLinks\FileLinksController');
+    Route::get('new', 'FileLinks\FileLinksController@create')     ->name('new');
+    Route::get('find/{id}', 'FileLinks\FileLinksController@find')       ->name('user');
     Route::get('details/{id}/{name}', 'FileLinks\FileLinksController@details')    ->name('details');
-    Route::get('disable/{id}',        'FileLinks\FileLinksController@disableLink')->name('disable');
+    Route::get('disable/{id}', 'FileLinks\FileLinksController@disableLink')->name('disable');
     //  File Link Files
-    Route::resource('files',          'FileLinks\LinkFilesController');
+    Route::resource('files', 'FileLinks\LinkFilesController');
     //  Index landing page
-    Route::get('/',                   'FileLinks\FileLinksController@index')      ->name('index');
+    Route::get('/', 'FileLinks\FileLinksController@index')      ->name('index');
 });
 
 /*
 *   Guest File Link Routes
 */
 Route::get('file-links/{id}/get-files', 'FileLinks\GuestLinksController@getFiles')->name('file-links.getFiles');
-Route::put('file-links/{id}',            'FileLinks\GuestLinksController@notify') ->name('file-links.show');
-Route::post('file-links/{id}',          'FileLinks\GuestLinksController@update')  ->name('file-links.show');
-Route::get('file-links/{id}',           'FileLinks\GuestLinksController@show')    ->name('file-links.show');
-Route::get('file-links',                'FileLinks\GuestLinksController@index')   ->name('file-links.index');
+Route::put('file-links/{id}', 'FileLinks\GuestLinksController@notify') ->name('file-links.show');
+Route::post('file-links/{id}', 'FileLinks\GuestLinksController@update')  ->name('file-links.show');
+Route::get('file-links/{id}', 'FileLinks\GuestLinksController@show')    ->name('file-links.show');
+Route::get('file-links', 'FileLinks\GuestLinksController@index')   ->name('file-links.index');
 
 /*
 *   Customer Routes