@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | */ |
18 | 18 | public function getParams() |
19 | 19 | { |
20 | - return $this->params?: []; |
|
20 | + return $this->params ?: []; |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | /** |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | * @return ParameterTrait |
50 | 50 | */ |
51 | 51 | public function dropParam($key) { |
52 | - if(array_key_exists($key, $this->params)) { |
|
52 | + if (array_key_exists($key, $this->params)) { |
|
53 | 53 | unset($this->params[$key]); |
54 | 54 | } |
55 | 55 | return $this; |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | * @return mixed|null |
61 | 61 | */ |
62 | 62 | public function getParam($key) { |
63 | - if(array_key_exists($key, $this->params)) { |
|
63 | + if (array_key_exists($key, $this->params)) { |
|
64 | 64 | return $this->params[$key]; |
65 | 65 | } |
66 | 66 | return null; |
@@ -96,15 +96,15 @@ discard block |
||
96 | 96 | protected function hydrateBulkRequest() { |
97 | 97 | $class = new \ReflectionClass($this->getModelNamespace()); |
98 | 98 | $this->list = []; |
99 | - foreach($this->data as $item) { |
|
100 | - if(is_array($item)) { |
|
101 | - if(count($this->list) < Config::getParam('api.block.limit', 1000)) { |
|
99 | + foreach ($this->data as $item) { |
|
100 | + if (is_array($item)) { |
|
101 | + if (count($this->list) < Config::getParam('api.block.limit', 1000)) { |
|
102 | 102 | /** @var ActiveRecordInterface $model */ |
103 | 103 | $model = $class->newInstance(); |
104 | 104 | $this->hydrateModelFromRequest($model, $item); |
105 | 105 | $this->list[] = $model; |
106 | - } else { |
|
107 | - Logger::log(t('Max items per bulk insert raised'), LOG_WARNING, count($this->data) . t('items')); |
|
106 | + }else { |
|
107 | + Logger::log(t('Max items per bulk insert raised'), LOG_WARNING, count($this->data).t('items')); |
|
108 | 108 | } |
109 | 109 | } |
110 | 110 | } |
@@ -115,12 +115,12 @@ discard block |
||
115 | 115 | */ |
116 | 116 | protected function saveBulk() { |
117 | 117 | $tablemap = $this->getTableMap(); |
118 | - foreach($this->list as &$model) { |
|
118 | + foreach ($this->list as &$model) { |
|
119 | 119 | $con = Propel::getWriteConnection($tablemap::DATABASE_NAME); |
120 | 120 | try { |
121 | 121 | $model->save($con); |
122 | 122 | $con->commit(); |
123 | - } catch(\Exception $e) { |
|
123 | + }catch (\Exception $e) { |
|
124 | 124 | Logger::log($e->getMessage(), LOG_ERR, $model->toArray()); |
125 | 125 | $con->rollBack(); |
126 | 126 | } |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | protected function exportList() { |
134 | 134 | $list = []; |
135 | 135 | /** @var ActiveRecordInterface $item */ |
136 | - foreach($this->list as $item) { |
|
136 | + foreach ($this->list as $item) { |
|
137 | 137 | $list[] = $item->toArray(); |
138 | 138 | } |
139 | 139 | return $list; |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | * |
145 | 145 | * @param ModelCriteria $query |
146 | 146 | */ |
147 | - protected function joinTables(ModelCriteria &$query) |
|
147 | + protected function joinTables(ModelCriteria & $query) |
|
148 | 148 | { |
149 | 149 | //TODO for specific implementations |
150 | 150 | } |
@@ -157,18 +157,18 @@ discard block |
||
157 | 157 | */ |
158 | 158 | protected function findPk(ModelCriteria $query, $primaryKey) { |
159 | 159 | $pks = explode(Api::API_PK_SEPARATOR, urldecode($primaryKey)); |
160 | - if(count($pks) === 1 && !empty($pks[0])) { |
|
160 | + if (count($pks) === 1 && !empty($pks[0])) { |
|
161 | 161 | $query->filterByPrimaryKey($pks[0]); |
162 | - } else { |
|
162 | + }else { |
|
163 | 163 | $item = 0; |
164 | - foreach($this->getPkDbName() as $phpName) { |
|
164 | + foreach ($this->getPkDbName() as $phpName) { |
|
165 | 165 | try { |
166 | 166 | $query->filterBy($phpName, $pks[$item]); |
167 | 167 | $item++; |
168 | - if($item >= count($pks)) { |
|
168 | + if ($item >= count($pks)) { |
|
169 | 169 | break; |
170 | 170 | } |
171 | - } catch(\Exception $e) { |
|
171 | + }catch (\Exception $e) { |
|
172 | 172 | Logger::log($e->getMessage(), LOG_DEBUG); |
173 | 173 | } |
174 | 174 | } |
@@ -198,8 +198,8 @@ discard block |
||
198 | 198 | try { |
199 | 199 | $query = $this->prepareQuery(); |
200 | 200 | $this->model = $this->findPk($query, $primaryKey); |
201 | - } catch (\Exception $e) { |
|
202 | - Logger::log(get_class($this) . ': ' . $e->getMessage(), LOG_ERR); |
|
201 | + }catch (\Exception $e) { |
|
202 | + Logger::log(get_class($this).': '.$e->getMessage(), LOG_ERR); |
|
203 | 203 | } |
204 | 204 | } |
205 | 205 | |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | /** |
221 | 221 | * @param ModelCriteria $query |
222 | 222 | */ |
223 | - protected function checkReturnFields(ModelCriteria &$query) |
|
223 | + protected function checkReturnFields(ModelCriteria & $query) |
|
224 | 224 | { |
225 | 225 | $returnFields = Request::getInstance()->getQuery(Api::API_FIELDS_RESULT_FIELD); |
226 | 226 | if (null !== $returnFields) { |
@@ -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 | } |
@@ -154,22 +154,22 @@ discard block |
||
154 | 154 | * @param $action |
155 | 155 | * @throws ApiException |
156 | 156 | */ |
157 | - private function addExtraColumns(ModelCriteria &$query, $action) |
|
157 | + private function addExtraColumns(ModelCriteria & $query, $action) |
|
158 | 158 | { |
159 | 159 | if (Api::API_ACTION_LIST === $action) { |
160 | 160 | $this->addDefaultListField(); |
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 | } |
@@ -196,22 +196,22 @@ discard block |
||
196 | 196 | /** |
197 | 197 | * @param ModelCriteria $query |
198 | 198 | */ |
199 | - protected function checkI18n(ModelCriteria &$query) |
|
199 | + protected function checkI18n(ModelCriteria & $query) |
|
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 | } |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | foreach ($domains as $domain => $routes) { |
36 | 36 | $pDomain = str_replace('@', '', $domain); |
37 | 37 | $pDomain = str_replace('/', '', $pDomain); |
38 | - $response[] = strtolower($pDomain) . '.api.secret'; |
|
38 | + $response[] = strtolower($pDomain).'.api.secret'; |
|
39 | 39 | } |
40 | 40 | return $this->json($response); |
41 | 41 | } |
@@ -51,8 +51,8 @@ discard block |
||
51 | 51 | */ |
52 | 52 | public function config() |
53 | 53 | { |
54 | - Logger::log("Config loaded executed by " . $this->getRequest()->getRequestUri()); |
|
55 | - if(defined('PSFS_UNIT_TESTING_EXECUTION')) { |
|
54 | + Logger::log("Config loaded executed by ".$this->getRequest()->getRequestUri()); |
|
55 | + if (defined('PSFS_UNIT_TESTING_EXECUTION')) { |
|
56 | 56 | throw new ConfigException('CONFIG'); |
57 | 57 | } |
58 | 58 | $form = new ConfigForm(Router::getInstance()->getRoute('admin-config'), Config::$required, Config::$optional, Config::getInstance()->dumpConfig()); |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | } |
90 | 90 | Security::getInstance()->setFlash("callback_message", t("Configuración actualizada correctamente")); |
91 | 91 | Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-config", true)); |
92 | - } else { |
|
92 | + }else { |
|
93 | 93 | throw new HttpException(t('Error al guardar la configuración, prueba a cambiar los permisos'), 403); |
94 | 94 | } |
95 | 95 | } |
@@ -63,7 +63,7 @@ |
||
63 | 63 | GeneratorHelper::checkCustomNamespaceApi($apiClass); |
64 | 64 | $this->gen->createStructureModule($module, false, $type, $apiClass); |
65 | 65 | Security::getInstance()->setFlash("callback_message", str_replace("%s", $module, t("Módulo %s generado correctamente"))); |
66 | - Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-module", true)); |
|
66 | + Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-module", true)); |
|
67 | 67 | } catch (Exception $e) { |
68 | 68 | Logger::log($e->getMessage() . " [" . $e->getFile() . ":" . $e->getLine() . "]"); |
69 | 69 | Security::getInstance()->setFlash("callback_message", htmlentities($e->getMessage())); |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | */ |
34 | 34 | public function generateModule() |
35 | 35 | { |
36 | - Logger::log("Arranque generador de módulos al solicitar " . $this->getRequest()->getRequestUri()); |
|
36 | + Logger::log("Arranque generador de módulos al solicitar ".$this->getRequest()->getRequestUri()); |
|
37 | 37 | /* @var $form ConfigForm */ |
38 | 38 | $form = new ModuleForm(); |
39 | 39 | $form->build(); |
@@ -64,8 +64,8 @@ discard block |
||
64 | 64 | $this->gen->createStructureModule($module, false, $type, $apiClass); |
65 | 65 | Security::getInstance()->setFlash("callback_message", str_replace("%s", $module, t("Módulo %s generado correctamente"))); |
66 | 66 | Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-module", true)); |
67 | - } catch (Exception $e) { |
|
68 | - Logger::log($e->getMessage() . " [" . $e->getFile() . ":" . $e->getLine() . "]"); |
|
67 | + }catch (Exception $e) { |
|
68 | + Logger::log($e->getMessage()." [".$e->getFile().":".$e->getLine()."]"); |
|
69 | 69 | Security::getInstance()->setFlash("callback_message", htmlentities($e->getMessage())); |
70 | 70 | } |
71 | 71 | } |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | { |
56 | 56 | GeneratorHelper::createDir(dirname($path)); |
57 | 57 | if (false === FileHelper::writeFile($path, $data)) { |
58 | - throw new ConfigException(t('No se tienen los permisos suficientes para escribir en el fichero ') . $path); |
|
58 | + throw new ConfigException(t('No se tienen los permisos suficientes para escribir en el fichero ').$path); |
|
59 | 59 | } |
60 | 60 | } |
61 | 61 | |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | { |
70 | 70 | Inspector::stats('[Cache] Gathering data from cache', Inspector::SCOPE_DEBUG); |
71 | 71 | $data = null; |
72 | - $absolutePath = $absolute ? $path : CACHE_DIR . DIRECTORY_SEPARATOR . $path; |
|
72 | + $absolutePath = $absolute ? $path : CACHE_DIR.DIRECTORY_SEPARATOR.$path; |
|
73 | 73 | if (file_exists($absolutePath)) { |
74 | 74 | $data = FileHelper::readFile($absolutePath); |
75 | 75 | } |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | private function hasExpiredCache($path, $expires = 300, $absolute = false) |
86 | 86 | { |
87 | 87 | Inspector::stats('[Cache] Checking expiration', Inspector::SCOPE_DEBUG); |
88 | - $absolutePath = ($absolute) ? $path : CACHE_DIR . DIRECTORY_SEPARATOR . $path; |
|
88 | + $absolutePath = ($absolute) ? $path : CACHE_DIR.DIRECTORY_SEPARATOR.$path; |
|
89 | 89 | $lasModificationDate = filemtime($absolutePath); |
90 | 90 | return ($lasModificationDate + $expires <= time()); |
91 | 91 | } |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | { |
153 | 153 | Inspector::stats('[Cache] Store data in cache', Inspector::SCOPE_DEBUG); |
154 | 154 | $data = self::transformData($data, $transform); |
155 | - $absolutePath = $absolute ? $path : CACHE_DIR . DIRECTORY_SEPARATOR . $path; |
|
155 | + $absolutePath = $absolute ? $path : CACHE_DIR.DIRECTORY_SEPARATOR.$path; |
|
156 | 156 | $this->saveTextToFile($data, $absolutePath); |
157 | 157 | } |
158 | 158 | |
@@ -168,12 +168,12 @@ discard block |
||
168 | 168 | public function readFromCache($path, $expires = 300, $function = null, $transform = Cache::TEXT) |
169 | 169 | { |
170 | 170 | $data = null; |
171 | - Inspector::stats('[Cache] Reading data from cache: ' . json_encode(['path' => $path]), Inspector::SCOPE_DEBUG); |
|
172 | - if (file_exists(CACHE_DIR . DIRECTORY_SEPARATOR . $path)) { |
|
171 | + Inspector::stats('[Cache] Reading data from cache: '.json_encode(['path' => $path]), Inspector::SCOPE_DEBUG); |
|
172 | + if (file_exists(CACHE_DIR.DIRECTORY_SEPARATOR.$path)) { |
|
173 | 173 | if (is_callable($function) && $this->hasExpiredCache($path, $expires)) { |
174 | 174 | $data = $function(); |
175 | 175 | $this->storeData($path, $data, $transform); |
176 | - } else { |
|
176 | + }else { |
|
177 | 177 | $data = $this->getDataFromFile($path, $transform); |
178 | 178 | } |
179 | 179 | } |
@@ -219,20 +219,20 @@ discard block |
||
219 | 219 | $query[Api::HEADER_API_LANG] = Request::header(Api::HEADER_API_LANG, 'es'); |
220 | 220 | $filename = FileHelper::generateHashFilename($action['http'], $action['slug'], $query); |
221 | 221 | $hashPath = FileHelper::generateCachePath($action, $query); |
222 | - Inspector::stats('[Cache] Cache file calculated: ' . json_encode(['file' => $filename, 'hash' => $hashPath]), Inspector::SCOPE_DEBUG); |
|
222 | + Inspector::stats('[Cache] Cache file calculated: '.json_encode(['file' => $filename, 'hash' => $hashPath]), Inspector::SCOPE_DEBUG); |
|
223 | 223 | Logger::log('Cache file calculated', LOG_DEBUG, ['file' => $filename, 'hash' => $hashPath]); |
224 | 224 | } |
225 | 225 | return [$hashPath, $filename]; |
226 | 226 | } |
227 | 227 | |
228 | 228 | public function flushCache() { |
229 | - if(Config::getParam('cache.data.enable', false)) { |
|
229 | + if (Config::getParam('cache.data.enable', false)) { |
|
230 | 230 | Inspector::stats('[Cache] Flushing cache', Inspector::SCOPE_DEBUG); |
231 | 231 | $action = Security::getInstance()->getSessionKey(self::CACHE_SESSION_VAR); |
232 | - if(is_array($action)) { |
|
233 | - $hashPath = FileHelper::generateCachePath($action, $action['params']) . '..' . DIRECTORY_SEPARATOR . ' .. ' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR; |
|
234 | - if(!file_exists($hashPath)) { |
|
235 | - $hashPath = CACHE_DIR . DIRECTORY_SEPARATOR . $hashPath; |
|
232 | + if (is_array($action)) { |
|
233 | + $hashPath = FileHelper::generateCachePath($action, $action['params']).'..'.DIRECTORY_SEPARATOR.' .. '.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR; |
|
234 | + if (!file_exists($hashPath)) { |
|
235 | + $hashPath = CACHE_DIR.DIRECTORY_SEPARATOR.$hashPath; |
|
236 | 236 | } |
237 | 237 | FileHelper::deleteDir($hashPath); |
238 | 238 | } |
@@ -23,8 +23,8 @@ discard block |
||
23 | 23 | foreach ($compiledFiles as $file) { |
24 | 24 | echo "\t\t<script type='text/javascript' src='{$file}'></script>\n"; |
25 | 25 | } |
26 | - } else { |
|
27 | - echo "\t\t<script type='text/javascript' src='" . $baseUrl . "/js/" . $hash . ".js'" . |
|
26 | + }else { |
|
27 | + echo "\t\t<script type='text/javascript' src='".$baseUrl."/js/".$hash.".js'". |
|
28 | 28 | "></script>\n"; |
29 | 29 | } |
30 | 30 | } |
@@ -40,12 +40,12 @@ discard block |
||
40 | 40 | */ |
41 | 41 | protected function putDebugJs($pathParts, $base, $file, $hash, array &$compiledFiles) |
42 | 42 | { |
43 | - $filePath = $hash . "_" . $pathParts[count($pathParts) - 1]; |
|
44 | - $compiledFiles[] = "/js/" . $filePath; |
|
43 | + $filePath = $hash."_".$pathParts[count($pathParts) - 1]; |
|
44 | + $compiledFiles[] = "/js/".$filePath; |
|
45 | 45 | $data = ""; |
46 | - if (!file_exists($base . $filePath) || filemtime($base . $filePath) < filemtime($file)) { |
|
46 | + if (!file_exists($base.$filePath) || filemtime($base.$filePath) < filemtime($file)) { |
|
47 | 47 | $data = file_get_contents($file); |
48 | - AssetsHelper::storeContents($base . $filePath, $data); |
|
48 | + AssetsHelper::storeContents($base.$filePath, $data); |
|
49 | 49 | } |
50 | 50 | return $data; |
51 | 51 | } |
@@ -61,9 +61,9 @@ discard block |
||
61 | 61 | */ |
62 | 62 | protected function compileJs(array $files, $basePath, $hash, array &$compiledFiles) |
63 | 63 | { |
64 | - $base = $basePath . "js" . DIRECTORY_SEPARATOR; |
|
64 | + $base = $basePath."js".DIRECTORY_SEPARATOR; |
|
65 | 65 | $debug = Config::getParam('debug'); |
66 | - if ($debug || !file_exists($base . $hash . ".js")) { |
|
66 | + if ($debug || !file_exists($base.$hash.".js")) { |
|
67 | 67 | $data = ''; |
68 | 68 | if (0 < count($files)) { |
69 | 69 | $minifier = new JS(); |
@@ -72,15 +72,15 @@ discard block |
||
72 | 72 | if (file_exists($file)) { |
73 | 73 | if ($debug) { |
74 | 74 | $data = $this->putDebugJs($pathParts, $base, $file, $hash, $compiledFiles); |
75 | - } elseif (!file_exists($base . $hash . ".js")) { |
|
75 | + } elseif (!file_exists($base.$hash.".js")) { |
|
76 | 76 | $minifier->add($file); |
77 | 77 | //$data = $this->putProductionJs($base, $file, $data); |
78 | 78 | } |
79 | 79 | } |
80 | 80 | } |
81 | - if($debug) { |
|
82 | - AssetsHelper::storeContents($base . $hash . ".js", $data); |
|
83 | - } else { |
|
81 | + if ($debug) { |
|
82 | + AssetsHelper::storeContents($base.$hash.".js", $data); |
|
83 | + }else { |
|
84 | 84 | $this->dumpJs($hash, $base, $minifier); |
85 | 85 | } |
86 | 86 | unset($minifier); |
@@ -101,9 +101,9 @@ discard block |
||
101 | 101 | ini_set('memory_limit', -1); |
102 | 102 | GeneratorHelper::createDir($base); |
103 | 103 | if (Config::getParam('assets.obfuscate', false)) { |
104 | - $minifier->gzip($base . $hash . ".js"); |
|
105 | - } else { |
|
106 | - $minifier->minify($base . $hash . ".js"); |
|
104 | + $minifier->gzip($base.$hash.".js"); |
|
105 | + }else { |
|
106 | + $minifier->minify($base.$hash.".js"); |
|
107 | 107 | } |
108 | 108 | } |
109 | 109 | } |
@@ -69,22 +69,22 @@ discard block |
||
69 | 69 | { |
70 | 70 | $path = explode("/", $string); |
71 | 71 | $originalFilename = end($path); |
72 | - $base = WEB_DIR . DIRECTORY_SEPARATOR; |
|
72 | + $base = WEB_DIR.DIRECTORY_SEPARATOR; |
|
73 | 73 | $debug = Config::getParam('debug'); |
74 | 74 | $cache = Config::getParam('cache.var'); |
75 | - $cache = $cache ? '.' . $cache : ''; |
|
75 | + $cache = $cache ? '.'.$cache : ''; |
|
76 | 76 | $finfo = finfo_open(FILEINFO_MIME_TYPE); // devuelve el tipo mime de su extensión |
77 | 77 | $mime = finfo_file($finfo, $filenamePath); |
78 | 78 | $extension = explode(".", $string); |
79 | 79 | $extension = end($extension); |
80 | - $file = "/" . substr(md5($string), 0, 8) . "." . $extension; |
|
80 | + $file = "/".substr(md5($string), 0, 8).".".$extension; |
|
81 | 81 | $htmlBase = ''; |
82 | 82 | finfo_close($finfo); |
83 | 83 | if (preg_match('/\.css$/i', $string)) { |
84 | - $file = "/" . substr(md5($string), 0, 8) . "$cache.css"; |
|
84 | + $file = "/".substr(md5($string), 0, 8)."$cache.css"; |
|
85 | 85 | $htmlBase = "css"; |
86 | 86 | } elseif (preg_match('/\.js$/i', $string)) { |
87 | - $file = "/" . substr(md5($string), 0, 8) . "$cache.js"; |
|
87 | + $file = "/".substr(md5($string), 0, 8)."$cache.js"; |
|
88 | 88 | $htmlBase = "js"; |
89 | 89 | } elseif (preg_match("/image/i", $mime)) { |
90 | 90 | $htmlBase = "img"; |
@@ -98,9 +98,9 @@ discard block |
||
98 | 98 | $file = $name; |
99 | 99 | } |
100 | 100 | if ($debug) { |
101 | - $file = str_replace("." . $extension, "_" . $originalFilename, $file); |
|
101 | + $file = str_replace(".".$extension, "_".$originalFilename, $file); |
|
102 | 102 | } |
103 | - $filePath = $htmlBase . $file; |
|
103 | + $filePath = $htmlBase.$file; |
|
104 | 104 | |
105 | 105 | return array($base, $htmlBase, $filePath); |
106 | 106 | } |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | { |
116 | 116 | GeneratorHelper::createDir(dirname($path)); |
117 | 117 | if ("" !== $content && false === file_put_contents($path, $content)) { |
118 | - throw new ConfigException(t('No se tienen permisos para escribir en ' . $path)); |
|
118 | + throw new ConfigException(t('No se tienen permisos para escribir en '.$path)); |
|
119 | 119 | } |
120 | 120 | } |
121 | 121 | } |
@@ -77,8 +77,8 @@ discard block |
||
77 | 77 | protected $isMultipart = false; |
78 | 78 | |
79 | 79 | protected function closeConnection() { |
80 | - if(null !== $this?->con) { |
|
81 | - if($this?->con instanceof \CurlHandle) { |
|
80 | + if (null !== $this?->con) { |
|
81 | + if ($this?->con instanceof \CurlHandle) { |
|
82 | 82 | curl_close($this->con); |
83 | 83 | } |
84 | 84 | $this->setCon(null); |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | { |
95 | 95 | $this->params = []; |
96 | 96 | $this->headers = []; |
97 | - Logger::log('Context service for ' . static::class . ' cleared!'); |
|
97 | + Logger::log('Context service for '.static::class.' cleared!'); |
|
98 | 98 | $this->closeConnection(); |
99 | 99 | } |
100 | 100 | |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | { |
103 | 103 | $this->clearContext(); |
104 | 104 | $con = curl_init($this->url); |
105 | - if($con instanceof \CurlHandle) { |
|
105 | + if ($con instanceof \CurlHandle) { |
|
106 | 106 | $this->setCon($con); |
107 | 107 | } |
108 | 108 | } |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | public function setUrl(string $url, bool $cleanContext = true) |
123 | 123 | { |
124 | 124 | $this->url = $url; |
125 | - if($cleanContext) { |
|
125 | + if ($cleanContext) { |
|
126 | 126 | $this->initialize(); |
127 | 127 | } |
128 | 128 | } |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | */ |
188 | 188 | public function setIsJson($isJson = true) { |
189 | 189 | $this->isJson = $isJson; |
190 | - if($isJson) { |
|
190 | + if ($isJson) { |
|
191 | 191 | $this->setIsMultipart(false); |
192 | 192 | } |
193 | 193 | } |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | */ |
205 | 205 | public function setIsMultipart($isMultipart = true) { |
206 | 206 | $this->isMultipart = $isMultipart; |
207 | - if($isMultipart) { |
|
207 | + if ($isMultipart) { |
|
208 | 208 | $this->setIsJson(false); |
209 | 209 | } |
210 | 210 | } |