xpressengine / xpressengine

app/Http/Controllers/Member/Settings/UserController.php

Unused Use Statements -1 removed lines

@@ -11,7 +11,6 @@
 use Xpressengine\Support\Exceptions\InvalidArgumentHttpException;
 use Xpressengine\User\Exceptions\EmailNotFoundException;
 use Xpressengine\User\Exceptions\MailAlreadyExistsException;
-use Xpressengine\User\Models\User;
 use Xpressengine\User\Rating;
 use Xpressengine\User\Repositories\UserRepository;
 use Xpressengine\User\UserHandler;

Spacing +3 added lines, -3 removed lines

@@ -49,7 +49,7 @@ 
         if ($group = $request->get('group')) {
             $query = $query->whereHas(
                 'groups',
-                function (Builder $q) use ($group) {
+                function(Builder $q) use ($group) {
                     $q->where('groupId', $group);
                 }
             );
@@ -67,7 +67,7 @@ 
 
         if ($keyword = $request->get('keyword')) {
             $query = $query->where(
-                function (Builder $q) use ($field, $keyword) {
+                function(Builder $q) use ($field, $keyword) {
                     foreach (explode(',', $field) as $f) {
                         $q->orWhere($f, 'like', '%'.$keyword.'%');
                     };
@@ -451,7 +451,7 @@ 
             return XePresenter::makeApi([]);
         }
 
-        $matchedMemberList = $users->query()->where('displayName', 'like', '%'.$keyword.'%')->paginate( null,
+        $matchedMemberList = $users->query()->where('displayName', 'like', '%'.$keyword.'%')->paginate(null,
             ['id', 'displayName', 'email']
         )->items();
 

app/Http/Controllers/SkinController.php

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 
 use Illuminate\Http\Request;
 use XePresenter;
-use XeSkin;
 use Validator;
 use Xpressengine\Skin\SkinHandler;
 use Xpressengine\Support\Exceptions\InvalidArgumentException;

app/Providers/StorageServiceProvider.php

Doc Comments +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
     /**
      * Get the services provided by the provider.
      *
-     * @return array
+     * @return string[]
      */
     public function provides()
     {

Spacing +5 added lines, -5 removed lines

@@ -58,11 +58,11 @@ 
      */
     public function register()
     {
-        $this->app->bind('xe.storage.temp', function ($app) {
+        $this->app->bind('xe.storage.temp', function($app) {
             return new TempFileCreator();
         }, true);
 
-        $this->app->bind('xe.storage', function ($app) {
+        $this->app->bind('xe.storage', function($app) {
             $distributor = new RoundRobinDistributor($app['config']['filesystems'], $app['xe.db']->connection());
 
             $proxyClass = $app['xe.interception']->proxy(Storage::class, 'XeStorage');
@@ -78,7 +78,7 @@ 
 
         $this->app->bind(Storage::class, 'xe.storage');
 
-        $this->app->bind('xe.storage.url', function ($app) {
+        $this->app->bind('xe.storage.url', function($app) {
             return new UrlMaker(
                 $app['Illuminate\Contracts\Routing\UrlGenerator'],
                 $app['config']['filesystems.disks']
@@ -88,8 +88,8 @@ 
         intercept(
             'XeSettings@getManageMenu',
             ['storage.managemenu' => ['before' => 'manage.sort']],
-            function ($target) {
-                $menu          = $target();
+            function($target) {
+                $menu = $target();
                 $menu['contents']['submenu']['file'] = [
                     'title' => '파일',
                     'description' => 'blur blur~',

app/Providers/UserServiceProvider.php

Doc Comments +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
     /**
      * Get the services provided by the provider.
      *
-     * @return array
+     * @return string[]
      */
     public function provides()
     {

Spacing +21 added lines, -21 removed lines

@@ -96,7 +96,7 @@ 
     {
         $this->app->singleton(
             'xe.auth',
-            function ($app) {
+            function($app) {
                 $proxyClass = $app['xe.interception']->proxy(Guard::class, 'Auth');
                 return new $proxyClass(
                     new UserProvider($app['hash'], User::class), $app['session.store'], $app['request']
@@ -115,7 +115,7 @@ 
     {
         $this->app->singleton(
             'auth.password',
-            function ($app) {
+            function($app) {
                 // The password token repository is responsible for storing the email addresses
                 // and password reset tokens. It will be used to verify the tokens are valid
                 // for the given e-mail addresses. We will resolve an implementation here.
@@ -132,7 +132,7 @@ 
 
                 // register validator for password
                 $broker->validator(
-                    function ($credentials) {
+                    function($credentials) {
                         try {
                             return app('xe.user')->validatePassword($credentials['password']);
                         } catch (\Exception $e) {
@@ -155,7 +155,7 @@ 
     {
         $this->app->singleton(
             'xe.auth.email',
-            function ($app) {
+            function($app) {
                 $view = $app['config']['auth.confirm.email'];
 
                 // The password broker uses a token repository to validate tokens and send user
@@ -170,12 +170,12 @@ 
     {
         $this->app->singleton(
             'xe.user.image',
-            function ($app) {
+            function($app) {
 
                 $profileImgConfig = config('xe.user.profileImage');
 
                 return new UserImageHandler(
-                    $app['xe.storage'], $app['xe.media'], function () {
+                    $app['xe.storage'], $app['xe.media'], function() {
                     return Thumbnailer::getManager();
                 }, $profileImgConfig
                 );
@@ -192,7 +192,7 @@ 
     {
         $this->app->singleton(
             'auth.password.tokens',
-            function ($app) {
+            function($app) {
                 $connection = $app['db']->connection();
 
                 // The database token repository is an implementation of the token repository
@@ -259,7 +259,7 @@ 
     {
         $this->app->singleton(
             'xe.user',
-            function ($app) {
+            function($app) {
                 $proxyClass = $app['xe.interception']->proxy(UserHandler::class, 'XeUser');
 
                 $userHandler = new $proxyClass(
@@ -298,7 +298,7 @@ 
     {
         $this->app->singleton(
             'xe.users',
-            function ($app) {
+            function($app) {
                 return new UserRepository(User::class);
             }
         );
@@ -314,7 +314,7 @@ 
     {
         $this->app->singleton(
             'xe.user.accounts',
-            function ($app) {
+            function($app) {
                 return new UserAccountRepository(UserAccount::class);
             }
         );
@@ -330,7 +330,7 @@ 
     {
         $this->app->singleton(
             'xe.user.groups',
-            function ($app) {
+            function($app) {
                 return new UserGroupRepository(UserGroup::class);
             }
         );
@@ -346,7 +346,7 @@ 
     {
         $this->app->singleton(
             'xe.user.virtualGroups',
-            function ($app) {
+            function($app) {
                 /** @var Closure $vGroups */
                 $vGroups = $app['config']->get('xe.group.virtualGroup.all');
                 /** @var Closure $getter */
@@ -361,7 +361,7 @@ 
     {
         $this->app->singleton(
             'xe.user.emails',
-            function ($app) {
+            function($app) {
                 return new UserEmailRepository(UserEmail::class);
             }
         );
@@ -369,7 +369,7 @@ 
 
         $this->app->singleton(
             'xe.user.pendingEmails',
-            function ($app) {
+            function($app) {
                 return new PendingEmailRepository(PendingEmail::class);
             }
         );
@@ -407,7 +407,7 @@ 
     {
         $this->app['auth']->extend(
             'xe',
-            function ($app) {
+            function($app) {
                 return $app['xe.auth'];
             }
         );
@@ -426,7 +426,7 @@ 
         // 도메인이 생략된 이메일 validation 추가
         $validator->extend(
             'email_prefix',
-            function ($attribute, $value, $parameters) {
+            function($attribute, $value, $parameters) {
                 if (!str_contains($value, '@')) {
                     $value .= '@test.com';
                 }
@@ -439,7 +439,7 @@ 
         $displayNameValidate = app('config')->get('xe.user.displayName.validate');
         $validator->extend(
             'display_name',
-            function ($attribute, $value, $parameters) use ($displayNameValidate) {
+            function($attribute, $value, $parameters) use ($displayNameValidate) {
                 return $displayNameValidate($value);
             }
         );
@@ -451,7 +451,7 @@ 
 
         $validator->extend(
             'password',
-            function ($attribute, $value, $parameters) use ($validate) {
+            function($attribute, $value, $parameters) use ($validate) {
                 return $validate($value);
             },
             $level['description']
@@ -499,9 +499,9 @@ 
         $storage = $this->app['xe.storage'];
         $media = $this->app['xe.media'];
         User::setProfileImageResolver(
-            function ($imageId) use ($default, $storage, $media) {
+            function($imageId) use ($default, $storage, $media) {
                 try {
-                    if($imageId !== null) {
+                    if ($imageId !== null) {
                         /** @var Storage $storage */
                         $file = File::find($imageId);
 
@@ -511,7 +511,7 @@ 
                             return asset($mediaFile->url());
                         }
                     }
-                } catch(\Exception $e) {
+                } catch (\Exception $e) {
                 }
 
                 return asset($default);

core/src/Xpressengine/Category/CategoryHandler.php

Doc Comments +2 added lines, -2 removed lines

@@ -84,7 +84,7 @@ 
      * Remove category
      *
      * @param Category $category category object
-     * @return bool
+     * @return boolean|null
      */
     public function remove(Category $category)
     {
@@ -158,7 +158,7 @@ 
      *
      * @param CategoryItem $item  item object
      * @param bool         $force if true then remove all descendant
-     * @return bool
+     * @return boolean|null
      */
     public function removeItem(CategoryItem $item, $force = true)
     {

Spacing +10 added lines, -10 removed lines

@@ -259,8 +259,8 @@ 
         $descendant = $item->getDescendantName();
         $depth = $item->getDepthName();
 
-        $select = $conn->table($table . ' as a')
-            ->joinWhere($table . ' as d', "d.{$ancestor}", '=', $item->getKey())
+        $select = $conn->table($table.' as a')
+            ->joinWhere($table.' as d', "d.{$ancestor}", '=', $item->getKey())
             ->where("a.{$descendant}", '=', $parent->getKey())
             ->select([
                 "a.{$ancestor}",
@@ -270,7 +270,7 @@ 
 
         $bindings = $select->getBindings();
 
-        $insertQuery = sprintf("insert into %s (`{$ancestor}`, `{$descendant}`, `{$depth}`) ", $prefix . $table)
+        $insertQuery = sprintf("insert into %s (`{$ancestor}`, `{$descendant}`, `{$depth}`) ", $prefix.$table)
             . $select->toSql();
 
         return $conn->insert($insertQuery, $bindings);
@@ -290,12 +290,12 @@ 
         $ancestor = $item->getAncestorName();
         $descendant = $item->getDescendantName();
 
-        $rows = $conn->table($table . ' as a')
-            ->join($table . ' as rel', "a.{$ancestor}", '=', "rel.{$ancestor}")
-            ->join($table . ' as d', "d.{$descendant}", '=', "rel.{$descendant}")
+        $rows = $conn->table($table.' as a')
+            ->join($table.' as rel', "a.{$ancestor}", '=', "rel.{$ancestor}")
+            ->join($table.' as d', "d.{$descendant}", '=', "rel.{$descendant}")
             ->where("a.{$descendant}", $parent->getKey())
             ->where("d.{$ancestor}", $item->getKey())
-            ->get(['rel.' . $item->getKeyName()]);
+            ->get(['rel.'.$item->getKeyName()]);
 
         $ids = array_column($rows, $item->getKeyName());
 
@@ -319,7 +319,7 @@ 
         }
 
         /** @var Collection $children */
-        $children = $children->filter(function (CategoryItem $model) use ($item) {
+        $children = $children->filter(function(CategoryItem $model) use ($item) {
             return $model->getKey() != $item->getKey();
         });
 
@@ -327,7 +327,7 @@ 
             ->merge([$item])
             ->merge($children->slice($position));
 
-        $children->each(function (CategoryItem $model, $idx) {
+        $children->each(function(CategoryItem $model, $idx) {
             $model->{$model->getOrderKeyName()} = $idx;
             $model->save();
         });
@@ -351,7 +351,7 @@ 
      */
     public function setModel($model)
     {
-        $this->model = '\\' . ltrim($model, '\\');
+        $this->model = '\\'.ltrim($model, '\\');
     }
 
     /**

core/src/Xpressengine/Database/DynamicQuery.php

Doc Comments +2 added lines, -2 removed lines

@@ -340,7 +340,7 @@ 
      * get list
      *
      * @param array $columns get columns list
-     * @return array|static[]
+     * @return integer
      */
     public function count($columns = '*')
     {
@@ -436,7 +436,7 @@ 
      *
      * @param int   $perPage count of list
      * @param array $columns get columns
-     * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
+     * @return \Illuminate\Pagination\Paginator
      */
     public function simplePaginate($perPage = 15, $columns = ['*'], $pageName = 'page')
     {

core/src/Xpressengine/Document/Models/Document.php

Unused Use Statements -1 removed lines

@@ -16,7 +16,6 @@
 use Xpressengine\Config\ConfigEntity;
 use Xpressengine\Database\Eloquent\DynamicModel;
 use Xpressengine\Document\Exceptions\NotAllowedTypeException;
-use Xpressengine\Document\Exceptions\DocumentNotFoundException;
 use Xpressengine\Document\Exceptions\ReplyLimitationException;
 use Xpressengine\Document\Exceptions\ValueRequiredException;
 use Illuminate\Database\Eloquent\Builder as OriginBuilder;

Doc Comments +1 added lines, -1 removed lines

@@ -428,7 +428,7 @@
     /**
      * 덧글의 depth 반환
      *
-     * @return float
+     * @return integer
      */
     public function getDepth()
     {

Spacing +8 added lines, -8 removed lines

@@ -339,7 +339,7 @@ 
     {
         $timestamp = time();
         if ($this->parentId == null || $this->parentId == '') {
-            $this->setAttribute('head', $timestamp . '-' . $this->id);
+            $this->setAttribute('head', $timestamp.'-'.$this->id);
         } elseif ($this->parentId !== $this->id) {
             $parent = static::find($this->parentId);
             if ($parent === null) {
@@ -348,7 +348,7 @@ 
             $this->setAttribute('reply', $this->getReplyChar($parent));
             $this->setAttribute('head', $parent->head);
         }
-        $this->setAttribute('listOrder', $this->head . (isset($this->reply) ? $this->reply : ''));
+        $this->setAttribute('listOrder', $this->head.(isset($this->reply) ? $this->reply : ''));
     }
 
     /**
@@ -381,7 +381,7 @@ 
     protected function getReplyChar(Document $parent)
     {
         $lastReply = self::where('head', $parent->head)
-            ->where('reply', 'like', $parent->reply . str_repeat('_', self::$replyCharLen))
+            ->where('reply', 'like', $parent->reply.str_repeat('_', self::$replyCharLen))
             ->max('reply');
 
         $lastChar = null;
@@ -389,7 +389,7 @@ 
             $lastChar = substr($lastReply, -1 * self::getReplyCharLen());
         }
 
-        return $parent->reply . $this->makeReplyChar($lastChar);
+        return $parent->reply.$this->makeReplyChar($lastChar);
     }
 
     /**
@@ -408,15 +408,15 @@ 
             return str_repeat($std[0], self::getReplyCharLen());
         }
 
-        if ($prevChars[strlen($prevChars)-1] == end($std)) {
+        if ($prevChars[strlen($prevChars) - 1] == end($std)) {
             if (strlen($prevChars) < 2) {
                 throw new ReplyLimitationException;
             }
             reset($std);
-            $new = $this->makeReplyChar(substr($prevChars, 0, strlen($prevChars)-1)) . current($std);
+            $new = $this->makeReplyChar(substr($prevChars, 0, strlen($prevChars) - 1)).current($std);
         } else {
-            $key = array_search($prevChars[strlen($prevChars)-1], $std);
-            $new = substr($prevChars, 0, strlen($prevChars)-1) . $std[$key + 1];
+            $key = array_search($prevChars[strlen($prevChars) - 1], $std);
+            $new = substr($prevChars, 0, strlen($prevChars) - 1).$std[$key + 1];
         }
 
         return $new;

core/src/Xpressengine/Media/MediaManager.php

Doc Comments +2 added lines, -2 removed lines

@@ -149,7 +149,7 @@ 
      * 파일이 특정 미디어 타입과 매칭된다며 해당 타입 반환
      *
      * @param File $file file instance
-     * @return string|null
+     * @return integer|null
      */
     public function getFileType(File $file)
     {
@@ -212,7 +212,7 @@ 
      * 미디어 삭제
      *
      * @param Media $media media instance
-     * @return bool
+     * @return boolean|null
      */
     public function remove(Media $media)
     {

core/src/Xpressengine/Permission/PermissionHandler.php

Doc Comments +1 added lines, -1 removed lines

@@ -231,7 +231,7 @@
      *
      * @param string $name    permission name
      * @param string $siteKey site key name
-     * @return Permission|null
+     * @return Permission
      */
     public function findOrNew($name, $siteKey = 'default')
     {

Spacing +3 added lines, -3 removed lines

@@ -171,7 +171,7 @@ 
      */
     protected function makeKeyForLoaded($siteKey, $name)
     {
-        return $siteKey .'-'. $name;
+        return $siteKey.'-'.$name;
     }
 
     /**
@@ -199,7 +199,7 @@ 
     protected function setAncestor(Permission $permission)
     {
         $ancestors = $this->repo->fetchAncestor($permission);
-        usort($ancestors, function (Permission $a, Permission $b) {
+        usort($ancestors, function(Permission $a, Permission $b) {
             if ($a->getDepth() == $b->getDepth()) {
                 return 0;
             }
@@ -306,7 +306,7 @@ 
         $permission = $this->loaded[$this->makeKeyForLoaded($siteKey, $name)];
         $descendants = $this->repo->fetchDescendant($permission);
 
-        usort($descendants, function (Permission $a, Permission $b) {
+        usort($descendants, function(Permission $a, Permission $b) {
             if ($a->getDepth() == $b->getDepth()) {
                 return 0;
             }