Apply fixes from StyleCI

framework/core/src/Api/Serializer/BasicDiscussionSerializer.php

@@ -36,7 +36,7 @@ class BasicDiscussionSerializer extends AbstractSerializer
 
         return [
             'title' => $model->title,
-            'slug' =>  $this->slugManager->forResource(Discussion::class)->toSlug($model),
+            'slug' => $this->slugManager->forResource(Discussion::class)->toSlug($model),
         ];
     }
 

framework/core/src/Api/Serializer/BasicPostSerializer.php

@@ -39,8 +39,8 @@ class BasicPostSerializer extends AbstractSerializer
         }
 
         $attributes = [
-            'number'      => (int) $model->number,
-            'createdAt'   => $this->formatDate($model->created_at),
+            'number' => (int) $model->number,
+            'createdAt' => $this->formatDate($model->created_at),
             'contentType' => $model->type
         ];
 

framework/core/src/Api/Serializer/BasicUserSerializer.php

@@ -35,10 +35,10 @@ class BasicUserSerializer extends AbstractSerializer
         }
 
         return [
-            'username'    => $model->username,
+            'username' => $model->username,
             'displayName' => $model->display_name,
-            'avatarUrl'   => $model->avatar_url,
-            'slug'        => $this->slugManager->forResource(User::class)->toSlug($model)
+            'avatarUrl' => $model->avatar_url,
+            'slug' => $this->slugManager->forResource(User::class)->toSlug($model)
         ];
     }
 

framework/core/src/Api/Serializer/CurrentUserSerializer.php

@@ -25,13 +25,13 @@ class CurrentUserSerializer extends UserSerializer
         $attributes = parent::getDefaultAttributes($model);
 
         $attributes += [
-            'isEmailConfirmed'         => (bool) $model->is_email_confirmed,
-            'email'                    => $model->email,
-            'markedAllAsReadAt'        => $this->formatDate($model->marked_all_as_read_at),
-            'unreadNotificationCount'  => (int) $model->getUnreadNotificationCount(),
-            'newNotificationCount'     => (int) $model->getNewNotificationCount(),
-            'preferences'              => (array) $model->preferences,
-            'isAdmin'                  => $model->isAdmin(),
+            'isEmailConfirmed' => (bool) $model->is_email_confirmed,
+            'email' => $model->email,
+            'markedAllAsReadAt' => $this->formatDate($model->marked_all_as_read_at),
+            'unreadNotificationCount' => (int) $model->getUnreadNotificationCount(),
+            'newNotificationCount' => (int) $model->getNewNotificationCount(),
+            'preferences' => (array) $model->preferences,
+            'isAdmin' => $model->isAdmin(),
         ];
 
         return $attributes;

framework/core/src/Api/Serializer/DiscussionSerializer.php

@@ -19,15 +19,15 @@ class DiscussionSerializer extends BasicDiscussionSerializer
     protected function getDefaultAttributes(object|array $model): array
     {
         $attributes = parent::getDefaultAttributes($model) + [
-            'commentCount'      => (int) $model->comment_count,
-            'participantCount'  => (int) $model->participant_count,
-            'createdAt'         => $this->formatDate($model->created_at),
-            'lastPostedAt'      => $this->formatDate($model->last_posted_at),
-            'lastPostNumber'    => (int) $model->last_post_number,
-            'canReply'          => $this->actor->can('reply', $model),
-            'canRename'         => $this->actor->can('rename', $model),
-            'canDelete'         => $this->actor->can('delete', $model),
-            'canHide'           => $this->actor->can('hide', $model)
+            'commentCount' => (int) $model->comment_count,
+            'participantCount' => (int) $model->participant_count,
+            'createdAt' => $this->formatDate($model->created_at),
+            'lastPostedAt' => $this->formatDate($model->last_posted_at),
+            'lastPostNumber' => (int) $model->last_post_number,
+            'canReply' => $this->actor->can('reply', $model),
+            'canRename' => $this->actor->can('rename', $model),
+            'canDelete' => $this->actor->can('delete', $model),
+            'canHide' => $this->actor->can('hide', $model)
         ];
 
         if ($model->hidden_at) {

framework/core/src/Api/Serializer/ForumSerializer.php

@@ -83,7 +83,7 @@ class ForumSerializer extends AbstractSerializer
             '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'),

framework/core/src/Api/Serializer/GroupSerializer.php

@@ -35,10 +35,10 @@ class GroupSerializer extends AbstractSerializer
 
         return [
             'nameSingular' => $this->translateGroupName($model->name_singular),
-            'namePlural'   => $this->translateGroupName($model->name_plural),
-            'color'        => $model->color,
-            'icon'         => $model->icon,
-            'isHidden'     => $model->is_hidden
+            'namePlural' => $this->translateGroupName($model->name_plural),
+            'color' => $model->color,
+            'icon' => $model->icon,
+            'isHidden' => $model->is_hidden
         ];
     }
 

framework/core/src/Api/Serializer/NotificationSerializer.php

@@ -36,9 +36,9 @@ class NotificationSerializer extends AbstractSerializer
 
         return [
             'contentType' => $model->type,
-            'content'     => $model->data,
-            'createdAt'   => $this->formatDate($model->created_at),
-            'isRead'      => (bool) $model->read_at
+            'content' => $model->data,
+            'createdAt' => $this->formatDate($model->created_at),
+            'isRead' => (bool) $model->read_at
         ];
     }
 

framework/core/src/Api/Serializer/PostSerializer.php

@@ -47,9 +47,9 @@ class PostSerializer extends BasicPostSerializer
         }
 
         $attributes += [
-            'canEdit'   => $canEdit,
+            'canEdit' => $canEdit,
             'canDelete' => $this->actor->can('delete', $model),
-            'canHide'   => $this->actor->can('hide', $model)
+            'canHide' => $this->actor->can('hide', $model)
         ];
 
         return $attributes;

framework/core/src/Api/Serializer/UserSerializer.php

@@ -21,13 +21,13 @@ class UserSerializer extends BasicUserSerializer
         $attributes = parent::getDefaultAttributes($model);
 
         $attributes += [
-            'joinTime'           => $this->formatDate($model->joined_at),
-            'discussionCount'    => (int) $model->discussion_count,
-            'commentCount'       => (int) $model->comment_count,
-            'canEdit'            => $this->actor->can('edit', $model),
+            'joinTime' => $this->formatDate($model->joined_at),
+            'discussionCount' => (int) $model->discussion_count,
+            'commentCount' => (int) $model->comment_count,
+            'canEdit' => $this->actor->can('edit', $model),
             'canEditCredentials' => $this->actor->can('editCredentials', $model),
-            'canEditGroups'      => $this->actor->can('editGroups', $model),
-            'canDelete'          => $this->actor->can('delete', $model),
+            'canEditGroups' => $this->actor->can('editGroups', $model),
+            'canDelete' => $this->actor->can('delete', $model),
         ];
 
         if ($model->getPreference('discloseOnline') || $this->actor->can('viewLastSeenAt', $model)) {
@@ -39,7 +39,7 @@ class UserSerializer extends BasicUserSerializer
         if ($attributes['canEditCredentials'] || $this->actor->id === $model->id) {
             $attributes += [
                 'isEmailConfirmed' => (bool) $model->is_email_confirmed,
-                'email'            => $model->email
+                'email' => $model->email
             ];
         }
 

framework/core/src/Extension/Extension.php

@@ -453,15 +453,15 @@ class Extension implements Arrayable
     public function toArray(): array
     {
         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);
     }
 

framework/core/src/Filesystem/FilesystemServiceProvider.php

@@ -34,15 +34,15 @@ class FilesystemServiceProvider extends AbstractServiceProvider
             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'),
                         'visibility' => Visibility::PUBLIC
                     ];
                 },
                 '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')
                     ];
                 },
             ];

framework/core/src/Foundation/Application.php

@@ -199,22 +199,22 @@ class Application extends IlluminateContainer implements LaravelApplication
     public function registerCoreContainerAliases(): void
     {
         $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 => $aliasGroup) {

framework/core/src/Frontend/FrontendServiceProvider.php

@@ -142,19 +142,19 @@ class FrontendServiceProvider extends AbstractServiceProvider
 
         $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';

framework/core/src/Install/DatabaseConfig.php

@@ -28,17 +28,17 @@ class DatabaseConfig implements Arrayable
     public function toArray(): array
     {
         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
         ];
     }

framework/core/src/Install/Steps/StoreConfig.php

@@ -44,12 +44,12 @@ class StoreConfig implements ReversibleStep
     private function buildConfig(): array
     {
         return [
-            'debug'    => $this->debugMode,
+            'debug' => $this->debugMode,
             'database' => $this->dbConfig->toArray(),
-            'url'      => (string) $this->baseUrl,
-            'paths'    => $this->getPathsConfig(),
-            'headers'  => [
-                'poweredByHeader'  => true,
+            'url' => (string) $this->baseUrl,
+            'paths' => $this->getPathsConfig(),
+            'headers' => [
+                'poweredByHeader' => true,
                 'referrerPolicy' => 'same-origin',
             ]
         ];
@@ -58,7 +58,7 @@ class StoreConfig implements ReversibleStep
     private function getPathsConfig(): array
     {
         return [
-            'api'   => 'api',
+            'api' => 'api',
             'admin' => 'admin',
         ];
     }

framework/core/src/Notification/UnsubscribeToken.php

@@ -30,7 +30,7 @@ class UnsubscribeToken extends AbstractModel
     protected $table = 'unsubscribe_tokens';
 
     protected $casts = [
-        'user_id'        => 'int',
+        'user_id' => 'int',
         'unsubscribed_at' => 'datetime'
     ];
 

framework/core/tests/integration/api/users/CreateTest.php

@@ -186,7 +186,7 @@ class CreateTest extends TestCase
                 'username' => 'test',
                 'email' => 'test@machine.local',
                 'is_email_confirmed' => 1,
-                'avatar_url' =>  'file://localhost/etc/passwd'
+                'avatar_url' => 'file://localhost/etc/passwd'
             ], []),
             'scheme' => 'file'
         ];
@@ -251,28 +251,28 @@ class CreateTest extends TestCase
             'username' => 'test',
             'email' => 'test@machine.local',
             'is_email_confirmed' => 1,
-            'avatar_url' =>  'https://127.0.0.1/image.png'
+            'avatar_url' => 'https://127.0.0.1/image.png'
         ], []);
 
         $regTokens[] = RegistrationToken::generate('flarum', '1', [
             'username' => 'test',
             'email' => 'test@machine.local',
             'is_email_confirmed' => 1,
-            'avatar_url' =>  'https://i_do_not_exist.flarum.org/image.png'
+            'avatar_url' => 'https://i_do_not_exist.flarum.org/image.png'
         ], []);
 
         $regTokens[] = RegistrationToken::generate('flarum', '1', [
             'username' => 'test',
             'email' => 'test@machine.local',
             'is_email_confirmed' => 1,
-            'avatar_url' =>  '../image.png'
+            'avatar_url' => '../image.png'
         ], []);
 
         $regTokens[] = RegistrationToken::generate('flarum', '1', [
             'username' => 'test',
             'email' => 'test@machine.local',
             'is_email_confirmed' => 1,
-            'avatar_url' =>  'image.png'
+            'avatar_url' => 'image.png'
         ], []);
 
         // Test each reg token
@@ -325,28 +325,28 @@ class CreateTest extends TestCase
             'username' => 'test1',
             'email' => 'test1@machine.local',
             'is_email_confirmed' => 1,
-            'avatar_url' =>  'https://raw.githubusercontent.com/flarum/framework/main/framework/core/tests/fixtures/assets/avatar.png'
+            'avatar_url' => 'https://raw.githubusercontent.com/flarum/framework/main/framework/core/tests/fixtures/assets/avatar.png'
         ], []);
 
         $regTokens[] = RegistrationToken::generate('flarum', '2', [
             'username' => 'test2',
             'email' => 'test2@machine.local',
             'is_email_confirmed' => 1,
-            'avatar_url' =>  'https://raw.githubusercontent.com/flarum/framework/main/framework/core/tests/fixtures/assets/avatar.jpg'
+            'avatar_url' => 'https://raw.githubusercontent.com/flarum/framework/main/framework/core/tests/fixtures/assets/avatar.jpg'
         ], []);
 
         $regTokens[] = RegistrationToken::generate('flarum', '3', [
             'username' => 'test3',
             'email' => 'test3@machine.local',
             'is_email_confirmed' => 1,
-            'avatar_url' =>  'https://raw.githubusercontent.com/flarum/framework/main/framework/core/tests/fixtures/assets/avatar.gif'
+            'avatar_url' => 'https://raw.githubusercontent.com/flarum/framework/main/framework/core/tests/fixtures/assets/avatar.gif'
         ], []);
 
         $regTokens[] = RegistrationToken::generate('flarum', '4', [
             'username' => 'test4',
             'email' => 'test4@machine.local',
             'is_email_confirmed' => 1,
-            'avatar_url' =>  'http://raw.githubusercontent.com/flarum/framework/main/framework/core/tests/fixtures/assets/avatar.png'
+            'avatar_url' => 'http://raw.githubusercontent.com/flarum/framework/main/framework/core/tests/fixtures/assets/avatar.png'
         ], []);
 
         /**

framework/core/tests/integration/extenders/FilesystemTest.php

@@ -44,7 +44,7 @@ class FilesystemTest extends TestCase
         $this->extend((new Extend\Filesystem)->disk('flarum-uploads', function (Paths $paths, UrlGenerator $url) {
             return [
                 'root' => "$paths->public/assets/uploads",
-                'url'  => $url->to('forum')->path('assets/uploads')
+                'url' => $url->to('forum')->path('assets/uploads')
             ];
         }));
 
@@ -148,7 +148,7 @@ class UploadsDisk
     {
         return [
             'root' => "$paths->public/assets/uploads",
-            'url'  => $url->to('forum')->path('assets/uploads')
+            'url' => $url->to('forum')->path('assets/uploads')
         ];
     }
 }