Completed
Push — master ( 297f50...fac5e1 )
by Fran
05:32
created
src/base/types/Api.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
          *
180 180
          * @param ModelCriteria $query
181 181
          */
182
-        private function addOrders(ModelCriteria &$query)
182
+        private function addOrders(ModelCriteria & $query)
183 183
         {
184 184
             $orderAdded = FALSE;
185 185
             foreach ($this->order->getOrders() as $field => $direction) {
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
                     $orderAdded = TRUE;
188 188
                     if ($direction === Order::ASC) {
189 189
                         $query->addAscendingOrderByColumn($field);
190
-                    } else {
190
+                    }else {
191 191
                         $query->addDescendingOrderByColumn($field);
192 192
                     }
193 193
                 }
@@ -201,9 +201,9 @@  discard block
 block discarded – undo
201 201
          * Add extra columns to pagination query
202 202
          * @param ModelCriteria $query
203 203
          */
204
-        private function addExtraColumns(ModelCriteria &$query)
204
+        private function addExtraColumns(ModelCriteria & $query)
205 205
         {
206
-            if(!empty($this->extraColumns)) {
206
+            if (!empty($this->extraColumns)) {
207 207
                 foreach ($this->extraColumns as $expression => $columnName) {
208 208
                     $query->withColumn($expression, $columnName);
209 209
                 }
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
          * Method that allow joins between models
215 215
          * @param ModelCriteria $query
216 216
          */
217
-        protected function joinTables(ModelCriteria &$query)
217
+        protected function joinTables(ModelCriteria & $query)
218 218
         {
219 219
             //TODO for specific implementations
220 220
         }
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
          *
225 225
          * @param ModelCriteria $query
226 226
          */
227
-        private function addFilters(ModelCriteria &$query)
227
+        private function addFilters(ModelCriteria & $query)
228 228
         {
229 229
             if (count($this->query) > 0) {
230 230
                 foreach ($this->query as $field => $value) {
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
                         } elseif (preg_match('/^(\'|\")(.*)(\'|\")$/', $value)) {
242 242
                             $text = preg_replace('/(\'|\")/', '', $value);
243 243
                             $query->filterBy($tableField, $text, Criteria::LIKE);
244
-                        } else {
244
+                        }else {
245 245
                             $query->filterBy($tableField, $value, Criteria::EQUAL);
246 246
                         }
247 247
                     }
@@ -264,10 +264,10 @@  discard block
 block discarded – undo
264 264
                 list($page, $limit) = $this->extractPagination();
265 265
                 if ($limit == -1) {
266 266
                     $this->list = $query->find($this->con);
267
-                } else {
267
+                }else {
268 268
                     $this->list = $query->paginate($page, $limit, $this->con);
269 269
                 }
270
-            } catch (\Exception $e) {
270
+            }catch (\Exception $e) {
271 271
                 Logger::getInstance(get_class($this))->errorLog($e->getMessage());
272 272
             }
273 273
         }
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
                 $this->joinTables($query);
285 285
                 $this->addExtraColumns($query);
286 286
                 $this->model = $query->findPk($pk);
287
-            } catch (\Exception $e) {
287
+            }catch (\Exception $e) {
288 288
                 Logger::getInstance(get_class($this))->errorLog($e->getMessage());
289 289
             }
290 290
         }
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
             $pages = 1;
309 309
             if (NULL === $pk || '' === $pk) {
310 310
                 list($return, $total, $pages) = $this->getList();
311
-            } else {
311
+            }else {
312 312
                 list($code, $return) = $this->getSingleResult($pk);
313 313
 
314 314
             }
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
359 359
                     $saved = TRUE;
360 360
                     $model = $this->model->toArray();
361 361
                 }
362
-            } catch (\Exception $e) {
362
+            }catch (\Exception $e) {
363 363
                 jpre($e->getMessage(), true);
364 364
                 Logger::getInstance()->errorLog($e->getMessage());
365 365
             }
@@ -388,7 +388,7 @@  discard block
 block discarded – undo
388 388
                         $this->model->delete($this->con);
389 389
                         $deleted = TRUE;
390 390
                     }
391
-                } catch (\Exception $e) {
391
+                }catch (\Exception $e) {
392 392
                     Logger::getInstance(get_class($this->model))->errorLog($e->getMessage());
393 393
                 }
394 394
             }
@@ -431,7 +431,7 @@  discard block
 block discarded – undo
431 431
          */
432 432
         private function extractQuery()
433 433
         {
434
-            $queryReflector = new \ReflectionClass($this->getModelNamespace() . "Query");
434
+            $queryReflector = new \ReflectionClass($this->getModelNamespace()."Query");
435 435
             /** @var \Propel\Runtime\ActiveQuery\ModelCriteria $query */
436 436
             $query = $queryReflector->getMethod('create')->invoke(NULL);
437 437
 
@@ -475,7 +475,7 @@  discard block
 block discarded – undo
475 475
             if ($this->con->inTransaction()) {
476 476
                 if ($status === 200) {
477 477
                     $this->con->commit();
478
-                } else {
478
+                }else {
479 479
                     $this->con->rollBack();
480 480
                 }
481 481
             }
@@ -518,7 +518,7 @@  discard block
 block discarded – undo
518 518
             return $this->render('api.admin.html.twig', array(
519 519
                 "api"    => $this->getApi(),
520 520
                 "domain" => $this->domain,
521
-                "url"    => preg_replace('/\/$/', '', $this->getRoute(strtolower('api-' . $this->getApi() . "-pk"), TRUE)),
521
+                "url"    => preg_replace('/\/$/', '', $this->getRoute(strtolower('api-'.$this->getApi()."-pk"), TRUE)),
522 522
             ));
523 523
         }
524 524
 
@@ -554,7 +554,7 @@  discard block
 block discarded – undo
554 554
                 $return = $this->list->toArray();
555 555
                 $total = $this->list->getNbResults();
556 556
                 $pages = $this->list->getLastPage();
557
-            } catch (\Exception $e) {
557
+            }catch (\Exception $e) {
558 558
                 Logger::getInstance(get_class($this))->errorLog($e->getMessage());
559 559
             }
560 560
 
@@ -574,7 +574,7 @@  discard block
 block discarded – undo
574 574
             $return = array();
575 575
             if (NULL === $model) {
576 576
                 $code = 404;
577
-            } else {
577
+            }else {
578 578
                 $return = $model->toArray();
579 579
             }
580 580
             return array($code, $return);
Please login to merge, or discard this patch.