[CLEANUP] Refactor some services

romm · Mar 2, 2017 · f70ec7e · f70ec7e
1 parent 6494c33
commit f70ec7e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/Classes/Configuration/Settings/Settings.php b/Classes/Configuration/Settings/Settings.php
@@ -21,6 +21,7 @@ class Settings extends AbstractFormzConfiguration
 
     /**
      * @var string
+     * @validate Romm.ConfigurationObject:ClassImplements(interface=TYPO3\CMS\Core\Cache\Backend\BackendInterface)
      */
     protected $defaultBackendCache = FileBackend::class;
 

diff --git a/Classes/Service/CacheService.php b/Classes/Service/CacheService.php
@@ -14,8 +14,10 @@
 namespace Romm\Formz\Service;
 
 use Romm\Formz\Core\Core;
+use Romm\Formz\Exceptions\ClassNotFoundException;
 use Romm\Formz\Service\Traits\ExtendedFacadeInstanceTrait;
 use TYPO3\CMS\Core\Cache\Backend\AbstractBackend;
+use TYPO3\CMS\Core\Cache\Backend\BackendInterface;
 use TYPO3\CMS\Core\Cache\CacheManager;
 use TYPO3\CMS\Core\Cache\Frontend\FrontendInterface;
 use TYPO3\CMS\Core\SingletonInterface;
@@ -49,9 +51,14 @@ public function getBackendCache()
     {
         $backendCache = $this->typoScriptService->getExtensionConfigurationFromPath('settings.defaultBackendCache');
 
-        if (false === class_exists($backendCache)
-            && false === in_array(AbstractBackend::class, class_parents($backendCache))
-        ) {
+        if (false === class_exists($backendCache)) {
+            throw new ClassNotFoundException(
+                'The cache class name given in configuration "config.tx_formz.settings.defaultBackendCache" was not found (current value: "' . (string)$backendCache . '")',
+                1488475103
+            );
+        }
+
+        if (false === in_array(BackendInterface::class, class_implements($backendCache))) {
             throw new \Exception(
                 'The cache class name given in configuration "config.tx_formz.settings.defaultBackendCache" must inherit "' . AbstractBackend::class . '" (current value: "' . (string)$backendCache . '")',
                 1459251263
@@ -80,14 +87,6 @@ public function getCacheInstance()
         return $this->cacheInstance;
     }
 
-    /**
-     * @param FrontendInterface $cacheInstance
-     */
-    public function setCacheInstance(FrontendInterface $cacheInstance)
-    {
-        $this->cacheInstance = $cacheInstance;
-    }
-
     /**
      * Generic cache identifier creation for usages in the extension.
      *

diff --git a/Tests/Unit/FormzUnitTestUtility.php b/Tests/Unit/FormzUnitTestUtility.php
@@ -421,7 +421,7 @@ private function injectTransientMemoryCacheInFormzCore()
         $cacheFactory = new CacheFactory('foo', new CacheManager);
         $cacheInstance = $cacheFactory->create('foo', VariableFrontend::class, TransientMemoryBackend::class);
 
-        CacheService::get()->setCacheInstance($cacheInstance);
+        $this->inject(CacheService::get(), 'cacheInstance', $cacheInstance);
     }
 
     /**