psfs / core

src/base/Logger.php

Doc Comments +4 added lines, -4 removed lines

@@ -90,7 +90,7 @@ 
      * @param string $msg
      * @param array $context
      *
-     * @return bool
+     * @return boolean|null
      */
     public function debugLog($msg = '', array $context = [])
     {
@@ -98,7 +98,7 @@ 
     }
 
     /**
-     * @param $msg
+     * @param string $msg
      * @param array $context
      *
      * @return bool
@@ -109,7 +109,7 @@ 
     }
 
     /**
-     * @param $msg
+     * @param string $msg
      * @param array $context
      *
      * @return bool
@@ -123,7 +123,7 @@ 
     }
 
     /**
-     * @param $msg
+     * @param string $msg
      * @param array $context
      * @return bool
      */

Spacing +8 added lines, -8 removed lines

@@ -16,8 +16,8 @@ 
 
 
 if (!defined('LOG_DIR')) {
-    GeneratorHelper::createDir(BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
-    define('LOG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
+    GeneratorHelper::createDir(BASE_DIR.DIRECTORY_SEPARATOR.'logs');
+    define('LOG_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'logs');
 }
 
 /**
@@ -55,7 +55,7 @@ 
         $config = Config::getInstance();
         $args = func_get_args();
         list($logger, $debug, $path) = $this->setup($config, $args);
-        $this->stream = fopen($path . DIRECTORY_SEPARATOR . date('Ymd') . '.log', 'a+');
+        $this->stream = fopen($path.DIRECTORY_SEPARATOR.date('Ymd').'.log', 'a+');
         $this->addPushLogger($logger, $debug, $config);
         $this->log_level = Config::getParam('log.level', 'info');
     }
@@ -116,7 +116,7 @@ 
      */
     public function criticalLog($msg, array $context = [])
     {
-        if(Config::getParam('log.slack.hook')) {
+        if (Config::getParam('log.slack.hook')) {
             SlackHelper::getInstance()->trace($msg, '', '', $context);
         }
         return $this->logger->addCritical($msg, $this->addMinimalContext($context));
@@ -212,7 +212,7 @@ 
     private function createLoggerPath(Config $config)
     {
         $logger = $this->setLoggerName($config);
-        $path = LOG_DIR . DIRECTORY_SEPARATOR . $logger . DIRECTORY_SEPARATOR . date('Y') . DIRECTORY_SEPARATOR . date('m');
+        $path = LOG_DIR.DIRECTORY_SEPARATOR.$logger.DIRECTORY_SEPARATOR.date('Y').DIRECTORY_SEPARATOR.date('m');
         GeneratorHelper::createDir($path);
 
         return $path;
@@ -225,10 +225,10 @@ 
      */
     public static function log($msg, $type = LOG_DEBUG, array $context = null)
     {
-        if(null === $context) {
+        if (null === $context) {
             $context = [];
         }
-        if(Config::getParam('profiling.enable')) {
+        if (Config::getParam('profiling.enable')) {
             Inspector::stats($msg);
         }
         switch ($type) {
@@ -279,7 +279,7 @@ 
     {
         $context['uri'] = null !== $_SERVER && array_key_exists('REQUEST_URI', $_SERVER) ? $_SERVER['REQUEST_URI'] : 'Unknow';
         $context['method'] = null !== $_SERVER && array_key_exists('REQUEST_METHOD', $_SERVER) ? $_SERVER['REQUEST_METHOD'] : 'Unknow';
-        if(null !== $_SERVER && array_key_exists('HTTP_X_PSFS_UID', $_SERVER)) {
+        if (null !== $_SERVER && array_key_exists('HTTP_X_PSFS_UID', $_SERVER)) {
             $context['uid'] = $_SERVER['HTTP_X_PSFS_UID'];
         }
         return $context;

src/base/types/traits/SystemTrait.php

Unused Use Statements -2 removed lines

@@ -3,8 +3,6 @@
 
 use PSFS\base\config\Config;
 use PSFS\base\Logger;
-use PSFS\base\Request;
-use PSFS\base\Router;
 use PSFS\base\types\helpers\SlackHelper;
 
 /**

Spacing +10 added lines, -10 removed lines

@@ -38,7 +38,7 @@ 
                 $use /= 1024;
                 break;
             case "MBytes":
-                $use /= (1024 * 1024);
+                $use /= (1024*1024);
                 break;
             case "Bytes":
             default:
@@ -62,34 +62,34 @@ 
     protected function bindWarningAsExceptions()
     {
         Logger::log('Added handlers for errors');
-        if(Config::getParam('debug')) {
+        if (Config::getParam('debug')) {
             Logger::log('Setting error_reporting as E_ALL');
             ini_set('error_reporting', E_ALL);
             ini_set('display_errors', 1);
         }
         //Warning & Notice handler
-        set_error_handler(function ($errno, $errstr, $errfile, $errline) {
+        set_error_handler(function($errno, $errstr, $errfile, $errline) {
             Logger::log($errstr, LOG_CRIT, ['file' => $errfile, 'line' => $errline, 'errno' => $errno]);
             return true;
         }, E_ALL | E_STRICT | E_DEPRECATED | E_USER_DEPRECATED | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR);
 
-        register_shutdown_function(function () {
+        register_shutdown_function(function() {
             $error = error_get_last() or json_last_error() or preg_last_error() or \DateTime::getLastErrors();
-            if( $error !== NULL) {
+            if ($error !== NULL) {
                 $errno   = $error["type"];
                 $errfile = $error["file"];
                 $errline = $error["line"];
                 $errstr  = $error["message"];
                 Logger::log($errstr, LOG_CRIT, ['file' => $errfile, 'line' => $errline, 'errno' => $errno]);
-                if(null !== Config::getParam('log.slack.hook')) {
+                if (null !== Config::getParam('log.slack.hook')) {
                     SlackHelper::getInstance()->trace($errstr, $errfile, $errline, $error);
                 }
             }
 
-            if(self::getTs() > 10 && null !== Config::getParam('log.slack.hook')) {
+            if (self::getTs() > 10 && null !== Config::getParam('log.slack.hook')) {
                 SlackHelper::getInstance()->trace('Slow service endpoint', '', '', [
-                    'time' => round(self::getTs(), 3) . ' secs',
-                    'memory' => round(self::getMem('MBytes'), 3) . ' Mb',
+                    'time' => round(self::getTs(), 3).' secs',
+                    'memory' => round(self::getMem('MBytes'), 3).' Mb',
                 ]);
             }
             return false;
@@ -104,7 +104,7 @@ 
         Logger::log('Initializing stats (mem + ts)');
         if (null !== $_SERVER && array_key_exists('REQUEST_TIME_FLOAT', $_SERVER)) {
             $this->ts = (float)$_SERVER['REQUEST_TIME_FLOAT'];
-        } else {
+        }else {
             $this->ts = PSFS_START_TS;
         }
         $this->mem = PSFS_START_MEM;

src/base/dto/JsonResponse.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
         $this->success = $result;
         $this->total = $total ?: (is_array($data) ? count($data) : 0);
         $this->pages = $pages;
-        if(null !== $message) {
+        if (null !== $message) {
             $this->message = $message;
         }
     }

src/base/types/Api.php

Spacing +34 added lines, -34 removed lines

@@ -74,15 +74,15 @@ 
     public function init()
     {
         parent::init();
-        Logger::log(get_called_class() . ' init', LOG_DEBUG);
+        Logger::log(get_called_class().' init', LOG_DEBUG);
         $this->domain = $this->getDomain();
         $this->hydrateRequestData();
         $this->hydrateOrders();
-        if($this instanceof CustomApi === false) {
+        if ($this instanceof CustomApi === false) {
             $this->createConnection($this->getTableMap());
         }
         $this->setLoaded(true);
-        Logger::log(get_called_class() . ' loaded', LOG_DEBUG);
+        Logger::log(get_called_class().' loaded', LOG_DEBUG);
     }
 
     /**
@@ -91,7 +91,7 @@ 
     protected function hydrateOrders()
     {
         if (count($this->query)) {
-            Logger::log(get_called_class() . ' gathering query string', LOG_DEBUG);
+            Logger::log(get_called_class().' gathering query string', LOG_DEBUG);
             foreach ($this->query as $key => $value) {
                 if ($key === self::API_ORDER_FIELD && is_array($value)) {
                     foreach ($value as $field => $direction) {
@@ -108,10 +108,10 @@ 
      */
     protected function extractPagination()
     {
-        Logger::log(get_called_class() . ' extract pagination start', LOG_DEBUG);
+        Logger::log(get_called_class().' extract pagination start', LOG_DEBUG);
         $page = (array_key_exists(self::API_PAGE_FIELD, $this->query)) ? $this->query[self::API_PAGE_FIELD] : 1;
         $limit = (array_key_exists(self::API_LIMIT_FIELD, $this->query)) ? $this->query[self::API_LIMIT_FIELD] : 100;
-        Logger::log(get_called_class() . ' extract pagination end', LOG_DEBUG);
+        Logger::log(get_called_class().' extract pagination end', LOG_DEBUG);
         return array($page, $limit);
     }
 
@@ -122,7 +122,7 @@ 
      */
     private function addOrders(ModelCriteria &$query)
     {
-        Logger::log(get_called_class() . ' extract orders start ', LOG_DEBUG);
+        Logger::log(get_called_class().' extract orders start ', LOG_DEBUG);
         $orderAdded = FALSE;
         $tableMap = $this->getTableMap();
         foreach ($this->order->getOrders() as $field => $direction) {
@@ -130,17 +130,17 @@ 
                 $orderAdded = TRUE;
                 if ($direction === Order::ASC) {
                     $query->addAscendingOrderByColumn($column->getPhpName());
-                } else {
+                }else {
                     $query->addDescendingOrderByColumn($column->getPhpName());
                 }
             }
         }
         if (!$orderAdded) {
-            foreach($this->getPkDbName() as $pk => $phpName) {
+            foreach ($this->getPkDbName() as $pk => $phpName) {
                 $query->addAscendingOrderByColumn($pk);
             }
         }
-        Logger::log(get_called_class() . ' extract orders end', LOG_DEBUG);
+        Logger::log(get_called_class().' extract orders end', LOG_DEBUG);
     }
 
     /**
@@ -155,7 +155,7 @@ 
             foreach ($this->query as $field => $value) {
                 if (self::API_COMBO_FIELD === $field) {
                     ApiHelper::composerComboField($tableMap, $query, $this->extraColumns, $value);
-                } elseif(!preg_match('/^__/', $field)) {
+                } elseif (!preg_match('/^__/', $field)) {
                     ApiHelper::addModelField($tableMap, $query, $field, $value);
                 }
             }
@@ -176,10 +176,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::log($e->getMessage(), LOG_ERR);
         }
     }
@@ -198,7 +198,7 @@ 
         $code = 200;
         list($return, $total, $pages) = $this->getList();
         $message = null;
-        if(!$total) {
+        if (!$total) {
             $message = i18n::_('No se han encontrado elementos para la búsqueda');
         }
 
@@ -224,7 +224,7 @@ 
         $pages = 1;
         $message = null;
         list($code, $return) = $this->getSingleResult($pk);
-        if($code !== 200) {
+        if ($code !== 200) {
             $message = i18n::_('No se ha encontrado el elemento solicitado');
         }
 
@@ -253,13 +253,13 @@ 
                 $status = 200;
                 $saved = TRUE;
                 $model = $this->model->toArray();
-            } else {
+            }else {
                 $message = i18n::_('No se ha podido guardar el modelo seleccionado');
             }
-        } catch (\Exception $e) {
-            $message = i18n::_('Ha ocurrido un error intentando guardar el elemento: ') .'<br>'. $e->getMessage();
+        }catch (\Exception $e) {
+            $message = i18n::_('Ha ocurrido un error intentando guardar el elemento: ').'<br>'.$e->getMessage();
             $context = [];
-            if(null !== $e->getPrevious()) {
+            if (null !== $e->getPrevious()) {
                 $context[] = $e->getPrevious()->getMessage();
             }
             Logger::log($e->getMessage(), LOG_CRIT, $context);
@@ -295,18 +295,18 @@ 
                     $updated = TRUE;
                     $status = 200;
                     $model = $this->model->toArray();
-                } else {
+                }else {
                     $message = i18n::_('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs');
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 $message = i18n::_('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs');
                 $context = [];
-                if(null !== $e->getPrevious()) {
+                if (null !== $e->getPrevious()) {
                     $context[] = $e->getPrevious()->getMessage();
                 }
                 Logger::log($e->getMessage(), LOG_CRIT, $context);
             }
-        } else {
+        }else {
             $message = i18n::_('No se ha encontrado el modelo al que se hace referencia para actualizar');
         }
 
@@ -334,15 +334,15 @@ 
                 $this->con->beginTransaction();
                 $this->hydrateModel($pk);
                 if (NULL !== $this->model) {
-                    if(method_exists('clearAllReferences', $this->model)) {
+                    if (method_exists('clearAllReferences', $this->model)) {
                         $this->model->clearAllReferences(true);
                     }
                     $this->model->delete($this->con);
                     $deleted = TRUE;
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 $context = [];
-                if(null !== $e->getPrevious()) {
+                if (null !== $e->getPrevious()) {
                     $context[] = $e->getPrevious()->getMessage();
                 }
                 Logger::log($e->getMessage(), LOG_CRIT, $context);
@@ -372,7 +372,7 @@ 
             $this->saveBulk();
             $saved = true;
             $status = 200;
-        } catch(\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_CRIT, $this->getRequest()->getData());
             $message = i18n::_('Bulk insert rolled back');
         }
@@ -394,7 +394,7 @@ 
 
         /** @var CustomerTableMap $tableMap */
         $modelPk = ApiHelper::extractPrimaryKeyColumnName($this->getTableMap());
-        foreach($this->list->getData() as $data) {
+        foreach ($this->list->getData() as $data) {
             $return[] = ApiHelper::mapArrayObject($this->getModelNamespace(), $modelPk, $this->query, $data);
         }
         return $return;
@@ -411,20 +411,20 @@ 
         try {
             $this->paginate();
             if (null !== $this->list) {
-                if(array_key_exists(self::API_FIELDS_RESULT_FIELD, $this->query) && Config::getParam('api.field.types')) {
+                if (array_key_exists(self::API_FIELDS_RESULT_FIELD, $this->query) && Config::getParam('api.field.types')) {
                     $return = $this->extractDataWithFormat();
-                } else {
+                }else {
                     $return = $this->list->toArray(null, false, TableMap::TYPE_PHPNAME, false);
                 }
                 $total = 0;
                 $pages = 0;
-                if($this->list instanceof PropelModelPager) {
+                if ($this->list instanceof PropelModelPager) {
                     $total = $this->list->getNbResults();
                     $pages = $this->list->getLastPage();
                 }
             }
-        } 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 array($return, $total, $pages);
@@ -442,7 +442,7 @@ 
         $return = array();
         if (NULL === $model || !method_exists($model, 'toArray')) {
             $code = 404;
-        } else {
+        }else {
             $return = $model->toArray();
         }
 

src/base/types/helpers/SlackHelper.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
             'text' => 'PSFS Error notifier',
             'attachments' => [
                 [
-                    "text" => $file . (strlen($line) ? ' [' . $line . ']' : ''),
+                    "text" => $file.(strlen($line) ? ' ['.$line.']' : ''),
                     "color" => "danger",
                     "title" => $message,
                     'fallback' => 'PSFS Error notifier',