[BUGFIX] Handle method signature change in TYPO3 12.2

Oktopuce · Feb 16, 2023 · 767eb22 · 767eb22
1 parent c8f22a4
commit 767eb22
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/Classes/Service/PageService.php b/Classes/Service/PageService.php
@@ -16,6 +16,7 @@
 use TYPO3\CMS\Core\Type\Bitmask\PageTranslationVisibility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\RootlineUtility;
+use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 
 /**
  * Page Service
@@ -43,12 +44,14 @@ public function getMenu(
         $pageConstraints = $this->getPageConstraints($excludePages, $includeNotInMenu, $includeMenuSeparator);
         $cacheKey = md5($pageUid . $pageConstraints . (integer) $disableGroupAccessCheck);
         if (!isset(static::$cachedMenus[$cacheKey])) {
-            if ($disableGroupAccessCheck) {
+            if ($disableGroupAccessCheck
+                && version_compare(VersionNumberUtility::getCurrentTypo3Version(), '12.1', '<=')
+            ) {
                 $pageRepository->where_groupAccess = '';
             }
 
             static::$cachedMenus[$cacheKey] = array_filter(
-                $pageRepository->getMenu($pageUid, '*', 'sorting', $pageConstraints),
+                $pageRepository->getMenu($pageUid, '*', 'sorting', $pageConstraints, true, !$disableGroupAccessCheck),
                 function ($page) {
                     return !$this->hidePageForLanguageUid($page);
                 }

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1,5 +1,13 @@
 parameters:
     ignoreErrors:
+        -
+            message: "#^Access to protected property TYPO3\\\\CMS\\\\Core\\\\Domain\\\\Repository\\\\PageRepository\\:\\:\\$where_groupAccess\\.$#"
+            count: 1
+            path: Classes/Service/PageService.php
+        -
+            message: "#^Method TYPO3\\\\CMS\\\\Core\\\\Domain\\\\Repository\\\\PageRepository\\:\\:getMenu\\(\\) invoked with 6 parameters, 1\\-5 required\\.$#"
+            count: 1
+            path: Classes/Service/PageService.php
         -
             message: "#^Parameter \\#2 \\$conf of method TYPO3\\\\CMS\\\\Frontend\\\\ContentObject\\\\ContentObjectRenderer\\:\\:parseFunc\\(\\) expects non-empty-array<string, mixed>\\|null, array\\{\\} given\\.$#"
             count: 1