diff --git a/Classes/Domain/Search/Statistics/StatisticsWriterProcessor.php b/Classes/Domain/Search/Statistics/StatisticsWriterProcessor.php index 1b590a8bcd..c389fd9efa 100644 --- a/Classes/Domain/Search/Statistics/StatisticsWriterProcessor.php +++ b/Classes/Domain/Search/Statistics/StatisticsWriterProcessor.php @@ -97,7 +97,7 @@ public function process(SearchResultSet $resultSet): SearchResultSet // @extensionScannerIgnoreLine 'time_processing' => $response->debug->timing->process->time ?? 0, 'feuser_id' => isset($TSFE->fe_user->user) ? (int)$TSFE->fe_user->user['uid'] ?? 0 : 0, - 'cookie' => $TSFE->fe_user->id ?? '', + 'cookie' => $TSFE->fe_user->getSession()->getIdentifier() ?? '', 'ip' => IpAnonymizationUtility::anonymizeIp($this->getUserIp(), $ipMaskLength), 'page' => $page, 'keywords' => $keywords, diff --git a/Documentation/Releases/solr-release-11-5.rst b/Documentation/Releases/solr-release-11-5.rst index db392a6352..cc99fb0f3b 100644 --- a/Documentation/Releases/solr-release-11-5.rst +++ b/Documentation/Releases/solr-release-11-5.rst @@ -6,14 +6,22 @@ Releases 11.5 ============= -.. include:: HintAboutOutdatedChangelog.rst.txt - -Release 11.5.4 +Release 11.5.5 -------------- -This is a maintenance release for TYPO3 11.5 and the last release that supports Apache Solr 8.11. Next EXT:solr release for TYPO3 11.5 will be 11.6.0, it +This is a maintenance release for TYPO3 11.5 and the last release that supports Apache Solr 8.11. +Next EXT:solr release for TYPO3 11.5 will be 11.6.0, it will contain support for Apache Solr 9 and some breaking improvements. +**Note:** This change requires the database schema update, due of database schema change from `pull-request #3880 `__ + +11.5.5 contains the following changes: + +- !!![BUGFIX:11.5] Exception with tx_solr_statistics after latest TYPO3 security update by @dkd-kaehm in `#3880 `__ + +Release 11.5.4 +-------------- + 11.5.4 contains the following changes: - [TASK] Fix CI 2023.09.11 on release-11.5.x by @dkd-kaehm in `#3777 `__ diff --git a/Tests/Unit/Domain/Search/Statistics/StatisticsWriterProcessorTest.php b/Tests/Unit/Domain/Search/Statistics/StatisticsWriterProcessorTest.php index 39b8b93320..ed90dad164 100644 --- a/Tests/Unit/Domain/Search/Statistics/StatisticsWriterProcessorTest.php +++ b/Tests/Unit/Domain/Search/Statistics/StatisticsWriterProcessorTest.php @@ -25,6 +25,7 @@ use ApacheSolrForTypo3\Solr\System\Configuration\TypoScriptConfiguration; use ApacheSolrForTypo3\Solr\Tests\Unit\UnitTest; use PHPUnit\Framework\MockObject\MockObject; +use TYPO3\CMS\Frontend\Authentication\FrontendUserAuthentication; use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController; /** @@ -83,6 +84,7 @@ public function canWriteExpectedStatisticsData() { /* @var TypoScriptFrontendController $fakeTSFE */ $fakeTSFE = $this->getDumbMock(TypoScriptFrontendController::class); + $fakeTSFE->fe_user = $this->getDumbMock(FrontendUserAuthentication::class); $fakeTSFE->id = 888; $fakeTime = 100; $fakeIP = '192.168.2.22'; diff --git a/ext_tables.sql b/ext_tables.sql index 99da28b0ac..0113231b1c 100644 --- a/ext_tables.sql +++ b/ext_tables.sql @@ -27,7 +27,7 @@ CREATE TABLE tx_solr_statistics ( time_processing int(11) DEFAULT '0' NOT NULL, feuser_id int(11) unsigned DEFAULT '0' NOT NULL, - cookie varchar(32) DEFAULT '' NOT NULL, + cookie varchar(255) DEFAULT '' NOT NULL, ip varchar(255) DEFAULT '' NOT NULL, keywords varchar(128) DEFAULT '' NOT NULL,