From 0af000adfc28e22780ba08fc793f9edc8f7afaac Mon Sep 17 00:00:00 2001 From: Rolf Kiefhaber Date: Thu, 1 Jun 2023 11:58:39 +0200 Subject: [PATCH 1/3] removed $name from Command constructors cannot be autowired in TYPO3 11 and are not required anyway --- Classes/Command/ExportRedirectCommand.php | 3 +-- Classes/Command/ImportRedirectCommand.php | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Classes/Command/ExportRedirectCommand.php b/Classes/Command/ExportRedirectCommand.php index 5e50f2b..d1eebbc 100644 --- a/Classes/Command/ExportRedirectCommand.php +++ b/Classes/Command/ExportRedirectCommand.php @@ -21,12 +21,11 @@ class ExportRedirectCommand extends Command protected $notificationHandler; public function __construct( - string $name = null, NotificationHandler $notificationHandler ) { $this->notificationHandler = $notificationHandler; - parent::__construct($name); + parent::__construct(); } /** diff --git a/Classes/Command/ImportRedirectCommand.php b/Classes/Command/ImportRedirectCommand.php index 4b49bf1..6af8410 100644 --- a/Classes/Command/ImportRedirectCommand.php +++ b/Classes/Command/ImportRedirectCommand.php @@ -42,7 +42,6 @@ class ImportRedirectCommand extends Command implements LoggerAwareInterface protected $externalDomains = []; public function __construct( - string $name = null, NotificationHandler $notificationHandler, ExtensionConfiguration $extensionConfiguration ) { @@ -51,7 +50,7 @@ public function __construct( $this->notificationHandler = $notificationHandler; $this->extensionConfiguration = $extensionConfiguration; - parent::__construct($name); + parent::__construct(); } /** From 8ece4ff07282683e45a1470ab5d8b11030126787 Mon Sep 17 00:00:00 2001 From: Rolf Kiefhaber Date: Thu, 1 Jun 2023 11:59:30 +0200 Subject: [PATCH 2/3] Added TYPO3 11 as compatible --- README.md | 2 +- composer.json | 4 ++-- ext_emconf.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index e3b7b0d..291d7c3 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Each target entry will be matched by the routing configuration. If the target is ### Requirements -* TYPO3 10 +* TYPO3 10 || 11 * EXT:redirects ### Setup diff --git a/composer.json b/composer.json index fff5393..d0c089b 100644 --- a/composer.json +++ b/composer.json @@ -28,8 +28,8 @@ ], "require": { "php": "^7.4 || ^8.0", - "typo3/cms-core": "^10.4", - "typo3/cms-redirects": "^10.4" + "typo3/cms-core": "^10.4 || ^11.5", + "typo3/cms-redirects": "^10.4 || ^11.5" }, "autoload": { "psr-4": { diff --git a/ext_emconf.php b/ext_emconf.php index 8d9432d..aacb2a1 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -12,8 +12,8 @@ 'constraints' => [ 'depends' => [ - 'typo3' => '10.4.0-10.4.99', - 'redirects' => '^10.4.0-10.4.99', + 'typo3' => '10.4.0-11.5.99', + 'redirects' => '^10.4.0-11.5.99', ], 'conflicts' => [], 'suggests' => [], From 3626160004899357ef713c57a8c9e0abd0ac52c1 Mon Sep 17 00:00:00 2001 From: Rolf Kiefhaber Date: Thu, 1 Jun 2023 12:01:14 +0200 Subject: [PATCH 3/3] fixed replace in composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d0c089b..8d9ba7c 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ } }, "replace": { - "georgringer/redirect_generator": "*", + "georgringer/redirect-generator": "*", "typo3-ter/redirect-generator": "self.version" }, "extra": {