mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-04 07:27:39 +02:00
Code Issues Releases Wiki Activity

fix: typing

Browse Source
This commit is contained in:
Sami Mazouz
2024-03-08 18:48:51 +01:00
parent cda2b37dc2
commit 7c4f69e56f
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
extensions/sticky/tests/integration/api/ListDiscussionsTest.php
View File

@@ -59,9 +59,9 @@ class ListDiscussionsTest extends TestCase
$this->request('GET', '/api/discussions') $this->request('GET', '/api/discussions')
); );
$this->assertEquals(200, $response->getStatusCode()); $this->assertEquals(200, $response->getStatusCode(), $body = $response->getBody()->getContents());
$data = json_decode($response->getBody()->getContents(), true); $data = json_decode($body, true);
$this->assertEqualsCanonicalizing([3, 1, 2, 4], Arr::pluck($data['data'], 'id')); $this->assertEqualsCanonicalizing([3, 1, 2, 4], Arr::pluck($data['data'], 'id'));
} }
@@ -75,9 +75,9 @@ class ListDiscussionsTest extends TestCase
]) ])
); );
$this->assertEquals(200, $response->getStatusCode()); $this->assertEquals(200, $response->getStatusCode(), $body = $response->getBody()->getContents());
$data = json_decode($response->getBody()->getContents(), true); $data = json_decode($body, true);
$this->assertEqualsCanonicalizing([3, 1, 2, 4], Arr::pluck($data['data'], 'id')); $this->assertEqualsCanonicalizing([3, 1, 2, 4], Arr::pluck($data['data'], 'id'));
} }
@@ -91,9 +91,9 @@ class ListDiscussionsTest extends TestCase
]) ])
); );
$this->assertEquals(200, $response->getStatusCode()); $this->assertEquals(200, $response->getStatusCode(), $body = $response->getBody()->getContents());
$data = json_decode($response->getBody()->getContents(), true); $data = json_decode($body, true);
$this->assertEqualsCanonicalizing([2, 4, 3, 1], Arr::pluck($data['data'], 'id')); $this->assertEqualsCanonicalizing([2, 4, 3, 1], Arr::pluck($data['data'], 'id'));
} }
@@ -111,9 +111,9 @@ class ListDiscussionsTest extends TestCase
]) ])
); );
$this->assertEquals(200, $response->getStatusCode()); $this->assertEquals(200, $response->getStatusCode(), $body = $response->getBody()->getContents());
$data = json_decode($response->getBody()->getContents(), true); $data = json_decode($body, true);
$this->assertEqualsCanonicalizing([3, 1, 2, 4], Arr::pluck($data['data'], 'id')); $this->assertEqualsCanonicalizing([3, 1, 2, 4], Arr::pluck($data['data'], 'id'));
} }

5
extensions/tags/extend.php
View File

@@ -32,6 +32,7 @@ use Flarum\Tags\Search\TagSearcher;
use Flarum\Tags\Tag; use Flarum\Tags\Tag;
use Flarum\Tags\Utf8SlugDriver; use Flarum\Tags\Utf8SlugDriver;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Relations\Relation;
return [ return [
(new Extend\Frontend('forum')) (new Extend\Frontend('forum'))
@@ -108,8 +109,8 @@ return [
function (Endpoint\Index|Endpoint\Show|Endpoint\Create $endpoint) { function (Endpoint\Index|Endpoint\Show|Endpoint\Create $endpoint) {
return $endpoint return $endpoint
->addDefaultInclude(['tags', 'tags.parent']) ->addDefaultInclude(['tags', 'tags.parent'])
->eagerLoadWhere('tags', function (Builder $query, Context $context, array $relations) { ->eagerLoadWhere('tags', function (Builder|Relation $query, Context $context) {
/** @var Builder<Tag> $query */ /** @var Builder<Tag>|Relation $query */
$query->withStateFor($context->getActor()); $query->withStateFor($context->getActor());
}); });
} }