From f678407b9dec81a63985f44d34517b340adace17 Mon Sep 17 00:00:00 2001 From: Andre Kraus Date: Thu, 24 Feb 2022 15:27:09 +0100 Subject: [PATCH] [FIX] Establish basic compatibility for TYPO3 v11 --- Classes/Domain/Model/Dto/PdfDemand.php | 4 ++-- .../ProcessOrderCreate/DocumentRenderer.php | 8 +++----- Classes/Service/PdfService.php | 2 +- Configuration/Services.yaml | 6 +++--- Configuration/TCA/Overrides/sys_template.php | 2 +- composer.json | 10 ++++------ ext_emconf.php | 8 ++++---- 7 files changed, 18 insertions(+), 22 deletions(-) diff --git a/Classes/Domain/Model/Dto/PdfDemand.php b/Classes/Domain/Model/Dto/PdfDemand.php index 61ba746..143beda 100644 --- a/Classes/Domain/Model/Dto/PdfDemand.php +++ b/Classes/Domain/Model/Dto/PdfDemand.php @@ -2,14 +2,14 @@ declare(strict_types=1); namespace Extcode\CartPdf\Domain\Model\Dto; +use TYPO3\CMS\Extbase\DomainObject\AbstractEntity; /* * This file is part of the package extcode/cart-pdf. * * For the full copyright and license information, please read the * LICENSE file that was distributed with this source code. */ - -class PdfDemand extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity +class PdfDemand extends AbstractEntity { /** * @var int diff --git a/Classes/EventListener/ProcessOrderCreate/DocumentRenderer.php b/Classes/EventListener/ProcessOrderCreate/DocumentRenderer.php index f6ba93c..e54b3b0 100644 --- a/Classes/EventListener/ProcessOrderCreate/DocumentRenderer.php +++ b/Classes/EventListener/ProcessOrderCreate/DocumentRenderer.php @@ -10,7 +10,7 @@ */ use Extcode\Cart\Domain\Repository\Order\ItemRepository as OrderItemRepository; -use Extcode\Cart\Event\ProcessOrderCreateEvent; +use Extcode\Cart\Event\Order\NumberGeneratorEvent; use Extcode\Cart\Utility\OrderUtility; use Extcode\CartPdf\Service\PdfService; use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager; @@ -61,7 +61,7 @@ public function __construct( $this->options = $options; } - public function __invoke(ProcessOrderCreateEvent $event): void + public function __invoke(NumberGeneratorEvent $event): void { $orderItem = $event->getOrderItem(); $this->settings = $event->getSettings(); @@ -82,9 +82,7 @@ public function __invoke(ProcessOrderCreateEvent $event): void $setterForDate = 'set' . ucfirst($documentType) . 'Date'; if (!$orderItem->$getterForNumber()) { - $documentNumber = $this->orderUtility->getNumber($this->settings, $documentType); - - $orderItem->$setterForNumber($documentNumber); + $orderItem->$setterForNumber($orderItem->getOrderNumber()); $orderItem->$setterForDate(new \DateTime()); } diff --git a/Classes/Service/PdfService.php b/Classes/Service/PdfService.php index 397e3ea..1cddbb3 100644 --- a/Classes/Service/PdfService.php +++ b/Classes/Service/PdfService.php @@ -118,7 +118,7 @@ public function createPdf(OrderItem $orderItem, string $pdfType): void $newFileName = $orderItem->$getNumber() . '.pdf'; if (file_exists($pdfFilename)) { - $storage = $this->storageRepository->findByUid($this->pdfSettings['storageRepository']); + $storage = $this->storageRepository->findByUid(intval($this->pdfSettings['storageRepository'])); $targetFolder = $storage->getFolder($this->pdfSettings['storageFolder']); if (class_exists('\TYPO3\CMS\Core\Resource\DuplicationBehavior')) { diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml index 76b0b28..15c8b39 100644 --- a/Configuration/Services.yaml +++ b/Configuration/Services.yaml @@ -14,9 +14,9 @@ services: tags: - name: event.listener identifier: 'cart-pdf--process-order-create--document-renderer' - event: Extcode\Cart\Event\ProcessOrderCreateEvent - after: 'cart--process-order-create--order-number' - before: 'cart--process-order-create--email' + event: Extcode\Cart\Event\Order\NumberGeneratorEvent + after: 'cart--order--create--invoice-number' + before: 'cart--order--finish--email' Extcode\CartPdf\Service\PdfService: arguments: diff --git a/Configuration/TCA/Overrides/sys_template.php b/Configuration/TCA/Overrides/sys_template.php index 59c257e..81fa05d 100644 --- a/Configuration/TCA/Overrides/sys_template.php +++ b/Configuration/TCA/Overrides/sys_template.php @@ -1,5 +1,5 @@ =7.2.0 <7.5", - "typo3/cms-core": "^10.4", - "extcode/cart": "^7.0", - "extcode/tcpdf": "^3.0" + "typo3/cms-core": "^11.5", + "extcode/cart": "^8.0", + "extcode/tcpdf": "^4.0.0" }, "require-dev": { "typo3/testing-framework": "^5.0", "friendsofphp/php-cs-fixer": "^2.14", "helmich/typo3-typoscript-lint": "^2.0" }, - "replace": { - "extcode/cart-pdf": "self.version" - }, "scripts": { "post-autoload-dump": [ "mkdir -p .build/public/typo3conf/ext/", diff --git a/ext_emconf.php b/ext_emconf.php index b21fb85..202460d 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -17,12 +17,12 @@ 'modify_tables' => '', 'clearCacheOnLoad' => 0, 'lockType' => '', - 'version' => '5.0.0', + 'version' => '6.0.0', 'constraints' => [ 'depends' => [ - 'typo3' => '10.4.0-10.4.99', - 'cart' => '7.0.0', - 'tcpdf' => '3.0.0', + 'typo3' => '11.5.0-11.5.99', + 'cart' => '8.0.0', + 'tcpdf' => '4.0.0', ], 'conflicts' => [], 'suggests' => [],