[TASK] Fix a last phpstan error on this level

This is actually most likely a phpstan bug. We add an @var hint to circumvent.
TYPO3-CMS · Oct 30, 2023 · e8e8cac · e8e8cac
1 parent 982f6c0
commit e8e8cac
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 19 deletions.
diff --git a/Build/phpstan-baseline.neon b/Build/phpstan-baseline.neon
@@ -1,7 +1,2 @@
 parameters:
-	ignoreErrors:
-		-
-			message: "#^Offset 0 does not exist on array\\{\\}\\.$#"
-			count: 1
-			path: ../Classes/TcaDataGenerator/Generator.php
-
+	ignoreErrors: []
diff --git a/Build/testing-docker/docker-compose.yml b/Build/testing-docker/docker-compose.yml
@@ -448,7 +448,7 @@ services:
         fi
         mkdir -p .Build/.cache
         php -v | grep '^PHP';
-        php -dxdebug.mode=off .Build/bin/phpstan analyze -c Build/phpstan.neon --no-progress --no-interaction --generate-baseline=Build/phpstan-baseline.neon
+        php -dxdebug.mode=off .Build/bin/phpstan analyze -c Build/phpstan.neon --no-progress --no-interaction --allow-empty-baseline --generate-baseline=Build/phpstan-baseline.neon
       "
 
   unit:

diff --git a/Classes/TcaDataGenerator/Generator.php b/Classes/TcaDataGenerator/Generator.php
@@ -123,7 +123,10 @@ public function create(): void
         $this->executeDataHandler($data);
 
         // Create a site configuration on root page
-        $topPageUid = $recordFinder->findUidsOfStyleguideEntryPages()[0];
+        /** @var non-empty-array $topPageUidList */
+        $topPageUidList = $recordFinder->findUidsOfStyleguideEntryPages();
+        $topPageUid = $topPageUidList[0];
+
         $this->createSiteConfiguration($topPageUid);
 
         // Create data for each main table

diff --git a/Classes/TcaDataGenerator/RecordFinder.php b/Classes/TcaDataGenerator/RecordFinder.php
@@ -37,14 +37,12 @@ class RecordFinder
      * Returns a uid list of existing styleguide demo top level pages.
      * These are pages with pid=0 and tx_styleguide_containsdemo set to 'tx_styleguide'.
      * This can be multiple pages if "create" button was clicked multiple times without "delete" in between.
-     *
-     * @return array
      */
     public function findUidsOfStyleguideEntryPages(): array
     {
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('pages');
         $queryBuilder->getRestrictions()->removeAll()->add(GeneralUtility::makeInstance(DeletedRestriction::class));
-        $rows = $queryBuilder->select('uid')
+        $result = $queryBuilder->select('uid')
             ->from('pages')
             ->where(
                 $queryBuilder->expr()->eq(
@@ -56,15 +54,12 @@ public function findUidsOfStyleguideEntryPages(): array
                     $queryBuilder->createNamedParameter('tx_styleguide', \PDO::PARAM_STR)
                 )
             )
-            ->executeQuery()
-            ->fetchAllAssociative();
-        $uids = [];
-        if (is_array($rows)) {
-            foreach ($rows as $row) {
-                $uids[] = (int)$row['uid'];
-            }
+            ->executeQuery();
+        $uidList = [];
+        while ($row = $result->fetchAssociative()) {
+            $uidList[] = (int)$row['uid'];
         }
-        return $uids;
+        return $uidList;
     }
 
     /**