test: php 8.4 (#4103)

* test: php 8.4 * fix: php 8.4 deprecations * fix: make argument required * chore: review changes
2025-08-07 00:47:00 +02:00 · 2024-11-08 17:33:47 +01:00
parent 845228f251
commit 820894a7c9
104 changed files with 138 additions and 131 deletions
--- a/extensions/akismet/tests/phpunit.integration.xml
+++ b/extensions/akismet/tests/phpunit.integration.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
    cacheDirectory=".phpunit.cache"
    backupStaticProperties="false"
--- a/extensions/akismet/tests/phpunit.unit.xml
+++ b/extensions/akismet/tests/phpunit.unit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
    cacheDirectory=".phpunit.cache"
    backupStaticProperties="false"
--- a/extensions/approval/tests/phpunit.integration.xml
+++ b/extensions/approval/tests/phpunit.integration.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
    cacheDirectory=".phpunit.cache"
    backupStaticProperties="false"
--- a/extensions/approval/tests/phpunit.unit.xml
+++ b/extensions/approval/tests/phpunit.unit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
    cacheDirectory=".phpunit.cache"
    backupStaticProperties="false"
--- a/extensions/flags/tests/phpunit.integration.xml
+++ b/extensions/flags/tests/phpunit.integration.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
    cacheDirectory=".phpunit.cache"
    backupStaticProperties="false"
--- a/extensions/flags/tests/phpunit.unit.xml
+++ b/extensions/flags/tests/phpunit.unit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
    cacheDirectory=".phpunit.cache"
    backupStaticProperties="false"
--- a/extensions/likes/tests/integration/api/LikePostTest.php
+++ b/extensions/likes/tests/integration/api/LikePostTest.php
@@ -64,7 +64,7 @@ class LikePostTest extends TestCase

    #[Test]
    #[DataProvider('allowedUsersToLike')]
-    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);
@@ -82,7 +82,7 @@ class LikePostTest extends TestCase

    #[Test]
    #[DataProvider('unallowedUsersToLike')]
-    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 @@ class LikePostTest extends TestCase

    #[Test]
    #[DataProvider('allowedUsersToLike')]
-    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);
--- a/extensions/likes/tests/phpunit.integration.xml
+++ b/extensions/likes/tests/phpunit.integration.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
    cacheDirectory=".phpunit.cache"
    backupStaticProperties="false"
--- a/extensions/likes/tests/phpunit.unit.xml
+++ b/extensions/likes/tests/phpunit.unit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
    cacheDirectory=".phpunit.cache"
    backupStaticProperties="false"
--- a/extensions/lock/src/Post/DiscussionLockedPost.php
+++ b/extensions/lock/src/Post/DiscussionLockedPost.php
@@ -18,7 +18,7 @@ class DiscussionLockedPost extends AbstractEventPost implements MergeableInterfa
 {
    public static string $type = 'discussionLocked';

-    public function saveAfter(Post $previous = null): static
+    public function saveAfter(?Post $previous = null): static
    {
        // 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
--- a/extensions/mentions/src/Formatter/FormatTagMentions.php
+++ b/extensions/mentions/src/Formatter/FormatTagMentions.php
@@ -17,7 +17,7 @@ use s9e\TextFormatter\Utils;

 class FormatTagMentions
 {
-    public function __invoke(Renderer $renderer, mixed $context, string $xml, Request $request = null): string
+    public function __invoke(Renderer $renderer, mixed $context, string $xml, ?Request $request = null): string
    {
        return Utils::replaceAttributes($xml, 'TAGMENTION', function ($attributes) use ($context) {
            /** @var Tag|null $tag */
--- a/extensions/mentions/tests/phpunit.integration.xml
+++ b/extensions/mentions/tests/phpunit.integration.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
    cacheDirectory=".phpunit.cache"
    backupStaticProperties="false"
--- a/extensions/mentions/tests/phpunit.unit.xml
+++ b/extensions/mentions/tests/phpunit.unit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
    cacheDirectory=".phpunit.cache"
    backupStaticProperties="false"
--- a/extensions/messages/tests/phpunit.integration.xml
+++ b/extensions/messages/tests/phpunit.integration.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
    cacheDirectory=".phpunit.cache"
    backupStaticProperties="false"
--- a/extensions/messages/tests/phpunit.unit.xml
+++ b/extensions/messages/tests/phpunit.unit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
    cacheDirectory=".phpunit.cache"
    backupStaticProperties="false"
--- a/extensions/nicknames/tests/phpunit.integration.xml
+++ b/extensions/nicknames/tests/phpunit.integration.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
    cacheDirectory=".phpunit.cache"
    backupStaticProperties="false"
--- a/extensions/nicknames/tests/phpunit.unit.xml
+++ b/extensions/nicknames/tests/phpunit.unit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
    cacheDirectory=".phpunit.cache"
    backupStaticProperties="false"
--- a/extensions/package-manager/tests/integration/SetupComposer.php
+++ b/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;
    }
--- a/extensions/package-manager/tests/phpunit.integration.xml
+++ b/extensions/package-manager/tests/phpunit.integration.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
    cacheDirectory=".phpunit.cache"
    backupStaticProperties="false"
--- a/extensions/package-manager/tests/phpunit.unit.xml
+++ b/extensions/package-manager/tests/phpunit.unit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
    cacheDirectory=".phpunit.cache"
    backupStaticProperties="false"
--- a/extensions/statistics/tests/phpunit.integration.xml
+++ b/extensions/statistics/tests/phpunit.integration.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
    cacheDirectory=".phpunit.cache"
    backupStaticProperties="false"
--- a/extensions/statistics/tests/phpunit.unit.xml
+++ b/extensions/statistics/tests/phpunit.unit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
    cacheDirectory=".phpunit.cache"
    backupStaticProperties="false"
--- a/extensions/sticky/src/Post/DiscussionStickiedPost.php
+++ b/extensions/sticky/src/Post/DiscussionStickiedPost.php
@@ -18,7 +18,7 @@ class DiscussionStickiedPost extends AbstractEventPost implements MergeableInter
 {
    public static string $type = 'discussionStickied';

-    public function saveAfter(Post $previous = null): static
+    public function saveAfter(?Post $previous = null): static
    {
        // 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
--- a/extensions/sticky/tests/phpunit.integration.xml
+++ b/extensions/sticky/tests/phpunit.integration.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
    cacheDirectory=".phpunit.cache"
    backupStaticProperties="false"
--- a/extensions/sticky/tests/phpunit.unit.xml
+++ b/extensions/sticky/tests/phpunit.unit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
    cacheDirectory=".phpunit.cache"
    backupStaticProperties="false"
--- a/extensions/subscriptions/tests/phpunit.integration.xml
+++ b/extensions/subscriptions/tests/phpunit.integration.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
    cacheDirectory=".phpunit.cache"
    backupStaticProperties="false"
--- a/extensions/subscriptions/tests/phpunit.unit.xml
+++ b/extensions/subscriptions/tests/phpunit.unit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
    cacheDirectory=".phpunit.cache"
    backupStaticProperties="false"
--- a/extensions/suspend/tests/phpunit.integration.xml
+++ b/extensions/suspend/tests/phpunit.integration.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
    cacheDirectory=".phpunit.cache"
    backupStaticProperties="false"
--- a/extensions/suspend/tests/phpunit.unit.xml
+++ b/extensions/suspend/tests/phpunit.unit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
    cacheDirectory=".phpunit.cache"
    backupStaticProperties="false"
--- a/extensions/tags/src/Post/DiscussionTaggedPost.php
+++ b/extensions/tags/src/Post/DiscussionTaggedPost.php
@@ -18,7 +18,7 @@ class DiscussionTaggedPost extends AbstractEventPost implements MergeableInterfa
 {
    public static string $type = 'discussionTagged';

-    public function saveAfter(Post $previous = null): static
+    public function saveAfter(?Post $previous = null): static
    {
        // 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
--- a/extensions/tags/src/Tag.php
+++ b/extensions/tags/src/Tag.php
@@ -146,7 +146,7 @@ class Tag extends AbstractModel
        return $this;
    }

-    public function setLastPostedDiscussion(Discussion $discussion = null): static
+    public function setLastPostedDiscussion(?Discussion $discussion = null): static
    {
        $this->last_posted_at = optional($discussion)->last_posted_at;
        $this->last_posted_discussion_id = optional($discussion)->id;
--- a/extensions/tags/src/TagRepository.php
+++ b/extensions/tags/src/TagRepository.php
@@ -32,7 +32,7 @@ class TagRepository
     * Find a tag by ID, optionally making sure it is visible to a certain
     * user, or throw an exception.
     */
-    public function findOrFail(int $id, User $actor = null): Tag
+    public function findOrFail(int $id, ?User $actor = null): Tag
    {
        $query = Tag::where('id', $id);

@@ -45,7 +45,7 @@ class TagRepository
     *
     * @return Collection<int, Tag>
     */
-    public function all(User $user = null): Collection
+    public function all(?User $user = null): Collection
    {
        $query = Tag::query();

@@ -55,7 +55,7 @@ class TagRepository
    /**
     * Get the ID of a tag with the given slug.
     */
-    public function getIdForSlug(string $slug, User $user = null): ?int
+    public function getIdForSlug(string $slug, ?User $user = null): ?int
    {
        $query = Tag::where('slug', $slug);

--- a/extensions/tags/tests/phpunit.integration.xml
+++ b/extensions/tags/tests/phpunit.integration.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
    cacheDirectory=".phpunit.cache"
    backupStaticProperties="false"
--- a/extensions/tags/tests/phpunit.unit.xml
+++ b/extensions/tags/tests/phpunit.unit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
    backupGlobals="false"
    cacheDirectory=".phpunit.cache"
    backupStaticProperties="false"