Completed
Push — master ( 5479a4...c60d27 )
by claudio
07:16 queued 38s
created
app/Console/Commands/Optimise/Path.php 1 patch
Braces   +13 added lines, -8 removed lines patch added patch discarded remove patch
@@ -50,12 +50,16 @@  discard block
 block discarded – undo
50 50
     {
51 51
         $path = new Path(tempnam(sys_get_temp_dir(), 'OPT')); //TODO check the return in case of errors this return false on failure
52 52
         unlink($path->getPath()); //remove file to create a dir
53
-        if (file_exists($path->getPath()))
54
-            throw new OptimiseException('problem during creation of tmp dir (the directory already exists)');
55
-        if (!@mkdir($path->getPath()))
56
-            throw new OptimiseException('problem during creation of tmp dir (mkdir problem)');;
57
-        if (!is_dir($path->getPath()))
58
-            throw new OptimiseException('problem during creation of tmp dir (it is not possible to create directory)');
53
+        if (file_exists($path->getPath())) {
54
+                    throw new OptimiseException('problem during creation of tmp dir (the directory already exists)');
55
+        }
56
+        if (!@mkdir($path->getPath())) {
57
+                    throw new OptimiseException('problem during creation of tmp dir (mkdir problem)');
58
+        }
59
+        ;
60
+        if (!is_dir($path->getPath())) {
61
+                    throw new OptimiseException('problem during creation of tmp dir (it is not possible to create directory)');
62
+        }
59 63
         return $path;
60 64
     }
61 65
 
@@ -80,8 +84,9 @@  discard block
 block discarded – undo
80 84
      */
81 85
     public function __destruct()
82 86
     {
83
-        if ($this->path && is_dir($this->path) && !self::delTree($this->path))
84
-            throw new OptimiseException('problems during removing of path directory');
87
+        if ($this->path && is_dir($this->path) && !self::delTree($this->path)) {
88
+                    throw new OptimiseException('problems during removing of path directory');
89
+        }
85 90
     }
86 91
 
87 92
     /**
Please login to merge, or discard this patch.
app/Console/Commands/Optimise/Solver.php 1 patch
Braces   +60 added lines, -40 removed lines patch added patch discarded remove patch
@@ -104,8 +104,9 @@  discard block
 block discarded – undo
104 104
      */
105 105
     static private function checkGlpsol()
106 106
     {
107
-        if (!(`which glpsol`))
108
-            throw new OptimiseException('glpsol is not installed');
107
+        if (!(`which glpsol`)) {
108
+                    throw new OptimiseException('glpsol is not installed');
109
+        }
109 110
     }
110 111
 
111 112
     /**
@@ -193,8 +194,9 @@  discard block
 block discarded – undo
193 194
      */
194 195
     public function setTimeSlots($timeSlots)
195 196
     {
196
-        if (!is_int($timeSlots) || $timeSlots <= 0)
197
-            throw new OptimiseException('$timeSlots is not integer or it is not >0');
197
+        if (!is_int($timeSlots) || $timeSlots <= 0) {
198
+                    throw new OptimiseException('$timeSlots is not integer or it is not >0');
199
+        }
198 200
 
199 201
         $this->timeSlots = $timeSlots;
200 202
         return $this;
@@ -215,8 +217,9 @@  discard block
 block discarded – undo
215 217
      */
216 218
     public function setMaxTimeSlots($maxTimeSlots)
217 219
     {
218
-        if (!is_int($maxTimeSlots) || $maxTimeSlots <= 0)
219
-            throw new OptimiseException('$maxTimeSlots is not integer or it is not >0');
220
+        if (!is_int($maxTimeSlots) || $maxTimeSlots <= 0) {
221
+                    throw new OptimiseException('$maxTimeSlots is not integer or it is not >0');
222
+        }
220 223
 
221 224
         $this->maxTimeSlots = $maxTimeSlots;
222 225
         return $this;
@@ -238,12 +241,14 @@  discard block
 block discarded – undo
238 241
     public function setMeetingsAvailability($meetingsAvailability)
239 242
     {
240 243
         $meetings = array_keys($meetingsAvailability);
241
-        if (array_diff($meetings, $this->meetings))
242
-            throw new OptimiseException('meetings different from meetings set');
244
+        if (array_diff($meetings, $this->meetings)) {
245
+                    throw new OptimiseException('meetings different from meetings set');
246
+        }
243 247
         foreach ($meetingsAvailability as $key => $meetingsAvailabilityS) {
244 248
             $timeSlots = array_keys($meetingsAvailabilityS);
245
-            if (count($timeSlots) != $this->timeSlots)
246
-                throw new OptimiseException('timeSlots different from timeSlots set');
249
+            if (count($timeSlots) != $this->timeSlots) {
250
+                            throw new OptimiseException('timeSlots different from timeSlots set');
251
+            }
247 252
             $meetingsAvailability[$key] = self::arrayPad($meetingsAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0);
248 253
         }
249 254
 
@@ -260,8 +265,9 @@  discard block
 block discarded – undo
260 265
     static private function arrayPad(array $array, $len, $pad)
261 266
     {
262 267
         $len = $len - count($array);
263
-        for ($i = 0; $i < $len; $i++)
264
-            $array[] = $pad;
268
+        for ($i = 0; $i < $len; $i++) {
269
+                    $array[] = $pad;
270
+        }
265 271
         return $array;
266 272
     }
267 273
 
@@ -287,8 +293,9 @@  discard block
 block discarded – undo
287 293
         }
288 294
         foreach ($meetingsDuration as $duration) {
289 295
             $duration = (int)$duration; //TODO fix this (fix for optimise)
290
-            if (!is_int($duration) || $duration <= 0)
291
-                throw new OptimiseException('duration is not integer or it is not >0');
296
+            if (!is_int($duration) || $duration <= 0) {
297
+                            throw new OptimiseException('duration is not integer or it is not >0');
298
+            }
292 299
         }
293 300
 
294 301
         $this->meetingsDuration = $meetingsDuration;
@@ -311,12 +318,14 @@  discard block
 block discarded – undo
311 318
     public function setUsersAvailability($usersAvailability)
312 319
     {
313 320
         $users = array_keys($usersAvailability);
314
-        if (array_diff($users, $this->users))
315
-            throw new OptimiseException('users different from users set');
321
+        if (array_diff($users, $this->users)) {
322
+                    throw new OptimiseException('users different from users set');
323
+        }
316 324
         foreach ($usersAvailability as $key => $usersAvailabilityS) {
317 325
             $timeSlots = array_keys($usersAvailabilityS);
318
-            if (count($timeSlots) != $this->timeSlots)
319
-                throw new OptimiseException('timeSlots different from timeSlots set');
326
+            if (count($timeSlots) != $this->timeSlots) {
327
+                            throw new OptimiseException('timeSlots different from timeSlots set');
328
+            }
320 329
 
321 330
             $usersAvailability[$key] = self::arrayPad($usersAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0);
322 331
         }
@@ -341,12 +350,14 @@  discard block
 block discarded – undo
341 350
     public function setUsersMeetings($usersMeetings)
342 351
     {
343 352
         $users = array_keys($usersMeetings);
344
-        if (array_diff($users, $this->users))
345
-            throw new OptimiseException('users different from users set');
353
+        if (array_diff($users, $this->users)) {
354
+                    throw new OptimiseException('users different from users set');
355
+        }
346 356
         foreach ($usersMeetings as $usersMeetingsS) {
347 357
             $meetings = array_keys($usersMeetingsS);
348
-            if (array_diff($meetings, $this->meetings))
349
-                throw new OptimiseException('meetings different from meetings set');
358
+            if (array_diff($meetings, $this->meetings)) {
359
+                            throw new OptimiseException('meetings different from meetings set');
360
+            }
350 361
         }
351 362
 
352 363
         $this->usersMeetings = $usersMeetings;
@@ -363,8 +374,9 @@  discard block
 block discarded – undo
363 374
         $this->writeModelFile();
364 375
         $event = $this->schedule->exec('glpsol --math ' . $this->path->getModelPath())->sendOutputTo($this->path->getOutputPath())->after(function () {
365 376
         }); //this just to execute in foreground
366
-        if ($event->isDue($this->laravel))
367
-            $event->run($this->laravel);
377
+        if ($event->isDue($this->laravel)) {
378
+                    $event->run($this->laravel);
379
+        }
368 380
         //TODO catch glpsol errors
369 381
         return $this;
370 382
     }
@@ -398,9 +410,10 @@  discard block
 block discarded – undo
398 410
      */
399 411
     private function checkArrayProprieties($proprieties)
400 412
     {
401
-        foreach ($proprieties as $propriety)
402
-            if (count($this->$propriety) == 0)
413
+        foreach ($proprieties as $propriety) {
414
+                    if (count($this->$propriety) == 0)
403 415
                 throw new OptimiseException($propriety . ' is not set correctly');
416
+        }
404 417
     }
405 418
 
406 419
     /**
@@ -409,9 +422,10 @@  discard block
 block discarded – undo
409 422
      */
410 423
     private function checkIntProprieties($proprieties)
411 424
     {
412
-        foreach ($proprieties as $propriety)
413
-            if (!is_int($this->$propriety) || $this->$propriety <= 0)
425
+        foreach ($proprieties as $propriety) {
426
+                    if (!is_int($this->$propriety) || $this->$propriety <= 0)
414 427
                 throw new OptimiseException($propriety . ' is not set correctly');
428
+        }
415 429
     }
416 430
 
417 431
     /**
@@ -448,8 +462,9 @@  discard block
 block discarded – undo
448 462
     static private function writeCSV($file, $data, $heading, \Closure $writer)
449 463
     {
450 464
         $fp = @fopen($file, 'w');
451
-        if (!$fp)
452
-            throw new OptimiseException('problem during creation of a file');
465
+        if (!$fp) {
466
+                    throw new OptimiseException('problem during creation of a file');
467
+        }
453 468
 
454 469
         fputcsv($fp, $heading);
455 470
 
@@ -511,8 +526,9 @@  discard block
 block discarded – undo
511 526
     {
512 527
         $f = function ($fp, $data) {
513 528
             foreach ($data as $key => $field) {
514
-                foreach ($field as $key2 => $field2)
515
-                    fputcsv($fp, [$key, $key2, $field2]);
529
+                foreach ($field as $key2 => $field2) {
530
+                                    fputcsv($fp, [$key, $key2, $field2]);
531
+                }
516 532
             }
517 533
         };
518 534
 
@@ -543,8 +559,9 @@  discard block
 block discarded – undo
543 559
         $strReplaceS = array('{USERS_PATH}', '{MEETINGS_PATH}', '{USER_AVAILABILITY_PATH}', '{MEETINGS_AVAILABILITY_PATH}', '{USER_MEETINGS_PATH}', '{MEETINGS_DURATION_PATH}', '{TIME_SLOTS}', '{MAX_TIME_SLOTS}', '{X_OUT_PATH}', '{Y_OUT_PATH}');
544 560
         $strReplaceR = array($this->path->getUsersPath(), $this->path->getMeetingsPath(), $this->path->getUsersAvailabilityPath(), $this->path->getMeetingsAvailabilityPath(), $this->path->getUsersMeetingsPath(), $this->path->getMeetingsDurationPath(), $this->timeSlots, $this->maxTimeSlots, $this->path->getXPath(), $this->path->getYPath());
545 561
         $f = @fopen($this->path->getModelPath(), "w");
546
-        if (!$f)
547
-            throw new OptimiseException('problem during creation of a file');
562
+        if (!$f) {
563
+                    throw new OptimiseException('problem during creation of a file');
564
+        }
548 565
         fwrite($f, str_replace($strReplaceS, $strReplaceR, file_get_contents(__DIR__ . "/model.stub")));
549 566
         fclose($f);
550 567
     }
@@ -565,12 +582,14 @@  discard block
 block discarded – undo
565 582
      */
566 583
     static private function readCSVFile($file)
567 584
     {
568
-        if (!file_exists($file) || !filesize($file))
569
-            throw new OptimiseException('no results file');
585
+        if (!file_exists($file) || !filesize($file)) {
586
+                    throw new OptimiseException('no results file');
587
+        }
570 588
 
571 589
         $handle = @fopen($file, "r");
572
-        if (!$handle)
573
-            throw new OptimiseException('problems during reading the file');
590
+        if (!$handle) {
591
+                    throw new OptimiseException('problems during reading the file');
592
+        }
574 593
 
575 594
         $ret = [];
576 595
         fgetcsv($handle); //skip head
@@ -603,8 +622,9 @@  discard block
 block discarded – undo
603 622
      */
604 623
     public function getOutput()
605 624
     {
606
-        if (!($data = file_get_contents($this->path->getOutputPath())))
607
-            throw new OptimiseException('problems during reading the file');
625
+        if (!($data = file_get_contents($this->path->getOutputPath()))) {
626
+                    throw new OptimiseException('problems during reading the file');
627
+        }
608 628
         return $data;
609 629
     }
610 630
 }
611 631
\ No newline at end of file
Please login to merge, or discard this patch.
app/Console/Commands/SyncCaldav/SyncCaldav.php 1 patch
Braces   +14 added lines, -10 removed lines patch added patch discarded remove patch
@@ -59,10 +59,11 @@  discard block
 block discarded – undo
59 59
     {
60 60
         //
61 61
         $calendarId = $this->argument('calendarId');
62
-        if (is_numeric($calendarId))
63
-            $this->makeForeground(Caldav::findOrFail($calendarId));
64
-        else
65
-            $this->syncAll();
62
+        if (is_numeric($calendarId)) {
63
+                    $this->makeForeground(Caldav::findOrFail($calendarId));
64
+        } else {
65
+                    $this->syncAll();
66
+        }
66 67
     }
67 68
 
68 69
     /**
@@ -82,13 +83,15 @@  discard block
 block discarded – undo
82 83
         if ($this->option('background')) {
83 84
             \Log::debug(self::BACKGROUND_MOD_MEX);
84 85
             $this->info(self::BACKGROUND_MOD_MEX);
85
-            foreach ($calendars as $calendar)
86
-                $this->makeBackground($calendar);
86
+            foreach ($calendars as $calendar) {
87
+                            $this->makeBackground($calendar);
88
+            }
87 89
             \Log::debug(self::BACKGROUND_COMPLETED_MEX);
88 90
             $this->info(self::BACKGROUND_COMPLETED_MEX);
89
-        } else
90
-            foreach ($calendars as $calendar)
91
+        } else {
92
+                    foreach ($calendars as $calendar)
91 93
                 $this->makeForeground($calendar);
94
+        }
92 95
     }
93 96
 
94 97
     /**
@@ -98,7 +101,8 @@  discard block
 block discarded – undo
98 101
     private function makeBackground(Caldav $calendar)
99 102
     {
100 103
         $event = $this->schedule->command('sync:caldav ' . $calendar->calendar_id)->withoutOverlapping();
101
-        if ($event->isDue($this->laravel))
102
-            $event->run($this->laravel);
104
+        if ($event->isDue($this->laravel)) {
105
+                    $event->run($this->laravel);
106
+        }
103 107
     }
104 108
 }
Please login to merge, or discard this patch.
app/Employee.php 1 patch
Braces   +8 added lines, -6 removed lines patch added patch discarded remove patch
@@ -97,14 +97,16 @@
 block discarded – undo
97 97
     public function getEmailForPasswordReset()
98 98
     {
99 99
         list(, $caller) = debug_backtrace(false);
100
-        if (isset($caller['class']))
101
-            $caller = explode('\\', $caller['class']);
102
-        else
103
-            $caller = '';
100
+        if (isset($caller['class'])) {
101
+                    $caller = explode('\\', $caller['class']);
102
+        } else {
103
+                    $caller = '';
104
+        }
104 105
 
105 106
         //check if this function is called by email sender
106
-        if ((count($caller) && $caller[count($caller) - 1] == 'PasswordBroker') || (defined('HHVM_VERSION') && $caller == ''))
107
-            return $this->email;
107
+        if ((count($caller) && $caller[count($caller) - 1] == 'PasswordBroker') || (defined('HHVM_VERSION') && $caller == '')) {
108
+                    return $this->email;
109
+        }
108 110
         //return unique identify for token repository
109 111
         return $this->email . $this->company->id;
110 112
     }
Please login to merge, or discard this patch.
app/Group.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -45,8 +45,9 @@
 block discarded – undo
45 45
 
46 46
     public function getPlannerNameAttribute()
47 47
     {
48
-        if (is_object($this->planner) && $this->planner->exists)
49
-            return $this->planner->name;
48
+        if (is_object($this->planner) && $this->planner->exists) {
49
+                    return $this->planner->name;
50
+        }
50 51
         return null;
51 52
     }
52 53
 
Please login to merge, or discard this patch.
app/Http/Controllers/Companies/Employees/EmployeesController.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -50,8 +50,9 @@  discard block
 block discarded – undo
50 50
         //
51 51
         $company = \Auth::user();
52 52
         $input = $request->all();
53
-        if (isset($input['password']))
54
-            $input['password'] = bcrypt($input['password']);
53
+        if (isset($input['password'])) {
54
+                    $input['password'] = bcrypt($input['password']);
55
+        }
55 56
         $employee = $company->employees()->create($input);
56 57
         return $employee;
57 58
     }
@@ -83,8 +84,9 @@  discard block
 block discarded – undo
83 84
         $employee = Employee::findOrFail($id);
84 85
         $this->authorize($employee);
85 86
         $input = $request->all();
86
-        if (isset($input['password']))
87
-            $input['password'] = bcrypt($input['password']);
87
+        if (isset($input['password'])) {
88
+                    $input['password'] = bcrypt($input['password']);
89
+        }
88 90
         $employee->update($input);
89 91
         return $employee;
90 92
     }
Please login to merge, or discard this patch.
app/Http/Controllers/Companies/Groups/EmployeesController.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -69,8 +69,9 @@
 block discarded – undo
69 69
         $employee = Employee::findOrFail($employeeId);
70 70
         $this->authorize($employee);
71 71
         $group = Group::findOrFail($groupId);
72
-        if (!$employee->belongsToGroup($group))
73
-            return Response::json(['error' => 'employId <> groupId'], 404);
72
+        if (!$employee->belongsToGroup($group)) {
73
+                    return Response::json(['error' => 'employId <> groupId'], 404);
74
+        }
74 75
         $employee->groups()->detach($groupId);
75 76
         return $group->employees;
76 77
     }
Please login to merge, or discard this patch.
app/Http/Controllers/Employees/Auth/AuthController.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -79,8 +79,9 @@
 block discarded – undo
79 79
         if ($request->input('remember', false)) {
80 80
             config(['jwt.ttl' => '43200']); //30 days
81 81
             $this->custom = array_merge($this->custom, ['remember' => 'true']);
82
-        } else
83
-            $this->custom = array_merge($this->custom, ['remember' => 'false']);
82
+        } else {
83
+                    $this->custom = array_merge($this->custom, ['remember' => 'false']);
84
+        }
84 85
 
85 86
         return $this->postLoginOriginal($request);
86 87
     }
Please login to merge, or discard this patch.
app/Http/Controllers/Employees/Calendars/CalendarsController.php 1 patch
Braces   +9 added lines, -6 removed lines patch added patch discarded remove patch
@@ -66,8 +66,9 @@  discard block
 block discarded – undo
66 66
         $employee = \Auth::user();
67 67
         $input = $request->all();
68 68
         $calendar = $employee->calendars()->create($input);
69
-        if (isset($input['password']))
70
-            $input['password'] = \Crypt::encrypt($input['password']);
69
+        if (isset($input['password'])) {
70
+                    $input['password'] = \Crypt::encrypt($input['password']);
71
+        }
71 72
         $calendar->caldav()->create($input);
72 73
         //TODO test
73 74
         //TODO validator
@@ -120,15 +121,17 @@  discard block
 block discarded – undo
120 121
         if ($caldav) {
121 122
             $this->validateCaldav($request);
122 123
         }
123
-        if (isset($input['password']))
124
-            $input['password'] = \Crypt::encrypt($input['password']);
124
+        if (isset($input['password'])) {
125
+                    $input['password'] = \Crypt::encrypt($input['password']);
126
+        }
125 127
         $calendar->update($input);
126 128
         //TODO test
127 129
         //TODO validator
128 130
         //TODO check if caldav exists?
129 131
 
130
-        if ($caldav)
131
-            $caldav->update($input);
132
+        if ($caldav) {
133
+                    $caldav->update($input);
134
+        }
132 135
         return $calendar;
133 136
     }
134 137
 
Please login to merge, or discard this patch.