phpffcms / ffcms-core

src/Managers/MigrationsManager.php

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
 use Ffcms\Core\Helper\FileSystem\Normalize;
 use Ffcms\Core\Helper\Type\Any;
 use Ffcms\Core\Helper\Type\Arr;
-use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
 
 /**

Spacing +6 added lines, -6 removed lines

@@ -70,7 +70,7 @@ 
                 continue;
             }
             // check initialize conditions (equals to $exist)
-            if (File::exist($this->dir . '/' . $migration)) {
+            if (File::exist($this->dir.'/'.$migration)) {
                 if (Arr::in($fullName, $dbmigrations) === $exist) {
                     $found[] = $migration;
                 }
@@ -100,16 +100,16 @@ 
         }
 
         // check if migration file is exists
-        if (!File::exist($this->dir . '/' . $file))
+        if (!File::exist($this->dir.'/'.$file))
             return false;
 
         // check if migration file located in extend directory and copy to default
         if (Normalize::diskFullPath($this->dir) !== Normalize::diskFullPath(static::DEFAULT_DIR)) {
-            File::copy($this->dir . DIRECTORY_SEPARATOR . $file, static::DEFAULT_DIR . DIRECTORY_SEPARATOR . $file);
+            File::copy($this->dir.DIRECTORY_SEPARATOR.$file, static::DEFAULT_DIR.DIRECTORY_SEPARATOR.$file);
         }
 
         // include migration and get class name
-        File::inc($this->dir . '/' . $file, false, false);
+        File::inc($this->dir.'/'.$file, false, false);
         $fullName = Str::cleanExtension($file);
         $class = Str::firstIn($fullName, '-');
 
@@ -144,10 +144,10 @@ 
         }
 
         // check if exists
-        if (!File::exist($this->dir . '/' . $file))
+        if (!File::exist($this->dir.'/'.$file))
             return false;
 
-        File::inc($this->dir . '/' . $file, false, false);
+        File::inc($this->dir.'/'.$file, false, false);
         $fullName = Str::cleanExtension($file);
         $class = Str::firstIn($fullName, '-');
 

Braces +21 added lines, -14 removed lines

@@ -30,14 +30,16 @@ 
      */
     public function __construct(?string $dir = null, ?string $connectionName = null)
     {
-        if ($dir === null)
-            $dir = static::DEFAULT_DIR;
+        if ($dir === null) {
+                    $dir = static::DEFAULT_DIR;
+        }
 
         $this->dir = rtrim($dir, '/');
         $this->connection = $connectionName;
 
-        if ($this->dir !== static::DEFAULT_DIR)
-            $this->customDir = true;
+        if ($this->dir !== static::DEFAULT_DIR) {
+                    $this->customDir = true;
+        }
     }
 
     /**
@@ -50,16 +52,18 @@ 
     {
         // initialize db migration record
         $records = new Migration();
-        if ($this->connection !== null)
-            $records->setConnection($this->connection);
+        if ($this->connection !== null) {
+                    $records->setConnection($this->connection);
+        }
 
         // get installed migrations
         $dbmigrations = Arr::pluck('migration', $records->get()->toArray());
 
         // list migrations
         $migrations = File::listFiles($this->dir, ['.php'], true);
-        if (!Any::isArray($migrations) || count($migrations) < 1)
-            return false;
+        if (!Any::isArray($migrations) || count($migrations) < 1) {
+                    return false;
+        }
 
         $found = false;
         foreach ($migrations as $migration) {
@@ -100,8 +104,9 @@ 
         }
 
         // check if migration file is exists
-        if (!File::exist($this->dir . '/' . $file))
-            return false;
+        if (!File::exist($this->dir . '/' . $file)) {
+                    return false;
+        }
 
         // check if migration file located in extend directory and copy to default
         if (Normalize::diskFullPath($this->dir) !== Normalize::diskFullPath(static::DEFAULT_DIR)) {
@@ -114,8 +119,9 @@ 
         $class = Str::firstIn($fullName, '-');
 
         // check if class is instance of migration interface
-        if (!class_exists($class) || !is_a($class, 'Ffcms\Core\Migrations\MigrationInterface', true))
-            return false;
+        if (!class_exists($class) || !is_a($class, 'Ffcms\Core\Migrations\MigrationInterface', true)) {
+                    return false;
+        }
 
         // implement migration
         $init = new $class($fullName, $this->connection);
@@ -144,8 +150,9 @@ 
         }
 
         // check if exists
-        if (!File::exist($this->dir . '/' . $file))
-            return false;
+        if (!File::exist($this->dir . '/' . $file)) {
+                    return false;
+        }
 
         File::inc($this->dir . '/' . $file, false, false);
         $fullName = Str::cleanExtension($file);

src/Network/Request.php

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 use Ffcms\Core\App;
 use Ffcms\Core\Helper\Type\Any;
 use Ffcms\Core\Helper\Type\Arr;
-use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
 use Symfony\Component\HttpFoundation\RedirectResponse as Redirect;
 use Symfony\Component\HttpFoundation\Request as FoundationRequest;

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 +27 added lines, -18 removed lines

@@ -141,18 +141,21 @@ 
         $routing = App::$Properties->getAll('Routing');
 
         // try to work with static aliases
-        if (Any::isArray($routing) && isset($routing['Alias'], $routing['Alias'][env_name]))
-            $pathway = $this->findStaticAliases($routing['Alias'][env_name], $pathway);
+        if (Any::isArray($routing) && isset($routing['Alias'], $routing['Alias'][env_name])) {
+                    $pathway = $this->findStaticAliases($routing['Alias'][env_name], $pathway);
+        }
 
         $this->setPathdata(explode('/', trim($pathway, '/')));
 
         // set default controller and action for undefined data
-        if (!$this->action)
-            $this->action = 'Index';
+        if (!$this->action) {
+                    $this->action = 'Index';
+        }
 
         // empty or contains backslashes? set to main
-        if (!$this->controller || Str::contains('\\', $this->controller))
-            $this->controller = 'Main';
+        if (!$this->controller || Str::contains('\\', $this->controller)) {
+                    $this->controller = 'Main';
+        }
 
         // find callback injection in routing configs (calculated in App::run())
         if (Any::isArray($routing) && isset($routing['Callback'], $routing['Callback'][env_name])) {
@@ -170,8 +173,9 @@ 
         /** @var array $routing */
         $routing = App::$Properties->getAll('Routing');
 
-        if (!Any::isArray($routing) || !isset($routing['Redirect']) || !Any::isArray($routing['Redirect']))
-            return;
+        if (!Any::isArray($routing) || !isset($routing['Redirect']) || !Any::isArray($routing['Redirect'])) {
+                    return;
+        }
 
         // check if source uri is key in redirect target map
         if (array_key_exists($pathway, $routing['Redirect'])) {
@@ -230,8 +234,9 @@ 
      */
     private function findDynamicCallbacks(array $map = null, ?string $controller = null)
     {
-        if ($map === null)
-            return;
+        if ($map === null) {
+                    return;
+        }
 
         // try to find global callback for this controller slug
         if (array_key_exists($controller, $map)) {
@@ -248,8 +253,9 @@ 
     private function loadTrustedProxies()
     {
         $proxies = App::$Properties->get('trustedProxy');
-        if ($proxies === null || Str::likeEmpty($proxies))
-            return;
+        if ($proxies === null || Str::likeEmpty($proxies)) {
+                    return;
+        }
 
         $pList = explode(',', $proxies);
         $resultList = [];
@@ -265,8 +271,9 @@ 
      */
     private function setPathdata(?array $pathArray = null)
     {
-        if (!Any::isArray($pathArray) || count($pathArray) < 1)
-            return;
+        if (!Any::isArray($pathArray) || count($pathArray) < 1) {
+                    return;
+        }
 
         // check if array length is more then 4 basic elements and slice it recursive
         if (count($pathArray) > 4) {
@@ -295,8 +302,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;
     }
 
@@ -439,8 +447,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())) {

src/Traits/ModelValidator.php

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
 use Ffcms\Core\Exception\SyntaxException;
 use Ffcms\Core\Helper\ModelFilters;
 use Ffcms\Core\Helper\Type\Any;
-use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
 
 /**

Spacing +4 added lines, -4 removed lines

@@ -137,7 +137,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);
                     }
                 }
             }
@@ -146,7 +146,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) {
@@ -155,14 +155,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;
             // prevent array-type setting

Braces +30 added lines, -20 removed lines

@@ -41,8 +41,9 @@ 
             // if request is submited for this model - try to validate input data
             if ($this->send()) {
                 // token is wrong - update bool state
-                if ($currentToken !== $this->getRequest('_csrf_token'))
-                    $this->_tokenOk = false;
+                if ($currentToken !== $this->getRequest('_csrf_token')) {
+                                    $this->_tokenOk = false;
+                }
             }
             // set token data to display
             $this->_csrf_token = $newToken;
@@ -58,21 +59,24 @@ 
     public function runValidate(array $rules = null)
     {
         // skip validation on empty rules
-        if ($rules === null)
-            return true;
+        if ($rules === null) {
+                    return true;
+        }
 
         $success = true;
         // list each rule as single one
         foreach ($rules as $rule) {
             // 0 = field (property) name, 1 = filter name, 2 = filter value
-            if ($rule[0] === null || $rule[1] === null)
-                continue;
+            if ($rule[0] === null || $rule[1] === null) {
+                            continue;
+            }
 
             $propertyName = $rule[0];
             $validationRule = $rule[1];
             $validationValue = null;
-            if (isset($rule[2]))
-                $validationValue = $rule[2];
+            if (isset($rule[2])) {
+                            $validationValue = $rule[2];
+            }
 
             // check if target field defined as array and make recursive validation
             if (Any::isArray($propertyName)) {
@@ -160,8 +164,9 @@ 
         // 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');
+            if (App::$Debug) {
+                            App::$Debug->addMessage('Validation failed. Property: ' . $propertyName . ', filter: ' . $filterName, 'warning');
+            }
         } else {
             $field_set_name = $propertyName;
             // prevent array-type setting
@@ -172,8 +177,9 @@ 
                 if ($propertyName !== $field_set_name) { // array-based property
                     $dot_path = trim(strstr($propertyName, '.'), '.');
                     // prevent throws any exceptions for null and false objects
-                    if (!Any::isArray($this->{$field_set_name}))
-                        $this->{$field_set_name} = [];
+                    if (!Any::isArray($this->{$field_set_name})) {
+                                            $this->{$field_set_name} = [];
+                    }
 
                     // use dot-data provider to compile output array
                     $dotData = new DotData($this->{$field_set_name});
@@ -203,14 +209,16 @@ 
         $sources = $this->sources();
         $types = $this->types();
         // validate sources for current field
-        if (array_key_exists($propertyName, $sources))
-            $inputType = Str::lowerCase($sources[$propertyName]);
+        if (array_key_exists($propertyName, $sources)) {
+                    $inputType = Str::lowerCase($sources[$propertyName]);
+        }
 
 
         // check if field is array-nested element by dots and use first element as general
         $filterField = $propertyName;
-        if (array_key_exists($filterField, $types))
-            $filterType = Str::lowerCase($types[$filterField]);
+        if (array_key_exists($filterField, $types)) {
+                    $filterType = Str::lowerCase($types[$filterField]);
+        }
 
         // get clear field value
         $propertyValue = $this->getRequest($propertyName, $inputType);
@@ -312,8 +320,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
@@ -337,8 +346,9 @@ 
         if (Str::contains('.', $param)) {
             $response = $request;
             foreach (explode('.', $param) as $path) {
-                if ($response !== null && !array_key_exists($path, $response))
-                    return null;
+                if ($response !== null && !array_key_exists($path, $response)) {
+                                    return null;
+                }
                 // find deep array nesting offset
                 $response = $response[$path];
             }

src/Traits/ClassTools.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     {
         $hash = null;
         foreach ($this as $property => $value) {
-            $hash = md5($hash . $property . '=' . $value);
+            $hash = md5($hash.$property.'='.$value);
         }
         return $hash;
     }

src/Helper/Url.php

Spacing +14 added lines, -14 removed lines

@@ -25,7 +25,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;
     }
 
     /**
@@ -61,7 +61,7 @@ 
                 $controller = Str::lastIn($controller, '\\', true);
             }
 
-            $response = $controller . '/' . $action;
+            $response = $controller.'/'.$action;
         }
 
         // check if controller and action is defined
@@ -71,17 +71,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, '/'));
             }
@@ -97,7 +97,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;
@@ -119,7 +119,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>';
     }
 
     /**
@@ -155,19 +155,19 @@ 
     {
         /** @var array $configs */
         $configs = \App::$Properties->getAll('default');
-        $httpHost = $configs['baseProto'] . '://' . $configs['baseDomain'];
+        $httpHost = $configs['baseProto'].'://'.$configs['baseDomain'];
         if ($configs['basePath'] !== '/') {
-            $httpHost .= $configs['basePath'] . '/';
+            $httpHost .= $configs['basePath'].'/';
         }
 
         // check if is this is URI not URL
         if (!Str::startsWith($httpHost, $uri)) {
             // check if lang is defined in URI or define it
             if ($lang !== null && $configs['multiLanguage'] && !Str::startsWith($lang, $uri)) {
-                $uri = $lang . '/' . ltrim($uri, '/');
+                $uri = $lang.'/'.ltrim($uri, '/');
             }
             // add basic httpHost data
-            $uri = rtrim($httpHost, '/') . '/' . ltrim($uri, '/');
+            $uri = rtrim($httpHost, '/').'/'.ltrim($uri, '/');
         }
 
         return $uri;

Braces +3 added lines, -2 removed lines

@@ -136,8 +136,9 @@
     public static function link($to, $name, array $property = null)
     {
         $compile_property = self::applyProperty($property);
-        if (!Any::isArray($to))
-            $to = [$to];
+        if (!Any::isArray($to)) {
+                    $to = [$to];
+        }
 
         // call Url::to(args)
         $callbackTo = call_user_func_array([__NAMESPACE__ . '\Url', 'to'], $to);

src/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/Helper/Simplify.php

Braces +9 added lines, -6 removed lines

@@ -21,13 +21,15 @@ 
      */
     public static function parseUserNick($userId = null, $onEmpty = 'guest'): ?string
     {
-        if (!Any::isInt($userId))
-            return \App::$Security->strip_tags($onEmpty);
+        if (!Any::isInt($userId)) {
+                    return \App::$Security->strip_tags($onEmpty);
+        }
 
         // try to find user active record as object
         $identity = App::$User->identity($userId);
-        if (!$identity)
-            return \App::$Security->strip_tags($onEmpty);
+        if (!$identity) {
+                    return \App::$Security->strip_tags($onEmpty);
+        }
 
         // return user nickname from profile
         return $identity->profile->getNickname();
@@ -44,8 +46,9 @@ 
     {
         $nick = self::parseUserNick($userId, $onEmpty);
         // new name is not found, lets return default
-        if ($nick === $onEmpty || (int)$userId < 1)
-            return $nick;
+        if ($nick === $onEmpty || (int)$userId < 1) {
+                    return $nick;
+        }
 
         return Url::link([$controllerAction, (int)$userId], $nick);
     }

src/Helper/FileSystem/Directory.php

Spacing +2 added lines, -2 removed lines

@@ -91,7 +91,7 @@ 
             return false;
         }
 
-        $pattern = rtrim($path, '/') . '/*';
+        $pattern = rtrim($path, '/').'/*';
         $entry = glob($pattern, $mod);
 
         if ($returnRelative === true) {
@@ -122,7 +122,7 @@ 
         array_pop($separatedPath);
         $clearPath = implode(DIRECTORY_SEPARATOR, $separatedPath);
 
-        @rename($path, $clearPath . DIRECTORY_SEPARATOR . $newDirName);
+        @rename($path, $clearPath.DIRECTORY_SEPARATOR.$newDirName);
 
         return true;
     }

src/Helper/FileSystem/Normalize.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
     {
         $path = self::diskPath($path);
         if (!Str::startsWith(root, $path)) {
-            $path = root . DIRECTORY_SEPARATOR . ltrim($path, '\\/');
+            $path = root.DIRECTORY_SEPARATOR.ltrim($path, '\\/');
         }
         return $path;
     }