phpffcms / ffcms-core

src/Ffcms/Core/Arch/Model.php

Doc Comments +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
     /**
      * Get label value by variable name
      * @param string $param
-     * @return mixed
+     * @return string
      */
     final public function getLabel($param)
     {
@@ -72,7 +72,7 @@ 
 
     /**
      * Set attribute labels for model variables
-     * @return array
+     * @return string
      */
     public function labels()
     {

src/Ffcms/Core/Arch/View.php

Doc Comments +1 added lines, -1 removed lines

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

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use Ffcms\Core\App;
 use Ffcms\Core\Exception\NativeException;
-use Ffcms\Core\Exception\NotFoundException;
 use Ffcms\Core\Exception\SyntaxException;
 use Ffcms\Core\Helper\FileSystem\Directory;
 use Ffcms\Core\Helper\FileSystem\File;

Spacing +16 added lines, -16 removed lines

@@ -44,16 +44,16 @@ 
     {
         // 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
@@ -96,7 +96,7 @@ 
         
         // path still not defined?
         if ($path === null) {
-            throw new SyntaxException('Viewer is not founded: ' . App::$Security->strip_tags($path));
+            throw new SyntaxException('Viewer is not founded: '.App::$Security->strip_tags($path));
         }
 
         // cleanup from slashes on start/end
@@ -125,7 +125,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
@@ -141,14 +141,14 @@ 
 
             // depended controller is not founded? Let finish
             if ($calledController === null) {
-                throw new NativeException('View render is failed: callback controller not founded! Call with relative path: ' . $path);
+                throw new NativeException('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
@@ -158,18 +158,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 !== null) {
-                    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 !== null) {
-            App::$Debug->addMessage('Viewer not founded on rendering: ' . $path, 'warning');
+            App::$Debug->addMessage('Viewer not founded on rendering: '.$path, 'warning');
         }
 
         return null;
@@ -264,7 +264,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;
         }
@@ -273,9 +273,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";
             }
         }
 
@@ -298,7 +298,7 @@ 
 
         $code = null;
         foreach (App::$Alias->getPlainCode($type) as $row) {
-            $code .= $row . "\n";
+            $code .= $row."\n";
         }
 
         return $code;

src/Ffcms/Core/Helper/Url.php

Doc Comments +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
      * @param string|null $add
      * @param array $params
      * @param bool $encode
-     * @return null|string
+     * @return string
      */
     public static function to($controller_action, $id = null, $add = null, array $params = null, $encode = true)
     {

Spacing +10 added lines, -10 removed lines

@@ -23,7 +23,7 @@ 
     public static function to($controller_action, $id = null, $add = null, array $params = null, $encode = true)
     {
         $pathway = self::buildPathway([$controller_action, $id, $add, $params], $encode);
-        return App::$Alias->baseUrl . '/' . $pathway;
+        return App::$Alias->baseUrl.'/'.$pathway;
     }
 
     /**
@@ -60,7 +60,7 @@ 
                 $controller = Str::lastIn($controller, '\\', true);
             }
 
-            $response = $controller . '/' . $action;
+            $response = $controller.'/'.$action;
         }
 
         // check if controller and action is defined
@@ -70,17 +70,17 @@ 
 
         // id is defined?
         if (isset($to[1]) && !Str::likeEmpty($to[1])) {
-            $response .= '/' . self::safeUri($to[1], $encode);
+            $response .= '/'.self::safeUri($to[1], $encode);
         }
 
         // add param is defined?
         if (isset($to[2]) && !Str::likeEmpty($to[2])) {
-            $response .= '/' . self::safeUri($to[2], $encode);
+            $response .= '/'.self::safeUri($to[2], $encode);
         }
 
         // try to find static alias
-        if (isset($routing['Alias'][env_name]) && Arr::in('/' . $response, $routing['Alias'][env_name])) {
-            $pathAlias = array_search('/' . $response, $routing['Alias'][env_name]);
+        if (isset($routing['Alias'][env_name]) && Arr::in('/'.$response, $routing['Alias'][env_name])) {
+            $pathAlias = array_search('/'.$response, $routing['Alias'][env_name]);
             if ($pathAlias !== false) {
                 $response = Str::lowerCase(trim($pathAlias, '/'));
             }
@@ -96,7 +96,7 @@ 
             }
             $queryString = http_build_query($to[3]);
             if (Str::length($queryString) > 0) {
-                $response .= '?' . http_build_query($to[3]);
+                $response .= '?'.http_build_query($to[3]);
             }
             if ($anchor !== false) {
                 $response .= $anchor;
@@ -118,7 +118,7 @@ 
     public static function buildPathwayFromRequest()
     {
         return self::buildPathway([
-            Str::lowerCase(App::$Request->getController()) . '/' . Str::lowerCase(App::$Request->getAction()),
+            Str::lowerCase(App::$Request->getController()).'/'.Str::lowerCase(App::$Request->getAction()),
             App::$Request->getID(),
             App::$Request->getAdd(),
             App::$Request->query->all()
@@ -140,9 +140,9 @@ 
             $to = [$to];
         }
         // call Url::to(args)
-        $callbackTo = call_user_func_array([__NAMESPACE__ . '\Url', 'to'], $to);
+        $callbackTo = call_user_func_array([__NAMESPACE__.'\Url', 'to'], $to);
 
-        return '<a href="' . $callbackTo . '"' . $compile_property . '>' . $name . '</a>';
+        return '<a href="'.$callbackTo.'"'.$compile_property.'>'.$name.'</a>';
     }
 
     /**

src/Ffcms/Core/Network/Request.php

Doc Comments +3 added lines, -3 removed lines

@@ -239,7 +239,7 @@ 
 
     /**
      * Get current $id argument for controller action
-     * @return string|null
+     * @return string
      */
     public function getID()
     {
@@ -248,7 +248,7 @@ 
 
     /**
      * Get current $add argument for controller action
-     * @return string|null
+     * @return string
      */
     public function getAdd()
     {
@@ -257,7 +257,7 @@ 
 
     /**
      * Get callback class alias if exist
-     * @return bool|string
+     * @return boolean
      */
     public function getCallbackAlias()
     {

Spacing +9 added lines, -9 removed lines

@@ -59,11 +59,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
@@ -89,7 +89,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;
                     }
@@ -116,11 +116,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();
                 }
@@ -178,9 +178,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, '/');
 
@@ -270,7 +270,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;
     }
@@ -380,7 +380,7 @@ 
      */
     public function getFullUrl()
     {
-        return $this->getSchemeAndHttpHost() . $this->getRequestUri();
+        return $this->getSchemeAndHttpHost().$this->getRequestUri();
     }
 
     /**

src/Ffcms/Core/Debug/Manager.php

Doc Comments +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 
     /**
      * Add exception into debug bar and stop execute
-     * @param $e
+     * @param \Ffcms\Core\Exception\TemplateException $e
      * @throws \DebugBar\DebugBarException
      */
     public function addException($e)

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

Doc Comments +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
     /**
      * Construct table based on passed elements as array: properties, thead, tbody, rows, items etc
      * @param array $elements
-     * @return null
+     * @return null|string
      */
     public static function display($elements)
     {

Spacing +14 added lines, -14 removed lines

@@ -40,24 +40,24 @@ 
         // init dom model
         $dom = new Dom();
         // draw response
-        $table = $dom->table(function () use ($dom, $elements, $selectOptions) {
+        $table = $dom->table(function() use ($dom, $elements, $selectOptions) {
             $res = null;
             // check if thead is defined
             if (isset($elements['thead']) && Obj::isArray($elements['thead']) && count($elements['thead']) > 0 && Obj::isArray($elements['thead']['titles'])) {
                 // add thead container
-                $res .= $dom->thead(function () use ($dom, $elements, $selectOptions) {
-                    return $dom->tr(function () use ($dom, $elements, $selectOptions) {
+                $res .= $dom->thead(function() use ($dom, $elements, $selectOptions) {
+                    return $dom->tr(function() use ($dom, $elements, $selectOptions) {
                         $tr = null;
                         foreach ($elements['thead']['titles'] as $order => $title) {
                             $th = htmlentities($title['text']);
                             // make global checkbox for selectable columns
                             if ($selectOptions !== false && $order + 1 === $selectOptions['attachOrder']) {
-                                $th = $dom->input(function () {
+                                $th = $dom->input(function() {
                                     return null;
-                                }, ['type' => 'checkbox', 'name' => 'selectAll']) . ' ' . $th;
+                                }, ['type' => 'checkbox', 'name' => 'selectAll']).' '.$th;
                             }
                             // build tr row collecting all th's
-                            $tr .= $dom->th(function () use ($th) {
+                            $tr .= $dom->th(function() use ($th) {
                                 return $th;
                             });
                         }
@@ -76,14 +76,14 @@ 
                         // sort td items inside row by key increment
                         ksort($row);
                         // add data in tr container
-                        $tr .= $dom->tr(function () use ($dom, $row, $selectOptions) {
+                        $tr .= $dom->tr(function() use ($dom, $row, $selectOptions) {
                             $td = null;
                             foreach ($row as $order => $item) {
                                 if (!Obj::isInt($order)) {
                                     continue;
                                 }
                                 // collect td item
-                                $td .= $dom->td(function () use ($dom, $order, $item, $selectOptions) {
+                                $td .= $dom->td(function() use ($dom, $order, $item, $selectOptions) {
                                     $text = null;
                                     // make text secure based on passed options
                                     if ($item['html'] === true) {
@@ -97,9 +97,9 @@ 
                                     }
                                     // check if selectable box is enabled and equal current order id
                                     if ($selectOptions !== false && $order === $selectOptions['attachOrder']) {
-                                        $text = $dom->input(function (){
+                                        $text = $dom->input(function() {
                                             return null;
-                                        }, Arr::merge($selectOptions['selector'], ['value' => htmlentities($text)])) . ' ' . $text;
+                                        }, Arr::merge($selectOptions['selector'], ['value' => htmlentities($text)])).' '.$text;
                                     }
                                     return $text;
                                 }, $item['property']);
@@ -122,14 +122,14 @@ 
             // build js code for "selectAll" checkbox
             self::buildSelectorHtml($selectOptions);
             // return response inside "form" tag
-            return $dom->form(function () use ($dom, $selectOptions, $table) {
+            return $dom->form(function() use ($dom, $selectOptions, $table) {
                 foreach ($selectOptions['buttons'] as $btn) {
                     if (!Obj::isArray($btn)) {
                         continue;
                     }
-                    $table .= $dom->input(function(){
+                    $table .= $dom->input(function() {
                         return null;
-                    }, $btn) . ' ';
+                    }, $btn).' ';
                 }
                 return $table;
             }, $selectOptions['form']);
@@ -145,7 +145,7 @@ 
     private static function buildSelectorHtml(array $opt)
     {
         $js = '$(function () {
-            var targetSwitchbox = $(\'input[name="' . $opt['selector']['name'] . '"]\');
+            var targetSwitchbox = $(\'input[name="' . $opt['selector']['name'].'"]\');
             $(\'input[name="selectAll"]\').change(function() {
                 $(targetSwitchbox).each(function () {
                     $(this).prop(\'checked\', !$(this).is(\':checked\'));

src/Ffcms/Core/Traits/ModelValidator.php

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 use Ffcms\Core\App;
 use Ffcms\Core\Exception\SyntaxException;
 use Dflydev\DotAccessData\Data as DotData;
-use Ffcms\Core\Helper\Type\Arr;
 use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
 use Ffcms\Core\Filter\Native;

Spacing +6 added lines, -6 removed lines

@@ -95,7 +95,7 @@ 
                     } elseif (method_exists($class, $obj)) { // maybe its a function?
                         $class = $class::$obj; // call function
                     } else {
-                        throw new SyntaxException('Filter callback execution failed: ' . $filter_name);
+                        throw new SyntaxException('Filter callback execution failed: '.$filter_name);
                     }
 
                 }
@@ -105,7 +105,7 @@ 
             if (method_exists($class, $method)) {
                 $check = @$class::$method($field_value, $filter_argv);
             } else {
-                throw new SyntaxException('Filter callback execution failed: ' . $filter_name);
+                throw new SyntaxException('Filter callback execution failed: '.$filter_name);
             }
         } elseif (method_exists('Ffcms\Core\Filter\Native', $filter_name)) { // only full namespace\class path based :(
             if ($filter_argv != null) {
@@ -114,7 +114,7 @@ 
                 $check = Native::$filter_name($field_value);
             }
         } else {
-            throw new SyntaxException('Filter "' . $filter_name . '" is not exist');
+            throw new SyntaxException('Filter "'.$filter_name.'" is not exist');
         }
         if ($check !== true) { // switch only on fail check.
             $this->_badAttr[] = $field_name;
@@ -169,7 +169,7 @@ 
         if ($inputType !== 'file') {
             if ($html !== true) {
                 $field_value = App::$Security->strip_tags($field_value);
-            } elseif($secure !== true) {
+            } elseif ($secure !== true) {
                 $field_value = App::$Security->secureHtml($field_value);
             }
         }
@@ -265,10 +265,10 @@ 
         $paramQuery = $this->getFormName();
         if (Str::contains('.', $param)) {
             foreach (explode('.', $param) as $item) {
-                $paramQuery .= '[' . $item . ']';
+                $paramQuery .= '['.$item.']';
             }
         } else {
-            $paramQuery .= '[' . $param . ']';
+            $paramQuery .= '['.$param.']';
         }
 
         // get request based on method and param query

src/Ffcms/Core/Helper/Text.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
                 $breakerPos = mb_strpos($text, '<br', null, 'UTF-8');
             } else {
                 // add length('</p>')
-                $breakerPos+= 4;
+                $breakerPos += 4;
             }
             // cut text from position caret before </p> (+4 symbols to save item as valid)
             if ($breakerPos !== false) {

src/Ffcms/Core/Helper/HTML/System/NativeGenerator.php

Doc Comments +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
      * @param string|null $add
      * @param array $params
      * @param bool $encode
-     * @return null|string
+     * @return string
      */
     public static function to($controller_action, $id = null, $add = null, array $params = null, $encode = true)
     {

Spacing +9 added lines, -9 removed lines

@@ -24,7 +24,7 @@ 
             $purifier = App::$Memory->get('object.purifier.helpers');
         } else {
             $config = \HTMLPurifier_Config::createDefault();
-            $config->set('Cache.SerializerPath', root . '/Private/Cache/HTMLPurifier/');
+            $config->set('Cache.SerializerPath', root.'/Private/Cache/HTMLPurifier/');
             $config->set('AutoFormat.AutoParagraph', false);
 
             // allow use target=_blank for links
@@ -64,9 +64,9 @@ 
         $build = null;
         foreach ($property as $p => $v) {
             if ($v === null || $v === false || $v === true) {
-                $build .= ' ' . self::nohtml($p);
+                $build .= ' '.self::nohtml($p);
             } else {
-                $build .= ' ' . self::nohtml($p) . '="' . self::nohtml($v) . '"';
+                $build .= ' '.self::nohtml($p).'="'.self::nohtml($v).'"';
             }
         }
         return $build;
@@ -80,7 +80,7 @@ 
      */
     public static function buildSingleTag($tagName, array $property = null)
     {
-        return '<' . self::nohtml($tagName) . self::applyProperty($property) . '/>';
+        return '<'.self::nohtml($tagName).self::applyProperty($property).'/>';
     }
 
     /**
@@ -98,7 +98,7 @@ 
             $value = self::nohtml($value);
         }
         
-        return '<' . $tagName . self::applyProperty($property) . '>' . $value . '</' . $tagName . '>';
+        return '<'.$tagName.self::applyProperty($property).'>'.$value.'</'.$tagName.'>';
     }
 
     /**
@@ -140,15 +140,15 @@ 
                 if (!Str::contains('/', $elementPoint) || count($elementArray) < 2) {
                     $active = $elementPoint === $currentPoint;
                 } else {
-                    $elementPoint = $elementArray[0] . '/' . $elementArray[1];
+                    $elementPoint = $elementArray[0].'/'.$elementArray[1];
                     $active = Str::startsWith($elementPoint, $currentPoint);
                 }
                 break;
             case 'id':
                 $elementArray = explode('/', $elementPoint);
-                $elementPoint = $elementArray[0] . '/' . $elementArray[1];
+                $elementPoint = $elementArray[0].'/'.$elementArray[1];
                 if (null !== $elementArray[2]) {
-                    $elementPoint .= '/' . $elementArray[2];
+                    $elementPoint .= '/'.$elementArray[2];
                 }
 
                 $active = Str::startsWith($elementPoint, $currentPoint);
@@ -204,7 +204,7 @@ 
      */
     public static function convertLink($uri)
     {
-        $link = App::$Alias->baseUrl . '/';
+        $link = App::$Alias->baseUrl.'/';
         if (Obj::isArray($uri)) {
             $link .= Url::buildPathway($uri);
         } elseif (Str::startsWith('http', $uri)) {