psfs / core

src/base/Template.php

Spacing +1 added lines, -1 removed lines

@@ -307,7 +307,7 @@
             if ($file->isFile()) {
                 try {
                     $this->tpl->loadTemplate(str_replace($tplDir.'/', '', $file));
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::getInstance()->errorLog($e->getMessage());
                 }
             }

Braces +2 added lines, -2 removed lines

@@ -197,7 +197,7 @@ 
         $dump = '';
         try {
             $dump = $this->tpl->render($tpl, $vars);
-        }catch (\Exception $e) {
+        } catch (\Exception $e) {
             echo $e->getMessage()."<pre>".$e->getTraceAsString()."</pre>";
         }
         return $dump;
@@ -394,7 +394,7 @@ 
             unset($_SERVER["PHP_AUTH_USER"]);
             unset($_SERVER["PHP_AUTH_PW"]);
             header_remove("Authorization");
-        }else {
+        } else {
             header('Authorization:');
         }
     }

src/base/config/Config.php

Braces +2 added lines, -2 removed lines

@@ -140,7 +140,7 @@ 
         try {
             Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR."config.json", $final_data, Cache::JSON, true);
             $saved = true;
-        }catch (ConfigException $e) {
+        } catch (ConfigException $e) {
             Logger::getInstance()->errorLog($e->getMessage());
         }
         return $saved;
@@ -182,7 +182,7 @@ 
             if (@mkdir($dir, 0775, true) === false) {
                 throw new \Exception(_('Can\'t create directory ').$dir);
             }
-        }catch (\Exception $e) {
+        } catch (\Exception $e) {
             if (!file_exists(dirname($dir))) {
                 throw new ConfigException($e->getMessage().$dir);
             }

Spacing +3 added lines, -3 removed lines

@@ -46,7 +46,7 @@ 
         if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR."config.json"))
         {
             $this->loadConfigData();
-        } else {
+        }else {
             $this->debug = true;
         }
         return $this;
@@ -197,7 +197,7 @@ 
             if (file_exists(WEB_DIR.DIRECTORY_SEPARATOR.$dir)) {
                 try {
                     @shell_exec("rm -rf ".WEB_DIR.DIRECTORY_SEPARATOR.$dir);
-                } catch(\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::getInstance()->errorLog($e->getMessage());
                 }
             }
@@ -209,7 +209,7 @@ 
      */
     public function loadConfigData()
     {
-        $this->config = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . "config.json", Cache::JSON, TRUE) ?: array();
+        $this->config = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR."config.json", Cache::JSON, TRUE) ?: array();
         $this->debug = (array_key_exists('debug', $this->config)) ? (bool)$this->config['debug'] : FALSE;
     }
 }

src/base/dto/Dto.php

Spacing +6 added lines, -6 removed lines

@@ -20,13 +20,13 @@ 
             try {
                 $reflectionClass = new \ReflectionClass($this);
                 $properties = $reflectionClass->getProperties();
-                if(count($properties) > 0) {
+                if (count($properties) > 0) {
                     /** @var \ReflectionProperty $property */
-                    foreach($properties as $property) {
+                    foreach ($properties as $property) {
                         $dto[$property->getName()] = $property->getValue($this);
                     }
                 }
-            } catch(\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance(get_class($this))->errorLog($e->getMessage());
             }
             return $dto;
@@ -47,9 +47,9 @@ 
          */
         public function fromArray(array $object = array())
         {
-            if(count($object) > 0) {
-                foreach($object as $key => $value) {
-                    if(property_exists($this, $key)) {
+            if (count($object) > 0) {
+                foreach ($object as $key => $value) {
+                    if (property_exists($this, $key)) {
                         $this->$key = $value;
                     }
                 }

src/base/dto/Order.php

Spacing +4 added lines, -4 removed lines

@@ -31,8 +31,8 @@ 
         {
             $order = array();
             if (count($order) > 0) {
-                foreach($this->fields as $field => $direction) {
-                    if(strtolower($fieldToRemove) === strtolower($field)) {
+                foreach ($this->fields as $field => $direction) {
+                    if (strtolower($fieldToRemove) === strtolower($field)) {
                         continue;
                     }
                     $order[$field] = $direction;
@@ -60,9 +60,9 @@ 
          */
         public static function parseDirection($direction = Order::ASC)
         {
-            if(preg_match('/^asc$/i', $direction)) {
+            if (preg_match('/^asc$/i', $direction)) {
                 return Order::ASC;
-            } else {
+            }else {
                 return Order::DESC;
             }
         }

src/base/extension/AssetsParser.php

Spacing +5 added lines, -5 removed lines

@@ -157,7 +157,7 @@ 
             }
         }
         if (!$this->debug && !file_exists($base.$this->hash.".js")) {
-            $this->storeContents($base.$this->hash.".js", $data);//Minifier::minify($data));
+            $this->storeContents($base.$this->hash.".js", $data); //Minifier::minify($data));
         }
         return $this;
     }
@@ -196,7 +196,7 @@ 
             foreach ($this->compiled_files as $file) {
                 echo "\t\t<script type='text/javascript' src='{$file}'></script>\n";
             }
-        } else {
+        }else {
             echo "\t\t<script type='text/javascript' src='/js/".$this->hash.".js'></script>\n";
         }
     }
@@ -210,7 +210,7 @@ 
             foreach ($this->compiled_files as $file) {
                 echo "\t\t<link href='{$file}' rel='stylesheet' media='screen, print'>";
             }
-        } else {
+        }else {
             echo "\t\t<link href='/css/".$this->hash.".css' rel='stylesheet' media='screen, print'>";
         }
     }
@@ -235,7 +235,7 @@ 
                     $this->log->infoLog("$orig copiado a $dest");
                 }
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             $this->log->errorLog($e->getMessage());
         }
     }
@@ -264,7 +264,7 @@ 
             if ($this->debug) {
                 $data = file_get_contents($file);
                 $this->storeContents($base.$file_path, $data);
-            } else {
+            }else {
                 $data .= file_get_contents($file);
             }
             $this->compiled_files[] = "/css/".$file_path;

Braces +1 added lines, -1 removed lines

@@ -303,7 +303,7 @@
         $js = file_get_contents($file);
         try {
             $data .= ";\n".$js;
-        }catch (\Exception $e) {
+        } catch (\Exception $e) {
             throw new ConfigException($e->getMessage());
         }
         return $data;

src/base/extension/AssetsTokenParser.php

Braces +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
         $tmp = array();
         if (NULL === $node) {
             $node = $value;
-        }else {
+        } else {
             $tmp = $this->getTmpAttribute($node);
         }
         $tmp[] = $value->getAttribute("value");

src/base/types/SingletonTrait.php

Braces +3 added lines, -1 removed lines

@@ -22,7 +22,9 @@
             $class = get_called_class();
             if (!array_key_exists($class, self::$instance) || !self::$instance[$class] instanceof $class) {
                 self::$instance[$class] = new $class(func_get_args());
-                if (method_exists(self::$instance[$class], "init")) self::$instance[$class]->init();
+                if (method_exists(self::$instance[$class], "init")) {
+                    self::$instance[$class]->init();
+                }
             }
             return self::$instance[$class];
         }

src/bootstrap.php

Braces +29 added lines, -11 removed lines

@@ -1,19 +1,37 @@
 <?php
     use Symfony\Component\Finder\Finder;
 
-    if (!defined('SOURCE_DIR'))define('SOURCE_DIR', __DIR__);
+    if (!defined('SOURCE_DIR')) {
+        define('SOURCE_DIR', __DIR__);
+    }
     if (preg_match('/vendor/', SOURCE_DIR))
     {
-        if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..');
-        if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'src');
-    }else {
-        if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR.DIRECTORY_SEPARATOR.'..');
-        if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'modules');
-    }
-    if (!defined('LOG_DIR')) define('LOG_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'logs');
-    if (!defined('CACHE_DIR')) define('CACHE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'cache');
-    if (!defined('CONFIG_DIR')) define('CONFIG_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'config');
-    if (!defined('WEB_DIR')) define('WEB_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'html');
+        if (!defined('BASE_DIR')) {
+            define('BASE_DIR', SOURCE_DIR.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..');
+        }
+        if (!defined('CORE_DIR')) {
+            define('CORE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'src');
+        }
+    } else {
+        if (!defined('BASE_DIR')) {
+            define('BASE_DIR', SOURCE_DIR.DIRECTORY_SEPARATOR.'..');
+        }
+        if (!defined('CORE_DIR')) {
+            define('CORE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'modules');
+        }
+    }
+    if (!defined('LOG_DIR')) {
+        define('LOG_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'logs');
+    }
+    if (!defined('CACHE_DIR')) {
+        define('CACHE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'cache');
+    }
+    if (!defined('CONFIG_DIR')) {
+        define('CONFIG_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'config');
+    }
+    if (!defined('WEB_DIR')) {
+        define('WEB_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'html');
+    }
 
     //Cargamos en memoria la función de desarrollo PRE
     if (!function_exists('pre')) {

src/command/CreateDocumentRoot.php

Braces +9 added lines, -3 removed lines

@@ -6,7 +6,9 @@ 
     use Symfony\Component\Console\Input\InputInterface;
     use Symfony\Component\Console\Output\OutputInterface;
 
-    if (!isset($console)) $console = new Application();
+    if (!isset($console)) {
+        $console = new Application();
+    }
     $console
         ->register('psfs:create:root')
         ->setDefinition(array(
@@ -15,13 +17,17 @@ 
         ->setDescription('Comando de creación del Document Root del projecto')
         ->setCode(function(InputInterface $input, OutputInterface $output) {
             $path = $input->getArgument('path');
-            if (empty($path)) $path = BASE_DIR.DIRECTORY_SEPARATOR.'html';
+            if (empty($path)) {
+                $path = BASE_DIR.DIRECTORY_SEPARATOR.'html';
+            }
             \PSFS\base\config\Config::createDir($path);
             $paths = array("js", "css", "img", "media", "font");
             foreach ($paths as $htmlPath) {
                 \PSFS\base\config\Config::createDir($path.DIRECTORY_SEPARATOR.$htmlPath);
             }
-            if (!file_exists(SOURCE_DIR.DIRECTORY_SEPARATOR.'html.tar.gz')) throw new \PSFS\base\exception\ConfigException("No existe el fichero del DocumentRoot");
+            if (!file_exists(SOURCE_DIR.DIRECTORY_SEPARATOR.'html.tar.gz')) {
+                throw new \PSFS\base\exception\ConfigException("No existe el fichero del DocumentRoot");
+            }
             $tar = new \Archive_Tar(realpath(SOURCE_DIR.DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR."html.tar.gz", true);
             $tar->extract(realpath($path));
             $output->writeln("Document root generado en ".$path);