xpressengine / xpressengine

app/Console/Commands/ThemeMakeCommand.php

Spacing +26 added lines, -26 removed lines

@@ -62,12 +62,12 @@ 
         $id = $this->getThemeId($plugin, $file);
         $title = $this->getThemeTitle();
         $description = $this->getThemeDescription($id, $plugin);
-        $templateView = strtolower(last(explode('@',$id)));
+        $templateView = strtolower(last(explode('@', $id)));
         $template = $this->getTemplatePath($templateView, $plugin);
         $css = $this->getCssPath($id, $plugin);
 
         // print and confirm the information of theme
-        if($this->confirmInfo($file, $namespace.'\\'.$class, $plugin, $id, $title, $description, $template, $css) === false){
+        if ($this->confirmInfo($file, $namespace.'\\'.$class, $plugin, $id, $title, $description, $template, $css) === false) {
             return false;
         }
 
@@ -78,7 +78,7 @@ 
             $this->makeCss($plugin, $css);
 
             // composer.json 파일 수정
-            if($this->registerTheme($plugin, 'theme/'.$id, $namespace.'\\'.$class, $title, $description) === false) {
+            if ($this->registerTheme($plugin, 'theme/'.$id, $namespace.'\\'.$class, $title, $description) === false) {
                 throw new \Exception('Writing to composer.json file was failed.');
             }
 
@@ -129,7 +129,7 @@ 
          * DummyCssFile
         */
 
-        if($class === $pluginClass) {
+        if ($class === $pluginClass) {
             $pluginClass = $pluginClass.'Plugin';
         }
 
@@ -183,22 +183,22 @@ 
     {
         $id = $this->option('id');
 
-        if(!$id) {
-            $fileName = basename($file,'.php');
+        if (!$id) {
+            $fileName = basename($file, '.php');
             $id = $plugin.'@'.strtolower($fileName);
         } else {
-            if(strpos('theme/', $id) === 0) {
+            if (strpos('theme/', $id) === 0) {
                 $id = substr($id, 6);
             }
 
-            if(strpos($id, '@') === false) {
+            if (strpos($id, '@') === false) {
                 $id = $plugin.'@'.$id;
             }
         }
 
         $theme = \App::make('xe.theme')->getTheme($id);
 
-        if($theme !== null) {
+        if ($theme !== null) {
             throw new \Exception("Theme[$theme] already exists.");
         }
 
@@ -217,13 +217,13 @@ 
     {
         $paths = explode('/', $file);
 
-        if($paths[0] === str_replace(base_path().'/', '', app('xe.plugin')->getPluginsDir())) {
+        if ($paths[0] === str_replace(base_path().'/', '', app('xe.plugin')->getPluginsDir())) {
             array_shift($paths);
         }
 
         $plugin = array_shift($paths);
 
-        if(app('xe.plugin')->getPlugin($plugin) === null) {
+        if (app('xe.plugin')->getPlugin($plugin) === null) {
             throw new \Exception("Unable to find a plugin to locate the theme file. plugin[$plugin] is not found.");
         }
 
@@ -251,7 +251,7 @@ 
     protected function getThemeDescription($id, $plugin)
     {
         $description = $this->option('description');
-        if(!$description) {
+        if (!$description) {
             $description = sprintf(
                 '%s theme from %s plugin.',
                 ucfirst(last(explode('@', $id))), ucfirst($plugin)
@@ -269,7 +269,7 @@ 
     protected function getThemeFile()
     {
         $filePath = $this->argument('file');
-        if(file_exists($filePath)) {
+        if (file_exists($filePath)) {
             throw new \Exception("file[$filePath] already exists.");
         }
         return $filePath;
@@ -288,7 +288,7 @@ 
     {
         $entity = \App::make('xe.plugin')->getPlugin($plugin);
         $viewFile = 'views/theme/'.$id.'.blade.php';
-        if(file_exists($entity->getPath($viewFile))) {
+        if (file_exists($entity->getPath($viewFile))) {
             throw new \Exception("template file[views/$viewFile] already exists.");
         }
         return $viewFile;
@@ -306,9 +306,9 @@ 
     protected function getCssPath($id, $plugin)
     {
         $entity = \App::make('xe.plugin')->getPlugin($plugin);
-        $file = strtolower(last(explode('@',$id)));
+        $file = strtolower(last(explode('@', $id)));
         $cssFile = 'assets/theme/'.$file.'.css';
-        if(file_exists($entity->getPath($cssFile))) {
+        if (file_exists($entity->getPath($cssFile))) {
             throw new \Exception("template file[views/$cssFile] already exists.");
         }
         return $cssFile;
@@ -344,8 +344,8 @@ 
             )
         );
 
-        while($confirm = $this->ask('Do you want to add theme? [yes|no]')) {
-            if($confirm === 'yes') {
+        while ($confirm = $this->ask('Do you want to add theme? [yes|no]')) {
+            if ($confirm === 'yes') {
                 return true;
             } else {
                 return false;
@@ -384,7 +384,7 @@ 
 
         $this->files->put(base_path($file), $code);
 
-        if(!class_exists($namespace.'\\'.$class)) {
+        if (!class_exists($namespace.'\\'.$class)) {
             $this->files->delete(base_path($file));
             throw new \Exception("Unable to load the theme class file[$file]. please check autoload setting of composer.json");
         }
@@ -449,11 +449,11 @@ 
 
                 if ($unescapeUnicode && function_exists('mb_convert_encoding')) {
                     // https://stackoverflow.com/questions/2934563/how-to-decode-unicode-escape-sequences-like-u00ed-to-proper-utf-8-encoded-cha
-                    $buffer = preg_replace_callback('/(\\\\+)u([0-9a-f]{4})/i', function ($match) {
+                    $buffer = preg_replace_callback('/(\\\\+)u([0-9a-f]{4})/i', function($match) {
                         $l = strlen($match[1]);
 
                         if ($l % 2) {
-                            return str_repeat('\\', $l - 1) . mb_convert_encoding(
+                            return str_repeat('\\', $l - 1).mb_convert_encoding(
                                 pack('H*', $match[2]),
                                 'UTF-8',
                                 'UCS-2BE'
@@ -529,7 +529,7 @@ 
         $this->originComposerStr = $composerStr;
         $json = json_decode($composerStr, true);
         $component = data_get($json, 'extra.xpressengine.component');
-        if(isset($component[$id])) {
+        if (isset($component[$id])) {
             throw new \Exception(sprintf('component[%s] already exists.', $id));
         }
         $component[$id] = [];
@@ -588,7 +588,7 @@ 
     protected function clean($file, $plugin, $template, $css)
     {
         // delete theme class file
-        if(is_writable(base_path($file))) {
+        if (is_writable(base_path($file))) {
             $this->files->delete(base_path($file));
         }
 
@@ -596,19 +596,19 @@ 
 
         // unregister component from composer.json
         $composerFile = $pluginEntity->getPath('composer.json');
-        if($this->originComposerStr !== null && is_writable($composerFile)) {
+        if ($this->originComposerStr !== null && is_writable($composerFile)) {
             $this->files->put($composerFile, $this->originComposerStr);
         }
 
         // delete template file
         $templateFile = $pluginEntity->getPath($template);
-        if(is_writable($templateFile)) {
+        if (is_writable($templateFile)) {
             $this->files->delete($templateFile);
         }
 
         // delete css file
         $cssFile = $pluginEntity->getPath($css);
-        if(is_writable($cssFile)) {
+        if (is_writable($cssFile)) {
             $this->files->delete($cssFile);
         }
     }

app/Console/Commands/StorageOptimize.php

Spacing +9 added lines, -9 removed lines

@@ -51,7 +51,7 @@ 
 
         $loop = 0;
         try {
-            while(true) {
+            while (true) {
                 $files = $this->storage->paginate(['useCount' => 0, 'parentId' => null], 20);
                 if (count($files) < 1) {
                     break;
@@ -82,7 +82,7 @@ 
 
     private function intercept()
     {
-        intercept('XeStorage@remove', 'storage.optimize.log', function ($target, $file) {
+        intercept('XeStorage@remove', 'storage.optimize.log', function($target, $file) {
 
             $this->bag[] = $file;
 
@@ -102,22 +102,22 @@ 
             switch ($verbosity) {
                 case 2:
                     if ($file->parentId === null) {
-                        $this->info("\t" . $file->clientname);
+                        $this->info("\t".$file->clientname);
                     }
                     break;
                 case 3:
                     if ($file->parentId === null) {
-                        $this->line("\t" .
-                            $file->disk . "\t" .
-                            "<info>" . $file->clientname . "</info>\t" .
+                        $this->line("\t".
+                            $file->disk."\t".
+                            "<info>".$file->clientname."</info>\t".
                             bytes($file->size)
                         );
                     }
                     break;
                 case 4:
-                    $this->line("\t" .
-                        $file->disk . "\t" .
-                        "<info>" . $file->clientname . "</info>\t" .
+                    $this->line("\t".
+                        $file->disk."\t".
+                        "<info>".$file->clientname."</info>\t".
                         bytes($file->size)
                     );
                     break;