diff --git a/extensions/sticky/tests/integration/api/ListDiscussionsTest.php b/extensions/sticky/tests/integration/api/ListDiscussionsTest.php index 4db57a65a..cd13c9bc5 100644 --- a/extensions/sticky/tests/integration/api/ListDiscussionsTest.php +++ b/extensions/sticky/tests/integration/api/ListDiscussionsTest.php @@ -59,9 +59,9 @@ class ListDiscussionsTest extends TestCase $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')); } @@ -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')); } @@ -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')); } @@ -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')); } diff --git a/extensions/tags/extend.php b/extensions/tags/extend.php index 0bf0d0c17..b656961df 100644 --- a/extensions/tags/extend.php +++ b/extensions/tags/extend.php @@ -32,6 +32,7 @@ use Flarum\Tags\Search\TagSearcher; use Flarum\Tags\Tag; use Flarum\Tags\Utf8SlugDriver; use Illuminate\Database\Eloquent\Builder; +use Illuminate\Database\Eloquent\Relations\Relation; return [ (new Extend\Frontend('forum')) @@ -108,8 +109,8 @@ return [ function (Endpoint\Index|Endpoint\Show|Endpoint\Create $endpoint) { return $endpoint ->addDefaultInclude(['tags', 'tags.parent']) - ->eagerLoadWhere('tags', function (Builder $query, Context $context, array $relations) { - /** @var Builder $query */ + ->eagerLoadWhere('tags', function (Builder|Relation $query, Context $context) { + /** @var Builder|Relation $query */ $query->withStateFor($context->getActor()); }); }