Test Failed
Branch dev5 (4ce0ff)
by Ron
06:19
created
app/Http/Middleware/RedirectIfAuthenticated.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,8 @@
 block discarded – undo
17 17
      */
18 18
     public function handle($request, Closure $next, $guard = null)
19 19
     {
20
-        if(Auth::guard($guard)->check()) {
20
+        if(Auth::guard($guard)->check())
21
+        {
21 22
             return redirect('/dashboard');
22 23
         }
23 24
 
Please login to merge, or discard this patch.
app/Http/Controllers/Customers/CustomerController.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -47,8 +47,7 @@  discard block
 block discarded – undo
47 47
             $searchResults = new CustomersCollection(
48 48
                 Customers::orderBy($request->sortField, $request->sortType)
49 49
                     //  Search the name, dba name, and cust id columns
50
-                    ->where(function($query) use ($request)
51
-                    {
50
+                    ->where(function($query) use ($request) {
52 51
                         $query->where('name', 'like', '%' . $request->name . '%')
53 52
                             ->orWhere('cust_id', 'like', '%' . $request->name . '%')
54 53
                             ->orWhere('dba_name', 'like', '%' . $request->name . '%');
@@ -58,10 +57,8 @@  discard block
 block discarded – undo
58 57
                     //  Include the customers systems
59 58
                     ->with('CustomerSystems.SystemTypes')
60 59
                     //  If the system field is present - search for system type
61
-                    ->when($request->system, function($query) use ($request)
62
-                    {
63
-                        $query->whereHas('CustomerSystems.SystemTypes', function($query) use ($request)
64
-                        {
60
+                    ->when($request->system, function($query) use ($request) {
61
+                        $query->whereHas('CustomerSystems.SystemTypes', function($query) use ($request) {
65 62
                             $query->where('sys_id', $request->system);
66 63
                         });
67 64
                     })
Please login to merge, or discard this patch.
database/seeds/UserTableSeeder.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,8 +12,7 @@
 block discarded – undo
12 12
     public function run()
13 13
     {
14 14
         //  Create the test users - note, none are installers - permissions are assigned randomly
15
-        factory(App\User::class, 15)->create()->each(function($user)
16
-        {
15
+        factory(App\User::class, 15)->create()->each(function($user) {
17 16
             $user->UserPermissions()->save(factory(App\UserPermissions::class)->create(['user_id' => $user->user_id]));
18 17
         });
19 18
     }
Please login to merge, or discard this patch.
database/migrations/2019_11_25_175206_updates_for_version_5_0.php 1 patch
Braces   +22 added lines, -11 removed lines patch added patch discarded remove patch
@@ -82,7 +82,8 @@  discard block
 block discarded – undo
82 82
     //  Added the ability to set an expiration date for user passwords - will force them to change after this expires
83 83
     private function addPasswordExpiresColumn()
84 84
     {
85
-        if(!Schema::hasColumn('users', 'password_expires')) {
85
+        if(!Schema::hasColumn('users', 'password_expires'))
86
+        {
86 87
             Schema::table('users', function(Blueprint $table) {
87 88
                 $table->timestamp('password_expires')
88 89
                     ->nullable()
@@ -153,7 +154,8 @@  discard block
 block discarded – undo
153 154
     //  Added a 'hidden' attribute to system customer data types to allow passwords to not be viewed unless clicked or focus
154 155
     private function addHiddenColumn()
155 156
     {
156
-        if(!Schema::hasColumn('system_data_field_types', 'hidden')) {
157
+        if(!Schema::hasColumn('system_data_field_types', 'hidden'))
158
+        {
157 159
             Schema::table('system_cust_data_types', function(Blueprint $table) {
158 160
                 $table->boolean('hidden')
159 161
                     ->default(0)
@@ -165,7 +167,8 @@  discard block
 block discarded – undo
165 167
     //  Update the File links table - add cust_id and note column
166 168
     private function addColumnsToFileLinksTable()
167 169
     {
168
-        if(!Schema::hasColumn('file_links', 'cust_id')) {
170
+        if(!Schema::hasColumn('file_links', 'cust_id'))
171
+        {
169 172
             Schema::table('file_links', function(Blueprint $table) {
170 173
                 $table->integer('cust_id')
171 174
                     ->unsigned()
@@ -174,7 +177,8 @@  discard block
 block discarded – undo
174 177
                 $table->foreign('cust_id')->references('cust_id')->on('customers')->onUpdate('cascade')->onDelete('cascade');
175 178
             });
176 179
         }
177
-        if(!Schema::hasColumn('file_links', 'note')) {
180
+        if(!Schema::hasColumn('file_links', 'note'))
181
+        {
178 182
             Schema::table('file_links', function(Blueprint $table) {
179 183
                 $table->longText('note')
180 184
                     ->nullable()
@@ -182,7 +186,8 @@  discard block
 block discarded – undo
182 186
             });
183 187
             //  Migrate the instructions from the old table to the new column
184 188
             $instructions = DB::select('SELECT * FROM `file_link_instructions`');
185
-            foreach($instructions as $ins) {
189
+            foreach($instructions as $ins)
190
+            {
186 191
                 FileLinks::find($ins->link_id)->update([
187 192
                     'note' => $ins->instruction
188 193
                 ]);
@@ -193,7 +198,8 @@  discard block
 block discarded – undo
193 198
     //  Add Notes column to the file links files table
194 199
     private function addNotesColumnToFileLinkFiles()
195 200
     {
196
-        if(!Schema::hasColumn('file_link_files', 'note')) {
201
+        if(!Schema::hasColumn('file_link_files', 'note'))
202
+        {
197 203
             Schema::table('file_link_files', function(Blueprint $table) {
198 204
                 $table->longText('note')
199 205
                     ->nullable()
@@ -201,7 +207,8 @@  discard block
 block discarded – undo
201 207
             });
202 208
             //  Migrate the existing notes to the new table
203 209
             $notes = DB::select('SELECT * FROM `file_link_notes`');
204
-            foreach($notes as $note) {
210
+            foreach($notes as $note)
211
+            {
205 212
                 FileLinkFiles::where('file_id', $note->file_id)->update([
206 213
                     'note' => $note->note
207 214
                 ]);
@@ -212,7 +219,8 @@  discard block
 block discarded – undo
212 219
     //  Add the documentation column to the tech tips table
213 220
     private function migrateSystemDocumentation()
214 221
     {
215
-        if(!Schema::hasColumn('tech_tips', 'tip_type_id')) {
222
+        if(!Schema::hasColumn('tech_tips', 'tip_type_id'))
223
+        {
216 224
             Schema::table('tech_tips', function(Blueprint $table) {
217 225
                 $table->bigInteger('tip_type_id')->unsigned()->after('public')->default(1);
218 226
                 $table->foreign('tip_type_id')->references('tip_type_id')->on('tech_tip_types')->onUpdate('cascade');
@@ -220,7 +228,8 @@  discard block
 block discarded – undo
220 228
 
221 229
             //  Move all of the system files over to the tech tips table
222 230
             $sysFiles = DB::select('SELECT * FROM `system_files`');
223
-            foreach($sysFiles as $sysFile) {
231
+            foreach($sysFiles as $sysFile)
232
+            {
224 233
                 $newTip = TechTips::create([
225 234
                     'user_id'       => $sysFile->user_id,
226 235
                     'public'        => 0,
@@ -314,7 +323,8 @@  discard block
 block discarded – undo
314 323
     //  Remove the system files and system file types table
315 324
     private function removeSystemFilesTables()
316 325
     {
317
-        if(Schema::hasTable('system_files')) {
326
+        if(Schema::hasTable('system_files'))
327
+        {
318 328
             Schema::table('system_files', function(Blueprint $table) {
319 329
                 $table->dropForeign(['sys_id']);
320 330
                 $table->dropForeign(['type_id']);
@@ -360,7 +370,8 @@  discard block
 block discarded – undo
360 370
     //  Add soft deletes to tech tips table to prevent accidental deletes
361 371
     private function addSoftDeleteToTechTips()
362 372
     {
363
-        if (!Schema::hasColumn('tech_tips', 'deleted_at')) {
373
+        if (!Schema::hasColumn('tech_tips', 'deleted_at'))
374
+        {
364 375
             Schema::table('tech_tips', function (Blueprint $table) {
365 376
                 $table->softDeletes()->after('description');
366 377
             });
Please login to merge, or discard this patch.
app/Http/Controllers/TechTips/TechTipsController.php 1 patch
Braces   +18 added lines, -10 removed lines patch added patch discarded remove patch
@@ -63,14 +63,17 @@  discard block
 block discarded – undo
63 63
         Log::debug('request Data -> ', $request->toArray());
64 64
 
65 65
         //  See if there are any search paramaters entered
66
-        if (!$request->search['searchText'] && !isset($request->search['articleType']) && !isset($request->search['systemType'])) {
66
+        if (!$request->search['searchText'] && !isset($request->search['articleType']) && !isset($request->search['systemType']))
67
+        {
67 68
             //  No search paramaters, send all tech tips
68 69
             $tips = new TechTipsCollection(
69 70
                 TechTips::orderBy('created_at', 'DESC')
70 71
                     ->with('SystemTypes')
71 72
                     ->paginate($request->pagination['perPage'])
72 73
             );
73
-        } else {
74
+        }
75
+        else
76
+        {
74 77
             $article = isset($request->search['articleType']) ? true : false;
75 78
             $system  = isset($request->search['systemType'])  ? true : false;
76 79
             //  Search paramaters, filter results
@@ -158,7 +161,8 @@  discard block
 block discarded – undo
158 161
         $save = $receiver->receive();
159 162
 
160 163
         //  See if the uploade has finished
161
-        if ($save->isFinished()) {
164
+        if ($save->isFinished())
165
+        {
162 166
             $this->saveFile($save->getFile());
163 167
 
164 168
             return 'uploaded successfully';
@@ -264,8 +268,7 @@  discard block
 block discarded – undo
264 268
         if(!$tipData->supressEmail)
265 269
         {
266 270
             $details = TechTips::find($tipID);
267
-            $users = User::where('active', 1)->whereHas('UserSettings', function($query)
268
-            {
271
+            $users = User::where('active', 1)->whereHas('UserSettings', function($query) {
269 272
                 $query->where('em_tech_tip', 1);
270 273
             })->get();
271 274
 
@@ -279,7 +282,8 @@  discard block
 block discarded – undo
279 282
     //  Details controller - will move to the show controller with just the tech tip id
280 283
     public function details($id, $subject)
281 284
     {
282
-        if (session()->has('newTipFile')) {
285
+        if (session()->has('newTipFile'))
286
+        {
283 287
             session()->forget('newTipFile');
284 288
         }
285 289
 
@@ -309,7 +313,8 @@  discard block
 block discarded – undo
309 313
     //  Add or remove this tip as a favorite of the user
310 314
     public function toggleFav($action, $id)
311 315
     {
312
-        switch ($action) {
316
+        switch ($action)
317
+        {
313 318
             case 'add':
314 319
                 TechTipFavs::create([
315 320
                     'user_id' => Auth::user()->user_id,
@@ -337,7 +342,8 @@  discard block
 block discarded – undo
337 342
         $this->authorize('hasAccess', 'edit_tech_tip');
338 343
         $tipData = TechTips::where('tip_id', $id)->with('User')->with('SystemTypes')->with('TechTipTypes')->first();
339 344
 
340
-        if (!$tipData) {
345
+        if (!$tipData)
346
+        {
341 347
             return view('tips.tipNotFound');
342 348
         }
343 349
 
@@ -370,7 +376,8 @@  discard block
 block discarded – undo
370 376
         $receiver = new FileReceiver('file', $request, HandlerFactory::classFromRequest($request));
371 377
 
372 378
         //  Verify if there is a file to be processed or not
373
-        if ($receiver->isUploaded() === false || $request->_completed) {
379
+        if ($receiver->isUploaded() === false || $request->_completed)
380
+        {
374 381
             $this->storeUpdatedTip($request, $id);
375 382
             Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id);
376 383
             return response()->json(['tip_id' => $id]);
@@ -380,7 +387,8 @@  discard block
 block discarded – undo
380 387
         $save = $receiver->receive();
381 388
 
382 389
         //  See if the uploade has finished
383
-        if ($save->isFinished()) {
390
+        if ($save->isFinished())
391
+        {
384 392
             $this->saveFile($save->getFile(), $id);
385 393
 
386 394
             return 'uploaded successfully';
Please login to merge, or discard this patch.
routes/web.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -62,8 +62,7 @@  discard block
 block discarded – undo
62 62
 /*
63 63
 *   Customer Routes
64 64
 */
65
-Route::prefix('customer')->name('customer.')->group(function()
66
-{
65
+Route::prefix('customer')->name('customer.')->group(function() {
67 66
     //  Customer Files
68 67
     Route::resource('files',                   'Customers\CustomerFilesController');
69 68
     //  Custome Notes
@@ -89,8 +88,7 @@  discard block
 block discarded – undo
89 88
 */
90 89
 Route::resource('tips',                       'TechTips\TechTipsController');
91 90
 Route::post('submit-edit/{id}',               'TechTips\TechTipsController@update')      ->name('tips.submit-edit');
92
-Route::prefix('tip')->name('tip.')->group(function()
93
-{
91
+Route::prefix('tip')->name('tip.')->group(function() {
94 92
     Route::resource('comments',               'TechTips\TechTipCommentsController');
95 93
     Route::get('search',                      'TechTips\TechTipsController@search')      ->name('search');
96 94
     Route::get('details/{id}/{name}',         'TechTips\TechTipsController@details')     ->name('details');
Please login to merge, or discard this patch.