Completed
Push — master ( ccf51f...d35ea5 )
by claudio
06:09
created
app/Console/Commands/Optimise/OptimiseException.php 2 patches
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -1,21 +1,21 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Created by PhpStorm.
4
- * User: Claudio Cardinale <[email protected]>
5
- * Date: 07/12/15
6
- * Time: 21.24
7
- * This program is free software; you can redistribute it and/or
8
- * modify it under the terms of the GNU General Public License
9
- * as published by the Free Software Foundation; either version 2
10
- * of the License, or (at your option) any later version.
11
- * This program is distributed in the hope that it will be useful,
12
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
- * GNU General Public License for more details.
15
- * You should have received a copy of the GNU General Public License
16
- * along with this program; if not, write to the Free Software
17
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
18
- */
3
+     * Created by PhpStorm.
4
+     * User: Claudio Cardinale <[email protected]>
5
+     * Date: 07/12/15
6
+     * Time: 21.24
7
+     * This program is free software; you can redistribute it and/or
8
+     * modify it under the terms of the GNU General Public License
9
+     * as published by the Free Software Foundation; either version 2
10
+     * of the License, or (at your option) any later version.
11
+     * This program is distributed in the hope that it will be useful,
12
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
+     * GNU General Public License for more details.
15
+     * You should have received a copy of the GNU General Public License
16
+     * along with this program; if not, write to the Free Software
17
+     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
18
+     */
19 19
 
20 20
 namespace plunner\Console\Commands\Optimise;
21 21
 
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
      * @param Exception $previous
37 37
      * @param bool $empty
38 38
      */
39
-    public function __construct($message =  "", $code = 0, Exception $previous = null, $empty = false)
39
+    public function __construct($message = "", $code = 0, Exception $previous = null, $empty = false)
40 40
     {
41 41
         parent::__construct($message, $code, $previous);
42 42
         $this->empty = $empty;
Please login to merge, or discard this patch.
app/Events/Optimise/OkEvent.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,6 +39,6 @@
 block discarded – undo
39 39
      */
40 40
     public function broadcastOn()
41 41
     {
42
-        return [];
42
+        return [ ];
43 43
     }
44 44
 }
Please login to merge, or discard this patch.
app/Events/Optimise/ErrorEvent.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,6 +39,6 @@
 block discarded – undo
39 39
      */
40 40
     public function broadcastOn()
41 41
     {
42
-        return [];
42
+        return [ ];
43 43
     }
44 44
 }
Please login to merge, or discard this patch.
app/Console/Commands/Optimise/Path.php 3 patches
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -1,21 +1,21 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Created by PhpStorm.
4
- * User: Claudio Cardinale <[email protected]>
5
- * Date: 18/12/15
6
- * Time: 15.20
7
- * This program is free software; you can redistribute it and/or
8
- * modify it under the terms of the GNU General Public License
9
- * as published by the Free Software Foundation; either version 2
10
- * of the License, or (at your option) any later version.
11
- * This program is distributed in the hope that it will be useful,
12
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
- * GNU General Public License for more details.
15
- * You should have received a copy of the GNU General Public License
16
- * along with this program; if not, write to the Free Software
17
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
18
- */
3
+     * Created by PhpStorm.
4
+     * User: Claudio Cardinale <[email protected]>
5
+     * Date: 18/12/15
6
+     * Time: 15.20
7
+     * This program is free software; you can redistribute it and/or
8
+     * modify it under the terms of the GNU General Public License
9
+     * as published by the Free Software Foundation; either version 2
10
+     * of the License, or (at your option) any later version.
11
+     * This program is distributed in the hope that it will be useful,
12
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
+     * GNU General Public License for more details.
15
+     * You should have received a copy of the GNU General Public License
16
+     * along with this program; if not, write to the Free Software
17
+     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
18
+     */
19 19
 
20 20
 namespace plunner\Console\Commands\Optimise;
21 21
 
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
         if (file_exists($path->getPath()))
54 54
             throw new OptimiseException('problem during creation of tmp dir (the directory already exists)');
55 55
         if (!@mkdir($path->getPath()))
56
-            throw new OptimiseException('problem during creation of tmp dir (mkdir problem)');;
56
+            throw new OptimiseException('problem during creation of tmp dir (mkdir problem)'); ;
57 57
         if (!is_dir($path->getPath()))
58 58
             throw new OptimiseException('problem during creation of tmp dir (it is not possible to create directory)');
59 59
         return $path;
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
      */
105 105
     public function getModelPath()
106 106
     {
107
-        return $this->path . '/model.mod';
107
+        return $this->path.'/model.mod';
108 108
     }
109 109
 
110 110
     /**
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
      */
113 113
     public function getUsersPath()
114 114
     {
115
-        return $this->path . '/Users.csv';
115
+        return $this->path.'/Users.csv';
116 116
     }
117 117
 
118 118
     /**
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
      */
121 121
     public function getMeetingsPath()
122 122
     {
123
-        return $this->path . '/Meeting.csv';
123
+        return $this->path.'/Meeting.csv';
124 124
     }
125 125
 
126 126
     /**
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
      */
129 129
     public function getMeetingsDurationPath()
130 130
     {
131
-        return $this->path . '/MeetingsDuration.csv';
131
+        return $this->path.'/MeetingsDuration.csv';
132 132
     }
133 133
 
134 134
     /**
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
      */
137 137
     public function getMeetingsAvailabilityPath()
138 138
     {
139
-        return $this->path . '/MeetingsAvailability.csv';
139
+        return $this->path.'/MeetingsAvailability.csv';
140 140
     }
141 141
 
142 142
     /**
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
      */
145 145
     public function getUsersAvailabilityPath()
146 146
     {
147
-        return $this->path . '/UsersAvailability.csv';
147
+        return $this->path.'/UsersAvailability.csv';
148 148
     }
149 149
 
150 150
     /**
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
      */
153 153
     public function getUsersMeetingsPath()
154 154
     {
155
-        return $this->path . '/UsersMeetings.csv';
155
+        return $this->path.'/UsersMeetings.csv';
156 156
     }
157 157
 
158 158
     /**
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
      */
161 161
     public function getXPath()
162 162
     {
163
-        return $this->path . '/x.csv';
163
+        return $this->path.'/x.csv';
164 164
     }
165 165
 
166 166
     /**
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
      */
169 169
     public function getYPath()
170 170
     {
171
-        return $this->path . '/y.csv';
171
+        return $this->path.'/y.csv';
172 172
     }
173 173
 
174 174
     /**
@@ -176,6 +176,6 @@  discard block
 block discarded – undo
176 176
      */
177 177
     public function getOutputPath()
178 178
     {
179
-        return $this->path . '/out.txt';
179
+        return $this->path.'/out.txt';
180 180
     }
181 181
 }
182 182
\ No newline at end of file
Please login to merge, or discard this 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/Http/Middleware/GetUserAndRefresh.php 3 patches
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -1,21 +1,21 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Created by PhpStorm.
4
- * User: Claudio Cardinale <[email protected]>
5
- * Date: 24/12/15
6
- * Time: 22.53
7
- * This program is free software; you can redistribute it and/or
8
- * modify it under the terms of the GNU General Public License
9
- * as published by the Free Software Foundation; either version 2
10
- * of the License, or (at your option) any later version.
11
- * This program is distributed in the hope that it will be useful,
12
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
- * GNU General Public License for more details.
15
- * You should have received a copy of the GNU General Public License
16
- * along with this program; if not, write to the Free Software
17
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
18
- */
3
+     * Created by PhpStorm.
4
+     * User: Claudio Cardinale <[email protected]>
5
+     * Date: 24/12/15
6
+     * Time: 22.53
7
+     * This program is free software; you can redistribute it and/or
8
+     * modify it under the terms of the GNU General Public License
9
+     * as published by the Free Software Foundation; either version 2
10
+     * of the License, or (at your option) any later version.
11
+     * This program is distributed in the hope that it will be useful,
12
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
+     * GNU General Public License for more details.
15
+     * You should have received a copy of the GNU General Public License
16
+     * along with this program; if not, write to the Free Software
17
+     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
18
+     */
19 19
 
20 20
 namespace plunner\Http\Middleware;
21 21
 
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -34,12 +34,12 @@
 block discarded – undo
34 34
                 \JWTFactory::setTTL(43200);
35 35
                 //config(['jwt.ttl' =>'43200']); //30 days
36 36
             }
37
-        }catch(JWTException $e)
37
+        } catch (JWTException $e)
38 38
         {}
39 39
 
40 40
         //this to add the remember me mode field in the new token, but we have the custom check that is an useless
41 41
         //overhead
42
-        $custom = $custom . ';remember-' . $remember == 'true' ? 'true' : 'false';
42
+        $custom = $custom.';remember-'.$remember == 'true' ? 'true' : 'false';
43 43
         return parent::handle($request, $next, $custom);
44 44
     }
45 45
 
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
                 \JWTFactory::setTTL(43200);
35 35
                 //config(['jwt.ttl' =>'43200']); //30 days
36 36
             }
37
-        }catch(JWTException $e)
37
+        } catch(JWTException $e)
38 38
         {}
39 39
 
40 40
         //this to add the remember me mode field in the new token, but we have the custom check that is an useless
Please login to merge, or discard this patch.
app/MeetingTimeslot.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -32,14 +32,14 @@
 block discarded – undo
32 32
      *
33 33
      * @var array
34 34
      */
35
-    protected $fillable = ['time_start', 'time_end'];
35
+    protected $fillable = [ 'time_start', 'time_end' ];
36 36
 
37 37
     /**
38 38
      * The attributes excluded from the model's JSON form.
39 39
      *
40 40
      * @var array
41 41
      */
42
-    protected $hidden = ['pivot', 'meeting'];
42
+    protected $hidden = [ 'pivot', 'meeting' ];
43 43
 
44 44
     /**
45 45
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
Please login to merge, or discard this patch.
app/Http/Controllers/Employees/Calendars/TimeslotsController.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,8 +21,8 @@
 block discarded – undo
21 21
      */
22 22
     public function __construct()
23 23
     {
24
-        config(['auth.model' => \plunner\Employee::class]);
25
-        config(['jwt.user' => \plunner\Employee::class]);
24
+        config([ 'auth.model' => \plunner\Employee::class ]);
25
+        config([ 'jwt.user' => \plunner\Employee::class ]);
26 26
         $this->middleware('jwt.authandrefresh:mode-en');
27 27
     }
28 28
 
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -36,8 +36,9 @@
 block discarded – undo
36 36
         $calendar = Calendar::findOrFail($calendarId);
37 37
         $this->authorize($calendar);
38 38
         $timeslots = $calendar->timeslots();
39
-        if ($request->query('current'))
40
-            $timeslots->where('time_start', '>=', new \DateTime());
39
+        if ($request->query('current')) {
40
+                    $timeslots->where('time_start', '>=', new \DateTime());
41
+        }
41 42
         return $timeslots->get();
42 43
     }
43 44
 
Please login to merge, or discard this patch.
app/Http/Controllers/Employees/Planners/MeetingTimeslotsController.php 3 patches
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -2,11 +2,9 @@
 block discarded – undo
2 2
 
3 3
 namespace plunner\Http\Controllers\Employees\Planners;
4 4
 
5
-use Illuminate\Http\Request;
6 5
 use Illuminate\Support\Facades\Response;
7 6
 use plunner\Group;
8 7
 use plunner\Http\Controllers\Controller;
9
-use plunner\Http\Requests;
10 8
 use plunner\Http\Requests\Employees\Meeting\MeetingTimeslotRequest;
11 9
 use plunner\Meeting;
12 10
 use plunner\MeetingTimeslot;
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -16,8 +16,8 @@  discard block
 block discarded – undo
16 16
 {
17 17
     public function __construct()
18 18
     {
19
-        config(['auth.model' => \plunner\Planner::class]);
20
-        config(['jwt.user' => \plunner\Planner::class]);
19
+        config([ 'auth.model' => \plunner\Planner::class ]);
20
+        config([ 'jwt.user' => \plunner\Planner::class ]);
21 21
         $this->middleware('jwt.authandrefresh:mode-en');
22 22
     }
23 23
 
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 
36 36
         if ($meeting->group_id == $groupId)
37 37
             return $meeting->timeslots;
38
-        return Response::json(['error' => 'meeting->group_id <> groupId'], 403);
38
+        return Response::json([ 'error' => 'meeting->group_id <> groupId' ], 403);
39 39
     }
40 40
 
41 41
     /**
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 
58 58
         if ($meeting->group_id == $groupId && $timeslot->meeting_id == $meetingId)
59 59
             return $timeslot;
60
-        return Response::json(['error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId'], 403);
60
+        return Response::json([ 'error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId' ], 403);
61 61
     }
62 62
 
63 63
     /**
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
         $meeting = Meeting::findOrFail($meetingId);
74 74
         $this->authorize($meeting);
75 75
         if ($meeting->start_time != NULL)
76
-            return Response::json(['error' => 'the meeting is already planned'], 422);
76
+            return Response::json([ 'error' => 'the meeting is already planned' ], 422);
77 77
 
78 78
         $input = $request->all();
79 79
 
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
             $timeslot = $meeting->timeslots()->create($input);
82 82
             return $timeslot;
83 83
         }
84
-        return Response::json(['error' => 'meeting->group_id <> groupId'], 403);
84
+        return Response::json([ 'error' => 'meeting->group_id <> groupId' ], 403);
85 85
     }
86 86
 
87 87
     /**
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
         $meeting = Meeting::findOrFail($meetingId);
98 98
         $this->authorize($meeting);
99 99
         if ($meeting->start_time != NULL)
100
-            return Response::json(['error' => 'the meeting is already planned'], 422);
100
+            return Response::json([ 'error' => 'the meeting is already planned' ], 422);
101 101
         $timeslot = MeetingTimeslot::findOrFail($timeslotId);
102 102
         $this->authorize($timeslot);
103 103
 
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
             $timeslot->update($input);
108 108
             return $timeslot;
109 109
         }
110
-        return Response::json(['error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId'], 403);
110
+        return Response::json([ 'error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId' ], 403);
111 111
     }
112 112
 
113 113
     /**
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
         $meeting = Meeting::findOrFail($meetingId);
126 126
         $this->authorize($meeting);
127 127
         if ($meeting->start_time != NULL)
128
-            return Response::json(['error' => 'the meeting is already planned'], 422);
128
+            return Response::json([ 'error' => 'the meeting is already planned' ], 422);
129 129
         $timeslot = MeetingTimeslot::findOrFail($timeslotId);
130 130
         $this->authorize($timeslot);
131 131
 
@@ -133,6 +133,6 @@  discard block
 block discarded – undo
133 133
             $timeslot->delete();
134 134
             return $timeslot;
135 135
         }
136
-        return Response::json(['error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId'], 403);
136
+        return Response::json([ 'error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId' ], 403);
137 137
     }
138 138
 }
Please login to merge, or discard this patch.
Braces   +15 added lines, -10 removed lines patch added patch discarded remove patch
@@ -33,8 +33,9 @@  discard block
 block discarded – undo
33 33
         $meeting = Meeting::findOrFail($meetingId);
34 34
         $this->authorize($meeting);
35 35
 
36
-        if ($meeting->group_id == $groupId)
37
-            return $meeting->timeslots;
36
+        if ($meeting->group_id == $groupId) {
37
+                    return $meeting->timeslots;
38
+        }
38 39
         return Response::json(['error' => 'meeting->group_id <> groupId'], 403);
39 40
     }
40 41
 
@@ -55,8 +56,9 @@  discard block
 block discarded – undo
55 56
         $timeslot = MeetingTimeslot::findOrFail($timeslotId);
56 57
         $this->authorize($timeslot);
57 58
 
58
-        if ($meeting->group_id == $groupId && $timeslot->meeting_id == $meetingId)
59
-            return $timeslot;
59
+        if ($meeting->group_id == $groupId && $timeslot->meeting_id == $meetingId) {
60
+                    return $timeslot;
61
+        }
60 62
         return Response::json(['error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId'], 403);
61 63
     }
62 64
 
@@ -72,8 +74,9 @@  discard block
 block discarded – undo
72 74
         $this->authorize($group);
73 75
         $meeting = Meeting::findOrFail($meetingId);
74 76
         $this->authorize($meeting);
75
-        if ($meeting->start_time != NULL)
76
-            return Response::json(['error' => 'the meeting is already planned'], 422);
77
+        if ($meeting->start_time != NULL) {
78
+                    return Response::json(['error' => 'the meeting is already planned'], 422);
79
+        }
77 80
 
78 81
         $input = $request->all();
79 82
 
@@ -96,8 +99,9 @@  discard block
 block discarded – undo
96 99
         $this->authorize($group);
97 100
         $meeting = Meeting::findOrFail($meetingId);
98 101
         $this->authorize($meeting);
99
-        if ($meeting->start_time != NULL)
100
-            return Response::json(['error' => 'the meeting is already planned'], 422);
102
+        if ($meeting->start_time != NULL) {
103
+                    return Response::json(['error' => 'the meeting is already planned'], 422);
104
+        }
101 105
         $timeslot = MeetingTimeslot::findOrFail($timeslotId);
102 106
         $this->authorize($timeslot);
103 107
 
@@ -124,8 +128,9 @@  discard block
 block discarded – undo
124 128
         $this->authorize($group);
125 129
         $meeting = Meeting::findOrFail($meetingId);
126 130
         $this->authorize($meeting);
127
-        if ($meeting->start_time != NULL)
128
-            return Response::json(['error' => 'the meeting is already planned'], 422);
131
+        if ($meeting->start_time != NULL) {
132
+                    return Response::json(['error' => 'the meeting is already planned'], 422);
133
+        }
129 134
         $timeslot = MeetingTimeslot::findOrFail($timeslotId);
130 135
         $this->authorize($timeslot);
131 136
 
Please login to merge, or discard this patch.
app/Console/Commands/Optimise/Solver.php 4 patches
Doc Comments   +9 added lines, -7 removed lines patch added patch discarded remove patch
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
     }
144 144
 
145 145
     /**
146
-     * @return \string[]
146
+     * @return string[]
147 147
      */
148 148
     public function getUsers()
149 149
     {
@@ -255,6 +255,8 @@  discard block
 block discarded – undo
255 255
      * implementation of arraypad that doesn't change original keys<br/>
256 256
      * <strong>CAUTION: Only positive $len</strong>
257 257
      * @param array $array
258
+     * @param integer $len
259
+     * @param integer $pad
258 260
      * @return array
259 261
      */
260 262
     static private function arrayPad(array $array, $len, $pad)
@@ -393,7 +395,7 @@  discard block
 block discarded – undo
393 395
     }
394 396
 
395 397
     /**
396
-     * @param $proprieties
398
+     * @param string[] $proprieties
397 399
      * @throws OptimiseException
398 400
      */
399 401
     private function checkArrayProprieties($proprieties)
@@ -404,7 +406,7 @@  discard block
 block discarded – undo
404 406
     }
405 407
 
406 408
     /**
407
-     * @param $proprieties
409
+     * @param string[] $proprieties
408 410
      * @throws OptimiseException
409 411
      */
410 412
     private function checkIntProprieties($proprieties)
@@ -424,7 +426,7 @@  discard block
 block discarded – undo
424 426
 
425 427
     /**
426 428
      * @param string $file
427
-     * @param array $data
429
+     * @param string[] $data
428 430
      * @throws OptimiseException
429 431
      */
430 432
     static private function writeCSVArrayNoKey($file, $data)
@@ -441,7 +443,7 @@  discard block
 block discarded – undo
441 443
     /**
442 444
      * @param string $file
443 445
      * @param array $data
444
-     * @param array $heading
446
+     * @param string[] $heading
445 447
      * @param \Closure $writer
446 448
      * @throws OptimiseException
447 449
      */
@@ -478,7 +480,7 @@  discard block
 block discarded – undo
478 480
 
479 481
     /**
480 482
      * @param string $file
481
-     * @param array $data
483
+     * @param string[] $data
482 484
      * @param string $name
483 485
      * @throws OptimiseException
484 486
      */
@@ -503,7 +505,7 @@  discard block
 block discarded – undo
503 505
 
504 506
     /**
505 507
      * @param string $file
506
-     * @param array $data
508
+     * @param string[] $data
507 509
      * @param string $name
508 510
      * @throws OptimiseException
509 511
      */
Please login to merge, or discard this patch.
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -1,21 +1,21 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Created by PhpStorm.
4
- * User: Claudio Cardinale <[email protected]>
5
- * Date: 07/12/15
6
- * Time: 21.18
7
- * This program is free software; you can redistribute it and/or
8
- * modify it under the terms of the GNU General Public License
9
- * as published by the Free Software Foundation; either version 2
10
- * of the License, or (at your option) any later version.
11
- * This program is distributed in the hope that it will be useful,
12
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
- * GNU General Public License for more details.
15
- * You should have received a copy of the GNU General Public License
16
- * along with this program; if not, write to the Free Software
17
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
18
- */
3
+     * Created by PhpStorm.
4
+     * User: Claudio Cardinale <[email protected]>
5
+     * Date: 07/12/15
6
+     * Time: 21.18
7
+     * This program is free software; you can redistribute it and/or
8
+     * modify it under the terms of the GNU General Public License
9
+     * as published by the Free Software Foundation; either version 2
10
+     * of the License, or (at your option) any later version.
11
+     * This program is distributed in the hope that it will be useful,
12
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
+     * GNU General Public License for more details.
15
+     * You should have received a copy of the GNU General Public License
16
+     * along with this program; if not, write to the Free Software
17
+     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
18
+     */
19 19
 
20 20
 namespace plunner\Console\Commands\Optimise;
21 21
 
Please login to merge, or discard this 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.
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -241,10 +241,10 @@  discard block
 block discarded – undo
241 241
         if (array_diff($meetings, $this->meetings))
242 242
             throw new OptimiseException('meetings different from meetings set');
243 243
         foreach ($meetingsAvailability as $key => $meetingsAvailabilityS) {
244
-            $timeSlots = array_keys($meetingsAvailabilityS);//TODO this is useless, we can use directly $usersAvailabilityS
244
+            $timeSlots = array_keys($meetingsAvailabilityS); //TODO this is useless, we can use directly $usersAvailabilityS
245 245
             if (count($timeSlots) != $this->timeSlots)
246 246
                 throw new OptimiseException('timeSlots different from timeSlots set');
247
-            $meetingsAvailability[$key] = self::arrayPad($meetingsAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0);
247
+            $meetingsAvailability[ $key ] = self::arrayPad($meetingsAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0);
248 248
         }
249 249
 
250 250
         $this->meetingsAvailability = $meetingsAvailability;
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
     {
262 262
         $len = $len - count($array);
263 263
         for ($i = 0; $i < $len; $i++)
264
-            $array[] = $pad;
264
+            $array[ ] = $pad;
265 265
         return $array;
266 266
     }
267 267
 
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
286 286
             throw new OptimiseException('meetings different from meetings set');
287 287
         }
288 288
         foreach ($meetingsDuration as $duration) {
289
-            $duration = (int)$duration; //TODO fix this (fix for optimise)
289
+            $duration = (int) $duration; //TODO fix this (fix for optimise)
290 290
             if (!is_int($duration) || $duration <= 0)
291 291
                 throw new OptimiseException('duration is not integer or it is not >0');
292 292
         }
@@ -314,11 +314,11 @@  discard block
 block discarded – undo
314 314
         if (array_diff($users, $this->users))
315 315
             throw new OptimiseException('users different from users set');
316 316
         foreach ($usersAvailability as $key => $usersAvailabilityS) {
317
-            $timeSlots = array_keys($usersAvailabilityS);//TODO this is useless, we can use directly $usersAvailabilityS
317
+            $timeSlots = array_keys($usersAvailabilityS); //TODO this is useless, we can use directly $usersAvailabilityS
318 318
             if (count($timeSlots) != $this->timeSlots)
319 319
                 throw new OptimiseException('timeSlots different from timeSlots set');
320 320
 
321
-            $usersAvailability[$key] = self::arrayPad($usersAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0);
321
+            $usersAvailability[ $key ] = self::arrayPad($usersAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0);
322 322
         }
323 323
 
324 324
         $this->usersAvailability = $usersAvailability;
@@ -361,7 +361,7 @@  discard block
 block discarded – undo
361 361
     {
362 362
         $this->writeData();
363 363
         $this->writeModelFile();
364
-        $event = $this->schedule->exec('glpsol --math ' . $this->path->getModelPath())->sendOutputTo($this->path->getOutputPath())->after(function () {
364
+        $event = $this->schedule->exec('glpsol --math '.$this->path->getModelPath())->sendOutputTo($this->path->getOutputPath())->after(function() {
365 365
         }); //this just to execute in foreground
366 366
         if ($event->isDue($this->laravel))
367 367
             $event->run($this->laravel);
@@ -388,8 +388,8 @@  discard block
 block discarded – undo
388 388
      */
389 389
     private function checkData()
390 390
     {
391
-        $this->checkArrayProprieties(['users', 'meetings', 'meetingsAvailability', 'meetingsDuration', 'usersAvailability', 'usersMeetings']);
392
-        $this->checkIntProprieties(['timeSlots', 'maxTimeSlots']);
391
+        $this->checkArrayProprieties([ 'users', 'meetings', 'meetingsAvailability', 'meetingsDuration', 'usersAvailability', 'usersMeetings' ]);
392
+        $this->checkIntProprieties([ 'timeSlots', 'maxTimeSlots' ]);
393 393
     }
394 394
 
395 395
     /**
@@ -400,7 +400,7 @@  discard block
 block discarded – undo
400 400
     {
401 401
         foreach ($proprieties as $propriety)
402 402
             if (count($this->$propriety) == 0)
403
-                throw new OptimiseException($propriety . ' property is not set correctly');
403
+                throw new OptimiseException($propriety.' property is not set correctly');
404 404
     }
405 405
 
406 406
     /**
@@ -411,7 +411,7 @@  discard block
 block discarded – undo
411 411
     {
412 412
         foreach ($proprieties as $propriety)
413 413
             if (!is_int($this->$propriety) || $this->$propriety <= 0)
414
-                throw new OptimiseException($propriety . ' property is not set correctly');
414
+                throw new OptimiseException($propriety.' property is not set correctly');
415 415
     }
416 416
 
417 417
     /**
@@ -429,13 +429,13 @@  discard block
 block discarded – undo
429 429
      */
430 430
     static private function writeCSVArrayNoKey($file, $data)
431 431
     {
432
-        $f = function ($fp, $data) {
432
+        $f = function($fp, $data) {
433 433
             foreach ($data as $field) {
434
-                fputcsv($fp, [$field]);
434
+                fputcsv($fp, [ $field ]);
435 435
             }
436 436
         };
437 437
 
438
-        self::writeCSV($file, $data, ['i'], $f);
438
+        self::writeCSV($file, $data, [ 'i' ], $f);
439 439
     }
440 440
 
441 441
     /**
@@ -484,13 +484,13 @@  discard block
 block discarded – undo
484 484
      */
485 485
     static private function writeCSVArray($file, $data, $name)
486 486
     {
487
-        $f = function ($fp, $data) {
487
+        $f = function($fp, $data) {
488 488
             foreach ($data as $key => $field) {
489
-                fputcsv($fp, [$key, $field]);
489
+                fputcsv($fp, [ $key, $field ]);
490 490
             }
491 491
         };
492 492
 
493
-        self::writeCSV($file, $data, ['i', $name], $f);
493
+        self::writeCSV($file, $data, [ 'i', $name ], $f);
494 494
     }
495 495
 
496 496
     /**
@@ -509,14 +509,14 @@  discard block
 block discarded – undo
509 509
      */
510 510
     static private function writeCSVMatrix($file, $data, $name)
511 511
     {
512
-        $f = function ($fp, $data) {
512
+        $f = function($fp, $data) {
513 513
             foreach ($data as $key => $field) {
514 514
                 foreach ($field as $key2 => $field2)
515
-                    fputcsv($fp, [$key, $key2, $field2]);
515
+                    fputcsv($fp, [ $key, $key2, $field2 ]);
516 516
             }
517 517
         };
518 518
 
519
-        self::writeCSV($file, $data, ['i', 'j', $name], $f);
519
+        self::writeCSV($file, $data, [ 'i', 'j', $name ], $f);
520 520
     }
521 521
 
522 522
     /**
@@ -545,7 +545,7 @@  discard block
 block discarded – undo
545 545
         $f = @fopen($this->path->getModelPath(), "w");
546 546
         if (!$f)
547 547
             throw new OptimiseException('problem during creation of a file');
548
-        fwrite($f, str_replace($strReplaceS, $strReplaceR, file_get_contents(__DIR__ . "/model.stub")));
548
+        fwrite($f, str_replace($strReplaceS, $strReplaceR, file_get_contents(__DIR__."/model.stub")));
549 549
         fclose($f);
550 550
     }
551 551
 
@@ -572,7 +572,7 @@  discard block
 block discarded – undo
572 572
         if (!$handle)
573 573
             throw new OptimiseException('problems during reading the file');
574 574
 
575
-        $ret = [];
575
+        $ret = [ ];
576 576
         fgetcsv($handle); //skip head
577 577
         while (($data = fgetcsv($handle)) !== FALSE) {
578 578
             if (count($data) != 3) {
@@ -580,7 +580,7 @@  discard block
 block discarded – undo
580 580
                 throw new OptimiseException('problems during parsing the file');
581 581
             }
582 582
 
583
-            $ret[$data[0]][$data[1]] = $data[2];
583
+            $ret[ $data[ 0 ] ][ $data[ 1 ] ] = $data[ 2 ];
584 584
         }
585 585
 
586 586
         fclose($handle);
Please login to merge, or discard this patch.