xpressengine / xpressengine

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' => [

app/Http/Controllers/MenuController.php

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;

core/src/Xpressengine/Category/Models/CategoryItem.php

Unused Use Statements -1 removed lines

@@ -13,7 +13,6 @@
  */
 namespace Xpressengine\Category\Models;
 
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Xpressengine\Support\Tree\Node;

resources/FieldTypes/Category.php

Unused Use Statements -2 removed lines

@@ -4,12 +4,10 @@
  */
 namespace Xpressengine\FieldTypes;
 
-use Xpressengine\Database\DynamicQuery;
 use Xpressengine\DynamicField\AbstractType;
 use Xpressengine\DynamicField\ColumnEntity;
 use Xpressengine\DynamicField\ColumnDataType;
 use Xpressengine\Config\ConfigEntity;
-use Illuminate\Database\Query\Builder;
 use Xpressengine\Category\Models\Category as CategoryModel;
 use Xpressengine\FieldSkins\Category\AfterTitle;
 use Xpressengine\FieldSkins\Category\BeforeTitle;

app/Http/Kernel.php

Spacing +3 added lines, -3 removed lines

@@ -74,7 +74,7 @@ 
 
     protected function isInstalled()
     {
-        return file_exists($this->app->storagePath() . '/app/installed');
+        return file_exists($this->app->storagePath().'/app/installed');
     }
 
     /**
@@ -95,11 +95,11 @@ 
      */
 	protected function resetProviders()
 	{
-        $this->app['events']->listen('bootstrapped: App\Bootstrappers\LoadConfiguration', function ($app) {
+        $this->app['events']->listen('bootstrapped: App\Bootstrappers\LoadConfiguration', function($app) {
             $config = $app['config'];
 
             $providers = $config['app.providers'];
-            $providers = array_filter($providers, function ($p) {
+            $providers = array_filter($providers, function($p) {
                 return substr($p, 0, strlen('Illuminate')) == 'Illuminate';
             });
 

app/Providers/InstallServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
     {
         echo 'Please Install XE3';
         exit;
-        $appKeyPath = storage_path('app') . '/appKey';
+        $appKeyPath = storage_path('app').'/appKey';
 
         if (File::exists($appKeyPath) === false) {
             File::put($appKeyPath, Str::random(32));

app/Console/Commands/XeInstall.php

Spacing +16 added lines, -16 removed lines

@@ -133,9 +133,9 @@ 
         } catch (\Exception $e) {
             $err = [
                 'Install fail!! Try again.',
-                ' message: ' . $e->getMessage(),
-                ' file: ' . $e->getFile(),
-                ' line: ' . $e->getLine(),
+                ' message: '.$e->getMessage(),
+                ' file: '.$e->getFile(),
+                ' line: '.$e->getLine(),
             ];
             $this->output->error(implode(PHP_EOL, $err));
             $note = [
@@ -329,13 +329,13 @@ 
         try {
             $this->setStorageDirPermission();
         } catch (\Exception $e) {
-            $this->error('Fail to change storage directory permission. Check directory after install.' . PHP_EOL . ' message: '. $e->getMessage());
+            $this->error('Fail to change storage directory permission. Check directory after install.'.PHP_EOL.' message: '.$e->getMessage());
         }
 
         try {
             $this->setBootCacheDirPermission();
         } catch (\Exception $e) {
-            $this->error('Fail to change bootstrap cache directory permission. Check directory after install.' . PHP_EOL . ' message: '. $e->getMessage());
+            $this->error('Fail to change bootstrap cache directory permission. Check directory after install.'.PHP_EOL.' message: '.$e->getMessage());
         }
     }
 
@@ -351,7 +351,7 @@ 
             . PHP_EOL
             . 'Your personal information will not be collected.'
         );
-        $answer = $this->askValidation('Do you agree to collect your system environmental information?', 'yes', function ($value) {
+        $answer = $this->askValidation('Do you agree to collect your system environmental information?', 'yes', function($value) {
             if (!in_array($value, ['yes', 'no'])) {
                 throw new \Exception('Input only yes or no.');
             }
@@ -488,13 +488,13 @@ 
      */
     private function configFileGenerate($key, array $data)
     {
-        $dir = config_path() . '/cms';
+        $dir = config_path().'/cms';
         $this->makeDir($dir);
 
         $data = $this->encodeArr2Str($data);
 
-        $file = $dir . "/{$key}.php";
-        file_put_contents($file, '<?php' . str_repeat(PHP_EOL, 2) . 'return [' . PHP_EOL . $data . '];' . PHP_EOL);
+        $file = $dir."/{$key}.php";
+        file_put_contents($file, '<?php'.str_repeat(PHP_EOL, 2).'return ['.PHP_EOL.$data.'];'.PHP_EOL);
     }
 
     /**
@@ -527,9 +527,9 @@ 
 
         foreach ($arr as $key => $val) {
             if (is_array($val)) {
-                $output .= $this->getIndent($depth) . "'{$key}' => " . '[' . PHP_EOL . $this->encodeArr2Str($val, $depth + 1) . $this->getIndent($depth) . '],' . PHP_EOL;
+                $output .= $this->getIndent($depth)."'{$key}' => ".'['.PHP_EOL.$this->encodeArr2Str($val, $depth + 1).$this->getIndent($depth).'],'.PHP_EOL;
             } else {
-                $output .= $this->getIndent($depth) . "'{$key}' => " . (is_int($val) ? $val : "'{$val}'") .',' . PHP_EOL;
+                $output .= $this->getIndent($depth)."'{$key}' => ".(is_int($val) ? $val : "'{$val}'").','.PHP_EOL;
             }
         }
 
@@ -583,7 +583,7 @@ 
         $siteInfo = $this->defaultInfos['site'];
 
         // site url
-        $siteInfo['url'] = $this->askValidation('site url', $siteInfo['url'], function ($url) {
+        $siteInfo['url'] = $this->askValidation('site url', $siteInfo['url'], function($url) {
             $url = trim($url, "/");
             if (filter_var($url, FILTER_VALIDATE_URL) === false) {
                 throw new \Exception('Invalid URL Format.');
@@ -592,7 +592,7 @@ 
         });
 
         // timezone
-        $siteInfo['timezone'] = $this->askValidation('Timezone', $siteInfo['timezone'], function ($timezone) {
+        $siteInfo['timezone'] = $this->askValidation('Timezone', $siteInfo['timezone'], function($timezone) {
             if (in_array($timezone, timezone_identifiers_list()) === false) {
                 throw new \Exception('Inputted timezone do not exist.');
             }
@@ -763,7 +763,7 @@ 
         $process = new Process(implode(' && ', $commands), $this->getBasePath(), null, null, null);
 
         $process->run(
-            function ($type, $line) {
+            function($type, $line) {
                 $this->line($line);
             }
         );
@@ -808,7 +808,7 @@ 
         $adminInfo = $this->defaultInfos['admin'];
 
         // email
-        $adminInfo['email'] = $this->askValidation('Email', $adminInfo['email'], function ($email) {
+        $adminInfo['email'] = $this->askValidation('Email', $adminInfo['email'], function($email) {
             $validate = \Validator::make(
                 ['email' => $email],
                 [
@@ -822,7 +822,7 @@ 
         });
 
         // displayName
-        $adminInfo['displayName'] = $this->askValidation('Name', $adminInfo['displayName'], function ($displayName) {
+        $adminInfo['displayName'] = $this->askValidation('Name', $adminInfo['displayName'], function($displayName) {
             if (strlen(trim($displayName)) === 0) {
                 throw new \Exception('Input Name');
             }

migrations/CategoryMigration.php

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
 
     public function install()
     {
-        Schema::create('category', function (Blueprint $table) {
+        Schema::create('category', function(Blueprint $table) {
             $table->engine = "InnoDB";
 
             $table->increments('id');
@@ -17,7 +17,7 @@ 
             $table->integer('count');
         });
 
-        Schema::create('category_item', function (Blueprint $table) {
+        Schema::create('category_item', function(Blueprint $table) {
             $table->engine = "InnoDB";
 
             $table->increments('id');
@@ -31,7 +31,7 @@ 
             $table->index('parentId');
         });
 
-        Schema::create('category_closure', function (Blueprint $table) {
+        Schema::create('category_closure', function(Blueprint $table) {
             $table->engine = "InnoDB";
 
             $table->bigIncrements('id');