psfs / core

src/base/types/Api.php

Doc Comments +5 added lines, -5 removed lines

@@ -297,7 +297,7 @@ 
          * @CACHE 600
          * @ROUTE /api/{__API__}
          *
-         * @return \PSFS\base\dto\JsonResponse [{__API__}]
+         * @return string|null [{__API__}]
          */
         public function modelList()
         {
@@ -316,7 +316,7 @@ 
          *
          * @param int $pk
          *
-         * @return \PSFS\base\dto\JsonResponse {__API__}
+         * @return string|null {__API__}
          */
         public function get($pk)
         {
@@ -359,7 +359,7 @@ 
          * @PAYLOAD {__API__}
          * @ROUTE /api/{__API__}
          *
-         * @return \PSFS\base\dto\JsonResponse {__API__}
+         * @return string|null {__API__}
          */
         public function post()
         {
@@ -390,7 +390,7 @@ 
          *
          * @param string $pk
          *
-         * @return \PSFS\base\dto\JsonResponse {__API__}
+         * @return string|null {__API__}
          */
         public function delete($pk = NULL)
         {
@@ -420,7 +420,7 @@ 
          *
          * @param string $pk
          *
-         * @return \PSFS\base\dto\JsonResponse {__API__}
+         * @return string|null {__API__}
          *
          */
         public function put($pk)

Spacing +16 added lines, -16 removed lines

@@ -179,7 +179,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        private function addOrders(ModelCriteria &$query)
+        private function addOrders(ModelCriteria & $query)
         {
             $orderAdded = FALSE;
             foreach ($this->order->getOrders() as $field => $direction) {
@@ -187,7 +187,7 @@ 
                     $orderAdded = TRUE;
                     if ($direction === Order::ASC) {
                         $query->addAscendingOrderByColumn($field);
-                    } else {
+                    }else {
                         $query->addDescendingOrderByColumn($field);
                     }
                 }
@@ -202,7 +202,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        private function addExtraColumns(ModelCriteria &$query)
+        private function addExtraColumns(ModelCriteria & $query)
         {
             if (!empty($this->extraColumns)) {
                 foreach ($this->extraColumns as $expression => $columnName) {
@@ -216,7 +216,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        protected function joinTables(ModelCriteria &$query)
+        protected function joinTables(ModelCriteria & $query)
         {
             //TODO for specific implementations
         }
@@ -226,7 +226,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        private function addFilters(ModelCriteria &$query)
+        private function addFilters(ModelCriteria & $query)
         {
             if (count($this->query) > 0) {
                 foreach ($this->query as $field => $value) {
@@ -243,7 +243,7 @@ 
                         } elseif (preg_match('/^(\'|\")(.*)(\'|\")$/', $value)) {
                             $text = preg_replace('/(\'|\")/', '', $value);
                             $query->filterBy($tableField, $text, Criteria::LIKE);
-                        } else {
+                        }else {
                             $query->filterBy($tableField, $value, Criteria::EQUAL);
                         }
                     }
@@ -266,10 +266,10 @@ 
                 list($page, $limit) = $this->extractPagination();
                 if ($limit == -1) {
                     $this->list = $query->find($this->con);
-                } else {
+                }else {
                     $this->list = $query->paginate($page, $limit, $this->con);
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance(get_class($this))->errorLog($e->getMessage());
             }
         }
@@ -286,7 +286,7 @@ 
                 $this->joinTables($query);
                 $this->addExtraColumns($query);
                 $this->model = $query->findPk($pk);
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance(get_class($this))->errorLog($e->getMessage());
             }
         }
@@ -374,7 +374,7 @@ 
                     $saved = TRUE;
                     $model = $this->model->toArray();
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 jpre($e->getMessage(), TRUE);
                 Logger::getInstance()->errorLog($e->getMessage());
             }
@@ -403,7 +403,7 @@ 
                         $this->model->delete($this->con);
                         $deleted = TRUE;
                     }
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::getInstance(get_class($this->model))->errorLog($e->getMessage());
                 }
             }
@@ -447,7 +447,7 @@ 
          */
         private function extractQuery()
         {
-            $queryReflector = new \ReflectionClass($this->getModelNamespace() . "Query");
+            $queryReflector = new \ReflectionClass($this->getModelNamespace()."Query");
             /** @var \Propel\Runtime\ActiveQuery\ModelCriteria $query */
             $query = $queryReflector->getMethod('create')->invoke(NULL);
 
@@ -491,7 +491,7 @@ 
             if ($this->con->inTransaction()) {
                 if ($status === 200) {
                     $this->con->commit();
-                } else {
+                }else {
                     $this->con->rollBack();
                 }
             }
@@ -535,7 +535,7 @@ 
             return $this->render('api.admin.html.twig', array(
                 "api"    => $this->getApi(),
                 "domain" => $this->domain,
-                "url"    => preg_replace('/\/$/', '', $this->getRoute(strtolower('api-' . $this->getApi() . "-pk"), TRUE)),
+                "url"    => preg_replace('/\/$/', '', $this->getRoute(strtolower('api-'.$this->getApi()."-pk"), TRUE)),
             ));
         }
 
@@ -572,7 +572,7 @@ 
                 $return = $this->list->toArray();
                 $total = $this->list->getNbResults();
                 $pages = $this->list->getLastPage();
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance(get_class($this))->errorLog($e->getMessage());
             }
 
@@ -592,7 +592,7 @@ 
             $return = array();
             if (NULL === $model) {
                 $code = 404;
-            } else {
+            }else {
                 $return = $model->toArray();
             }
 

src/services/DocumentorService.php

Spacing +8 added lines, -8 removed lines

@@ -33,7 +33,7 @@ 
                         if (!preg_match('/^\@ROOT/i', $domain)) {
                             $modules[] = str_replace('/', '', str_replace('@', '', $domain));
                         }
-                    } catch (\Exception $e) {
+                    }catch (\Exception $e) {
                         $modules[] = $e->getMessage();
                     }
                 }
@@ -51,7 +51,7 @@ 
          */
         public function extractApiEndpoints($module)
         {
-            $module_path = CORE_DIR . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . "Api";
+            $module_path = CORE_DIR.DIRECTORY_SEPARATOR.$module.DIRECTORY_SEPARATOR."Api";
             $endpoints = [];
             if (file_exists($module_path)) {
                 $finder = new Finder();
@@ -59,7 +59,7 @@ 
                 if (count($finder)) {
                     /** @var \SplFileInfo $file */
                     foreach ($finder as $file) {
-                        $namespace = "\\{$module}\\Api\\" . str_replace('.php', '', $file->getFilename());
+                        $namespace = "\\{$module}\\Api\\".str_replace('.php', '', $file->getFilename());
                         $endpoints[$namespace] = $this->extractApiInfo($namespace);
                     }
                 }
@@ -227,7 +227,7 @@ 
             if (count($returnTypes)) {
                 $closure = $modelDto = [];
                 $isArray = false;
-                foreach($returnTypes as $returnType) {
+                foreach ($returnTypes as $returnType) {
                     try {
                         if (false === strpos($returnType, '@')) {
                             $class = str_replace('{__API__}', $model, $returnType);
@@ -238,15 +238,15 @@ 
                             if (class_exists($class)) {
                                 $reflector = new \ReflectionClass($class);
                                 if ($reflector->isSubclassOf(self::DTO_INTERFACE)) {
-                                    foreach($reflector->getProperties(\ReflectionMethod::IS_PUBLIC) as $property) {
+                                    foreach ($reflector->getProperties(\ReflectionMethod::IS_PUBLIC) as $property) {
                                         $closure[$property->getName()] = $this->extractVarType($property->getDocComment());
                                     }
-                                } else {
+                                }else {
                                     $modelDto = $this->extractModelFields($class);
                                 }
                             }
                         }
-                    } catch(\Exception $e) {
+                    }catch (\Exception $e) {
                         Logger::getInstance()->errorLog($e->getMessage());
                     }
                 }
@@ -279,7 +279,7 @@ 
                         }
                     }
                 }
-            } catch(\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance()->errorLog($e->getMessage());
             }