[FIX] Establish basic compatibility for TYPO3 v11

krausandre · Feb 24, 2022 · ead4cef · ead4cef
1 parent 881e2b6
commit ead4cef
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 8 deletions.
diff --git a/Classes/EventListener/Order/Payment/ClearCart.php b/Classes/EventListener/Order/Payment/ClearCart.php
@@ -10,9 +10,23 @@
  */
 
 use Extcode\Cart\Event\Order\EventInterface;
+use Extcode\Cart\EventListener\Order\Finish\ClearCart as FinishClearCart;
+use Extcode\Cart\Service\SessionHandler;
+use Extcode\Cart\Utility\CartUtility;
+use Extcode\Cart\Utility\ParserUtility;
 
-class ClearCart extends \Extcode\Cart\EventListener\ProcessOrderCreate\ClearCart
+class ClearCart extends FinishClearCart
 {
+    public function __construct(
+        CartUtility $cartUtility,
+        ParserUtility $parserUtility,
+        SessionHandler $sessionHandler
+    ) {
+        $this->cartUtility = $cartUtility;
+        $this->parserUtility = $parserUtility;
+        $this->sessionHandler = $sessionHandler;
+    }
+
     public function __invoke(EventInterface $event): void
     {
         $orderItem = $event->getOrderItem();

diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml
@@ -17,6 +17,10 @@ services:
       $paymentRepository: '@Extcode\Cart\Domain\Repository\Order\PaymentRepository'
 
   Extcode\CartPaypal\EventListener\Order\Payment\ClearCart:
+    arguments:
+      $cartUtility: '@Extcode\Cart\Utility\CartUtility'
+      $parserUtility: '@Extcode\Cart\Utility\ParserUtility'
+      $sessionHandler: '@Extcode\Cart\Service\SessionHandler'
     tags:
       - name: event.listener
         identifier: 'cart-paypal--order--payment--clear-cart'

diff --git a/Configuration/TCA/Overrides/sys_template.php b/Configuration/TCA/Overrides/sys_template.php
@@ -1,5 +1,5 @@
 <?php
-defined('TYPO3_MODE') or die();
+defined('TYPO3') or die();
 
 call_user_func(function () {
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile(

diff --git a/Configuration/TCA/Overrides/tx_cart_domain_model_order_transaction.php b/Configuration/TCA/Overrides/tx_cart_domain_model_order_transaction.php
@@ -1,6 +1,6 @@
 <?php
 
-defined('TYPO3_MODE') or die();
+defined('TYPO3') or die();
 
 $_LLL = 'LLL:EXT:cart_paypal/Resources/Private/Language/locallang_db.xlf';
 

diff --git a/composer.json b/composer.json
@@ -12,6 +12,7 @@
         "PayPal",
         "cart"
     ],
+    "version": "5.1.0",
     "authors": [
         {
             "name": "Daniel Gohlke",
@@ -41,10 +42,10 @@
     "require": {
         "php": ">=7.2.0 <7.5",
         "ext-curl": "*",
-        "typo3/cms-core": "^10.4",
-        "typo3/cms-extbase": "^10.4",
-        "typo3/cms-frontend": "^10.4",
-        "extcode/cart": "^7.4"
+        "typo3/cms-core": "^11.5",
+        "typo3/cms-extbase": "^11.5",
+        "typo3/cms-frontend": "^11.5",
+        "extcode/cart": "^8.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.14",

diff --git a/ext_localconf.php b/ext_localconf.php
@@ -1,6 +1,6 @@
 <?php
 
-defined('TYPO3_MODE') or die();
+defined('TYPO3') or die();
 
 // configure plugins