Merge pull request #25 from christian-fries/master

Support for TYPO3 10.4
Zillion01 · Sep 2, 2020 · 1cb7fc5 · 1cb7fc5
2 parents 0458cbc + 7bcdcf8
commit 1cb7fc5
Show file tree

Hide file tree

Showing 21 changed files with 52 additions and 182 deletions.
diff --git a/Classes/Controller/CategorycommentController.php b/Classes/Controller/CategorycommentController.php
@@ -15,6 +15,7 @@
 
 use Jp\Jpfaq\Service\SendMailService;
 use Jp\Jpfaq\Domain\Model\Categorycomment;
+use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
@@ -104,7 +105,7 @@ public function addCommentAction(Categorycomment $newCategorycomment, array $cat
 
         if ($currentUid == $pluginUid) {
             // Set comment IP
-            $extensionConfiguration = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['jpfaq']);
+            $extensionConfiguration = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('jpfaq');
             $anonymizeIpSetting = $extensionConfiguration['anonymizeIp'];
             $commentIp= (string)GeneralUtility::getIndpEnv('REMOTE_ADDR');
 

diff --git a/Classes/Controller/QuestioncommentController.php b/Classes/Controller/QuestioncommentController.php
@@ -16,6 +16,7 @@
 use Jp\Jpfaq\Service\SendMailService;
 use Jp\Jpfaq\Domain\Model\Question;
 use Jp\Jpfaq\Domain\Model\Questioncomment;
+use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
@@ -85,7 +86,7 @@ public function addCommentAction(Question $question, Questioncomment $newQuestio
 
         if ($currentUid == $pluginUid) {
             // Set comment IP
-            $extensionConfiguration = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['jpfaq']);
+            $extensionConfiguration = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('jpfaq');
             $anonymizeIpSetting = $extensionConfiguration['anonymizeIp'];
             $commentIp= (string)GeneralUtility::getIndpEnv('REMOTE_ADDR');
 

diff --git a/Classes/Domain/Model/Question.php b/Classes/Domain/Model/Question.php
@@ -254,6 +254,16 @@ public function setNothelpful($nothelpful)
         $this->nothelpful = $nothelpful;
     }
 
+    /**
+     * Returns the Questioncomment
+     *
+     * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\Jp\Jpfaq\Domain\Model\Questioncomment>
+     */
+    public function getQuestioncomment()
+    {
+        return $this->questioncomment;
+    }
+
     /**
      * Adds a questioncomment
      *

diff --git a/Classes/Domain/Model/TtContent.php b/Classes/Domain/Model/TtContent.php
@@ -20,20 +20,6 @@
  */
 class TtContent extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 {
-    /**
-     * uid
-     *
-     * @var string
-     */
-    protected $uid = '';
-
-    /**
-     * pid
-     *
-     * @var string
-     */
-    protected $pid = '';
-
     /**
      * @var \DateTime
      */
@@ -617,23 +603,4 @@ public function getContentType() {
     public function setContentType($contentType) {
         $this->contentType = $contentType;
     }
-
-    /**
-     * Gets the uid
-     *
-     * @return string $uid
-     */
-    public function getUid() {
-        return $this->uid;
-    }
-
-    /**
-     * Gets the pid
-     *
-     * @return string $pid
-     */
-    public function getPid() {
-        return $this->pid;
-    }
-
 }
diff --git a/Classes/Service/SendMailService.php b/Classes/Service/SendMailService.php
@@ -29,7 +29,14 @@ public static function sendMail(string $receivers, array $sender, string $subjec
         $mail->setTo($receivers);
         $mail->setFrom($sender);
         $mail->setSubject($subject);
-        $mail->setBody('<html><head></head><body>' . $body . ' </body></html>', 'text/html');
+
+        // TYPO3 10 uses Mailer whereas TYPO3 9 uses SwiftMailer
+        if (method_exists($mail, 'html')) {
+            $mail->html('<html><head></head><body>' . $body . ' </body></html>');
+        } else {
+            $mail->setBody('<html><head></head><body>' . $body . ' </body></html>', 'text/html');
+        }
+
         $mail->send();
 
         return $mail->isSent();

diff --git a/Classes/ViewHelpers/ExcludeAlreadyDisplayedQuestionsViewHelper.php b/Classes/ViewHelpers/ExcludeAlreadyDisplayedQuestionsViewHelper.php
@@ -11,8 +11,7 @@
  * LICENSE file that was distributed with this source code.
  */
 use Jp\Jpfaq\Domain\Model\Question;
-use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
-use TYPO3\CMS\Fluid\Core\ViewHelper\Facets\CompilableInterface;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 /**
@@ -28,7 +27,7 @@
  * </output>
  *
  */
-class ExcludeAlreadyDisplayedQuestionsViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper implements CompilableInterface
+class ExcludeAlreadyDisplayedQuestionsViewHelper extends \TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper
 {
     use CompileWithRenderStatic;
 

diff --git a/Configuration/Extbase/Persistence/Classes.php b/Configuration/Extbase/Persistence/Classes.php
@@ -0,0 +1,13 @@
+<?php
+declare(strict_types = 1);
+
+return [
+    \Jp\Jpfaq\Domain\Model\TtContent::class => [
+        'tableName' => 'tt_content',
+        'properties' => [
+            'contentType' => [
+                'fieldName' => 'CType'
+            ],
+        ],
+    ],
+];
diff --git a/Configuration/TCA/tx_jpfaq_domain_model_category.php b/Configuration/TCA/tx_jpfaq_domain_model_category.php
@@ -7,7 +7,6 @@
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
         'cruser_id' => 'cruser_id',
-        'dividers2tabs' => 1,
         'sortby' => 'sorting',
         'versioningWS' => true,
         'languageField' => 'sys_language_uid',

diff --git a/Configuration/TCA/tx_jpfaq_domain_model_question.php b/Configuration/TCA/tx_jpfaq_domain_model_question.php
@@ -7,7 +7,6 @@
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
         'cruser_id' => 'cruser_id',
-        'dividers2tabs' => 1,
         'sortby' => 'sorting',
         'versioningWS' => true,
         'languageField' => 'sys_language_uid',

diff --git a/Configuration/TCA/tx_jpfaq_domain_model_questioncomment.php b/Configuration/TCA/tx_jpfaq_domain_model_questioncomment.php
@@ -6,6 +6,7 @@
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
         'cruser_id' => 'cruser_id',
+        'sortby' => 'sorting',
         'default_sortby' => 'crdate DESC',
         'versioningWS' => true,
         'languageField' => 'sys_language_uid',

diff --git a/...ipt/TSconfig/Page/contentElementWizard.ts → ...Config/Page/contentElementWizard.tsconfig b/...ipt/TSconfig/Page/contentElementWizard.ts → ...Config/Page/contentElementWizard.tsconfig
diff --git a/.../TypoScript/TSconfig/Page/pageTSconfig.ts → ...ation/TsConfig/Page/pageTSconfig.tsconfig b/.../TypoScript/TSconfig/Page/pageTSconfig.ts → ...ation/TsConfig/Page/pageTSconfig.tsconfig
diff --git a/Configuration/TsConfig/includePageTSconfig.tsconfig b/Configuration/TsConfig/includePageTSconfig.tsconfig
@@ -0,0 +1 @@
+<INCLUDE_TYPOSCRIPT: source="DIR: EXT:jpfaq/Configuration/TsConfig/Page/" extension="tsconfig">
diff --git a/Configuration/TypoScript/TSconfig/includePageTSconfig.ts b/Configuration/TypoScript/TSconfig/includePageTSconfig.ts
diff --git a/Configuration/TypoScript/constants.ts → ...iguration/TypoScript/constants.typoscript b/Configuration/TypoScript/constants.ts → ...iguration/TypoScript/constants.typoscript
diff --git a/Configuration/TypoScript/setup.ts → Configuration/TypoScript/setup.typoscript b/Configuration/TypoScript/setup.ts → Configuration/TypoScript/setup.typoscript
diff --git a/README.md b/README.md
@@ -1,6 +1,8 @@
 # jpfaq
 Frequently Asked Questions (FAQ) plugin. Optional features: categories, on-the-fly search, customer helpfulness tracking and comments.
 
-For TYPO3 9.5
+For TYPO3 9.5 and TYPO3 10.4
 
-Install: composer require jvdp/jpfaq
+## Install
+
+To install this extension, run `composer require jvdp/jpfaq`.
diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
     "issues": "https://forge.typo3.org/projects/extension-jpfaq/"
   },
   "require": {
-    "typo3/cms-core": "^9.5"
+    "typo3/cms-core": "^9.5 || ^10.4"
   },
   "autoload": {
     "psr-4": {

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -15,7 +15,7 @@
         array(
             'depends' =>
                 array(
-                    'typo3' => '9.5.0-9.5.99',
+                    'typo3' => '9.5.0-10.4.99',
                 ),
             'conflicts' =>
                 array(),

diff --git a/ext_localconf.php b/ext_localconf.php
@@ -20,10 +20,10 @@ function ($extKey) {
             ]
         );
     },
-    $_EXTKEY
+    'jpfaq'
 );
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig('<INCLUDE_TYPOSCRIPT: source="FILE: EXT:jpfaq/Configuration/TypoScript/TSconfig/includePageTSconfig.ts">');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig('<INCLUDE_TYPOSCRIPT: source="FILE: EXT:jpfaq/Configuration/TsConfig/includePageTSconfig.tsconfig">');
 
 /**
  *  Icon registry