luyadev / luya

core/console/commands/ThemeController.php

Spacing +13 added lines, -13 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);
         
@@ -59,15 +59,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.');
         }
@@ -81,15 +81,15 @@ 
         ];
         
         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 . ucfirst($themeName) . 'Asset.php' => $this->renderAssetClass($themeName),
-            $themeFolder. DIRECTORY_SEPARATOR . 'resources'.DIRECTORY_SEPARATOR. $themeName .'.css' => '',
-            $themeFolder. DIRECTORY_SEPARATOR . 'views'.DIRECTORY_SEPARATOR.'layouts'.DIRECTORY_SEPARATOR.'theme.php' => $this->renderLayout($themeName),
-            $themeFolder. DIRECTORY_SEPARATOR . 'views'.DIRECTORY_SEPARATOR.'cmslayouts'.DIRECTORY_SEPARATOR.'theme.php' => $this->renderCmsLayout($themeName),
+            $themeFolder.DIRECTORY_SEPARATOR.'theme.json' => $this->renderJson($basePath, $themeName),
+            $themeFolder.DIRECTORY_SEPARATOR.ucfirst($themeName).'Asset.php' => $this->renderAssetClass($themeName),
+            $themeFolder.DIRECTORY_SEPARATOR.'resources'.DIRECTORY_SEPARATOR.$themeName.'.css' => '',
+            $themeFolder.DIRECTORY_SEPARATOR.'views'.DIRECTORY_SEPARATOR.'layouts'.DIRECTORY_SEPARATOR.'theme.php' => $this->renderLayout($themeName),
+            $themeFolder.DIRECTORY_SEPARATOR.'views'.DIRECTORY_SEPARATOR.'cmslayouts'.DIRECTORY_SEPARATOR.'theme.php' => $this->renderCmsLayout($themeName),
         ];
         
         foreach ($contents as $fileName => $content) {
@@ -150,7 +150,7 @@ 
      */
     private function renderAssetClass($themeName)
     {
-        $className = ucfirst($themeName) . 'Asset';
+        $className = ucfirst($themeName).'Asset';
         return "<?php
 namespace app\\themes\\{$themeName};
 
@@ -171,7 +171,7 @@ 
      */
     private function renderLayout($themeName)
     {
-        $className = ucfirst($themeName) . 'Asset';
+        $className = ucfirst($themeName).'Asset';
     
         return '<?php
 /**

core/web/WebsiteLink.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
     public function setHref($href)
     {
         if (StringHelper::startsWith($href, '//')) {
-            $this->_href = Url::base(true) . str_replace('//', '/', $href);
+            $this->_href = Url::base(true).str_replace('//', '/', $href);
         } elseif (StringHelper::startsWith($href, '#')) {
             // When an anchor link is given, do not modify the link. This can be usefull for one pagers
             $this->_href = $href;

core/web/Svg.php

Spacing +7 added lines, -7 removed lines

@@ -102,25 +102,25 @@ 
     public function run()
     {
         // Cache generated code
-        return $this->getOrSetHasCache(['svg', $this->folder, $this->file, $this->cssClass, $this->symbolName], function () {
+        return $this->getOrSetHasCache(['svg', $this->folder, $this->file, $this->cssClass, $this->symbolName], function() {
 
             // Check if file ends with .svg, if not add the extension
-            $svgFile = StringHelper::endsWith($this->file, '.svg') ? $this->file : $this->file . '.svg';
+            $svgFile = StringHelper::endsWith($this->file, '.svg') ? $this->file : $this->file.'.svg';
 
             if ($this->symbolMode) {
-                $svgPath = Yii::$app->view->publicHtml . '/' . $svgFile;
+                $svgPath = Yii::$app->view->publicHtml.'/'.$svgFile;
 
-                return '<svg class="symbol symbol--' . $this->symbolName . '' . ($this->cssClass ? ' ' . $this->cssClass : '') . '"><use class="symbol__use" xlink:href="' . $svgPath . '#' . $this->symbolName . '" /></svg>';
+                return '<svg class="symbol symbol--'.$this->symbolName.''.($this->cssClass ? ' '.$this->cssClass : '').'"><use class="symbol__use" xlink:href="'.$svgPath.'#'.$this->symbolName.'" /></svg>';
             } else {
                 // Build the full svg file path
-                $svgPath = $this->folder . DIRECTORY_SEPARATOR . $svgFile;
+                $svgPath = $this->folder.DIRECTORY_SEPARATOR.$svgFile;
 
                 // Get the svg contents
                 $content = FileHelper::getFileContent($svgPath);
 
                 // If a cssClass string is given, add it to the <svg> tag
                 if ($this->cssClass && is_string($this->cssClass)) {
-                    $content = preg_replace('/<svg/', '<svg class="' . $this->cssClass . '"', $content);
+                    $content = preg_replace('/<svg/', '<svg class="'.$this->cssClass.'"', $content);
                 }
 
                 if ($content) {
@@ -128,7 +128,7 @@ 
                 }
             }
 
-            throw new Exception('Unable to access SVG File: ' . $svgPath);
+            throw new Exception('Unable to access SVG File: '.$svgPath);
         });
     }
 }