phpffcms / ffcms-core

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

Unused Use Statements -5 removed lines

@@ -4,16 +4,11 @@
 
 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\Form\FieldSelector;
 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 Form. Simple HTML model generator for fast form building.

Spacing +6 added lines, -6 removed lines

@@ -86,7 +86,7 @@ 
     {
         $form = self::buildSingleTag('form', $this->formProperty, false);
         if ($this->model->_tokenRequired)
-            $form .= PHP_EOL . $this->field->hidden('_csrf_token', ['value' => $this->model->_csrf_token]);
+            $form .= PHP_EOL.$this->field->hidden('_csrf_token', ['value' => $this->model->_csrf_token]);
 
         return $form;
     }
@@ -106,7 +106,7 @@ 
         $response = null;
         try {
             $response = $this->field->{$type}($object, $property, $helper, $layerFile);
-        } catch (\Exception $e){}
+        } catch (\Exception $e) {}
         return $response;
     }
 
@@ -119,7 +119,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);
     }
@@ -133,10 +133,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);
                 }
@@ -147,7 +147,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 +15 added lines, -10 removed lines

@@ -50,8 +50,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();
@@ -59,8 +60,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];
+                }
             }
         }
         // initialize field selector helper
@@ -71,8 +73,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;
@@ -85,8 +88,9 @@ 
     public function start()
     {
         $form = self::buildSingleTag('form', $this->formProperty, false);
-        if ($this->model->_tokenRequired)
-            $form .= PHP_EOL . $this->field->hidden('_csrf_token', ['value' => $this->model->_csrf_token]);
+        if ($this->model->_tokenRequired) {
+                    $form .= PHP_EOL . $this->field->hidden('_csrf_token', ['value' => $this->model->_csrf_token]);
+        }
 
         return $form;
     }
@@ -152,8 +156,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/Mailer.php

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
     {
         try {
             $this->message = App::$View->render($tpl, $params, $dir);
-        } catch (SyntaxException $e){}
+        } catch (SyntaxException $e) {}
         return $this;
     }
 
@@ -73,7 +73,7 @@ 
         } catch (\Exception $e) {
             if (App::$Debug) {
                 App::$Debug->addException($e);
-                App::$Debug->addMessage('Send mail failed! Info: ' . $e->getMessage(), 'error');
+                App::$Debug->addMessage('Send mail failed! Info: '.$e->getMessage(), 'error');
             }
         }
     }

Braces +6 added lines, -4 removed lines

@@ -57,12 +57,14 @@
     public function send(string $to, string $subject, ?string $message = null)
     {
         // try to get message from global if not passed direct
-        if ($message === null)
-            $message = $this->message;
+        if ($message === null) {
+                    $message = $this->message;
+        }
 
         try {
-            if ($message === null)
-                throw new \Exception('Message body is empty!');
+            if ($message === null) {
+                            throw new \Exception('Message body is empty!');
+            }
 
             // try to build message and send it
             $message = (new \Swift_Message($subject))

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

Spacing +3 added lines, -3 removed lines

@@ -77,7 +77,7 @@ 
         // check if model has attribute
         if (!property_exists($this->model, $rootName)) {
             if (App::$Debug)
-                App::$Debug->addMessage('Field "' . $name . '" (' . $field . ') is not defined in model: [' . get_class($this->model) . ']', 'error');
+                App::$Debug->addMessage('Field "'.$name.'" ('.$field.') is not defined in model: ['.get_class($this->model).']', 'error');
 
             return null;
         }
@@ -85,13 +85,13 @@ 
         // prepare default layer if not passed
         $layer = $this->findFieldLayer($field, $layer);
         // prepare html attributes, object value
-        $attr = $this->model->getFormName() . '-' . $rootName;
+        $attr = $this->model->getFormName().'-'.$rootName;
         $label = $this->model->getLabel($name);
         $value = $this->model->{$rootName};
         // check if dot-nested array used and update attr name
         if ($rootName !== $name) {
             $nesting = trim(strstr($name, '.'), '.');
-            $attr .= '-' . Str::replace('.', '-', $nesting);
+            $attr .= '-'.Str::replace('.', '-', $nesting);
             $value = Arr::getByPath($nesting, $value);
         }
 

Braces +27 added lines, -18 removed lines

@@ -52,32 +52,38 @@ 
      */
     public function __call(string $field, ?array $arguments = null): ?string
     {
-        if ($arguments === null || count($arguments) < 1)
-            return null;
+        if ($arguments === null || count($arguments) < 1) {
+                    return null;
+        }
 
         // get named arguments from passed array
         $name = (string)$arguments[0];
         $rootName = $name;
         // set root element name if array dot-nested notation found
-        if (Str::contains('.', $name))
-            $rootName = strstr($rootName, '.', true);
+        if (Str::contains('.', $name)) {
+                    $rootName = strstr($rootName, '.', true);
+        }
         // define properties, helper and layer
         $properties = null;
         $helper = null;
         $layer = null;
-        if (isset($arguments[1]))
-            $properties = (array)$arguments[1];
+        if (isset($arguments[1])) {
+                    $properties = (array)$arguments[1];
+        }
 
-        if (isset($arguments[2]))
-            $helper = (string)$arguments[2];
+        if (isset($arguments[2])) {
+                    $helper = (string)$arguments[2];
+        }
 
-        if (isset($arguments[3]))
-            $layer = (string)$arguments[3];
+        if (isset($arguments[3])) {
+                    $layer = (string)$arguments[3];
+        }
 
         // check if model has attribute
         if (!property_exists($this->model, $rootName)) {
-            if (App::$Debug)
-                App::$Debug->addMessage('Field "' . $name . '" (' . $field . ') is not defined in model: [' . get_class($this->model) . ']', 'error');
+            if (App::$Debug) {
+                            App::$Debug->addMessage('Field "' . $name . '" (' . $field . ') is not defined in model: [' . get_class($this->model) . ']', 'error');
+            }
 
             return null;
         }
@@ -100,8 +106,9 @@ 
         $elementDOM = $constructor->makeTag($name, $value, $properties);
 
         // if item is hidden - return tag without assign of global template
-        if ($field === 'hidden')
-            return $elementDOM;
+        if ($field === 'hidden') {
+                    return $elementDOM;
+        }
 
         // prepare output html
         try {
@@ -112,8 +119,9 @@ 
                 'help' => self::nohtml($helper)
             ]);
         } catch (SyntaxException $e) {
-            if (App::$Debug)
-                App::$Debug->addException($e);
+            if (App::$Debug) {
+                            App::$Debug->addException($e);
+            }
             return null;
         }
     }
@@ -126,8 +134,9 @@ 
      */
     private function findFieldLayer(?string $type = null, ?string $layer = null): ?string
     {
-        if ($layer !== null)
-            return $layer;
+        if ($layer !== null) {
+                    return $layer;
+        }
 
         switch ($type) {
             case 'checkbox':

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

Braces +3 added lines, -2 removed lines

@@ -30,8 +30,9 @@
      */
     public function make()
     {
-        if (isset($this->properties['value']))
-            unset($this->properties['value']);
+        if (isset($this->properties['value'])) {
+                    unset($this->properties['value']);
+        }
 
         $this->properties['type'] = 'password';
         

src/Ffcms/Core/Traits/ModelValidator.php

Braces +30 added lines, -20 removed lines

@@ -41,8 +41,9 @@ 
             // if request is submited for this model - try to validate input data
             if ($this->send()) {
                 // token is wrong - update bool state
-                if ($currentToken !== $this->getRequest('_csrf_token'))
-                    $this->_tokenOk = false;
+                if ($currentToken !== $this->getRequest('_csrf_token')) {
+                                    $this->_tokenOk = false;
+                }
             }
             // set token data to display
             $this->_csrf_token = $newToken;
@@ -58,21 +59,24 @@ 
     public function runValidate(array $rules = null)
     {
         // skip validation on empty rules
-        if ($rules === null)
-            return true;
+        if ($rules === null) {
+                    return true;
+        }
 
         $success = true;
         // list each rule as single one
         foreach ($rules as $rule) {
             // 0 = field (property) name, 1 = filter name, 2 = filter value
-            if ($rule[0] === null || $rule[1] === null)
-                continue;
+            if ($rule[0] === null || $rule[1] === null) {
+                            continue;
+            }
 
             $propertyName = $rule[0];
             $validationRule = $rule[1];
             $validationValue = null;
-            if (isset($rule[2]))
-                $validationValue = $rule[2];
+            if (isset($rule[2])) {
+                            $validationValue = $rule[2];
+            }
 
             // check if target field defined as array and make recursive validation
             if (Any::isArray($propertyName)) {
@@ -160,8 +164,9 @@ 
         // if one from all validation tests is fail - mark as incorrect attribute
         if ($check !== true) {
             $this->_badAttr[] = $propertyName;
-            if (App::$Debug)
-                App::$Debug->addMessage('Validation failed. Property: ' . $propertyName . ', filter: ' . $filterName, 'warning');
+            if (App::$Debug) {
+                            App::$Debug->addMessage('Validation failed. Property: ' . $propertyName . ', filter: ' . $filterName, 'warning');
+            }
         } else {
             $field_set_name = $propertyName;
             // prevent array-type setting
@@ -172,8 +177,9 @@ 
                 if ($propertyName !== $field_set_name) { // array-based property
                     $dot_path = trim(strstr($propertyName, '.'), '.');
                     // prevent throws any exceptions for null and false objects
-                    if (!Any::isArray($this->{$field_set_name}))
-                        $this->{$field_set_name} = [];
+                    if (!Any::isArray($this->{$field_set_name})) {
+                                            $this->{$field_set_name} = [];
+                    }
 
                     // use dot-data provider to compile output array
                     $dotData = new DotData($this->{$field_set_name});
@@ -203,14 +209,16 @@ 
         $sources = $this->sources();
         $types = $this->types();
         // validate sources for current field
-        if (array_key_exists($propertyName, $sources))
-            $inputType = Str::lowerCase($sources[$propertyName]);
+        if (array_key_exists($propertyName, $sources)) {
+                    $inputType = Str::lowerCase($sources[$propertyName]);
+        }
 
 
         // check if field is array-nested element by dots and use first element as general
         $filterField = $propertyName;
-        if (array_key_exists($filterField, $types))
-            $filterType = Str::lowerCase($types[$filterField]);
+        if (array_key_exists($filterField, $types)) {
+                    $filterType = Str::lowerCase($types[$filterField]);
+        }
 
         // get clear field value
         $propertyValue = $this->getRequest($propertyName, $inputType);
@@ -312,8 +320,9 @@ 
      */
     public function getRequest($param, $method = null)
     {
-        if ($method === null)
-            $method = $this->_sendMethod;
+        if ($method === null) {
+                    $method = $this->_sendMethod;
+        }
 
         $method = Str::lowerCase($method);
         // get root request as array or string
@@ -337,8 +346,9 @@ 
         if (Str::contains('.', $param)) {
             $response = $request;
             foreach (explode('.', $param) as $path) {
-                if (!array_key_exists($path, $response))
-                    return null;
+                if (!array_key_exists($path, $response)) {
+                                    return null;
+                }
                 // find deep array nesting offset
                 $response = $response[$path];
             }