phpffcms / ffcms-core

src/Helper/Security.php

Doc Comments +2 added lines, -2 removed lines

@@ -46,7 +46,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)
     {
@@ -87,7 +87,7 @@ 
      * @deprecated
      * @param $var
      * @param null $indent
-     * @return mixed|string
+     * @return string|null
      */
     public function var_export54($var, $indent = null, $guessTypes = false)
     {

src/Arch/Controller.php

Spacing +4 added lines, -4 removed lines

@@ -71,9 +71,9 @@ 
         } else {
             $this->startMeasure(__METHOD__);
 
-            $layoutPath = App::$Alias->currentViewPath . '/layout/' . $this->layout . '.php';
+            $layoutPath = App::$Alias->currentViewPath.'/layout/'.$this->layout.'.php';
             if (!File::exist($layoutPath)) {
-                throw new NativeException('Layout not founded: ' . $layoutPath);
+                throw new NativeException('Layout not founded: '.$layoutPath);
             }
 
             $body = $this->output;
@@ -92,7 +92,7 @@ 
             // set custom css library's not included on static call
             $cssIncludeCode = App::$View->showCodeLink('css');
             if (!Str::likeEmpty($cssIncludeCode)) {
-                $content = Str::replace('</head>', $cssIncludeCode . '</head>', $content);
+                $content = Str::replace('</head>', $cssIncludeCode.'</head>', $content);
             }
 
 
@@ -102,7 +102,7 @@ 
             if (App::$Debug) {
                 $content = Str::replace(
                     ['</body>', '</head>'],
-                    [App::$Debug->renderOut() . '</body>', App::$Debug->renderHead() . '</head>'],
+                    [App::$Debug->renderOut().'</body>', App::$Debug->renderHead().'</head>'],
                     $content
                 );
             }

src/Arch/View.php

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
@@ -106,7 +106,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
@@ -135,7 +135,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
@@ -151,14 +151,14 @@ 
 
             // 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
@@ -168,11 +168,11 @@ 
 
         // 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;
@@ -180,7 +180,7 @@ 
         }
 
         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;
@@ -276,7 +276,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;
         }
@@ -285,9 +285,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";
             }
         }
 
@@ -310,7 +310,7 @@ 
 
         $code = null;
         foreach (App::$Alias->getPlainCode($type) as $row) {
-            $code .= $row . "\n";
+            $code .= $row."\n";
         }
 
         return $code;

src/Traits/ModelValidator.php

Spacing +4 added lines, -4 removed lines

@@ -139,7 +139,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);
                     }
                 }
             }
@@ -148,7 +148,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) {
@@ -157,14 +157,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;

src/Properties.php

Spacing +5 added lines, -5 removed lines

@@ -42,9 +42,9 @@ 
         }
 
         // try to load from file
-        $configFile = ucfirst(Str::lowerCase($configName)) . '.php';
-        if (File::exist('/Private/Config/' . $configFile)) {
-            $this->data[$configName] = File::inc('/Private/Config/' . $configFile, true);
+        $configFile = ucfirst(Str::lowerCase($configName)).'.php';
+        if (File::exist('/Private/Config/'.$configFile)) {
+            $this->data[$configName] = File::inc('/Private/Config/'.$configFile, true);
             return true;
         }
 
@@ -137,12 +137,12 @@ 
      */
     public function writeConfig(string $configFile, array $data): bool
     {
-        $path = '/Private/Config/' . ucfirst(Str::lowerCase($configFile)) . '.php';
+        $path = '/Private/Config/'.ucfirst(Str::lowerCase($configFile)).'.php';
         if (!File::exist($path) || !File::writable($path)) {
             return false;
         }
 
-        $saveData = '<?php return ' . Arr::exportVar($data) . ';';
+        $saveData = '<?php return '.Arr::exportVar($data).';';
         File::write($path, $saveData);
         // overload config values if changed
         $this->load($configFile, true);

src/I18n/Translate.php

Spacing +4 added lines, -4 removed lines

@@ -55,7 +55,7 @@ 
 
         if (Any::isArray($params) && count($params) > 0) {
             foreach ($params as $var => $value) {
-                $text = Str::replace('%' . $var . '%', $value, $text);
+                $text = Str::replace('%'.$var.'%', $value, $text);
             }
         }
         return $text;
@@ -70,7 +70,7 @@ 
     public function translate(string $text, array $params = null)
     {
         $index = null;
-        $namespace = 'Apps\Controller\\' . env_name . '\\';
+        $namespace = 'Apps\Controller\\'.env_name.'\\';
         foreach (@debug_backtrace() as $caller) {
             if (isset($caller['class']) && Str::startsWith($namespace, $caller['class'])) {
                 $index = Str::sub((string)$caller['class'], Str::length($namespace));
@@ -86,7 +86,7 @@ 
      */
     protected function load(string $index): ?array
     {
-        $file = root . '/I18n/' . env_name . '/' . App::$Request->getLanguage() . '/' . $index . '.php';
+        $file = root.'/I18n/'.env_name.'/'.App::$Request->getLanguage().'/'.$index.'.php';
         if (!File::exist($file)) {
             return [];
         }
@@ -125,7 +125,7 @@ 
     public function getAvailableLangs(): array
     {
         $langs = ['en'];
-        $scan = Directory::scan(root . '/I18n/' . env_name . '/', GLOB_ONLYDIR, true);
+        $scan = Directory::scan(root.'/I18n/'.env_name.'/', GLOB_ONLYDIR, true);
         foreach ($scan as $row) {
             $langs[] = trim($row, '/');
         }

src/App.php

Spacing +9 added lines, -9 removed lines

@@ -187,24 +187,24 @@ 
         $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();
@@ -231,10 +231,10 @@ 
                 ]));
             }
 
-            $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)) {
@@ -249,7 +249,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();

src/Network/Response.php

Spacing +2 added lines, -2 removed lines

@@ -22,10 +22,10 @@
     {
         $to = trim($to, '/');
         if (false === $full && !Str::startsWith(App::$Alias->baseUrl, $to)) {
-            $to = App::$Alias->baseUrl . '/' . $to;
+            $to = App::$Alias->baseUrl.'/'.$to;
         }
         $redirect = new FoundationRedirect($to);
         $redirect->send();
-        exit('Redirecting to ' . $to . ' ...');
+        exit('Redirecting to '.$to.' ...');
     }
 }

src/Network/Request.php

Spacing +10 added lines, -10 removed lines

@@ -61,11 +61,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
@@ -91,7 +91,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;
                     }
@@ -118,11 +118,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();
                 }
@@ -181,7 +181,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);
@@ -207,9 +207,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, '/');
 
@@ -306,7 +306,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;
     }
@@ -472,7 +472,7 @@ 
      */
     public function getFullUrl(): string
     {
-        return $this->getSchemeAndHttpHost() . $this->getRequestUri();
+        return $this->getSchemeAndHttpHost().$this->getRequestUri();
     }
 
     /**