xpressengine / xpressengine

core/src/Xpressengine/Theme/ThemeHandler.php

Spacing +3 added lines, -3 removed lines

@@ -237,7 +237,7 @@ 
      */
     public function getMobileResolver()
     {
-        return $this->mobileResolver ?: function () {
+        return $this->mobileResolver ?: function() {
         };
     }
 
@@ -299,7 +299,7 @@ 
         $skins = $this->getList($target, $isSettings);
         return array_where(
             $skins,
-            function ($id, $entity) {
+            function($id, $entity) {
                 /** @var SkinEntity $entity */
                 return $entity->supportMobile();
             }
@@ -319,7 +319,7 @@ 
         $skins = $this->getList($target, $isSettings);
         return array_where(
             $skins,
-            function ($id, $entity) {
+            function($id, $entity) {
                 /** @var SkinEntity $entity */
                 return $entity->supportDesktop();
             }

core/src/Xpressengine/User/UserHandler.php

Doc Comments +1 added lines, -1 removed lines

@@ -514,7 +514,7 @@
      * @param UserInterface $user     user
      * @param array         $userData user data
      *
-     * @return UserInterface|static
+     * @return UserInterface
      */
     public function update(UserInterface $user, $userData)
     {

core/src/Xpressengine/User/Repositories/RepositoryTrait.php

Spacing +1 added lines, -1 removed lines

@@ -333,6 +333,6 @@
      */
     public function setModel($model)
     {
-        $this->model = '\\' . ltrim($model, '\\');
+        $this->model = '\\'.ltrim($model, '\\');
     }
 }

core/src/Xpressengine/User/UserProvider.php

Spacing +2 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
             if (!str_contains($email, '@')) {
                 $emailPrefix = $email;
 
-                $query = $query->whereHas('emails', function ($q) use ($emailPrefix) {
+                $query = $query->whereHas('emails', function($q) use ($emailPrefix) {
                     $q->where('address', 'like', $emailPrefix.'@%');
                 })->get();
 
@@ -67,7 +67,7 @@ 
                     return null;
                 }
             } else {
-                $user = $query->whereHas('emails', function ($q) use ($email) {
+                $user = $query->whereHas('emails', function($q) use ($email) {
                     $q->where('address', $email);
                 })->first();
             }

app/Http/Controllers/MenuController.php

Indentation +1 added lines, -1 removed lines

@@ -824,7 +824,7 @@
 
         XeDB::commit();
 
-		return Redirect::back()->with('alert', ['type' => 'success', 'message' => 'success']);
+        return Redirect::back()->with('alert', ['type' => 'success', 'message' => 'success']);
     }
 
     /**

Doc Comments +5 added lines, -2 removed lines

@@ -108,7 +108,7 @@ 
      *
      * @param MenuHandler $handler menu handler
      *
-     * @return mixed
+     * @return RedirectResponse
      * @throws Exception
      */
     public function store(MenuHandler $handler)
@@ -453,7 +453,7 @@ 
      * @param MenuHandler     $handler menu handler
      * @param string          $menuId  where to store
      *
-     * @return $this|RedirectResponse
+     * @return RedirectResponse
      * @throws Exception
      */
     public function storeItem(MenuHandler $handler, $menuId)
@@ -643,6 +643,9 @@ 
 
     }
 
+    /**
+     * @param string $name
+     */
     protected function registerItemImage(MenuItem $item, $name)
     {
         $columnKeyName = $name . 'Id';

Spacing +3 added lines, -3 removed lines

@@ -356,7 +356,7 @@ 
 
     protected function inputFilterParser($prefix, $inputs = [])
     {
-        $inputs = array_where($inputs, function ($key, $value) use ($prefix) {
+        $inputs = array_where($inputs, function($key, $value) use ($prefix) {
             return starts_with($key, $prefix);
         });
 
@@ -645,7 +645,7 @@ 
 
     protected function registerItemImage(MenuItem $item, $name)
     {
-        $columnKeyName = $name . 'Id';
+        $columnKeyName = $name.'Id';
 
         if ($uploadImg = Request::file($name)) {
             $image = XeMedia::make(XeStorage::upload($uploadImg, 'menu'));
@@ -657,7 +657,7 @@ 
 
             $item->{$columnKeyName} = $image->getKey();
         } else {
-            $key = 'remove' . ucfirst($name);
+            $key = 'remove'.ucfirst($name);
             if (Request::get($key) && $item->{$columnKeyName} !== null) {
                 XeStorage::unBind($item->getKey(), $item->{$name});
                 $item->{$columnKeyName} = null;

app/Console/Commands/ThemeMakeCommand.php

Doc Comments +23 added lines, -20 removed lines

@@ -51,7 +51,7 @@ 
     /**
      * Execute the console command.
      *
-     * @return bool|null
+     * @return false|null
      */
     public function fire()
     {
@@ -96,7 +96,7 @@ 
     /**
      * makeDirectory
      *
-     * @param $path
+     * @param string $path
      *
      * @return void
      */
@@ -149,7 +149,7 @@ 
      * replaceCode
      *
      * @param $stub
-     * @param $search
+     * @param string $search
      * @param $replace
      *
      * @return $this
@@ -163,6 +163,7 @@ 
     /**
      * Get the stub file for the generator.
      *
+     * @param string $filename
      * @return string
      */
     protected function getStub($filename)
@@ -278,7 +279,7 @@ 
     /**
      * getTemplatePath
      *
-     * @param $id
+     * @param string $id
      * @param $plugin
      *
      * @return string
@@ -318,15 +319,15 @@ 
      * confirmInfo
      *
      * @param $file
-     * @param $class
+     * @param string $class
      * @param $plugin
      * @param $id
      * @param $title
      * @param $description
-     * @param $template
-     * @param $css
+     * @param string $template
+     * @param string $css
      *
-     * @return bool
+     * @return boolean|null
      */
     protected function confirmInfo($file, $class, $plugin, $id, $title, $description, $template, $css)
     {
@@ -356,7 +357,7 @@ 
     /**
      * getThemeClass
      *
-     * @return array
+     * @return string[]
      */
     protected function getThemeClass()
     {
@@ -368,10 +369,12 @@ 
      * makeThemeClass
      *
      * @param $file
-     * @param $namespace
-     * @param $class
+     * @param string $namespace
+     * @param string $class
      * @param $plugin
-     * @param $template
+     * @param string $template
+     * @param string $templateView
+     * @param string $css
      *
      * @return void
      * @throws \Exception
@@ -396,7 +399,7 @@ 
      * @param $class
      * @param $m
      *
-     * @return array
+     * @return string[]
      */
     protected function parseClassName($class)
     {
@@ -412,7 +415,7 @@ 
     /**
      * formatJson
      *
-     * @param      $json
+     * @param      string $json
      * @param bool $unescapeUnicode
      * @param bool $unescapeSlashes
      *
@@ -513,8 +516,8 @@ 
      * registerTheme
      *
      * @param $plugin
-     * @param $id
-     * @param $class
+     * @param string $id
+     * @param string $class
      * @param $title
      * @param $description
      *
@@ -547,7 +550,7 @@ 
      * makeTemplate
      *
      * @param $plugin
-     * @param $template
+     * @param string $template
      *
      * @return bool
      */
@@ -563,7 +566,7 @@ 
      * makeCss
      *
      * @param $plugin
-     * @param $css
+     * @param string $css
      *
      * @return bool
      */
@@ -580,8 +583,8 @@ 
      *
      * @param $file
      * @param $plugin
-     * @param $template
-     * @param $css
+     * @param string $template
+     * @param string $css
      *
      * @return void
      */

Unused Use Statements -2 removed lines

@@ -4,8 +4,6 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Filesystem\Filesystem;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Process\Process;
 
 class ThemeMakeCommand extends Command
 {

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;

app/Console/Commands/PutTranslation.php

Unused Use Statements -2 removed lines

@@ -14,10 +14,8 @@
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
-use Xpressengine\Database\VirtualConnectionInterface;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
-use Xpressengine\Database\DatabaseHandler;
 use Xpressengine\Translation\Translator;
 
 /**

Spacing +3 added lines, -3 removed lines

@@ -89,7 +89,7 @@ 
             $dir = dir($dirPath);
 
             while ($entry = $dir->read()) {
-                $path = $dirPath . DIRECTORY_SEPARATOR . $entry;
+                $path = $dirPath.DIRECTORY_SEPARATOR.$entry;
                 if (is_dir($path)) {
                     continue;
                 }
@@ -115,10 +115,10 @@ 
     {
         if (!$name) {
             // core language
-            return base_path('resources') . DIRECTORY_SEPARATOR . 'lang';
+            return base_path('resources').DIRECTORY_SEPARATOR.'lang';
         }
 
-        return base_path('plugins') . DIRECTORY_SEPARATOR . $name . DIRECTORY_SEPARATOR . 'langs';
+        return base_path('plugins').DIRECTORY_SEPARATOR.$name.DIRECTORY_SEPARATOR.'langs';
     }
 
     /**

app/Http/Controllers/InstallController.php

Unused Use Statements -1 removed lines

@@ -1,7 +1,6 @@
 <?php
 namespace App\Http\Controllers;
 
-use Xpressengine\Http\Request;
 use View;
 use Artisan;
 use File;

Spacing +2 added lines, -2 removed lines

@@ -83,8 +83,8 @@
         $this->checkSystem();
 
 
-        $appKeyPath = storage_path('app') . '/appKey';
-        $configPath = storage_path('app') . '/installConfig';
+        $appKeyPath = storage_path('app').'/appKey';
+        $configPath = storage_path('app').'/installConfig';
 
         $string = Yaml::dump([
             'site' => [