[BUGFIX] Fix remaining integration tests

TYPO3-Solr · Jul 11, 2024 · f859f0c · f859f0c
1 parent 87630a2
commit f859f0c
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 48 deletions.
diff --git a/Classes/Domain/Index/Queue/UpdateHandler/DataUpdateHandler.php b/Classes/Domain/Index/Queue/UpdateHandler/DataUpdateHandler.php
@@ -385,6 +385,12 @@ protected function processPageRecord(int $uid, int $pid, array $updatedFields =
         $this->updateCanonicalPages($uid);
         $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) {
+            $uid = (int)$fullRecord['l10n_parent'];
+        }
+
         $recursiveUpdateRequired = $this->isRecursivePageUpdateRequired($uid, $updatedFields);
         if ($recursiveUpdateRequired) {
             $treePageIds = $this->getSubPageIds($uid);

diff --git a/Classes/Domain/Search/Statistics/StatisticsRepository.php b/Classes/Domain/Search/Statistics/StatisticsRepository.php
@@ -162,7 +162,6 @@ public function getFrequentSearchTermsFromStatisticsByFrequentSearchConfiguratio
             )
             ->from($frequentSearchConfiguration['select.']['FROM']);
 
-
         $queryBuilder
             ->getConcreteQueryBuilder()
             ->where($frequentSearchConfiguration['select.']['ADD_WHERE'])

diff --git a/Classes/IndexQueue/FrontendHelper/UserGroupDetector.php b/Classes/IndexQueue/FrontendHelper/UserGroupDetector.php
@@ -32,7 +32,8 @@
 /**
  * The UserGroupDetector is responsible to identify the fe_group references on records that are visible on the page (not the page itself).
  */
-class UserGroupDetector implements FrontendHelper, SingletonInterface {
+class UserGroupDetector implements FrontendHelper, SingletonInterface
+{
     /**
      * Index Queue page indexer request.
      */
@@ -89,7 +90,8 @@ public function checkEnableFields(RecordAccessGrantedEvent $event): void
      * restrictions apply during page rendering.
      */
     #[AsEventListener]
-    public function deactivateTcaFrontendGroupEnableFields(ModifyTypoScriptConfigEvent $event): void {
+    public function deactivateTcaFrontendGroupEnableFields(ModifyTypoScriptConfigEvent $event): void
+    {
         if (!$this->activated) {
             return;
         }
@@ -112,7 +114,8 @@ public function deactivateTcaFrontendGroupEnableFields(ModifyTypoScriptConfigEve
      * are not performed any longer.
      */
     #[AsEventListener]
-    public function getPage_preProcess(BeforePageIsRetrievedEvent $event): void {
+    public function getPage_preProcess(BeforePageIsRetrievedEvent $event): void
+    {
         if ($this->activated) {
             //$event->skipGroupAccessCheck();
             $disableGroupAccessCheck = true;
@@ -124,7 +127,8 @@ public function getPage_preProcess(BeforePageIsRetrievedEvent $event): void {
      * no groups or extendToSubpages flag is found and thus access is granted.
      */
     #[AsEventListener]
-    public function getPageOverlay_preProcess(BeforeRecordLanguageOverlayEvent $event): void {
+    public function getPageOverlay_preProcess(BeforeRecordLanguageOverlayEvent $event): void
+    {
         if (!$this->activated) {
             return;
         }

diff --git a/Classes/IndexQueue/PageIndexerRequest.php b/Classes/IndexQueue/PageIndexerRequest.php
@@ -25,13 +25,7 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Log\LogLevel;
 use RuntimeException;
-use TYPO3\CMS\Core\Context\Context;
-use TYPO3\CMS\Core\Core\SystemEnvironmentBuilder;
-use TYPO3\CMS\Core\Http\MiddlewareDispatcher;
 use TYPO3\CMS\Core\Http\RequestFactory;
-use TYPO3\CMS\Core\Http\RequestHandler;
-use TYPO3\CMS\Core\Http\ServerRequest;
-use TYPO3\CMS\Core\Http\Uri;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**

diff --git a/Classes/System/Language/FrontendOverlayService.php b/Classes/System/Language/FrontendOverlayService.php
@@ -21,7 +21,6 @@
 use Doctrine\DBAL\Exception as DBALException;
 use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Context\Exception\AspectNotFoundException;
-use TYPO3\CMS\Core\Context\LanguageAspect;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Database\Query\QueryBuilder;
 use TYPO3\CMS\Core\Domain\Repository\PageRepository;

diff --git a/...ixtures/Extensions/fake_extension/Configuration/TCA/tx_fakeextension_domain_model_bar.php b/...ixtures/Extensions/fake_extension/Configuration/TCA/tx_fakeextension_domain_model_bar.php
@@ -7,7 +7,6 @@
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
         'versioningWS' => true,
-        'origUid' => 't3_origuid',
         'editlock' => 'editlock',
         'languageField' => 'sys_language_uid',
         'transOrigPointerField' => 'l10n_parent',

diff --git a/...ixtures/Extensions/fake_extension/Configuration/TCA/tx_fakeextension_domain_model_foo.php b/...ixtures/Extensions/fake_extension/Configuration/TCA/tx_fakeextension_domain_model_foo.php
@@ -7,7 +7,6 @@
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
         'versioningWS' => true,
-        'origUid' => 't3_origuid',
         'editlock' => 'editlock',
         'languageField' => 'sys_language_uid',
         'transOrigPointerField' => 'l10n_parent',

diff --git a/Tests/Integration/Fixtures/Extensions/fake_extension/ext_tables.sql b/Tests/Integration/Fixtures/Extensions/fake_extension/ext_tables.sql
@@ -13,7 +13,6 @@ CREATE TABLE tx_fakeextension_domain_model_foo (
 	t3ver_count int(11) DEFAULT '0' NOT NULL,
 	t3ver_tstamp int(11) DEFAULT '0' NOT NULL,
 	t3ver_move_id int(11) DEFAULT '0' NOT NULL,
-	t3_origuid int(11) DEFAULT '0' NOT NULL,
 	editlock tinyint(4) DEFAULT '0' NOT NULL,
 	sys_language_uid int(11) DEFAULT '0' NOT NULL,
 	l10n_parent int(11) DEFAULT '0' NOT NULL,
@@ -47,7 +46,6 @@ CREATE TABLE tx_fakeextension_domain_model_bar (
 	t3ver_count int(11) DEFAULT '0' NOT NULL,
 	t3ver_tstamp int(11) DEFAULT '0' NOT NULL,
 	t3ver_move_id int(11) DEFAULT '0' NOT NULL,
-	t3_origuid int(11) DEFAULT '0' NOT NULL,
 	editlock tinyint(4) DEFAULT '0' NOT NULL,
 	sys_language_uid int(11) DEFAULT '0' NOT NULL,
 	l10n_parent int(11) DEFAULT '0' NOT NULL,

diff --git a/...xtures/Extensions/fake_extension2/Configuration/TCA/tx_fakeextension_domain_model_bar.php b/...xtures/Extensions/fake_extension2/Configuration/TCA/tx_fakeextension_domain_model_bar.php
@@ -9,7 +9,6 @@
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
         'versioningWS' => true,
-        'origUid' => 't3_origuid',
         'editlock' => 'editlock',
         'type' => 'type',
         'useColumnsForDefaultValues' => 'type',

diff --git a/...ensions/fake_extension2/Configuration/TCA/tx_fakeextension_domain_model_directrelated.php b/...ensions/fake_extension2/Configuration/TCA/tx_fakeextension_domain_model_directrelated.php
@@ -9,7 +9,6 @@
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
         'versioningWS' => true,
-        'origUid' => 't3_origuid',
         'editlock' => 'editlock',
         'type' => 'type',
         'useColumnsForDefaultValues' => 'type',

diff --git a/.../Extensions/fake_extension2/Configuration/TCA/tx_fakeextension_domain_model_mmrelated.php b/.../Extensions/fake_extension2/Configuration/TCA/tx_fakeextension_domain_model_mmrelated.php
@@ -9,7 +9,6 @@
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
         'versioningWS' => true,
-        'origUid' => 't3_origuid',
         'editlock' => 'editlock',
         'type' => 'type',
         'useColumnsForDefaultValues' => 'type',

diff --git a/Tests/Integration/IndexQueue/Fixtures/change_translated_content_element.csv b/Tests/Integration/IndexQueue/Fixtures/change_translated_content_element.csv
@@ -1,4 +1,4 @@
 "tt_content",
-,"uid","pid","header","sys_language_uid","l18n_parent","t3_origuid"
-,456,1,"foo",0,0,0
-,9999,1,"foo translated",1,456,456
+,"uid","pid","header","sys_language_uid","l18n_parent"
+,456,1,"foo",0,0
+,9999,1,"foo translated",1,456
diff --git a/Tests/Integration/IndexQueue/RecordMonitorTest.php b/Tests/Integration/IndexQueue/RecordMonitorTest.php
@@ -56,31 +56,11 @@ class RecordMonitorTest extends IntegrationTestBase
         '../vendor/apache-solr-for-typo3/solr/Tests/Integration/Fixtures/Extensions/fake_extension',
     ];
 
-    /**
-     * @var RecordMonitor
-     */
-    protected $recordMonitor;
-
-    /**
-     * @var DataHandler
-     */
-    protected $dataHandler;
-
-    /**
-     * @var Queue
-     */
-    protected $indexQueue;
-
-    /**
-     * @var ExtensionConfiguration
-     */
-    protected $extensionConfiguration;
-
-    /**
-     * @var EventQueueItemRepository
-     */
-    protected $eventQueue;
-
+    protected RecordMonitor $recordMonitor;
+    protected DataHandler $dataHandler;
+    protected Queue $indexQueue;
+    protected ExtensionConfiguration $extensionConfiguration;
+    protected EventQueueItemRepository $eventQueue;
     protected BackendUserAuthentication $backendUser;
 
     protected function setUp(): void

diff --git a/Tests/Integration/TSFETestBootstrapper.php b/Tests/Integration/TSFETestBootstrapper.php
@@ -2,7 +2,6 @@
 
 namespace ApacheSolrForTypo3\Solr\Tests\Integration;
 
-use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Http\ServerRequest;
 use TYPO3\CMS\Core\Routing\PageArguments;
 use TYPO3\CMS\Core\Site\SiteFinder;