psfs / core

src/base/dto/Form.php

Spacing +4 added lines, -4 removed lines

@@ -42,10 +42,10 @@ 
             $array['fields'][] = $field->__toArray();
         }
         usort($array['fields'], function($fieldA, $fieldB) {
-            if((bool)$fieldA['required'] !== (bool)$fieldB['required']) {
-                if((bool)$fieldA['required']) {
+            if ((bool)$fieldA['required'] !== (bool)$fieldB['required']) {
+                if ((bool)$fieldA['required']) {
                     return -1;
-                } else {
+                }else {
                     return 1;
                 }
             }
@@ -56,7 +56,7 @@ 
             }
             return ($aOrder < $bOrder) ? -1 : 1;
         });
-        foreach($this->actions as $action) {
+        foreach ($this->actions as $action) {
             $array['actions'][] = $action->__toArray();
         }
         return $array;

src/base/dto/Order.php

Spacing +2 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
     {
         if (preg_match('/^asc$/i', $direction)) {
             return self::ASC;
-        } else {
+        }else {
             return self::DESC;
         }
     }
@@ -81,7 +81,7 @@ 
      */
     public function fromArray(array $object = array())
     {
-        foreach($object as $field => $order) {
+        foreach ($object as $field => $order) {
             $this->addOrder($field, $order);
         }
     }

src/base/dto/Dto.php

Spacing +16 added lines, -16 removed lines

@@ -19,7 +19,7 @@ 
     public function __construct($hydrate = true)
     {
         parent::__construct();
-        if($hydrate) {
+        if ($hydrate) {
             $this->fromArray(Request::getInstance()->getData());
         }
     }
@@ -47,22 +47,22 @@ 
                 /** @var \ReflectionProperty $property */
                 foreach ($properties as $property) {
                     $value = $property->getValue($this);
-                    if(is_object($value) && method_exists($value, 'toArray')) {
+                    if (is_object($value) && method_exists($value, 'toArray')) {
                         $dto[$property->getName()] = $value->toArray();
-                    } elseif(is_array($value)) {
-                        foreach($value as &$arrValue) {
-                            if($arrValue instanceof Dto) {
+                    } elseif (is_array($value)) {
+                        foreach ($value as &$arrValue) {
+                            if ($arrValue instanceof Dto) {
                                 $arrValue = $arrValue->toArray();
                             }
                         }
                         $dto[$property->getName()] = $value;
-                    } else {
+                    }else {
                         $dto[$property->getName()] = $property->getValue($this);
                     }
                 }
             }
-        } catch (\Exception $e) {
-            Logger::log(get_class($this) . ': ' . $e->getMessage(), LOG_ERR);
+        }catch (\Exception $e) {
+            Logger::log(get_class($this).': '.$e->getMessage(), LOG_ERR);
         }
         return $dto;
     }
@@ -85,26 +85,26 @@ 
     protected function parseDtoField(array $properties, $key, $value = null) {
         list($type, $isArray) = $this->extractTypes($properties, $key);
         $reflector = (class_exists($type)) ? new \ReflectionClass($type) : null;
-        if(null !== $reflector && $reflector->isSubclassOf(Dto::class)) {
-            if(null !== $value && is_array($value)) {
-                if(!array_key_exists($type, $this->__cache)) {
+        if (null !== $reflector && $reflector->isSubclassOf(Dto::class)) {
+            if (null !== $value && is_array($value)) {
+                if (!array_key_exists($type, $this->__cache)) {
                     $this->__cache[$type] = new $type(false);
                 }
-                if($isArray) {
+                if ($isArray) {
                     $this->$key = [];
-                    foreach($value as $data) {
-                        if(null !== $data && is_array($data)) {
+                    foreach ($value as $data) {
+                        if (null !== $data && is_array($data)) {
                             $dto = clone $this->__cache[$type];
                             $dto->fromArray($data);
                             array_push($this->$key, $dto);
                         }
                     }
-                } else {
+                }else {
                     $this->$key = clone $this->__cache[$type];
                     $this->$key->fromArray($value);
                 }
             }
-        } else {
+        }else {
             $this->castValue($key, $value, $type);
         }
     }

src/base/types/helpers/ServiceHelper.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
     }
 
     public static function parseRawData($type, $params) {
-        switch($type) {
+        switch ($type) {
             default:
             case self::TYPE_HTTP:
                 $parsedParams = http_build_query($params);

src/base/extension/AssetsTokenParser.php

Spacing +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
         $tmp = [];
         if (null === $node) {
             $node = $value;
-        } else {
+        }else {
             $tmp = $this->getTmpAttribute($node);
         }
         if (null !== $node) {

src/base/types/helpers/DeployHelper.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     public static function updateCacheVar() {
         $now = new \DateTime(null, new \DateTimeZone(Config::getParam('project.timezone', 'Europe/Madrid')));
         $config = Config::getInstance()->dumpConfig();
-        $config[self::CACHE_VAR_TAG] = 'v' . $now->format('Ymd.His');
+        $config[self::CACHE_VAR_TAG] = 'v'.$now->format('Ymd.His');
         Config::save($config);
         return $config[self::CACHE_VAR_TAG];
     }

src/controller/GeneratorController.php

Spacing +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
      */
     public function generateModule()
     {
-        Logger::log("Arranque generador de módulos al solicitar " . $this->getRequest()->getRequestUri());
+        Logger::log("Arranque generador de módulos al solicitar ".$this->getRequest()->getRequestUri());
         /* @var $form \PSFS\base\config\ConfigForm */
         $form = new ModuleForm();
         $form->build();
@@ -60,8 +60,8 @@ 
                 $this->gen->createStructureModule($module, false, $type, $apiClass);
                 Security::getInstance()->setFlash("callback_message", str_replace("%s", $module, t("Módulo %s generado correctamente")));
                 // Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-module", true));
-            } catch (\Exception $e) {
-                Logger::log($e->getMessage() . " [" . $e->getFile() . ":" . $e->getLine() . "]");
+            }catch (\Exception $e) {
+                Logger::log($e->getMessage()." [".$e->getFile().":".$e->getLine()."]");
                 Security::getInstance()->setFlash("callback_message", htmlentities($e->getMessage()));
             }
         }

src/base/types/helpers/GeneratorHelper.php

Spacing +30 added lines, -30 removed lines

@@ -23,10 +23,10 @@ 
             $objects = scandir($dir);
             foreach ($objects as $object) {
                 if ($object != "." && $object != "..") {
-                    if (filetype($dir . "/" . $object) == "dir") {
-                        self::deleteDir($dir . "/" . $object);
-                    } else {
-                        unlink($dir . "/" . $object);
+                    if (filetype($dir."/".$object) == "dir") {
+                        self::deleteDir($dir."/".$object);
+                    }else {
+                        unlink($dir."/".$object);
                     }
                 }
             }
@@ -42,10 +42,10 @@ 
     {
         $rootDirs = array("css", "js", "media", "font");
         foreach ($rootDirs as $dir) {
-            if (file_exists(WEB_DIR . DIRECTORY_SEPARATOR . $dir)) {
+            if (file_exists(WEB_DIR.DIRECTORY_SEPARATOR.$dir)) {
                 try {
-                    self::deleteDir(WEB_DIR . DIRECTORY_SEPARATOR . $dir);
-                } catch (\Exception $e) {
+                    self::deleteDir(WEB_DIR.DIRECTORY_SEPARATOR.$dir);
+                }catch (\Exception $e) {
                     syslog(LOG_INFO, $e->getMessage());
                 }
             }
@@ -61,12 +61,12 @@ 
     {
         try {
             if (!is_dir($dir) && @mkdir($dir, 0775, true) === false) {
-                throw new \Exception(t('Can\'t create directory ') . $dir);
+                throw new \Exception(t('Can\'t create directory ').$dir);
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             syslog(LOG_WARNING, $e->getMessage());
             if (!file_exists(dirname($dir))) {
-                throw new GeneratorException($e->getMessage() . $dir);
+                throw new GeneratorException($e->getMessage().$dir);
             }
         }
     }
@@ -77,7 +77,7 @@ 
      */
     public static function getTemplatePath()
     {
-        $path = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR;
+        $path = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'templates'.DIRECTORY_SEPARATOR;
         return realpath($path);
     }
 
@@ -96,15 +96,15 @@ 
      * @throws \ReflectionException
      */
     public static function checkCustomNamespaceApi($namespace) {
-        if(!empty($namespace)) {
-            if(class_exists($namespace)) {
+        if (!empty($namespace)) {
+            if (class_exists($namespace)) {
                 $reflector = new \ReflectionClass($namespace);
-                if(!$reflector->isSubclassOf(\PSFS\base\types\Api::class)) {
+                if (!$reflector->isSubclassOf(\PSFS\base\types\Api::class)) {
                     throw new GeneratorException(t('La clase definida debe extender de PSFS\\\base\\\types\\\Api'), 501);
-                } elseif(!$reflector->isAbstract()) {
+                } elseif (!$reflector->isAbstract()) {
                     throw new GeneratorException(t('La clase definida debe ser abstracta'), 501);
                 }
-            } else {
+            }else {
                 throw new GeneratorException(t('La clase definida para extender la API no existe'), 501);
             }
         }
@@ -115,13 +115,13 @@ 
      * @return array
      */
     public static function getDomainPaths($domain) {
-        $domains = json_decode(file_get_contents(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json'), true);
+        $domains = json_decode(file_get_contents(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json'), true);
         $paths = [];
-        if(null !== $domains) {
+        if (null !== $domains) {
             $keyDomains = array_keys($domains);
-            foreach($keyDomains as $keyDomain) {
+            foreach ($keyDomains as $keyDomain) {
                 $key = strtoupper(str_replace(['@', '/'], '', $keyDomain));
-                if(strtoupper($domain) === $key) {
+                if (strtoupper($domain) === $key) {
                     $paths = $domains[$keyDomain];
                     break;
                 }
@@ -137,14 +137,14 @@ 
      */
     public static function createRoot($path = WEB_DIR, OutputInterface $output = null) {
 
-        if(null === $output) {
+        if (null === $output) {
             $output = new ConsoleOutput();
         }
 
         GeneratorHelper::createDir($path);
         $paths = array("js", "css", "img", "media", "font");
         foreach ($paths as $htmlPath) {
-            GeneratorHelper::createDir($path . DIRECTORY_SEPARATOR . $htmlPath);
+            GeneratorHelper::createDir($path.DIRECTORY_SEPARATOR.$htmlPath);
         }
 
         // Generates the root needed files
@@ -157,18 +157,18 @@ 
         ];
         $output->writeln('Start creating html files');
         foreach ($files as $templates => $filename) {
-            $text = Template::getInstance()->dump("generator/html/" . $templates . '.html.twig');
-            if (false === file_put_contents($path . DIRECTORY_SEPARATOR . $filename, $text)) {
-                $output->writeln('Can\t create the file ' . $filename);
-            } else {
-                $output->writeln($filename . ' created successfully');
+            $text = Template::getInstance()->dump("generator/html/".$templates.'.html.twig');
+            if (false === file_put_contents($path.DIRECTORY_SEPARATOR.$filename, $text)) {
+                $output->writeln('Can\t create the file '.$filename);
+            }else {
+                $output->writeln($filename.' created successfully');
             }
         }
 
         //Export base locale translations
-        if (!file_exists(BASE_DIR . DIRECTORY_SEPARATOR . 'locale')) {
-            GeneratorHelper::createDir(BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
-            GeneratorService::copyr(SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'locale', BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
+        if (!file_exists(BASE_DIR.DIRECTORY_SEPARATOR.'locale')) {
+            GeneratorHelper::createDir(BASE_DIR.DIRECTORY_SEPARATOR.'locale');
+            GeneratorService::copyr(SOURCE_DIR.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'locale', BASE_DIR.DIRECTORY_SEPARATOR.'locale');
         }
     }
 }
\ No newline at end of file

src/base/Service.php

Spacing +17 added lines, -17 removed lines

@@ -70,10 +70,10 @@ 
     protected $isMultipart = false;
 
     private function closeConnection() {
-        if(null !== $this->con) {
-            if(is_resource($this->con)) {
+        if (null !== $this->con) {
+            if (is_resource($this->con)) {
                 @curl_close($this->con);
-            } else {
+            }else {
                 $this->con = null;
             }
         }
@@ -237,7 +237,7 @@ 
      */
     public function setIsJson($isJson = true) {
         $this->isJson = $isJson;
-        if($isJson) {
+        if ($isJson) {
             $this->setIsMultipart(false);
         }
     }
@@ -254,7 +254,7 @@ 
      */
     public function setIsMultipart($isMultipart = true) {
         $this->isMultipart = $isMultipart;
-        if($isMultipart) {
+        if ($isMultipart) {
             $this->setIsJson(false);
         }
     }
@@ -274,7 +274,7 @@ 
         $this->url = NULL;
         $this->params = array();
         $this->headers = array();
-        Logger::log('Context service for ' . static::class . ' cleared!');
+        Logger::log('Context service for '.static::class.' cleared!');
         $this->closeConnection();
     }
 
@@ -317,18 +317,18 @@ 
     }
 
     protected function applyOptions() {
-        if(count($this->options)) {
+        if (count($this->options)) {
             curl_setopt_array($this->con, $this->options);
         }
     }
 
     protected function applyHeaders() {
         $headers = [];
-        foreach($this->headers as $key => $value) {
-            $headers[] = $key . ': ' . $value;
+        foreach ($this->headers as $key => $value) {
+            $headers[] = $key.': '.$value;
         }
         $headers[self::PSFS_TRACK_HEADER] = Logger::getUid();
-        if(count($headers)) {
+        if (count($headers)) {
             curl_setopt($this->con, CURLOPT_HTTPHEADER, $headers);
         }
     }
@@ -337,10 +337,10 @@ 
      * @return int
      */
     private function parseServiceType() {
-        if($this->getIsJson()) {
+        if ($this->getIsJson()) {
             return ServiceHelper::TYPE_JSON;
         }
-        if($this->getIsMultipart()) {
+        if ($this->getIsMultipart()) {
             return ServiceHelper::TYPE_MULTIPART;
         }
         return ServiceHelper::TYPE_HTTP;
@@ -353,9 +353,9 @@ 
             case Request::VERB_GET:
             default:
                 $this->addOption(CURLOPT_CUSTOMREQUEST, Request::VERB_GET);
-                if(!empty($this->params)) {
+                if (!empty($this->params)) {
                     $sep = false === strpos($this->getUrl(), '?') ? '?' : '';
-                    $this->url = $this->url . $sep . http_build_query($this->params);
+                    $this->url = $this->url.$sep.http_build_query($this->params);
                 }
                 break;
             case Request::VERB_POST:
@@ -387,14 +387,14 @@ 
         $this->applyOptions();
         $this->applyHeaders();
         $verbose = null;
-        if('debug' === Config::getParam('log.level')) {
+        if ('debug' === Config::getParam('log.level')) {
             curl_setopt($this->con, CURLOPT_VERBOSE, true);
             $verbose = fopen('php://temp', 'wb+');
             curl_setopt($this->con, CURLOPT_STDERR, $verbose);
         }
         $result = curl_exec($this->con);
         $this->setResult($this->isJson ? json_decode($result, true) : $result);
-        if('debug' === Config::getParam('log.level')) {
+        if ('debug' === Config::getParam('log.level')) {
             rewind($verbose);
             $verboseLog = stream_get_contents($verbose);
             Logger::log($verboseLog, LOG_DEBUG, [
@@ -404,7 +404,7 @@ 
             ]);
             $this->info['verbose'] = $verboseLog;
         }
-        Logger::log($this->url . ' response: ', LOG_DEBUG, is_array($this->result) ? $this->result : [$this->result]);
+        Logger::log($this->url.' response: ', LOG_DEBUG, is_array($this->result) ? $this->result : [$this->result]);
         $this->info = array_merge($this->info, curl_getinfo($this->con));
     }