[TASK] Apache Solr 8.11.4 compatibility

Allows the usage of EXT:solr 11.5.x with Apache Solr 8.11.4, which is now the recommended version. Tests will run against this version.
TYPO3-Solr · Oct 30, 2024 · 0663768 · 0663768
1 parent 3518a2b
commit 0663768
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -24,10 +24,10 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Used versions (please complete the following information):**
- - TYPO3 Version: [e.g. 11.5.36]
+ - TYPO3 Version: [e.g. 11.5.41]
  - Browser: [e.g. chrome, safari]
  - EXT:solr Version: [e.g. 11.5.6]
- - Used Apache Solr Version: [e.g. 8.11.3]
+ - Used Apache Solr Version: [e.g. 8.11.4]
  - PHP Version: [e.g. 8.2.0]
  - MySQL Version: [e.g. 8.0.0]
 

diff --git a/Docker/SolrServer/Dockerfile b/Docker/SolrServer/Dockerfile
@@ -1,4 +1,4 @@
-FROM solr:8.11.3
+FROM solr:8.11.4
 MAINTAINER dkd Internet Service GmbH <[email protected]>
 ENV TERM linux
 

diff --git a/Documentation/Appendix/VersionMatrix.rst b/Documentation/Appendix/VersionMatrix.rst
@@ -21,7 +21,7 @@ Requirements for EXT:solr* 11.5 stack
 ------------------------------- ---------------------------------------------- --------------------------------------------- ---------------------------------
 TYPO3     EXT: solr  EXT:tika   EXT:solrfal EXT:solrconsole EXT:solrdebugtools EXT:solrfluidgrouping         EXT:solrmlt     Apache Solr     Configset
 ========= ========== ========== =========== =============== ================== ============================= =============== =============== =================
-11.5      11.5       11.0       11.0        11.0            11.0               11.0                          11.0 (Ø)        8.11.3¹         ext_solr_11_5_0
+11.5      11.5       11.0       11.0        11.0            11.0               11.0                          11.0 (Ø)        8.11.4¹         ext_solr_11_5_0
 ========= ========== ========== =========== =============== ================== ============================= =============== =============== =================
 
 | ¹ - recommended Apache Solr version, check version matrix in composer.json (composer info:solr-versions) for full list

diff --git a/Tests/Unit/ViewHelpers/Facet/Area/GroupViewHelperTest.php b/Tests/Unit/ViewHelpers/Facet/Area/GroupViewHelperTest.php
@@ -22,6 +22,7 @@
 use ApacheSolrForTypo3\Solr\ViewHelpers\Facet\Area\GroupViewHelper;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Object\ObjectManager;
+use TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\ViewHelperNode;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\Variables\StandardVariableProvider;
 
@@ -68,6 +69,8 @@ public function canMakeOnlyExpectedFacetsAvailableInstanceContext()
 
         $viewHelper = $this->getMockBuilder(GroupViewHelper::class)->onlyMethods(['renderChildren'])->getMock();
         $viewHelper->setRenderingContext($renderingContextMock);
+        $viewHelperNodeMock = $this->createMock(ViewHelperNode::class);
+        $viewHelper->setViewHelperNode($viewHelperNodeMock);
         $viewHelper->setArguments(['facets' => $facetCollection, 'groupName' => 'left']);
         $viewHelper->render();
 

diff --git a/composer.json b/composer.json
@@ -158,6 +158,7 @@
         "ext-solrfluidgrouping": "^11.0",
         "ext-solrmlt": "^11.0",
         "Apache-Solr": [
+          "8.11.4",
           "8.11.3",
           "8.11.2",
           "8.11.1"