@@ -3,7 +3,6 @@ |
||
| 3 | 3 | |
| 4 | 4 | use PSFS\base\Logger; |
| 5 | 5 | use PSFS\base\Service; |
| 6 | - use PSFS\base\Singleton; |
|
| 7 | 6 | use PSFS\base\types\helpers\InjectorHelper; |
| 8 | 7 | use Symfony\Component\Finder\Finder; |
| 9 | 8 | |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | $properties = []; |
| 222 | 222 | $reflector = new \ReflectionClass($class); |
| 223 | 223 | if ($reflector->isSubclassOf(self::DTO_INTERFACE)) { |
| 224 | - $properties = array_merge($properties, InjectorHelper::extractProperties($reflector, \ReflectionMethod::IS_PUBLIC)); |
|
| 224 | + $properties = array_merge($properties, InjectorHelper::extractProperties($reflector, \ReflectionMethod::IS_PUBLIC)); |
|
| 225 | 225 | } |
| 226 | 226 | |
| 227 | 227 | return $properties; |
@@ -417,7 +417,7 @@ discard block |
||
| 417 | 417 | "type" => $type, |
| 418 | 418 | ]; |
| 419 | 419 | if (strlen($format)) { |
| 420 | - $dto['properties'][$field]['format'] = $format; |
|
| 420 | + $dto['properties'][$field]['format'] = $format; |
|
| 421 | 421 | } |
| 422 | 422 | } |
| 423 | 423 | } |
@@ -86,8 +86,8 @@ discard block |
||
| 86 | 86 | */ |
| 87 | 87 | public function setHash($hash) |
| 88 | 88 | { |
| 89 | - $cache = Config::getInstance()->get('cache.var') ?: ''; |
|
| 90 | - $this->hash = $hash . (strlen($cache) ? '.' : '') . $cache; |
|
| 89 | + $cache = Config::getInstance()->get('cache.var') ?: ''; |
|
| 90 | + $this->hash = $hash . (strlen($cache) ? '.' : '') . $cache; |
|
| 91 | 91 | return $this; |
| 92 | 92 | } |
| 93 | 93 | |
@@ -350,9 +350,9 @@ discard block |
||
| 350 | 350 | $file = ""; |
| 351 | 351 | $html_base = ""; |
| 352 | 352 | $debug = Config::getInstance()->getDebugMode(); |
| 353 | - $cache = Config::getInstance()->get('cache.var'); |
|
| 354 | - $cache = $cache ? '.'.$cache : ''; |
|
| 355 | - if (preg_match('/\.css$/i', $string)) { |
|
| 353 | + $cache = Config::getInstance()->get('cache.var'); |
|
| 354 | + $cache = $cache ? '.'.$cache : ''; |
|
| 355 | + if (preg_match('/\.css$/i', $string)) { |
|
| 356 | 356 | $file = "/".substr(md5($string), 0, 8)."$cache.css"; |
| 357 | 357 | $html_base = "css"; |
| 358 | 358 | if ($debug) { |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | public function setHash($hash) |
| 88 | 88 | { |
| 89 | 89 | $cache = Config::getInstance()->get('cache.var') ?: ''; |
| 90 | - $this->hash = $hash . (strlen($cache) ? '.' : '') . $cache; |
|
| 90 | + $this->hash = $hash.(strlen($cache) ? '.' : '').$cache; |
|
| 91 | 91 | return $this; |
| 92 | 92 | } |
| 93 | 93 | |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | } |
| 155 | 155 | try { |
| 156 | 156 | $minifiedJs = Minifier::minify($data); |
| 157 | - } catch(\Exception $e) { |
|
| 157 | + }catch (\Exception $e) { |
|
| 158 | 158 | Logger::log($e->getMessage(), LOG_ERR); |
| 159 | 159 | $minifiedJs = false; |
| 160 | 160 | } |
@@ -197,7 +197,7 @@ discard block |
||
| 197 | 197 | foreach ($this->compiled_files as $file) { |
| 198 | 198 | echo "\t\t<script type='text/javascript' src='{$file}'></script>\n"; |
| 199 | 199 | } |
| 200 | - } else { |
|
| 200 | + }else { |
|
| 201 | 201 | echo "\t\t<script type='text/javascript' src='/js/".$this->hash.".js'></script>\n"; |
| 202 | 202 | } |
| 203 | 203 | } |
@@ -211,7 +211,7 @@ discard block |
||
| 211 | 211 | foreach ($this->compiled_files as $file) { |
| 212 | 212 | echo "\t\t<link href='{$file}' rel='stylesheet' media='screen, print'>"; |
| 213 | 213 | } |
| 214 | - } else { |
|
| 214 | + }else { |
|
| 215 | 215 | echo "\t\t<link href='/css/".$this->hash.".css' rel='stylesheet'>"; |
| 216 | 216 | } |
| 217 | 217 | } |
@@ -236,7 +236,7 @@ discard block |
||
| 236 | 236 | Logger::log("$orig copiado a $dest", LOG_INFO); |
| 237 | 237 | } |
| 238 | 238 | } |
| 239 | - } catch (\Exception $e) { |
|
| 239 | + }catch (\Exception $e) { |
|
| 240 | 240 | Logger::log($e->getMessage(), LOG_ERR); |
| 241 | 241 | } |
| 242 | 242 | } |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | if ($this->debug) { |
| 265 | 265 | $data = file_get_contents($file); |
| 266 | 266 | $this->storeContents($base.$file_path, $data); |
| 267 | - } else { |
|
| 267 | + }else { |
|
| 268 | 268 | $data .= file_get_contents($file); |
| 269 | 269 | } |
| 270 | 270 | $this->compiled_files[] = "/css/".$file_path; |