Merge pull request #8 from t3premium/develop

Migrate to TYPO3 v11
t3premium · Dec 12, 2023 · ecf2f32 · ecf2f32
2 parents dd14f8b + 4f873a0
commit ecf2f32
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 43 deletions.
diff --git a/Classes/CleverReach/Api.php b/Classes/CleverReach/Api.php
@@ -1,13 +1,14 @@
 <?php
+
 namespace T3premium\FemanagerCleverreach\CleverReach;
 
+use T3premium\FemanagerCleverreach\Service\ConfigurationService;
 use T3premium\FemanagerCleverreach\Tools\Rest;
 
 class Api
 {
     /**
-     * @var \T3premium\FemanagerCleverreach\Service\ConfigurationService
-     * @TYPO3\CMS\Extbase\Annotation\Inject
+     * @var ConfigurationService
      */
     protected $configurationService;
 
@@ -16,6 +17,11 @@ class Api
      */
     protected $rest;
 
+    public function injectConfigurationService(ConfigurationService $configurationService): void
+    {
+        $this->configurationService = $configurationService;
+    }
+
     public function connect()
     {
         if ($this->rest !== null) {

diff --git a/Classes/Finisher/CleverReachFinisher.php b/Classes/Finisher/CleverReachFinisher.php
@@ -1,6 +1,8 @@
 <?php
+
 namespace T3premium\FemanagerCleverreach\Finisher;
 
+use T3premium\FemanagerCleverreach\CleverReach\Api;
 use In2code\Femanager\Domain\Model\User;
 use In2code\Femanager\Finisher\AbstractFinisher;
 
@@ -11,10 +13,8 @@
  */
 class CleverReachFinisher extends AbstractFinisher
 {
-
     /**
-     * @var \T3premium\FemanagerCleverreach\CleverReach\Api
-     * @TYPO3\CMS\Extbase\Annotation\Inject
+     * @var Api
      */
     protected $api;
 
@@ -28,6 +28,11 @@ class CleverReachFinisher extends AbstractFinisher
      */
     protected $configuration;
 
+    public function injectApi(Api $api): void
+    {
+        $this->api = $api;
+    }
+
     /**
      * CrFinisher
      *
@@ -36,17 +41,17 @@ class CleverReachFinisher extends AbstractFinisher
     public function crFinisher()
     {
         $receivers[] = [
-            "attributes" => [
-                "firstname"     => $this->user->getFirstName(),
-                "lastname"      => $this->user->getLastName(),
+            'attributes' => [
+                'firstname' => $this->user->getFirstName(),
+                'lastname' => $this->user->getLastName(),
             ],
-            "global_attributes" => [
-                "firstname"     => $this->user->getFirstName(),
-                "lastname"      => $this->user->getLastName(),
+            'global_attributes' => [
+                'firstname' => $this->user->getFirstName(),
+                'lastname' => $this->user->getLastName(),
             ],
-            "email"         => $this->user->getEmail(),
-            "registered"    => strtotime("now"),
-            "activated"     => strtotime("now"),
+            'email' => $this->user->getEmail(),
+            'registered' => strtotime('now'),
+            'activated' => strtotime('now'),
         ];
 
         // Add new receiver to CleverReach

diff --git a/Classes/Service/ConfigurationService.php b/Classes/Service/ConfigurationService.php
@@ -1,27 +1,35 @@
 <?php
+
 namespace T3premium\FemanagerCleverreach\Service;
 
+use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
+use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
+
 /**
  * Class ConfigurationService
  */
 class ConfigurationService
 {
     /**
-     * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
-     * @TYPO3\CMS\Extbase\Annotation\Inject
+     * @var ObjectManagerInterface
      */
     protected $objectManager;
 
+    public function injectObjectManager(ObjectManagerInterface $objectManager): void
+    {
+        $this->objectManager = $objectManager;
+    }
+
 
     public function getConfiguration()
     {
         /**
-         * @var \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface
+         * @var ConfigurationManagerInterface
          * $configurationManager
          */
         $configurationManager = $this->objectManager->get('TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface');
         $settings = $configurationManager->getConfiguration(
-            \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT,
+            ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT,
             'femanager'
         );
         return $settings['plugin.']['tx_femanager.']['settings.']['finishers.']['100.']['config.'];

diff --git a/Classes/Tools/Rest.php b/Classes/Tools/Rest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace T3premium\FemanagerCleverreach\Tools;
 
 /**

diff --git a/Configuration/TCA/Overrides/sys_template.php b/Configuration/TCA/Overrides/sys_template.php
@@ -1,11 +1,13 @@
 <?php
-defined('TYPO3_MODE') or die();
+
+defined('TYPO3') or die();
+
+use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 
 /***************
  * Default TypoScript
  */
-// @extensionScannerIgnoreLine
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile(
+ExtensionManagementUtility::addStaticFile(
     'femanager_cleverreach',
     'Configuration/TypoScript/',
     'femanager CleverReach'

diff --git a/Documentation/Introduction/Index.rst b/Documentation/Introduction/Index.rst
@@ -19,6 +19,5 @@ femanager_cleverreach adds a cleverreach subscription to the femanager extension
 
 Requirements of femanager_cleverreach
 -------------------------------------
-- TYPO3 10.4
-- Extbase / Fluid
+- TYPO3 11.5
 - femanager
diff --git a/composer.json b/composer.json
@@ -20,8 +20,13 @@
 	"type": "typo3-cms-extension",
 	"license": "GPL-2.0-or-later",
 	"require": {
-		"typo3/cms-core": "^10.4.0",
-		"in2code/femanager": "^6.0.1"
+		"typo3/cms-core": "^11.5.0",
+		"in2code/femanager": "^7.0.0"
+	},
+	"extra": {
+		"typo3/cms": {
+			"extension-key": "femanager_cleverreach"
+		}
 	},
 	"replace": {
 		"typo3-ter/femanager_cleverreach": "self.version"
@@ -30,17 +35,5 @@
 		"psr-4": {
 			"T3premium\\FemanagerCleverreach\\": "Classes/"
 		}
-	},
-	"scripts": {
-		"post-autoload-dump": [
-			"mkdir -p .Build/Web/typo3conf/ext/",
-			"[ -L .Build/Web/typo3conf/ext/femanager_cleverreach ] || ln -snvf ../../../../. .Build/Web/typo3conf/ext/femanager_cleverreach"
-		]
-	},
-	"extra": {
-		"typo3/cms": {
-			"cms-package-dir": "{$vendor-dir}/typo3/cms",
-			"web-dir": ".Build/Web"
-		}
 	}
 }
diff --git a/ext_emconf.php b/ext_emconf.php
@@ -7,14 +7,11 @@
     'author_email' => 'samuel.heinz@t3premium.de',
     'author_company' => 'T3 Premium',
     'state' => 'stable',
-    'uploadfolder' => '0',
-    'createDirs' => '',
-    'clearCacheOnLoad' => 1,
-    'version' => '2.0.0',
+    'version' => '3.0.0',
     'constraints' => [
         'depends' => [
-            'typo3' => '10.4.0-10.4.99',
-            'femanager' => '6.0.1',
+            'typo3' => '11.5.0-11.5.99',
+            'femanager' => '7.0.0',
         ],
     ],
 ];