phpffcms / ffcms-core

src/Ffcms/Core/Network/Request.php

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 use Ffcms\Core\App;
 use Ffcms\Core\Helper\Type\Any;
 use Ffcms\Core\Helper\Type\Arr;
-use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
 use Symfony\Component\HttpFoundation\RedirectResponse as Redirect;
 use Symfony\Component\HttpFoundation\Request as FoundationRequest;

Braces +27 added lines, -18 removed lines

@@ -141,18 +141,21 @@ 
         $routing = App::$Properties->getAll('Routing');
 
         // try to work with static aliases
-        if (Any::isArray($routing) && isset($routing['Alias'], $routing['Alias'][env_name]))
-            $pathway = $this->findStaticAliases($routing['Alias'][env_name], $pathway);
+        if (Any::isArray($routing) && isset($routing['Alias'], $routing['Alias'][env_name])) {
+                    $pathway = $this->findStaticAliases($routing['Alias'][env_name], $pathway);
+        }
 
         $this->setPathdata(explode('/', trim($pathway, '/')));
 
         // set default controller and action for undefined data
-        if (!$this->action)
-            $this->action = 'Index';
+        if (!$this->action) {
+                    $this->action = 'Index';
+        }
 
         // empty or contains backslashes? set to main
-        if (!$this->controller || Str::contains('\\', $this->controller))
-            $this->controller = 'Main';
+        if (!$this->controller || Str::contains('\\', $this->controller)) {
+                    $this->controller = 'Main';
+        }
 
         // find callback injection in routing configs (calculated in App::run())
         if (Any::isArray($routing) && isset($routing['Callback'], $routing['Callback'][env_name])) {
@@ -170,8 +173,9 @@ 
         /** @var array $routing */
         $routing = App::$Properties->getAll('Routing');
 
-        if (!Any::isArray($routing) || !isset($routing['Redirect']) || !Any::isArray($routing['Redirect']))
-            return;
+        if (!Any::isArray($routing) || !isset($routing['Redirect']) || !Any::isArray($routing['Redirect'])) {
+                    return;
+        }
 
         // check if source uri is key in redirect target map
         if (array_key_exists($pathway, $routing['Redirect'])) {
@@ -230,8 +234,9 @@ 
      */
     private function findDynamicCallbacks(array $map = null, ?string $controller = null)
     {
-        if ($map === null)
-            return;
+        if ($map === null) {
+                    return;
+        }
 
         // try to find global callback for this controller slug
         if (array_key_exists($controller, $map)) {
@@ -248,8 +253,9 @@ 
     private function loadTrustedProxies()
     {
         $proxies = App::$Properties->get('trustedProxy');
-        if ($proxies === null || Str::likeEmpty($proxies))
-            return;
+        if ($proxies === null || Str::likeEmpty($proxies)) {
+                    return;
+        }
 
         $pList = explode(',', $proxies);
         $resultList = [];
@@ -265,8 +271,9 @@ 
      */
     private function setPathdata(?array $pathArray = null)
     {
-        if (!Any::isArray($pathArray) || count($pathArray) < 1)
-            return;
+        if (!Any::isArray($pathArray) || count($pathArray) < 1) {
+                    return;
+        }
 
         // check if array length is more then 4 basic elements and slice it recursive
         if (count($pathArray) > 4) {
@@ -295,8 +302,9 @@ 
     public function getPathInfo()
     {
         $route = $this->languageInPath ? Str::sub(parent::getPathInfo(), Str::length($this->language) + 1) : parent::getPathInfo();
-        if (!Str::startsWith('/', $route))
-            $route = '/' . $route;
+        if (!Str::startsWith('/', $route)) {
+                    $route = '/' . $route;
+        }
         return $route;
     }
 
@@ -439,8 +447,9 @@ 
     public function getPathWithoutControllerAction(): ?string
     {
         $path = trim($this->getPathInfo(), '/');
-        if ($this->aliasPathTarget !== null)
-            $path = trim($this->aliasPathTarget, '/');
+        if ($this->aliasPathTarget !== null) {
+                    $path = trim($this->aliasPathTarget, '/');
+        }
 
         $pathArray = explode('/', $path);
         if ($pathArray[0] === Str::lowerCase($this->getController())) {

src/Ffcms/Core/Traits/ModelValidator.php

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
 use Ffcms\Core\Exception\SyntaxException;
 use Ffcms\Core\Helper\ModelFilters;
 use Ffcms\Core\Helper\Type\Any;
-use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
 
 /**

Braces +24 added lines, -16 removed lines

@@ -59,21 +59,24 @@ 
     public function runValidate(array $rules = null)
     {
         // skip validation on empty rules
-        if ($rules === null)
-            return true;
+        if ($rules === null) {
+                    return true;
+        }
 
         $success = true;
         // list each rule as single one
         foreach ($rules as $rule) {
             // 0 = field (property) name, 1 = filter name, 2 = filter value
-            if ($rule[0] === null || $rule[1] === null)
-                continue;
+            if ($rule[0] === null || $rule[1] === null) {
+                            continue;
+            }
 
             $propertyName = $rule[0];
             $validationRule = $rule[1];
             $validationValue = null;
-            if (isset($rule[2]))
-                $validationValue = $rule[2];
+            if (isset($rule[2])) {
+                            $validationValue = $rule[2];
+            }
 
             // check if target field defined as array and make recursive validation
             if (Any::isArray($propertyName)) {
@@ -170,8 +173,9 @@ 
                 if ($propertyName !== $field_set_name) { // array-based property
                     $dot_path = trim(strstr($propertyName, '.'), '.');
                     // prevent throws any exceptions for null and false objects
-                    if (!Any::isArray($this->{$field_set_name}))
-                        $this->{$field_set_name} = [];
+                    if (!Any::isArray($this->{$field_set_name})) {
+                                            $this->{$field_set_name} = [];
+                    }
 
                     // use dot-data provider to compile output array
                     $dotData = new DotData($this->{$field_set_name});
@@ -201,14 +205,16 @@ 
         $sources = $this->sources();
         $types = $this->types();
         // validate sources for current field
-        if (array_key_exists($propertyName, $sources))
-            $inputType = Str::lowerCase($sources[$propertyName]);
+        if (array_key_exists($propertyName, $sources)) {
+                    $inputType = Str::lowerCase($sources[$propertyName]);
+        }
 
 
         // check if field is array-nested element by dots and use first element as general
         $filterField = $propertyName;
-        if (array_key_exists($filterField, $types))
-            $filterType = Str::lowerCase($types[$filterField]);
+        if (array_key_exists($filterField, $types)) {
+                    $filterType = Str::lowerCase($types[$filterField]);
+        }
 
         // get clear field value
         $propertyValue = $this->getRequest($propertyName, $inputType);
@@ -310,8 +316,9 @@ 
      */
     public function getRequest($param, $method = null)
     {
-        if ($method === null)
-            $method = $this->_sendMethod;
+        if ($method === null) {
+                    $method = $this->_sendMethod;
+        }
 
         $method = Str::lowerCase($method);
         // get root request as array or string
@@ -335,8 +342,9 @@ 
         if (Str::contains('.', $param)) {
             $response = $request;
             foreach (explode('.', $param) as $path) {
-                if (!array_key_exists($path, $response))
-                    return null;
+                if (!array_key_exists($path, $response)) {
+                                    return null;
+                }
                 // find deep array nesting offset
                 $response = $response[$path];
             }

src/Ffcms/Core/Managers/CronManager.php

Spacing +2 added lines, -2 removed lines

@@ -74,7 +74,7 @@ 
         if (!class_exists($class) || !method_exists($class, $method))
             return false;
 
-        $callback = (string)$class . '::' . (string)$method;
+        $callback = (string)$class.'::'.(string)$method;
 
         // add instance to cron task manager
         if (!isset($this->configs['instances'][$callback])) {
@@ -92,7 +92,7 @@ 
      */
     public function remove($class, $method)
     {
-        $callback = $class . '::' . $method;
+        $callback = $class.'::'.$method;
         if (isset($this->configs['instances'][$callback])) {
             unset($this->configs['instances'][$callback], $this->configs['log'][$callback]);
             App::$Properties->writeConfig('Cron', $this->configs);

Braces +9 added lines, -6 removed lines

@@ -23,8 +23,9 @@ 
     {
         /** @var array $configs */
         $configs = App::$Properties->getAll('Cron');
-        if (Any::isArray($configs))
-            $this->configs = $configs;
+        if (Any::isArray($configs)) {
+                    $this->configs = $configs;
+        }
     }
 
     /**
@@ -34,8 +35,9 @@ 
     public function run()
     {
         // check if cron instances is defined
-        if (!isset($this->configs['instances']) || !Any::isArray($this->configs['instances']))
-            return null;
+        if (!isset($this->configs['instances']) || !Any::isArray($this->configs['instances'])) {
+                    return null;
+        }
 
         // get timestamp
         $time = time();
@@ -71,8 +73,9 @@ 
     public function register($class, $method, $delay = 60)
     {
         // check if declared callback is exist over autoload
-        if (!class_exists($class) || !method_exists($class, $method))
-            return false;
+        if (!class_exists($class) || !method_exists($class, $method)) {
+                    return false;
+        }
 
         $callback = (string)$class . '::' . (string)$method;
 

src/Ffcms/Core/Properties.php

Spacing +5 added lines, -5 removed lines

@@ -41,9 +41,9 @@ 
             return true;
 
         // try to load from file
-        $configFile = ucfirst(Str::lowerCase($configName)) . '.php';
-        if (File::exist('/Private/Config/' . $configFile)) {
-            $this->data[$configName] = File::inc('/Private/Config/' . $configFile, true);
+        $configFile = ucfirst(Str::lowerCase($configName)).'.php';
+        if (File::exist('/Private/Config/'.$configFile)) {
+            $this->data[$configName] = File::inc('/Private/Config/'.$configFile, true);
             return true;
         }
 
@@ -132,11 +132,11 @@ 
      */
     public function writeConfig(string $configFile, array $data): bool
     {
-        $path = '/Private/Config/' . ucfirst(Str::lowerCase($configFile)) . '.php';
+        $path = '/Private/Config/'.ucfirst(Str::lowerCase($configFile)).'.php';
         if (!File::exist($path) || !File::writable($path))
             return false;
 
-        $saveData = '<?php return ' . Arr::exportVar($data) . ';';
+        $saveData = '<?php return '.Arr::exportVar($data).';';
         File::write($path, $saveData);
         // overload config values if changed
         $this->load($configFile, true);

Braces +21 added lines, -14 removed lines

@@ -24,8 +24,9 @@ 
      */
     public function __construct()
     {
-        if (!$this->load('default'))
-            throw new NativeException('Default configurations is not founded: /Private/Config/Default.php');
+        if (!$this->load('default')) {
+                    throw new NativeException('Default configurations is not founded: /Private/Config/Default.php');
+        }
     }
 
     /**
@@ -37,8 +38,9 @@ 
     private function load(string $configName, $overload = false): bool
     {
         // check if always loaded
-        if (Any::isArray($this->data) && array_key_exists($configName, $this->data) && !$overload)
-            return true;
+        if (Any::isArray($this->data) && array_key_exists($configName, $this->data) && !$overload) {
+                    return true;
+        }
 
         // try to load from file
         $configFile = ucfirst(Str::lowerCase($configName)) . '.php';
@@ -61,12 +63,14 @@ 
     {
         $this->load($configFile);
         // check if configs for this file is loaded
-        if (!isset($this->data[$configFile]))
-            return false;
+        if (!isset($this->data[$configFile])) {
+                    return false;
+        }
 
         // check if config key is exist
-        if (!isset($this->data[$configFile][$configKey]))
-            return false;
+        if (!isset($this->data[$configFile][$configKey])) {
+                    return false;
+        }
 
         $response = $this->data[$configFile][$configKey];
 
@@ -100,8 +104,9 @@ 
     public function getAll($configFile = 'default'): ?array
     {
         $this->load($configFile);
-        if (!Any::isArray($this->data) || !array_key_exists($configFile, $this->data))
-            return null;
+        if (!Any::isArray($this->data) || !array_key_exists($configFile, $this->data)) {
+                    return null;
+        }
 
         return $this->data[$configFile];
     }
@@ -116,8 +121,9 @@ 
     public function updateConfig(string $configFile, array $newData, ?bool $mergeDeep = false): bool
     {
         $this->load($configFile);
-        if (!isset($this->data[$configFile]))
-            return false;
+        if (!isset($this->data[$configFile])) {
+                    return false;
+        }
 
         $oldData = $this->data[$configFile];
         $saveData = ($mergeDeep ? Arr::mergeRecursive($oldData, $newData) : Arr::merge($oldData, $newData));
@@ -133,8 +139,9 @@ 
     public function writeConfig(string $configFile, array $data): bool
     {
         $path = '/Private/Config/' . ucfirst(Str::lowerCase($configFile)) . '.php';
-        if (!File::exist($path) || !File::writable($path))
-            return false;
+        if (!File::exist($path) || !File::writable($path)) {
+                    return false;
+        }
 
         $saveData = '<?php return ' . Arr::exportVar($data) . ';';
         File::write($path, $saveData);

src/Ffcms/Core/Arch/ActiveModel.php

Braces +15 added lines, -10 removed lines

@@ -41,11 +41,13 @@ 
     public function getLocaled(string $attribute)
     {
         // if always decoded
-        if (Any::isArray($this->{$attribute}))
-            return $this->{$attribute}[App::$Request->getLanguage()];
+        if (Any::isArray($this->{$attribute})) {
+                    return $this->{$attribute}[App::$Request->getLanguage()];
+        }
 
-        if (!Any::isStr($attribute) || Str::likeEmpty($this->{$attribute}))
-            return null;
+        if (!Any::isStr($attribute) || Str::likeEmpty($this->{$attribute})) {
+                    return null;
+        }
 
         return Serialize::getDecodeLocale($this->{$attribute});
     }
@@ -58,8 +60,9 @@ 
      */
     public function setAttribute($key, $value)
     {
-        if ($value !== null && $this->isSerializeCastable($key))
-            $value = $this->asSerialize($value);
+        if ($value !== null && $this->isSerializeCastable($key)) {
+                    $value = $this->asSerialize($value);
+        }
 
         return parent::setAttribute($key, $value);
     }
@@ -72,11 +75,13 @@ 
      */
     protected function castAttribute($key, $value)
     {
-        if ($value === null)
-            return $value;
+        if ($value === null) {
+                    return $value;
+        }
 
-        if ($this->getCastType($key) === 'serialize')
-            return $this->fromSerialize($value);
+        if ($this->getCastType($key) === 'serialize') {
+                    return $this->fromSerialize($value);
+        }
 
         return parent::castAttribute($key, $value);
     }

src/Ffcms/Core/Helper/Date.php

Braces +12 added lines, -8 removed lines

@@ -28,8 +28,9 @@ 
     public static function convertToDatetime($rawDate, $format = 'd.m.Y')
     {
         // convert timestamp to date format
-        if (Any::isInt($rawDate))
-            $rawDate = date(\DateTime::ATOM, $rawDate);
+        if (Any::isInt($rawDate)) {
+                    $rawDate = date(\DateTime::ATOM, $rawDate);
+        }
 
         try {
             $object = new \DateTime($rawDate);
@@ -61,15 +62,17 @@ 
         // convert to timestamp
         $timestamp = $raw;
         // raw can be instance of eloquent active record object, convert to str
-        if (!Any::isInt($raw))
-            $timestamp = self::convertToTimestamp((string)$timestamp);
+        if (!Any::isInt($raw)) {
+                    $timestamp = self::convertToTimestamp((string)$timestamp);
+        }
 
         // calculate difference between tomorrow day midnight and passed date
         $diff = time() - $timestamp;
 
         // date in future, lets return as is
-        if ($diff < 0)
-            return self::convertToDatetime($timestamp, static::FORMAT_TO_SECONDS);
+        if ($diff < 0) {
+                    return self::convertToDatetime($timestamp, static::FORMAT_TO_SECONDS);
+        }
 
         // calculate delta and make offset sub. Maybe usage instance of Datetime is better, but localization is sucks!
         $deltaSec = $diff % 60;
@@ -86,8 +89,9 @@ 
         // sounds like more then 1 day's ago
         if ($deltaDays > 1) {
             // sounds like more then 2 week ago, just return as is
-            if ($deltaDays > 14)
-                return self::convertToDatetime($timestamp, static::FORMAT_TO_HOUR);
+            if ($deltaDays > 14) {
+                            return self::convertToDatetime($timestamp, static::FORMAT_TO_HOUR);
+            }
 
             return App::$Translate->get('DateHuman', '%days% days ago', ['days' => (int)$deltaDays]);
         }

src/Ffcms/Core/Helper/Serialize.php

Braces +3 added lines, -2 removed lines

@@ -42,8 +42,9 @@
      */
     public static function getDecoded($data, $key)
     {
-        if (!Any::isArray($data))
-            $data = self::decode($data);
+        if (!Any::isArray($data)) {
+                    $data = self::decode($data);
+        }
 
         return $data === false ? null : $data[$key];
     }

src/Ffcms/Core/Helper/HTML/Form/RadioField.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
         // get options from properties
         $options = $this->properties['options'];
         if (!Any::isIterable($options))
-            throw new SyntaxException('Radio field ' . self::nohtml($this->name) . ' have no iterable options');
+            throw new SyntaxException('Radio field '.self::nohtml($this->name).' have no iterable options');
 
         unset($this->properties['options'], $this->properties['value']);
 

Braces +3 added lines, -2 removed lines

@@ -40,8 +40,9 @@
     {
         // get options from properties
         $options = $this->properties['options'];
-        if (!Any::isIterable($options))
-            throw new SyntaxException('Radio field ' . self::nohtml($this->name) . ' have no iterable options');
+        if (!Any::isIterable($options)) {
+                    throw new SyntaxException('Radio field ' . self::nohtml($this->name) . ' have no iterable options');
+        }
 
         unset($this->properties['options'], $this->properties['value']);
 

src/Ffcms/Core/Helper/HTML/Form/SelectField.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
         $options = $this->properties['options'];
         unset($this->properties['options']);
         if (!Any::isIterable($options))
-            throw new SyntaxException('Select field ' . self::nohtml($this->name) . ' have no iterable options');
+            throw new SyntaxException('Select field '.self::nohtml($this->name).' have no iterable options');
         // value is not used there
         unset($this->properties['value']);
         // options is defined as key->value array?

Braces +3 added lines, -2 removed lines

@@ -35,8 +35,9 @@
         // get options from properties
         $options = $this->properties['options'];
         unset($this->properties['options']);
-        if (!Any::isIterable($options))
-            throw new SyntaxException('Select field ' . self::nohtml($this->name) . ' have no iterable options');
+        if (!Any::isIterable($options)) {
+                    throw new SyntaxException('Select field ' . self::nohtml($this->name) . ' have no iterable options');
+        }
         // value is not used there
         unset($this->properties['value']);
         // options is defined as key->value array?