Failed Conditions
Pull Request — newinternal-bugfixing (#286)
by Simon
19:44 queued 16:21
created
includes/Security/SecurityManager.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -207,7 +207,8 @@
 block discarded – undo
207 207
         }
208 208
     }
209 209
 
210
-    public function getRoleConfiguration(){
210
+    public function getRoleConfiguration()
211
+    {
211 212
         return $this->roleConfiguration;
212 213
     }
213 214
 }
Please login to merge, or discard this patch.
includes/ConsoleTasks/MigrateToRoles.php 1 patch
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -29,11 +29,11 @@  discard block
 block discarded – undo
29 29
         foreach ($users as $user) {
30 30
             $toAdd = array('user');
31 31
 
32
-            if($user['status'] === 'Admin'){
32
+            if($user['status'] === 'Admin') {
33 33
                 $toAdd[] = 'admin';
34 34
             }
35 35
 
36
-            if($user['checkuser'] == 1){
36
+            if($user['checkuser'] == 1) {
37 37
                 $toAdd[] = 'checkuser';
38 38
             }
39 39
 
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
             $log->setComment($logData);
61 61
             $log->save();
62 62
 
63
-            if($user['status'] === 'Admin' || $user['status'] === 'User'){
63
+            if($user['status'] === 'Admin' || $user['status'] === 'User') {
64 64
                 $update->execute(array('id' => $user['id']));
65 65
             }
66 66
         }
Please login to merge, or discard this patch.
includes/Helpers/SearchHelpers/UserSearchHelper.php 1 patch
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -52,7 +52,8 @@  discard block
 block discarded – undo
52 52
         return $this;
53 53
     }
54 54
 
55
-    public function statusIn($statuses) {
55
+    public function statusIn($statuses)
56
+    {
56 57
         $this->inClause('status', $statuses);
57 58
 
58 59
         return $this;
@@ -77,14 +78,16 @@  discard block
 block discarded – undo
77 78
      *
78 79
      * @return $this
79 80
      */
80
-    public function lastActiveBefore(DateTime $instant){
81
+    public function lastActiveBefore(DateTime $instant)
82
+    {
81 83
         $this->whereClause .= ' AND origin.lastactive < ?';
82 84
         $this->parameterList[] = $instant->format("Y-m-d H:i:s");
83 85
 
84 86
         return $this;
85 87
     }
86 88
 
87
-    public function getRoleMap(&$roleMap){
89
+    public function getRoleMap(&$roleMap)
90
+    {
88 91
         $query = <<<SQL
89 92
             SELECT /* UserSearchHelper/roleMap */ 
90 93
                   r.user user
Please login to merge, or discard this patch.