psfs / core

src/services/DocumentorService.php

Doc Comments +1 added lines, -1 removed lines

@@ -360,7 +360,7 @@
      * Translator from php types to swagger types
      * @param string $format
      *
-     * @return array
+     * @return string[]
      */
     public static function translateSwaggerFormats($format)
     {

Spacing +11 added lines, -11 removed lines

@@ -39,10 +39,10 @@ 
                     if (!preg_match('/^ROOT/i', $module)) {
                         $modules[] = [
                             'name' => $module,
-                            'path' => realpath($info['template'] . DIRECTORY_SEPARATOR . '..'),
+                            'path' => realpath($info['template'].DIRECTORY_SEPARATOR.'..'),
                         ];
                     }
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     $modules[] = $e->getMessage();
                 }
             }
@@ -60,7 +60,7 @@ 
      */
     public function extractApiEndpoints(array $module)
     {
-        $module_path = $module['path'] . DIRECTORY_SEPARATOR . 'Api';
+        $module_path = $module['path'].DIRECTORY_SEPARATOR.'Api';
         $module_name = $module['name'];
         $endpoints = [];
         if (file_exists($module_path)) {
@@ -69,7 +69,7 @@ 
             if (count($finder)) {
                 /** @var \SplFileInfo $file */
                 foreach ($finder as $file) {
-                    $namespace = "\\{$module_name}\\Api\\" . str_replace('.php', '', $file->getFilename());
+                    $namespace = "\\{$module_name}\\Api\\".str_replace('.php', '', $file->getFilename());
                     $info = $this->extractApiInfo($namespace, $module_name);
                     if (!empty($info)) {
                         $endpoints[$namespace] = $info;
@@ -98,7 +98,7 @@ 
                     if (NULL !== $mInfo) {
                         $info[] = $mInfo;
                     }
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::getInstance()->errorLog($e->getMessage());
                 }
             }
@@ -309,7 +309,7 @@ 
             } elseif (null !== $reflector && $reflector->isSubclassOf(self::DTO_INTERFACE)) {
                 $payload = $this->extractDtoProperties($namespace);
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::getInstance()->errorLog($e->getMessage());
         }
 
@@ -346,7 +346,7 @@ 
                     if (in_array($methodInfo['method'], ['POST', 'PUT'])) {
                         $methodInfo['payload'] = $this->extractPayload($modelNamespace, $docComments);
                     }
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     jpre($e->getMessage());
                     Logger::getInstance()->errorLog($e->getMessage());
                 }
@@ -425,13 +425,13 @@ 
                         ]]);
                         if (array_key_exists($subDtoName, $subDto)) {
                             $definitions = $subDto;
-                        } else {
+                        }else {
                             $definitions[$subDtoName] = $subDto;
                         }
                         $dto['properties'][$field] = [
-                            '$ref' => "#/definitions/" . $subDtoName,
+                            '$ref' => "#/definitions/".$subDtoName,
                         ];
-                    } else {
+                    }else {
                         list($type, $format) = self::translateSwaggerFormats($format);
                         $dto['properties'][$field] = [
                             "type" => $type,
@@ -489,7 +489,7 @@ 
     protected function extractDtoName($dto, $isArray = false)
     {
         $dto = explode('\\', $dto);
-        $modelDto = array_pop($dto) . "Dto";
+        $modelDto = array_pop($dto)."Dto";
         if ($isArray) {
             $modelDto .= "List";
         }

src/base/config/LoginForm.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
             ))
             ->addButton('submit', _("Acceder como {{username}}"))
             ->addButton("cancel", _("Cancelar"), "button", array(
-                "onclick" => "javacript:location.href = \"" . Router::getInstance()->getRoute('') . "\";",
+                "onclick" => "javacript:location.href = \"".Router::getInstance()->getRoute('')."\";",
                 "class" => "btn-link",
             ));
     }

src/base/config/ConfigForm.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
             "class" => "btn-success col-md-offset-2"
         ))
             ->addButton('add_field', _('Añadir nuevo parámetro'), 'button', array(
-                "onclick" => "javascript:addNewField(document.getElementById('" . $this->getName() . "'));",
+                "onclick" => "javascript:addNewField(document.getElementById('".$this->getName()."'));",
                 "class" => "btn-warning",
             ));
     }

src/base/dto/Dto.php

Spacing +2 added lines, -2 removed lines

@@ -36,8 +36,8 @@
                     $dto[$property->getName()] = $property->getValue($this);
                 }
             }
-        } catch (\Exception $e) {
-            Logger::log(get_class($this) . ': ' . $e->getMessage(), LOG_ERR);
+        }catch (\Exception $e) {
+            Logger::log(get_class($this).': '.$e->getMessage(), LOG_ERR);
         }
         return $dto;
     }

src/base/dto/Order.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
     {
         if (preg_match('/^asc$/i', $direction)) {
             return Order::ASC;
-        } else {
+        }else {
             return Order::DESC;
         }
     }

src/base/types/Controller.php

Spacing +6 added lines, -6 removed lines

@@ -36,7 +36,7 @@ 
     {
         $vars['__menu__'] = $this->getMenu();
         $domain = (null === $domain) ? $this->getDomain() : $domain;
-        return $this->tpl->render($domain . $template, $vars, $cookies);
+        return $this->tpl->render($domain.$template, $vars, $cookies);
     }
 
     /**
@@ -67,7 +67,7 @@ 
     {
         $vars['__menu__'] = $this->getMenu();
         $domain = $domain ?: $this->getDomain();
-        return $this->tpl->dump($domain . $template, $vars);
+        return $this->tpl->dump($domain.$template, $vars);
     }
 
     /**
@@ -96,15 +96,15 @@ 
         /////////////////////////////////////////////////////////////
         // Date in the past sets the value to already have been expired.
         header("Expires: Sat, 26 Jul 1997 05:00:00 GMT");
-        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+        header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
         header('Cache-Control: no-store, no-cache, must-revalidate'); // HTTP/1.1
         header('Cache-Control: pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
         header("Pragma: no-cache");
         header("Expires: 0");
         header('Content-Transfer-Encoding: none');
-        header("Content-type: " . $content);
-        header("Content-length: " . strlen($data));
-        header('Content-Disposition: attachment; filename="' . $filename . '"');
+        header("Content-type: ".$content);
+        header("Content-length: ".strlen($data));
+        header('Content-Disposition: attachment; filename="'.$filename.'"');
         echo $data;
         ob_flush();
         ob_end_clean();

src/base/types/AuthApi.php

Spacing +2 added lines, -2 removed lines

@@ -26,13 +26,13 @@
     {
         $namespace = explode('\\', $this->getModelTableMap());
         $module = strtolower($namespace[0]);
-        $secret = Config::getInstance()->get($module . '.api.secret');
+        $secret = Config::getInstance()->get($module.'.api.secret');
         if (NULL === $secret) {
             $secret = Config::getInstance()->get("api.secret");
         }
         if (NULL === $secret) {
             $auth = TRUE;
-        } else {
+        }else {
             $token = Request::getInstance()->getHeader('X-API-SEC-TOKEN');
             if (array_key_exists('API_TOKEN', $this->query)) {
                 $token = $this->query['API_TOKEN'];

src/base/types/Api.php

Spacing +26 added lines, -26 removed lines

@@ -180,7 +180,7 @@ 
      *
      * @param ModelCriteria $query
      */
-    private function addOrders(ModelCriteria &$query)
+    private function addOrders(ModelCriteria & $query)
     {
         $orderAdded = FALSE;
         $tableMap = $this->getTableMap();
@@ -189,7 +189,7 @@ 
                 $orderAdded = TRUE;
                 if ($direction === Order::ASC) {
                     $query->addAscendingOrderByColumn($column->getPhpName());
-                } else {
+                }else {
                     $query->addDescendingOrderByColumn($column->getPhpName());
                 }
             }
@@ -209,7 +209,7 @@ 
         if (count($pks) == 1) {
             $pks = array_keys($pks);
             $this->extraColumns[$pks[0]] = self::API_MODEL_KEY_FIELD;
-        } else {
+        }else {
             throw new ApiException(_('El modelo de la API no está debidamente mapeado, no hay Primary Key o es compuesta'));
         }
     }
@@ -231,7 +231,7 @@ 
             }
             if (null !== $column) {
                 $this->extraColumns[$column->getFullyQualifiedName()] = self::API_LIST_NAME_FIELD;
-            } else {
+            }else {
                 $this->addClassListName($tableMap);
             }
         }
@@ -243,7 +243,7 @@ 
      *
      * @param ModelCriteria $query
      */
-    private function addExtraColumns(ModelCriteria &$query)
+    private function addExtraColumns(ModelCriteria & $query)
     {
         if (self::API_ACTION_LIST === $this->action) {
             $this->addDefaultListField();
@@ -261,7 +261,7 @@ 
      *
      * @param ModelCriteria $query
      */
-    protected function joinTables(ModelCriteria &$query)
+    protected function joinTables(ModelCriteria & $query)
     {
         //TODO for specific implementations
     }
@@ -283,14 +283,14 @@ 
      *
      * @param ModelCriteria $query
      */
-    private function addFilters(ModelCriteria &$query)
+    private function addFilters(ModelCriteria & $query)
     {
         if (count($this->query) > 0) {
             $tableMap = $this->getTableMap();
             foreach ($this->query as $field => $value) {
                 if (self::API_COMBO_FIELD === $field) {
                     ApiHelper::composerComboField($tableMap, $query, $this->extraColumns, $value);
-                } else {
+                }else {
                     ApiHelper::addModelField($tableMap, $query, $field, $value);
                 }
             }
@@ -300,7 +300,7 @@ 
     /**
      * @param ModelCriteria $query
      */
-    private function checkReturnFields(ModelCriteria &$query)
+    private function checkReturnFields(ModelCriteria & $query)
     {
         $returnFields = $this->getRequest()->getQuery('__fields');
         if (null !== $returnFields) {
@@ -336,10 +336,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::log($e->getMessage(), LOG_ERR);
         }
     }
@@ -356,7 +356,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());
         }
     }
@@ -447,8 +447,8 @@ 
                 $saved = TRUE;
                 $model = $this->model->toArray();
             }
-        } catch (\Exception $e) {
-            $model = _('Ha ocurrido un error intentando guardar el elemento: ') . $e->getMessage();
+        }catch (\Exception $e) {
+            $model = _('Ha ocurrido un error intentando guardar el elemento: ').$e->getMessage();
             Logger::log($e->getMessage(), LOG_ERR);
         }
 
@@ -478,7 +478,7 @@ 
                     $this->model->delete($this->con);
                     $deleted = TRUE;
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 $message = _('Ha ocurrido un error intentando eliminar el elemento, por favor verifica que no tenga otros elementos relacionados');
                 Logger::getInstance(get_class($this->model))->errorLog($e->getMessage());
             }
@@ -513,14 +513,14 @@ 
                     $updated = TRUE;
                     $status = 200;
                     $model = $this->model->toArray();
-                } else {
+                }else {
                     $model = _('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs');
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 $model = $e->getMessage();
                 Logger::getInstance(get_class($this->model))->errorLog($e->getMessage());
             }
-        } else {
+        }else {
             $model = _('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs');
         }
 
@@ -532,7 +532,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($this->con);
 
@@ -576,7 +576,7 @@ 
         if (null !== $this->con && $this->con->inTransaction()) {
             if ($status === 200) {
                 $this->con->commit();
-            } else {
+            }else {
                 $this->con->rollBack();
             }
         }
@@ -628,8 +628,8 @@ 
             "domain" => $this->getDomain(),
             "listLabel" => self::API_LIST_NAME_FIELD,
             'modelId' => self::API_MODEL_KEY_FIELD,
-            'formUrl' => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower('admin-api-form-' . $this->getDomain() . '-' . $this->getApi()), TRUE)),
-            "url" => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower($this->getDomain() . '-' . 'api-' . $this->getApi() . "-pk"), TRUE)),
+            'formUrl' => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower('admin-api-form-'.$this->getDomain().'-'.$this->getApi()), TRUE)),
+            "url" => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower($this->getDomain().'-'.'api-'.$this->getApi()."-pk"), TRUE)),
         ), [], '');
     }
 
@@ -668,7 +668,7 @@ 
                 $total = $this->list->getNbResults();
                 $pages = $this->list->getLastPage();
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::getInstance(get_class($this))->errorLog($e->getMessage());
         }
 
@@ -687,7 +687,7 @@ 
         $return = array();
         if (NULL === $model && method_exists($model, 'toArray')) {
             $code = 404;
-        } else {
+        }else {
             $return = $model->toArray();
         }
 
@@ -702,10 +702,10 @@ 
         $pks = '';
         $sep = '';
         foreach ($tableMap->getPrimaryKeys() as $pk) {
-            $pks .= $sep . $pk->getFullyQualifiedName();
+            $pks .= $sep.$pk->getFullyQualifiedName();
             $sep = ', "|", ';
         }
-        $this->extraColumns['CONCAT("' . $tableMap->getPhpName() . ' #", ' . $pks . ')'] = self::API_LIST_NAME_FIELD;
+        $this->extraColumns['CONCAT("'.$tableMap->getPhpName().' #", '.$pks.')'] = self::API_LIST_NAME_FIELD;
     }
 
     /**

src/base/extension/AssetsNode.php

Spacing +3 added lines, -3 removed lines

@@ -30,16 +30,16 @@
         $scripts = $this->getNode("scripts");
 
         //Creamos el parser
-        $compiler->addDebugInfo($scripts)->write('$parser = new \\PSFS\\base\\extension\\AssetsParser(\'' . $this->type . '\')')
+        $compiler->addDebugInfo($scripts)->write('$parser = new \\PSFS\\base\\extension\\AssetsParser(\''.$this->type.'\')')
             ->raw(";\n");
 
         //Asociamos el hash
-        $compiler->write('$parser->setHash(\'' . $this->hash . '\')')
+        $compiler->write('$parser->setHash(\''.$this->hash.'\')')
             ->raw(";\n");
 
         //Asociamos los ficheros
         foreach ($scripts->getAttribute("value") as $value) {
-            $compiler->write('$parser->addFile(\'' . $value . '\')')->raw(";\n");
+            $compiler->write('$parser->addFile(\''.$value.'\')')->raw(";\n");
         }
 
         //Procesamos los ficheros