phpffcms / ffcms-core

src/Ffcms/Core/App.php

Unused Use Statements -3 removed lines

@@ -6,11 +6,8 @@
 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\Obj;

Spacing +8 added lines, -8 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))

Braces +23 added lines, -15 removed lines

@@ -192,20 +192,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 +216,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,17 +235,20 @@ 
             $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();
         } catch (\Exception $e) {
             // check if exception is system-based throw
-            if ($e instanceof TemplateException)
-                $html = $e->display();
-            else // or hook exception to system based :)))
+            if ($e instanceof TemplateException) {
+                            $html = $e->display();
+            } else {
+                // or hook exception to system based :)))
                 $html = (new NativeException($e->getMessage()))->display();
+            }
         }
 
         // set full rendered content to response builder

src/Ffcms/Core/Exception/TemplateException.php

Braces +3 added lines, -2 removed lines

@@ -36,8 +36,9 @@
         }
         
         // add notification in debug bar if exist
-        if (App::$Debug !== null)
-            App::$Debug->addException($this);
+        if (App::$Debug !== null) {
+                    App::$Debug->addException($this);
+        }
 
         // return rendered result
         return $this->buildFakePage();

src/Ffcms/Core/Network/Request.php

Spacing +10 added lines, -10 removed lines

@@ -60,11 +60,11 @@ 
 
         $basePath = trim(App::$Properties->get('basePath'), '/');
         if ($basePath !== null && Str::length($basePath) > 0) {
-            $basePath = '/' . $basePath;
+            $basePath = '/'.$basePath;
         }
 
         if (!defined('env_no_uri') || env_no_uri === false) {
-            $basePath .= '/' . strtolower(env_name);
+            $basePath .= '/'.strtolower(env_name);
         }
 
         // we never try to use path's without friendly url's
@@ -90,7 +90,7 @@ 
             } else {
                 // try to find language in pathway
                 foreach (App::$Properties->get('languages') as $lang) {
-                    if (Str::startsWith('/' . $lang, $this->getPathInfo())) {
+                    if (Str::startsWith('/'.$lang, $this->getPathInfo())) {
                         $this->language = $lang;
                         $this->languageInPath = true;
                     }
@@ -117,11 +117,11 @@ 
                     // parse query string
                     $queryString = null;
                     if (count($this->query->all()) > 0) {
-                        $queryString = '?' . http_build_query($this->query->all());
+                        $queryString = '?'.http_build_query($this->query->all());
                     }
 
                     // build response with redirect to language-based path
-                    $response = new Redirect($this->getSchemeAndHttpHost() . $this->basePath . '/' . $userLang . $this->getPathInfo() . $queryString);
+                    $response = new Redirect($this->getSchemeAndHttpHost().$this->basePath.'/'.$userLang.$this->getPathInfo().$queryString);
                     $response->send();
                     exit();
                 }
@@ -180,7 +180,7 @@ 
         if (array_key_exists($pathway, $routing['Redirect'])) {
             $target = $this->getSchemeAndHttpHost(); // . $this->getBasePath() . '/' . rtrim($routing['Redirect'][$pathway], '/');
             if ($this->getBasePath() !== null && !Str::likeEmpty($this->getBasePath())) {
-                $target .= '/' . $this->getBasePath();
+                $target .= '/'.$this->getBasePath();
             }
             $target .= rtrim($routing['Redirect'][$pathway], '/');
             $redirect = new Redirect($target);
@@ -206,9 +206,9 @@ 
             // find "new path" as binding uri slug
             $binding = array_search($pathway, $map, true);
             // build url to redirection
-            $url = $this->getSchemeAndHttpHost() . $this->getBasePath() . '/';
+            $url = $this->getSchemeAndHttpHost().$this->getBasePath().'/';
             if (App::$Properties->get('multiLanguage')) {
-                $url .= $this->language . '/';
+                $url .= $this->language.'/';
             }
             $url .= ltrim($binding, '/');
 
@@ -302,7 +302,7 @@ 
     {
         $route = $this->languageInPath ? Str::sub(parent::getPathInfo(), Str::length($this->language) + 1) : parent::getPathInfo();
         if (!Str::startsWith('/', $route))
-            $route = '/' . $route;
+            $route = '/'.$route;
         return $route;
     }
 
@@ -466,7 +466,7 @@ 
      */
     public function getFullUrl(): string
     {
-        return $this->getSchemeAndHttpHost() . $this->getRequestUri();
+        return $this->getSchemeAndHttpHost().$this->getRequestUri();
     }
 
     /**

Braces +6 added lines, -4 removed lines

@@ -301,8 +301,9 @@ 
     public function getPathInfo()
     {
         $route = $this->languageInPath ? Str::sub(parent::getPathInfo(), Str::length($this->language) + 1) : parent::getPathInfo();
-        if (!Str::startsWith('/', $route))
-            $route = '/' . $route;
+        if (!Str::startsWith('/', $route)) {
+                    $route = '/' . $route;
+        }
         return $route;
     }
 
@@ -445,8 +446,9 @@ 
     public function getPathWithoutControllerAction(): ?string
     {
         $path = trim($this->getPathInfo(), '/');
-        if ($this->aliasPathTarget !== null)
-            $path = trim($this->aliasPathTarget, '/');
+        if ($this->aliasPathTarget !== null) {
+                    $path = trim($this->aliasPathTarget, '/');
+        }
 
         $pathArray = explode('/', $path);
         if ($pathArray[0] === Str::lowerCase($this->getController())) {