[FIX] tests for TYPO3 13 @ 2024.07.02

Migrates: * Configuration/FlexForms/Form.xml * Configuration/FlexForms/Results.xml Relates: TYPO3-Solr#3995
dkd-kaehm · Jul 3, 2024 · b808a64 · b808a64
1 parent 816746d
commit b808a64
Show file tree

Hide file tree

Showing 53 changed files with 498 additions and 602 deletions.
diff --git a/Build/Test/IntegrationTests.xml b/Build/Test/IntegrationTests.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd"
+	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
 	backupGlobals="true"
 	beStrictAboutTestsThatDoNotTestAnything="false"
 	bootstrap="../../.Build/vendor/typo3/testing-framework/Resources/Core/Build/FunctionalTestsBootstrap.php"
@@ -15,10 +15,9 @@
 	failOnNotice="true"
 	failOnRisky="true"
 	failOnWarning="true"
-	requireCoverageMetadata="false"
 	processIsolation="true"
 >
-	<coverage includeUncoveredFiles="false"></coverage>
+	<coverage includeUncoveredFiles="false"/>
 	<source>
 		<include>
 			<directory>../../Classes</directory>

diff --git a/Classes/Domain/Index/Queue/UpdateHandler/DataUpdateHandler.php b/Classes/Domain/Index/Queue/UpdateHandler/DataUpdateHandler.php
@@ -246,7 +246,7 @@ public function handleMovedPage(int $uid, ?int $previousParentId = null): void
         $this->applyPageChangesToQueue($uid);
 
         if ($previousParentId !== null) {
-            $pageRecord = BackendUtility::getRecord('pages', $uid);
+            $pageRecord = $this->getRecord('pages', $uid);
             if ($pageRecord !== null && (int)$pageRecord['pid'] !== $previousParentId) {
                 $treePageIds = $this->getSubPageIds($uid);
                 $this->updatePageIdItems($treePageIds);
@@ -386,8 +386,8 @@ protected function processPageRecord(int $uid, int $pid, array $updatedFields =
         $this->mountPageUpdater->update($uid);
 
         // We need to get the full record to find out if this is a page translation
-        $fullRecord = BackendUtility::getRecord('pages', $uid);
-        if ($fullRecord['sys_language_uid'] > 0) {
+        $fullRecord = $this->getRecord('pages', $uid);
+        if (($fullRecord['sys_language_uid'] ?? null) > 0) {
             $uid = (int)$fullRecord['l10n_parent'];
         }
 
@@ -491,7 +491,7 @@ protected function getConfigurationPageId(string $recordTable, int $recordPageId
      */
     protected function getIsTranslationParentRecordEnabled(string $recordTable, int $recordUid): bool
     {
-        $l10nParentRecord = (array)BackendUtility::getRecord($recordTable, $recordUid, '*', '', false);
+        $l10nParentRecord = (array)$this->getRecord($recordTable, $recordUid, '*', '', false);
         return $this->tcaService->isEnabledRecord($recordTable, $l10nParentRecord);
     }
 
@@ -548,4 +548,19 @@ protected function getSiteRepository(): SiteRepository
     {
         return GeneralUtility::makeInstance(SiteRepository::class);
     }
+
+    /**
+     * Wraps {@link BackendUtility::getRecord()}
+     *
+     * Purpose: Unit-Tests
+     */
+    protected function getRecord(
+        string $table,
+        int|string $uid,
+        string $fields = '*',
+        string $where = '',
+        bool $useDeleteClause = true,
+    ): ?array {
+        return BackendUtility::getRecord($table, $uid);
+    }
 }
diff --git a/Classes/Event/Indexing/AfterPageDocumentIsCreatedForIndexingEvent.php b/Classes/Event/Indexing/AfterPageDocumentIsCreatedForIndexingEvent.php
@@ -20,7 +20,6 @@
 use ApacheSolrForTypo3\Solr\IndexQueue\Item;
 use ApacheSolrForTypo3\Solr\System\Configuration\TypoScriptConfiguration;
 use ApacheSolrForTypo3\Solr\System\Solr\Document\Document;
-use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Core\Site\Entity\Site;
 use TYPO3\CMS\Core\Site\Entity\SiteLanguage;
 use TYPO3\CMS\Frontend\ContentObject\Exception\ContentRenderingException;

diff --git a/Classes/Event/Indexing/BeforePageDocumentIsProcessedForIndexingEvent.php b/Classes/Event/Indexing/BeforePageDocumentIsProcessedForIndexingEvent.php
@@ -17,17 +17,10 @@
 
 namespace ApacheSolrForTypo3\Solr\Event\Indexing;
 
-use ApacheSolrForTypo3\Solr\IndexQueue\Item;
-use ApacheSolrForTypo3\Solr\System\Solr\Document\Document;
-use Psr\Http\Message\ServerRequestInterface;
-use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
-
 /**
  * Allows to add more documents to the Solr index.
  *
  * Previously used with
  * $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['solr']['Indexer']['indexPageAddDocuments']
  */
-class BeforePageDocumentIsProcessedForIndexingEvent extends BeforeDocumentIsProcessedForIndexingEvent
-{
-}
+class BeforePageDocumentIsProcessedForIndexingEvent extends BeforeDocumentIsProcessedForIndexingEvent {}
diff --git a/Classes/IndexQueue/AbstractIndexer.php b/Classes/IndexQueue/AbstractIndexer.php
@@ -25,7 +25,6 @@
 use ApacheSolrForTypo3\Solr\System\Util\ArrayAccessor;
 use TYPO3\CMS\Core\Core\Environment;
 use TYPO3\CMS\Core\TypoScript\FrontendTypoScript;
-use TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;

diff --git a/Classes/System/Solr/Service/AbstractSolrService.php b/Classes/System/Solr/Service/AbstractSolrService.php
@@ -36,15 +36,15 @@
 abstract class AbstractSolrService
 {
     protected static array $pingCache = [];
-
     protected TypoScriptConfiguration $configuration;
-
     protected SolrLogManager $logger;
-
     protected Client $client;
 
-    public function __construct(Client $client, $typoScriptConfiguration = null, $logManager = null)
-    {
+    public function __construct(
+        Client $client,
+        TypoScriptConfiguration $typoScriptConfiguration = null,
+        SolrLogManager $logManager = null,
+    ) {
         $this->client = $client;
         $this->configuration = $typoScriptConfiguration ?? Util::getSolrConfiguration();
         $this->logger = $logManager ?? GeneralUtility::makeInstance(SolrLogManager::class, __CLASS__);

diff --git a/Configuration/FlexForms/Form.xml b/Configuration/FlexForms/Form.xml
@@ -1,59 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <T3DataStructure>
-    <sheets>
-        <sDEF>
-            <ROOT>
-                <TCEforms>
-                    <sheetTitle>Search</sheetTitle>
-                </TCEforms>
-                <type>array</type>
-                <el>
-                    <search.targetPage>
-                        <TCEforms>
-                            <label>Target Page</label>
-                            <config>
-                                <type>group</type>
-                                <internal_type>db</internal_type>
-                                <allowed>pages</allowed>
-                            </config>
-                        </TCEforms>
-                    </search.targetPage>
-                </el>
-            </ROOT>
-        </sDEF>
-        <sOptions>
-            <ROOT>
-                <TCEforms>
-                    <sheetTitle>Options</sheetTitle>
-                </TCEforms>
-                <type>array</type>
-                <el>
-                    <view.templateFiles.form>
-                        <TCEforms>
-                            <label>Custom Template</label>
-                            <config>
-                                <section>1</section>
-                                <type>select</type>
-                                <renderType>selectSingle</renderType>
-                                <itemsProcFunc>ApacheSolrForTypo3\Solr\System\UserFunctions\FlexFormUserFunctions->getAvailableTemplates</itemsProcFunc>
-                            </config>
-                        </TCEforms>
-                    </view.templateFiles.form>
-                    <view.pluginNamespace>
-                        <TCEforms>
-                            <exclude>1</exclude>
-                            <label>Plugin Namespace</label>
-                            <config>
-								<section>1</section>
-								<type>select</type>
-								<renderType>selectSingle</renderType>
-								<itemsProcFunc>ApacheSolrForTypo3\Solr\System\UserFunctions\FlexFormUserFunctions->getAvailablePluginNamespaces</itemsProcFunc>
-                                <default>tx_solr</default>
-                            </config>
-                        </TCEforms>
-                    </view.pluginNamespace>
-                </el>
-            </ROOT>
-        </sOptions>
-    </sheets>
+	<sheets>
+		<sDEF>
+			<ROOT>
+				<sheetTitle>Search</sheetTitle>
+				<type>array</type>
+				<el>
+					<search.targetPage>
+						<label>Target Page</label>
+						<config>
+							<type>group</type>
+							<allowed>pages</allowed>
+						</config>
+					</search.targetPage>
+				</el>
+			</ROOT>
+		</sDEF>
+		<sOptions>
+			<ROOT>
+				<sheetTitle>Options</sheetTitle>
+				<type>array</type>
+				<el>
+					<view.templateFiles.form>
+						<label>Custom Template</label>
+						<config>
+							<section>1</section>
+							<type>select</type>
+							<renderType>selectSingle</renderType>
+							<itemsProcFunc>ApacheSolrForTypo3\Solr\System\UserFunctions\FlexFormUserFunctions->getAvailableTemplates</itemsProcFunc>
+						</config>
+					</view.templateFiles.form>
+					<view.pluginNamespace>
+						<exclude>1</exclude>
+						<label>Plugin Namespace</label>
+						<config>
+							<section>1</section>
+							<type>select</type>
+							<renderType>selectSingle</renderType>
+							<itemsProcFunc>ApacheSolrForTypo3\Solr\System\UserFunctions\FlexFormUserFunctions->getAvailablePluginNamespaces</itemsProcFunc>
+							<default>tx_solr</default>
+						</config>
+					</view.pluginNamespace>
+				</el>
+			</ROOT>
+		</sOptions>
+	</sheets>
 </T3DataStructure>