phpffcms / ffcms-core

src/Ffcms/Core/Helper/HTML/Bootstrap/Navbar.php

Spacing +8 added lines, -8 removed lines

@@ -37,7 +37,7 @@ 
         // set mobile collapse id for toggle
         $mobCollapseId = $elements['collapseId'];
         if (Str::likeEmpty($mobCollapseId)) {
-            $mobCollapseId = Str::randomLatin(mt_rand(6,12)) . mt_rand(1, 99);
+            $mobCollapseId = Str::randomLatin(mt_rand(6, 12)).mt_rand(1, 99);
         }
 
         // set element id for toggle
@@ -99,7 +99,7 @@ 
         // generate output dom of bootstrap navbar
         $dom = new Dom();
         $body = $dom->div(function() use ($leftBuild, $rightBuild, $itemsStatic){
-            return $leftBuild . $itemsStatic . $rightBuild;
+            return $leftBuild.$itemsStatic.$rightBuild;
         }, ['class' => 'collapse navbar-collapse', 'id' => $mobCollapseId]);
 
         // drow <nav @properties>@next</nav>
@@ -110,17 +110,17 @@ 
                 $header = $dom->div(function() use ($dom, $elements, $mobCollapseId){
                     // drow <button @collapse>@next</button>
                     $collapseButton = $dom->button(function() use ($dom){
-                        $toggleItem = $dom->span(function(){
+                        $toggleItem = $dom->span(function() {
                             return 'Toggle menu';
                         }, ['class' => 'sr-only']);
                         $toggleIcon = null;
                         for ($i = 0; $i < 3; $i++) {
-                            $toggleIcon .= $dom->span(function(){
+                            $toggleIcon .= $dom->span(function() {
                                 return null;
                             }, ['class' => 'icon-bar']);
                         }
-                        return $toggleItem . $toggleIcon;
-                    }, ['type' => 'button', 'class' => 'navbar-toggle collapsed', 'data-toggle' => 'collapse', 'data-target' => '#' . $mobCollapseId]);
+                        return $toggleItem.$toggleIcon;
+                    }, ['type' => 'button', 'class' => 'navbar-toggle collapsed', 'data-toggle' => 'collapse', 'data-target' => '#'.$mobCollapseId]);
                     // drow <div @brand>@brandtext<?div>
                     $brand = null;
                     if (isset($elements['brand'])) {
@@ -135,10 +135,10 @@ 
                             }, $elements['brand']['property']);
                         }
                     }
-                    return $collapseButton . $brand;
+                    return $collapseButton.$brand;
                 }, ['class' => 'navbar-header']);
                 // return header and body concat
-                return $header . $body;
+                return $header.$body;
             }, $elements['container']);
         }, $elements['nav']);
     }

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;
     }
@@ -427,7 +427,7 @@ 
      */
     public function getFullUrl()
     {
-        return $this->getSchemeAndHttpHost() . $this->getRequestUri();
+        return $this->getSchemeAndHttpHost().$this->getRequestUri();
     }
 
     /**

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

Spacing +10 added lines, -10 removed lines

@@ -23,7 +23,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
@@ -65,9 +65,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;
@@ -82,7 +82,7 @@ 
      */
     public static function buildSingleTag($tagName, array $property = null, $closeSlash = true)
     {
-        return '<' . self::nohtml($tagName) . self::applyProperty($property) . ($closeSlash ? '/>' : '>');
+        return '<'.self::nohtml($tagName).self::applyProperty($property).($closeSlash ? '/>' : '>');
     }
 
     /**
@@ -100,7 +100,7 @@ 
             $value = self::nohtml($value);
         }
         
-        return '<' . $tagName . self::applyProperty($property) . '>' . $value . '</' . $tagName . '>';
+        return '<'.$tagName.self::applyProperty($property).'>'.$value.'</'.$tagName.'>';
     }
 
     /**
@@ -142,13 +142,13 @@ 
                 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 ($elementArray[2] === null) { // looks like id is not defined in element
                     if (Str::contains('?', $currentPoint)) {
                         $currentPoint = Str::firstIn($currentPoint, '?');
@@ -157,7 +157,7 @@ 
                     $currentToId = implode('/', array_slice($currentArray, 0, 3));
                     $active = $elementPoint === $currentToId;
                 } else {
-                    $elementPoint .= '/' . $elementArray[2];
+                    $elementPoint .= '/'.$elementArray[2];
                     $active = Str::startsWith($elementPoint, $currentPoint);
                 }
                 break;
@@ -212,7 +212,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)) {
@@ -232,7 +232,7 @@ 
      */
     public static function encode($uri)
     {
-        return implode('/', array_map(function($v){
+        return implode('/', array_map(function($v) {
             return urlencode($v);
         }, explode('/', $uri)));
     }

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

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
         }
         // get image link
         $image = App::$Captcha->get();
-        $response = '<img id="src-secure-image" src="' . $image . '" alt="captcha" onClick="this.src=\''.$image.'&rnd=\'+Math.random()" />';
+        $response = '<img id="src-secure-image" src="'.$image.'" alt="captcha" onClick="this.src=\''.$image.'&rnd=\'+Math.random()" />';
         // render response tag with image
         $this->properties['type'] = 'text';
         $response .= self::buildSingleTag('input', $this->properties);

src/Ffcms/Core/Helper/HTML/Bootstrap/Nav.php

Spacing +6 added lines, -6 removed lines

@@ -60,7 +60,7 @@ 
             } elseif ($item['type'] === 'tab') {
                 $activeObject = false;
                 $item['type'] = 'link'; // fix for global Listing builder
-                $item['link'] = '#' . $elements['tabAnchor'] . $tabIdx;
+                $item['link'] = '#'.$elements['tabAnchor'].$tabIdx;
 
                 $item['property']['role'] = 'presentation';
 
@@ -75,11 +75,11 @@ 
 
                 // mark active tab
                 if ($activeObject === true) {
-                    $item['property']['class'] .= (Str::length($item['property']['class']) > 0 ? ' ' : null) . 'active';
+                    $item['property']['class'] .= (Str::length($item['property']['class']) > 0 ? ' ' : null).'active';
                 }
 
                 // tab special properties for bootstrap
-                $item['linkProperty']['aria-controls'] = $elements['tabAnchor'] . $tabIdx;
+                $item['linkProperty']['aria-controls'] = $elements['tabAnchor'].$tabIdx;
                 $item['linkProperty']['role'] = 'tab';
                 $item['linkProperty']['data-toggle'] = 'tab';
 
@@ -98,7 +98,7 @@ 
                     } else {
                         return self::nohtml($itemContent);
                     }
-                }, ['role' => 'tabpanel', 'class' => 'tab-pane fade' . ($activeObject === true ? ' in active' : null), 'id' => $elements['tabAnchor'] . $tabIdx]);
+                }, ['role' => 'tabpanel', 'class' => 'tab-pane fade'.($activeObject === true ? ' in active' : null), 'id' => $elements['tabAnchor'].$tabIdx]);
                 $tabIdx++;
             }
         }
@@ -106,7 +106,7 @@ 
         // check if global class "nav" isset
         if ($elements['property']['class'] !== null) {
             if (!Str::contains('nav ', $elements['property']['class'])) {
-                $elements['property']['class'] = 'nav ' . $elements['property']['class'];
+                $elements['property']['class'] = 'nav '.$elements['property']['class'];
             }
         } else {
             $elements['property']['class'] = 'nav';
@@ -130,7 +130,7 @@ 
                     return $tabContent;
                 }, $elements['tabProperty']);
             }
-            return $listing . $tabContent;
+            return $listing.$tabContent;
         }, $blockProperty);
     }
 }
\ No newline at end of file

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

Spacing +4 added lines, -4 removed lines

@@ -30,7 +30,7 @@ 
         // initialize new DOM model
         $dom = new Dom();
         // return DOM-HTML, build based on closures!
-        return $dom->{$elements['type']}(function () use ($dom, $elements) {
+        return $dom->{$elements['type']}(function() use ($dom, $elements) {
             // prepare output avg variable
             $itemHTML = null;
             // get active order level
@@ -71,7 +71,7 @@ 
 
         return $dom->li(function() use($dom, $item){
             $dropdownLink = $dom->a(function() use ($dom, $item){
-                return self::applyEscape($item['text'], $item['html'], $item['!secure']) . ' ' . $dom->span(function(){}, ['class' => 'caret']);
+                return self::applyEscape($item['text'], $item['html'], $item['!secure']).' '.$dom->span(function() {}, ['class' => 'caret']);
             }, $item['dropdown']);
 
             $dropdownElements = $dom->ul(function() use ($dom, $item){
@@ -82,7 +82,7 @@ 
                 return $resp;
             }, $item['menuProperty']);
 
-            return $dropdownLink . $dropdownElements;
+            return $dropdownLink.$dropdownElements;
         }, $item['property']);
 
     }
@@ -136,7 +136,7 @@ 
         $item['linkProperty']['href'] = self::convertLink($item['link']);
 
         // build output <li@params><a @params>@text</li>
-        return $dom->li(function () use ($dom, $text, $item) {
+        return $dom->li(function() use ($dom, $text, $item) {
             return $dom->a(function() use ($text) {
                 return $text;
             }, $item['linkProperty']);

Braces +3 added lines, -2 removed lines

@@ -66,8 +66,9 @@
             return null;
         }
 
-        if (!isset($item['menuProperty']['class']))
-            $item['menuProperty']['class'] = 'dropdown-menu';
+        if (!isset($item['menuProperty']['class'])) {
+                    $item['menuProperty']['class'] = 'dropdown-menu';
+        }
 
         return $dom->li(function() use($dom, $item){
             $dropdownLink = $dom->a(function() use ($dom, $item){

src/Ffcms/Core/Arch/Model.php

Doc Comments +2 added lines, -2 removed lines

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

src/Ffcms/Core/Arch/Controller.php

Spacing +4 added lines, -4 removed lines

@@ -67,9 +67,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;
@@ -88,7 +88,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);
             }
 
 
@@ -98,7 +98,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/Ffcms/Core/Traits/ModelValidator.php

Spacing +3 added lines, -3 removed lines

@@ -138,7 +138,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,7 +157,7 @@ 
                 $check = ModelFilters::$filterName($fieldValue);
             }
         } else {
-            throw new SyntaxException('Filter "' . $filterName . '" is not exist');
+            throw new SyntaxException('Filter "'.$filterName.'" is not exist');
         }
         if ($check !== true) { // if one from all validation tests is fail - mark as incorrect attribute
             $this->_badAttr[] = $propertyName;

Braces +6 added lines, -4 removed lines

@@ -317,8 +317,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
@@ -342,8 +343,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];
             }