Skip to content

[FIX] Establish basic compatibility for TYPO3 v11 #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
krausandre wants to merge 1 commit into from
Closed

[FIX] Establish basic compatibility for TYPO3 v11 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Classes/Domain/Model/Dto/PdfDemand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 3 additions & 5 deletions Classes/EventListener/ProcessOrderCreate/DocumentRenderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand All @@ -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());
}

Expand Down
2 changes: 1 addition & 1 deletion Classes/Service/PdfService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')) {
Expand Down
6 changes: 3 additions & 3 deletions Configuration/Services.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion Configuration/TCA/Overrides/sys_template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
defined('TYPO3_MODE') or die();
defined('TYPO3') or die();

call_user_func(function () {
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile(
Expand Down
10 changes: 4 additions & 6 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"PDF",
"cart"
],
"version": "6.0.0",
"authors": [
{
"name": "Daniel Gohlke",
Expand Down Expand Up @@ -42,18 +43,15 @@
},
"require": {
"php": ">=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/",
Expand Down
8 changes: 4 additions & 4 deletions ext_emconf.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' => [],
Expand Down