Completed
Pull Request — develop (#111)
by Patrick
02:28
created
Http/class.WebErrorHandler.php 2 patches
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.
Data/class.Filter.php 1 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
             return array_filter($array, array($this, 'filterElement'));
187 187
         }
188 188
         return array();
Please login to merge, or discard this patch.
Data/class.ObjectDataTable.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
         return $this->dataTable->create($data);
35 35
     }
36 36
 
37
-    public function read($filter=false, $select=false, $count=false, $skip=false, $sort=false, $params=false)
37
+    public function read($filter = false, $select = false, $count = false, $skip = false, $sort = false, $params = false)
38 38
     {
39 39
         $res = $this->dataTable->read($filter, $select, $count, $skip, $sort, $params);
40 40
         if($res === false)
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
         return $this->dataTable->delete($filter);
68 68
     }
69 69
 
70
-    public function count($filter=false)
70
+    public function count($filter = false)
71 71
     {
72 72
         return $this->dataTable->count($filter);
73 73
     }
Please login to merge, or discard this patch.
Data/class.CSVDataTable.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
     public function count($filter = false)
21 21
     {
22 22
         if($filter)
23
-	{
23
+        {
24 24
             $res = $this->data;
25 25
 	    $res = $filter->filter_array($res);
26 26
 	    return count($res);
Please login to merge, or discard this patch.
Data/class.SQLDataSet.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
246 246
         $sql = "UPDATE $tablename SET $set WHERE $where";
247 247
         if($this->pdo->exec($sql) === false)
248 248
         {
249
-            if (php_sapi_name() !== "cli") {
249
+            if(php_sapi_name() !== "cli") {
250 250
               error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true));
251 251
             }
252 252
             return false;
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
287 287
         $sql = "INSERT INTO $tablename ($cols) VALUES ($set);";
288 288
         if($this->pdo->exec($sql) === false)
289 289
         {
290
-            if (php_sapi_name() !== "cli") {
290
+            if(php_sapi_name() !== "cli") {
291 291
                 error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true));
292 292
             }
293 293
             return false;
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -246,7 +246,8 @@  discard block
 block discarded – undo
246 246
         $sql = "UPDATE $tablename SET $set WHERE $where";
247 247
         if($this->pdo->exec($sql) === false)
248 248
         {
249
-            if (php_sapi_name() !== "cli") {
249
+            if (php_sapi_name() !== "cli")
250
+            {
250 251
               error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true));
251 252
             }
252 253
             return false;
@@ -287,7 +288,8 @@  discard block
 block discarded – undo
287 288
         $sql = "INSERT INTO $tablename ($cols) VALUES ($set);";
288 289
         if($this->pdo->exec($sql) === false)
289 290
         {
290
-            if (php_sapi_name() !== "cli") {
291
+            if (php_sapi_name() !== "cli")
292
+            {
291 293
                 error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true));
292 294
             }
293 295
             return false;
Please login to merge, or discard this patch.