psfs / core

src/base/types/helpers/ApiFormHelper.php

Spacing +3 added lines, -3 removed lines

@@ -19,11 +19,11 @@
     public static function checkApiActions($namespace, $domain, $api) {
         $actions = [];
         $reflector = new ReflectionClass($namespace);
-        if(null !== $reflector) {
-            foreach($reflector->getMethods(ReflectionMethod::IS_PUBLIC) as $apiAction) {
+        if (null !== $reflector) {
+            foreach ($reflector->getMethods(ReflectionMethod::IS_PUBLIC) as $apiAction) {
                 $docComments = $apiAction->getDocComment();
                 $action = AnnotationHelper::extractAction($docComments);
-                if(null !== $action) {
+                if (null !== $action) {
                     list($route, $info) = RouterHelper::extractRouteInfo($apiAction, $api, $domain);
                     list($method, $cleanRoute) = RouterHelper::extractHttpRoute($route);
                     $formAction = new FormAction();

src/base/types/helpers/InjectorHelper.php

Spacing +7 added lines, -7 removed lines

@@ -31,10 +31,10 @@ 
                 $label = self::getLabel($property->getDocComment());
                 $values = self::getValues($property->getDocComment());
                 $isArray = (bool)preg_match('/\[\]$/', $instanceType);
-                if($isArray) {
+                if ($isArray) {
                     $instanceType = str_replace('[]', '', $instanceType);
                 }
-                if($instanceType === '\\DateTime' || !Router::exists($instanceType)) {
+                if ($instanceType === '\\DateTime' || !Router::exists($instanceType)) {
                     list($type, $format) = DocumentorHelper::translateSwaggerFormats($instanceType);
                     $variables[$property->getName()] = [
                         'type' => $type,
@@ -42,7 +42,7 @@ 
                         'required' => $isRequired,
                         'description' => $label,
                     ];
-                } else {
+                }else {
                     $instance = new ReflectionClass($instanceType);
                     $variables[$property->getName()] = [
                         'is_array' => $isArray,
@@ -51,7 +51,7 @@ 
                         'properties' => self::extractVariables($instance),
                     ];
                 }
-                if(!empty($values)){
+                if (!empty($values)) {
                     $variables[$property->getName()]['enum'] = $values;
                 }
             }
@@ -155,13 +155,13 @@ 
      */
     public static function constructInjectableInstance($variable, $singleton, $classNameSpace, $calledClass)
     {
-        Logger::log('Create inyectable instance for ' . $classNameSpace);
+        Logger::log('Create inyectable instance for '.$classNameSpace);
         $reflector = new ReflectionClass($calledClass);
         $property = $reflector->getProperty($variable);
         $varInstanceType = (null === $classNameSpace) ? InjectorHelper::extractVarType($property->getDocComment()) : $classNameSpace;
         if (true === $singleton && method_exists($varInstanceType, 'getInstance')) {
             $instance = $varInstanceType::getInstance();
-        } else {
+        }else {
             $instance = new $varInstanceType();
         }
         return $instance;
@@ -175,7 +175,7 @@ 
     public static function getClassProperties($class)
     {
         $properties = [];
-        Logger::log('Extracting annotations properties from class ' . $class);
+        Logger::log('Extracting annotations properties from class '.$class);
         $selfReflector = new ReflectionClass($class);
         if (false !== $selfReflector->getParentClass()) {
             $properties = self::getClassProperties($selfReflector->getParentClass()->getName());

src/base/types/helpers/AnnotationHelper.php

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
      * @return string|null
      */
     public static function extractFromDoc($needle, $comments, $default = null) {
-        preg_match('/@' . $needle . '\ (.*)(\n|\r)/im', $comments, $matches);
+        preg_match('/@'.$needle.'\ (.*)(\n|\r)/im', $comments, $matches);
         return (count($matches) > 0) ? $matches[1] : $default;
     }
 }

src/base/types/traits/Helper/FieldHelperTrait.php

Spacing +13 added lines, -13 removed lines

@@ -122,27 +122,27 @@ 
         $behaviors = $tableMap->getBehaviors();
         foreach ($map::getFieldNames() as $field) {
             $fDto = self::parseFormField($domain, $tableMap, $field, $behaviors);
-            if(null !== $fDto) {
+            if (null !== $fDto) {
                 $form->addField($fDto);
             }
         }
 
-        if(array_key_exists('i18n', $behaviors)) {
-            $relateI18n = $tableMap->getRelation($tableMap->getPhpName() . 'I18n');
-            if(null !== $relateI18n) {
+        if (array_key_exists('i18n', $behaviors)) {
+            $relateI18n = $tableMap->getRelation($tableMap->getPhpName().'I18n');
+            if (null !== $relateI18n) {
                 $i18NTableMap = $relateI18n->getLocalTable();
-                foreach($i18NTableMap->getColumns() as $columnMap) {
+                foreach ($i18NTableMap->getColumns() as $columnMap) {
                     $columnName = self::getColumnMapName($columnMap);
-                    if(!$form->fieldExists($columnName)) {
+                    if (!$form->fieldExists($columnName)) {
                         /** @var Field $fDto */
                         $fDto = self::parseFormField($domain, $i18NTableMap, $columnMap->getPhpName(), $i18NTableMap->getBehaviors());
-                        if(null !== $fDto) {
+                        if (null !== $fDto) {
                             $fDto->pk = false;
                             $fDto->required = true;
-                            if(strtolower($fDto->name) === 'locale') {
+                            if (strtolower($fDto->name) === 'locale') {
                                 $fDto->type = Field::COMBO_TYPE;
                                 $languages = explode(',', Config::getParam('i18n.locales', Config::getParam('default.language', 'es_ES')));
-                                foreach($languages as $language) {
+                                foreach ($languages as $language) {
                                     $fDto->data[] = [
                                         $fDto->name => $language,
                                         'Label' => t($language),
@@ -169,14 +169,14 @@ 
     {
         $column = null;
         try {
-            foreach($tableMap->getColumns() as $tableMapColumn) {
+            foreach ($tableMap->getColumns() as $tableMapColumn) {
                 $columnName = $tableMapColumn->getPhpName();
-                if(preg_match('/^'.$field.'$/i', $columnName)) {
+                if (preg_match('/^'.$field.'$/i', $columnName)) {
                     $column = $tableMapColumn;
                     break;
                 }
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_DEBUG);
         }
         return $column;
@@ -187,7 +187,7 @@ 
      */
     public static function getFieldTypes() {
         $configType = Config::getParam('api.field.case', TableMap::TYPE_PHPNAME);
-        switch($configType) {
+        switch ($configType) {
             default:
             case 'UpperCamelCase':
             case TableMap::TYPE_PHPNAME:

src/controller/I18nController.php

Spacing +3 added lines, -3 removed lines

@@ -44,8 +44,8 @@ 
         //Generating the templates translations
         $translations = $this->tpl->regenerateTemplates();
 
-        $localePath = realpath(BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
-        $localePath .= DIRECTORY_SEPARATOR . $locale . DIRECTORY_SEPARATOR . 'LC_MESSAGES' . DIRECTORY_SEPARATOR;
+        $localePath = realpath(BASE_DIR.DIRECTORY_SEPARATOR.'locale');
+        $localePath .= DIRECTORY_SEPARATOR.$locale.DIRECTORY_SEPARATOR.'LC_MESSAGES'.DIRECTORY_SEPARATOR;
 
         //xgettext localizations
         $translations = array_merge($translations, I18nHelper::findTranslations(SOURCE_DIR, $locale));
@@ -53,7 +53,7 @@ 
         $translations = array_merge($translations, I18nHelper::findTranslations(CACHE_DIR, $locale));
 
         $translations[] = "msgfmt {$localePath}translations.po -o {$localePath}translations.mo";
-        $translations[] = shell_exec('export PATH=\$PATH:/opt/local/bin:/bin:/sbin; msgfmt '. $localePath . 'translations.po -o ' . $localePath . 'translations.mo');
+        $translations[] = shell_exec('export PATH=\$PATH:/opt/local/bin:/bin:/sbin; msgfmt '.$localePath.'translations.po -o '.$localePath.'translations.mo');
         return $this->render('translations.html.twig', array(
             'translations' => $translations,
         ));

src/base/types/traits/Generator/StructureTrait.php

Spacing +10 added lines, -10 removed lines

@@ -24,7 +24,7 @@ 
         // Creates the src folder
         GeneratorHelper::createDir($modPath);
         // Create module path
-        GeneratorHelper::createDir($modPath . $module);
+        GeneratorHelper::createDir($modPath.$module);
     }
 
     /**
@@ -40,16 +40,16 @@ 
         Logger::log("Generamos la estructura");
         $paths = [
             "Api", "Config", "Controller", "Models", "Public", "Templates", "Services", "Test", "Doc",
-            "Locale", "Locale/" . Config::getParam('default.locale', 'es_ES'), "Locale/" . Config::getParam('default.locale', 'es_ES') . "/LC_MESSAGES"
+            "Locale", "Locale/".Config::getParam('default.locale', 'es_ES'), "Locale/".Config::getParam('default.locale', 'es_ES')."/LC_MESSAGES"
         ];
-        $modulePath = $modPath . $module;
+        $modulePath = $modPath.$module;
         foreach ($paths as $path) {
-            GeneratorHelper::createDir($modulePath . DIRECTORY_SEPARATOR . $path);
+            GeneratorHelper::createDir($modulePath.DIRECTORY_SEPARATOR.$path);
         }
         //Creamos las carpetas de los assets
         $htmlPaths = array("css", "js", "img", "media", "font");
         foreach ($htmlPaths as $path) {
-            GeneratorHelper::createDir($modulePath . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . $path);
+            GeneratorHelper::createDir($modulePath.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR.$path);
         }
     }
 
@@ -64,10 +64,10 @@ 
         //Generamos el fichero de configuración
         Logger::log("Generamos ficheros para assets base");
         $css = $this->writeTemplateToFile("/* CSS3 STYLES */\n\n",
-            $modPath . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . "css" . DIRECTORY_SEPARATOR . "styles.css",
+            $modPath.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR."css".DIRECTORY_SEPARATOR."styles.css",
             $force);
         $js = $this->writeTemplateToFile("/* APP MODULE JS */\n\n(function() {\n\t'use strict';\n})();",
-            $modPath . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . "js" . DIRECTORY_SEPARATOR . "app.js",
+            $modPath.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR."js".DIRECTORY_SEPARATOR."app.js",
             $force);
         return ($css && $js);
     }
@@ -89,7 +89,7 @@ 
             "class" => $class,
         ));
         return $this->writeTemplateToFile($controller,
-            $modPath . DIRECTORY_SEPARATOR . "Services" . DIRECTORY_SEPARATOR . "{$class}Service.php",
+            $modPath.DIRECTORY_SEPARATOR."Services".DIRECTORY_SEPARATOR."{$class}Service.php",
             $force);
     }
 
@@ -108,13 +108,13 @@ 
             "autoloader" => preg_replace('/(\\\|\/)/', '_', $module),
             "regex" => preg_replace('/(\\\|\/)/m', '\\\\\\\\\\\\', $module),
         ));
-        $autoload = $this->writeTemplateToFile($autoloader, $mod_path . DIRECTORY_SEPARATOR . "autoload.php", $force);
+        $autoload = $this->writeTemplateToFile($autoloader, $mod_path.DIRECTORY_SEPARATOR."autoload.php", $force);
 
         Logger::log("Generamos el phpunit");
         $phpUnitTemplate = $this->tpl->dump("generator/phpunit.template.twig", array(
             "module" => $module,
         ));
-        $phpunit = $this->writeTemplateToFile($phpUnitTemplate, $mod_path . DIRECTORY_SEPARATOR . "phpunit.xml.dist", $force);
+        $phpunit = $this->writeTemplateToFile($phpUnitTemplate, $mod_path.DIRECTORY_SEPARATOR."phpunit.xml.dist", $force);
         return $autoload && $phpunit;
     }
 }

src/base/types/traits/TemplateTrait.php

Spacing +3 added lines, -3 removed lines

@@ -28,11 +28,11 @@
             try {
                 Cache::getInstance()->storeData($filename, $fileContent, Cache::TEXT, true);
                 $created = true;
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::log($e->getMessage(), LOG_ERR);
             }
-        } else {
-            Logger::log($filename . t(' not exists or cant write'), LOG_ERR);
+        }else {
+            Logger::log($filename.t(' not exists or cant write'), LOG_ERR);
         }
         return $created;
     }

src/services/DocumentorService.php

Spacing +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
      */
     public function extractApiEndpoints(array $module)
     {
-        $modulePath = $module['path'] . DIRECTORY_SEPARATOR . 'Api';
+        $modulePath = $module['path'].DIRECTORY_SEPARATOR.'Api';
         $moduleName = $module['name'];
         $endpoints = [];
         if (file_exists($modulePath)) {
@@ -54,7 +54,7 @@ 
                 /** @var SplFileInfo $file */
                 foreach ($finder as $file) {
                     $filename = str_replace([$modulePath, '/'], ['', '\\'], $file->getPathname());
-                    $namespace = "\\{$moduleName}\\Api" . str_replace('.php', '', $filename);
+                    $namespace = "\\{$moduleName}\\Api".str_replace('.php', '', $filename);
                     $info = $this->extractApiInfo($namespace, $moduleName);
                     if (!empty($info)) {
                         $endpoints[$namespace] = $info;
@@ -84,7 +84,7 @@ 
                         if (NULL !== $mInfo) {
                             $info[] = $mInfo;
                         }
-                    } catch (Exception $e) {
+                    }catch (Exception $e) {
                         Logger::log($e->getMessage(), LOG_ERR);
                     }
                 }

src/base/types/traits/Api/SwaggerFormaterTrait.php

Spacing +11 added lines, -11 removed lines

@@ -86,10 +86,10 @@ 
         $formatted = [
             "swagger" => "2.0",
             "host" => preg_replace('/^(http|https)\:\/\/(.*)\/$/i', '$2', Router::getInstance()->getRoute('', true)),
-            "basePath" => '/' . $module['name'] . '/api',
+            "basePath" => '/'.$module['name'].'/api',
             "schemes" => [Request::getInstance()->getServer('HTTPS') === 'on' ? 'https' : 'http'],
             "info" => [
-                "title" => t('Documentación API módulo ') . $module['name'],
+                "title" => t('Documentación API módulo ').$module['name'],
                 "version" => Config::getParam('api.version', '1.0.0'),
                 "contact" => [
                     "name" => Config::getParam("author", "Fran López"),
@@ -101,7 +101,7 @@ 
         foreach ($endpoints as $model) {
             foreach ($model as $endpoint) {
                 if (!preg_match('/^\/(admin|api)\//i', $endpoint['url']) && strlen($endpoint['url'])) {
-                    $url = preg_replace('/\/' . $module['name'] . '\/api/i', '', $endpoint['url']);
+                    $url = preg_replace('/\/'.$module['name'].'\/api/i', '', $endpoint['url']);
                     $description = $endpoint['description'];
                     $method = strtolower($endpoint['method']);
                     $paths[$url][$method] = [
@@ -142,7 +142,7 @@ 
             }
         }
         ksort($dtos);
-        uasort($paths, function ($path1, $path2) {
+        uasort($paths, function($path1, $path2) {
             $key1 = array_keys($path1)[0];
             $key2 = array_keys($path2)[0];
             return strcmp($path1[$key1]['tags'][0], $path2[$key2]['tags'][0]);
@@ -166,13 +166,13 @@ 
                     $modelDto['objects'][$dtoName][$param] = [
                         'type' => 'array',
                         'items' => [
-                            '$ref' => '#/definitions/' . $info['type'],
+                            '$ref' => '#/definitions/'.$info['type'],
                         ]
                     ];
-                } else {
+                }else {
                     $modelDto['objects'][$dtoName][$param] = [
                         'type' => 'object',
-                        '$ref' => '#/definitions/' . $info['type'],
+                        '$ref' => '#/definitions/'.$info['type'],
                     ];
                 }
                 $modelDto['objects'][$info['class']] = $info['properties'];
@@ -180,7 +180,7 @@ 
                 if (array_key_exists('objects', $paramDto)) {
                     $modelDto['objects'] = array_merge($modelDto['objects'], $paramDto['objects']);
                 }
-            } else {
+            }else {
                 $modelDto['objects'][$dtoName][$param] = $info;
             }
         }
@@ -211,7 +211,7 @@ 
                     $return = $this->extractReturn($modelNamespace, $docComments);
                     $url = array_pop($route);
                     $methodInfo = [
-                        'url' => str_replace('/' . $module . '/api', '', $url),
+                        'url' => str_replace('/'.$module.'/api', '', $url),
                         'method' => $info['http'],
                         'description' => $info['label'],
                         'return' => $return,
@@ -222,7 +222,7 @@ 
                     $this->setRequestParams($method, $methodInfo, $modelNamespace, $docComments);
                     $this->setQueryParams($method, $methodInfo);
                     $this->setRequestHeaders($reflection, $methodInfo);
-                } catch (Exception $e) {
+                }catch (Exception $e) {
                     Logger::log($e->getMessage(), LOG_ERR);
                 }
             }
@@ -322,7 +322,7 @@ 
             foreach ($method->getParameters() as $parameter) {
                 $parameterName = $parameter->getName();
                 $types = [];
-                preg_match_all('/\@param\ (.*)\ \$' . $parameterName . '$/im', $docComments, $types);
+                preg_match_all('/\@param\ (.*)\ \$'.$parameterName.'$/im', $docComments, $types);
                 if (count($types) > 1 && count($types[1]) > 0) {
                     $methodInfo['parameters'][$parameterName] = $types[1][0];
                 }