Apply fixes from StyleCI

flarum · Jun 16, 2024 · 453d272 · 453d272
1 parent f04542e
commit 453d272
Show file tree

Hide file tree

Showing 24 changed files with 117 additions and 115 deletions.
diff --git a/extensions/akismet/src/Akismet.php b/extensions/akismet/src/Akismet.php
@@ -50,7 +50,7 @@ protected function sendRequest(string $type): ResponseInterface
         $client = new Client();
 
         return $client->request('POST', "$this->apiUrl/$type", [
-            'headers'     => [
+            'headers' => [
                 'User-Agent' => "Flarum/$this->flarumVersion | Akismet/$this->extensionVersion",
             ],
             'form_params' => $this->params,

diff --git a/extensions/flags/src/AddCanFlagAttribute.php b/extensions/flags/src/AddCanFlagAttribute.php
@@ -40,6 +40,7 @@ protected function checkFlagOwnPostSetting(User $actor, Post $post): bool
             // If $actor is the post author, check to see if the setting is enabled
             return (bool) $this->settings->get('flarum-flags.can_flag_own');
         }
+
         // $actor is not the post author
         return true;
     }

diff --git a/extensions/flags/src/Api/Serializer/FlagSerializer.php b/extensions/flags/src/Api/Serializer/FlagSerializer.php
@@ -31,10 +31,10 @@ protected function getDefaultAttributes($flag)
         }
 
         return [
-            'type'         => $flag->type,
-            'reason'       => $flag->reason,
+            'type' => $flag->type,
+            'reason' => $flag->reason,
             'reasonDetail' => $flag->reason_detail,
-            'createdAt'    => $this->formatDate($flag->created_at),
+            'createdAt' => $this->formatDate($flag->created_at),
         ];
     }
 

diff --git a/extensions/tags/src/Api/Serializer/TagSerializer.php b/extensions/tags/src/Api/Serializer/TagSerializer.php
@@ -47,19 +47,19 @@ protected function getDefaultAttributes($tag)
         }
 
         $attributes = [
-            'name'               => $tag->name,
-            'description'        => $tag->description,
-            'slug'               => $this->slugManager->forResource(Tag::class)->toSlug($tag),
-            'color'              => $tag->color,
-            'backgroundUrl'      => $tag->background_path,
-            'backgroundMode'     => $tag->background_mode,
-            'icon'               => $tag->icon,
-            'discussionCount'    => (int) $tag->discussion_count,
-            'position'           => $tag->position === null ? null : (int) $tag->position,
-            'defaultSort'        => $tag->default_sort,
-            'isChild'            => (bool) $tag->parent_id,
-            'isHidden'           => (bool) $tag->is_hidden,
-            'lastPostedAt'       => $this->formatDate($tag->last_posted_at),
+            'name' => $tag->name,
+            'description' => $tag->description,
+            'slug' => $this->slugManager->forResource(Tag::class)->toSlug($tag),
+            'color' => $tag->color,
+            'backgroundUrl' => $tag->background_path,
+            'backgroundMode' => $tag->background_mode,
+            'icon' => $tag->icon,
+            'discussionCount' => (int) $tag->discussion_count,
+            'position' => $tag->position === null ? null : (int) $tag->position,
+            'defaultSort' => $tag->default_sort,
+            'isChild' => (bool) $tag->parent_id,
+            'isHidden' => (bool) $tag->is_hidden,
+            'lastPostedAt' => $this->formatDate($tag->last_posted_at),
             'canStartDiscussion' => $this->actor->can('startDiscussion', $tag),
             'canAddToDiscussion' => $this->actor->can('addToDiscussion', $tag)
         ];

diff --git a/extensions/tags/tests/integration/RetrievesRepresentativeTags.php b/extensions/tags/tests/integration/RetrievesRepresentativeTags.php
@@ -27,7 +27,7 @@ protected function tags()
             ['id' => 11, 'name' => 'Secondary Restricted', 'slug' => 'secondary-restricted', 'position' => null, 'parent_id' => null, 'is_restricted' => true],
             ['id' => 12, 'name' => 'Primary Restricted 2', 'slug' => 'primary-2-restricted', 'position' => 100, 'parent_id' => null, 'is_restricted' => true],
             ['id' => 13, 'name' => 'Primary Restricted 2 Child 1', 'slug' => 'primary-2-restricted-child-1', 'position' => 101, 'parent_id' => 12],
-            ['id' => 14, 'name' => 'Primary Restricted 3', 'slug' => 'primary-3-restricted', 'position' => 102, 'parent_id' =>null, 'is_restricted' => true],
+            ['id' => 14, 'name' => 'Primary Restricted 3', 'slug' => 'primary-3-restricted', 'position' => 102, 'parent_id' => null, 'is_restricted' => true],
         ];
     }
 }
diff --git a/framework/core/src/Api/Serializer/BasicDiscussionSerializer.php b/framework/core/src/Api/Serializer/BasicDiscussionSerializer.php
@@ -46,7 +46,7 @@ protected function getDefaultAttributes($discussion)
 
         return [
             'title' => $discussion->title,
-            'slug' =>  $this->slugManager->forResource(Discussion::class)->toSlug($discussion),
+            'slug' => $this->slugManager->forResource(Discussion::class)->toSlug($discussion),
         ];
     }
 

diff --git a/framework/core/src/Api/Serializer/BasicPostSerializer.php b/framework/core/src/Api/Serializer/BasicPostSerializer.php
@@ -53,8 +53,8 @@ protected function getDefaultAttributes($post)
         }
 
         $attributes = [
-            'number'      => (int) $post->number,
-            'createdAt'   => $this->formatDate($post->created_at),
+            'number' => (int) $post->number,
+            'createdAt' => $this->formatDate($post->created_at),
             'contentType' => $post->type
         ];
 

diff --git a/framework/core/src/Api/Serializer/BasicUserSerializer.php b/framework/core/src/Api/Serializer/BasicUserSerializer.php
@@ -45,10 +45,10 @@ protected function getDefaultAttributes($user)
         }
 
         return [
-            'username'    => $user->username,
+            'username' => $user->username,
             'displayName' => $user->display_name,
-            'avatarUrl'   => $user->avatar_url,
-            'slug'        => $this->slugManager->forResource(User::class)->toSlug($user)
+            'avatarUrl' => $user->avatar_url,
+            'slug' => $this->slugManager->forResource(User::class)->toSlug($user)
         ];
     }
 

diff --git a/framework/core/src/Api/Serializer/CurrentUserSerializer.php b/framework/core/src/Api/Serializer/CurrentUserSerializer.php
@@ -20,13 +20,13 @@ protected function getDefaultAttributes($user)
         $attributes = parent::getDefaultAttributes($user);
 
         $attributes += [
-            'isEmailConfirmed'         => (bool) $user->is_email_confirmed,
-            'email'                    => $user->email,
-            'markedAllAsReadAt'        => $this->formatDate($user->marked_all_as_read_at),
-            'unreadNotificationCount'  => (int) $user->getUnreadNotificationCount(),
-            'newNotificationCount'     => (int) $user->getNewNotificationCount(),
-            'preferences'              => (array) $user->preferences,
-            'isAdmin'                  => $user->isAdmin(),
+            'isEmailConfirmed' => (bool) $user->is_email_confirmed,
+            'email' => $user->email,
+            'markedAllAsReadAt' => $this->formatDate($user->marked_all_as_read_at),
+            'unreadNotificationCount' => (int) $user->getUnreadNotificationCount(),
+            'newNotificationCount' => (int) $user->getNewNotificationCount(),
+            'preferences' => (array) $user->preferences,
+            'isAdmin' => $user->isAdmin(),
         ];
 
         return $attributes;

diff --git a/framework/core/src/Api/Serializer/DiscussionSerializer.php b/framework/core/src/Api/Serializer/DiscussionSerializer.php
@@ -19,15 +19,15 @@ class DiscussionSerializer extends BasicDiscussionSerializer
     protected function getDefaultAttributes($discussion)
     {
         $attributes = parent::getDefaultAttributes($discussion) + [
-            'commentCount'      => (int) $discussion->comment_count,
-            'participantCount'  => (int) $discussion->participant_count,
-            'createdAt'         => $this->formatDate($discussion->created_at),
-            'lastPostedAt'      => $this->formatDate($discussion->last_posted_at),
-            'lastPostNumber'    => (int) $discussion->last_post_number,
-            'canReply'          => $this->actor->can('reply', $discussion),
-            'canRename'         => $this->actor->can('rename', $discussion),
-            'canDelete'         => $this->actor->can('delete', $discussion),
-            'canHide'           => $this->actor->can('hide', $discussion)
+            'commentCount' => (int) $discussion->comment_count,
+            'participantCount' => (int) $discussion->participant_count,
+            'createdAt' => $this->formatDate($discussion->created_at),
+            'lastPostedAt' => $this->formatDate($discussion->last_posted_at),
+            'lastPostNumber' => (int) $discussion->last_post_number,
+            'canReply' => $this->actor->can('reply', $discussion),
+            'canRename' => $this->actor->can('rename', $discussion),
+            'canDelete' => $this->actor->can('delete', $discussion),
+            'canHide' => $this->actor->can('hide', $discussion)
         ];
 
         if ($discussion->hidden_at) {

diff --git a/framework/core/src/Api/Serializer/ForumSerializer.php b/framework/core/src/Api/Serializer/ForumSerializer.php
@@ -89,7 +89,7 @@ protected function getDefaultAttributes($model): array
             'headerHtml' => $this->settings->get('custom_header'),
             'footerHtml' => $this->settings->get('custom_footer'),
             'allowSignUp' => (bool) $this->settings->get('allow_sign_up'),
-            'defaultRoute'  => $this->settings->get('default_route'),
+            'defaultRoute' => $this->settings->get('default_route'),
             'canViewForum' => $this->actor->can('viewForum'),
             'canStartDiscussion' => $this->actor->can('startDiscussion'),
             'canSearchUsers' => $this->actor->can('searchUsers'),

diff --git a/framework/core/src/Api/Serializer/GroupSerializer.php b/framework/core/src/Api/Serializer/GroupSerializer.php
@@ -49,10 +49,10 @@ protected function getDefaultAttributes($group)
 
         return [
             'nameSingular' => $this->translateGroupName($group->name_singular),
-            'namePlural'   => $this->translateGroupName($group->name_plural),
-            'color'        => $group->color,
-            'icon'         => $group->icon,
-            'isHidden'     => $group->is_hidden
+            'namePlural' => $this->translateGroupName($group->name_plural),
+            'color' => $group->color,
+            'icon' => $group->icon,
+            'isHidden' => $group->is_hidden
         ];
     }
 

diff --git a/framework/core/src/Api/Serializer/NotificationSerializer.php b/framework/core/src/Api/Serializer/NotificationSerializer.php
@@ -43,9 +43,9 @@ protected function getDefaultAttributes($notification)
 
         return [
             'contentType' => $notification->type,
-            'content'     => $notification->data,
-            'createdAt'   => $this->formatDate($notification->created_at),
-            'isRead'      => (bool) $notification->read_at
+            'content' => $notification->data,
+            'createdAt' => $this->formatDate($notification->created_at),
+            'isRead' => (bool) $notification->read_at
         ];
     }
 

diff --git a/framework/core/src/Api/Serializer/PostSerializer.php b/framework/core/src/Api/Serializer/PostSerializer.php
@@ -45,9 +45,9 @@ protected function getDefaultAttributes($post)
         }
 
         $attributes += [
-            'canEdit'   => $canEdit,
+            'canEdit' => $canEdit,
             'canDelete' => $this->actor->can('delete', $post),
-            'canHide'   => $this->actor->can('hide', $post)
+            'canHide' => $this->actor->can('hide', $post)
         ];
 
         return $attributes;

diff --git a/framework/core/src/Api/Serializer/UserSerializer.php b/framework/core/src/Api/Serializer/UserSerializer.php
@@ -20,13 +20,13 @@ protected function getDefaultAttributes($user)
         $attributes = parent::getDefaultAttributes($user);
 
         $attributes += [
-            'joinTime'           => $this->formatDate($user->joined_at),
-            'discussionCount'    => (int) $user->discussion_count,
-            'commentCount'       => (int) $user->comment_count,
-            'canEdit'            => $this->actor->can('edit', $user),
+            'joinTime' => $this->formatDate($user->joined_at),
+            'discussionCount' => (int) $user->discussion_count,
+            'commentCount' => (int) $user->comment_count,
+            'canEdit' => $this->actor->can('edit', $user),
             'canEditCredentials' => $this->actor->can('editCredentials', $user),
-            'canEditGroups'      => $this->actor->can('editGroups', $user),
-            'canDelete'          => $this->actor->can('delete', $user),
+            'canEditGroups' => $this->actor->can('editGroups', $user),
+            'canDelete' => $this->actor->can('delete', $user),
         ];
 
         if ($user->getPreference('discloseOnline') || $this->actor->can('viewLastSeenAt', $user)) {
@@ -38,7 +38,7 @@ protected function getDefaultAttributes($user)
         if ($attributes['canEditCredentials'] || $this->actor->id === $user->id) {
             $attributes += [
                 'isEmailConfirmed' => (bool) $user->is_email_confirmed,
-                'email'            => $user->email
+                'email' => $user->email
             ];
         }
 

diff --git a/framework/core/src/Extension/Extension.php b/framework/core/src/Extension/Extension.php
@@ -510,15 +510,15 @@ public function migrate(Migrator $migrator, $direction = 'up')
     public function toArray()
     {
         return (array) array_merge([
-            'id'                     => $this->getId(),
-            'version'                => $this->getVersion(),
-            'path'                   => $this->getPath(),
-            'icon'                   => $this->getIcon(),
-            'hasAssets'              => $this->hasAssets(),
-            'hasMigrations'          => $this->hasMigrations(),
+            'id' => $this->getId(),
+            'version' => $this->getVersion(),
+            'path' => $this->getPath(),
+            'icon' => $this->getIcon(),
+            'hasAssets' => $this->hasAssets(),
+            'hasMigrations' => $this->hasMigrations(),
             'extensionDependencyIds' => $this->getExtensionDependencyIds(),
-            'optionalDependencyIds'  => $this->getOptionalDependencyIds(),
-            'links'                  => $this->getLinks(),
+            'optionalDependencyIds' => $this->getOptionalDependencyIds(),
+            'links' => $this->getLinks(),
         ], $this->composerJson);
     }
 

diff --git a/framework/core/src/Filesystem/FilesystemServiceProvider.php b/framework/core/src/Filesystem/FilesystemServiceProvider.php
@@ -36,14 +36,14 @@ public function register()
             return [
                 'flarum-assets' => function (Paths $paths, UrlGenerator $url) {
                     return [
-                        'root'   => "$paths->public/assets",
-                        'url'    => $url->to('forum')->path('assets')
+                        'root' => "$paths->public/assets",
+                        'url' => $url->to('forum')->path('assets')
                     ];
                 },
                 'flarum-avatars' => function (Paths $paths, UrlGenerator $url) {
                     return [
-                        'root'   => "$paths->public/assets/avatars",
-                        'url'    => $url->to('forum')->path('assets/avatars')
+                        'root' => "$paths->public/assets/avatars",
+                        'url' => $url->to('forum')->path('assets/avatars')
                     ];
                 },
             ];

diff --git a/framework/core/src/Foundation/Application.php b/framework/core/src/Foundation/Application.php
@@ -336,22 +336,22 @@ protected function fireAppCallbacks(array $callbacks)
     public function registerCoreContainerAliases()
     {
         $aliases = [
-            'app'                  => [\Illuminate\Contracts\Container\Container::class, \Illuminate\Contracts\Foundation\Application::class,  \Psr\Container\ContainerInterface::class],
-            'blade.compiler'       => [\Illuminate\View\Compilers\BladeCompiler::class],
-            'cache'                => [\Illuminate\Cache\CacheManager::class, \Illuminate\Contracts\Cache\Factory::class],
-            'cache.store'          => [\Illuminate\Cache\Repository::class, \Illuminate\Contracts\Cache\Repository::class],
-            'config'               => [\Illuminate\Config\Repository::class, \Illuminate\Contracts\Config\Repository::class],
-            'db'                   => [\Illuminate\Database\DatabaseManager::class],
-            'db.connection'        => [\Illuminate\Database\Connection::class, \Illuminate\Database\ConnectionInterface::class],
-            'events'               => [\Illuminate\Events\Dispatcher::class, \Illuminate\Contracts\Events\Dispatcher::class],
-            'files'                => [\Illuminate\Filesystem\Filesystem::class],
-            'filesystem'           => [\Illuminate\Filesystem\FilesystemManager::class, \Illuminate\Contracts\Filesystem\Factory::class],
-            'filesystem.disk'      => [\Illuminate\Contracts\Filesystem\Filesystem::class],
-            'filesystem.cloud'     => [\Illuminate\Contracts\Filesystem\Cloud::class],
-            'hash'                 => [\Illuminate\Contracts\Hashing\Hasher::class],
-            'mailer'               => [\Illuminate\Mail\Mailer::class, \Illuminate\Contracts\Mail\Mailer::class, \Illuminate\Contracts\Mail\MailQueue::class],
-            'validator'            => [\Illuminate\Validation\Factory::class, \Illuminate\Contracts\Validation\Factory::class],
-            'view'                 => [\Illuminate\View\Factory::class, \Illuminate\Contracts\View\Factory::class],
+            'app' => [\Illuminate\Contracts\Container\Container::class, \Illuminate\Contracts\Foundation\Application::class,  \Psr\Container\ContainerInterface::class],
+            'blade.compiler' => [\Illuminate\View\Compilers\BladeCompiler::class],
+            'cache' => [\Illuminate\Cache\CacheManager::class, \Illuminate\Contracts\Cache\Factory::class],
+            'cache.store' => [\Illuminate\Cache\Repository::class, \Illuminate\Contracts\Cache\Repository::class],
+            'config' => [\Illuminate\Config\Repository::class, \Illuminate\Contracts\Config\Repository::class],
+            'db' => [\Illuminate\Database\DatabaseManager::class],
+            'db.connection' => [\Illuminate\Database\Connection::class, \Illuminate\Database\ConnectionInterface::class],
+            'events' => [\Illuminate\Events\Dispatcher::class, \Illuminate\Contracts\Events\Dispatcher::class],
+            'files' => [\Illuminate\Filesystem\Filesystem::class],
+            'filesystem' => [\Illuminate\Filesystem\FilesystemManager::class, \Illuminate\Contracts\Filesystem\Factory::class],
+            'filesystem.disk' => [\Illuminate\Contracts\Filesystem\Filesystem::class],
+            'filesystem.cloud' => [\Illuminate\Contracts\Filesystem\Cloud::class],
+            'hash' => [\Illuminate\Contracts\Hashing\Hasher::class],
+            'mailer' => [\Illuminate\Mail\Mailer::class, \Illuminate\Contracts\Mail\Mailer::class, \Illuminate\Contracts\Mail\MailQueue::class],
+            'validator' => [\Illuminate\Validation\Factory::class, \Illuminate\Contracts\Validation\Factory::class],
+            'view' => [\Illuminate\View\Factory::class, \Illuminate\Contracts\View\Factory::class],
         ];
 
         foreach ($aliases as $key => $aliases) {

diff --git a/framework/core/src/Frontend/FrontendServiceProvider.php b/framework/core/src/Frontend/FrontendServiceProvider.php
@@ -136,19 +136,19 @@ function (Container $container) {
 
         $this->container->singleton('flarum.less.config', function (Container $container) {
             return [
-                'config-primary-color'   => [
+                'config-primary-color' => [
                     'key' => 'theme_primary_color',
                 ],
                 'config-secondary-color' => [
                     'key' => 'theme_secondary_color',
                 ],
-                'config-dark-mode'       => [
+                'config-dark-mode' => [
                     'key' => 'theme_dark_mode',
                     'callback' => function ($value) {
                         return $value ? 'true' : 'false';
                     },
                 ],
-                'config-colored-header'  => [
+                'config-colored-header' => [
                     'key' => 'theme_colored_header',
                     'callback' => function ($value) {
                         return $value ? 'true' : 'false';

diff --git a/framework/core/src/Install/DatabaseConfig.php b/framework/core/src/Install/DatabaseConfig.php
@@ -37,17 +37,17 @@ public function __construct($driver, $host, $port, $database, $username, $passwo
     public function toArray()
     {
         return [
-            'driver'    => $this->driver,
-            'host'      => $this->host,
-            'port'      => $this->port,
-            'database'  => $this->database,
-            'username'  => $this->username,
-            'password'  => $this->password,
-            'charset'   => 'utf8mb4',
+            'driver' => $this->driver,
+            'host' => $this->host,
+            'port' => $this->port,
+            'database' => $this->database,
+            'username' => $this->username,
+            'password' => $this->password,
+            'charset' => 'utf8mb4',
             'collation' => 'utf8mb4_unicode_ci',
-            'prefix'    => $this->prefix,
-            'strict'    => false,
-            'engine'    => 'InnoDB',
+            'prefix' => $this->prefix,
+            'strict' => false,
+            'engine' => 'InnoDB',
             'prefix_indexes' => true
         ];
     }