Apply fixes from StyleCI

Author: StyleCIBot

extensions/likes/tests/integration/api/LikePostTest.php

@@ -60,7 +60,7 @@ protected function rewriteDefaultPermissionsAfterBoot()
      * @dataProvider allowedUsersToLike
      * @test
      */
-    public function can_like_a_post_if_allowed(int $postId, ?int $authenticatedAs, string $message, bool $canLikeOwnPost = null)
+    public function can_like_a_post_if_allowed(int $postId, ?int $authenticatedAs, string $message, ?bool $canLikeOwnPost = null)
     {
         if (! is_null($canLikeOwnPost)) {
             $this->setting('flarum-likes.like_own_post', $canLikeOwnPost);
@@ -80,7 +80,7 @@ public function can_like_a_post_if_allowed(int $postId, ?int $authenticatedAs, s
      * @dataProvider unallowedUsersToLike
      * @test
      */
-    public function cannot_like_a_post_if_not_allowed(int $postId, ?int $authenticatedAs, string $message, bool $canLikeOwnPost = null)
+    public function cannot_like_a_post_if_not_allowed(int $postId, ?int $authenticatedAs, string $message, ?bool $canLikeOwnPost = null)
     {
         if (! is_null($canLikeOwnPost)) {
             $this->setting('flarum-likes.like_own_post', $canLikeOwnPost);
@@ -100,7 +100,7 @@ public function cannot_like_a_post_if_not_allowed(int $postId, ?int $authenticat
      * @dataProvider allowedUsersToLike
      * @test
      */
-    public function can_dislike_a_post_if_liked_and_allowed(int $postId, ?int $authenticatedAs, string $message, bool $canLikeOwnPost = null)
+    public function can_dislike_a_post_if_liked_and_allowed(int $postId, ?int $authenticatedAs, string $message, ?bool $canLikeOwnPost = null)
     {
         if (! is_null($canLikeOwnPost)) {
             $this->setting('flarum-likes.like_own_post', $canLikeOwnPost);

extensions/lock/src/Post/DiscussionLockedPost.php

@@ -24,7 +24,7 @@ class DiscussionLockedPost extends AbstractEventPost implements MergeableInterfa
     /**
      * {@inheritdoc}
      */
-    public function saveAfter(Post $previous = null)
+    public function saveAfter(?Post $previous = null)
     {
         // If the previous post is another 'discussion locked' post, and it's
         // by the same user, then we can merge this post into it. If we find

extensions/mentions/src/Formatter/FormatPostMentions.php

@@ -44,7 +44,7 @@ public function __construct(TranslatorInterface $translator, SlugManager $slugMa
      * @param \Psr\Http\Message\ServerRequestInterface|null $request
      * @return string $xml to be rendered
      */
-    public function __invoke(Renderer $renderer, $context, $xml, Request $request = null)
+    public function __invoke(Renderer $renderer, $context, $xml, ?Request $request = null)
     {
         return Utils::replaceAttributes($xml, 'POSTMENTION', function ($attributes) use ($context) {
             $post = (($context && isset($context->getRelations()['mentionsPosts'])) || $context instanceof Post)

extensions/mentions/src/Formatter/FormatTagMentions.php

@@ -17,7 +17,7 @@
 
 class FormatTagMentions
 {
-    public function __invoke(Renderer $renderer, $context, ?string $xml, Request $request = null): string
+    public function __invoke(Renderer $renderer, $context, ?string $xml, ?Request $request = null): string
     {
         return Utils::replaceAttributes($xml, 'TAGMENTION', function ($attributes) use ($context) {
             /** @var Tag|null $tag */

extensions/package-manager/src/Task/TaskRepository.php

@@ -27,7 +27,7 @@ public function query()
      * @param User $actor
      * @return Task
      */
-    public function findOrFail($id, User $actor = null): Task
+    public function findOrFail($id, ?User $actor = null): Task
     {
         return Task::findOrFail($id);
     }

extensions/package-manager/tests/integration/SetupComposer.php

@@ -17,7 +17,7 @@ class SetupComposer
 
     private $config;
 
-    public function __construct(array $config = null)
+    public function __construct(?array $config = null)
     {
         $this->config = $config;
     }

extensions/sticky/src/Post/DiscussionStickiedPost.php

@@ -24,7 +24,7 @@ class DiscussionStickiedPost extends AbstractEventPost implements MergeableInter
     /**
      * {@inheritdoc}
      */
-    public function saveAfter(Post $previous = null)
+    public function saveAfter(?Post $previous = null)
     {
         // If the previous post is another 'discussion stickied' post, and it's
         // by the same user, then we can merge this post into it. If we find

extensions/tags/src/Post/DiscussionTaggedPost.php

@@ -24,7 +24,7 @@ class DiscussionTaggedPost extends AbstractEventPost implements MergeableInterfa
     /**
      * {@inheritdoc}
      */
-    public function saveAfter(Post $previous = null)
+    public function saveAfter(?Post $previous = null)
     {
         // If the previous post is another 'discussion tagged' post, and it's
         // by the same user, then we can merge this post into it. If we find

extensions/tags/src/Tag.php

@@ -137,7 +137,7 @@ public function refreshLastPostedDiscussion()
         return $this;
     }
 
-    public function setLastPostedDiscussion(Discussion $discussion = null)
+    public function setLastPostedDiscussion(?Discussion $discussion = null)
     {
         $this->last_posted_at = optional($discussion)->last_posted_at;
         $this->last_posted_discussion_id = optional($discussion)->id;

extensions/tags/src/TagRepository.php

@@ -78,7 +78,7 @@ public function getAuthorizedRelations($relations, User $actor): array
      * @param User|null $actor
      * @return Tag
      */
-    public function findOrFail($id, User $actor = null)
+    public function findOrFail($id, ?User $actor = null)
     {
         $query = Tag::where('id', $id);
 
@@ -92,7 +92,7 @@ public function findOrFail($id, User $actor = null)
      * @param User|null $user
      * @return \Illuminate\Database\Eloquent\Collection<Tag>
      */
-    public function all(User $user = null)
+    public function all(?User $user = null)
     {
         $query = Tag::query();
 
@@ -106,7 +106,7 @@ public function all(User $user = null)
      * @param User|null $user
      * @return int
      */
-    public function getIdForSlug($slug, User $user = null): ?int
+    public function getIdForSlug($slug, ?User $user = null): ?int
     {
         $query = Tag::where('slug', $slug);
 

framework/core/src/Api/Controller/AbstractSerializeController.php

@@ -196,7 +196,7 @@ protected function getRelationCallablesToLoad(Collection $models): array
     /**
      * Eager loads the required relationships.
      */
-    protected function loadRelations(Collection $models, array $relations, ServerRequestInterface $request = null): void
+    protected function loadRelations(Collection $models, array $relations, ?ServerRequestInterface $request = null): void
     {
         $addedRelations = $this->getRelationsToLoad($models);
         $addedRelationCallables = $this->getRelationCallablesToLoad($models);

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

@@ -79,7 +79,7 @@ public function getActor()
     /**
      * {@inheritdoc}
      */
-    public function getAttributes($model, array $fields = null)
+    public function getAttributes($model, ?array $fields = null)
     {
         if (! is_object($model) && ! is_array($model)) {
             return [];
@@ -113,7 +113,7 @@ abstract protected function getDefaultAttributes($model);
      * @param DateTime|null $date
      * @return string|null
      */
-    public function formatDate(DateTime $date = null)
+    public function formatDate(?DateTime $date = null)
     {
         if ($date) {
             return $date->format(DateTime::RFC3339);

framework/core/src/Database/Exception/MigrationKeyMissing.php

@@ -15,15 +15,15 @@ class MigrationKeyMissing extends Exception
 {
     protected $direction;
 
-    public function __construct(string $direction, string $file = null)
+    public function __construct(string $direction, ?string $file = null)
     {
         $this->direction = $direction;
 
         $fileNameWithSpace = $file ? ' '.realpath($file) : '';
         parent::__construct("Migration file$fileNameWithSpace should contain an array with up/down (looking for $direction)");
     }
 
-    public function withFile(string $file = null): self
+    public function withFile(?string $file = null): self
     {
         return new self($this->direction, $file);
     }

framework/core/src/Database/Migrator.php

@@ -76,7 +76,7 @@ public function __construct(
      * @param  Extension|null $extension
      * @return void
      */
-    public function run($path, Extension $extension = null)
+    public function run($path, ?Extension $extension = null)
     {
         $files = $this->getMigrationFiles($path);
 
@@ -95,7 +95,7 @@ public function run($path, Extension $extension = null)
      * @param  Extension|null $extension
      * @return void
      */
-    public function runMigrationList($path, $migrations, Extension $extension = null)
+    public function runMigrationList($path, $migrations, ?Extension $extension = null)
     {
         // First we will just make sure that there are any migrations to run. If there
         // aren't, we will just make a note of it to the developer so they're aware
@@ -122,7 +122,7 @@ public function runMigrationList($path, $migrations, Extension $extension = null
      * @param  Extension|null $extension
      * @return void
      */
-    protected function runUp($path, $file, Extension $extension = null)
+    protected function runUp($path, $file, ?Extension $extension = null)
     {
         $this->resolveAndRunClosureMigration($path, $file);
 
@@ -141,7 +141,7 @@ protected function runUp($path, $file, Extension $extension = null)
      * @param  Extension|null $extension
      * @return int
      */
-    public function reset($path, Extension $extension = null)
+    public function reset($path, ?Extension $extension = null)
     {
         $migrations = array_reverse($this->repository->getRan(
             $extension ? $extension->getId() : null
@@ -169,7 +169,7 @@ public function reset($path, Extension $extension = null)
      * @param  Extension $extension
      * @return void
      */
-    protected function runDown($path, $file, Extension $extension = null)
+    protected function runDown($path, $file, ?Extension $extension = null)
     {
         $this->resolveAndRunClosureMigration($path, $file, 'down');
 

framework/core/src/Discussion/Discussion.php

@@ -158,7 +158,7 @@ public function rename($title)
      * @param User $actor
      * @return $this
      */
-    public function hide(User $actor = null)
+    public function hide(?User $actor = null)
     {
         if (! $this->hidden_at) {
             $this->hidden_at = Carbon::now();
@@ -401,7 +401,7 @@ public function readers()
      *
      * @see Discussion::setStateUser()
      */
-    public function state(User $user = null): HasOne
+    public function state(?User $user = null): HasOne
     {
         $user = $user ?: static::$stateUser;
 

framework/core/src/Discussion/DiscussionRepository.php

@@ -32,7 +32,7 @@ public function query()
      * @param User|null $user
      * @return \Flarum\Discussion\Discussion
      */
-    public function findOrFail($id, User $user = null)
+    public function findOrFail($id, ?User $user = null)
     {
         $query = $this->query()->where('id', $id);
 
@@ -73,7 +73,7 @@ public function getReadIdsQuery(User $user): Builder
      * @param User|null $user
      * @return Builder<Discussion>
      */
-    protected function scopeVisibleTo(Builder $query, User $user = null)
+    protected function scopeVisibleTo(Builder $query, ?User $user = null)
     {
         if ($user !== null) {
             $query->whereVisibleTo($user);

framework/core/src/Discussion/Event/Deleted.php

@@ -28,7 +28,7 @@ class Deleted
      * @param \Flarum\Discussion\Discussion $discussion
      * @param User $actor
      */
-    public function __construct(Discussion $discussion, User $actor = null)
+    public function __construct(Discussion $discussion, ?User $actor = null)
     {
         $this->discussion = $discussion;
         $this->actor = $actor;

framework/core/src/Discussion/Event/Hidden.php

@@ -28,7 +28,7 @@ class Hidden
      * @param \Flarum\Discussion\Discussion $discussion
      * @param User $actor
      */
-    public function __construct(Discussion $discussion, User $actor = null)
+    public function __construct(Discussion $discussion, ?User $actor = null)
     {
         $this->discussion = $discussion;
         $this->actor = $actor;

framework/core/src/Discussion/Event/Renamed.php

@@ -34,7 +34,7 @@ class Renamed
      * @param User $actor
      * @param string $oldTitle
      */
-    public function __construct(Discussion $discussion, $oldTitle, User $actor = null)
+    public function __construct(Discussion $discussion, $oldTitle, ?User $actor = null)
     {
         $this->discussion = $discussion;
         $this->oldTitle = $oldTitle;

framework/core/src/Discussion/Event/Restored.php

@@ -28,7 +28,7 @@ class Restored
      * @param \Flarum\Discussion\Discussion $discussion
      * @param User $actor
      */
-    public function __construct(Discussion $discussion, User $actor = null)
+    public function __construct(Discussion $discussion, ?User $actor = null)
     {
         $this->discussion = $discussion;
         $this->actor = $actor;

framework/core/src/Discussion/Event/Started.php

@@ -28,7 +28,7 @@ class Started
      * @param \Flarum\Discussion\Discussion $discussion
      * @param User $actor
      */
-    public function __construct(Discussion $discussion, User $actor = null)
+    public function __construct(Discussion $discussion, ?User $actor = null)
     {
         $this->discussion = $discussion;
         $this->actor = $actor;

framework/core/src/Extend/ApiController.php

@@ -329,7 +329,7 @@ public function loadWhere(string $relation, callable $callback): self // @phpsta
         return $this;
     }
 
-    public function extend(Container $container, Extension $extension = null)
+    public function extend(Container $container, ?Extension $extension = null)
     {
         $this->beforeDataCallbacks[] = function (AbstractSerializeController $controller) use ($container) {
             if (isset($this->serializer) && $this->isApplicable($this->serializer[1], $controller, $container)) {

framework/core/src/Extend/ApiSerializer.php

@@ -133,7 +133,7 @@ public function relationship(string $name, $callback): self
         return $this;
     }
 
-    public function extend(Container $container, Extension $extension = null)
+    public function extend(Container $container, ?Extension $extension = null)
     {
         if (! empty($this->attribute)) {
             $this->attributes[] = function ($serializer, $model, $attributes) use ($container) {

framework/core/src/Extend/Auth.php

@@ -58,7 +58,7 @@ public function removePasswordChecker(string $identifier): self
         return $this;
     }
 
-    public function extend(Container $container, Extension $extension = null)
+    public function extend(Container $container, ?Extension $extension = null)
     {
         $container->extend('flarum.user.password_checkers', function ($passwordCheckers) use ($container) {
             foreach ($this->removePasswordCheckers as $identifier) {

framework/core/src/Extend/Conditional.php

@@ -86,7 +86,7 @@ public function when($condition, $extenders): self
      * @param Extension|null $extension
      * @return void
      */
-    public function extend(Container $container, Extension $extension = null)
+    public function extend(Container $container, ?Extension $extension = null)
     {
         foreach ($this->conditions as $condition) {
             if (is_callable($condition['condition'])) {

framework/core/src/Extend/Console.php

@@ -56,7 +56,7 @@ public function schedule(string $command, $callback, $args = []): self
         return $this;
     }
 
-    public function extend(Container $container, Extension $extension = null)
+    public function extend(Container $container, ?Extension $extension = null)
     {
         $container->extend('flarum.console.commands', function ($existingCommands) {
             return array_merge($existingCommands, $this->addCommands);

framework/core/src/Extend/Csrf.php

@@ -29,7 +29,7 @@ public function exemptRoute(string $routeName): self
         return $this;
     }
 
-    public function extend(Container $container, Extension $extension = null)
+    public function extend(Container $container, ?Extension $extension = null)
     {
         $container->extend('flarum.http.csrfExemptPaths', function ($existingExemptPaths) {
             return array_merge($existingExemptPaths, $this->csrfExemptRoutes);

framework/core/src/Extend/ErrorHandling.php

@@ -108,7 +108,7 @@ public function reporter(string $reporterClass): self
         return $this;
     }
 
-    public function extend(Container $container, Extension $extension = null)
+    public function extend(Container $container, ?Extension $extension = null)
     {
         if (count($this->statuses)) {
             $container->extend('flarum.error.statuses', function ($statuses) {

framework/core/src/Extend/Event.php

@@ -56,7 +56,7 @@ public function subscribe(string $subscriber): self
         return $this;
     }
 
-    public function extend(Container $container, Extension $extension = null)
+    public function extend(Container $container, ?Extension $extension = null)
     {
         $events = $container->make(Dispatcher::class);
 

framework/core/src/Extend/ExtenderInterface.php

@@ -14,5 +14,5 @@
 
 interface ExtenderInterface
 {
-    public function extend(Container $container, Extension $extension = null);
+    public function extend(Container $container, ?Extension $extension = null);
 }

framework/core/src/Extend/Filesystem.php

@@ -75,7 +75,7 @@ public function driver(string $name, string $driverClass): self
         return $this;
     }
 
-    public function extend(Container $container, Extension $extension = null)
+    public function extend(Container $container, ?Extension $extension = null)
     {
         $container->extend('flarum.filesystem.disks', function ($existingDisks) use ($container) {
             foreach ($this->disks as $name => $disk) {

framework/core/src/Extend/Filter.php

@@ -59,7 +59,7 @@ public function addFilterMutator($callback): self
         return $this;
     }
 
-    public function extend(Container $container, Extension $extension = null)
+    public function extend(Container $container, ?Extension $extension = null)
     {
         $container->extend('flarum.filter.filters', function ($originalFilters) {
             foreach ($this->filters as $filter) {