phpffcms / ffcms-core

src/App.php

Unused Use Statements -4 removed lines

@@ -6,16 +6,12 @@
 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\Mailer;
 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/Traits/ModelValidator.php

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
 use Ffcms\Core\Exception\SyntaxException;
 use Ffcms\Core\Helper\ModelFilters;
 use Ffcms\Core\Helper\Type\Any;
-use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
 
 /**

Spacing +4 added lines, -4 removed lines

@@ -137,7 +137,7 @@ 
                     } elseif (method_exists($class, $obj)) { // maybe its a function?
                         $class = $class::$obj; // call function
                     } else {
-                        throw new SyntaxException('Filter callback execution failed: ' . $filterName);
+                        throw new SyntaxException('Filter callback execution failed: '.$filterName);
                     }
                 }
             }
@@ -146,7 +146,7 @@ 
             if (method_exists($class, $method)) {
                 $check = @$class::$method($fieldValue, $filterArgs);
             } else {
-                throw new SyntaxException('Filter callback execution failed: ' . $filterName);
+                throw new SyntaxException('Filter callback execution failed: '.$filterName);
             }
         } elseif (method_exists('Ffcms\Core\Helper\ModelFilters', $filterName)) { // only full namespace\class path based :(
             if ($filterArgs != null) {
@@ -155,14 +155,14 @@ 
                 $check = ModelFilters::$filterName($fieldValue);
             }
         } else {
-            throw new SyntaxException('Filter "' . $filterName . '" is not exist');
+            throw new SyntaxException('Filter "'.$filterName.'" is not exist');
         }
 
         // 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');
+                App::$Debug->addMessage('Validation failed. Property: '.$propertyName.', filter: '.$filterName, 'warning');
         } else {
             $field_set_name = $propertyName;
             // prevent array-type setting

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 ($response !== null && !array_key_exists($path, $response))
-                    return null;
+                if ($response !== null && !array_key_exists($path, $response)) {
+                                    return null;
+                }
                 // find deep array nesting offset
                 $response = $response[$path];
             }

src/Helper/Mailer.php

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
     {
         try {
             $this->message = App::$View->render($tpl, $params, $dir);
-        } catch (SyntaxException $e){}
+        } catch (SyntaxException $e) {}
         return $this;
     }
 
@@ -80,7 +80,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');
             }
             return false;
         }

Braces +6 added lines, -4 removed lines

@@ -63,12 +63,14 @@
     public function send(string $address, string $subject, ?string $message = null): bool
     {
         // 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))