Completed
Push — master ( 731a14...39886c )
by Patrick
05:14 queued 02:46
created
Data/MongoDataSet.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -141,9 +141,12 @@
 block discarded – undo
141 141
     {
142 142
         $namespace = $this->db_name.'.'.$collectionName;
143 143
         $dbWrite = new \MongoDB\Driver\BulkWrite();
144
-        try {
144
+        try
145
+        {
145 146
             $dbWrite->update($criteria, $new_object, $options);
146
-        } catch(\MongoDB\Driver\Exception\InvalidArgumentException $e) {
147
+        }
148
+        catch(\MongoDB\Driver\Exception\InvalidArgumentException $e)
149
+        {
147 150
             if(isset($new_object['$set']['']))
148 151
             {
149 152
                 unset($new_object['$set']['']);
Please login to merge, or discard this patch.
Data/Filter.php 2 patches
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -142,47 +142,47 @@
 block discarded – undo
142 142
     {
143 143
         $res = array();
144 144
         $count = count($this->children);
145
-	for($i = 0; $i < $count; $i++)
146
-	{
145
+    for($i = 0; $i < $count; $i++)
146
+    {
147 147
             if($this->children[$i] === 'and' || $this->children[$i] === 'or')
148
-	    {
148
+        {
149 149
                 array_push($res, $this->children[$i]);
150
-	    }
151
-	    else
152
-	    {
150
+        }
151
+        else
152
+        {
153 153
                 $tmp = $this->children[$i]->php_compare($element);
154
-		array_push($res, $tmp);
155
-	    }
156
-	}
157
-	if($count === 1)
158
-	{
154
+        array_push($res, $tmp);
155
+        }
156
+    }
157
+    if($count === 1)
158
+    {
159 159
             return $res[0];
160
-	}
161
-	while($count >= 3)
162
-	{
163
-	    if($res[1] === 'and')
160
+    }
161
+    while($count >= 3)
162
+    {
163
+        if($res[1] === 'and')
164 164
             {
165 165
                 $var1 = array_shift($res);
166 166
                 array_shift($res);
167 167
                 $var2 = array_shift($res);
168
-	        $res = array_merge(array($var1 && $var2), $res);
168
+            $res = array_merge(array($var1 && $var2), $res);
169 169
             }
170
-	    else if($res[1] === 'or')
170
+        else if($res[1] === 'or')
171 171
             {
172 172
                 $var1 = array_shift($res);
173 173
                 array_shift($res);
174 174
                 $var2 = array_shift($res);
175 175
                 $res = array_merge(array($var1 || $var2), $res);
176
-	    }
177
-	    $count = count($res);
178
-	}
176
+        }
177
+        $count = count($res);
178
+    }
179 179
         return $res[0];
180 180
     }
181 181
 
182 182
     public function filter_array(&$array)
183 183
     {
184 184
         if(is_array($array))
185
-	{
185
+    {
186 186
             $res = array_filter($array, array($this, 'filterElement'));
187 187
             return array_values($res);
188 188
         }
Please login to merge, or discard this patch.
Braces   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 	for($i = 0; $i < $count; $i++)
146 146
 	{
147 147
             if($this->children[$i] === 'and' || $this->children[$i] === 'or')
148
-	    {
148
+            {
149 149
                 array_push($res, $this->children[$i]);
150 150
 	    }
151 151
 	    else
@@ -161,14 +161,14 @@  discard block
 block discarded – undo
161 161
 	while($count >= 3)
162 162
 	{
163 163
 	    if($res[1] === 'and')
164
-            {
164
+	    {
165 165
                 $var1 = array_shift($res);
166 166
                 array_shift($res);
167 167
                 $var2 = array_shift($res);
168 168
 	        $res = array_merge(array($var1 && $var2), $res);
169 169
             }
170
-	    else if($res[1] === 'or')
171
-            {
170
+            else if($res[1] === 'or')
171
+	    {
172 172
                 $var1 = array_shift($res);
173 173
                 array_shift($res);
174 174
                 $var2 = array_shift($res);
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
     public function filter_array(&$array)
183 183
     {
184 184
         if(is_array($array))
185
-	{
185
+        {
186 186
             $res = array_filter($array, array($this, 'filterElement'));
187 187
             return array_values($res);
188 188
         }
Please login to merge, or discard this patch.
Http/LoginRequiredPage.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
     {
25 25
         if($this->user === false || $this->user === null)
26 26
         {
27
-          $this->content['body'] = '
27
+            $this->content['body'] = '
28 28
             <div id="content">
29 29
               <div class="row">
30 30
                 <div class="col-lg-12">
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
         }
37 37
         else if(!isset($this->content['body']))
38 38
         {
39
-          $this->content['body'] = $this->body;
39
+            $this->content['body'] = $this->body;
40 40
         }
41 41
         //Add page JS just before rednering so it is after any added by the page explicitly
42 42
         $this->addJS('js/'.basename($_SERVER['SCRIPT_NAME'], '.php').'.js');
Please login to merge, or discard this patch.
Http/WebErrorHandler.php 3 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,11 +17,11 @@
 block discarded – undo
17 17
             return $response->withJson($exception, 400);
18 18
         }
19 19
         if (php_sapi_name() !== "cli") {
20
-          error_log($exception->__toString());
20
+            error_log($exception->__toString());
21 21
         }
22 22
         return $response
23 23
             ->withStatus(500)
24 24
             ->withHeader('Content-Type', 'text/html')
25 25
             ->write($exception->__toString());
26
-   }
26
+    }
27 27
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
         {
17 17
             return $response->withJson($exception, 400);
18 18
         }
19
-        if (php_sapi_name() !== "cli") {
19
+        if(php_sapi_name() !== "cli") {
20 20
           error_log($exception->__toString());
21 21
         }
22 22
         return $response
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,8 @@
 block discarded – undo
16 16
         {
17 17
             return $response->withJson($exception, 400);
18 18
         }
19
-        if (php_sapi_name() !== "cli") {
19
+        if (php_sapi_name() !== "cli")
20
+        {
20 21
           error_log($exception->__toString());
21 22
         }
22 23
         return $response
Please login to merge, or discard this patch.
Http/Rest/RestAPI.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 
22 22
     public function setup($app)
23 23
     {
24
-        \Sentry\init(['dsn' => 'https://[email protected]/4283882' ]);
24
+        \Sentry\init(['dsn' => 'https://[email protected]/4283882']);
25 25
         return $app->any('[/]', $this);
26 26
     }
27 27
 
Please login to merge, or discard this patch.
Serialize/SpreadSheetSerializer.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@
 block discarded – undo
89 89
             {
90 90
                 $this->addValueByColName($res[0], $tmp, $colName, $row[$colName]);
91 91
             }
92
-            $tmp = $tmp+array_fill_keys(range(0,max(array_keys($tmp))),false);
92
+            $tmp = $tmp + array_fill_keys(range(0, max(array_keys($tmp))), false);
93 93
             ksort($tmp);
94 94
             $res[] = $tmp;
95 95
         }
Please login to merge, or discard this patch.
Email/AmazonSES.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -42,10 +42,13 @@  discard block
 block discarded – undo
42 42
             $args = array();
43 43
             $args['RawMessage'] = array();
44 44
             $args['RawMessage']['Data'] = $email->getRawMessage();
45
-            try {
45
+            try
46
+            {
46 47
                 $res = $this->ses->sendRawEmail($args);
47 48
                 return $res;
48
-            } catch(\Exception $e) {
49
+            }
50
+            catch(\Exception $e)
51
+            {
49 52
                 return false;
50 53
             }
51 54
         }
@@ -66,9 +69,12 @@  discard block
 block discarded – undo
66 69
             $args['Message']['Body']['Text']['Data'] = $email->getTextBody();
67 70
             $args['Message']['Body']['Html']['Data'] = $email->getHtmlBody();
68 71
             $args['ReplyToAddresses'] = array($email->getReplyTo());
69
-            try {
72
+            try
73
+            {
70 74
                 return $this->ses->sendEmail($args);
71
-            } catch(\Exception $e) {
75
+            }
76
+            catch(\Exception $e)
77
+            {
72 78
                 return false;
73 79
             }
74 80
         }
Please login to merge, or discard this patch.
Email/SMTPServer.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -59,8 +59,8 @@
 block discarded – undo
59 59
             return array($address);
60 60
         }
61 61
         $ret = array();
62
-        $ret[0] = trim(substr($address, $pos+1), '>');
63
-        $ret[1] = substr($address, 0, $pos-1);
62
+        $ret[0] = trim(substr($address, $pos + 1), '>');
63
+        $ret[1] = substr($address, 0, $pos - 1);
64 64
         return $ret;
65 65
     }
66 66
 
Please login to merge, or discard this patch.
Auth/LDAPAuthenticator.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
      *
234 234
      * @param \stdClass	$data The AuthData from the session
235 235
      *
236
-     * @return null|\Auth\LDAPUser The LDAPUser represented by this data
236
+     * @return LDAPUser The LDAPUser represented by this data
237 237
      */
238 238
     public function getUser($data)
239 239
     {
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
245 245
      *
246 246
      * @param string $name The Group's name
247 247
      *
248
-     * @return null|\Auth\LDAPGroup The LDAPGroup represented by the name or null if not found
248
+     * @return null|LDAPGroup The LDAPGroup represented by the name or null if not found
249 249
      */
250 250
     public function getGroupByName($name)
251 251
     {
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
     }
330 330
 
331 331
     /**
332
-     * @param boolean|\Data\Filter $filter The filter to user when reading users
332
+     * @param \Flipside\Data\Filter $filter The filter to user when reading users
333 333
      * @param boolean|array   $select The fields to return
334 334
      * @param boolean|integer $top The number of records to return
335 335
      * @param boolean|integer $skip The number of records to skip
Please login to merge, or discard this patch.