Skip to content

Commit ce2285b

Browse files
committed
* inline all single usage of variable with value self::getContainer()
- override method `tearDown()` as it's only invoking the parent @ `EventListener\ShowReactJsonViewTest` @ `App\Tests` * rename `hasQueryResultMorePages()` to `hasMorePages()` since 122379f @ `App\PostsQuery\QueryResult`, also affects its usage in `App\Controller\UsersController->query()` @ be
1 parent 3f225ce commit ce2285b

File tree

6 files changed

+7
-16
lines changed

6 files changed

+7
-16
lines changed

be/src/Controller/UsersController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ function (array $acc, $paramValue, string $paramName) use ($paramConstraints): a
5151
)[1]->orderBy('t.uid', 'DESC');
5252

5353
['result' => $result, 'hasMorePages' => $hasMorePages] =
54-
QueryResult::hasQueryResultMorePages($queries, $this->perPageItems);
54+
QueryResult::hasMorePages($queries, $this->perPageItems);
5555
$resultCount = count($result);
5656
Helper::abortAPIIf(40402, $resultCount === 0);
5757

be/src/PostsQuery/QueryResult.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function __construct(
3636
) {}
3737

3838
/** @return array{result: Collection, hasMorePages: bool} */
39-
public static function hasQueryResultMorePages(QueryBuilder $query, int $limit): array
39+
public static function hasMorePages(QueryBuilder $query, int $limit): array
4040
{
4141
$results = collect($query->setMaxResults($limit + 1)->getQuery()->getResult());
4242
if ($results->count() === $limit + 1) {
@@ -91,7 +91,7 @@ public function setResult(
9191
});
9292

9393
$resultsAndHasMorePages = $queries->map(fn(QueryBuilder $query) =>
94-
self::hasQueryResultMorePages($query, $this->perPageItems));
94+
self::hasMorePages($query, $this->perPageItems));
9595
/** @var PostsKeyByTypePluralName $postsKeyByTypePluralName */
9696
$postsKeyByTypePluralName = $resultsAndHasMorePages
9797
->mapWithKeys(fn(array $resultAndHasMorePages, string $postType) =>

be/tests/EventListener/PrettyJsonResponseTest.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ protected function setUp(): void
1919
{
2020
parent::setUp();
2121
self::bootKernel();
22-
$container = static::getContainer();
23-
$this->sut = $container->get(PrettyJsonResponse::class);
22+
$this->sut = static::getContainer()->get(PrettyJsonResponse::class);
2423
}
2524

2625
public function test(): void

be/tests/EventListener/ShowReactJsonViewTest.php

+1-7
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,7 @@ protected function setUp(): void
1919
{
2020
parent::setUp();
2121
self::bootKernel();
22-
$container = static::getContainer();
23-
$this->sut = $container->get(ShowReactJsonView::class);
24-
}
25-
26-
protected function tearDown(): void
27-
{
28-
parent::tearDown();
22+
$this->sut = static::getContainer()->get(ShowReactJsonView::class);
2923
}
3024

3125
public function testShowing(): void

be/tests/PostsQuery/PostsTreeTest.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ protected function setUp(): void
2020
{
2121
parent::setUp();
2222
self::bootKernel();
23-
$container = self::getContainer();
24-
$this->sut = $container->get(PostsTree::class);
23+
$this->sut = self::getContainer()->get(PostsTree::class);
2524
}
2625

2726
#[DataProvider('provideReOrderNestedPostsData')]

be/tests/Repository/Post/PostRepositoryFactoryTest.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ protected function setUp(): void
1818
{
1919
parent::setUp();
2020
self::bootKernel();
21-
$container = static::getContainer();
22-
$this->sut = $container->get(PostRepositoryFactory::class);
21+
$this->sut = static::getContainer()->get(PostRepositoryFactory::class);
2322
}
2423

2524
#[DataProvider('providePostModelFid')]

0 commit comments

Comments
 (0)