scci / security-employee-tracker

app/Console/Commands/DeleteSeparatedAndDestroyedUsers.php

Doc Comments +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 
     /**
      * Return list of users who were destroyed.
-     * @return mixed
+     * @return Collection
      */
     public function getDestroyed()
     {

Spacing +3 added lines, -3 removed lines

@@ -56,14 +56,14 @@
 
     public function setDestroyed()
     {
-        $deadmanList = User::where(function ($q) {
+        $deadmanList = User::where(function($q) {
                 $q->where('status', 'separated')->orWhere('status', 'destroyed');
             })
-            ->whereBetween('destroyed_date', [Carbon::today(),Carbon::today()->addDays(6)])
+            ->whereBetween('destroyed_date', [Carbon::today(), Carbon::today()->addDays(6)])
             ->get();
 
         foreach ($deadmanList as $user) {
-            Storage::deleteDirectory('user_'.$user->id);
+            Storage::deleteDirectory('user_' . $user->id);
             $user->delete();
         }
 

app/Console/Commands/RenewTraining.php

Doc Comments +2 added lines, -2 removed lines

@@ -129,8 +129,8 @@
 
     /**
      * @param $trainingUser
-     * @param $dueDate
-     * @return static
+     * @param Carbon $dueDate
+     * @return TrainingUser
      */
     private function createRecord($trainingUser, $dueDate)
     {

app/Console/Commands/SendReminders.php

Doc Comments +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
 
     /**
      * Take a list of notes and return a list of supervisors related to those notes.
-     * @return static
+     * @return Collection
      */
     private function getSupervisors()
     {

Spacing +4 added lines, -4 removed lines

@@ -70,16 +70,16 @@
 
             $newNotes = new Collection();
 
-            $this->trainingUsers->each( function( $item, $key ) use ($supervisor, $newNotes) {
-                if ( $item->user->supervisor_id == $supervisor->id ) {
+            $this->trainingUsers->each(function($item, $key) use ($supervisor, $newNotes) {
+                if ($item->user->supervisor_id == $supervisor->id) {
                     $newNotes->push($item);
                 }
             });
 
             if (!$newNotes->isEmpty()) {
-                Mail::send('emails.supervisor_reminder', ['notes' => $newNotes], function ($m) use ($supervisor) {
+                Mail::send('emails.supervisor_reminder', ['notes' => $newNotes], function($m) use ($supervisor) {
                     $m->to($supervisor->email, $supervisor->userFullName)
-                        ->subject($supervisor->email.' Training that your employees need to complete.');
+                        ->subject($supervisor->email . ' Training that your employees need to complete.');
                 });
             }
 

app/Console/Commands/UpdateDuty.php

Doc Comments +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
 
     /**
      * Execute the console command.
-     * @return mixed
+     * @return UpdateDuty
      */
     public function handle()
     {
@@ -112,7 +112,7 @@ 
 
     /**
      * @param $duty
-     * @param $date
+     * @param Carbon $date
      * @return string
      */
     private function generateICS($duty, $date)
@@ -168,7 +168,7 @@ 
     /**
      * @param $duty
      * @param $usersDateArray
-     * @return mixed
+     * @return UpdateDuty
      */
     private function sendUsersUpcomingEmailNotification($duty, $usersDateArray)
     {

Spacing +7 added lines, -7 removed lines

@@ -47,8 +47,8 @@ 
 
     private function processEmailList($emailList, $duty)
     {
-        foreach($emailList as $usersDateArray) {
-            if ($usersDateArray['date'] == Carbon::today()->format('Y-m-d')){
+        foreach ($emailList as $usersDateArray) {
+            if ($usersDateArray['date'] == Carbon::today()->format('Y-m-d')) {
                 foreach ($usersDateArray['users'] as $user) {
                     $this->sendTodaysNotification($user, $duty);
                 }
@@ -71,7 +71,7 @@ 
         Mail::send('emails.duty_today', [
             'user' => $user,
             'duty' => $duty
-        ], function ($m) use ($user, $duty) {
+        ], function($m) use ($user, $duty) {
             $m->to($user->email, $user->userFullName)
                 ->subject('Reminder: You have ' . $duty->name . ' security check today.');
         });
@@ -84,9 +84,9 @@ 
             'user' => $user,
             'date' => $date,
             'duty' => $duty
-        ], function ($m) use ($user, $duty, $date) {
+        ], function($m) use ($user, $duty, $date) {
 
-            $filename = $this->generateICS($duty, Carbon::createFromFormat('Y-m-d',$date));
+            $filename = $this->generateICS($duty, Carbon::createFromFormat('Y-m-d', $date));
 
             if ($duty->cycle = 'daily') {
                 $subject = "You have $duty->name security check on $date.";
@@ -106,8 +106,8 @@ 
      */
     private function isReadyForNotification($duty, $usersDateArray)
     {
-        return ( $duty->cycle == 'weekly' && $usersDateArray['date'] == Carbon::today()->addWeeks(2)->format('Y-m-d') )
-            || ( $duty->cycle == 'daily'  && $usersDateArray['date'] == Carbon::today()->addWeeks(1)->format('Y-m-d') );
+        return ($duty->cycle == 'weekly' && $usersDateArray['date'] == Carbon::today()->addWeeks(2)->format('Y-m-d'))
+            || ($duty->cycle == 'daily' && $usersDateArray['date'] == Carbon::today()->addWeeks(1)->format('Y-m-d'));
     }
 
     /**

app/Handlers/Calendar/Calendar.php

Doc Comments +3 added lines

@@ -62,6 +62,9 @@
         }
     }
 
+    /**
+     * @param string $date
+     */
     private function pushToArray($list, array $columnName, $date) {
         $array = [];
 

Spacing +12 added lines, -12 removed lines

@@ -16,7 +16,7 @@ 
     public function __construct()
     {
         $this->start = Carbon::today()->subWeeks(1);
-        $this->end =  Carbon::today()->addMonths(2);
+        $this->end = Carbon::today()->addMonths(2);
         $this->calendarArray = [];
 
         $this->generateCalendarItems();
@@ -44,12 +44,12 @@ 
             $currentDate = $date->format('Y-m-d');
 
             $separatedArray = $this->pushToArray($separatedList, ['destroyed_date'], $currentDate);
-            $travelsArray = $this->pushToArray($travelList, ['leave_date','return_date'], $currentDate);
+            $travelsArray = $this->pushToArray($travelList, ['leave_date', 'return_date'], $currentDate);
             $trainingUsersArray = $this->pushToArray($trainingUsersList, ['due_date'], $currentDate);
             $newUserArray = $this->pushToArray($newUserList, ['created_at'], $currentDate);
             $trainingUsersArray = $this->groupUsersForTraining($trainingUsersArray);
 
-            if ( (!empty($separatedArray) || !empty($travelsArray) || !empty($trainingUsersArray) || !empty($newUserArray)) || $currentDate == Carbon::today()->format('Y-m-d') ) {
+            if ((!empty($separatedArray) || !empty($travelsArray) || !empty($trainingUsersArray) || !empty($newUserArray)) || $currentDate == Carbon::today()->format('Y-m-d')) {
                 $this->calendarArray[$i]['date'] = $currentDate;
                 $this->calendarArray[$i]['separated'] = $separatedArray;
                 $this->calendarArray[$i]['travel'] = $travelsArray;
@@ -67,7 +67,7 @@ 
 
 
 
-        foreach($list as $item) {
+        foreach ($list as $item) {
             foreach ($columnName as $column) {
                 $dbDate = $this->testForCarbonObject($item[$column]);
                 if ($date == $dbDate) {
@@ -86,7 +86,7 @@ 
     private function testForCarbonObject($date)
     {
         //check if format is YYYY-MM-DD
-        if (preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/",$date)) {
+        if (preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/", $date)) {
             return $date;
         } else if (get_class($date) == 'Carbon\Carbon') {
             return $date->format('Y-m-d');
@@ -98,14 +98,14 @@ 
     private function groupUsersForTraining($trainingUsers)
     {
         $array = array();
-        foreach($trainingUsers as $key => $item) {
+        foreach ($trainingUsers as $key => $item) {
             $array[$item['training_id']][$key] = $item;
         }
         ksort($array, SORT_NUMERIC);
 
-        foreach($array as $training) {
-            foreach($training as $trainingUser) {
-                $trainingUser['userLink'] = "<a href='" . url('user', $trainingUser->user_id) ."'>". $trainingUser->user->userFullName ."</a>";
+        foreach ($array as $training) {
+            foreach ($training as $trainingUser) {
+                $trainingUser['userLink'] = "<a href='" . url('user', $trainingUser->user_id) . "'>" . $trainingUser->user->userFullName . "</a>";
             }
         }
 
@@ -117,10 +117,10 @@ 
      */
     private function separatedList()
     {
-        return User::where( function ($q) {
+        return User::where(function($q) {
                 $q->where('status', 'separated')->orWhere('status', 'destroyed');
             })
-            ->whereBetween('destroyed_date', [$this->start,$this->end])
+            ->whereBetween('destroyed_date', [$this->start, $this->end])
             ->get();
     }
 
@@ -130,7 +130,7 @@ 
     private function travelsList()
     {
         return Travel::with('user')
-            ->where(function ($query) {
+            ->where(function($query) {
                 $query->whereBetween('leave_date', [$this->start, $this->end])
                     ->orWhereBetween('return_date', [$this->start, $this->end]);
             })

app/Handlers/Duty/DutyList.php

Doc Comments +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
     /**
      * @param array $dateArray
      * @param array $IDArray
-     * @param $type
+     * @param string $type
      */
     public function processSwapRequest(array $dateArray, array $IDArray, $type)
     {

app/Handlers/Duty/DutyUsers.php

Doc Comments +5 added lines, -5 removed lines

@@ -42,7 +42,7 @@ 
 
     /**
      * Generate a collection to be used for emails. View is either emails.duty_future or emails.duty_today
-     * @return mixed
+     * @return \Illuminate\Support\Collection
      */
     public function emailOutput()
     {
@@ -58,7 +58,7 @@ 
 
     /**
      * Get function for the list. List is stored on the helper class.
-     * @return mixed
+     * @return Collection
      */
     public function getList()
     {
@@ -76,7 +76,7 @@ 
 
     /**
      * Get the current user in our database who is working the duty roster
-     * @return mixed
+     * @return DutyUsers
      */
     public function getLastWorked()
     {
@@ -87,7 +87,7 @@ 
 
     /**
      * Get a list of all users for a specific duty sorted by the user's last name
-     * @return mixed
+     * @return DutyUsers
      */
     public function queryList()
     {
@@ -97,7 +97,7 @@ 
 
     /**
      * Take our list of users and merge them with dates so that each user is assigned a duty date.
-     * @return Collection
+     * @return DutyUsers
      */
     public function combineListWithDates()
     {

Indentation +5 added lines, -5 removed lines

@@ -25,11 +25,11 @@
         $newCollection = new Collection();
 
         foreach ($this->list as $entry) {
-			if(Gate::allows('view')) {
-				$rowvalue = "<a href='" . url( 'user', $entry['user']->id ) . "'>". $entry['user']->userFullName ."</a>";
-			} else {
-				$rowvalue = $entry['user']->userFullName;
-			}
+            if(Gate::allows('view')) {
+                $rowvalue = "<a href='" . url( 'user', $entry['user']->id ) . "'>". $entry['user']->userFullName ."</a>";
+            } else {
+                $rowvalue = $entry['user']->userFullName;
+            }
             $newCollection->push([
                 'row' => $rowvalue,
                 'id' => $entry['user']->id,

Spacing +5 added lines, -5 removed lines

@@ -25,8 +25,8 @@ 
         $newCollection = new Collection();
 
         foreach ($this->list as $entry) {
-			if(Gate::allows('view')) {
-				$rowvalue = "<a href='" . url( 'user', $entry['user']->id ) . "'>". $entry['user']->userFullName ."</a>";
+			if (Gate::allows('view')) {
+				$rowvalue = "<a href='" . url('user', $entry['user']->id) . "'>" . $entry['user']->userFullName . "</a>";
 			} else {
 				$rowvalue = $entry['user']->userFullName;
 			}
@@ -46,7 +46,7 @@ 
      */
     public function emailOutput()
     {
-        $collection = $this->list->map(function ($value, $key) {
+        $collection = $this->list->map(function($value, $key) {
             return [
                 'users' => new Collection([$value['user']]),
                 'date' => $value['date'],
@@ -127,9 +127,9 @@ 
             ->orderBy('date', 'ASC')
             ->get();
 
-        foreach($dutySwaps as $swap)
+        foreach ($dutySwaps as $swap)
         {
-            foreach($this->list as $key => $entry)
+            foreach ($this->list as $key => $entry)
             {
                 if ($swap->date == $entry['date']) {
                     $this->list[$key] = [

app/Http/Controllers/AttachmentController.php

Doc Comments +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
     /**
      * Currently only called from the Training page via the sidebar upload.
      * @param $request
-     * @return Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function store(Request $request) {
         $data = $request->all();
@@ -46,7 +46,7 @@ 
     /**
      * Let the browser download the file.
      * @param $fileId
-     * @return mixed
+     * @return Response
      */
     public function show($fileId)
     {
@@ -76,7 +76,7 @@ 
     /**
      * Remove the specified resource from storage.
      * @param  $fileId
-     * @return Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function destroy($fileId)
     {

Spacing +3 added lines, -3 removed lines

@@ -22,11 +22,11 @@ 
 
         $encrypt = false;
 
-        if( array_key_exists('encrypt', $data)) {
+        if (array_key_exists('encrypt', $data)) {
             $encrypt = $data['encrypt'];
         }
 
-        if ($data['type'] == 'training'){
+        if ($data['type'] == 'training') {
             $model = Training::findOrFail($data['id']);
         } else if ($data['type'] == 'user') {
             $model = User::findOrFail($data['id']);
@@ -56,7 +56,7 @@ 
 
         $file = $modelName . "_" . $entry->imageable_id . '/' . $entry->filename;
 
-        if($entry->encrypted) {
+        if ($entry->encrypted) {
             try {
                 $fileContent = decrypt(Storage::get($file));
             } catch (DecryptException $e) {

app/Http/Controllers/SettingController.php

Doc Comments +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
      * Update the specified resource in storage.
      *
      * @param  \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function update(Request $request)
     {