phpffcms / ffcms-core

src/Ffcms/Core/Traits/ClassTools.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     {
         $hash = null;
         foreach ($this as $property => $value) {
-            $hash = md5($hash . $property . '=' . $value);
+            $hash = md5($hash.$property.'='.$value);
         }
         return $hash;
     }

src/Ffcms/Core/Alias.php

Spacing +10 added lines, -10 removed lines

@@ -92,7 +92,7 @@ 
             $this->baseDomain = App::$Properties->get('baseDomain');
         }
         // build script url
-        $this->scriptUrl = App::$Request->getScheme() . '://' . $this->baseDomain;
+        $this->scriptUrl = App::$Request->getScheme().'://'.$this->baseDomain;
         if (App::$Properties->get('basePath') !== '/') {
             $this->scriptUrl .= rtrim(App::$Properties->get('basePath'), '/');
         }
@@ -104,27 +104,27 @@ 
 
         $this->baseUrlNoLang = $this->baseUrl;
         if (App::$Request->languageInPath() && App::$Request->getLanguage() !== null) {
-            $this->baseUrl .= '/' . App::$Request->getLanguage();
+            $this->baseUrl .= '/'.App::$Request->getLanguage();
         }
 
         // add cron initiation from user if enabled
         if ((bool)App::$Properties->get('userCron') && env_name === 'Front') {
-            $this->addPlainCode('js', 'if(Math.random() > 0.8) { $.get("' . $this->scriptUrl . '/cron.php?rand=" + Math.random()); }');
+            $this->addPlainCode('js', 'if(Math.random() > 0.8) { $.get("'.$this->scriptUrl.'/cron.php?rand=" + Math.random()); }');
         }
 
         // build vendor libs alias
-        $this->vendorNamedLibrary['js']['jquery'] = $this->scriptUrl . '/vendor/bower/jquery/dist/jquery.min.js';
-        $this->vendorNamedLibrary['css']['bootstrap'] = $this->scriptUrl . '/vendor/bower/bootstrap/dist/css/bootstrap.min.css';
-        $this->vendorNamedLibrary['js']['bootstrap'] = $this->scriptUrl . '/vendor/bower/bootstrap/dist/js/bootstrap.min.js';
-        $this->vendorNamedLibrary['css']['fa'] = $this->scriptUrl . '/vendor/bower/components-font-awesome/css/font-awesome.min.css';
-        $this->vendorNamedLibrary['js']['jquery-ui'] = $this->scriptUrl . '/vendor/bower/jquery-ui/jquery-ui.min.js';
-        $this->vendorNamedLibrary['css']['jquery-ui'] = $this->scriptUrl . '/vendor/bower/jquery-ui/themes/base/jquery-ui.min.css';
+        $this->vendorNamedLibrary['js']['jquery'] = $this->scriptUrl.'/vendor/bower/jquery/dist/jquery.min.js';
+        $this->vendorNamedLibrary['css']['bootstrap'] = $this->scriptUrl.'/vendor/bower/bootstrap/dist/css/bootstrap.min.css';
+        $this->vendorNamedLibrary['js']['bootstrap'] = $this->scriptUrl.'/vendor/bower/bootstrap/dist/js/bootstrap.min.js';
+        $this->vendorNamedLibrary['css']['fa'] = $this->scriptUrl.'/vendor/bower/components-font-awesome/css/font-awesome.min.css';
+        $this->vendorNamedLibrary['js']['jquery-ui'] = $this->scriptUrl.'/vendor/bower/jquery-ui/jquery-ui.min.js';
+        $this->vendorNamedLibrary['css']['jquery-ui'] = $this->scriptUrl.'/vendor/bower/jquery-ui/themes/base/jquery-ui.min.css';
 
         $themeAll = App::$Properties->get('theme');
         if (!isset($themeAll[env_name]) || Str::length($themeAll[env_name]) < 1) {
             $themeAll[env_name] = 'default';
         }
-        $this->currentViewUrl = $this->scriptUrl . '/Apps/View/' . env_name . '/' . $themeAll[env_name];
+        $this->currentViewUrl = $this->scriptUrl.'/Apps/View/'.env_name.'/'.$themeAll[env_name];
     }
 
     /**

src/Ffcms/Core/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);

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);

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

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/Ffcms/Core/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']);

src/Ffcms/Core/Arch/Widget.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 
         // check if class exist
         if (!class_exists(self::$class)) {
-            return 'Error: Widget is not founded: ' . self::$class;
+            return 'Error: Widget is not founded: '.self::$class;
         }
 
         // init class and pass properties

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use Apps\ActiveRecord\App as AppRecord;
 use Ffcms\Core\Helper\Type\Any;
-use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
 use Ffcms\Core\Interfaces\iWidget;
 use Ffcms\Core\Traits\DynamicGlobal;

Braces +3 added lines, -2 removed lines

@@ -33,8 +33,9 @@
         $object = new self::$class;
         if (Any::isArray($params) && count($params) > 0) {
             foreach ($params as $property => $value) {
-                if (property_exists($object, $property))
-                    $object->{$property} = $value;
+                if (property_exists($object, $property)) {
+                                    $object->{$property} = $value;
+                }
             }
         }
 

src/Ffcms/Core/Helper/FileSystem/File.php

Doc Comments +1 added lines, -1 removed lines

@@ -210,7 +210,7 @@
     /**
      * Get file md5 hash
      * @param string $path
-     * @return bool|string
+     * @return false|string
      */
     public static function getMd5($path)
     {

Spacing +3 added lines, -3 removed lines

@@ -192,15 +192,15 @@
             return [];
         }
 
-        $dir = opendir($path . '/.');
+        $dir = opendir($path.'/.');
         while ($item = readdir($dir)) {
-            if (is_file($sub = $path . '/' . $item)) {
+            if (is_file($sub = $path.'/'.$item)) {
                 $item_ext = Str::lastIn($item, '.');
                 if ($ext === null || Arr::in($item_ext, $ext)) {
                     if ($returnRelative) {
                         $files[] = $item;
                     } else {
-                        $files[] = $path . DIRECTORY_SEPARATOR . $item;
+                        $files[] = $path.DIRECTORY_SEPARATOR.$item;
                     }
                 }
             } else {

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

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
         }
         // get image link
         $image = App::$Captcha->get();
-        $response = '<img id="src-secure-image" src="' . $image . '" alt="captcha" onClick="this.src=\''.$image.'&rnd=\'+Math.random()" />';
+        $response = '<img id="src-secure-image" src="'.$image.'" alt="captcha" onClick="this.src=\''.$image.'&rnd=\'+Math.random()" />';
         // render response tag with image
         $this->properties['type'] = 'text';
         $response .= self::buildSingleTag('input', $this->properties);

src/Ffcms/Core/Helper/HTML/Listing.php

Spacing +4 added lines, -4 removed lines

@@ -30,7 +30,7 @@ 
         // initialize new DOM model
         $dom = new Dom();
         // return DOM-HTML, build based on closures!
-        return $dom->{$elements['type']}(function () use ($dom, $elements) {
+        return $dom->{$elements['type']}(function() use ($dom, $elements) {
             // prepare output avg variable
             $itemHTML = null;
             // get active order level
@@ -71,7 +71,7 @@ 
 
         return $dom->li(function() use($dom, $item){
             $dropdownLink = $dom->a(function() use ($dom, $item){
-                return self::applyEscape($item['text'], $item['html'], $item['!secure']) . ' ' . $dom->span(function(){}, ['class' => 'caret']);
+                return self::applyEscape($item['text'], $item['html'], $item['!secure']).' '.$dom->span(function() {}, ['class' => 'caret']);
             }, $item['dropdown']);
 
             $dropdownElements = $dom->ul(function() use ($dom, $item){
@@ -82,7 +82,7 @@ 
                 return $resp;
             }, $item['menuProperty']);
 
-            return $dropdownLink . $dropdownElements;
+            return $dropdownLink.$dropdownElements;
         }, $item['property']);
 
     }
@@ -136,7 +136,7 @@ 
         $item['linkProperty']['href'] = self::convertLink($item['link']);
 
         // build output <li@params><a @params>@text</li>
-        return $dom->li(function () use ($dom, $text, $item) {
+        return $dom->li(function() use ($dom, $text, $item) {
             return $dom->a(function() use ($text) {
                 return $text;
             }, $item['linkProperty']);

Braces +9 added lines, -6 removed lines

@@ -24,8 +24,9 @@ 
     public static function display($elements)
     {
         // check input elements
-        if (!Arr::in($elements['type'], ['ul', 'ol']) || count($elements['items']) < 1)
-            return null;
+        if (!Arr::in($elements['type'], ['ul', 'ol']) || count($elements['items']) < 1) {
+                    return null;
+        }
 
         // initialize new DOM model
         $dom = new Dom();
@@ -62,11 +63,13 @@ 
      */
     private static function buildDropdown($dom, $item)
     {
-        if (!Any::isArray($item['items']))
-            return null;
+        if (!Any::isArray($item['items'])) {
+                    return null;
+        }
 
-        if (!isset($item['menuProperty']['class']))
-            $item['menuProperty']['class'] = 'dropdown-menu';
+        if (!isset($item['menuProperty']['class'])) {
+                    $item['menuProperty']['class'] = 'dropdown-menu';
+        }
 
         return $dom->li(function() use($dom, $item){
             $dropdownLink = $dom->a(function() use ($dom, $item){

src/Ffcms/Core/Arch/Model.php

Doc Comments +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
     /**
      * Get label value by variable name
      * @param string $param
-     * @return mixed
+     * @return string
      */
     final public function getLabel($param)
     {
@@ -65,7 +65,7 @@ 
 
     /**
      * Set attribute labels for model variables
-     * @return array
+     * @return string
      */
     public function labels(): array
     {

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 use Ffcms\Core\App;
 use Ffcms\Core\Exception\SyntaxException;
 use Ffcms\Core\Helper\Type\Any;
-use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
 use Ffcms\Core\Interfaces\iModel;
 use Ffcms\Core\Traits\DynamicGlobal;

Braces +16 added lines, -10 removed lines

@@ -143,8 +143,9 @@ 
                 }
                 // add message about wrong attribute to session holder, later display it
                 $attrLabel = $attr;
-                if ($this->getLabel($attr) !== null)
-                    $attrLabel = $this->getLabel($attr);
+                if ($this->getLabel($attr) !== null) {
+                                    $attrLabel = $this->getLabel($attr);
+                }
 
                 App::$Session->getFlashBag()->add('warning', __('Field "%field%" is incorrect', ['field' => $attrLabel]));
             }
@@ -162,8 +163,9 @@ 
         $properties = null;
         // list all properties here, array_walk sucks on performance!
         foreach ($this as $property => $value) {
-            if (Str::startsWith('_', $property))
-                continue;
+            if (Str::startsWith('_', $property)) {
+                            continue;
+            }
 
             $properties[$property] = $value;
         }
@@ -177,8 +179,9 @@ 
     public function clearProperties(): void
     {
         foreach ($this as $property => $value) {
-            if (!Str::startsWith('_', $property))
-                $this->{$property} = null;
+            if (!Str::startsWith('_', $property)) {
+                            $this->{$property} = null;
+            }
         }
     }
 
@@ -195,12 +198,15 @@ 
         foreach ($rules as $rule) {
             if (Any::isArray($rule[0])) { // 2 or more rules [['field1', 'field2'], 'filter', 'filter_argv']
                 foreach ($rule[0] as $tfield) {
-                    if ($tfield == $field)
-                        $response[$rule[1]] = $rule[2]; // ['min_length' => 1, 'required' => null]
+                    if ($tfield == $field) {
+                                            $response[$rule[1]] = $rule[2];
+                    }
+                    // ['min_length' => 1, 'required' => null]
                 }
             } else { // 1 rule ['field1', 'filter', 'filter_argv']
-                if ($rule[0] === $field)
-                    $response[$rule[1]] = $rule[2];
+                if ($rule[0] === $field) {
+                                    $response[$rule[1]] = $rule[2];
+                }
             }
         }