Completed
Push — master ( d580f1...36f3e7 )
by Fran
06:21
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
         }
@@ -312,14 +312,14 @@  discard block
 block discarded – undo
312 312
                     $return = $this->list->toArray();
313 313
                     $total = $this->list->getNbResults();
314 314
                     $pages = $this->list->getLastPage();
315
-                } catch (\Exception $e) {
315
+                }catch (\Exception $e) {
316 316
                     Logger::getInstance(get_class($this))->errorLog($e->getMessage());
317 317
                 }
318
-            } else {
318
+            }else {
319 319
                 $return = $this->_get($pk);
320 320
                 if (NULL === $return) {
321 321
                     $code = 404;
322
-                } else {
322
+                }else {
323 323
                     $return = $return->toArray();
324 324
                 }
325 325
             }
@@ -370,7 +370,7 @@  discard block
 block discarded – undo
370 370
                     $saved = TRUE;
371 371
                     $model = $this->model->toArray();
372 372
                 }
373
-            } catch (\Exception $e) {
373
+            }catch (\Exception $e) {
374 374
                 Logger::getInstance()->errorLog($e->getMessage());
375 375
             }
376 376
 
@@ -398,7 +398,7 @@  discard block
 block discarded – undo
398 398
                         $this->model->delete($this->con);
399 399
                         $deleted = TRUE;
400 400
                     }
401
-                } catch (\Exception $e) {
401
+                }catch (\Exception $e) {
402 402
                     Logger::getInstance(get_class($this->model))->errorLog($e->getMessage());
403 403
                 }
404 404
             }
@@ -441,7 +441,7 @@  discard block
 block discarded – undo
441 441
          */
442 442
         private function extractQuery()
443 443
         {
444
-            $queryReflector = new \ReflectionClass($this->getModelNamespace() . "Query");
444
+            $queryReflector = new \ReflectionClass($this->getModelNamespace()."Query");
445 445
             /** @var \Propel\Runtime\ActiveQuery\ModelCriteria $query */
446 446
             $query = $queryReflector->getMethod('create')->invoke(NULL);
447 447
 
@@ -485,7 +485,7 @@  discard block
 block discarded – undo
485 485
             if ($this->con->inTransaction()) {
486 486
                 if ($status === 200) {
487 487
                     $this->con->commit();
488
-                } else {
488
+                }else {
489 489
                     $this->con->rollBack();
490 490
                 }
491 491
             }
@@ -528,7 +528,7 @@  discard block
 block discarded – undo
528 528
             return $this->render('api.admin.html.twig', array(
529 529
                 "api"    => $this->getApi(),
530 530
                 "domain" => $this->domain,
531
-                "url"    => preg_replace('/\/$/', '', $this->getRoute(strtolower('api-' . $this->getApi() . "-pk"), TRUE)),
531
+                "url"    => preg_replace('/\/$/', '', $this->getRoute(strtolower('api-'.$this->getApi()."-pk"), TRUE)),
532 532
             ));
533 533
         }
534 534
 
Please login to merge, or discard this patch.