updates

Classes/EventListener/AfterCacheableContentIsGeneratedEventListener.php

@@ -0,0 +1,32 @@
+<?php
+declare(strict_types=1);
+
+namespace WapplerSystems\A21glossary\EventListener;
+
+
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
+use TYPO3\CMS\Frontend\Event\AfterCacheableContentIsGeneratedEvent;
+use WapplerSystems\A21glossary\Processor;
+
+final class AfterCacheableContentIsGeneratedEventListener
+{
+    public function __invoke(AfterCacheableContentIsGeneratedEvent $event): void
+    {
+
+        $content = $event->getController()->content;
+
+
+        $tsConfig = GeneralUtility::makeInstance(ConfigurationManagerInterface::class)
+            ->getConfiguration(
+                ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT
+            );
+
+        $config = $tsConfig['plugin.']['tx_a21glossary.']['settings.'] ?? [];
+
+        $processor = GeneralUtility::makeInstance(Processor::class);
+        $event->getController()->content = $processor->main($content, $config);
+
+
+    }
+}

Classes/Processor.php

@@ -105,7 +105,7 @@ public static function addSlashesOnArray(array &$theArray)
      * @return string the modified content
      * @throws \InvalidArgumentException
      */
-    public function main($content, $config = [])
+    public function main(string $content, array $config = []): string
     {
 
         $this->config = array_merge($this->config, $config);
@@ -397,7 +397,7 @@ public function main($content, $config = [])
      * @param string $pidList idlists set by configuraion
      * @return array glossary items
      */
-    protected function fetchGlossaryItems($pidList): array
+    protected function fetchGlossaryItems(string $pidList): array
     {
         // -1 means: ignore pids
         if ('' === trim($pidList)) {
@@ -413,22 +413,24 @@ protected function fetchGlossaryItems($pidList): array
 
         $connection = GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionForTable('tx_a21glossary_main');
 
-        $query = $connection->createQueryBuilder()->select('*')->from('tx_a21glossary_main');
-        $query->where(
-            $query->expr()->in('pid', $aPidList),
-            $query->expr()->in('sys_language_uid', [-1, $languageUid])
-        )->orderBy('short', 'asc');
-
-        if ($statement = $query->execute()) {
-            foreach ($statement as $row) {
-                $row['shortcut'] = trim($row['shortcut']);
-                $row['short'] = trim($row['short']);
-                $items[$row['shortcut'] ? $row['shortcut'] : $row['short']] = $row;
-                if (!isset($this->count['found'])) {
-                    $this->count['found'] = 0;
-                }
-                $this->count['found']++;
+        $query = $connection->createQueryBuilder();
+        $query->getRestrictions()->removeAll();
+        $query = $query->select('*')->from('tx_a21glossary_main')
+            ->where(
+                $query->expr()->in('pid', $aPidList),
+                $query->expr()->in('sys_language_uid', [-1, $languageUid])
+            )
+            ->orderBy('short', 'asc');
+
+        $results = $query->executeQuery()->fetchAllAssociative();
+        foreach ($results as $row) {
+            $row['shortcut'] = trim($row['shortcut']);
+            $row['short'] = trim($row['short']);
+            $items[$row['shortcut'] ? $row['shortcut'] : $row['short']] = $row;
+            if (!isset($this->count['found'])) {
+                $this->count['found'] = 0;
             }
+            $this->count['found']++;
         }
         $this->count['used'] = \count($items);
         return $items;

Configuration/Services.yaml

@@ -6,3 +6,8 @@ services:
 
   WapplerSystems\A21glossary\:
     resource: '../Classes/*'
+
+  WapplerSystems\A21glossary\EventListener\AfterCacheableContentIsGeneratedEventListener:
+    tags:
+      - name: event.listener
+        identifier: 'a21glossary/content-modifier'

composer.json

@@ -19,9 +19,6 @@
         "typo3/cms-frontend": "^12.4.0",
         "georgringer/numbered-pagination": "^1.0.2"
     },
-    "replace": {
-        "svewap/a21glossary": "self.version"
-    },
     "extra": {
         "typo3/cms": {
             "extension-key": "a21glossary"