@@ -31,10 +31,10 @@ discard block |
||
31 | 31 | $label = self::getLabel($property->getDocComment()); |
32 | 32 | $values = self::getValues($property->getDocComment()); |
33 | 33 | $isArray = (bool)preg_match('/\[\]$/', $instanceType); |
34 | - if($isArray) { |
|
34 | + if ($isArray) { |
|
35 | 35 | $instanceType = str_replace('[]', '', $instanceType); |
36 | 36 | } |
37 | - if($instanceType === '\\DateTime' || !Router::exists($instanceType)) { |
|
37 | + if ($instanceType === '\\DateTime' || !Router::exists($instanceType)) { |
|
38 | 38 | list($type, $format) = DocumentorHelper::translateSwaggerFormats($instanceType); |
39 | 39 | $variables[$property->getName()] = [ |
40 | 40 | 'type' => $type, |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | 'required' => $isRequired, |
43 | 43 | 'description' => $label, |
44 | 44 | ]; |
45 | - } else { |
|
45 | + }else { |
|
46 | 46 | $instance = new ReflectionClass($instanceType); |
47 | 47 | $variables[$property->getName()] = [ |
48 | 48 | 'is_array' => $isArray, |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | 'properties' => self::extractVariables($instance), |
52 | 52 | ]; |
53 | 53 | } |
54 | - if(!empty($values)){ |
|
54 | + if (!empty($values)) { |
|
55 | 55 | $variables[$property->getName()]['enum'] = $values; |
56 | 56 | } |
57 | 57 | } |
@@ -155,13 +155,13 @@ discard block |
||
155 | 155 | */ |
156 | 156 | public static function constructInjectableInstance($variable, $singleton, $classNameSpace, $calledClass) |
157 | 157 | { |
158 | - Logger::log('Create inyectable instance for ' . $classNameSpace); |
|
158 | + Logger::log('Create inyectable instance for '.$classNameSpace); |
|
159 | 159 | $reflector = new ReflectionClass($calledClass); |
160 | 160 | $property = $reflector->getProperty($variable); |
161 | 161 | $varInstanceType = (null === $classNameSpace) ? InjectorHelper::extractVarType($property->getDocComment()) : $classNameSpace; |
162 | 162 | if (true === $singleton && method_exists($varInstanceType, 'getInstance')) { |
163 | 163 | $instance = $varInstanceType::getInstance(); |
164 | - } else { |
|
164 | + }else { |
|
165 | 165 | $instance = new $varInstanceType(); |
166 | 166 | } |
167 | 167 | return $instance; |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | public static function getClassProperties($class) |
176 | 176 | { |
177 | 177 | $properties = []; |
178 | - Logger::log('Extracting annotations properties from class ' . $class); |
|
178 | + Logger::log('Extracting annotations properties from class '.$class); |
|
179 | 179 | $selfReflector = new ReflectionClass($class); |
180 | 180 | if (false !== $selfReflector->getParentClass()) { |
181 | 181 | $properties = self::getClassProperties($selfReflector->getParentClass()->getName()); |
@@ -92,7 +92,7 @@ |
||
92 | 92 | * @return string|null |
93 | 93 | */ |
94 | 94 | public static function extractFromDoc($needle, $comments, $default = null) { |
95 | - preg_match('/@' . $needle . '\ (.*)(\n|\r)/im', $comments, $matches); |
|
95 | + preg_match('/@'.$needle.'\ (.*)(\n|\r)/im', $comments, $matches); |
|
96 | 96 | return (count($matches) > 0) ? $matches[1] : $default; |
97 | 97 | } |
98 | 98 | } |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | if (count($pks) === 1) { |
82 | 82 | $pks = array_keys($pks); |
83 | 83 | return [ |
84 | - $tableMap::TABLE_NAME . '.' . $pks[0] => Api::API_MODEL_KEY_FIELD |
|
84 | + $tableMap::TABLE_NAME.'.'.$pks[0] => Api::API_MODEL_KEY_FIELD |
|
85 | 85 | ]; |
86 | 86 | } |
87 | 87 | if (count($pks) > 1) { |
@@ -89,9 +89,9 @@ discard block |
||
89 | 89 | $principal = ''; |
90 | 90 | $sep = 'CONCAT('; |
91 | 91 | foreach ($pks as $pk) { |
92 | - $apiPks[$tableMap::TABLE_NAME . '.' . $pk->getName()] = $pk->getPhpName(); |
|
93 | - $principal .= $sep . $tableMap::TABLE_NAME . '.' . $pk->getName(); |
|
94 | - $sep = ', "' . Api::API_PK_SEPARATOR . '", '; |
|
92 | + $apiPks[$tableMap::TABLE_NAME.'.'.$pk->getName()] = $pk->getPhpName(); |
|
93 | + $principal .= $sep.$tableMap::TABLE_NAME.'.'.$pk->getName(); |
|
94 | + $sep = ', "'.Api::API_PK_SEPARATOR.'", '; |
|
95 | 95 | } |
96 | 96 | $principal .= ')'; |
97 | 97 | $apiPks[$principal] = Api::API_MODEL_KEY_FIELD; |
@@ -118,10 +118,10 @@ discard block |
||
118 | 118 | $pks = ''; |
119 | 119 | $sep = ''; |
120 | 120 | foreach ($tableMap->getPrimaryKeys() as $pk) { |
121 | - $pks .= $sep . $pk->getFullyQualifiedName(); |
|
121 | + $pks .= $sep.$pk->getFullyQualifiedName(); |
|
122 | 122 | $sep = ', "|", '; |
123 | 123 | } |
124 | - $this->extraColumns['CONCAT("' . $tableMap->getPhpName() . ' #", ' . $pks . ')'] = Api::API_LIST_NAME_FIELD; |
|
124 | + $this->extraColumns['CONCAT("'.$tableMap->getPhpName().' #", '.$pks.')'] = Api::API_LIST_NAME_FIELD; |
|
125 | 125 | } |
126 | 126 | |
127 | 127 | /** |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | } |
144 | 144 | if (null !== $column) { |
145 | 145 | $this->extraColumns[$column->getFullyQualifiedName()] = Api::API_LIST_NAME_FIELD; |
146 | - } else { |
|
146 | + }else { |
|
147 | 147 | $this->addClassListName($tableMap); |
148 | 148 | } |
149 | 149 | } |
@@ -161,15 +161,15 @@ discard block |
||
161 | 161 | $this->addPkToList(); |
162 | 162 | } |
163 | 163 | if (!empty($this->extraColumns)) { |
164 | - if(Config::getParam('api.extrafields.compat', true)) { |
|
164 | + if (Config::getParam('api.extrafields.compat', true)) { |
|
165 | 165 | $fields = array_values($this->extraColumns); |
166 | - } else { |
|
166 | + }else { |
|
167 | 167 | $returnFields = Request::getInstance()->getQuery(Api::API_FIELDS_RESULT_FIELD); |
168 | 168 | $fields = explode(',', $returnFields ?: ''); |
169 | 169 | $fields[] = self::API_MODEL_KEY_FIELD; |
170 | 170 | } |
171 | 171 | foreach ($this->extraColumns as $expression => $columnName) { |
172 | - if(empty($fields) || in_array($columnName, $fields)) { |
|
172 | + if (empty($fields) || in_array($columnName, $fields)) { |
|
173 | 173 | $query->withColumn($expression, $columnName); |
174 | 174 | } |
175 | 175 | } |
@@ -200,18 +200,18 @@ discard block |
||
200 | 200 | { |
201 | 201 | $this->extractApiLang(); |
202 | 202 | $model = $this->getModelNamespace(); |
203 | - $modelI18n = $model . 'I18n'; |
|
203 | + $modelI18n = $model.'I18n'; |
|
204 | 204 | if (method_exists($query, 'useI18nQuery')) { |
205 | 205 | $query->useI18nQuery($this->lang); |
206 | 206 | $modelParts = explode('\\', $modelI18n); |
207 | - $i18nMapClass = str_replace(end($modelParts), 'Map\\' . end($modelParts), $modelI18n) . 'TableMap'; |
|
207 | + $i18nMapClass = str_replace(end($modelParts), 'Map\\'.end($modelParts), $modelI18n).'TableMap'; |
|
208 | 208 | /** @var TableMap $modelI18nTableMap */ |
209 | 209 | $modelI18nTableMap = $i18nMapClass::getTableMap(); |
210 | - foreach($modelI18nTableMap->getColumns() as $columnMap) { |
|
211 | - if(!$columnMap->isPrimaryKey()) { |
|
210 | + foreach ($modelI18nTableMap->getColumns() as $columnMap) { |
|
211 | + if (!$columnMap->isPrimaryKey()) { |
|
212 | 212 | $query->withColumn($columnMap->getFullyQualifiedName(), ApiHelper::getColumnMapName($columnMap)); |
213 | - } elseif(!$columnMap->isForeignKey()) { |
|
214 | - $query->withColumn('IFNULL(' . $columnMap->getFullyQualifiedName() . ', "'.$this->lang.'")', ApiHelper::getColumnMapName($columnMap)); |
|
213 | + } elseif (!$columnMap->isForeignKey()) { |
|
214 | + $query->withColumn('IFNULL('.$columnMap->getFullyQualifiedName().', "'.$this->lang.'")', ApiHelper::getColumnMapName($columnMap)); |
|
215 | 215 | } |
216 | 216 | } |
217 | 217 | } |
@@ -225,22 +225,22 @@ discard block |
||
225 | 225 | $model->fromArray($data, ApiHelper::getFieldTypes()); |
226 | 226 | $tableMap = $this->getTableMap(); |
227 | 227 | try { |
228 | - if($tableMap->hasRelation($tableMap->getPhpName() . 'I18n')) |
|
228 | + if ($tableMap->hasRelation($tableMap->getPhpName().'I18n')) |
|
229 | 229 | { |
230 | - $relateI18n = $tableMap->getRelation($tableMap->getPhpName() . 'I18n'); |
|
230 | + $relateI18n = $tableMap->getRelation($tableMap->getPhpName().'I18n'); |
|
231 | 231 | $i18NTableMap = $relateI18n->getLocalTable(); |
232 | 232 | $model->setLocale(array_key_exists('Locale', $data) ? $data['Locale'] : (array_key_exists('locale', $data) ? $data['locale'] : Request::header(Api::HEADER_API_LANG, 'es_ES'))); |
233 | - foreach($i18NTableMap->getColumns() as $columnMap) { |
|
234 | - $method = 'set' . $columnMap->getPhpName(); |
|
233 | + foreach ($i18NTableMap->getColumns() as $columnMap) { |
|
234 | + $method = 'set'.$columnMap->getPhpName(); |
|
235 | 235 | $dtoColumnName = ApiHelper::getColumnMapName($columnMap); |
236 | - if(array_key_exists($dtoColumnName, $data) |
|
236 | + if (array_key_exists($dtoColumnName, $data) |
|
237 | 237 | && method_exists($model, $method) |
238 | 238 | && !($columnMap->isPrimaryKey() && $columnMap->isForeignKey())) { |
239 | 239 | $model->$method($data[$dtoColumnName]); |
240 | 240 | } |
241 | 241 | } |
242 | 242 | } |
243 | - } catch(Exception $e) { |
|
243 | + }catch (Exception $e) { |
|
244 | 244 | Logger::log($e->getMessage(), LOG_DEBUG); |
245 | 245 | } |
246 | 246 | } |
@@ -122,27 +122,27 @@ discard block |
||
122 | 122 | $behaviors = $tableMap->getBehaviors(); |
123 | 123 | foreach ($map::getFieldNames() as $field) { |
124 | 124 | $fDto = self::parseFormField($domain, $tableMap, $field, $behaviors); |
125 | - if(null !== $fDto) { |
|
125 | + if (null !== $fDto) { |
|
126 | 126 | $form->addField($fDto); |
127 | 127 | } |
128 | 128 | } |
129 | 129 | |
130 | - if(array_key_exists('i18n', $behaviors)) { |
|
131 | - $relateI18n = $tableMap->getRelation($tableMap->getPhpName() . 'I18n'); |
|
132 | - if(null !== $relateI18n) { |
|
130 | + if (array_key_exists('i18n', $behaviors)) { |
|
131 | + $relateI18n = $tableMap->getRelation($tableMap->getPhpName().'I18n'); |
|
132 | + if (null !== $relateI18n) { |
|
133 | 133 | $i18NTableMap = $relateI18n->getLocalTable(); |
134 | - foreach($i18NTableMap->getColumns() as $columnMap) { |
|
134 | + foreach ($i18NTableMap->getColumns() as $columnMap) { |
|
135 | 135 | $columnName = self::getColumnMapName($columnMap); |
136 | - if(!$form->fieldExists($columnName)) { |
|
136 | + if (!$form->fieldExists($columnName)) { |
|
137 | 137 | /** @var Field $fDto */ |
138 | 138 | $fDto = self::parseFormField($domain, $i18NTableMap, $columnMap->getPhpName(), $i18NTableMap->getBehaviors()); |
139 | - if(null !== $fDto) { |
|
139 | + if (null !== $fDto) { |
|
140 | 140 | $fDto->pk = false; |
141 | 141 | $fDto->required = true; |
142 | - if(strtolower($fDto->name) === 'locale') { |
|
142 | + if (strtolower($fDto->name) === 'locale') { |
|
143 | 143 | $fDto->type = Field::COMBO_TYPE; |
144 | 144 | $languages = explode(',', Config::getParam('i18n.locales', Config::getParam('default.language', 'es_ES'))); |
145 | - foreach($languages as $language) { |
|
145 | + foreach ($languages as $language) { |
|
146 | 146 | $fDto->data[] = [ |
147 | 147 | $fDto->name => $language, |
148 | 148 | 'Label' => t($language), |
@@ -169,14 +169,14 @@ discard block |
||
169 | 169 | { |
170 | 170 | $column = null; |
171 | 171 | try { |
172 | - foreach($tableMap->getColumns() as $tableMapColumn) { |
|
172 | + foreach ($tableMap->getColumns() as $tableMapColumn) { |
|
173 | 173 | $columnName = $tableMapColumn->getPhpName(); |
174 | - if(preg_match('/^'.$field.'$/i', $columnName)) { |
|
174 | + if (preg_match('/^'.$field.'$/i', $columnName)) { |
|
175 | 175 | $column = $tableMapColumn; |
176 | 176 | break; |
177 | 177 | } |
178 | 178 | } |
179 | - } catch (\Exception $e) { |
|
179 | + }catch (\Exception $e) { |
|
180 | 180 | Logger::log($e->getMessage(), LOG_DEBUG); |
181 | 181 | } |
182 | 182 | return $column; |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | */ |
188 | 188 | public static function getFieldTypes() { |
189 | 189 | $configType = Config::getParam('api.field.case', TableMap::TYPE_PHPNAME); |
190 | - switch($configType) { |
|
190 | + switch ($configType) { |
|
191 | 191 | default: |
192 | 192 | case 'UpperCamelCase': |
193 | 193 | case TableMap::TYPE_PHPNAME: |
@@ -44,8 +44,8 @@ discard block |
||
44 | 44 | //Generating the templates translations |
45 | 45 | $translations = $this->tpl->regenerateTemplates(); |
46 | 46 | |
47 | - $localePath = realpath(BASE_DIR . DIRECTORY_SEPARATOR . 'locale'); |
|
48 | - $localePath .= DIRECTORY_SEPARATOR . $locale . DIRECTORY_SEPARATOR . 'LC_MESSAGES' . DIRECTORY_SEPARATOR; |
|
47 | + $localePath = realpath(BASE_DIR.DIRECTORY_SEPARATOR.'locale'); |
|
48 | + $localePath .= DIRECTORY_SEPARATOR.$locale.DIRECTORY_SEPARATOR.'LC_MESSAGES'.DIRECTORY_SEPARATOR; |
|
49 | 49 | |
50 | 50 | //xgettext localizations |
51 | 51 | $translations = array_merge($translations, I18nHelper::findTranslations(SOURCE_DIR, $locale)); |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | $translations = array_merge($translations, I18nHelper::findTranslations(CACHE_DIR, $locale)); |
54 | 54 | |
55 | 55 | $translations[] = "msgfmt {$localePath}translations.po -o {$localePath}translations.mo"; |
56 | - $translations[] = shell_exec('export PATH=\$PATH:/opt/local/bin:/bin:/sbin; msgfmt '. $localePath . 'translations.po -o ' . $localePath . 'translations.mo'); |
|
56 | + $translations[] = shell_exec('export PATH=\$PATH:/opt/local/bin:/bin:/sbin; msgfmt '.$localePath.'translations.po -o '.$localePath.'translations.mo'); |
|
57 | 57 | return $this->render('translations.html.twig', array( |
58 | 58 | 'translations' => $translations, |
59 | 59 | )); |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | // Creates the src folder |
25 | 25 | GeneratorHelper::createDir($modPath); |
26 | 26 | // Create module path |
27 | - GeneratorHelper::createDir($modPath . $module); |
|
27 | + GeneratorHelper::createDir($modPath.$module); |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | /** |
@@ -40,16 +40,16 @@ discard block |
||
40 | 40 | Logger::log("Generamos la estructura"); |
41 | 41 | $paths = [ |
42 | 42 | "Api", "Config", "Controller", "Models", "Public", "Templates", "Services", "Test", "Doc", |
43 | - "Locale", "Locale/" . Config::getParam('default.locale', 'es_ES'), "Locale/" . Config::getParam('default.locale', 'es_ES') . "/LC_MESSAGES" |
|
43 | + "Locale", "Locale/".Config::getParam('default.locale', 'es_ES'), "Locale/".Config::getParam('default.locale', 'es_ES')."/LC_MESSAGES" |
|
44 | 44 | ]; |
45 | - $modulePath = $modPath . $module; |
|
45 | + $modulePath = $modPath.$module; |
|
46 | 46 | foreach ($paths as $path) { |
47 | - GeneratorHelper::createDir($modulePath . DIRECTORY_SEPARATOR . $path); |
|
47 | + GeneratorHelper::createDir($modulePath.DIRECTORY_SEPARATOR.$path); |
|
48 | 48 | } |
49 | 49 | //Creamos las carpetas de los assets |
50 | 50 | $htmlPaths = array("css", "js", "img", "media", "font"); |
51 | 51 | foreach ($htmlPaths as $path) { |
52 | - GeneratorHelper::createDir($modulePath . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . $path); |
|
52 | + GeneratorHelper::createDir($modulePath.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR.$path); |
|
53 | 53 | } |
54 | 54 | } |
55 | 55 | |
@@ -64,10 +64,10 @@ discard block |
||
64 | 64 | //Generamos el fichero de configuración |
65 | 65 | Logger::log("Generamos ficheros para assets base"); |
66 | 66 | $css = $this->writeTemplateToFile("/* CSS3 STYLES */\n\n", |
67 | - $modPath . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . "css" . DIRECTORY_SEPARATOR . "styles.css", |
|
67 | + $modPath.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR."css".DIRECTORY_SEPARATOR."styles.css", |
|
68 | 68 | $force); |
69 | 69 | $js = $this->writeTemplateToFile("/* APP MODULE JS */\n\n(function() {\n\t'use strict';\n})();", |
70 | - $modPath . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . "js" . DIRECTORY_SEPARATOR . "app.js", |
|
70 | + $modPath.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR."js".DIRECTORY_SEPARATOR."app.js", |
|
71 | 71 | $force); |
72 | 72 | return ($css && $js); |
73 | 73 | } |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | "class" => $class, |
90 | 90 | )); |
91 | 91 | return $this->writeTemplateToFile($controller, |
92 | - $modPath . DIRECTORY_SEPARATOR . "Services" . DIRECTORY_SEPARATOR . "{$class}Service.php", |
|
92 | + $modPath.DIRECTORY_SEPARATOR."Services".DIRECTORY_SEPARATOR."{$class}Service.php", |
|
93 | 93 | $force); |
94 | 94 | } |
95 | 95 | |
@@ -108,13 +108,13 @@ discard block |
||
108 | 108 | "autoloader" => preg_replace('/(\\\|\/)/', '_', $module), |
109 | 109 | "regex" => preg_replace('/(\\\|\/)/m', '\\\\\\\\\\\\', $module), |
110 | 110 | )); |
111 | - $autoload = $this->writeTemplateToFile($autoloader, $mod_path . DIRECTORY_SEPARATOR . "autoload.php", $force); |
|
111 | + $autoload = $this->writeTemplateToFile($autoloader, $mod_path.DIRECTORY_SEPARATOR."autoload.php", $force); |
|
112 | 112 | |
113 | 113 | Logger::log("Generamos el phpunit"); |
114 | 114 | $phpUnitTemplate = $this->tpl->dump("generator/phpunit.template.twig", array( |
115 | 115 | "module" => $module, |
116 | 116 | )); |
117 | - $phpunit = $this->writeTemplateToFile($phpUnitTemplate, $mod_path . DIRECTORY_SEPARATOR . "phpunit.xml.dist", $force); |
|
117 | + $phpunit = $this->writeTemplateToFile($phpUnitTemplate, $mod_path.DIRECTORY_SEPARATOR."phpunit.xml.dist", $force); |
|
118 | 118 | return $autoload && $phpunit; |
119 | 119 | } |
120 | 120 | } |
@@ -22,12 +22,12 @@ discard block |
||
22 | 22 | */ |
23 | 23 | private function getPropelPaths($modulePath) |
24 | 24 | { |
25 | - $moduleDir = CORE_DIR . DIRECTORY_SEPARATOR . $modulePath; |
|
25 | + $moduleDir = CORE_DIR.DIRECTORY_SEPARATOR.$modulePath; |
|
26 | 26 | GeneratorHelper::createDir($moduleDir); |
27 | 27 | $moduleDir = realpath($moduleDir); |
28 | - $configDir = $moduleDir . DIRECTORY_SEPARATOR . 'Config'; |
|
29 | - $sqlDir = $moduleDir . DIRECTORY_SEPARATOR . 'Config' . DIRECTORY_SEPARATOR . 'Sql'; |
|
30 | - $migrationDir = $moduleDir . DIRECTORY_SEPARATOR . 'Config' . DIRECTORY_SEPARATOR . 'Migrations'; |
|
28 | + $configDir = $moduleDir.DIRECTORY_SEPARATOR.'Config'; |
|
29 | + $sqlDir = $moduleDir.DIRECTORY_SEPARATOR.'Config'.DIRECTORY_SEPARATOR.'Sql'; |
|
30 | + $migrationDir = $moduleDir.DIRECTORY_SEPARATOR.'Config'.DIRECTORY_SEPARATOR.'Migrations'; |
|
31 | 31 | $paths = [ |
32 | 32 | 'projectDir' => $moduleDir, |
33 | 33 | 'outputDir' => $moduleDir, |
@@ -93,9 +93,9 @@ discard block |
||
93 | 93 | private function setupManager(GeneratorConfig $configGenerator, AbstractManager &$manager, $workingDir = CORE_DIR) |
94 | 94 | { |
95 | 95 | $manager->setGeneratorConfig($configGenerator); |
96 | - $schemaFile = new \SplFileInfo($configGenerator->getSection('paths')['schemaDir'] . DIRECTORY_SEPARATOR . 'schema.xml'); |
|
96 | + $schemaFile = new \SplFileInfo($configGenerator->getSection('paths')['schemaDir'].DIRECTORY_SEPARATOR.'schema.xml'); |
|
97 | 97 | $manager->setSchemas([$schemaFile]); |
98 | - $manager->setLoggerClosure(function ($message) { |
|
98 | + $manager->setLoggerClosure(function($message) { |
|
99 | 99 | Logger::log($message, LOG_INFO); |
100 | 100 | }); |
101 | 101 | $manager->setWorkingDirectory($workingDir); |
@@ -28,11 +28,11 @@ |
||
28 | 28 | try { |
29 | 29 | Cache::getInstance()->storeData($filename, $fileContent, Cache::TEXT, true); |
30 | 30 | $created = true; |
31 | - } catch (\Exception $e) { |
|
31 | + }catch (\Exception $e) { |
|
32 | 32 | Logger::log($e->getMessage(), LOG_ERR); |
33 | 33 | } |
34 | - } else { |
|
35 | - Logger::log($filename . t(' not exists or cant write'), LOG_ERR); |
|
34 | + }else { |
|
35 | + Logger::log($filename.t(' not exists or cant write'), LOG_ERR); |
|
36 | 36 | } |
37 | 37 | return $created; |
38 | 38 | } |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | */ |
39 | 39 | public function createStructureModule($module, $force = false, $type = "", $apiClass = "") |
40 | 40 | { |
41 | - $modPath = CORE_DIR . DIRECTORY_SEPARATOR; |
|
41 | + $modPath = CORE_DIR.DIRECTORY_SEPARATOR; |
|
42 | 42 | $module = ucfirst($module); |
43 | 43 | $this->createModulePath($module, $modPath); |
44 | 44 | $this->createModulePathTree($module, $modPath); |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | */ |
60 | 60 | private function createModuleBaseFiles($module, $modPath, $force = false, $controllerType = '') |
61 | 61 | { |
62 | - $modulePath = $modPath . $module; |
|
62 | + $modulePath = $modPath.$module; |
|
63 | 63 | $this->generateControllerTemplate($module, $modulePath, $force, $controllerType); |
64 | 64 | $this->generateServiceTemplate($module, $modulePath, $force); |
65 | 65 | $this->genereateAutoloaderTemplate($module, $modulePath, $force); |
@@ -87,28 +87,28 @@ discard block |
||
87 | 87 | "namespace" => preg_replace('/(\\\|\/)/', '\\', $module), |
88 | 88 | "url" => preg_replace('/(\\\|\/)/', '/', $module), |
89 | 89 | "class" => $class, |
90 | - "controllerType" => $class . "Base", |
|
90 | + "controllerType" => $class."Base", |
|
91 | 91 | "is_base" => false |
92 | 92 | )); |
93 | - $controller = $this->writeTemplateToFile($controllerBody, $modPath . DIRECTORY_SEPARATOR . "Controller" . |
|
94 | - DIRECTORY_SEPARATOR . "{$class}Controller.php", $force); |
|
93 | + $controller = $this->writeTemplateToFile($controllerBody, $modPath.DIRECTORY_SEPARATOR."Controller". |
|
94 | + DIRECTORY_SEPARATOR."{$class}Controller.php", $force); |
|
95 | 95 | |
96 | 96 | $controllerBody = $this->tpl->dump("generator/controller.template.twig", array( |
97 | 97 | "module" => $module, |
98 | 98 | "namespace" => preg_replace('/(\\\|\/)/', '\\', $module), |
99 | 99 | "url" => preg_replace('/(\\\|\/)/', '/', $module), |
100 | - "class" => $class . "Base", |
|
100 | + "class" => $class."Base", |
|
101 | 101 | "service" => $class, |
102 | 102 | "controllerType" => $controllerType, |
103 | 103 | "is_base" => true, |
104 | 104 | "domain" => $class, |
105 | 105 | )); |
106 | - $controllerBase = $this->writeTemplateToFile($controllerBody, $modPath . DIRECTORY_SEPARATOR . "Controller" . |
|
107 | - DIRECTORY_SEPARATOR . "base" . DIRECTORY_SEPARATOR . "{$class}BaseController.php", true); |
|
106 | + $controllerBase = $this->writeTemplateToFile($controllerBody, $modPath.DIRECTORY_SEPARATOR."Controller". |
|
107 | + DIRECTORY_SEPARATOR."base".DIRECTORY_SEPARATOR."{$class}BaseController.php", true); |
|
108 | 108 | |
109 | - $filename = $modPath . DIRECTORY_SEPARATOR . "Test" . DIRECTORY_SEPARATOR . "{$class}Test.php"; |
|
109 | + $filename = $modPath.DIRECTORY_SEPARATOR."Test".DIRECTORY_SEPARATOR."{$class}Test.php"; |
|
110 | 110 | $test = true; |
111 | - if(!file_exists($filename)) { |
|
111 | + if (!file_exists($filename)) { |
|
112 | 112 | $testTemplate = $this->tpl->dump("generator/testCase.template.twig", array( |
113 | 113 | "module" => $module, |
114 | 114 | "namespace" => preg_replace('/(\\\|\/)/', '\\', $module), |
@@ -127,8 +127,8 @@ discard block |
||
127 | 127 | */ |
128 | 128 | private function createModuleModels($module, $path) |
129 | 129 | { |
130 | - $modulePath = $path . $module; |
|
131 | - $modulePath = str_replace(CORE_DIR . DIRECTORY_SEPARATOR, '', $modulePath); |
|
130 | + $modulePath = $path.$module; |
|
131 | + $modulePath = str_replace(CORE_DIR.DIRECTORY_SEPARATOR, '', $modulePath); |
|
132 | 132 | |
133 | 133 | $configGenerator = $this->getConfigGenerator($modulePath); |
134 | 134 | |
@@ -138,8 +138,8 @@ discard block |
||
138 | 138 | $configTemplate = $this->tpl->dump("generator/config.propel.template.twig", array( |
139 | 139 | "module" => $module, |
140 | 140 | )); |
141 | - $this->writeTemplateToFile($configTemplate, CORE_DIR . DIRECTORY_SEPARATOR . $modulePath . DIRECTORY_SEPARATOR . "Config" . |
|
142 | - DIRECTORY_SEPARATOR . "config.php", true); |
|
141 | + $this->writeTemplateToFile($configTemplate, CORE_DIR.DIRECTORY_SEPARATOR.$modulePath.DIRECTORY_SEPARATOR."Config". |
|
142 | + DIRECTORY_SEPARATOR."config.php", true); |
|
143 | 143 | Logger::log("Generado config genérico para propel"); |
144 | 144 | } |
145 | 145 | |
@@ -154,8 +154,8 @@ discard block |
||
154 | 154 | private function generateBaseApiTemplate($module, $modPath, $force = false, $apiClass = "") |
155 | 155 | { |
156 | 156 | $created = true; |
157 | - $modelPath = $modPath . $module . DIRECTORY_SEPARATOR . 'Models'; |
|
158 | - $apiPath = $modPath . $module . DIRECTORY_SEPARATOR . 'Api'; |
|
157 | + $modelPath = $modPath.$module.DIRECTORY_SEPARATOR.'Models'; |
|
158 | + $apiPath = $modPath.$module.DIRECTORY_SEPARATOR.'Api'; |
|
159 | 159 | if (file_exists($modelPath)) { |
160 | 160 | $dir = dir($modelPath); |
161 | 161 | $this->generateApiFiles($module, $force, $apiClass, $dir, $apiPath); |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | //Generamos el fichero de configuración |
174 | 174 | Logger::log("Generamos fichero vacío de configuración"); |
175 | 175 | return $this->writeTemplateToFile("<?php\n\t", |
176 | - $modPath . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "config.php", |
|
176 | + $modPath.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."config.php", |
|
177 | 177 | $force); |
178 | 178 | } |
179 | 179 | |
@@ -194,7 +194,7 @@ discard block |
||
194 | 194 | "db" => $this->config->get("db_name"), |
195 | 195 | )); |
196 | 196 | return $this->writeTemplateToFile($schema, |
197 | - $modPath . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "schema.xml", |
|
197 | + $modPath.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."schema.xml", |
|
198 | 198 | $force); |
199 | 199 | } |
200 | 200 | |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | "namespace" => preg_replace('/(\\\|\/)/', '', $module), |
213 | 213 | )); |
214 | 214 | return $this->writeTemplateToFile($buildProperties, |
215 | - $modPath . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "propel.yml", |
|
215 | + $modPath.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."propel.yml", |
|
216 | 216 | $force); |
217 | 217 | } |
218 | 218 | |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | "module" => $module, |
231 | 231 | )); |
232 | 232 | return $this->writeTemplateToFile($index, |
233 | - $modPath . DIRECTORY_SEPARATOR . "Templates" . DIRECTORY_SEPARATOR . "index.html.twig", |
|
233 | + $modPath.DIRECTORY_SEPARATOR."Templates".DIRECTORY_SEPARATOR."index.html.twig", |
|
234 | 234 | $force); |
235 | 235 | } |
236 | 236 | |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | )); |
261 | 261 | |
262 | 262 | return $this->writeTemplateToFile($controller, |
263 | - $modPath . DIRECTORY_SEPARATOR . 'base' . DIRECTORY_SEPARATOR . "{$api}BaseApi.php", true); |
|
263 | + $modPath.DIRECTORY_SEPARATOR.'base'.DIRECTORY_SEPARATOR."{$api}BaseApi.php", true); |
|
264 | 264 | } |
265 | 265 | |
266 | 266 | /** |
@@ -285,7 +285,7 @@ discard block |
||
285 | 285 | "package" => $package, |
286 | 286 | )); |
287 | 287 | |
288 | - return $this->writeTemplateToFile($controller, $modPath . DIRECTORY_SEPARATOR . "{$api}.php", $force); |
|
288 | + return $this->writeTemplateToFile($controller, $modPath.DIRECTORY_SEPARATOR."{$api}.php", $force); |
|
289 | 289 | } |
290 | 290 | |
291 | 291 | /** |
@@ -302,15 +302,15 @@ discard block |
||
302 | 302 | $base = $dir->path; |
303 | 303 | while ($file = $dir->read()) { |
304 | 304 | if (!in_array(strtolower($file), ['.', '..', 'base', 'map'])) { |
305 | - if (is_dir($base . DIRECTORY_SEPARATOR . $file)) { |
|
306 | - $this->generateApiFiles($module, $force, $apiClass, dir($base . DIRECTORY_SEPARATOR . $file), $apiPath . DIRECTORY_SEPARATOR . $file, $file); |
|
307 | - } else if (!preg_match('/Query\.php$/i', $file) |
|
305 | + if (is_dir($base.DIRECTORY_SEPARATOR.$file)) { |
|
306 | + $this->generateApiFiles($module, $force, $apiClass, dir($base.DIRECTORY_SEPARATOR.$file), $apiPath.DIRECTORY_SEPARATOR.$file, $file); |
|
307 | + }else if (!preg_match('/Query\.php$/i', $file) |
|
308 | 308 | && !preg_match('/I18n\.php$/i', $file) |
309 | 309 | && preg_match('/\.php$/i', $file) |
310 | 310 | ) { |
311 | 311 | $filename = str_replace(".php", "", $file); |
312 | 312 | $this->log->addLog("Generamos Api BASES para {$filename}"); |
313 | - if($this->checkIfIsModel($module, $filename, $package)) { |
|
313 | + if ($this->checkIfIsModel($module, $filename, $package)) { |
|
314 | 314 | $this->createApiBaseFile($module, $apiPath, $filename, $apiClass, $package); |
315 | 315 | $this->createApi($module, $apiPath, $force, $filename, $package); |
316 | 316 | } |
@@ -333,7 +333,7 @@ discard block |
||
333 | 333 | $parts[] = $package; |
334 | 334 | } |
335 | 335 | $parts[] = $filename; |
336 | - $namespace = '\\' . implode('\\', $parts); |
|
336 | + $namespace = '\\'.implode('\\', $parts); |
|
337 | 337 | $reflectorClass = new \ReflectionClass($namespace); |
338 | 338 | $isModel = $reflectorClass->isInstantiable(); |
339 | 339 | return $isModel; |