[TASK] Make it more work on 9.5

georgringer · Sep 9, 2019 · 63bf4f6 · 63bf4f6
1 parent 007c595
commit 63bf4f6
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 117 deletions.
diff --git a/Classes/Controller/ModFuncController.php b/Classes/Controller/ModFuncController.php
@@ -4,16 +4,23 @@
 
 use GeorgRinger\PageSpeed\Domain\Model\Dto\Configuration;
 use GeorgRinger\PageSpeed\Domain\Repository\PageSpeedRepository;
-use TYPO3\CMS\Backend\Module\AbstractFunctionModule;
+use TYPO3\CMS\Backend\Module\BaseScriptClass;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Page\PageRenderer;
-use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Fluid\View\StandaloneView;
 
-class ModFuncController extends AbstractFunctionModule
+class ModFuncController
 {
+    /**
+     * Contains a reference to the parent (calling) object (which is probably an instance of
+     * an extension class to \TYPO3\CMS\Backend\Module\BaseScriptClass
+     *
+     * @var BaseScriptClass
+     * @see init()
+     */
+    public $pObj;
 
     /** @var StandaloneView */
     protected $view;
@@ -30,6 +37,20 @@ class ModFuncController extends AbstractFunctionModule
     /** @var int */
     protected $pageId = 0;
 
+
+    /**
+     * Initialize the object
+     *
+     * @param \object $pObj A reference to the parent (calling) object
+     * @throws \RuntimeException
+     * @see \TYPO3\CMS\Backend\Module\BaseScriptClass::checkExtObj()
+     */
+    public function init($pObj)
+    {
+        $this->pObj = $pObj;
+        $this->pObj->MOD_MENU = array_merge($this->pObj->MOD_MENU, $this->modMenu());
+    }
+
     public function __construct()
     {
         $this->view = GeneralUtility::makeInstance(StandaloneView::class);
@@ -141,13 +162,13 @@ protected function checkPageId(): void
      */
     protected function addScripts()
     {
-        $path = ExtensionManagementUtility::siteRelPath('page_speed') . 'Resources/Public/';
-        $this->getDocumentTemplate()->addStyleSheet('page_speed', '../' . $path . 'Styles/speed.css');
+        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+        $pageRenderer->addCssFile('EXT:page_speed/Resources/Public/Styles/speed.css');
 
         $jsFiles = ['JavaScript/main.js', 'Contrib/amcharts/amcharts.js', 'Contrib/amcharts/gauge.js', 'Contrib/amcharts/serial.js', 'Contrib/amcharts/themes/dark.js'];
         $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
         foreach ($jsFiles as $file) {
-            $pageRenderer->addJsFile('../' . $path . $file);
+            $pageRenderer->addJsFile('EXT:page_speed/Resources/Public/' . $file);
         }
     }
 

diff --git a/Classes/Domain/Model/Dto/Configuration.php b/Classes/Domain/Model/Dto/Configuration.php
@@ -2,7 +2,10 @@
 
 namespace GeorgRinger\PageSpeed\Domain\Model\Dto;
 
+use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
+use TYPO3\CMS\Core\Exception;
 use TYPO3\CMS\Core\SingletonInterface;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 class Configuration implements SingletonInterface
 {
@@ -18,12 +21,14 @@ class Configuration implements SingletonInterface
 
     public function __construct()
     {
-        $configuration = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['page_speed']);
-        if (\is_array($configuration)) {
-            $this->key = (string)$configuration['key'];
-            $this->demo = (bool)$configuration['demo'];
-            $this->cacheTime = (int)$configuration['cacheTime'];
+        try {
+            $configuration = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('page_speed');
+        } catch (\Exception $e) {
+            $configuration = [];
         }
+        $this->key = (string)$configuration['key'];
+        $this->demo = (bool)$configuration['demo'];
+        $this->cacheTime = (int)$configuration['cacheTime'];
     }
 
     /**

diff --git a/Classes/Service/UrlService.php b/Classes/Service/UrlService.php
diff --git a/Classes/ViewHelpers/Chart/AssetsViewHelper.php b/Classes/ViewHelpers/Chart/AssetsViewHelper.php
@@ -17,7 +17,7 @@
 
 use GeorgRinger\PageSpeed\Domain\Model\Response;
 use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
-use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
 class AssetsViewHelper extends AbstractViewHelper
 {

diff --git a/Classes/ViewHelpers/Chart/GaugeViewHelper.php b/Classes/ViewHelpers/Chart/GaugeViewHelper.php
@@ -16,7 +16,7 @@
  */
 
 use GeorgRinger\PageSpeed\Domain\Model\Response;
-use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
 class GaugeViewHelper extends AbstractViewHelper
 {

diff --git a/Classes/ViewHelpers/IndicatorRulesViewHelper.php b/Classes/ViewHelpers/IndicatorRulesViewHelper.php
@@ -3,7 +3,7 @@
 namespace GeorgRinger\PageSpeed\ViewHelpers;
 
 use GeorgRinger\PageSpeed\Domain\Model\Response;
-use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
 class IndicatorRulesViewHelper extends AbstractViewHelper
 {

diff --git a/Classes/ViewHelpers/IndicatorViewHelper.php b/Classes/ViewHelpers/IndicatorViewHelper.php
@@ -3,7 +3,7 @@
 namespace GeorgRinger\PageSpeed\ViewHelpers;
 
 use GeorgRinger\PageSpeed\Domain\Model\Response;
-use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
 class IndicatorViewHelper extends AbstractViewHelper
 {

diff --git a/Classes/ViewHelpers/ResultViewHelper.php b/Classes/ViewHelpers/ResultViewHelper.php
@@ -3,7 +3,7 @@
 namespace GeorgRinger\PageSpeed\ViewHelpers;
 
 use GeorgRinger\PageSpeed\Domain\Model\Response\Result;
-use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
 class ResultViewHelper extends AbstractViewHelper
 {
@@ -26,7 +26,7 @@ public function render()
         $result = $this->arguments['result'];
         $hsc = $this->arguments['hsc'];
 
-        if (is_null($result)) {
+        if ($result === null) {
             return '';
         }
         $searchReplace = [];

diff --git a/Classes/ViewHelpers/UrlBlockViewHelper.php b/Classes/ViewHelpers/UrlBlockViewHelper.php
@@ -3,7 +3,7 @@
 namespace GeorgRinger\PageSpeed\ViewHelpers;
 
 use GeorgRinger\PageSpeed\Domain\Model\Response\Result;
-use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
 class UrlBlockViewHelper extends AbstractViewHelper
 {

diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
 		"GPL-2.0+"
 	],
 	"require": {
-		"typo3/cms-core": "^9.4"
+		"typo3/cms-core": "^9.5"
 	},
 	"autoload": {
 		"psr-4": {

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -8,10 +8,10 @@
     'author_email' => '[email protected]',
     'state' => 'beta',
     'clearCacheOnLoad' => true,
-    'version' => '3.0.0',
+    'version' => '3.1.0',
     'constraints' => [
         'depends' => [
-            'typo3' => '9.4.0-9.9.99',
+            'typo3' => '9.5.0-9.9.99',
         ],
         'conflicts' => [],
         'suggests' => [],

diff --git a/ext_localconf.php b/ext_localconf.php
@@ -8,7 +8,7 @@
     $configuration = new \GeorgRinger\PageSpeed\Domain\Model\Dto\Configuration();
 
     $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['page_speed_response'] = [
-        'frontend' => \TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class,
+        'frontend' => \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class,
         'backend' => \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend::class,
         'options' => [
             'defaultLifetime' => $configuration->getCacheTime(),