butcherman / Tech_Bench

database/migrations/2019_10_19_175205_updates_for_version_5_0.php

Braces +37 added lines, -17 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()
@@ -95,17 +96,21 @@ 
     //  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');
             });
 
             //  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
@@ -126,7 +131,9 @@ 
                                 'modify_category'     => 1
                             ]
                         );
-                    } else if ($user->name === 'Admin') {
+                    }
+                    else if ($user->name === 'Admin')
+                    {
                         UserPermissions::create(
                             [
                                 'user_id'             => $user->user_id,
@@ -142,7 +149,9 @@ 
                                 'modify_category'     => 1
                             ]
                         );
-                    } else if ($user->name === 'Report') {
+                    }
+                    else if ($user->name === 'Report')
+                    {
                         UserPermissions::create(
                             [
                                 'user_id'             => $user->user_id,
@@ -158,7 +167,9 @@ 
                                 'modify_category'     => 0
                             ]
                         );
-                    } else {
+                    }
+                    else
+                    {
                         UserPermissions::create(
                             [
                                 'user_id'             => $user->user_id,
@@ -183,7 +194,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_cust_data_types', 'hidden')) {
+        if (!Schema::hasColumn('system_cust_data_types', 'hidden'))
+        {
             Schema::table('system_cust_data_types', function (Blueprint $table) {
                 $table->boolean('hidden')
                     ->default(0)
@@ -195,7 +207,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()
@@ -204,7 +217,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()
@@ -212,7 +226,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
                 ]);
@@ -223,7 +238,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()
@@ -231,7 +247,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
                 ]);
@@ -242,14 +259,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,
@@ -344,7 +363,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']);

database/seeds/UserTableSeeder.php

Braces +1 added lines, -2 removed lines

@@ -12,8 +12,7 @@
     public function run()
     {
         //  Create the test users - note, none are installers - permissions are assigned randomly
-        factory(App\User::class, 15)->create()->each(function($user)
-        {
+        factory(App\User::class, 15)->create()->each(function($user) {
             $user->UserPermissions()->save(factory(App\UserPermissions::class)->create());
         });
     }