* 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
n0099 · Oct 30, 2024 · ce2285b · ce2285b
1 parent 3f225ce
commit ce2285b
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 16 deletions.
diff --git a/be/src/Controller/UsersController.php b/be/src/Controller/UsersController.php
@@ -51,7 +51,7 @@ function (array $acc, $paramValue, string $paramName) use ($paramConstraints): a
             )[1]->orderBy('t.uid', 'DESC');
 
         ['result' => $result, 'hasMorePages' => $hasMorePages] =
-            QueryResult::hasQueryResultMorePages($queries, $this->perPageItems);
+            QueryResult::hasMorePages($queries, $this->perPageItems);
         $resultCount = count($result);
         Helper::abortAPIIf(40402, $resultCount === 0);
 

diff --git a/be/src/PostsQuery/QueryResult.php b/be/src/PostsQuery/QueryResult.php
@@ -36,7 +36,7 @@ public function __construct(
     ) {}
 
     /** @return array{result: Collection, hasMorePages: bool} */
-    public static function hasQueryResultMorePages(QueryBuilder $query, int $limit): array
+    public static function hasMorePages(QueryBuilder $query, int $limit): array
     {
         $results = collect($query->setMaxResults($limit + 1)->getQuery()->getResult());
         if ($results->count() === $limit + 1) {
@@ -91,7 +91,7 @@ public function setResult(
         });
 
         $resultsAndHasMorePages = $queries->map(fn(QueryBuilder $query) =>
-            self::hasQueryResultMorePages($query, $this->perPageItems));
+            self::hasMorePages($query, $this->perPageItems));
         /** @var PostsKeyByTypePluralName $postsKeyByTypePluralName */
         $postsKeyByTypePluralName = $resultsAndHasMorePages
             ->mapWithKeys(fn(array $resultAndHasMorePages, string $postType) =>

diff --git a/be/tests/EventListener/PrettyJsonResponseTest.php b/be/tests/EventListener/PrettyJsonResponseTest.php
@@ -19,8 +19,7 @@ protected function setUp(): void
     {
         parent::setUp();
         self::bootKernel();
-        $container = static::getContainer();
-        $this->sut = $container->get(PrettyJsonResponse::class);
+        $this->sut = static::getContainer()->get(PrettyJsonResponse::class);
     }
 
     public function test(): void

diff --git a/be/tests/EventListener/ShowReactJsonViewTest.php b/be/tests/EventListener/ShowReactJsonViewTest.php
@@ -19,13 +19,7 @@ protected function setUp(): void
     {
         parent::setUp();
         self::bootKernel();
-        $container = static::getContainer();
-        $this->sut = $container->get(ShowReactJsonView::class);
-    }
-
-    protected function tearDown(): void
-    {
-        parent::tearDown();
+        $this->sut = static::getContainer()->get(ShowReactJsonView::class);
     }
 
     public function testShowing(): void

diff --git a/be/tests/PostsQuery/PostsTreeTest.php b/be/tests/PostsQuery/PostsTreeTest.php
@@ -20,8 +20,7 @@ protected function setUp(): void
     {
         parent::setUp();
         self::bootKernel();
-        $container = self::getContainer();
-        $this->sut = $container->get(PostsTree::class);
+        $this->sut = self::getContainer()->get(PostsTree::class);
     }
 
     #[DataProvider('provideReOrderNestedPostsData')]

diff --git a/be/tests/Repository/Post/PostRepositoryFactoryTest.php b/be/tests/Repository/Post/PostRepositoryFactoryTest.php
@@ -18,8 +18,7 @@ protected function setUp(): void
     {
         parent::setUp();
         self::bootKernel();
-        $container = static::getContainer();
-        $this->sut = $container->get(PostRepositoryFactory::class);
+        $this->sut = static::getContainer()->get(PostRepositoryFactory::class);
     }
 
     #[DataProvider('providePostModelFid')]