[WIP][TASK] Allow v12 solr + core

Classes/EventListener/BeforeSearchResultIsShownEventListener.php

@@ -0,0 +1,26 @@
+<?php
+declare(strict_types=1);
+
+namespace StudioMitte\SolrNumberedPagination\EventListener;
+
+use ApacheSolrForTypo3\Solr\Event\Search\BeforeSearchResultIsShownEvent;
+use ApacheSolrForTypo3\Solr\Pagination\ResultsPaginator;
+use GeorgRinger\NumberedPagination\NumberedPagination;
+use TYPO3\CMS\Core\Pagination\SlidingWindowPagination;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+
+class BeforeSearchResultIsShownEventListener
+{
+
+    public function __invoke(BeforeSearchResultIsShownEvent $event)
+    {
+        $searchResultSet = $event->getResultSet();
+        $currentPage = $event->getCurrentPage();
+        $itemsPerPage = ($searchResultSet->getUsedResultsPerPage() ?: 10);
+        $maximumNumberOfLinks = ($event->getPagination()->getMaxPageNumbers() ?: 10);
+        $paginator = GeneralUtility::makeInstance(ResultsPaginator::class, $searchResultSet, $currentPage, $itemsPerPage);
+
+        $event->setPagination(GeneralUtility::makeInstance(NumberedPagination::class, $paginator, $maximumNumberOfLinks));
+    }
+
+}

Configuration/Services.yaml

@@ -0,0 +1,13 @@
+services:
+  _defaults:
+    autowire: false
+    autoconfigure: true
+
+  StudioMitte\SolrNumberedPagination\:
+    resource: '../Classes/*'
+
+  StudioMitte\SolrNumberedPagination\EventListener\BeforeSearchResultIsShownEventListener:
+    tags:
+      - name: event.listener
+        identifier: 'solr_numbered_pagination/pagination'
+        event: ApacheSolrForTypo3\Solr\Event\Search\BeforeSearchResultIsShownEvent

composer.json

@@ -12,9 +12,9 @@
     "GPL-2.0-or-later"
   ],
   "require": {
-    "typo3/cms-core": "^10 || ^11.5",
+    "typo3/cms-core": "^10 || ^11.5 || ^12.4.2",
     "georgringer/numbered-pagination": "^1",
-    "apache-solr-for-typo3/solr": "11.5.x-dev || ^11"
+    "apache-solr-for-typo3/solr": "11.5.x-dev || ^11 || ^12"
   },
   "autoload": {
     "psr-4": {
@@ -26,4 +26,4 @@
       "extension-key": "solr_numbered_pagination"
     }
   }
-}
+}

ext_emconf.php

@@ -7,11 +7,11 @@
     'author' => 'Georg Ringer',
     'author_email' => '[email protected]',
     'state' => 'stable',
-    'version' => '1.0.1',
+    'version' => '1.0.2',
     'constraints' => [
         'depends' => [
-            'typo3' => '10.4.0-11.5.99',
-            'solr' => '11.5.0-11.5.99',
+            'typo3' => '10.4.0-12.4.99',
+            'solr' => '11.5.0-12.99.99',
             'numbered_pagination' => '1.0.0-1.99.99',
         ],
         'conflicts' => [],

ext_localconf.php

@@ -1,9 +1,11 @@
 <?php
 
-$signalSlotDispatcher = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\SignalSlot\Dispatcher::class);
-$signalSlotDispatcher->connect(
-    \ApacheSolrForTypo3\Solr\Controller\SearchController::class,
-    'resultsAction',
-    \StudioMitte\SolrNumberedPagination\Slot\SolrResultActionSlot::class,
-    'run'
-);
+if ((new \TYPO3\CMS\Core\Information\Typo3Version())->getMajorVersion() < 12) {
+    $signalSlotDispatcher = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\SignalSlot\Dispatcher::class);
+    $signalSlotDispatcher->connect(
+        \ApacheSolrForTypo3\Solr\Controller\SearchController::class,
+        'resultsAction',
+        \StudioMitte\SolrNumberedPagination\Slot\SolrResultActionSlot::class,
+        'run'
+    );
+}