github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-25 09:41:49 +08:00
Code Issues Actions 46 Packages Projects Releases Wiki Activity

fix: php 8.4 deprecations
Some checks failed
Backend Tests / run (push) Has been cancelled
Details
Frontend Workflow / run (push) Has been cancelled
Details
Static Code Analysis / run (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Sami Mazouz 2024-11-07 18:34:32 +01:00
parent d710e388be
commit 68fd0bdf2e
No known key found for this signature in database
102 changed files with 134 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/akismet/tests/phpunit.integration.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" backupGlobals="false"
cacheDirectory=".phpunit.cache" cacheDirectory=".phpunit.cache"
backupStaticProperties="false" backupStaticProperties="false"

2
extensions/akismet/tests/phpunit.unit.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" backupGlobals="false"
cacheDirectory=".phpunit.cache" cacheDirectory=".phpunit.cache"
backupStaticProperties="false" backupStaticProperties="false"

2
extensions/approval/tests/phpunit.integration.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" backupGlobals="false"
cacheDirectory=".phpunit.cache" cacheDirectory=".phpunit.cache"
backupStaticProperties="false" backupStaticProperties="false"

2
extensions/approval/tests/phpunit.unit.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" backupGlobals="false"
cacheDirectory=".phpunit.cache" cacheDirectory=".phpunit.cache"
backupStaticProperties="false" backupStaticProperties="false"

2
extensions/flags/tests/phpunit.integration.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" backupGlobals="false"
cacheDirectory=".phpunit.cache" cacheDirectory=".phpunit.cache"
backupStaticProperties="false" backupStaticProperties="false"

2
extensions/flags/tests/phpunit.unit.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" backupGlobals="false"
cacheDirectory=".phpunit.cache" cacheDirectory=".phpunit.cache"
backupStaticProperties="false" backupStaticProperties="false"

6
extensions/likes/tests/integration/api/LikePostTest.php
View File

@ -64,7 +64,7 @@ class LikePostTest extends TestCase
#[Test] #[Test]
#[DataProvider('allowedUsersToLike')] #[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)) { if (! is_null($canLikeOwnPost)) {
$this->setting('flarum-likes.like_own_post', $canLikeOwnPost); $this->setting('flarum-likes.like_own_post', $canLikeOwnPost);
@ -82,7 +82,7 @@ class LikePostTest extends TestCase
#[Test] #[Test]
#[DataProvider('unallowedUsersToLike')] #[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)) { if (! is_null($canLikeOwnPost)) {
$this->setting('flarum-likes.like_own_post', $canLikeOwnPost); $this->setting('flarum-likes.like_own_post', $canLikeOwnPost);
@ -100,7 +100,7 @@ class LikePostTest extends TestCase
#[Test] #[Test]
#[DataProvider('allowedUsersToLike')] #[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)) { if (! is_null($canLikeOwnPost)) {
$this->setting('flarum-likes.like_own_post', $canLikeOwnPost); $this->setting('flarum-likes.like_own_post', $canLikeOwnPost);

2
extensions/likes/tests/phpunit.integration.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" backupGlobals="false"
cacheDirectory=".phpunit.cache" cacheDirectory=".phpunit.cache"
backupStaticProperties="false" backupStaticProperties="false"

2
extensions/likes/tests/phpunit.unit.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" backupGlobals="false"
cacheDirectory=".phpunit.cache" cacheDirectory=".phpunit.cache"
backupStaticProperties="false" backupStaticProperties="false"

2
extensions/lock/src/Post/DiscussionLockedPost.php
View File

@ -18,7 +18,7 @@ class DiscussionLockedPost extends AbstractEventPost implements MergeableInterfa
{ {
public static string $type = 'discussionLocked'; 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 // 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 // by the same user, then we can merge this post into it. If we find

2
extensions/mentions/src/Formatter/FormatTagMentions.php
View File

@ -17,7 +17,7 @@ use s9e\TextFormatter\Utils;
class FormatTagMentions 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) { return Utils::replaceAttributes($xml, 'TAGMENTION', function ($attributes) use ($context) {
/** @var Tag|null $tag */ /** @var Tag|null $tag */

2
extensions/mentions/tests/phpunit.integration.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" backupGlobals="false"
cacheDirectory=".phpunit.cache" cacheDirectory=".phpunit.cache"
backupStaticProperties="false" backupStaticProperties="false"

2
extensions/mentions/tests/phpunit.unit.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" backupGlobals="false"
cacheDirectory=".phpunit.cache" cacheDirectory=".phpunit.cache"
backupStaticProperties="false" backupStaticProperties="false"

2
extensions/messages/tests/phpunit.integration.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" backupGlobals="false"
cacheDirectory=".phpunit.cache" cacheDirectory=".phpunit.cache"
backupStaticProperties="false" backupStaticProperties="false"

2
extensions/messages/tests/phpunit.unit.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" backupGlobals="false"
cacheDirectory=".phpunit.cache" cacheDirectory=".phpunit.cache"
backupStaticProperties="false" backupStaticProperties="false"

2
extensions/nicknames/tests/phpunit.integration.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" backupGlobals="false"
cacheDirectory=".phpunit.cache" cacheDirectory=".phpunit.cache"
backupStaticProperties="false" backupStaticProperties="false"

2
extensions/nicknames/tests/phpunit.unit.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" backupGlobals="false"
cacheDirectory=".phpunit.cache" cacheDirectory=".phpunit.cache"
backupStaticProperties="false" backupStaticProperties="false"

2
extensions/package-manager/tests/integration/SetupComposer.php
View File

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

2
extensions/package-manager/tests/phpunit.integration.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" backupGlobals="false"
cacheDirectory=".phpunit.cache" cacheDirectory=".phpunit.cache"
backupStaticProperties="false" backupStaticProperties="false"

2
extensions/package-manager/tests/phpunit.unit.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" backupGlobals="false"
cacheDirectory=".phpunit.cache" cacheDirectory=".phpunit.cache"
backupStaticProperties="false" backupStaticProperties="false"

2
extensions/statistics/tests/phpunit.integration.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" backupGlobals="false"
cacheDirectory=".phpunit.cache" cacheDirectory=".phpunit.cache"
backupStaticProperties="false" backupStaticProperties="false"

2
extensions/statistics/tests/phpunit.unit.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" backupGlobals="false"
cacheDirectory=".phpunit.cache" cacheDirectory=".phpunit.cache"
backupStaticProperties="false" backupStaticProperties="false"

2
extensions/sticky/src/Post/DiscussionStickiedPost.php
View File

@ -18,7 +18,7 @@ class DiscussionStickiedPost extends AbstractEventPost implements MergeableInter
{ {
public static string $type = 'discussionStickied'; 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 // 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 // by the same user, then we can merge this post into it. If we find

2
extensions/sticky/tests/phpunit.integration.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" backupGlobals="false"
cacheDirectory=".phpunit.cache" cacheDirectory=".phpunit.cache"
backupStaticProperties="false" backupStaticProperties="false"

2
extensions/sticky/tests/phpunit.unit.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" backupGlobals="false"
cacheDirectory=".phpunit.cache" cacheDirectory=".phpunit.cache"
backupStaticProperties="false" backupStaticProperties="false"

2
extensions/subscriptions/tests/phpunit.integration.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" backupGlobals="false"
cacheDirectory=".phpunit.cache" cacheDirectory=".phpunit.cache"
backupStaticProperties="false" backupStaticProperties="false"

2
extensions/subscriptions/tests/phpunit.unit.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" backupGlobals="false"
cacheDirectory=".phpunit.cache" cacheDirectory=".phpunit.cache"
backupStaticProperties="false" backupStaticProperties="false"

2
extensions/suspend/tests/phpunit.integration.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" backupGlobals="false"
cacheDirectory=".phpunit.cache" cacheDirectory=".phpunit.cache"
backupStaticProperties="false" backupStaticProperties="false"

2
extensions/suspend/tests/phpunit.unit.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" backupGlobals="false"
cacheDirectory=".phpunit.cache" cacheDirectory=".phpunit.cache"
backupStaticProperties="false" backupStaticProperties="false"

2
extensions/tags/src/Post/DiscussionTaggedPost.php
View File

@ -18,7 +18,7 @@ class DiscussionTaggedPost extends AbstractEventPost implements MergeableInterfa
{ {
public static string $type = 'discussionTagged'; 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 // 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 // by the same user, then we can merge this post into it. If we find

2
extensions/tags/src/Tag.php
View File

@ -146,7 +146,7 @@ class Tag extends AbstractModel
return $this; 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_at = optional($discussion)->last_posted_at;
$this->last_posted_discussion_id = optional($discussion)->id; $this->last_posted_discussion_id = optional($discussion)->id;

6
extensions/tags/src/TagRepository.php
View File

@ -32,7 +32,7 @@ class TagRepository
* Find a tag by ID, optionally making sure it is visible to a certain * Find a tag by ID, optionally making sure it is visible to a certain
* user, or throw an exception. * 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); $query = Tag::where('id', $id);
@ -45,7 +45,7 @@ class TagRepository
* *
* @return Collection<int, Tag> * @return Collection<int, Tag>
*/ */
public function all(User $user = null): Collection public function all(?User $user = null): Collection
{ {
$query = Tag::query(); $query = Tag::query();
@ -55,7 +55,7 @@ class TagRepository
/** /**
* Get the ID of a tag with the given slug. * 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); $query = Tag::where('slug', $slug);

2
extensions/tags/tests/phpunit.integration.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" backupGlobals="false"
cacheDirectory=".phpunit.cache" cacheDirectory=".phpunit.cache"
backupStaticProperties="false" backupStaticProperties="false"

2
extensions/tags/tests/phpunit.unit.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" backupGlobals="false"
cacheDirectory=".phpunit.cache" cacheDirectory=".phpunit.cache"
backupStaticProperties="false" backupStaticProperties="false"

2
framework/core/src/Api/Resource/Concerns/HasHooks.php
View File

@ -180,7 +180,7 @@ trait HasHooks
// //
} }
public function dispatchEventsFor(mixed $entity, User $actor = null): void public function dispatchEventsFor(mixed $entity, ?User $actor = null): void
{ {
if (method_exists($entity, 'releaseEvents')) { if (method_exists($entity, 'releaseEvents')) {
$this->traitDispatchEventsFor($entity, $actor); $this->traitDispatchEventsFor($entity, $actor);

4
framework/core/src/Database/Exception/MigrationKeyMissing.php
View File

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

2
framework/core/src/Discussion/Discussion.php
View File

@ -117,7 +117,7 @@ class Discussion extends AbstractModel
/** /**
* Start a new discussion. Raises the DiscussionWasStarted event. * Start a new discussion. Raises the DiscussionWasStarted event.
*/ */
public static function start(?string $title, User $user, self $model = null): self public static function start(?string $title, User $user, ?self $model = null): self
{ {
$discussion = $model ?? new static; $discussion = $model ?? new static;

8
framework/core/src/Extend/ApiResource.php
View File

@ -59,7 +59,7 @@ class ApiResource implements ExtenderInterface
* @param array $endpoints must be an array of names of the endpoints. * @param array $endpoints must be an array of names of the endpoints.
* @param callable|class-string|null $condition a callable that returns a boolean or a string that represents whether this should be applied. * @param callable|class-string|null $condition a callable that returns a boolean or a string that represents whether this should be applied.
*/ */
public function removeEndpoints(array $endpoints, callable|string $condition = null): self public function removeEndpoints(array $endpoints, callable|string|null $condition = null): self
{ {
$this->removeEndpoints[] = [$endpoints, $condition]; $this->removeEndpoints[] = [$endpoints, $condition];
@ -99,7 +99,7 @@ class ApiResource implements ExtenderInterface
* @param array $fields must be an array of field names. * @param array $fields must be an array of field names.
* @param callable|class-string|null $condition a callable that returns a boolean or a string that represents whether this should be applied. * @param callable|class-string|null $condition a callable that returns a boolean or a string that represents whether this should be applied.
*/ */
public function removeFields(array $fields, callable|string $condition = null): self public function removeFields(array $fields, callable|string|null $condition = null): self
{ {
$this->removeFields[] = [$fields, $condition]; $this->removeFields[] = [$fields, $condition];
@ -139,7 +139,7 @@ class ApiResource implements ExtenderInterface
* @param array $sorts must be an array of sort names. * @param array $sorts must be an array of sort names.
* @param callable|class-string|null $condition a callable that returns a boolean or a string that represents whether this should be applied. * @param callable|class-string|null $condition a callable that returns a boolean or a string that represents whether this should be applied.
*/ */
public function removeSorts(array $sorts, callable|string $condition = null): self public function removeSorts(array $sorts, callable|string|null $condition = null): self
{ {
$this->removeSorts[] = [$sorts, $condition]; $this->removeSorts[] = [$sorts, $condition];
@ -161,7 +161,7 @@ class ApiResource implements ExtenderInterface
return $this; return $this;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
if (! (new ReflectionClass($this->resourceClass))->isAbstract()) { if (! (new ReflectionClass($this->resourceClass))->isAbstract()) {
$container->extend('flarum.api.resources', function (array $resources) { $container->extend('flarum.api.resources', function (array $resources) {

2
framework/core/src/Extend/Auth.php
View File

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

2
framework/core/src/Extend/Conditional.php
View File

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

2
framework/core/src/Extend/Console.php
View File

@ -57,7 +57,7 @@ class Console implements ExtenderInterface
return $this; return $this;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
$container->extend('flarum.console.commands', function ($existingCommands) { $container->extend('flarum.console.commands', function ($existingCommands) {
return array_merge($existingCommands, $this->addCommands); return array_merge($existingCommands, $this->addCommands);

2
framework/core/src/Extend/Csrf.php
View File

@ -29,7 +29,7 @@ class Csrf implements ExtenderInterface
return $this; return $this;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
$container->extend('flarum.http.csrfExemptPaths', function ($existingExemptPaths) { $container->extend('flarum.http.csrfExemptPaths', function ($existingExemptPaths) {
return array_merge($existingExemptPaths, $this->csrfExemptRoutes); return array_merge($existingExemptPaths, $this->csrfExemptRoutes);

2
framework/core/src/Extend/ErrorHandling.php
View File

@ -108,7 +108,7 @@ class ErrorHandling implements ExtenderInterface
return $this; return $this;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
if (count($this->statuses)) { if (count($this->statuses)) {
$container->extend('flarum.error.statuses', function ($statuses) { $container->extend('flarum.error.statuses', function ($statuses) {

2
framework/core/src/Extend/Event.php
View File

@ -56,7 +56,7 @@ class Event implements ExtenderInterface
return $this; return $this;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
$events = $container->make(Dispatcher::class); $events = $container->make(Dispatcher::class);

2
framework/core/src/Extend/ExtenderInterface.php
View File

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

2
framework/core/src/Extend/Filesystem.php
View File

@ -77,7 +77,7 @@ class Filesystem implements ExtenderInterface
return $this; return $this;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
$container->extend('flarum.filesystem.disks', function ($existingDisks) use ($container) { $container->extend('flarum.filesystem.disks', function ($existingDisks) use ($container) {
foreach ($this->disks as $name => $disk) { foreach ($this->disks as $name => $disk) {

2
framework/core/src/Extend/Formatter.php
View File

@ -116,7 +116,7 @@ class Formatter implements ExtenderInterface, LifecycleInterface
return $this; return $this;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
$container->extend('flarum.formatter', function ($formatter, $container) { $container->extend('flarum.formatter', function ($formatter, $container) {
foreach ($this->configurationCallbacks as $callback) { foreach ($this->configurationCallbacks as $callback) {

4
framework/core/src/Extend/Frontend.php
View File

@ -101,7 +101,7 @@ class Frontend implements ExtenderInterface
* *
* @return self * @return self
*/ */
public function route(string $path, string $name, callable|string $content = null): self public function route(string $path, string $name, callable|string|null $content = null): self
{ {
$this->routes[] = compact('path', 'name', 'content'); $this->routes[] = compact('path', 'name', 'content');
@ -217,7 +217,7 @@ class Frontend implements ExtenderInterface
return $this->extraDocumentAttributes(['class' => $classes]); return $this->extraDocumentAttributes(['class' => $classes]);
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
$this->registerAssets($container, $this->getModuleName($extension)); $this->registerAssets($container, $this->getModuleName($extension));
$this->registerRoutes($container); $this->registerRoutes($container);

2
framework/core/src/Extend/LanguagePack.php
View File

@ -36,7 +36,7 @@ class LanguagePack implements ExtenderInterface, LifecycleInterface
) { ) {
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
if (is_null($extension)) { if (is_null($extension)) {
throw new InvalidArgumentException( throw new InvalidArgumentException(

2
framework/core/src/Extend/Link.php
View File

@ -36,7 +36,7 @@ class Link implements ExtenderInterface
return $this; return $this;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
$siteUrl = $container->make(Config::class)->url(); $siteUrl = $container->make(Config::class)->url();

2
framework/core/src/Extend/Locales.php
View File

@ -25,7 +25,7 @@ class Locales implements ExtenderInterface, LifecycleInterface
) { ) {
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
$container->resolving( $container->resolving(
LocaleManager::class, LocaleManager::class,

2
framework/core/src/Extend/Mail.php
View File

@ -31,7 +31,7 @@ class Mail implements ExtenderInterface
return $this; return $this;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
$container->extend('mail.supported_drivers', function ($existingDrivers) { $container->extend('mail.supported_drivers', function ($existingDrivers) {
return array_merge($existingDrivers, $this->drivers); return array_merge($existingDrivers, $this->drivers);

2
framework/core/src/Extend/Middleware.php
View File

@ -104,7 +104,7 @@ class Middleware implements ExtenderInterface
return $this; return $this;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
$container->extend("flarum.$this->frontend.middleware", function ($existingMiddleware) { $container->extend("flarum.$this->frontend.middleware", function ($existingMiddleware) {
foreach ($this->addMiddlewares as $addMiddleware) { foreach ($this->addMiddlewares as $addMiddleware) {

2
framework/core/src/Extend/Model.php
View File

@ -177,7 +177,7 @@ class Model implements ExtenderInterface
return $this; return $this;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
foreach ($this->customRelations as $name => $callback) { foreach ($this->customRelations as $name => $callback) {
/** @var class-string<AbstractModel> $modelClass */ /** @var class-string<AbstractModel> $modelClass */

2
framework/core/src/Extend/ModelPrivate.php
View File

@ -65,7 +65,7 @@ class ModelPrivate implements ExtenderInterface
return $this; return $this;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
if (! class_exists($this->modelClass)) { if (! class_exists($this->modelClass)) {
return; return;

2
framework/core/src/Extend/ModelUrl.php
View File

@ -41,7 +41,7 @@ class ModelUrl implements ExtenderInterface
return $this; return $this;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
if ($this->slugDrivers) { if ($this->slugDrivers) {
$container->extend('flarum.http.slugDrivers', function ($existingDrivers) { $container->extend('flarum.http.slugDrivers', function ($existingDrivers) {

2
framework/core/src/Extend/ModelVisibility.php
View File

@ -92,7 +92,7 @@ class ModelVisibility implements ExtenderInterface
return $this; return $this;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
if (! class_exists($this->modelClass)) { if (! class_exists($this->modelClass)) {
return; return;

2
framework/core/src/Extend/Notification.php
View File

@ -71,7 +71,7 @@ class Notification implements ExtenderInterface
return $this; return $this;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
$container->extend('flarum.notification.blueprints', function ($existingBlueprints) { $container->extend('flarum.notification.blueprints', function ($existingBlueprints) {
$existingBlueprints = array_merge($existingBlueprints, $this->blueprints); $existingBlueprints = array_merge($existingBlueprints, $this->blueprints);

2
framework/core/src/Extend/Policy.php
View File

@ -50,7 +50,7 @@ class Policy implements ExtenderInterface
return $this; return $this;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
$container->extend('flarum.policies', function ($existingPolicies) { $container->extend('flarum.policies', function ($existingPolicies) {
foreach ($this->modelPolicies as $modelClass => $addPolicies) { foreach ($this->modelPolicies as $modelClass => $addPolicies) {

2
framework/core/src/Extend/Post.php
View File

@ -31,7 +31,7 @@ class Post implements ExtenderInterface
return $this; return $this;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
foreach ($this->postTypes as $postType) { foreach ($this->postTypes as $postType) {
PostModel::setModel($postType::$type, $postType); PostModel::setModel($postType::$type, $postType);

2
framework/core/src/Extend/Routes.php
View File

@ -169,7 +169,7 @@ class Routes implements ExtenderInterface
return $this; return $this;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
if (empty($this->routes) && empty($this->removedRoutes)) { if (empty($this->routes) && empty($this->removedRoutes)) {
return; return;

2
framework/core/src/Extend/SearchDriver.php
View File

@ -131,7 +131,7 @@ class SearchDriver implements ExtenderInterface
return $this; return $this;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
$container->extend('flarum.search.drivers', function (array $oldDrivers) { $container->extend('flarum.search.drivers', function (array $oldDrivers) {
$oldDrivers[$this->driverClass] = array_merge( $oldDrivers[$this->driverClass] = array_merge(

2
framework/core/src/Extend/SearchIndex.php
View File

@ -30,7 +30,7 @@ class SearchIndex implements ExtenderInterface
return $this; return $this;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
if (empty($this->indexers)) { if (empty($this->indexers)) {
return; return;

2
framework/core/src/Extend/ServiceProvider.php
View File

@ -34,7 +34,7 @@ class ServiceProvider implements ExtenderInterface
return $this; return $this;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
$app = $container->make('flarum'); $app = $container->make('flarum');

2
framework/core/src/Extend/Session.php
View File

@ -34,7 +34,7 @@ class Session implements ExtenderInterface
return $this; return $this;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
$container->extend('flarum.session.drivers', function ($drivers) { $container->extend('flarum.session.drivers', function ($drivers) {
return array_merge($drivers, $this->drivers); return array_merge($drivers, $this->drivers);

6
framework/core/src/Extend/Settings.php
View File

@ -43,7 +43,7 @@ class Settings implements ExtenderInterface
* *
* @return self * @return self
*/ */
public function serializeToForum(string $attributeName, string $key, callable|string $callback = null): self public function serializeToForum(string $attributeName, string $key, callable|string|null $callback = null): self
{ {
$this->settings[$key] = compact('attributeName', 'callback'); $this->settings[$key] = compact('attributeName', 'callback');
@ -94,7 +94,7 @@ class Settings implements ExtenderInterface
* *
* @return self * @return self
*/ */
public function registerLessConfigVar(string $configName, string $key, callable|string $callback = null): self public function registerLessConfigVar(string $configName, string $key, callable|string|null $callback = null): self
{ {
$this->lessConfigs[$configName] = compact('key', 'callback'); $this->lessConfigs[$configName] = compact('key', 'callback');
@ -114,7 +114,7 @@ class Settings implements ExtenderInterface
return $this; return $this;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
if (! empty($this->defaults)) { if (! empty($this->defaults)) {
$container->extend('flarum.settings.default', function (Collection $defaults) { $container->extend('flarum.settings.default', function (Collection $defaults) {

4
framework/core/src/Extend/Theme.php
View File

@ -48,7 +48,7 @@ class Theme implements ExtenderInterface
* @param string|null $extensionId : If overriding an extension file, specify its ID, for example: `flarum-tags`. * @param string|null $extensionId : If overriding an extension file, specify its ID, for example: `flarum-tags`.
* @return self * @return self
*/ */
public function overrideFileSource(string $file, string $newFilePath, string $extensionId = null): self public function overrideFileSource(string $file, string $newFilePath, ?string $extensionId = null): self
{ {
$this->fileSourceOverrides[] = compact('file', 'newFilePath', 'extensionId'); $this->fileSourceOverrides[] = compact('file', 'newFilePath', 'extensionId');
@ -136,7 +136,7 @@ class Theme implements ExtenderInterface
return $this; return $this;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
$container->extend('flarum.frontend.custom_less_functions', function (array $customFunctions) { $container->extend('flarum.frontend.custom_less_functions', function (array $customFunctions) {
return array_merge($customFunctions, $this->customFunctions); return array_merge($customFunctions, $this->customFunctions);

2
framework/core/src/Extend/ThrottleApi.php
View File

@ -59,7 +59,7 @@ class ThrottleApi implements ExtenderInterface
return $this; return $this;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
$container->extend('flarum.api.throttlers', function ($throttlers) use ($container) { $container->extend('flarum.api.throttlers', function ($throttlers) use ($container) {
$throttlers = array_diff_key($throttlers, array_flip($this->removeThrottlers)); $throttlers = array_diff_key($throttlers, array_flip($this->removeThrottlers));

2
framework/core/src/Extend/User.php
View File

@ -72,7 +72,7 @@ class User implements ExtenderInterface
return $this; return $this;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
$container->extend('flarum.user.display_name.supported_drivers', function ($existingDrivers) { $container->extend('flarum.user.display_name.supported_drivers', function ($existingDrivers) {
return array_merge($existingDrivers, $this->displayNameDrivers); return array_merge($existingDrivers, $this->displayNameDrivers);

2
framework/core/src/Extend/Validator.php
View File

@ -48,7 +48,7 @@ class Validator implements ExtenderInterface
return $this; return $this;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
$container->resolving($this->validatorClass, function ($validator, $container) { $container->resolving($this->validatorClass, function ($validator, $container) {
foreach ($this->configurationCallbacks as $callback) { foreach ($this->configurationCallbacks as $callback) {

2
framework/core/src/Extend/View.php
View File

@ -64,7 +64,7 @@ class View implements ExtenderInterface, LifecycleInterface
return $this; return $this;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
$container->resolving(Factory::class, function (FactoryImplementation $view) { $container->resolving(Factory::class, function (FactoryImplementation $view) {
foreach ($this->namespaces as $namespace => $hints) { foreach ($this->namespaces as $namespace => $hints) {

2
framework/core/src/Extension/Exception/ExtensionBootError.php
View File

@ -18,7 +18,7 @@ class ExtensionBootError extends Exception
public function __construct( public function __construct(
public Extension $extension, public Extension $extension,
public object $extender, public object $extender,
Throwable $previous = null ?Throwable $previous = null
) { ) {
$extenderClass = $extender::class; $extenderClass = $extender::class;

4
framework/core/src/Formatter/Formatter.php
View File

@ -63,7 +63,7 @@ class Formatter
$this->renderingCallbacks[] = $callback; $this->renderingCallbacks[] = $callback;
} }
public function parse(string $text, mixed $context = null, User $user = null): string public function parse(string $text, mixed $context = null, ?User $user = null): string
{ {
$parser = $this->getParser($context); $parser = $this->getParser($context);
@ -81,7 +81,7 @@ class Formatter
return $parser->parse($text); return $parser->parse($text);
} }
public function render(string $xml, mixed $context = null, ServerRequestInterface $request = null): string public function render(string $xml, mixed $context = null, ?ServerRequestInterface $request = null): string
{ {
$renderer = $this->getRenderer(); $renderer = $this->getRenderer();

2
framework/core/src/Foundation/Application.php
View File

@ -57,7 +57,7 @@ class Application extends IlluminateContainer implements LaravelApplication
return $config[$key] ?? $default; return $config[$key] ?? $default;
} }
public function url(string $path = null): string public function url(?string $path = null): string
{ {
$config = $this->make('flarum.config'); $config = $this->make('flarum.config');
$url = (string) $config->url(); $url = (string) $config->url();

2
framework/core/src/Foundation/Console/InfoCommand.php
View File

@ -101,7 +101,7 @@ class InfoCommand extends AbstractCommand
* If the package seems to be a Git version, we extract the currently * If the package seems to be a Git version, we extract the currently
* checked out commit using the command line. * checked out commit using the command line.
*/ */
private function findPackageVersion(string $path, string $fallback = null): ?string private function findPackageVersion(string $path, ?string $fallback = null): ?string
{ {
if (file_exists("$path/.git")) { if (file_exists("$path/.git")) {
$cwd = getcwd(); $cwd = getcwd();

2
framework/core/src/Foundation/DispatchEventsTrait.php
View File

@ -16,7 +16,7 @@ trait DispatchEventsTrait
/** /**
* Dispatch all events for an entity. * Dispatch all events for an entity.
*/ */
public function dispatchEventsFor(mixed $entity, User $actor = null): void public function dispatchEventsFor(mixed $entity, ?User $actor = null): void
{ {
if (! method_exists($entity, 'releaseEvents')) { if (! method_exists($entity, 'releaseEvents')) {
throw new \InvalidArgumentException( throw new \InvalidArgumentException(

2
framework/core/src/Frontend/Assets.php
View File

@ -86,7 +86,7 @@ class Assets
$this->sources[$type][] = $callback; $this->sources[$type][] = $callback;
} }
private function populate(CompilerInterface $compiler, string $type, string $locale = null): void private function populate(CompilerInterface $compiler, string $type, ?string $locale = null): void
{ {
$compiler->addSources(function (SourceCollector $sources) use ($type, $locale) { $compiler->addSources(function (SourceCollector $sources) use ($type, $locale) {
foreach ($this->sources[$type] as $callback) { foreach ($this->sources[$type] as $callback) {

4
framework/core/src/Frontend/Compiler/Source/SourceCollector.php
View File

@ -26,7 +26,7 @@ class SourceCollector
*/ */
protected array $sources = []; protected array $sources = [];
public function addFile(string $file, string $extensionId = null): static public function addFile(string $file, ?string $extensionId = null): static
{ {
$this->sources[] = $this->validateSourceType( $this->sources[] = $this->validateSourceType(
new FileSource($file, $extensionId) new FileSource($file, $extensionId)
@ -44,7 +44,7 @@ class SourceCollector
return $this; return $this;
} }
public function addDirectory(string $directory, string $extensionId = null): static public function addDirectory(string $directory, ?string $extensionId = null): static
{ {
$this->sources[] = $this->validateSourceType( $this->sources[] = $this->validateSourceType(
new DirectorySource($directory, $extensionId) new DirectorySource($directory, $extensionId)

4
framework/core/src/Http/AccessToken.php
View File

@ -107,7 +107,7 @@ class AccessToken extends AbstractModel
* Update the time of last usage of a token. * Update the time of last usage of a token.
* If a request object is provided, the IP address and User Agent will also be logged. * If a request object is provided, the IP address and User Agent will also be logged.
*/ */
public function touch($attribute = null, ServerRequestInterface $request = null): bool public function touch($attribute = null, ?ServerRequestInterface $request = null): bool
{ {
$now = Carbon::now(); $now = Carbon::now();
@ -192,7 +192,7 @@ class AccessToken extends AbstractModel
/** /**
* This query scope is intended to be used on the base AccessToken object to query for expired tokens of any type. * This query scope is intended to be used on the base AccessToken object to query for expired tokens of any type.
*/ */
public function scopeWhereExpired(Builder $query, Carbon $date = null): void public function scopeWhereExpired(Builder $query, ?Carbon $date = null): void
{ {
if (is_null($date)) { if (is_null($date)) {
$date = Carbon::now(); $date = Carbon::now();

4
framework/core/src/Http/RouteHandlerFactory.php
View File

@ -66,12 +66,12 @@ class RouteHandlerFactory
}); });
} }
public function toForum(string $content = null): Closure public function toForum(?string $content = null): Closure
{ {
return $this->toFrontend('forum', $content); return $this->toFrontend('forum', $content);
} }
public function toAdmin(string $content = null): Closure public function toAdmin(?string $content = null): Closure
{ {
return $this->toFrontend('admin', $content); return $this->toFrontend('admin', $content);
} }

2
framework/core/src/Install/Console/UserDataProvider.php
View File

@ -119,7 +119,7 @@ class UserDataProvider implements DataProviderInterface
]; ];
} }
private function ask(string $question, string $default = null): mixed private function ask(string $question, ?string $default = null): mixed
{ {
$question = new Question("<question>$question</question> ", $default); $question = new Question("<question>$question</question> ", $default);

2
framework/core/src/Locale/LocaleManager.php
View File

@ -49,7 +49,7 @@ class LocaleManager
return isset($this->locales[$locale]); return isset($this->locales[$locale]);
} }
public function addTranslations(string $locale, string $file, string $module = null): void public function addTranslations(string $locale, string $file, ?string $module = null): void
{ {
$prefix = $module ? $module.'::' : ''; $prefix = $module ? $module.'::' : '';

2
framework/core/src/Mail/FlarumLogTransport.php
View File

@ -19,7 +19,7 @@ class FlarumLogTransport extends LogTransport
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function send(RawMessage $message, Envelope $envelope = null): ?SentMessage public function send(RawMessage $message, ?Envelope $envelope = null): ?SentMessage
{ {
$string = $message->toString(); $string = $message->toString();

2
framework/core/src/Mail/Mailer.php
View File

@ -21,7 +21,7 @@ class Mailer extends IlluminateMailer
string $name, string $name,
Factory $views, Factory $views,
TransportInterface $transport, TransportInterface $transport,
Dispatcher $events = null, ?Dispatcher $events,
protected SettingsRepositoryInterface $settings protected SettingsRepositoryInterface $settings
) { ) {
parent::__construct($name, $views, $transport, $events); parent::__construct($name, $views, $transport, $events);

4
framework/core/src/Mail/MutateEmail.php
View File

@ -15,10 +15,10 @@ class MutateEmail
{ {
public function handle(MessageSending $event): bool public function handle(MessageSending $event): bool
{ {
if (! empty($link = $event->data['unsubscribeLink'])) { if (! empty($event->data['unsubscribeLink'])) {
$headers = $event->message->getHeaders(); $headers = $event->message->getHeaders();
$headers->addTextHeader('List-Unsubscribe', '<'.$link.'>'); $headers->addTextHeader('List-Unsubscribe', '<'.$event->data['unsubscribeLink'].'>');
} }
return true; return true;

2
framework/core/src/Post/DiscussionRenamedPost.php
View File

@ -21,7 +21,7 @@ class DiscussionRenamedPost extends AbstractEventPost implements MergeableInterf
{ {
public static string $type = 'discussionRenamed'; public static string $type = 'discussionRenamed';
public function saveAfter(Post $previous = null): static public function saveAfter(?Post $previous = null): static
{ {
// If the previous post is another 'discussion renamed' post, and it's // If the previous post is another 'discussion renamed' post, and it's
// by the same user, then we can merge this post into it. If we find // by the same user, then we can merge this post into it. If we find

2
framework/core/src/Post/MergeableInterface.php
View File

@ -26,5 +26,5 @@ interface MergeableInterface
* unsuccessful, this should be the current model instance. Otherwise, * unsuccessful, this should be the current model instance. Otherwise,
* it should be the model that was merged into. * it should be the model that was merged into.
*/ */
public function saveAfter(Post $previous = null): static; public function saveAfter(?Post $previous = null): static;
} }

4
framework/core/src/Post/PostRepository.php
View File

@ -53,7 +53,7 @@ class PostRepository
* Find posts that match certain conditions, optionally making sure they * Find posts that match certain conditions, optionally making sure they
* are visible to a certain user, and/or using other criteria. * are visible to a certain user, and/or using other criteria.
*/ */
public function findWhere(array $where = [], User $actor = null, array $sort = [], int $count = null, int $start = 0): Collection public function findWhere(array $where = [], ?User $actor = null, array $sort = [], ?int $count = null, int $start = 0): Collection
{ {
$query = $this->queryVisibleTo($actor) $query = $this->queryVisibleTo($actor)
->where($where) ->where($where)
@ -110,7 +110,7 @@ class PostRepository
* @param int[] $ids * @param int[] $ids
* @return Builder<Post> * @return Builder<Post>
*/ */
protected function queryIds(array $ids, User $actor = null): Builder protected function queryIds(array $ids, ?User $actor = null): Builder
{ {
return $this->queryVisibleTo($actor)->whereIn('posts.id', $ids); return $this->queryVisibleTo($actor)->whereIn('posts.id', $ids);
} }

2
framework/core/src/User/AvatarValidator.php
View File

@ -90,7 +90,7 @@ class AvatarValidator extends AbstractValidator
} }
} }
protected function raise(string $error, array $parameters = [], string $rule = null): void protected function raise(string $error, array $parameters = [], ?string $rule = null): void
{ {
// When we switched to intl ICU message format, the translation parameters // When we switched to intl ICU message format, the translation parameters
// have become required to be in the format `{param}`. // have become required to be in the format `{param}`.

2
framework/core/src/User/User.php
View File

@ -650,7 +650,7 @@ class User extends AbstractModel
* *
* @internal * @internal
*/ */
public static function registerPreference(string $key, callable $transformer = null, mixed $default = null): void public static function registerPreference(string $key, ?callable $transformer = null, mixed $default = null): void
{ {
static::$preferences[$key] = compact('transformer', 'default'); static::$preferences[$key] = compact('transformer', 'default');
} }

12
framework/core/src/User/UserRepository.php
View File

@ -33,7 +33,7 @@ class UserRepository
* *
* @throws \Illuminate\Database\Eloquent\ModelNotFoundException * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
*/ */
public function findOrFail(int|string $id, User $actor = null): Model public function findOrFail(int|string $id, ?User $actor = null): Model
{ {
$query = $this->query()->where('id', $id); $query = $this->query()->where('id', $id);
@ -48,7 +48,7 @@ class UserRepository
* *
* @throws \Illuminate\Database\Eloquent\ModelNotFoundException * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
*/ */
public function findOrFailByUsername(string $username, User $actor = null): Model public function findOrFailByUsername(string $username, ?User $actor = null): Model
{ {
$query = $this->query()->where('username', $username); $query = $this->query()->where('username', $username);
@ -75,14 +75,14 @@ class UserRepository
return $this->query()->where('email', $email)->first(); return $this->query()->where('email', $email)->first();
} }
public function getIdForUsername(string $username, User $actor = null): ?int public function getIdForUsername(string $username, ?User $actor = null): ?int
{ {
$query = $this->query()->where('username', $username); $query = $this->query()->where('username', $username);
return $this->scopeVisibleTo($query, $actor)->value('id'); return $this->scopeVisibleTo($query, $actor)->value('id');
} }
public function getIdsForUsernames(array $usernames, User $actor = null): array public function getIdsForUsernames(array $usernames, ?User $actor = null): array
{ {
$query = $this->query()->whereIn('username', $usernames); $query = $this->query()->whereIn('username', $usernames);
@ -93,7 +93,7 @@ class UserRepository
* Find users by matching a string of words against their username, * Find users by matching a string of words against their username,
* optionally making sure they are visible to a certain user. * optionally making sure they are visible to a certain user.
*/ */
public function getIdsForUsername(string $string, User $actor = null): array public function getIdsForUsername(string $string, ?User $actor = null): array
{ {
$string = $this->escapeLikeString($string); $string = $this->escapeLikeString($string);
@ -107,7 +107,7 @@ class UserRepository
/** /**
* @return Builder<User> * @return Builder<User>
*/ */
protected function scopeVisibleTo(Builder $query, User $actor = null): Builder protected function scopeVisibleTo(Builder $query, ?User $actor = null): Builder
{ {
if ($actor !== null) { if ($actor !== null) {
$query->whereVisibleTo($actor); $query->whereVisibleTo($actor);

2
framework/core/tests/integration/api/users/GroupSearchTest.php
View File

@ -210,7 +210,7 @@ class GroupSearchTest extends TestCase
$this->assertEqualsCanonicalizing([1, 99, 4, 5, 6], array_column($responseBodyContents['included'], 'id')); $this->assertEqualsCanonicalizing([1, 99, 4, 5, 6], array_column($responseBodyContents['included'], 'id'));
} }
private function createRequest(array $group, int $userId = null) private function createRequest(array $group, ?int $userId = null)
{ {
$auth = $userId ? ['authenticatedAs' => $userId] : []; $auth = $userId ? ['authenticatedAs' => $userId] : [];

2
framework/core/tests/integration/extenders/PostTest.php
View File

@ -40,7 +40,7 @@ class PostTestCustomPost extends AbstractEventPost implements MergeableInterface
{ {
public static string $type = 'customPost'; public static string $type = 'customPost';
public function saveAfter(Post $previous = null): static public function saveAfter(?Post $previous = null): static
{ {
$this->save(); $this->save();

4
framework/core/tests/phpunit.integration.xml
View File

@ -1,10 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" backupGlobals="false"
cacheDirectory=".phpunit.cache" cacheDirectory=".phpunit.cache"
backupStaticProperties="false" backupStaticProperties="false"
displayDetailsOnTestsThatTriggerWarnings="true"
failOnPhpunitDeprecation="true"
colors="true" colors="true"
processIsolation="true" processIsolation="true"
stopOnFailure="false" stopOnFailure="false"

4
framework/core/tests/phpunit.unit.xml
View File

@ -1,10 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" backupGlobals="false"
cacheDirectory=".phpunit.cache" cacheDirectory=".phpunit.cache"
backupStaticProperties="false" backupStaticProperties="false"
displayDetailsOnTestsThatTriggerWarnings="true"
failOnPhpunitDeprecation="true"
colors="true" colors="true"
processIsolation="false" processIsolation="false"
stopOnFailure="false" stopOnFailure="false"

2
framework/core/tests/unit/Http/CookieFactoryTest.php
View File

@ -17,7 +17,7 @@ use PHPUnit\Framework\Attributes\Test;
class CookieFactoryTest extends TestCase class CookieFactoryTest extends TestCase
{ {
protected function factory(array $config = null): CookieFactory protected function factory(?array $config = null): CookieFactory
{ {
$config = new Config(array_merge([ $config = new Config(array_merge([
'url' => 'http://flarum.test' 'url' => 'http://flarum.test'

11
framework/core/tests/unit/Locale/TranslatorTest.php
View File

@ -11,6 +11,7 @@ namespace Flarum\Tests\unit\Locale;
use Flarum\Locale\Translator; use Flarum\Locale\Translator;
use Flarum\Testing\unit\TestCase; use Flarum\Testing\unit\TestCase;
use PHPUnit\Framework\Attributes\Test;
use Symfony\Component\Translation\Loader\ArrayLoader; use Symfony\Component\Translation\Loader\ArrayLoader;
use Symfony\Component\Translation\MessageCatalogueInterface; use Symfony\Component\Translation\MessageCatalogueInterface;
@ -23,7 +24,7 @@ class TranslatorTest extends TestCase
* translator works in the same way as JS translator. * translator works in the same way as JS translator.
*/ */
/** @test */ #[Test]
public function placeholders_encoding() public function placeholders_encoding()
{ {
$translator = new Translator('en'); $translator = new Translator('en');
@ -37,7 +38,7 @@ class TranslatorTest extends TestCase
$this->assertSame("test1 test2 ' test2 test1", $translator->trans('test1', ['placeholder' => $translator->trans('test2', ['placeholder' => "'"])])); $this->assertSame("test1 test2 ' test2 test1", $translator->trans('test1', ['placeholder' => $translator->trans('test2', ['placeholder' => "'"])]));
} }
/** @test */ #[Test]
public function missing_placeholders() public function missing_placeholders()
{ {
$translator = new Translator('en'); $translator = new Translator('en');
@ -49,7 +50,7 @@ class TranslatorTest extends TestCase
$this->assertSame('test1 {placeholder} test1', $translator->trans('test1', [])); $this->assertSame('test1 {placeholder} test1', $translator->trans('test1', []));
} }
/** @test */ #[Test]
public function escaped_placeholders() public function escaped_placeholders()
{ {
$translator = new Translator('en'); $translator = new Translator('en');
@ -61,7 +62,7 @@ class TranslatorTest extends TestCase
$this->assertSame("test1 ' {placeholder} test1", $translator->trans('test3', ['placeholder' => "'"])); $this->assertSame("test1 ' {placeholder} test1", $translator->trans('test3', ['placeholder' => "'"]));
} }
/** @test */ #[Test]
public function plural_rules() public function plural_rules()
{ {
$translator = new Translator('en'); $translator = new Translator('en');
@ -74,7 +75,7 @@ class TranslatorTest extends TestCase
$this->assertSame('Page 2 - A & B', $translator->trans('test4', ['forumName' => 'A & B', 'pageNumber' => 2])); $this->assertSame('Page 2 - A & B', $translator->trans('test4', ['forumName' => 'A & B', 'pageNumber' => 2]));
} }
/** @test */ #[Test]
public function plural_rules_2() public function plural_rules_2()
{ {
$translator = new Translator('pl'); $translator = new Translator('pl');

2
php-packages/testing/src/integration/Extend/BeginTransactionAndSetDatabase.php
View File

@ -27,7 +27,7 @@ class BeginTransactionAndSetDatabase implements ExtenderInterface
$this->setDbOnTestCase = $setDbOnTestCase; $this->setDbOnTestCase = $setDbOnTestCase;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
/** @var Connection $db */ /** @var Connection $db */
$db = $container->make(ConnectionInterface::class); $db = $container->make(ConnectionInterface::class);

2
php-packages/testing/src/integration/Extend/OverrideExtensionManagerForTests.php
View File

@ -27,7 +27,7 @@ class OverrideExtensionManagerForTests implements ExtenderInterface
$this->extensions = $extensions; $this->extensions = $extensions;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
$container->when(ExtensionManagerIncludeCurrent::class)->needs('$enabledIds')->give($this->extensions); $container->when(ExtensionManagerIncludeCurrent::class)->needs('$enabledIds')->give($this->extensions);
if (count($this->extensions)) { if (count($this->extensions)) {

2
php-packages/testing/src/integration/Extend/SetSettingsBeforeBoot.php
View File

@ -26,7 +26,7 @@ class SetSettingsBeforeBoot implements ExtenderInterface
$this->settings = $settings; $this->settings = $settings;
} }
public function extend(Container $container, Extension $extension = null): void public function extend(Container $container, ?Extension $extension = null): void
{ {
if (count($this->settings)) { if (count($this->settings)) {
$settings = $container->make(SettingsRepositoryInterface::class); $settings = $container->make(SettingsRepositoryInterface::class);

Some files were not shown because too many files have changed in this diff Show More