[Task] add EXT:container to dev-requirements, fix some php-stan complaints

Author: DavidBruchmann

Classes/DataHandler/ProcessCmdmap.php

@@ -54,7 +54,6 @@ public function execute_processCmdmap(
     ): void {
 
         $this->init($table, $id, $parentObj);
-        /** @var ServerRequestInterface $request */
         $request = $GLOBALS['TYPO3_REQUEST'] ?? null;
         if (!($request instanceof ServerRequestInterface)) {
             return;

Classes/Domain/Repository/TtContentRepository.php

@@ -66,7 +66,7 @@ public function __construct()
      * @todo: move this in a repository
      *
      * @param string $shortcutItem The single page to be used as the tree root
-     * @param array<int, array<non-empty-string, mixed>> $collectedItems The collected item data rows ordered by parent position, column position and sorting
+     * @param-out array<int, array<non-empty-string, mixed>> $collectedItems The collected item data rows ordered by parent position, column position and sorting
      * @param int $recursive The number of levels for the recursion
      * @param int $parentUid uid of the referencing tt_content record
      * @param int $language sys_language_uid of the referencing tt_content record
@@ -133,7 +133,7 @@ public function collectContentDataFromPages(
      * @todo: move this in a repository
      *
      * @param string $shortcutItem The tt_content element to fetch the data from
-     * @param array<int, array<non-empty-string, mixed>> $collectedItems The collected item data row
+     * @param-out array<int, array<non-empty-string, mixed>> $collectedItems The collected item data row
      * @param int $parentUid uid of the referencing tt_content record
      * @param int $language sys_language_uid of the referencing tt_content record
      * @throws DBALException
@@ -206,8 +206,8 @@ public function getPidFromUid(int $uid = 0): int
             )
             ->executeQuery()
             ->fetchAssociative();
-        $pid = (int)($contentElement['pid'] ?? 0);
-        return is_array($contentElement) && $pid ? $pid : 0;
+
+        return $contentElement['pid'] ? (int)$contentElement['pid'] : 0;
     }
 
     /**

Tests/Functional/ApiCompatibilityTest.php

@@ -114,14 +114,6 @@ public function connectionPoolApiIsCompatible(): void
     {
         $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
         $queryBuilder = $connectionPool->getQueryBuilderForTable('tt_content');
-
-        // Test that ConnectionPool API works consistently across versions
-        self::assertInstanceOf(\TYPO3\CMS\Core\Database\Query\QueryBuilder::class, $queryBuilder);
-
-        // Test query builder methods that are used by the extension
-        $connection = $connectionPool->getConnectionForTable('tt_content');
-        self::assertInstanceOf(\TYPO3\CMS\Core\Database\Connection::class, $connection);
-
         // Test restrictions API
         $restrictions = $queryBuilder->getRestrictions();
         self::assertInstanceOf(\TYPO3\CMS\Core\Database\Query\Restriction\QueryRestrictionContainerInterface::class, $restrictions);
@@ -134,28 +126,6 @@ public function dataHandlerApiIsCompatible(): void
 
         // Test DataHandler properties and methods used by extension
         self::assertObjectHasProperty('isImporting', $dataHandler);
-
-        // Test method signatures that are used by ProcessCmdmap
-        self::assertTrue(method_exists($dataHandler, 'start'));
-        self::assertTrue(method_exists($dataHandler, 'process_datamap'));
-        self::assertTrue(method_exists($dataHandler, 'process_cmdmap'));
-    }
-
-    #[Test]
-    public function BackendHelperClassUsesCompatibleApis(): void
-    {
-        $backendHelper = GeneralUtility::makeInstance(BackendHelper::class);
-
-        // Test that BackendHelper class can be instantiated and uses compatible APIs
-        self::assertInstanceOf(BackendHelper::class, $backendHelper);
-
-        // Test backend user access
-        $backendUser = $backendHelper->getBackendUser();
-        // Backend user might be null in testing context, but method should exist
-        self::assertTrue(method_exists($backendHelper, 'getBackendUser'));
-
-        // Test language service access
-        self::assertTrue(method_exists($backendHelper, 'getLanguageService'));
     }
 
     #[Test]
@@ -165,7 +135,7 @@ public function TtContentRepositoryUsesCompatibleApis(): void
 
         // Test database query methods
         $queryBuilder = $ttContentRepository->getQueryBuilder('tt_content');
-        self::assertInstanceOf(\TYPO3\CMS\Core\Database\Query\QueryBuilder::class, $queryBuilder);
+        self::assertTrue($queryBuilder, 'QueryBuilder can be retrieved from TtContentRepository');
     }
 
     #[Test]
@@ -232,15 +202,15 @@ public function globalVariablesAreAccessibleAcrossVersions(): void
         $request = $GLOBALS['TYPO3_REQUEST'] ?? null;
 
         // The extension should handle null request gracefully
-        self::assertTrue(true, 'Global variables access pattern is compatible');
+        self::assertTrue($request, 'Global variables access pattern is compatible');
 
         // Test BE_USER global access pattern
         $backendUser = $GLOBALS['BE_USER'] ?? null;
-        self::assertTrue(true, 'Backend user global access pattern is compatible');
+        self::assertTrue($backendUser, 'Backend user global access pattern is compatible');
 
         // Test LANG global access pattern
         $languageService = $GLOBALS['LANG'] ?? null;
-        self::assertTrue(true, 'Language service global access pattern is compatible');
+        self::assertTrue($languageService, 'Language service global access pattern is compatible');
     }
 
     #[Test]

composer.json

@@ -34,6 +34,7 @@
 		"typo3/cms-core": "^13.4 || ^14.0 < 14.2"
 	},
 	"require-dev": {
+		"b13/container": "^3.2",
 		"ergebnis/composer-normalize": "^2.31",
 		"friendsofphp/php-cs-fixer": "^3.64.0",
 		"phpstan/phpstan": "^1.12.5 || ^2.0.2",