phpffcms / ffcms-core

src/Helper/HTML/Form/MultiSelectField.php

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 use Ffcms\Core\Helper\HTML\System\NativeGenerator;
 use Ffcms\Core\Helper\Type\Any;
 use Ffcms\Core\Helper\Type\Arr;
-use Ffcms\Core\Helper\Type\Obj;
 
 class MultiSelectField extends NativeGenerator implements iField
 {

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
         $options = $this->properties['options'];
         $optionsKey = (bool)$this->properties['optionsKey'];
         if (!Any::isIterable($options))
-            throw new SyntaxException('Options for field ' . self::nohtml($this->name) . ' is not iterable');
+            throw new SyntaxException('Options for field '.self::nohtml($this->name).' is not iterable');
 
         unset($this->properties['options']);
         

Braces +9 added lines, -6 removed lines

@@ -36,8 +36,9 @@ 
         // check if options is defined
         $options = $this->properties['options'];
         $optionsKey = (bool)$this->properties['optionsKey'];
-        if (!Any::isIterable($options))
-            throw new SyntaxException('Options for field ' . self::nohtml($this->name) . ' is not iterable');
+        if (!Any::isIterable($options)) {
+                    throw new SyntaxException('Options for field ' . self::nohtml($this->name) . ' is not iterable');
+        }
 
         unset($this->properties['options']);
         
@@ -56,11 +57,13 @@ 
             if ($optionsKey === true) {
                 $optionProperty['value'] = $val;
                 // check if current element is active
-                if (Any::isArray($this->value) && Arr::in((string)$val, $this->value))
-                    $optionProperty['selected'] = 'selected';
+                if (Any::isArray($this->value) && Arr::in((string)$val, $this->value)) {
+                                    $optionProperty['selected'] = 'selected';
+                }
             } else {
-                if (Any::isArray($this->value) && Arr::in((string)$text, $this->value))
-                    $optionProperty['selected'] = 'selected';
+                if (Any::isArray($this->value) && Arr::in((string)$text, $this->value)) {
+                                    $optionProperty['selected'] = 'selected';
+                }
             }
             $optionsDOM .= self::buildContainerTag('option', $optionProperty, $text);
         }

src/Helper/HTML/SimplePagination.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use Ffcms\Core\Helper\Type\Any;
 use Ffcms\Core\Helper\Type\Arr;
-use Ffcms\Core\Helper\Type\Obj;
 
 /**
  * Class SimplePagination. Build and display html pagination block

Braces +12 added lines, -8 removed lines

@@ -37,17 +37,20 @@ 
     public function display(array $property = null): ?string
     {
         // total items is less to pagination requirement
-        if (($this->page * $this->step) + 1 > $this->total)
-            return null;
+        if (($this->page * $this->step) + 1 > $this->total) {
+                    return null;
+        }
 
         $lastPage = ceil($this->total / $this->step); // 6/5 ~ 2 = 0..2
 
-        if ($lastPage <= 1)
-            return null;
+        if ($lastPage <= 1) {
+                    return null;
+        }
 
         // prevent hack-boy's any try
-        if ($this->page > $lastPage)
-            return null;
+        if ($this->page > $lastPage) {
+                    return null;
+        }
 
         $items = [];
         // more then 10 items in pagination
@@ -137,8 +140,9 @@ 
     protected function generateItems($start, $end)
     {
         // prevent any shit's
-        if ($end <= $start)
-            return null;
+        if ($end <= $start) {
+                    return null;
+        }
 
         $items = [];
         for ($i = $start; $i < $end; $i++) {

src/Helper/HTML/System/NativeGenerator.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use Ffcms\Core\App;
 use Ffcms\Core\Helper\Type\Any;
-use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
 use Ffcms\Core\Helper\Url;
 

Spacing +10 added lines, -10 removed lines

@@ -24,7 +24,7 @@ 
             $purifier = App::$Memory->get('object.purifier.helpers');
         } else {
             $config = \HTMLPurifier_Config::createDefault();
-            $config->set('Cache.SerializerPath', root . '/Private/Cache/HTMLPurifier/');
+            $config->set('Cache.SerializerPath', root.'/Private/Cache/HTMLPurifier/');
             $config->set('AutoFormat.AutoParagraph', false);
 
             // allow use target=_blank for links
@@ -65,9 +65,9 @@ 
         $build = null;
         foreach ($property as $p => $v) {
             if ($v === null || $v === false || $v === true) {
-                $build .= ' ' . self::nohtml($p);
+                $build .= ' '.self::nohtml($p);
             } else {
-                $build .= ' ' . self::nohtml($p) . '="' . self::nohtml($v) . '"';
+                $build .= ' '.self::nohtml($p).'="'.self::nohtml($v).'"';
             }
         }
         return $build;
@@ -82,7 +82,7 @@ 
      */
     public static function buildSingleTag($tagName, array $property = null, $closeSlash = true)
     {
-        return '<' . self::nohtml($tagName) . self::applyProperty($property) . ($closeSlash ? '/>' : '>');
+        return '<'.self::nohtml($tagName).self::applyProperty($property).($closeSlash ? '/>' : '>');
     }
 
     /**
@@ -99,7 +99,7 @@ 
         if ($valueHtml !== true)
             $value = self::nohtml($value);
         
-        return '<' . $tagName . self::applyProperty($property) . '>' . $value . '</' . $tagName . '>';
+        return '<'.$tagName.self::applyProperty($property).'>'.$value.'</'.$tagName.'>';
     }
 
     /**
@@ -140,13 +140,13 @@ 
                 if (!Str::contains('/', $elementPoint) || count($elementArray) < 2) {
                     $active = $elementPoint === $currentPoint;
                 } else {
-                    $elementPoint = $elementArray[0] . '/' . $elementArray[1];
+                    $elementPoint = $elementArray[0].'/'.$elementArray[1];
                     $active = Str::startsWith($elementPoint, $currentPoint);
                 }
                 break;
             case 'id':
                 $elementArray = explode('/', $elementPoint);
-                $elementPoint = $elementArray[0] . '/' . $elementArray[1];
+                $elementPoint = $elementArray[0].'/'.$elementArray[1];
                 if ($elementArray[2] === null) { // looks like id is not defined in element
                     if (Str::contains('?', $currentPoint)) {
                         $currentPoint = Str::firstIn($currentPoint, '?');
@@ -155,7 +155,7 @@ 
                     $currentToId = implode('/', array_slice($currentArray, 0, 3));
                     $active = $elementPoint === $currentToId;
                 } else {
-                    $elementPoint .= '/' . $elementArray[2];
+                    $elementPoint .= '/'.$elementArray[2];
                     $active = Str::startsWith($elementPoint, $currentPoint);
                 }
                 break;
@@ -210,7 +210,7 @@ 
      */
     public static function convertLink($uri)
     {
-        $link = App::$Alias->baseUrl . '/';
+        $link = App::$Alias->baseUrl.'/';
         if (Any::isArray($uri)) {
             $link .= Url::buildPathway($uri);
         } elseif (Str::startsWith('http', $uri)) {
@@ -233,7 +233,7 @@ 
         if (Str::likeEmpty($uri))
             return null;
 
-        return implode('/', array_map(function($v){
+        return implode('/', array_map(function($v) {
             return urlencode($v);
         }, explode('/', $uri)));
     }

Braces +12 added lines, -8 removed lines

@@ -59,8 +59,9 @@ 
      */
     public static function applyProperty(array $property = null)
     {
-        if ($property === null || count($property) < 1)
-            return null;
+        if ($property === null || count($property) < 1) {
+                    return null;
+        }
         
         $build = null;
         foreach ($property as $p => $v) {
@@ -96,8 +97,9 @@ 
     public static function buildContainerTag($tagName, array $property = null, $value = null, $valueHtml = false)
     {
         $tagName = self::nohtml($tagName);
-        if ($valueHtml !== true)
-            $value = self::nohtml($value);
+        if ($valueHtml !== true) {
+                    $value = self::nohtml($value);
+        }
         
         return '<' . $tagName . self::applyProperty($property) . '>' . $value . '</' . $tagName . '>';
     }
@@ -111,8 +113,9 @@ 
     public static function safeUri($string, $encode = true)
     {
         $string = self::nohtml($string);
-        if ($encode === true)
-            $string = self::encode($string);
+        if ($encode === true) {
+                    $string = self::encode($string);
+        }
 
         return $string;
     }
@@ -230,8 +233,9 @@ 
      */
     public static function encode(?string $uri = null)
     {
-        if (Str::likeEmpty($uri))
-            return null;
+        if (Str::likeEmpty($uri)) {
+                    return null;
+        }
 
         return implode('/', array_map(function($v){
             return urlencode($v);

src/Helper/HTML/Table.php

Unused Use Statements -1 removed lines

@@ -7,7 +7,6 @@
 use Ffcms\Core\Helper\HTML\System\NativeGenerator;
 use Ffcms\Core\Helper\Type\Any;
 use Ffcms\Core\Helper\Type\Arr;
-use Ffcms\Core\Helper\Type\Obj;
 
 /**
  * Class Table. Helper for drawing tables using php static call Table::display([params])

Spacing +14 added lines, -14 removed lines

@@ -35,13 +35,13 @@ 
         // init dom model
         $dom = new Dom();
         // draw response
-        $table = $dom->table(function () use ($dom, $elements, $selectOptions) {
+        $table = $dom->table(function() use ($dom, $elements, $selectOptions) {
             $res = null;
             // check if thead is defined
             if (isset($elements['thead']) && Any::isArray($elements['thead']) && count($elements['thead']) > 0 && Any::isArray($elements['thead']['titles'])) {
                 // add thead container
-                $res .= $dom->thead(function () use ($dom, $elements, $selectOptions) {
-                    return $dom->tr(function () use ($dom, $elements, $selectOptions) {
+                $res .= $dom->thead(function() use ($dom, $elements, $selectOptions) {
+                    return $dom->tr(function() use ($dom, $elements, $selectOptions) {
                         $tr = null;
                         foreach ($elements['thead']['titles'] as $order => $title) {
                             $th = null;
@@ -56,12 +56,12 @@ 
                             }
                             // make global checkbox for selectable columns
                             if ($selectOptions !== false && $order + 1 === $selectOptions['attachOrder']) {
-                                $th = $dom->input(function () {
+                                $th = $dom->input(function() {
                                     return null;
-                                }, ['type' => 'checkbox', 'name' => 'selectAll']) . ' ' . $th;
+                                }, ['type' => 'checkbox', 'name' => 'selectAll']).' '.$th;
                             }
                             // build tr row collecting all th's
-                            $tr .= $dom->th(function () use ($th) {
+                            $tr .= $dom->th(function() use ($th) {
                                 return $th;
                             }, $title['property']);
                         }
@@ -80,14 +80,14 @@ 
                         // sort td items inside row by key increment
                         ksort($row);
                         // add data in tr container
-                        $tr .= $dom->tr(function () use ($dom, $row, $selectOptions) {
+                        $tr .= $dom->tr(function() use ($dom, $row, $selectOptions) {
                             $td = null;
                             foreach ($row as $order => $item) {
                                 if (!Any::isInt($order))
                                     continue;
 
                                 // collect td item
-                                $td .= $dom->td(function () use ($dom, $order, $item, $selectOptions) {
+                                $td .= $dom->td(function() use ($dom, $order, $item, $selectOptions) {
                                     $text = null;
                                     // make text secure based on passed options
                                     if ($item['html'] === true) {
@@ -101,9 +101,9 @@ 
                                     }
                                     // check if selectable box is enabled and equal current order id
                                     if ($selectOptions !== false && $order === $selectOptions['attachOrder']) {
-                                        $text = $dom->input(function (){
+                                        $text = $dom->input(function() {
                                             return null;
-                                        }, Arr::merge($selectOptions['selector'], ['value' => htmlentities($text, null, 'UTF-8')])) . ' ' . $text;
+                                        }, Arr::merge($selectOptions['selector'], ['value' => htmlentities($text, null, 'UTF-8')])).' '.$text;
                                     }
                                     return $text;
                                 }, $item['property']);
@@ -126,14 +126,14 @@ 
             // build js code for "selectAll" checkbox
             self::buildSelectorHtml($selectOptions);
             // return response inside "form" tag
-            return $dom->form(function () use ($dom, $selectOptions, $table) {
+            return $dom->form(function() use ($dom, $selectOptions, $table) {
                 foreach ($selectOptions['buttons'] as $btn) {
                     if (!Any::isArray($btn))
                         continue;
 
-                    $table .= $dom->input(function(){
+                    $table .= $dom->input(function() {
                         return null;
-                    }, $btn) . ' ';
+                    }, $btn).' ';
                 }
                 return $table;
             }, $selectOptions['form']);
@@ -149,7 +149,7 @@ 
     private static function buildSelectorHtml(array $opt)
     {
         $js = '$(function () {
-            var targetSwitchbox = $(\'input[name="' . $opt['selector']['name'] . '"]\');
+            var targetSwitchbox = $(\'input[name="' . $opt['selector']['name'].'"]\');
             $(\'input[name="selectAll"]\').change(function() {
                 $(targetSwitchbox).each(function () {
                     $(this).prop(\'checked\', !$(this).is(\':checked\'));

Braces +9 added lines, -6 removed lines

@@ -23,8 +23,9 @@ 
      */
     public static function display(array $elements): ?string
     {
-        if (!array_key_exists('tbody', $elements) || !Any::isArray($elements['tbody']['items']) || count($elements['tbody']['items']) < 1)
-            return null;
+        if (!array_key_exists('tbody', $elements) || !Any::isArray($elements['tbody']['items']) || count($elements['tbody']['items']) < 1) {
+                    return null;
+        }
 
         $selectOptions = false;
         if (isset($elements['selectableBox'])) {
@@ -83,8 +84,9 @@ 
                         $tr .= $dom->tr(function () use ($dom, $row, $selectOptions) {
                             $td = null;
                             foreach ($row as $order => $item) {
-                                if (!Any::isInt($order))
-                                    continue;
+                                if (!Any::isInt($order)) {
+                                                                    continue;
+                                }
 
                                 // collect td item
                                 $td .= $dom->td(function () use ($dom, $order, $item, $selectOptions) {
@@ -128,8 +130,9 @@ 
             // return response inside "form" tag
             return $dom->form(function () use ($dom, $selectOptions, $table) {
                 foreach ($selectOptions['buttons'] as $btn) {
-                    if (!Any::isArray($btn))
-                        continue;
+                    if (!Any::isArray($btn)) {
+                                            continue;
+                    }
 
                     $table .= $dom->input(function(){
                         return null;

src/Helper/ModelFilters.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use Ffcms\Core\Helper\Type\Any;
 use Ffcms\Core\Helper\Type\Arr;
-use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
 
 /**

Braces +66 added lines, -41 removed lines

@@ -23,8 +23,9 @@ 
      */
     public static function length_min($object, $length): bool
     {
-        if (!Any::isLine($object))
-            return false;
+        if (!Any::isLine($object)) {
+                    return false;
+        }
 
         return Str::length((string)$object) >= $length;
     }
@@ -37,8 +38,9 @@ 
      */
     public static function length_max($object, $length): bool
     {
-        if (!Any::isLine($object))
-            return false;
+        if (!Any::isLine($object)) {
+                    return false;
+        }
 
         return Str::length((string)$object) <= $length;
     }
@@ -51,12 +53,14 @@ 
      */
     public static function in($object, array $handle): bool
     {
-        if (!Any::isLine($object))
-            return false;
+        if (!Any::isLine($object)) {
+                    return false;
+        }
 
         // allow empty, validate on required rule
-        if (Any::isEmpty($object))
-            return true;
+        if (Any::isEmpty($object)) {
+                    return true;
+        }
 
         $object = Any::guessValueType($object);
 
@@ -82,8 +86,9 @@ 
      */
     public static function checked($object): bool
     {
-        if (!Any::isBool($object))
-            return false;
+        if (!Any::isBool($object)) {
+                    return false;
+        }
 
         return (bool)$object;
     }
@@ -155,11 +160,14 @@ 
      */
     public static function email($object): bool
     {
-        if (Any::isEmpty($object)) // allow empty
+        if (Any::isEmpty($object)) {
+            // allow empty
             return true;
+        }
 
-        if (!Any::isLine($object))
-            return false;
+        if (!Any::isLine($object)) {
+                    return false;
+        }
 
         return Str::isEmail($object);
     }
@@ -171,11 +179,14 @@ 
      */
     public static function phone($object): bool
     {
-        if (Any::isEmpty($object)) // allow empty
+        if (Any::isEmpty($object)) {
+            // allow empty
             return true;
+        }
 
-        if (!Any::isLine($object))
-            return false;
+        if (!Any::isLine($object)) {
+                    return false;
+        }
 
         return Str::isPhone($object);
     }
@@ -187,11 +198,14 @@ 
      */
     public static function url($object): bool
     {
-        if (Any::isEmpty($object)) // allow empty
+        if (Any::isEmpty($object)) {
+            // allow empty
             return true;
+        }
 
-        if (!Any::isLine($object))
-            return false;
+        if (!Any::isLine($object)) {
+                    return false;
+        }
 
         return Str::isUrl($object);
     }
@@ -204,8 +218,9 @@ 
      */
     public static function equal($object, $value = null): bool
     {
-        if (!Any::isLine($object))
-            return false;
+        if (!Any::isLine($object)) {
+                    return false;
+        }
 
         return $object === $value;
     }
@@ -218,8 +233,9 @@ 
      */
     public static function notequal($object, $value = null): bool
     {
-        if (!Any::isLine($object))
-            return false;
+        if (!Any::isLine($object)) {
+                    return false;
+        }
 
         return $object !== $value;
     }
@@ -254,11 +270,13 @@ 
      */
     public static function reg_match($object, $value): bool
     {
-        if (!Any::isLine($object))
-            return false;
+        if (!Any::isLine($object)) {
+                    return false;
+        }
 
-        if (Str::likeEmpty($object))
-            return true;
+        if (Str::likeEmpty($object)) {
+                    return true;
+        }
 
         // what the f*ck? -> return preg_match($value, $object) > 0;
         return (bool)preg_match($value, $object);
@@ -272,8 +290,9 @@ 
      */
     public static function intList($object, $value): bool
     {
-        if (!Any::isLine($object))
-            return false;
+        if (!Any::isLine($object)) {
+                    return false;
+        }
 
         return !preg_match('/[^0-9\s,]/$', $object);
     }
@@ -287,8 +306,9 @@ 
     public static function isFile($object, $value): bool
     {
         // allow empty fields, "required" option filter that
-        if ($object === null)
-            return true;
+        if ($object === null) {
+                    return true;
+        }
 
         $all = false;
         // if string is given
@@ -301,13 +321,15 @@ 
         }
 
         // input file is not object?
-        if ($object === null || !Any::isObj($object))
-            return false;
+        if ($object === null || !Any::isObj($object)) {
+                    return false;
+        }
 
         // get guess file type, based on mime-type
         $type = $object->guessExtension();
-        if ($type === null)
-            return false;
+        if ($type === null) {
+                    return false;
+        }
 
         return ($all ? true : Arr::in($type, $value));
     }
@@ -321,21 +343,24 @@ 
     public static function sizeFile($object, $value): bool
     {
         // allow empty field, validate on filter 'required'
-        if ($object === null)
-            return true;
+        if ($object === null) {
+                    return true;
+        }
 
         if (!Any::isArray($value)) {
             $value = [0, $value];
         }
 
         // input file is not object?
-        if ($object === null || !Any::isObj($object))
-            return false;
+        if ($object === null || !Any::isObj($object)) {
+                    return false;
+        }
 
         // get file upload size in bytes
         $realSize = $object->getClientSize();
-        if ($realSize === null)
-            return false;
+        if ($realSize === null) {
+                    return false;
+        }
 
         return $realSize > $value[0] && $realSize <= $value[1];
     }

src/Helper/Security.php

Doc Comments +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
      * String html tags and escape quotes
      * @param string|array $html
      * @param boolean $escapeQuotes
-     * @return string|array|null
+     * @return string|null
      */
     public function strip_tags($html, $escapeQuotes = true)
     {
@@ -90,7 +90,7 @@ 
      * @deprecated
      * @param $var
      * @param null $indent
-     * @return mixed|string
+     * @return string|null
      */
     public function var_export54($var, $indent = null, $guessTypes = false) {
         return Arr::exportVar($var, $indent, $guessTypes);

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;
 
 /**

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
     public function __construct()
     {
         $config = \HTMLPurifier_Config::createDefault();
-        $config->set('Cache.SerializerPath', root . '/Private/Cache/HTMLPurifier/');
+        $config->set('Cache.SerializerPath', root.'/Private/Cache/HTMLPurifier/');
         $config->set('HTML.Allowed', 'p,b,strong,em,a[href],i,span,ul,ol,li,blockquote,h2,h3,pre,code,img[src|alt|width|height]');
         //$config->set('URI.Base', 'http://www.example.com');
         //$config->set('URI.MakeAbsolute', true);

Braces +9 added lines, -6 removed lines

@@ -60,8 +60,9 @@ 
         }
 
         $text = strip_tags($html);
-        if ($escapeQuotes)
-            $text = $this->escapeQuotes($text);
+        if ($escapeQuotes) {
+                    $text = $this->escapeQuotes($text);
+        }
 
         return $text;
     }
@@ -113,8 +114,9 @@ 
      */
     public static function password_hash($password, $salt = null)
     {
-        if ($salt === null || !Any::isStr($salt) || Str::length($salt) < 1)
-            $salt = App::$Properties->get('passwordSalt');
+        if ($salt === null || !Any::isStr($salt) || Str::length($salt) < 1) {
+                    $salt = App::$Properties->get('passwordSalt');
+        }
 
         return crypt($password, $salt);
     }
@@ -126,8 +128,9 @@ 
      */
     public static function simpleHash($string): ?string
     {
-        if (!Any::isLine($string))
-            return null;
+        if (!Any::isLine($string)) {
+                    return null;
+        }
 
         return dechex(crc32($string));
     }

src/Helper/Type/Str.php

Doc Comments +2 added lines, -5 removed lines

@@ -213,8 +213,8 @@ 
 
     /**
      * Case-ignore replace $needle to $replacement in string $haystack. Alias for function str_ireplace()
-     * @param string|array $needle
-     * @param string|array $replacement
+     * @param string[] $needle
+     * @param string $replacement
      * @param string $haystack
      * @return string
      */
@@ -318,9 +318,6 @@ 
 
     /**
      * Concat string with add string by separator
-     * @param string $separator
-     * @param string $string1
-     * @param string $string2
      * @return string
      */
     public static function concat()

Spacing +1 added lines, -1 removed lines

@@ -297,7 +297,7 @@
 
         $output = null;
         foreach ($args as $string) {
-            $output .= $string . $separator;
+            $output .= $string.$separator;
         }
 
         $output = rtrim($output, $separator);

Braces +30 added lines, -20 removed lines

@@ -28,8 +28,9 @@ 
     public static function startsWith(?string $what, ?string $where): bool
     {
         // check is not empty string
-        if (self::likeEmpty($what) || self::likeEmpty($where))
-            return false;
+        if (self::likeEmpty($what) || self::likeEmpty($where)) {
+                    return false;
+        }
 
         $prefix = self::sub($where, 0, self::length($what));
         return $prefix === $what;
@@ -44,8 +45,9 @@ 
     public static function endsWith(?string $what, ?string $where): bool
     {
         // check is not empty string
-        if (self::likeEmpty($what) || self::likeEmpty($where))
-            return false;
+        if (self::likeEmpty($what) || self::likeEmpty($where)) {
+                    return false;
+        }
 
         $suffix = self::sub($where, -self::length($what));
         return $suffix === $what;
@@ -59,8 +61,9 @@ 
      */
     public static function firstIn(?string $string, ?string $delimiter): ?string
     {
-        if (self::likeEmpty($string) || self::likeEmpty($delimiter))
-            return null;
+        if (self::likeEmpty($string) || self::likeEmpty($delimiter)) {
+                    return null;
+        }
 
         return strstr($string, $delimiter, true);
     }
@@ -74,13 +77,15 @@ 
      */
     public static function lastIn(?string $string, ?string $delimiter, bool $withoutDelimiter = false): ?string
     {
-        if (self::likeEmpty($string) || self::likeEmpty($delimiter))
-            return null;
+        if (self::likeEmpty($string) || self::likeEmpty($delimiter)) {
+                    return null;
+        }
 
         $pos = mb_strrpos($string, $delimiter);
         // if entry is not founded return false
-        if (!Any::isInt($pos))
-            return null;
+        if (!Any::isInt($pos)) {
+                    return null;
+        }
 
         // remove delimiter pointer
         if ($withoutDelimiter) {
@@ -98,8 +103,9 @@ 
     public static function cleanExtension(?string $string): ?string
     {
         // no extension in string is founded
-        if (!self::contains('.', $string))
-            return $string;
+        if (!self::contains('.', $string)) {
+                    return $string;
+        }
 
         $splited = explode('.', $string);
         array_pop($splited);
@@ -124,8 +130,9 @@ 
      */
     public static function lowerCase(?string $string): ?string
     {
-        if ($string === null)
-            return null;
+        if ($string === null) {
+                    return null;
+        }
 
         return mb_strtolower($string, 'UTF-8');
     }
@@ -137,8 +144,9 @@ 
      */
     public static function upperCase(?string $string = null): ?string
     {
-        if ($string === null)
-            return null;
+        if ($string === null) {
+                    return null;
+        }
 
         return mb_strtoupper($string, 'UTF-8');
     }
@@ -205,8 +213,9 @@ 
      */
     public static function replace($needle, $replacement, ?string $haystack): ?string
     {
-        if ($haystack === null)
-            return null;
+        if ($haystack === null) {
+                    return null;
+        }
 
         return str_replace($needle, $replacement, $haystack);
     }
@@ -220,8 +229,9 @@ 
      */
     public static function ireplace($needle, $replacement, ?string $haystack): ?string
     {
-        if ($haystack === null)
-            return null;
+        if ($haystack === null) {
+                    return null;
+        }
 
         return str_ireplace($needle, $replacement, $haystack);
     }

src/I18n/Translate.php

Unused Use Statements -1 removed lines

@@ -9,7 +9,6 @@
 use Ffcms\Core\Helper\Serialize;
 use Ffcms\Core\Helper\Type\Any;
 use Ffcms\Core\Helper\Type\Arr;
-use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
 
 /**

Spacing +4 added lines, -4 removed lines

@@ -54,7 +54,7 @@ 
 
         if (Any::isArray($params) && count($params) > 0) {
             foreach ($params as $var => $value) {
-                $text = Str::replace('%' . $var . '%', $value, $text);
+                $text = Str::replace('%'.$var.'%', $value, $text);
             }
         }
         return $text;
@@ -69,7 +69,7 @@ 
     public function translate(string $text, array $params = null)
     {
         $index = null;
-        $namespace = 'Apps\Controller\\' . env_name . '\\';
+        $namespace = 'Apps\Controller\\'.env_name.'\\';
         foreach (@debug_backtrace() as $caller) {
             if (isset($caller['class']) && Str::startsWith($namespace, $caller['class'])) {
                 $index = Str::sub((string)$caller['class'], Str::length($namespace));
@@ -85,7 +85,7 @@ 
      */
     protected function load(string $index): ?array
     {
-        $file = root . '/I18n/' . env_name . '/' . App::$Request->getLanguage() . '/' . $index . '.php';
+        $file = root.'/I18n/'.env_name.'/'.App::$Request->getLanguage().'/'.$index.'.php';
         if (!File::exist($file))
             return [];
 
@@ -121,7 +121,7 @@ 
     public function getAvailableLangs(): array
     {
         $langs = ['en'];
-        $scan = Directory::scan(root . '/I18n/' . env_name . '/', GLOB_ONLYDIR, true);
+        $scan = Directory::scan(root.'/I18n/'.env_name.'/', GLOB_ONLYDIR, true);
         foreach ($scan as $row) {
             $langs[] = trim($row, '/');
         }

Braces +18 added lines, -12 removed lines

@@ -48,8 +48,9 @@ 
                 $this->indexes[] = $index;
             }
 
-            if ($this->cached && Any::isStr($text) && isset($this->cached[$text]))
-                $text = $this->cached[$text];
+            if ($this->cached && Any::isStr($text) && isset($this->cached[$text])) {
+                            $text = $this->cached[$text];
+            }
         }
 
         if (Any::isArray($params) && count($params) > 0) {
@@ -86,8 +87,9 @@ 
     protected function load(string $index): ?array
     {
         $file = root . '/I18n/' . env_name . '/' . App::$Request->getLanguage() . '/' . $index . '.php';
-        if (!File::exist($file))
-            return [];
+        if (!File::exist($file)) {
+                    return [];
+        }
 
         return require($file);
     }
@@ -101,13 +103,15 @@ 
     {
         $path = Normalize::diskFullPath($path);
         // check if file exist
-        if (!File::exist($path))
-            return false;
+        if (!File::exist($path)) {
+                    return false;
+        }
 
         // load file translations
         $addTranslation = require($path);
-        if (!Any::isArray($addTranslation))
-            return false;
+        if (!Any::isArray($addTranslation)) {
+                    return false;
+        }
 
         // merge data
         $this->cached = Arr::merge($this->cached, $addTranslation);
@@ -142,11 +146,13 @@ 
             $lang = App::$Request->getLanguage();
         }
         // unserialize from string to array
-        if (Any::isStr($input))
-            $input = Serialize::decode($input);
+        if (Any::isStr($input)) {
+                    $input = Serialize::decode($input);
+        }
 
-        if (Any::isArray($input) && array_key_exists($lang, $input))
-            return $input[$lang];
+        if (Any::isArray($input) && array_key_exists($lang, $input)) {
+                    return $input[$lang];
+        }
 
         return $default;
     }

src/Managers/BootManager.php

Doc Comments +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 
     /**
      * BootManager constructor. Pass composer loader inside
-     * @param bool|object $loader
+     * @param boolean $loader
      */
     public function __construct($loader = false)
     {

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
 use Ffcms\Core\Helper\FileSystem\Directory;
 use Ffcms\Core\Helper\FileSystem\File;
 use Ffcms\Core\Helper\Type\Any;
-use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
 
 /**

Spacing +5 added lines, -5 removed lines

@@ -43,7 +43,7 @@ 
         // check if cache is enabled
         if (App::$Cache !== null) {
             // try to get bootable class map from cache, or initialize parsing
-            $cache = App::$Cache->getItem('boot.' . env_name . '.class.map');
+            $cache = App::$Cache->getItem('boot.'.env_name.'.class.map');
             if (!$cache->isHit()) {
                 $this->compileBootableClasses();
                 $cache->set($this->objects)->expiresAfter(static::CACHE_TREE_TIME);
@@ -96,11 +96,11 @@ 
     {
         // list app root's
         foreach ($this->appRoots as $app) {
-            $app .= '/Apps/Controller/' . env_name;
+            $app .= '/Apps/Controller/'.env_name;
             $files = File::listFiles($app, ['.php'], true);
             foreach ($files as $file) {
                 // define full class name with namespace
-                $class = 'Apps\Controller\\' . env_name . '\\' . Str::cleanExtension($file);
+                $class = 'Apps\Controller\\'.env_name.'\\'.Str::cleanExtension($file);
                 // check if class exists (must be loaded over autoloader), boot method exist and this is controller instanceof
                 if (class_exists($class) && method_exists($class, 'boot') && is_a($class, 'Ffcms\Core\Arch\Controller', true)) {
                     $this->objects[] = $class;
@@ -110,14 +110,14 @@ 
 
         // list widget root's
         foreach ($this->widgetRoots as $widget) {
-            $widget .= '/Widgets/' . env_name;
+            $widget .= '/Widgets/'.env_name;
             // widgets are packed in directory, classname should be the same with root directory name
             $dirs = Directory::scan($widget, GLOB_ONLYDIR, true);
             if (!Any::isArray($dirs))
                 continue;
 
             foreach ($dirs as $instance) {
-                $class = 'Widgets\\' . env_name . '\\' . $instance . '\\' . $instance;
+                $class = 'Widgets\\'.env_name.'\\'.$instance.'\\'.$instance;
                 if (class_exists($class) && method_exists($class, 'boot') && is_a($class, 'Ffcms\Core\Arch\Widget', true)) {
                     $this->objects[] = $class;
                 }

Braces +12 added lines, -8 removed lines

@@ -81,11 +81,13 @@ 
         }
 
         // set default root path if not found anything else
-        if (count($this->appRoots) < 1)
-            $this->appRoots = [root];
+        if (count($this->appRoots) < 1) {
+                    $this->appRoots = [root];
+        }
 
-        if (count($this->widgetRoots) < 1)
-            $this->widgetRoots = [root];
+        if (count($this->widgetRoots) < 1) {
+                    $this->widgetRoots = [root];
+        }
     }
 
     /**
@@ -113,8 +115,9 @@ 
             $widget .= '/Widgets/' . env_name;
             // widgets are packed in directory, classname should be the same with root directory name
             $dirs = Directory::scan($widget, GLOB_ONLYDIR, true);
-            if (!Any::isArray($dirs))
-                continue;
+            if (!Any::isArray($dirs)) {
+                            continue;
+            }
 
             foreach ($dirs as $instance) {
                 $class = 'Widgets\\' . env_name . '\\' . $instance . '\\' . $instance;
@@ -133,8 +136,9 @@ 
     {
         $this->startMeasure(__METHOD__);
 
-        if (!Any::isArray($this->objects))
-            return false;
+        if (!Any::isArray($this->objects)) {
+                    return false;
+        }
 
         foreach ($this->objects as $class) {
             forward_static_call([$class, 'boot']);