[!!!][TASK] Replace QueryGenerator with PageRepository

If a storage page is hidden, it is not used anymore

Author: georgringer

Build/Scripts/runTests.sh

@@ -310,7 +310,7 @@ TEST_SUITE=""
 TYPO3_VERSION="12"
 DBMS="mysql"
 DBMS_VERSION=""
-PHP_VERSION="8.1"
+PHP_VERSION="8.2"
 PHP_XDEBUG_ON=0
 PHP_XDEBUG_PORT=9003
 EXTRA_TEST_OPTIONS=""

Classes/Controller/AddressController.php

@@ -11,7 +11,6 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
-use FriendsOfTYPO3\TtAddress\Database\QueryGenerator;
 use FriendsOfTYPO3\TtAddress\Domain\Model\Address;
 use FriendsOfTYPO3\TtAddress\Domain\Model\Dto\Demand;
 use FriendsOfTYPO3\TtAddress\Domain\Model\Dto\Settings;
@@ -20,6 +19,7 @@
 use FriendsOfTYPO3\TtAddress\Utility\CacheUtility;
 use FriendsOfTYPO3\TtAddress\Utility\TypoScript;
 use Psr\Http\Message\ResponseInterface;
+use TYPO3\CMS\Core\Domain\Repository\PageRepository;
 use TYPO3\CMS\Core\Pagination\ArrayPaginator;
 use TYPO3\CMS\Core\Pagination\PaginatorInterface;
 use TYPO3\CMS\Core\Pagination\SimplePagination;
@@ -34,12 +34,12 @@
 class AddressController extends ActionController
 {
     protected AddressRepository $addressRepository;
-    protected QueryGenerator$queryGenerator;
+    protected PageRepository $pageRepository;
     protected Settings $extensionConfiguration;
 
     public function initializeAction(): void
     {
-        $this->queryGenerator = GeneralUtility::makeInstance(QueryGenerator::class);
+        $this->pageRepository = GeneralUtility::makeInstance(PageRepository::class);
         $this->extensionConfiguration = GeneralUtility::makeInstance(Settings::class);
     }
 
@@ -231,19 +231,8 @@ protected function removeDotAtTheEnd($string): string
      */
     protected function getPidList(): array
     {
-        $rootPIDs = explode(',', $this->settings['pages']);
-        $pidList = $rootPIDs;
-
-        // iterate through root-page ids and merge to array
-        foreach ($rootPIDs as $pid) {
-            // @extensionScannerIgnoreLine
-            $result = $this->queryGenerator->getTreeList($pid, (int) ($this->settings['recursive'] ?? 0));
-            if ($result) {
-                $subtreePids = explode(',', $result);
-                $pidList = array_merge($pidList, $subtreePids);
-            }
-        }
-        return $pidList;
+        $rootPIDs = explode(',', $this->settings['pages'] ?? '');
+        return $this->pageRepository->getPageIdsRecursive($rootPIDs, (int) ($this->settings['recursive'] ?? 0));
     }
 
     /**

Classes/Database/QueryGenerator.php

@@ -17,10 +17,14 @@
 use FriendsOfTYPO3\TtAddress\Domain\Model\Dto\Demand;
 use FriendsOfTYPO3\TtAddress\Domain\Model\Dto\Settings;
 use FriendsOfTYPO3\TtAddress\Domain\Repository\AddressRepository;
+use TYPO3\CMS\Core\Cache\CacheDataCollectorInterface;
+use TYPO3\CMS\Core\Domain\Repository\PageRepository;
+use TYPO3\CMS\Core\Http\ServerRequest;
 use TYPO3\CMS\Core\Package\PackageManager;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManager;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
+use TYPO3\CMS\Extbase\Mvc\ExtbaseRequestParameters;
 use TYPO3\CMS\Extbase\Mvc\Request;
 use TYPO3\CMS\Fluid\View\TemplateView;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
@@ -31,7 +35,13 @@ class AddressControllerTest extends BaseTestCase
 {
     protected function setUp(): void
     {
-        $GLOBALS['TSFE'] = $this->getAccessibleMock(TypoScriptFrontendController::class, ['addCacheTags'], [], '', false);
+        $mockedCacheDataCollector =$this->getMockBuilder(CacheDataCollectorInterface::class)->getMock();
+
+        $serverRequest = (new ServerRequest())
+            ->withAttribute('extbase', new ExtbaseRequestParameters())
+            ->withAttribute('frontend.cache.collector', $mockedCacheDataCollector);
+
+        $GLOBALS['TYPO3_REQUEST'] = $serverRequest;
     }
 
     /**
@@ -79,23 +89,6 @@ public function dotsAreRemovedFromArray()
         self::assertEquals($expected, $subject->_call('removeDots', $given));
     }
 
-    /**
-     * @test
-     */
-    public function initializeActionWorks()
-    {
-        $mockedPackageManager = $this->getAccessibleMock(PackageManager::class, null, [], '', false);
-        GeneralUtility::setSingletonInstance(PackageManager::class, $mockedPackageManager);
-
-        $subject = $this->getAccessibleMock(AddressController::class, null, [], '', false);
-        $subject->_set('extensionConfiguration', $this->getMockedSettings());
-        $subject->initializeAction();
-
-        $expected = new QueryGenerator();
-
-        self::assertEquals($expected, $subject->_get('queryGenerator'));
-    }
-
     /**
      * @test
      */
@@ -114,17 +107,21 @@ public function injectAddressRepositoryWorks()
      */
     public function pidListIsReturned()
     {
-        $mockedQueryGenerator = $this->getAccessibleMock(QueryGenerator::class, ['getTreeList'], [], '', false);
-        $mockedQueryGenerator->expects(self::any())->method('getTreeList');
+        $mockedPageRepsitory = $this->getAccessibleMock(PageRepository::class, ['getPageIdsRecursive'], [], '', false);
+        $mockedPageRepsitory->expects(self::any())
+            ->method('getPageIdsRecursive')
+            ->with([123, 456], 3)
+            ->willReturn([123, 456, 789]);
+        ;
 
         $subject = $this->getAccessibleMock(AddressController::class, null, [], '', false);
-        $subject->_set('queryGenerator', $mockedQueryGenerator);
+        $subject->_set('pageRepository', $mockedPageRepsitory);
         $subject->_set('settings', [
             'pages' => '123,456',
             'recursive' => 3,
         ]);
 
-        self::assertEquals(['123', '456'], $subject->_call('getPidList'));
+        self::assertEquals([123, 456, 789], $subject->_call('getPidList'));
     }
 
     /**

Tests/Unit/Controller/AddressControllerTest.php

@@ -31,7 +31,7 @@ class CacheUtilityTest extends BaseTestCase
     public function nonArrayRecordInstancesAreSkippedForCacheTags()
     {
         $addressRecords = ['dummy string'];
-        
+
         $mockedCacheDataCollector =$this->getMockBuilder(CacheDataCollectorInterface::class)->getMock();
         $mockedCacheDataCollector
             ->expects($this->never())