phpffcms / ffcms-core

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
@@ -67,7 +67,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){
@@ -78,7 +78,7 @@ 
                 return $resp;
             }, ['class' => 'dropdown-menu']);
 
-            return $dropdownLink . $dropdownElements;
+            return $dropdownLink.$dropdownElements;
         }, $item['property']);
 
     }
@@ -130,7 +130,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']);

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';
@@ -126,7 +126,7 @@ 
                     return $tabContent;
                 }, ['class' => 'tab-content']);
             }
-            return $listing . $tabContent;
+            return $listing.$tabContent;
         }, $blockProperty);
     }
 }
\ No newline at end of file

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,26 +110,26 @@ 
                 $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'])) {
                         $brand = Url::link($elements['brand']['link'], $elements['brand']['text'], ['class' => 'navbar-brand']);
                     }
-                    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/Helper/Type/Str.php

Spacing +1 added lines, -1 removed lines

@@ -297,7 +297,7 @@
 
         $output = null;
         foreach ($args as $string) {
-            $output .= $string . $separator;
+            $output .= $string.$separator;
         }
 
         $output = rtrim($output, $separator);

Doc Comments +5 added lines, -8 removed lines

@@ -57,7 +57,7 @@ 
      * Find first entry in $string before $delimiter
      * @param string $string
      * @param string $delimiter
-     * @return string|bool
+     * @return false|string
      */
     public static function firstIn($string, $delimiter)
     {
@@ -72,7 +72,7 @@ 
      * @param string $string
      * @param string $delimiter
      * @param bool $withoutDelimiter
-     * @return string|bool
+     * @return false|string
      */
     public static function lastIn($string, $delimiter, $withoutDelimiter = false)
     {
@@ -214,8 +214,8 @@ 
 
     /**
      * Case-ignore replace $needle to $replacement in string $haystack. Alias for function str_ireplace()
-     * @param string|array $needle
-     * @param string|array $replacement
+     * @param string[] $needle
+     * @param string $replacement
      * @param string $haystack
      * @return string
      */
@@ -310,7 +310,7 @@ 
     /**
      * Check is $string sounds like a phone number
      * @param string $string
-     * @return int
+     * @return boolean
      */
     public static function isPhone($string)
     {
@@ -319,9 +319,6 @@ 
 
     /**
      * Concat string with add string by separator
-     * @param string $separator
-     * @param string $string1
-     * @param string $string2
      * @return string
      */
     public static function concat()

src/Ffcms/Core/I18n/Translate.php

Doc Comments +1 added lines, -1 removed lines

@@ -115,7 +115,7 @@
 
     /**
      * Get available languages in the filesystem
-     * @return array
+     * @return string[]
      */
     public function getAvailableLangs()
     {

Spacing +4 added lines, -4 removed lines

@@ -54,7 +54,7 @@ 
 
         if (Obj::isArray($params) && count($params) > 0) {
             foreach ($params as $var => $value) {
-                $text = Str::replace('%' . $var . '%', $value, $text);
+                $text = Str::replace('%'.$var.'%', $value, $text);
             }
         }
         return $text;
@@ -69,7 +69,7 @@ 
     public function translate($text, array $params = [])
     {
         $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));
@@ -85,7 +85,7 @@ 
      */
     protected function load($index)
     {
-        $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 [];
         }
@@ -123,7 +123,7 @@ 
     public function getAvailableLangs()
     {
         $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/Ffcms/Core/Network/Request.php

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/Properties.php

Spacing +5 added lines, -5 removed lines

@@ -46,9 +46,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;
         }
 
@@ -139,11 +139,11 @@ 
      */
     public function writeConfig($configFile, array $data)
     {
-        $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);
         return true;
     }

src/Ffcms/Core/Managers/CronManager.php

Spacing +2 added lines, -2 removed lines

@@ -76,7 +76,7 @@ 
             return false;
         }
 
-        $callback = (string)$class . '::' . (string)$method;
+        $callback = (string)$class.'::'.(string)$method;
 
         // add instance to cron task manager
         if (!isset($this->configs['instances'][$callback])) {
@@ -94,7 +94,7 @@ 
      */
     public function remove($class, $method)
     {
-        $callback = $class . '::' . $method;
+        $callback = $class.'::'.$method;
         if (isset($this->configs['instances'][$callback])) {
             unset($this->configs['instances'][$callback], $this->configs['log'][$callback]);
             App::$Properties->writeConfig('Cron', $this->configs);

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

Doc Comments +2 added lines, -2 removed lines

@@ -103,8 +103,8 @@
 
     /**
      * Display form field. Allowed type: text, password, textarea, checkbox, select, checkboxes, file, captcha, email, hidden
-     * @param $object
-     * @param $type
+     * @param string $object
+     * @param string $type
      * @param null|array $property
      * @param null|string $helper
      * @param null|string $layerFile

Spacing +9 added lines, -9 removed lines

@@ -81,7 +81,7 @@ 
     {
         $form = self::buildSingleTag('form', $this->formProperty, false);
         if ($this->model->_tokenRequired) {
-            $form .= PHP_EOL . $this->field('_csrf_token', 'hidden', ['value' => $this->model->_csrf_token]);
+            $form .= PHP_EOL.$this->field('_csrf_token', 'hidden', ['value' => $this->model->_csrf_token]);
         }
         return $form;
     }
@@ -101,7 +101,7 @@ 
     {
         if ($this->model === null) {
             if (App::$Debug !== null) {
-                App::$Debug->addMessage('Form model is not defined for field name: [' . strip_tags($object) . ']');
+                App::$Debug->addMessage('Form model is not defined for field name: ['.strip_tags($object).']');
             }
             return null;
         }
@@ -115,7 +115,7 @@ 
         // check if model contains current tag name as property
         if (!property_exists($this->model, $propertyName)) {
             if (App::$Debug !== null) {
-                App::$Debug->addMessage('Form field ["' . $object . '"] is not defined in model: [' . get_class($this->model) . ']', 'error');
+                App::$Debug->addMessage('Form field ["'.$object.'"] is not defined in model: ['.get_class($this->model).']', 'error');
             }
             return null;
         }
@@ -136,13 +136,13 @@ 
         }
         
         // prepare labels text and label "for" attr 
-        $labelFor = $this->name . '-' . $propertyName;
+        $labelFor = $this->name.'-'.$propertyName;
         $labelText = $this->model->getLabel($object);
         $itemValue = $this->model->{$propertyName};
         // sounds like a dot-separated $object
         if ($propertyName !== $object) {
             $nesting = trim(strstr($object, '.'), '.');
-            $labelFor .= '-' . Str::replace('.', '-', $nesting);
+            $labelFor .= '-'.Str::replace('.', '-', $nesting);
             $itemValue = Arr::getByPath($nesting, $itemValue);
         }
 
@@ -173,7 +173,7 @@ 
     public function submitButton($title, array $property = [])
     {
         $property['type'] = 'submit';
-        $property['name'] = $this->name . '[submit]';
+        $property['name'] = $this->name.'[submit]';
         $property['value'] = $title;
         return self::buildSingleTag('input', $property);
     }
@@ -187,10 +187,10 @@ 
     {
         // pre-validate form fields based on model rules and jquery.validation
         if ($validate) {
-            App::$Alias->addPlainCode('js', '$().ready(function() { $("#' . $this->name . '").validate(); });');
+            App::$Alias->addPlainCode('js', '$().ready(function() { $("#'.$this->name.'").validate(); });');
             App::$Alias->setCustomLibrary('js', '/vendor/bower/jquery-validation/dist/jquery.validate.min.js');
             if (App::$Request->getLanguage() !== 'en') {
-                $localeFile = '/vendor/bower/jquery-validation/src/localization/messages_' . App::$Request->getLanguage() . '.js';
+                $localeFile = '/vendor/bower/jquery-validation/src/localization/messages_'.App::$Request->getLanguage().'.js';
                 if (File::exist($localeFile)) {
                     App::$Alias->setCustomLibrary('js', $localeFile);
                 }
@@ -201,7 +201,7 @@ 
                 $formName = $this->model->getFormName();
                 if (Obj::isArray($badAttr) && count($badAttr) > 0) {
                     foreach ($badAttr as $attr) {
-                        $itemId = $formName . '-' . $attr;
+                        $itemId = $formName.'-'.$attr;
                         $render = App::$View->render(static::$structLayer['jsnotify'], ['itemId' => $itemId]);
                         App::$Alias->addPlainCode('js', $render);
                     }