phpffcms / ffcms-core

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?

src/Ffcms/Core/Helper/HTML/Bootstrap/Navbar.php

Spacing +8 added lines, -8 removed lines

@@ -36,7 +36,7 @@ 
         // set mobile collapse id for toggle
         $mobCollapseId = $elements['collapseId'];
         if (Any::isEmpty($mobCollapseId))
-            $mobCollapseId = Str::randomLatin(mt_rand(6,12)) . mt_rand(1, 99);
+            $mobCollapseId = Str::randomLatin(mt_rand(6, 12)).mt_rand(1, 99);
 
         // set element id for toggle
         $ulId = 1;
@@ -97,7 +97,7 @@ 
         // generate output dom of bootstrap navbar
         $dom = new Dom();
         $body = $dom->div(function() use ($leftBuild, $rightBuild, $itemsStatic){
-            return $leftBuild . $itemsStatic . $rightBuild;
+            return $leftBuild.$itemsStatic.$rightBuild;
         }, ['class' => 'collapse navbar-collapse', 'id' => $mobCollapseId]);
 
         // drow <nav @properties>@next</nav>
@@ -108,17 +108,17 @@ 
                 $header = $dom->div(function() use ($dom, $elements, $mobCollapseId){
                     // drow <button @collapse>@next</button>
                     $collapseButton = $dom->button(function() use ($dom){
-                        $toggleItem = $dom->span(function(){
+                        $toggleItem = $dom->span(function() {
                             return 'Toggle menu';
                         }, ['class' => 'sr-only']);
                         $toggleIcon = null;
                         for ($i = 0; $i < 3; $i++) {
-                            $toggleIcon .= $dom->span(function(){
+                            $toggleIcon .= $dom->span(function() {
                                 return null;
                             }, ['class' => 'icon-bar']);
                         }
-                        return $toggleItem . $toggleIcon;
-                    }, ['type' => 'button', 'class' => 'navbar-toggle collapsed', 'data-toggle' => 'collapse', 'data-target' => '#' . $mobCollapseId]);
+                        return $toggleItem.$toggleIcon;
+                    }, ['type' => 'button', 'class' => 'navbar-toggle collapsed', 'data-toggle' => 'collapse', 'data-target' => '#'.$mobCollapseId]);
                     // drow <div @brand>@brandtext<?div>
                     $brand = null;
                     if (isset($elements['brand'])) {
@@ -133,10 +133,10 @@ 
                             }, $elements['brand']['property']);
                         }
                     }
-                    return $collapseButton . $brand;
+                    return $collapseButton.$brand;
                 }, ['class' => 'navbar-header']);
                 // return header and body concat
-                return $header . $body;
+                return $header.$body;
             }, $elements['container']);
         }, $elements['nav']);
     }

Braces +9 added lines, -6 removed lines

@@ -24,19 +24,22 @@
     public static function display(array $elements): ?string
     {
         // check if elements passed well
-        if (!isset($elements['items']) || count($elements['items']) < 1)
-            return null;
+        if (!isset($elements['items']) || count($elements['items']) < 1) {
+                    return null;
+        }
 
         // set default bootstrap properties if not defined
         $elements['property']['class'] = Str::concat(' ', 'nav', $elements['property']['class']);
         $elements['nav']['class'] = Str::concat(' ', 'navbar', $elements['nav']['class']);
-        if (!$elements['container'])
-            $elements['container'] = 'container-fluid';
+        if (!$elements['container']) {
+                    $elements['container'] = 'container-fluid';
+        }
 
         // set mobile collapse id for toggle
         $mobCollapseId = $elements['collapseId'];
-        if (Any::isEmpty($mobCollapseId))
-            $mobCollapseId = Str::randomLatin(mt_rand(6,12)) . mt_rand(1, 99);
+        if (Any::isEmpty($mobCollapseId)) {
+                    $mobCollapseId = Str::randomLatin(mt_rand(6,12)) . mt_rand(1, 99);
+        }
 
         // set element id for toggle
         $ulId = 1;

src/Ffcms/Core/Helper/Type/Any.php

Braces +15 added lines, -10 removed lines

@@ -17,12 +17,14 @@ 
     public static function isEmpty($var = null): bool
     {
         // var is array type?
-        if (is_array($var))
-            return count($var) < 1;
+        if (is_array($var)) {
+                    return count($var) < 1;
+        }
 
         // var seems to be object?
-        if (is_object($var))
-            return count(get_object_vars($var)) < 1;
+        if (is_object($var)) {
+                    return count(get_object_vars($var)) < 1;
+        }
 
         // float,int,string,bool and null left. Check if not empty. Int and float will never equal to null.
         return ($var === null || $var === '' || $var === false);
@@ -123,14 +125,17 @@ 
     public static function guessValueType($var = null)
     {
         // pass var by reference and guess var type
-        if (self::isInt($var))
-            return $var;
+        if (self::isInt($var)) {
+                    return $var;
+        }
 
-        if (self::isFloat($var))
-            return $var;
+        if (self::isFloat($var)) {
+                    return $var;
+        }
 
-        if (self::isBool($var))
-            return $var;
+        if (self::isBool($var)) {
+                    return $var;
+        }
 
 
         return $var;

src/Ffcms/Core/Helper/Url.php

Spacing +14 added lines, -14 removed lines

@@ -25,7 +25,7 @@ 
     public static function to($controller_action, $id = null, $add = null, array $params = null, $encode = true)
     {
         $pathway = self::buildPathway([$controller_action, $id, $add, $params], $encode);
-        return App::$Alias->baseUrl . '/' . $pathway;
+        return App::$Alias->baseUrl.'/'.$pathway;
     }
 
     /**
@@ -61,7 +61,7 @@ 
                 $controller = Str::lastIn($controller, '\\', true);
             }
 
-            $response = $controller . '/' . $action;
+            $response = $controller.'/'.$action;
         }
 
         // check if controller and action is defined
@@ -71,17 +71,17 @@ 
 
         // id is defined?
         if (isset($to[1]) && !Str::likeEmpty($to[1])) {
-            $response .= '/' . self::safeUri($to[1], $encode);
+            $response .= '/'.self::safeUri($to[1], $encode);
         }
 
         // add param is defined?
         if (isset($to[2]) && !Str::likeEmpty($to[2])) {
-            $response .= '/' . self::safeUri($to[2], $encode);
+            $response .= '/'.self::safeUri($to[2], $encode);
         }
 
         // try to find static alias
-        if (isset($routing['Alias'][env_name]) && Arr::in('/' . $response, $routing['Alias'][env_name])) {
-            $pathAlias = array_search('/' . $response, $routing['Alias'][env_name]);
+        if (isset($routing['Alias'][env_name]) && Arr::in('/'.$response, $routing['Alias'][env_name])) {
+            $pathAlias = array_search('/'.$response, $routing['Alias'][env_name]);
             if ($pathAlias !== false) {
                 $response = Str::lowerCase(trim($pathAlias, '/'));
             }
@@ -97,7 +97,7 @@ 
             }
             $queryString = http_build_query($to[3]);
             if (Str::length($queryString) > 0) {
-                $response .= '?' . http_build_query($to[3]);
+                $response .= '?'.http_build_query($to[3]);
             }
             if ($anchor !== false) {
                 $response .= $anchor;
@@ -119,7 +119,7 @@ 
     public static function buildPathwayFromRequest()
     {
         return self::buildPathway([
-            Str::lowerCase(App::$Request->getController()) . '/' . Str::lowerCase(App::$Request->getAction()),
+            Str::lowerCase(App::$Request->getController()).'/'.Str::lowerCase(App::$Request->getAction()),
             App::$Request->getID(),
             App::$Request->getAdd(),
             App::$Request->query->all()
@@ -140,9 +140,9 @@ 
             $to = [$to];
 
         // call Url::to(args)
-        $callbackTo = call_user_func_array([__NAMESPACE__ . '\Url', 'to'], $to);
+        $callbackTo = call_user_func_array([__NAMESPACE__.'\Url', 'to'], $to);
 
-        return '<a href="' . $callbackTo . '"' . $compile_property . '>' . $name . '</a>';
+        return '<a href="'.$callbackTo.'"'.$compile_property.'>'.$name.'</a>';
     }
 
     /**
@@ -155,19 +155,19 @@ 
     {
         /** @var array $configs */
         $configs = \App::$Properties->getAll('default');
-        $httpHost = $configs['baseProto'] . '://' . $configs['baseDomain'];
+        $httpHost = $configs['baseProto'].'://'.$configs['baseDomain'];
         if ($configs['basePath'] !== '/') {
-            $httpHost .= $configs['basePath'] . '/';
+            $httpHost .= $configs['basePath'].'/';
         }
 
         // check if is this is URI not URL
         if (!Str::startsWith($httpHost, $uri)) {
             // check if lang is defined in URI or define it
             if ($lang !== null && $configs['multiLanguage'] && !Str::startsWith($lang, $uri)) {
-                $uri = $lang . '/' . ltrim($uri, '/');
+                $uri = $lang.'/'.ltrim($uri, '/');
             }
             // add basic httpHost data
-            $uri = rtrim($httpHost, '/') . '/' . ltrim($uri, '/');
+            $uri = rtrim($httpHost, '/').'/'.ltrim($uri, '/');
         }
 
         return $uri;

Braces +3 added lines, -2 removed lines

@@ -136,8 +136,9 @@
     public static function link($to, $name, array $property = null)
     {
         $compile_property = self::applyProperty($property);
-        if (!Any::isArray($to))
-            $to = [$to];
+        if (!Any::isArray($to)) {
+                    $to = [$to];
+        }
 
         // call Url::to(args)
         $callbackTo = call_user_func_array([__NAMESPACE__ . '\Url', 'to'], $to);