luyadev / luya

core/helpers/ObjectHelper.php

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
         }
         
         if ($throwException) {
-            throw new Exception("The given object must be an instance of: " . implode(",", $haystack));
+            throw new Exception("The given object must be an instance of: ".implode(",", $haystack));
         }
         
         return false;
@@ -218,7 +218,7 @@ 
             
         };
 
-        $staticPath = $module::staticBasePath() . DIRECTORY_SEPARATOR . 'controllers';
+        $staticPath = $module::staticBasePath().DIRECTORY_SEPARATOR.'controllers';
         if (is_dir($staticPath)) {
             foreach (FileHelper::findFiles($staticPath) as $file) {
                 $files[self::fileToName($staticPath, $file)] = $file;

core/base/Module.php

Spacing +2 added lines, -2 removed lines

@@ -216,7 +216,7 @@ 
     {
         $this->theme = Yii::$app->themeManager->getActiveTheme();
 
-        if ($this->theme){
+        if ($this->theme) {
             $this->layout = $this->theme->layout;
     
             if ($this->useAppLayoutPath) {
@@ -329,7 +329,7 @@ 
      */
     public function getControllerPath()
     {
-        return Yii::getAlias('@' . str_replace('\\', '/', $this->controllerNamespace), false);
+        return Yii::getAlias('@'.str_replace('\\', '/', $this->controllerNamespace), false);
     }
 
     // STATIC METHODS

core/theme/ThemeManager.php

Spacing +5 added lines, -5 removed lines

@@ -49,14 +49,14 @@ 
         if (strpos($basePath, '@') === 0) {
             $dir = Yii::getAlias($basePath);
         } elseif (strpos($basePath, '/') !== 0) {
-            $dir = $basePath = Yii::$app->basePath . DIRECTORY_SEPARATOR . $basePath;
+            $dir = $basePath = Yii::$app->basePath.DIRECTORY_SEPARATOR.$basePath;
         }
         
         if (!is_dir($dir) || !is_readable($dir)) {
-            throw new Exception('Theme directory not exists or readable: ' . $dir);
+            throw new Exception('Theme directory not exists or readable: '.$dir);
         }
         
-        $themeFile = $dir . '/theme.json';
+        $themeFile = $dir.'/theme.json';
         if (file_exists($themeFile)) {
             $config = Json::decode(file_get_contents($themeFile)) ?: [];
         } else {
@@ -152,7 +152,7 @@ 
         
         if (file_exists(Yii::getAlias('@app/themes'))) {
             foreach (scandir(Yii::getAlias('@app/themes')) as $dirPath) {
-                $themeDefinitions[] = "@app/themes/" . basename($dirPath);
+                $themeDefinitions[] = "@app/themes/".basename($dirPath);
             }
         }
         
@@ -190,7 +190,7 @@ 
         
         $this->_themes[$themeConfig->getBasePath()] = $themeConfig;
         
-        Yii::setAlias('@' . basename($themeConfig->getBasePath()) . 'Theme', $themeConfig->getBasePath());
+        Yii::setAlias('@'.basename($themeConfig->getBasePath()).'Theme', $themeConfig->getBasePath());
     }
     
     /**

core/traits/ErrorHandlerTrait.php

Spacing +3 added lines, -3 removed lines

@@ -148,9 +148,9 @@ 
             $_file = $exception->getFile();
             $_line = $exception->getLine();
         } elseif (is_string($exception)) {
-            $_message = 'exception string: ' . $exception;
+            $_message = 'exception string: '.$exception;
         } elseif (is_array($exception)) {
-            $_message = isset($exception['message']) ? $exception['message'] : 'exception array dump: ' . print_r($exception, true);
+            $_message = isset($exception['message']) ? $exception['message'] : 'exception array dump: '.print_r($exception, true);
             $_file = isset($exception['file']) ? $exception['file'] : __FILE__;
             $_line = isset($exception['line']) ? $exception['line'] : __LINE__;
         }
@@ -215,7 +215,7 @@ 
 
         if (!empty($file)) {
             try {
-                $lineInArray = $line -1;
+                $lineInArray = $line - 1;
                 // load file from path
                 $fileInfo = file($file, FILE_IGNORE_NEW_LINES);
                 // load file if false from real path

core/console/commands/ThemeController.php

Spacing +8 added lines, -8 removed lines

@@ -47,7 +47,7 @@ 
     
         $availableModules = implode(', ', array_column(Yii::$app->getFrontendModules(), 'id'));
         $themeLocation = $this->prompt("Enter the theme location where to generate (as path alias e.g. app, $availableModules):", ['default' => 'app']);
-        $themeLocation = '@' . ltrim($themeLocation, '@');
+        $themeLocation = '@'.ltrim($themeLocation, '@');
     
         preg_match("#^@[A-z]+#", $themeLocation, $newThemeLocation);
         if ($newThemeLocation[0] !== $themeLocation) {
@@ -58,15 +58,15 @@ 
             }
         }
         
-        $basePath = $themeLocation . DIRECTORY_SEPARATOR . 'themes' . DIRECTORY_SEPARATOR . $themeName;
+        $basePath = $themeLocation.DIRECTORY_SEPARATOR.'themes'.DIRECTORY_SEPARATOR.$themeName;
         $themeFolder = Yii::getAlias($basePath);
     
         if (file_exists($themeFolder)) {
-            return $this->outputError("The folder " . $themeFolder . " exists already.");
+            return $this->outputError("The folder ".$themeFolder." exists already.");
         }
     
-        $this->outputInfo("Theme path alias: " . $basePath);
-        $this->outputInfo("Theme real path: " . $themeFolder);
+        $this->outputInfo("Theme path alias: ".$basePath);
+        $this->outputInfo("Theme real path: ".$themeFolder);
         if (!$this->confirm("Do you want continue?")) {
             return $this->outputError('Abort by user.');
         }
@@ -80,11 +80,11 @@ 
         ];
 
         foreach ($folders as $folder) {
-            FileHelper::createDirectory($themeFolder . DIRECTORY_SEPARATOR . $folder);
+            FileHelper::createDirectory($themeFolder.DIRECTORY_SEPARATOR.$folder);
         }
         
         $contents = [
-            $themeFolder. DIRECTORY_SEPARATOR . 'theme.json' => $this->renderJson($basePath, $themeName),
+            $themeFolder.DIRECTORY_SEPARATOR.'theme.json' => $this->renderJson($basePath, $themeName),
         ];
         
         foreach ($contents as $fileName => $content) {
@@ -110,7 +110,7 @@ 
             $themeConfig->parentTheme = $this->prompt("Enter the base path (e.g. `@app/themes/blank`) of the parent theme:",
                 [
                     'default' => '@app/themes/blank',
-                    'validator' => function ($input, &$error) {
+                    'validator' => function($input, &$error) {
                         if (preg_match('/^[a-z]+$/', $input) === false) {
                             $error = 'The theme name must be only letter chars!';
                             return false;

core/theme/ThemeConfig.php

Spacing +1 added lines, -1 removed lines

@@ -97,6 +97,6 @@
     
     public function getViewPath()
     {
-        return $this->getBasePath() . '/views';
+        return $this->getBasePath().'/views';
     }
 }
\ No newline at end of file

core/theme/Theme.php

Spacing +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
         }
     
         $pos = strpos($viewPath, '/');
-        $rootPath = $pos === false ? $viewPath : (substr($viewPath, 0, $pos) . '/views');
+        $rootPath = $pos === false ? $viewPath : (substr($viewPath, 0, $pos).'/views');
         $this->pathMap[$rootPath] = $pathMap;
     
         $this->pathMap['@app/views'] = $pathMap;
@@ -84,7 +84,7 @@ 
     
     public function getLayoutPath()
     {
-        return $this->viewPath . '/' . self::LAYOUTS_PATH;
+        return $this->viewPath.'/'.self::LAYOUTS_PATH;
     }
     
     public function getConfig()