phpffcms / ffcms-core

src/Ffcms/Core/App.php

Unused Use Statements -4 removed lines

@@ -6,15 +6,11 @@
 use Ffcms\Core\Cache\MemoryObject;
 use Ffcms\Core\Debug\DebugMeasure;
 use Ffcms\Core\Debug\Manager as Debug;
-use Ffcms\Core\Exception\ForbiddenException;
-use Ffcms\Core\Exception\JsonException;
 use Ffcms\Core\Exception\NativeException;
 use Ffcms\Core\Exception\NotFoundException;
-use Ffcms\Core\Exception\SyntaxException;
 use Ffcms\Core\Exception\TemplateException;
 use Ffcms\Core\Helper\Security;
 use Ffcms\Core\Helper\Type\Any;
-use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
 use Ffcms\Core\I18n\Translate;
 use Ffcms\Core\Managers\BootManager;

Spacing +9 added lines, -9 removed lines

@@ -185,22 +185,22 @@ 
         $html = null;
         // lets try to get html full content to page render
         try {
-            $this->startMeasure(__METHOD__ . '::callback');
+            $this->startMeasure(__METHOD__.'::callback');
             /** @var \Ffcms\Core\Arch\Controller $callClass */
             $callClass = null;
-            $callMethod = 'action' . self::$Request->getAction();
+            $callMethod = 'action'.self::$Request->getAction();
 
             // define callback class namespace/name full path
-            $cName = (self::$Request->getCallbackAlias() ?? '\Apps\Controller\\' . env_name . '\\' . self::$Request->getController());
+            $cName = (self::$Request->getCallbackAlias() ?? '\Apps\Controller\\'.env_name.'\\'.self::$Request->getController());
             if (!class_exists($cName))
-                throw new NotFoundException('Callback class not found: ' . App::$Security->strip_tags($cName));
+                throw new NotFoundException('Callback class not found: '.App::$Security->strip_tags($cName));
 
             $callClass = new $cName;
             // check if callback method (action) is exist in class object
             if (!method_exists($callClass, $callMethod))
-                throw new NotFoundException('Method "' . App::$Security->strip_tags($callMethod) . '()" not founded in "' . get_class($callClass) . '"');
+                throw new NotFoundException('Method "'.App::$Security->strip_tags($callMethod).'()" not founded in "'.get_class($callClass).'"');
 
-            $this->stopMeasure(__METHOD__ . '::callback');
+            $this->stopMeasure(__METHOD__.'::callback');
             $params = [];
             if (!Str::likeEmpty(self::$Request->getID())) {
                 $params[] = self::$Request->getID();
@@ -224,10 +224,10 @@ 
                     'current' => count($params)
                 ]));
 
-            $this->startMeasure($cName . '::' . $callMethod);
+            $this->startMeasure($cName.'::'.$callMethod);
             // make callback call to action in controller and get response
             $actionResponse = call_user_func_array([$callClass, $callMethod], $params);
-            $this->stopMeasure($cName . '::' . $callMethod);
+            $this->stopMeasure($cName.'::'.$callMethod);
 
             // set response to controller attribute
             if (!Str::likeEmpty($actionResponse))
@@ -241,7 +241,7 @@ 
                 $html = $e->display();
             } else { // or hook exception to system based :)))
                 if (App::$Debug) {
-                    $msg = $e->getMessage() . $e->getTraceAsString();
+                    $msg = $e->getMessage().$e->getTraceAsString();
                     $html = (new NativeException($msg))->display();
                 } else {
                     $html = (new NativeException($e->getMessage()))->display();

Braces +21 added lines, -14 removed lines

@@ -156,8 +156,9 @@ 
 
         /** @var array $objects */
         $objects = App::$Properties->getAll('object');
-        if (!Any::isArray($objects))
-            throw new NativeException('Object configurations is not loaded: /Private/Config/Object.php');
+        if (!Any::isArray($objects)) {
+                    throw new NativeException('Object configurations is not loaded: /Private/Config/Object.php');
+        }
 
         // each all objects as service_name => service_instance()
         foreach ($objects as $name => $instance) {
@@ -192,20 +193,23 @@ 
 
             // define callback class namespace/name full path
             $cName = (self::$Request->getCallbackAlias() ?? '\Apps\Controller\\' . env_name . '\\' . self::$Request->getController());
-            if (!class_exists($cName))
-                throw new NotFoundException('Callback class not found: ' . App::$Security->strip_tags($cName));
+            if (!class_exists($cName)) {
+                            throw new NotFoundException('Callback class not found: ' . App::$Security->strip_tags($cName));
+            }
 
             $callClass = new $cName;
             // check if callback method (action) is exist in class object
-            if (!method_exists($callClass, $callMethod))
-                throw new NotFoundException('Method "' . App::$Security->strip_tags($callMethod) . '()" not founded in "' . get_class($callClass) . '"');
+            if (!method_exists($callClass, $callMethod)) {
+                            throw new NotFoundException('Method "' . App::$Security->strip_tags($callMethod) . '()" not founded in "' . get_class($callClass) . '"');
+            }
 
             $this->stopMeasure(__METHOD__ . '::callback');
             $params = [];
             if (!Str::likeEmpty(self::$Request->getID())) {
                 $params[] = self::$Request->getID();
-                if (!Str::likeEmpty(self::$Request->getAdd()))
-                    $params[] = self::$Request->getAdd();
+                if (!Str::likeEmpty(self::$Request->getAdd())) {
+                                    $params[] = self::$Request->getAdd();
+                }
             }
 
             // get instance of callback object (class::method) as reflection
@@ -213,16 +217,18 @@ 
             $argCount = 0;
             // calculate method defined arguments count
             foreach ($instance->getParameters() as $arg) {
-                if (!$arg->isOptional())
-                    $argCount++;
+                if (!$arg->isOptional()) {
+                                    $argCount++;
+                }
             }
             // compare method arg count with passed
-            if (count($params) < $argCount)
-                throw new NotFoundException(__('Arguments for method %method% is not enough. Expected: %required%, got: %current%.', [
+            if (count($params) < $argCount) {
+                            throw new NotFoundException(__('Arguments for method %method% is not enough. Expected: %required%, got: %current%.', [
                     'method' => $callMethod,
                     'required' => $argCount,
                     'current' => count($params)
                 ]));
+            }
 
             $this->startMeasure($cName . '::' . $callMethod);
             // make callback call to action in controller and get response
@@ -230,8 +236,9 @@ 
             $this->stopMeasure($cName . '::' . $callMethod);
 
             // set response to controller attribute
-            if (!Str::likeEmpty($actionResponse))
-                $callClass->setOutput($actionResponse);
+            if (!Str::likeEmpty($actionResponse)) {
+                            $callClass->setOutput($actionResponse);
+            }
 
             // build full compiled output html data with default layout and widgets
             $html = $callClass->buildOutput();

src/Ffcms/Core/Arch/Model.php

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];
+                }
             }
         }
 

src/Ffcms/Core/Arch/View.php

Doc Comments +1 added lines, -1 removed lines

@@ -249,7 +249,7 @@
     /**
      * Show custom code library link
      * @param string $type - js or css allowed
-     * @return array|null|string
+     * @return null|string
      */
     public function showCodeLink(string $type)
     {

Unused Use Statements -1 removed lines

@@ -9,7 +9,6 @@
 use Ffcms\Core\Helper\FileSystem\File;
 use Ffcms\Core\Helper\FileSystem\Normalize;
 use Ffcms\Core\Helper\Type\Any;
-use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
 use Ffcms\Core\Template\Variables;
 use Ffcms\Core\Traits\DynamicGlobal;

Spacing +16 added lines, -16 removed lines

@@ -55,16 +55,16 @@ 
         $this->lang = App::$Request->getLanguage();
         // get theme config and build full path
         $themeConfig = App::$Properties->get('theme');
-        $this->themePath = root . DIRECTORY_SEPARATOR . 'Apps' . DIRECTORY_SEPARATOR . 'View' . DIRECTORY_SEPARATOR . env_name;
+        $this->themePath = root.DIRECTORY_SEPARATOR.'Apps'.DIRECTORY_SEPARATOR.'View'.DIRECTORY_SEPARATOR.env_name;
         if (isset($themeConfig[env_name]) && Str::length($themeConfig[env_name]) > 0) {
-            $this->themePath .=  DIRECTORY_SEPARATOR . $themeConfig[env_name];
+            $this->themePath .= DIRECTORY_SEPARATOR.$themeConfig[env_name];
         } else {
-            $this->themePath .= DIRECTORY_SEPARATOR . 'default';
+            $this->themePath .= DIRECTORY_SEPARATOR.'default';
         }
 
         // check if theme is available
         if (!Directory::exist($this->themePath))
-            throw new NativeException('Apps theme is not founded: ' . Str::replace(root, null, $this->themePath));
+            throw new NativeException('Apps theme is not founded: '.Str::replace(root, null, $this->themePath));
 
         // get input args and build class properties
         $args = func_get_args();
@@ -102,7 +102,7 @@ 
         
         // path still not defined?
         if (!$path)
-            throw new SyntaxException('View not found: ' . App::$Security->strip_tags($path));
+            throw new SyntaxException('View not found: '.App::$Security->strip_tags($path));
 
         // cleanup from slashes on start/end
         $path = trim($path, '/\\');
@@ -130,7 +130,7 @@ 
             // lets try to get full path for current theme
             $tmpPath = $path;
             if (!Str::startsWith($this->themePath, $path))
-                $tmpPath = Normalize::diskPath($this->themePath . '/' . $path . '.php');
+                $tmpPath = Normalize::diskPath($this->themePath.'/'.$path.'.php');
         } else { // sounds like a object-depended view call from controller or etc
             // get stack trace of callbacks
             $calledLog = debug_backtrace();
@@ -144,13 +144,13 @@ 
 
             // depended controller is not founded? Let finish
             if (!$calledController)
-                throw new SyntaxException('View render is failed: callback controller not founded! Call with relative path: ' . $path);
+                throw new SyntaxException('View render is failed: callback controller not founded! Call with relative path: '.$path);
 
             // get controller name
-            $controllerName = Str::sub($calledController, Str::length('Apps\Controller\\' . env_name . '\\'));
+            $controllerName = Str::sub($calledController, Str::length('Apps\Controller\\'.env_name.'\\'));
             $controllerName = Str::lowerCase($controllerName);
             // get full path
-            $tmpPath = $this->themePath . DIRECTORY_SEPARATOR . $controllerName . DIRECTORY_SEPARATOR . $path . '.php';
+            $tmpPath = $this->themePath.DIRECTORY_SEPARATOR.$controllerName.DIRECTORY_SEPARATOR.$path.'.php';
         }
 
         // check if builded view full path is exist
@@ -159,18 +159,18 @@ 
 
         // hmm, not founded. Lets try to find in caller directory (for widgets, apps packages and other)
         if ($source !== null) {
-            $tmpPath = Normalize::diskPath($source . DIRECTORY_SEPARATOR . $path . '.php');
+            $tmpPath = Normalize::diskPath($source.DIRECTORY_SEPARATOR.$path.'.php');
             if (File::exist($tmpPath)) {
                 // add notify for native views
                 if (App::$Debug)
-                    App::$Debug->addMessage('Render native viewer: ' . Str::replace(root, null, $tmpPath), 'info');
+                    App::$Debug->addMessage('Render native viewer: '.Str::replace(root, null, $tmpPath), 'info');
 
                 return $tmpPath;
             }
         }
 
         if (App::$Debug)
-            App::$Debug->addMessage('Viewer not founded on rendering: ' . $path, 'warning');
+            App::$Debug->addMessage('Viewer not founded on rendering: '.$path, 'warning');
 
         return null;
     }
@@ -262,7 +262,7 @@ 
         foreach ($items as $item) {
             $item = trim($item, '/');
             if (!Str::startsWith(App::$Alias->scriptUrl, $item) && !Str::startsWith('http', $item)) { // is local without proto and domain
-                $item = App::$Alias->scriptUrl . '/' . $item;
+                $item = App::$Alias->scriptUrl.'/'.$item;
             }
             $output[] = $item;
         }
@@ -271,9 +271,9 @@ 
         $output = null;
         foreach ($clear as $row) {
             if ($type === 'css') {
-                $output .= '<link rel="stylesheet" type="text/css" href="' . $row . '">' . "\n";
+                $output .= '<link rel="stylesheet" type="text/css" href="'.$row.'">'."\n";
             } elseif ($type === 'js') {
-                $output .= '<script src="' . $row . '"></script>' . "\n";
+                $output .= '<script src="'.$row.'"></script>'."\n";
             }
         }
 
@@ -295,7 +295,7 @@ 
 
         $code = null;
         foreach (App::$Alias->getPlainCode($type) as $row) {
-            $code .= $row . "\n";
+            $code .= $row."\n";
         }
 
         return $code;

Braces +45 added lines, -30 removed lines

@@ -63,8 +63,9 @@ 
         }
 
         // check if theme is available
-        if (!Directory::exist($this->themePath))
-            throw new NativeException('Apps theme is not founded: ' . Str::replace(root, null, $this->themePath));
+        if (!Directory::exist($this->themePath)) {
+                    throw new NativeException('Apps theme is not founded: ' . Str::replace(root, null, $this->themePath));
+        }
 
         // get input args and build class properties
         $args = func_get_args();
@@ -89,20 +90,24 @@ 
         $source = $this->sourcePath;
 
         // if path is not defined - try to find it in arguments
-        if (!$path)
-            $path = array_shift($arguments);
+        if (!$path) {
+                    $path = array_shift($arguments);
+        }
 
         // if arguments is not define - try to find in arguments
-        if (!$params)
-            $params = array_shift($arguments);
+        if (!$params) {
+                    $params = array_shift($arguments);
+        }
 
         // if directory of caller is not defiend - lets find in argument
-        if (!$source)
-            $source = array_shift($arguments);
+        if (!$source) {
+                    $source = array_shift($arguments);
+        }
         
         // path still not defined?
-        if (!$path)
-            throw new SyntaxException('View not found: ' . App::$Security->strip_tags($path));
+        if (!$path) {
+                    throw new SyntaxException('View not found: ' . App::$Security->strip_tags($path));
+        }
 
         // cleanup from slashes on start/end
         $path = trim($path, '/\\');
@@ -129,8 +134,9 @@ 
         if (Str::contains('/', $path)) {
             // lets try to get full path for current theme
             $tmpPath = $path;
-            if (!Str::startsWith($this->themePath, $path))
-                $tmpPath = Normalize::diskPath($this->themePath . '/' . $path . '.php');
+            if (!Str::startsWith($this->themePath, $path)) {
+                            $tmpPath = Normalize::diskPath($this->themePath . '/' . $path . '.php');
+            }
         } else { // sounds like a object-depended view call from controller or etc
             // get stack trace of callbacks
             $calledLog = debug_backtrace();
@@ -138,13 +144,15 @@ 
 
             // lets try to find controller in backtrace
             foreach ($calledLog as $caller) {
-                if (isset($caller['class']) && Str::startsWith('Apps\Controller\\', $caller['class']))
-                    $calledController = (string)$caller['class'];
+                if (isset($caller['class']) && Str::startsWith('Apps\Controller\\', $caller['class'])) {
+                                    $calledController = (string)$caller['class'];
+                }
             }
 
             // depended controller is not founded? Let finish
-            if (!$calledController)
-                throw new SyntaxException('View render is failed: callback controller not founded! Call with relative path: ' . $path);
+            if (!$calledController) {
+                            throw new SyntaxException('View render is failed: callback controller not founded! Call with relative path: ' . $path);
+            }
 
             // get controller name
             $controllerName = Str::sub($calledController, Str::length('Apps\Controller\\' . env_name . '\\'));
@@ -154,23 +162,26 @@ 
         }
 
         // check if builded view full path is exist
-        if (File::exist($tmpPath))
-            return $tmpPath;
+        if (File::exist($tmpPath)) {
+                    return $tmpPath;
+        }
 
         // hmm, not founded. Lets try to find in caller directory (for widgets, apps packages and other)
         if ($source !== null) {
             $tmpPath = Normalize::diskPath($source . DIRECTORY_SEPARATOR . $path . '.php');
             if (File::exist($tmpPath)) {
                 // add notify for native views
-                if (App::$Debug)
-                    App::$Debug->addMessage('Render native viewer: ' . Str::replace(root, null, $tmpPath), 'info');
+                if (App::$Debug) {
+                                    App::$Debug->addMessage('Render native viewer: ' . Str::replace(root, null, $tmpPath), 'info');
+                }
 
                 return $tmpPath;
             }
         }
 
-        if (App::$Debug)
-            App::$Debug->addMessage('Viewer not founded on rendering: ' . $path, 'warning');
+        if (App::$Debug) {
+                    App::$Debug->addMessage('Viewer not founded on rendering: ' . $path, 'warning');
+        }
 
         return null;
     }
@@ -193,8 +204,9 @@ 
      */
     protected function renderSandbox($path, $params = null)
     {
-        if (!$path || !File::exist($path))
-            return null;
+        if (!$path || !File::exist($path)) {
+                    return null;
+        }
 
         // render defaults params as variables
         if (Any::isArray($params) && count($params) > 0) {
@@ -218,8 +230,9 @@ 
             ob_end_clean();
             // prepare output message
             $msg = $e->getMessage();
-            if (!Str::likeEmpty($msg))
-                $msg .= '. ';
+            if (!Str::likeEmpty($msg)) {
+                            $msg .= '. ';
+            }
 
             $msg .= __('Native exception catched in view: %path% in line %line%', ['path' => $path, 'line' => $e->getLine()]);
             exit($e->display($msg));
@@ -255,8 +268,9 @@ 
     {
         $items = App::$Alias->getCustomLibraryArray($type);
         // check if custom library available
-        if (!$items || !Any::isArray($items) || count($items) < 1)
-            return null;
+        if (!$items || !Any::isArray($items) || count($items) < 1) {
+                    return null;
+        }
 
         $output = [];
         foreach ($items as $item) {
@@ -290,8 +304,9 @@ 
      */
     public function showPlainCode(?string $type = null): ?string
     {
-        if (!App::$Alias->getPlainCode($type) || !Any::isArray(App::$Alias->getPlainCode($type)))
-            return null;
+        if (!App::$Alias->getPlainCode($type) || !Any::isArray(App::$Alias->getPlainCode($type))) {
+                    return null;
+        }
 
         $code = null;
         foreach (App::$Alias->getPlainCode($type) as $row) {

src/Ffcms/Core/Arch/Widget.php

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/Debug/Manager.php

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
 use DebugBar\StandardDebugBar;
 use Ffcms\Core\App;
 use Ffcms\Core\Helper\Type\Any;
-use Ffcms\Core\Helper\Type\Obj;
 
 /**
  * Class Debug. Provide methods of display information about debug and collected data in debug bar

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
         $this->render = $this->bar->getJavascriptRenderer();
         try {
             $this->bar->addCollector(new ConfigCollector());
-        } catch (\Exception $oe){}
+        } catch (\Exception $oe) {}
     }
 
     /**

Braces +3 added lines, -2 removed lines

@@ -80,8 +80,9 @@
      */
     public function addMessage($m, $type = 'info')
     {
-        if (!Any::isStr($m) || !Any::isStr($type))
-            return;
+        if (!Any::isStr($m) || !Any::isStr($type)) {
+                    return;
+        }
 
         $m = App::$Security->secureHtml($m);
         try {

src/Ffcms/Core/Helper/HTML/Bootstrap/Nav.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;
 use Ffcms\Core\Helper\Type\Str;
 
 class Nav extends NativeGenerator

Spacing +6 added lines, -6 removed lines

@@ -59,7 +59,7 @@ 
             } elseif ($item['type'] === 'tab') {
                 $activeObject = false;
                 $item['type'] = 'link'; // fix for global Listing builder
-                $item['link'] = '#' . $elements['tabAnchor'] . $tabIdx;
+                $item['link'] = '#'.$elements['tabAnchor'].$tabIdx;
 
                 $item['property']['role'] = 'presentation';
 
@@ -74,10 +74,10 @@ 
 
                 // mark active tab
                 if ($activeObject === true)
-                    $item['property']['class'] .= (Str::length($item['property']['class']) > 0 ? ' ' : null) . 'active';
+                    $item['property']['class'] .= (Str::length($item['property']['class']) > 0 ? ' ' : null).'active';
 
                 // tab special properties for bootstrap
-                $item['linkProperty']['aria-controls'] = $elements['tabAnchor'] . $tabIdx;
+                $item['linkProperty']['aria-controls'] = $elements['tabAnchor'].$tabIdx;
                 $item['linkProperty']['role'] = 'tab';
                 $item['linkProperty']['data-toggle'] = 'tab';
 
@@ -96,7 +96,7 @@ 
                     } else {
                         return self::nohtml($itemContent);
                     }
-                }, ['role' => 'tabpanel', 'class' => 'tab-pane fade' . ($activeObject === true ? ' in active' : null), 'id' => $elements['tabAnchor'] . $tabIdx]);
+                }, ['role' => 'tabpanel', 'class' => 'tab-pane fade'.($activeObject === true ? ' in active' : null), 'id' => $elements['tabAnchor'].$tabIdx]);
                 $tabIdx++;
             }
         }
@@ -104,7 +104,7 @@ 
         // check if global class "nav" isset
         if ($elements['property']['class'] !== null) {
             if (!Str::contains('nav ', $elements['property']['class'])) {
-                $elements['property']['class'] = 'nav ' . $elements['property']['class'];
+                $elements['property']['class'] = 'nav '.$elements['property']['class'];
             }
         } else {
             $elements['property']['class'] = 'nav';
@@ -128,7 +128,7 @@ 
                     return $tabContent;
                 }, $elements['tabProperty']);
             }
-            return $listing . $tabContent;
+            return $listing.$tabContent;
         }, $blockProperty);
     }
 }
\ No newline at end of file

Braces +12 added lines, -8 removed lines

@@ -20,18 +20,21 @@ 
     public static function display(array $elements): ?string
     {
         // check if elements isn't empty and contains rows
-        if (!isset($elements['items']) || count($elements['items']) < 1)
-            return null;
+        if (!isset($elements['items']) || count($elements['items']) < 1) {
+                    return null;
+        }
 
         // prepare tab order
-        if ($elements['tabAnchor'] === null)
-            $elements['tabAnchor'] = Str::randomLatin(mt_rand(6, 12));
+        if ($elements['tabAnchor'] === null) {
+                    $elements['tabAnchor'] = Str::randomLatin(mt_rand(6, 12));
+        }
 
         // set global element properties
         $blockProperty = [];
         if ($elements['blockProperty'] !== null) {
-            if (Any::isArray($elements['blockProperty']))
-                $blockProperty = $elements['blockProperty'];
+            if (Any::isArray($elements['blockProperty'])) {
+                            $blockProperty = $elements['blockProperty'];
+            }
             unset($elements['blockProperty']);
         }
 
@@ -73,8 +76,9 @@ 
                 }
 
                 // mark active tab
-                if ($activeObject === true)
-                    $item['property']['class'] .= (Str::length($item['property']['class']) > 0 ? ' ' : null) . 'active';
+                if ($activeObject === true) {
+                                    $item['property']['class'] .= (Str::length($item['property']['class']) > 0 ? ' ' : null) . 'active';
+                }
 
                 // tab special properties for bootstrap
                 $item['linkProperty']['aria-controls'] = $elements['tabAnchor'] . $tabIdx;

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

Unused Use Statements -2 removed lines

@@ -4,14 +4,12 @@
 
 use Ffcms\Core\App;
 use Ffcms\Core\Arch\Model;
-use Ffcms\Core\Exception\NativeException;
 use Ffcms\Core\Exception\SyntaxException;
 use Ffcms\Core\Helper\FileSystem\File;
 use Ffcms\Core\Helper\HTML\Form\Constructor;
 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;
 use Ffcms\Core\Helper\Type\Str;
 
 /**

Spacing +9 added lines, -9 removed lines

@@ -79,7 +79,7 @@ 
     {
         $form = self::buildSingleTag('form', $this->formProperty, false);
         if ($this->model->_tokenRequired) {
-            $form .= PHP_EOL . $this->field('_csrf_token', 'hidden', ['value' => $this->model->_csrf_token]);
+            $form .= PHP_EOL.$this->field('_csrf_token', 'hidden', ['value' => $this->model->_csrf_token]);
         }
         return $form;
     }
@@ -97,7 +97,7 @@ 
     {
         if ($this->model === null) {
             if (App::$Debug)
-                App::$Debug->addMessage('Form model is not defined for field name: [' . strip_tags($object) . ']');
+                App::$Debug->addMessage('Form model is not defined for field name: ['.strip_tags($object).']');
 
             return null;
         }
@@ -110,7 +110,7 @@ 
         // check if model contains current tag name as property
         if (!property_exists($this->model, $propertyName)) {
             if (App::$Debug)
-                App::$Debug->addMessage('Form field ["' . $object . '"] is not defined in model: [' . get_class($this->model) . ']', 'error');
+                App::$Debug->addMessage('Form field ["'.$object.'"] is not defined in model: ['.get_class($this->model).']', 'error');
 
             return null;
         }
@@ -131,13 +131,13 @@ 
         }
         
         // prepare labels text and label "for" attr 
-        $labelFor = $this->name . '-' . $propertyName;
+        $labelFor = $this->name.'-'.$propertyName;
         $labelText = $this->model->getLabel($object);
         $itemValue = $this->model->{$propertyName};
         // sounds like a dot-separated $object
         if ($propertyName !== $object) {
             $nesting = trim(strstr($object, '.'), '.');
-            $labelFor .= '-' . Str::replace('.', '-', $nesting);
+            $labelFor .= '-'.Str::replace('.', '-', $nesting);
             $itemValue = Arr::getByPath($nesting, $itemValue);
         }
 
@@ -178,7 +178,7 @@ 
     public function submitButton($title, array $property = [])
     {
         $property['type'] = 'submit';
-        $property['name'] = $this->name . '[submit]';
+        $property['name'] = $this->name.'[submit]';
         $property['value'] = $title;
         return self::buildSingleTag('input', $property);
     }
@@ -192,10 +192,10 @@ 
     {
         // pre-validate form fields based on model rules and jquery.validation
         if ($validate) {
-            App::$Alias->addPlainCode('js', '$().ready(function() { $("#' . $this->name . '").validate(); });');
+            App::$Alias->addPlainCode('js', '$().ready(function() { $("#'.$this->name.'").validate(); });');
             App::$Alias->setCustomLibrary('js', '/vendor/bower/jquery-validation/dist/jquery.validate.min.js');
             if (App::$Request->getLanguage() !== 'en') {
-                $localeFile = '/vendor/bower/jquery-validation/src/localization/messages_' . App::$Request->getLanguage() . '.js';
+                $localeFile = '/vendor/bower/jquery-validation/src/localization/messages_'.App::$Request->getLanguage().'.js';
                 if (File::exist($localeFile)) {
                     App::$Alias->setCustomLibrary('js', $localeFile);
                 }
@@ -206,7 +206,7 @@ 
                 $formName = $this->model->getFormName();
                 if (Any::isArray($badAttr) && count($badAttr) > 0) {
                     foreach ($badAttr as $attr) {
-                        $itemId = $formName . '-' . $attr;
+                        $itemId = $formName.'-'.$attr;
                         try {
                             $render = App::$View->render(static::$structLayer['jsnotify'], ['itemId' => $itemId]);
                             App::$Alias->addPlainCode('js', $render);

Braces +24 added lines, -16 removed lines

@@ -46,8 +46,9 @@ 
     public function __construct($model, array $property = null, array $layerFiles = null)
     {
         // prevent white-screen locks when model is not passed or passed wrong
-        if (!$model instanceof Model)
-            throw new SyntaxException('Bad model type passed in form builder. Check for init: new Form()');
+        if (!$model instanceof Model) {
+                    throw new SyntaxException('Bad model type passed in form builder. Check for init: new Form()');
+        }
 
         $this->model = $model;
         $this->name = $model->getFormName();
@@ -55,8 +56,9 @@ 
         // check if passed custom layer file
         if (Any::isArray($layerFiles) && count($layerFiles) > 0) {
             foreach (array_keys(static::$structLayer) as $type) {
-                if (isset($layerFiles[$type]) && Any::isStr($layerFiles[$type]))
-                    static::$structLayer[$type] = $layerFiles[$type];
+                if (isset($layerFiles[$type]) && Any::isStr($layerFiles[$type])) {
+                                    static::$structLayer[$type] = $layerFiles[$type];
+                }
             }
         }
         // set model submit method
@@ -64,8 +66,9 @@ 
 
         $property['id'] = $this->name; // define form id
         // if action is not defined - define it
-        if (!$property['action'])
-            $property['action'] = App::$Request->getFullUrl();
+        if (!$property['action']) {
+                    $property['action'] = App::$Request->getFullUrl();
+        }
 
         // set property global for this form
         $this->formProperty = $property;
@@ -96,21 +99,24 @@ 
     public function field(string $object, string $type, ?array $property = null, ?string $helper = null, ?string $layerFile = null)
     {
         if ($this->model === null) {
-            if (App::$Debug)
-                App::$Debug->addMessage('Form model is not defined for field name: [' . strip_tags($object) . ']');
+            if (App::$Debug) {
+                            App::$Debug->addMessage('Form model is not defined for field name: [' . strip_tags($object) . ']');
+            }
 
             return null;
         }
 
         // can be dots separated object
         $propertyName = $object;
-        if (Str::contains('.', $propertyName))
-            $propertyName = strstr($propertyName, '.', true);
+        if (Str::contains('.', $propertyName)) {
+                    $propertyName = strstr($propertyName, '.', true);
+        }
 
         // check if model contains current tag name as property
         if (!property_exists($this->model, $propertyName)) {
-            if (App::$Debug)
-                App::$Debug->addMessage('Form field ["' . $object . '"] is not defined in model: [' . get_class($this->model) . ']', 'error');
+            if (App::$Debug) {
+                            App::$Debug->addMessage('Form field ["' . $object . '"] is not defined in model: [' . get_class($this->model) . ']', 'error');
+            }
 
             return null;
         }
@@ -159,8 +165,9 @@ 
                 'help' => self::nohtml($helper)
             ]);
         } catch (SyntaxException $e) {
-            if (App::$Debug)
-                App::$Debug->addException($e);
+            if (App::$Debug) {
+                            App::$Debug->addException($e);
+            }
 
             $response = null;
         }
@@ -211,8 +218,9 @@ 
                             $render = App::$View->render(static::$structLayer['jsnotify'], ['itemId' => $itemId]);
                             App::$Alias->addPlainCode('js', $render);
                         } catch (SyntaxException $e) {
-                            if (App::$Debug)
-                                App::$Debug->addException($e);
+                            if (App::$Debug) {
+                                                            App::$Debug->addException($e);
+                            }
                         }
                     }
                 }

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

Doc Comments +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
     }
 
     /**
-     * @param string|array $name
+     * @param string $name
      * @param string|array|null $value
      * @param array|null $properties
      * @return null|string

Unused Use Statements -2 removed lines

@@ -4,9 +4,7 @@
 
 use Ffcms\Core\App;
 use Ffcms\Core\Arch\Model;
-use Ffcms\Core\Exception\SyntaxException;
 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

@@ -107,7 +107,7 @@ 
                 break;
             default:
                 if (App::$Debug)
-                    App::$Debug->addMessage('Field has unknown type: ' . App::$Security->strip_tags($name));
+                    App::$Debug->addMessage('Field has unknown type: '.App::$Security->strip_tags($name));
         }
 
         return $builder->make();
@@ -157,12 +157,12 @@ 
         if (Str::contains('.', $name)) {
             $splitedName = explode('.', $name);
             foreach ($splitedName as $nameKey) {
-                $properties['name'] .= '[' . $nameKey . ']';
-                $properties['id'] .= '-' . $nameKey;
+                $properties['name'] .= '['.$nameKey.']';
+                $properties['id'] .= '-'.$nameKey;
             }
         } else { // standard property definition - add field name
-            $properties['name'] .= '[' . $name . ']';
-            $properties['id'] .= '-' . $name;
+            $properties['name'] .= '['.$name.']';
+            $properties['id'] .= '-'.$name;
         }
     }
 }
\ No newline at end of file

Braces +9 added lines, -6 removed lines

@@ -56,8 +56,9 @@ 
     public function makeTag($name, $value = null, ?array $properties = null): ?string
     {
         // check if properties is passed well
-        if ($properties !== null && !Any::isArray($properties))
-            return null;
+        if ($properties !== null && !Any::isArray($properties)) {
+                    return null;
+        }
         
         // add properties to autovalidation by js (properties passed by ref)
         $this->addValidationProperties($name, $properties);
@@ -106,8 +107,9 @@ 
                 $builder = new RadioField($properties, $name, $value);
                 break;
             default:
-                if (App::$Debug)
-                    App::$Debug->addMessage('Field has unknown type: ' . App::$Security->strip_tags($name));
+                if (App::$Debug) {
+                                    App::$Debug->addMessage('Field has unknown type: ' . App::$Security->strip_tags($name));
+                }
         }
 
         return $builder->make();
@@ -150,8 +152,9 @@ 
     {
         // standard property data definition
         $properties['name'] = $properties['id'] = $this->formName; // form global name
-        if ($value !== null && !Any::isEmpty($value))
-            $properties['value'] = $value;
+        if ($value !== null && !Any::isEmpty($value)) {
+                    $properties['value'] = $value;
+        }
         
         // sounds like a array-path based obj name
         if (Str::contains('.', $name)) {

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

Unused Use Statements -1 removed lines

@@ -6,7 +6,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 MultiCheckboxField. Make multiple checkboxes form field

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
         // check if options is defined
         $options = $this->properties['options'];
         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']);
         
@@ -64,7 +64,7 @@ 
             $this->properties['value'] = $opt;
             // apply structured checkboxes style for each item
             $build .= App::$View->render('native/form/multi_checkboxes_list', [
-                'item' => self::buildSingleTag('input', $this->properties) . self::nohtml($opt)
+                'item' => self::buildSingleTag('input', $this->properties).self::nohtml($opt)
             ]);
         }
         

Braces +3 added lines, -2 removed lines

@@ -42,8 +42,9 @@
     {
         // check if options is defined
         $options = $this->properties['options'];
-        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']);