fix typo3 v9 compatibility; localisation initialize

carsten-walther · Jun 15, 2020 · a84c4aa · a84c4aa
1 parent 2abd356
commit a84c4aa
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 90 deletions.
diff --git a/Classes/Configuration/Configuration.php b/Classes/Configuration/Configuration.php
@@ -4,6 +4,7 @@
 
 use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Install\FolderStructure\Exception\InvalidArgumentException;
 
 /**
@@ -33,28 +34,14 @@ class Configuration
      *
      * @param \TYPO3\CMS\Core\Localization\LanguageService $languageService
      */
-     public function __construct(LanguageService $languageService = NULL)
-     {
-         self::$languageService = $languageService;
-         if (self::$languageService) {
-             self::$languageService->includeLLFile('EXT:html2pdf/Resources/Private/Language/locallang.xlf');
-         }
-     }
-
-     /**
-      * @param \TYPO3\CMS\Core\Localization\LanguageService $languageService
-      *
-      * @return void
-      */
-     public function injectLanguageService(LanguageService $languageService) : void
-     {
-         if (!self::$languageService) {
-             self::$languageService = $languageService;
-             if (self::$languageService) {
-                 self::$languageService->includeLLFile('EXT:html2pdf/Resources/Private/Language/locallang.xlf');
-             }
-         }
-     }
+    public function __construct(LanguageService $languageService = NULL)
+    {
+        self::$languageService = $languageService;
+        if (!self::$languageService) {
+            self::$languageService = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Localization\LanguageService::class);
+        }
+        self::$languageService->includeLLFile('EXT:html2pdf/Resources/Private/Language/locallang.xlf');
+    }
 
     /**
      * set

diff --git a/Classes/Controller/Html2pdfController.php b/Classes/Controller/Html2pdfController.php
@@ -27,31 +27,15 @@ class Html2pdfController
 
     /**
      * Html2pdfController constructor.
-     *
-     * @param \TYPO3\CMS\Core\Localization\LanguageService $languageService
      */
-     public function __construct(LanguageService $languageService = NULL)
-     {
-         $this->languageService = $languageService;
-         if ($this->languageService) {
-             $this->languageService->includeLLFile('EXT:html2pdf/Resources/Private/Language/locallang.xlf');
-         }
-     }
-
-     /**
-      * @param \TYPO3\CMS\Core\Localization\LanguageService $languageService
-      *
-      * @return void
-      */
-     public function injectLanguageService(LanguageService $languageService) : void
-     {
-         if (!$this->languageService) {
-             $this->languageService = $languageService;
-             if ($this->languageService) {
-                 $this->languageService->includeLLFile('EXT:html2pdf/Resources/Private/Language/locallang.xlf');
-             }
-         }
-     }
+    public function __construct(LanguageService $languageService = NULL)
+    {
+        $this->languageService = $languageService;
+        if (!$this->languageService) {
+            $this->languageService = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Localization\LanguageService::class);
+        }
+        $this->languageService->includeLLFile('EXT:html2pdf/Resources/Private/Language/locallang.xlf');
+    }
 
     /**
      * hookOutput

diff --git a/Classes/Converter/Converter.php b/Classes/Converter/Converter.php
@@ -8,6 +8,8 @@
 use Psr\Log\LoggerAwareTrait;
 use RuntimeException;
 use TYPO3\CMS\Core\Localization\LanguageService;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Utility\DebuggerUtility;
 use TYPO3\CMS\Install\FolderStructure\Exception\InvalidArgumentException;
 use Walther\Html2pdf\Configuration\Configuration;
 
@@ -30,28 +32,14 @@ class Converter implements LoggerAwareInterface
      *
      * @param \TYPO3\CMS\Core\Localization\LanguageService $languageService
      */
-     public function __construct(LanguageService $languageService = NULL)
-     {
-         $this->languageService = $languageService;
-         if ($this->languageService) {
-             $this->languageService->includeLLFile('EXT:html2pdf/Resources/Private/Language/locallang.xlf');
-         }
-     }
-
-     /**
-      * @param \TYPO3\CMS\Core\Localization\LanguageService $languageService
-      *
-      * @return void
-      */
-     public function injectLanguageService(LanguageService $languageService) : void
-     {
-         if (!$this->languageService) {
-             $this->languageService = $languageService;
-             if ($this->languageService) {
-                 $this->languageService->includeLLFile('EXT:html2pdf/Resources/Private/Language/locallang.xlf');
-             }
-         }
-     }
+    public function __construct(LanguageService $languageService = NULL)
+    {
+        $this->languageService = $languageService;
+        if (!$this->languageService) {
+            $this->languageService = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Localization\LanguageService::class);
+        }
+        $this->languageService->includeLLFile('EXT:html2pdf/Resources/Private/Language/locallang.xlf');
+    }
 
     /**
      * convert

diff --git a/Classes/Report/ExtensionStatus.php b/Classes/Report/ExtensionStatus.php
@@ -31,28 +31,14 @@ class ExtensionStatus implements StatusProviderInterface
      *
      * @param \TYPO3\CMS\Core\Localization\LanguageService $languageService
      */
-     public function __construct(LanguageService $languageService = NULL)
-     {
-         $this->languageService = $languageService;
-         if ($this->languageService) {
-             $this->languageService->includeLLFile('EXT:html2pdf/Resources/Private/Language/locallang.xlf');
-         }
-     }
-
-     /**
-      * @param \TYPO3\CMS\Core\Localization\LanguageService $languageService
-      *
-      * @return void
-      */
-     public function injectLanguageService(LanguageService $languageService) : void
-     {
-         if (!$this->languageService) {
-             $this->languageService = $languageService;
-             if ($this->languageService) {
-                 $this->languageService->includeLLFile('EXT:html2pdf/Resources/Private/Language/locallang.xlf');
-             }
-         }
-     }
+    public function __construct(LanguageService $languageService = NULL)
+    {
+        $this->languageService = $languageService;
+        if (!$this->languageService) {
+            $this->languageService = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Localization\LanguageService::class);
+        }
+        $this->languageService->includeLLFile('EXT:html2pdf/Resources/Private/Language/locallang.xlf');
+    }
 
     /**
      * getStatus