From fa74af32615b299d8802553b9d622049f90e909a Mon Sep 17 00:00:00 2001
From: Daniel Maier <dm@bergwerk.ag>
Date: Tue, 30 Oct 2018 11:13:56 +0100
Subject: [PATCH] [task] implement extension configuration interface

---
 Classes/Bootstrap.php                         | 17 +++++++
 .../ImplementationRegistrationService.php     | 46 +++++++++++++++----
 Classes/Utility/ExtensionConfiguration.php    |  7 +++
 Classes/Utility/ExtensionConfiguration87.php  | 11 +++++
 .../ExtensionConfigurationInterface.php       |  8 ++++
 ext_localconf.php                             |  6 +--
 6 files changed, 84 insertions(+), 11 deletions(-)
 create mode 100644 Classes/Bootstrap.php
 create mode 100644 Classes/Utility/ExtensionConfiguration.php
 create mode 100644 Classes/Utility/ExtensionConfiguration87.php
 create mode 100644 Classes/Utility/ExtensionConfigurationInterface.php

diff --git a/Classes/Bootstrap.php b/Classes/Bootstrap.php
new file mode 100644
index 0000000..b156a28
--- /dev/null
+++ b/Classes/Bootstrap.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Codappix\SearchCore;
+
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Object\ObjectManager;
+
+class Bootstrap
+{
+    /**
+     * @return object|ObjectManager
+     */
+    public static function getObjectManager()
+    {
+        return GeneralUtility::makeInstance(ObjectManager::class);
+    }
+}
\ No newline at end of file
diff --git a/Classes/Compatibility/ImplementationRegistrationService.php b/Classes/Compatibility/ImplementationRegistrationService.php
index 58d8aa6..6ceb720 100644
--- a/Classes/Compatibility/ImplementationRegistrationService.php
+++ b/Classes/Compatibility/ImplementationRegistrationService.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Codappix\SearchCore\Compatibility;
 
 /*
@@ -20,7 +21,13 @@ namespace Codappix\SearchCore\Compatibility;
  * 02110-1301, USA.
  */
 
+use Codappix\SearchCore\Domain\Index\TcaIndexer\TcaTableService;
+use Codappix\SearchCore\Domain\Index\TcaIndexer\TcaTableServiceInterface;
+use Codappix\SearchCore\Utility\ExtensionConfiguration;
+use Codappix\SearchCore\Utility\ExtensionConfiguration87;
+use Codappix\SearchCore\Utility\ExtensionConfigurationInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 use TYPO3\CMS\Extbase\Object\Container\Container;
 
 /**
@@ -31,16 +38,39 @@ class ImplementationRegistrationService
 {
     public static function registerImplementations()
     {
+        /** @var Container $container */
         $container = GeneralUtility::makeInstance(Container::class);
 
-        $container->registerImplementation(
-            \Codappix\SearchCore\Compatibility\TypoScriptServiceInterface::class,
-            \Codappix\SearchCore\Compatibility\TypoScriptService::class
-        );
+        if (VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version) >= 9000000) {
+            $container->registerImplementation(
+                ExtensionConfigurationInterface::class,
+                ExtensionConfiguration::class
+            );
 
-        $container->registerImplementation(
-            \Codappix\SearchCore\Domain\Index\TcaIndexer\TcaTableServiceInterface::class,
-            \Codappix\SearchCore\Domain\Index\TcaIndexer\TcaTableService::class
-        );
+            $container->registerImplementation(
+                TypoScriptServiceInterface::class,
+                TypoScriptService::class
+            );
+
+            $container->registerImplementation(
+                TcaTableServiceInterface::class,
+                TcaTableService::class
+            );
+        } else if (VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version) >= 8000000) {
+            $container->registerImplementation(
+                ExtensionConfigurationInterface::class,
+                ExtensionConfiguration87::class
+            );
+
+            $container->registerImplementation(
+                TypoScriptServiceInterface::class,
+                TypoScriptService::class
+            );
+
+            $container->registerImplementation(
+                TcaTableServiceInterface::class,
+                TcaTableService::class
+            );
+        }
     }
 }
diff --git a/Classes/Utility/ExtensionConfiguration.php b/Classes/Utility/ExtensionConfiguration.php
new file mode 100644
index 0000000..029cd3c
--- /dev/null
+++ b/Classes/Utility/ExtensionConfiguration.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Codappix\SearchCore\Utility;
+
+class ExtensionConfiguration extends \TYPO3\CMS\Core\Configuration\ExtensionConfiguration implements ExtensionConfigurationInterface
+{
+}
\ No newline at end of file
diff --git a/Classes/Utility/ExtensionConfiguration87.php b/Classes/Utility/ExtensionConfiguration87.php
new file mode 100644
index 0000000..ac0413c
--- /dev/null
+++ b/Classes/Utility/ExtensionConfiguration87.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Codappix\SearchCore\Utility;
+
+class ExtensionConfiguration87 implements ExtensionConfigurationInterface
+{
+    public function get($extensionKey)
+    {
+        return unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][$extensionKey]);
+    }
+}
\ No newline at end of file
diff --git a/Classes/Utility/ExtensionConfigurationInterface.php b/Classes/Utility/ExtensionConfigurationInterface.php
new file mode 100644
index 0000000..991ffec
--- /dev/null
+++ b/Classes/Utility/ExtensionConfigurationInterface.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Codappix\SearchCore\Utility;
+
+interface ExtensionConfigurationInterface
+{
+    public function get($extensionKey);
+}
\ No newline at end of file
diff --git a/ext_localconf.php b/ext_localconf.php
index 2d900a0..9a80c2c 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -42,10 +42,10 @@ call_user_func(
 
         \Codappix\SearchCore\Compatibility\ImplementationRegistrationService::registerImplementations();
 
-        
+
         // API does make use of object manager, therefore use GLOBALS
-        $extensionConfiguration = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Configuration\ExtensionConfiguration::class)->get($extensionKey);
-    
+        $extensionConfiguration = \Codappix\SearchCore\Bootstrap::getObjectManager()->get(\Codappix\SearchCore\Utility\ExtensionConfigurationInterface::class)->get($extensionKey);
+
         if ($extensionConfiguration === false
             || !isset($extensionConfiguration['disable']['elasticsearch'])
             || $extensionConfiguration['disable']['elasticsearch'] !== '1'