[!!!][TASK] Remove deprecated code from ConditionMatcher

The following methods changed from protected to private:

ConditionMatcher->determinePageId()
ConditionMatcher->getPageIdByRecord()

Resolves: #88407
Related: #87193
Releases: master
Change-Id: Iea9789aeb7f74ed3dad55ee81245b7ebb5806fde
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/60786

Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Benni Mack <benni@typo3.org>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Josef Glatz <josefglatz@gmail.com>
Reviewed-by: Benni Mack <benni@typo3.org>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>

typo3/sysext/backend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php

@@ -71,9 +71,8 @@ class ConditionMatcher extends AbstractConditionMatcher
      * the accordant conditions (e.g. PIDinRootline) will return "FALSE"
      *
      * @return int The determined page id or otherwise 0
-     * @deprecated since TYPO3 v9.4, will be removed in TYPO3 v10.0.
      */
-    protected function determinePageId()
+    private function determinePageId(): int
     {
         $pageId = 0;
         $editStatement = GeneralUtility::_GP('edit');
@@ -114,9 +113,8 @@ class ConditionMatcher extends AbstractConditionMatcher
      * @param int $id Id of the accordant record
      * @param bool $ignoreTable Whether to ignore the page, if TRUE a positive
      * @return int Id of the page the record is persisted on
-     * @deprecated since TYPO3 v9.4, will be removed in TYPO3 v10.0.
      */
-    protected function getPageIdByRecord($table, $id, $ignoreTable = false)
+    private function getPageIdByRecord($table, $id, $ignoreTable = false): int
     {
         $pageId = 0;
         $id = (int)$id;
@@ -125,7 +123,7 @@ class ConditionMatcher extends AbstractConditionMatcher
                 $pageId = $id;
             } else {
                 $record = BackendUtility::getRecordWSOL($table, abs($id), '*', '', false);
-                $pageId = $record['pid'];
+                $pageId = (int)$record['pid'];
             }
         }
         return $pageId;

typo3/sysext/core/Documentation/Changelog/master/Breaking-87193-DeprecatedFunctionalityRemoved.rst

@@ -210,6 +210,8 @@ The following PHP class methods that have been previously deprecated for v9 have
 * :php:`TYPO3\CMS\Backend\Configuration\TypoScript\ConditionMatching\ConditionMatcher->isUserLoggedIn()`
 * :php:`TYPO3\CMS\Backend\Configuration\TypoScript\ConditionMatching\ConditionMatcher->isAdminUser()`
 * :php:`TYPO3\CMS\Backend\Configuration\TypoScript\ConditionMatching\ConditionMatcher->getBackendUserAuthentication()`
+* :php:`TYPO3\CMS\Backend\Configuration\TypoScript\ConditionMatching\ConditionMatcher->determinePageId()`
+* :php:`TYPO3\CMS\Backend\Configuration\TypoScript\ConditionMatching\ConditionMatcher->getPageIdByRecord()`
 * :php:`TYPO3\CMS\Backend\Controller\ContentElement\MoveElementController->main()`
 * :php:`TYPO3\CMS\Backend\Controller\ContentElement\NewContentElementController->main()`
 * :php:`TYPO3\CMS\Backend\Controller\ContentElement\NewContentElementController->removeInvalidElements()`