psfs / core

src/command/PSFSConsole.php

Braces +6 added lines, -2 removed lines

@@ -31,14 +31,18 @@
     //Hidratamos con los comandos de PSFS
     $commands = new Finder();
     $commands->in(__DIR__)->notName("PSFSConsole.php");
-    foreach ($commands as $com) include_once($com->getRealPath());
+    foreach ($commands as $com) {
+        include_once($com->getRealPath());
+    }
 
     //Hidratamos con los comandos de los módulos
     if (file_exists(CORE_DIR))
     {
         $commands = new Finder();
         $commands->in(CORE_DIR)->path("Command")->name("*.php");
-        foreach ($commands as $com) include_once($com->getRealPath());
+        foreach ($commands as $com) {
+            include_once($com->getRealPath());
+        }
     }
 
     $console->run();

src/services/AdminServices.php

Spacing +18 added lines, -18 removed lines

@@ -6,7 +6,7 @@ 
     use PSFS\controller\Admin;
     use Symfony\Component\Finder\Finder;
 
-    class AdminServices extends Service{
+    class AdminServices extends Service {
 
         /**
          * @Inyectable
@@ -30,10 +30,10 @@ 
          */
         public function setAdminHeaders()
         {
-            if("login" === $this->config->get("admin_login")) return Admin::getInstance()->adminLogin("admin-setup");
+            if ("login" === $this->config->get("admin_login")) return Admin::getInstance()->adminLogin("admin-setup");
             $platform = trim(Config::getInstance()->get("platform_name"));
             header('HTTP/1.1 401 Unauthorized');
-            header('WWW-Authenticate: Basic Realm="' . $platform. '"');
+            header('WWW-Authenticate: Basic Realm="'.$platform.'"');
             echo _("Zona restringida");
             exit();
         }
@@ -45,9 +45,9 @@ 
         public function getAdmins()
         {
             $admins = $this->security->getAdmins();
-            if(!empty($admins))
+            if (!empty($admins))
             {
-                if(!$this->security->checkAdmin())
+                if (!$this->security->checkAdmin())
                 {
                     $this->setAdminHeaders();
                 }
@@ -62,12 +62,12 @@ 
          */
         private function parseAdmins(&$admins)
         {
-            if(!empty($admins)) foreach($admins as &$admin)
+            if (!empty($admins)) foreach ($admins as &$admin)
             {
-                if(isset($admin["profile"]))
+                if (isset($admin["profile"]))
                 {
                     $admin["class"] = $admin["profile"] == sha1("admin") ? 'primary' : "warning";
-                }else{
+                }else {
                     $admin["class"] = "primary";
                 }
             }
@@ -87,12 +87,12 @@ 
             $files->files()->in(LOG_DIR)->name("*.log")->sortByModifiedTime();
             $logs = array();
             /** @var \SplFileInfo $file */
-            foreach($files as $file)
+            foreach ($files as $file)
             {
-                $size = $file->getSize() / 8 / 1024;
+                $size = $file->getSize()/8/1024;
                 $time = date("c", $file->getMTime());
                 $dateTime = new \DateTime($time);
-                if(!isset($logs[$dateTime->format("Y")])) $logs[$dateTime->format("Y")] = array();
+                if (!isset($logs[$dateTime->format("Y")])) $logs[$dateTime->format("Y")] = array();
                 $logs[$dateTime->format("Y")][$dateTime->format("m")][$time] = array(
                     "filename" => $file->getFilename(),
                     "size" => round($size, 3)
@@ -116,27 +116,27 @@ 
             $files->files()->in(LOG_DIR)->name($selectedLog);
             $file = null;
             $log = array();
-            foreach($files as $match)
+            foreach ($files as $match)
             {
                 $file = $match;
                 break;
             }
             /** @var \SplFileInfo $file */
-            if(!empty($file))
+            if (!empty($file))
             {
                 $time = date("c", $file->getMTime());
                 $dateTime = new \DateTime($time);
                 $monthOpen = $dateTime->format("m");
-                $content = file($file->getPath() . DIRECTORY_SEPARATOR . $file->getFilename());
+                $content = file($file->getPath().DIRECTORY_SEPARATOR.$file->getFilename());
                 krsort($content);
                 $detailLog = array();
-                foreach($content as &$line)
+                foreach ($content as &$line)
                 {
                     list($line, $detail) = $this->parseLogLine($line, $match);
                     $detailLog[] = array_merge(array(
                         "log" => $line,
                     ), $detail);
-                    if(count($detailLog) >= 1000) break;
+                    if (count($detailLog) >= 1000) break;
                 }
                 $log = $detailLog;
             }
@@ -165,7 +165,7 @@ 
 
                 $type = (isset($match[1][0])) ? $match[1][0] : '';
                 $type = explode(".", $type);
-                $type = count($type)>1 ? $type[1] : $type[0];
+                $type = count($type) > 1 ? $type[1] : $type[0];
                 switch ($type) {
                     case 'INFO':
                         $detail["type"] = "success";
@@ -181,7 +181,7 @@ 
                         break;
                 }
 
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 $detail = array(
                     "type" => "danger",
                 );

Braces +16 added lines, -6 removed lines

@@ -30,7 +30,9 @@ 
          */
         public function setAdminHeaders()
         {
-            if("login" === $this->config->get("admin_login")) return Admin::getInstance()->adminLogin("admin-setup");
+            if("login" === $this->config->get("admin_login")) {
+                return Admin::getInstance()->adminLogin("admin-setup");
+            }
             $platform = trim(Config::getInstance()->get("platform_name"));
             header('HTTP/1.1 401 Unauthorized');
             header('WWW-Authenticate: Basic Realm="' . $platform. '"');
@@ -62,12 +64,14 @@ 
          */
         private function parseAdmins(&$admins)
         {
-            if(!empty($admins)) foreach($admins as &$admin)
+            if(!empty($admins)) {
+                foreach($admins as &$admin)
             {
                 if(isset($admin["profile"]))
                 {
                     $admin["class"] = $admin["profile"] == sha1("admin") ? 'primary' : "warning";
-                }else{
+            }
+                } else{
                     $admin["class"] = "primary";
                 }
             }
@@ -92,7 +96,9 @@ 
                 $size = $file->getSize() / 8 / 1024;
                 $time = date("c", $file->getMTime());
                 $dateTime = new \DateTime($time);
-                if(!isset($logs[$dateTime->format("Y")])) $logs[$dateTime->format("Y")] = array();
+                if(!isset($logs[$dateTime->format("Y")])) {
+                    $logs[$dateTime->format("Y")] = array();
+                }
                 $logs[$dateTime->format("Y")][$dateTime->format("m")][$time] = array(
                     "filename" => $file->getFilename(),
                     "size" => round($size, 3)
@@ -136,7 +142,9 @@ 
                     $detailLog[] = array_merge(array(
                         "log" => $line,
                     ), $detail);
-                    if(count($detailLog) >= 1000) break;
+                    if(count($detailLog) >= 1000) {
+                        break;
+                    }
                 }
                 $log = $detailLog;
             }
@@ -160,7 +168,9 @@ 
 
                     $detail = json_decode($match[0][0], TRUE);
                 }
-                if (empty($detail)) $detail = array();
+                if (empty($detail)) {
+                    $detail = array();
+                }
                 preg_match_all('/\>\ (.*):/i', $line, $match);
 
                 $type = (isset($match[1][0])) ? $match[1][0] : '';

src/base/dto/Form.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
         {
             $array = array();
             $array['fields'] = array();
-            foreach($this->fields as $field) {
+            foreach ($this->fields as $field) {
                 $array['fields'][] = $field->__toArray();
             }
             return $array;

src/base/types/AuthApi.php

Spacing +2 added lines, -2 removed lines

@@ -26,13 +26,13 @@
         {
             $namespace = explode('\\', $this->getModelTableMap());
             $module = strtolower($namespace[0]);
-            $secret = Config::getInstance()->get($module . '.api.secret');
+            $secret = Config::getInstance()->get($module.'.api.secret');
             if (NULL === $secret) {
                 $secret = Config::getInstance()->get("api.secret");
             }
             if (NULL === $secret) {
                 $auth = TRUE;
-            } else {
+            }else {
                 $token = Request::getInstance()->getHeader('X-API-SEC-TOKEN');
                 if (array_key_exists('API_TOKEN', $this->query)) {
                     $token = $this->query['API_TOKEN'];

src/base/types/interfaces/AuthInterface.php

Doc Comments +12 added lines

@@ -7,7 +7,19 @@
  * @package PSFS\base\types\interfaces
  */
 interface AuthInterface {
+
+    /**
+     * @return boolean
+     */
     function isLogged();
+
+    /**
+     * @return boolean
+     */
     function isAdmin();
+
+    /**
+     * @return boolean
+     */
     function canDo($action);
 }

src/base/types/interfaces/ControllerInterface.php

Doc Comments +8 added lines

@@ -7,6 +7,14 @@
  * @package PSFS\base\types\interfaces
  */
 interface ControllerInterface {
+
+    /**
+     * @return string|null
+     */
     public function render($template, Array $vars = null);
+
+    /**
+     * @return void
+     */
     public function response($response, $type = 'text/html');
 }

src/Dispatcher.php

Spacing +11 added lines, -11 removed lines

@@ -12,7 +12,7 @@ 
     use PSFS\base\exception\SecurityException;
     use PSFS\base\Singleton;
 
-    require_once __DIR__ . DIRECTORY_SEPARATOR . "bootstrap.php";
+    require_once __DIR__.DIRECTORY_SEPARATOR."bootstrap.php";
 
     /**
      * Class Dispatcher
@@ -82,10 +82,10 @@ 
         {
             $this->locale = $this->config->get("default_language");
             // Load translations
-            putenv("LC_ALL=" . $this->locale);
+            putenv("LC_ALL=".$this->locale);
             setlocale(LC_ALL, $this->locale);
             // Load the locale path
-            $locale_path = BASE_DIR . DIRECTORY_SEPARATOR . 'locale';
+            $locale_path = BASE_DIR.DIRECTORY_SEPARATOR.'locale';
             Config::createDir($locale_path);
             bindtextdomain('translations', $locale_path);
             textdomain('translations');
@@ -99,23 +99,23 @@ 
          */
         public function run()
         {
-            $this->log->infoLog("Begin request " . $this->parser->getRequestUri());
+            $this->log->infoLog("Begin request ".$this->parser->getRequestUri());
             //
             try {
                 if ($this->config->isConfigured()) {
                     if (!$this->parser->isFile()) {
                         return $this->router->execute($this->actualUri);
                     }
-                } else {
+                }else {
                     return $this->router->getAdmin()->config();
                 }
-            } catch (ConfigException $c) {
+            }catch (ConfigException $c) {
                 return $this->dumpException($c);
-            } catch (SecurityException $s) {
+            }catch (SecurityException $s) {
                 return $this->security->notAuthorized($this->actualUri);
-            } catch (RouterException $r) {
+            }catch (RouterException $r) {
                 return $this->router->httpNotFound($r);
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 return $this->dumpException($e);
             }
         }
@@ -156,7 +156,7 @@ 
                     $use /= 1024;
                     break;
                 case "MBytes":
-                    $use /= (1024 * 1024);
+                    $use /= (1024*1024);
                     break;
                 case "Bytes":
                 default:
@@ -181,7 +181,7 @@ 
         {
             if ($this->config->getDebugMode()) {
                 //Warning & Notice handler
-                set_error_handler(function ($errno, $errstr, $errfile, $errline) {
+                set_error_handler(function($errno, $errstr, $errfile, $errline) {
                     throw new \ErrorException($errstr, 500, $errno, $errfile, $errline);
                 });
             }

src/base/types/Api.php

Spacing +16 added lines, -16 removed lines

@@ -179,7 +179,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        private function addOrders(ModelCriteria &$query)
+        private function addOrders(ModelCriteria & $query)
         {
             $orderAdded = FALSE;
             foreach ($this->order->getOrders() as $field => $direction) {
@@ -187,7 +187,7 @@ 
                     $orderAdded = TRUE;
                     if ($direction === Order::ASC) {
                         $query->addAscendingOrderByColumn($field);
-                    } else {
+                    }else {
                         $query->addDescendingOrderByColumn($field);
                     }
                 }
@@ -202,7 +202,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        private function addExtraColumns(ModelCriteria &$query)
+        private function addExtraColumns(ModelCriteria & $query)
         {
             if (!empty($this->extraColumns)) {
                 foreach ($this->extraColumns as $expression => $columnName) {
@@ -216,7 +216,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        protected function joinTables(ModelCriteria &$query)
+        protected function joinTables(ModelCriteria & $query)
         {
             //TODO for specific implementations
         }
@@ -226,7 +226,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        private function addFilters(ModelCriteria &$query)
+        private function addFilters(ModelCriteria & $query)
         {
             if (count($this->query) > 0) {
                 foreach ($this->query as $field => $value) {
@@ -243,7 +243,7 @@ 
                         } elseif (preg_match('/^(\'|\")(.*)(\'|\")$/', $value)) {
                             $text = preg_replace('/(\'|\")/', '', $value);
                             $query->filterBy($tableField, $text, Criteria::LIKE);
-                        } else {
+                        }else {
                             $query->filterBy($tableField, $value, Criteria::EQUAL);
                         }
                     }
@@ -266,10 +266,10 @@ 
                 list($page, $limit) = $this->extractPagination();
                 if ($limit == -1) {
                     $this->list = $query->find($this->con);
-                } else {
+                }else {
                     $this->list = $query->paginate($page, $limit, $this->con);
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance(get_class($this))->errorLog($e->getMessage());
             }
         }
@@ -286,7 +286,7 @@ 
                 $this->joinTables($query);
                 $this->addExtraColumns($query);
                 $this->model = $query->findPk($pk);
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance(get_class($this))->errorLog($e->getMessage());
             }
         }
@@ -374,7 +374,7 @@ 
                     $saved = TRUE;
                     $model = $this->model->toArray();
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 jpre($e->getMessage(), TRUE);
                 Logger::getInstance()->errorLog($e->getMessage());
             }
@@ -403,7 +403,7 @@ 
                         $this->model->delete($this->con);
                         $deleted = TRUE;
                     }
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::getInstance(get_class($this->model))->errorLog($e->getMessage());
                 }
             }
@@ -447,7 +447,7 @@ 
          */
         private function extractQuery()
         {
-            $queryReflector = new \ReflectionClass($this->getModelNamespace() . "Query");
+            $queryReflector = new \ReflectionClass($this->getModelNamespace()."Query");
             /** @var \Propel\Runtime\ActiveQuery\ModelCriteria $query */
             $query = $queryReflector->getMethod('create')->invoke(NULL);
 
@@ -491,7 +491,7 @@ 
             if ($this->con->inTransaction()) {
                 if ($status === 200) {
                     $this->con->commit();
-                } else {
+                }else {
                     $this->con->rollBack();
                 }
             }
@@ -535,7 +535,7 @@ 
             return $this->render('api.admin.html.twig', array(
                 "api"    => $this->getApi(),
                 "domain" => $this->domain,
-                "url"    => preg_replace('/\/$/', '', $this->getRoute(strtolower('api-' . $this->getApi() . "-pk"), TRUE)),
+                "url"    => preg_replace('/\/$/', '', $this->getRoute(strtolower('api-'.$this->getApi()."-pk"), TRUE)),
             ));
         }
 
@@ -572,7 +572,7 @@ 
                 $return = $this->list->toArray();
                 $total = $this->list->getNbResults();
                 $pages = $this->list->getLastPage();
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance(get_class($this))->errorLog($e->getMessage());
             }
 
@@ -592,7 +592,7 @@ 
             $return = array();
             if (NULL === $model) {
                 $code = 404;
-            } else {
+            }else {
                 $return = $model->toArray();
             }
 

src/services/DocumentorService.php

Doc Comments +1 added lines, -1 removed lines

@@ -371,7 +371,7 @@
          * @param array $parts
          * @param int $partLength
          *
-         * @return array
+         * @return string[]
          */
         private static function extractTsAndMod(array &$parts, $partLength)
         {

Indentation +1 added lines, -1 removed lines

@@ -422,7 +422,7 @@
                                 "type" => $type,
                             ];
                             if (strlen($format)) {
-                               $dto['properties'][$field]['format'] = $format;
+                                $dto['properties'][$field]['format'] = $format;
                             }
                         }
                     }

Spacing +15 added lines, -15 removed lines

@@ -33,7 +33,7 @@ 
                         if (!preg_match('/^\@ROOT/i', $domain)) {
                             $modules[] = str_replace('/', '', str_replace('@', '', $domain));
                         }
-                    } catch (\Exception $e) {
+                    }catch (\Exception $e) {
                         $modules[] = $e->getMessage();
                     }
                 }
@@ -51,7 +51,7 @@ 
          */
         public function extractApiEndpoints($module)
         {
-            $module_path = CORE_DIR . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . "Api";
+            $module_path = CORE_DIR.DIRECTORY_SEPARATOR.$module.DIRECTORY_SEPARATOR."Api";
             $endpoints = [];
             if (file_exists($module_path)) {
                 $finder = new Finder();
@@ -59,7 +59,7 @@ 
                 if (count($finder)) {
                     /** @var \SplFileInfo $file */
                     foreach ($finder as $file) {
-                        $namespace = "\\{$module}\\Api\\" . str_replace('.php', '', $file->getFilename());
+                        $namespace = "\\{$module}\\Api\\".str_replace('.php', '', $file->getFilename());
                         $endpoints[$namespace] = $this->extractApiInfo($namespace);
                     }
                 }
@@ -88,7 +88,7 @@ 
                         if (NULL !== $mInfo) {
                             $info[] = $mInfo;
                         }
-                    } catch (\Exception $e) {
+                    }catch (\Exception $e) {
                         Logger::getInstance()->errorLog($e->getMessage());
                     }
                 }
@@ -221,9 +221,9 @@ 
             if ($reflector->isSubclassOf(self::DTO_INTERFACE)) {
                 foreach ($reflector->getProperties(\ReflectionMethod::IS_PUBLIC) as $property) {
                     $type = $this->extractVarType($property->getDocComment());
-                    if(class_exists($type)) {
+                    if (class_exists($type)) {
                         $properties[$property->getName()] = $this->extractModelFields($type);
-                    } else {
+                    }else {
                         $properties[$property->getName()] = $type;
                     }
                 }
@@ -242,7 +242,7 @@ 
          */
         protected function extractReturn($model, $comments = '')
         {
-            $modelDto  = [];
+            $modelDto = [];
             preg_match('/\@return\ (.*)\((.*)\)\n/i', $comments, $returnTypes);
             if (count($returnTypes)) {
                 // Extract principal DTO information
@@ -295,7 +295,7 @@ 
                 } elseif (null !== $reflector && $reflector->isSubclassOf(self::DTO_INTERFACE)) {
                     $payload = $this->extractDtoProperties($namespace);
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance()->errorLog($e->getMessage());
             }
 
@@ -331,7 +331,7 @@ 
                         if (in_array($methodInfo['method'], ['POST', 'PUT'])) {
                             $methodInfo['payload'] = $this->extractPayload($modelNamespace, $docComments);
                         }
-                    } catch (\Exception $e) {
+                    }catch (\Exception $e) {
                         jpre($e->getMessage());
                         Logger::getInstance()->errorLog($e->getMessage());
                     }
@@ -349,7 +349,7 @@ 
          */
         public static function translateSwaggerFormats($format)
         {
-            switch(strtolower($format)) {
+            switch (strtolower($format)) {
                 case 'bool':
                 case 'boolean':
                     $swaggerType = 'boolean';
@@ -410,13 +410,13 @@ 
                             ]]);
                             if (array_key_exists($subDtoName, $subDto)) {
                                 $definitions = $subDto;
-                            } else {
+                            }else {
                                 $definitions[$subDtoName] = $subDto;
                             }
                             $dto['properties'][$field] = [
-                                '$ref' => "#/definitions/" . $subDtoName,
+                                '$ref' => "#/definitions/".$subDtoName,
                             ];
-                        } else {
+                        }else {
                             list($type, $format) = self::translateSwaggerFormats($format);
                             $dto['properties'][$field] = [
                                 "type" => $type,
@@ -453,7 +453,7 @@ 
                     "url" => Router::getInstance()->getRoute(''),
                 ]
             ];
-            foreach($endpoints as $model) {
+            foreach ($endpoints as $model) {
                 foreach ($model as $endpoint) {
                     $dtos += self::extractSwaggerDefinition($endpoint);
                 }
@@ -472,7 +472,7 @@ 
         protected function extractDtoName($dto, $isArray = false)
         {
             $dto = explode('\\', $dto);
-            $modelDto = array_pop($dto) . "Dto";
+            $modelDto = array_pop($dto)."Dto";
             if ($isArray) {
                 $modelDto .= "List";
             }