@@ -20,13 +20,13 @@ discard block |
||
| 20 | 20 | try { |
| 21 | 21 | $reflectionClass = new \ReflectionClass($this); |
| 22 | 22 | $properties = $reflectionClass->getProperties(); |
| 23 | - if(count($properties) > 0) { |
|
| 23 | + if (count($properties) > 0) { |
|
| 24 | 24 | /** @var \ReflectionProperty $property */ |
| 25 | - foreach($properties as $property) { |
|
| 25 | + foreach ($properties as $property) { |
|
| 26 | 26 | $dto[$property->getName()] = $property->getValue($this); |
| 27 | 27 | } |
| 28 | 28 | } |
| 29 | - } catch(\Exception $e) { |
|
| 29 | + }catch (\Exception $e) { |
|
| 30 | 30 | Logger::getInstance(get_class($this))->errorLog($e->getMessage()); |
| 31 | 31 | } |
| 32 | 32 | return $dto; |
@@ -47,9 +47,9 @@ discard block |
||
| 47 | 47 | */ |
| 48 | 48 | public function fromArray(array $object = array()) |
| 49 | 49 | { |
| 50 | - if(count($object) > 0) { |
|
| 51 | - foreach($object as $key => $value) { |
|
| 52 | - if(property_exists($this, $key)) { |
|
| 50 | + if (count($object) > 0) { |
|
| 51 | + foreach ($object as $key => $value) { |
|
| 52 | + if (property_exists($this, $key)) { |
|
| 53 | 53 | $this->$key = $value; |
| 54 | 54 | } |
| 55 | 55 | } |
@@ -31,8 +31,8 @@ discard block |
||
| 31 | 31 | { |
| 32 | 32 | $order = array(); |
| 33 | 33 | if (count($order) > 0) { |
| 34 | - foreach($this->fields as $field => $direction) { |
|
| 35 | - if(strtolower($fieldToRemove) === strtolower($field)) { |
|
| 34 | + foreach ($this->fields as $field => $direction) { |
|
| 35 | + if (strtolower($fieldToRemove) === strtolower($field)) { |
|
| 36 | 36 | continue; |
| 37 | 37 | } |
| 38 | 38 | $order[$field] = $direction; |
@@ -60,9 +60,9 @@ discard block |
||
| 60 | 60 | */ |
| 61 | 61 | public static function parseDirection($direction = Order::ASC) |
| 62 | 62 | { |
| 63 | - if(preg_match('/^asc$/i', $direction)) { |
|
| 63 | + if (preg_match('/^asc$/i', $direction)) { |
|
| 64 | 64 | return Order::ASC; |
| 65 | - } else { |
|
| 65 | + }else { |
|
| 66 | 66 | return Order::DESC; |
| 67 | 67 | } |
| 68 | 68 | } |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | } |
| 158 | 158 | } |
| 159 | 159 | if (!$this->debug && !file_exists($base.$this->hash.".js")) { |
| 160 | - $this->storeContents($base.$this->hash.".js", $data);//Minifier::minify($data)); |
|
| 160 | + $this->storeContents($base.$this->hash.".js", $data); //Minifier::minify($data)); |
|
| 161 | 161 | } |
| 162 | 162 | return $this; |
| 163 | 163 | } |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | foreach ($this->compiled_files as $file) { |
| 197 | 197 | echo "\t\t<script type='text/javascript' src='{$file}'></script>\n"; |
| 198 | 198 | } |
| 199 | - } else { |
|
| 199 | + }else { |
|
| 200 | 200 | echo "\t\t<script type='text/javascript' src='/js/".$this->hash.".js'></script>\n"; |
| 201 | 201 | } |
| 202 | 202 | } |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | foreach ($this->compiled_files as $file) { |
| 211 | 211 | echo "\t\t<link href='{$file}' rel='stylesheet' media='screen, print'>"; |
| 212 | 212 | } |
| 213 | - } else { |
|
| 213 | + }else { |
|
| 214 | 214 | echo "\t\t<link href='/css/".$this->hash.".css' rel='stylesheet' media='screen, print'>"; |
| 215 | 215 | } |
| 216 | 216 | } |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | $this->log->infoLog("$orig copiado a $dest"); |
| 236 | 236 | } |
| 237 | 237 | } |
| 238 | - } catch (\Exception $e) { |
|
| 238 | + }catch (\Exception $e) { |
|
| 239 | 239 | $this->log->errorLog($e->getMessage()); |
| 240 | 240 | } |
| 241 | 241 | } |
@@ -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; |
@@ -303,7 +303,7 @@ |
||
| 303 | 303 | $js = file_get_contents($file); |
| 304 | 304 | try { |
| 305 | 305 | $data .= ";\n".$js; |
| 306 | - }catch (\Exception $e) { |
|
| 306 | + } catch (\Exception $e) { |
|
| 307 | 307 | throw new ConfigException($e->getMessage()); |
| 308 | 308 | } |
| 309 | 309 | return $data; |
@@ -135,7 +135,7 @@ |
||
| 135 | 135 | $tmp = array(); |
| 136 | 136 | if (NULL === $node) { |
| 137 | 137 | $node = $value; |
| 138 | - }else { |
|
| 138 | + } else { |
|
| 139 | 139 | $tmp = $this->getTmpAttribute($node); |
| 140 | 140 | } |
| 141 | 141 | $tmp[] = $value->getAttribute("value"); |
@@ -52,7 +52,7 @@ |
||
| 52 | 52 | $router = Router::getInstance(); |
| 53 | 53 | try { |
| 54 | 54 | return $router->getRoute($path, $absolute, $params); |
| 55 | - } catch (\Exception $e) |
|
| 55 | + }catch (\Exception $e) |
|
| 56 | 56 | { |
| 57 | 57 | return $router->getRoute('', $absolute, $params); |
| 58 | 58 | } |
@@ -136,7 +136,7 @@ |
||
| 136 | 136 | * @param string $path |
| 137 | 137 | * @param $domains |
| 138 | 138 | * |
| 139 | - * @return mixed |
|
| 139 | + * @return string |
|
| 140 | 140 | */ |
| 141 | 141 | private static function extractPathname($path, $domains) |
| 142 | 142 | { |
@@ -179,8 +179,11 @@ |
||
| 179 | 179 | private static function putResourceContent($name, $filename_path, $base, $file_path) |
| 180 | 180 | { |
| 181 | 181 | $data = file_get_contents($filename_path); |
| 182 | - if (!empty($name)) file_put_contents(WEB_DIR.DIRECTORY_SEPARATOR.$name, $data); |
|
| 183 | - else file_put_contents($base.$file_path, $data); |
|
| 182 | + if (!empty($name)) { |
|
| 183 | + file_put_contents(WEB_DIR.DIRECTORY_SEPARATOR.$name, $data); |
|
| 184 | + } else { |
|
| 185 | + file_put_contents($base.$file_path, $data); |
|
| 186 | + } |
|
| 184 | 187 | } |
| 185 | 188 | |
| 186 | 189 | /** |
@@ -22,7 +22,9 @@ |
||
| 22 | 22 | $class = get_called_class(); |
| 23 | 23 | if (!array_key_exists($class, self::$instance) || !self::$instance[$class] instanceof $class) { |
| 24 | 24 | self::$instance[$class] = new $class(func_get_args()); |
| 25 | - if (method_exists(self::$instance[$class], "init")) self::$instance[$class]->init(); |
|
| 25 | + if (method_exists(self::$instance[$class], "init")) { |
|
| 26 | + self::$instance[$class]->init(); |
|
| 27 | + } |
|
| 26 | 28 | } |
| 27 | 29 | return self::$instance[$class]; |
| 28 | 30 | } |
@@ -6,7 +6,9 @@ discard block |
||
| 6 | 6 | use Symfony\Component\Console\Input\InputInterface; |
| 7 | 7 | use Symfony\Component\Console\Output\OutputInterface; |
| 8 | 8 | |
| 9 | - if (!isset($console)) $console = new Application(); |
|
| 9 | + if (!isset($console)) { |
|
| 10 | + $console = new Application(); |
|
| 11 | + } |
|
| 10 | 12 | $console |
| 11 | 13 | ->register('psfs:create:root') |
| 12 | 14 | ->setDefinition(array( |
@@ -15,13 +17,17 @@ discard block |
||
| 15 | 17 | ->setDescription('Comando de creación del Document Root del projecto') |
| 16 | 18 | ->setCode(function(InputInterface $input, OutputInterface $output) { |
| 17 | 19 | $path = $input->getArgument('path'); |
| 18 | - if (empty($path)) $path = BASE_DIR.DIRECTORY_SEPARATOR.'html'; |
|
| 20 | + if (empty($path)) { |
|
| 21 | + $path = BASE_DIR.DIRECTORY_SEPARATOR.'html'; |
|
| 22 | + } |
|
| 19 | 23 | \PSFS\base\config\Config::createDir($path); |
| 20 | 24 | $paths = array("js", "css", "img", "media", "font"); |
| 21 | 25 | foreach ($paths as $htmlPath) { |
| 22 | 26 | \PSFS\base\config\Config::createDir($path.DIRECTORY_SEPARATOR.$htmlPath); |
| 23 | 27 | } |
| 24 | - if (!file_exists(SOURCE_DIR.DIRECTORY_SEPARATOR.'html.tar.gz')) throw new \PSFS\base\exception\ConfigException("No existe el fichero del DocumentRoot"); |
|
| 28 | + if (!file_exists(SOURCE_DIR.DIRECTORY_SEPARATOR.'html.tar.gz')) { |
|
| 29 | + throw new \PSFS\base\exception\ConfigException("No existe el fichero del DocumentRoot"); |
|
| 30 | + } |
|
| 25 | 31 | $tar = new \Archive_Tar(realpath(SOURCE_DIR.DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR."html.tar.gz", true); |
| 26 | 32 | $tar->extract(realpath($path)); |
| 27 | 33 | $output->writeln("Document root generado en ".$path); |
@@ -29,12 +29,16 @@ discard block |
||
| 29 | 29 | |
| 30 | 30 | public function infoLog($msg) |
| 31 | 31 | { |
| 32 | - if ($this->verbosity) $this->log->writeln($msg); |
|
| 32 | + if ($this->verbosity) { |
|
| 33 | + $this->log->writeln($msg); |
|
| 34 | + } |
|
| 33 | 35 | } |
| 34 | 36 | } |
| 35 | 37 | } |
| 36 | 38 | |
| 37 | - if (!isset($console)) $console = new Application(); |
|
| 39 | + if (!isset($console)) { |
|
| 40 | + $console = new Application(); |
|
| 41 | + } |
|
| 38 | 42 | $console |
| 39 | 43 | ->register('psfs:create:module') |
| 40 | 44 | ->setDefinition(array( |
@@ -58,7 +62,7 @@ discard block |
||
| 58 | 62 | { |
| 59 | 63 | \PSFS\services\GeneratorService::getInstance()->createStructureModule($module, $log); |
| 60 | 64 | } |
| 61 | - }catch (\Exception $e) |
|
| 65 | + } catch (\Exception $e) |
|
| 62 | 66 | { |
| 63 | 67 | $output->writeln($e->getMessage()); |
| 64 | 68 | $output->writeln($e->getTraceAsString()); |
@@ -31,14 +31,18 @@ |
||
| 31 | 31 | //Hidratamos con los comandos de PSFS |
| 32 | 32 | $commands = new Finder(); |
| 33 | 33 | $commands->in(__DIR__)->notName("PSFSConsole.php"); |
| 34 | - foreach ($commands as $com) include_once($com->getRealPath()); |
|
| 34 | + foreach ($commands as $com) { |
|
| 35 | + include_once($com->getRealPath()); |
|
| 36 | + } |
|
| 35 | 37 | |
| 36 | 38 | //Hidratamos con los comandos de los módulos |
| 37 | 39 | if (file_exists(CORE_DIR)) |
| 38 | 40 | { |
| 39 | 41 | $commands = new Finder(); |
| 40 | 42 | $commands->in(CORE_DIR)->path("Command")->name("*.php"); |
| 41 | - foreach ($commands as $com) include_once($com->getRealPath()); |
|
| 43 | + foreach ($commands as $com) { |
|
| 44 | + include_once($com->getRealPath()); |
|
| 45 | + } |
|
| 42 | 46 | } |
| 43 | 47 | |
| 44 | 48 | $console->run(); |