From 0d1ce249b48b1b6a45f6c6cbb185b4100536ec25 Mon Sep 17 00:00:00 2001 From: ah-net <103565001+ah-net@users.noreply.github.com> Date: Tue, 30 Apr 2024 15:59:31 +0200 Subject: [PATCH 1/3] fix: magento 2.4.7 compatibility (#61) --- Model/Logger.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Model/Logger.php b/Model/Logger.php index 92e64eb..77c2714 100644 --- a/Model/Logger.php +++ b/Model/Logger.php @@ -44,7 +44,7 @@ public function __construct(LoggerInterface $log, State $state) /** * {@inheritdoc} */ - public function emergency($message, array $context = []) + public function emergency($message, array $context = []): void { $this->log->emergency('[TweakWise] ' . $message, $context); } @@ -52,7 +52,7 @@ public function emergency($message, array $context = []) /** * {@inheritdoc} */ - public function alert($message, array $context = []) + public function alert($message, array $context = []): void { $this->log->alert('[TweakWise] ' . $message, $context); } @@ -60,7 +60,7 @@ public function alert($message, array $context = []) /** * {@inheritdoc} */ - public function critical($message, array $context = []) + public function critical($message, array $context = []): void { $this->log->critical('[TweakWise] ' . $message, $context); } @@ -68,7 +68,7 @@ public function critical($message, array $context = []) /** * {@inheritdoc} */ - public function error($message, array $context = []) + public function error($message, array $context = []): void { $this->log->error('[TweakWise] ' . $message, $context); } @@ -76,7 +76,7 @@ public function error($message, array $context = []) /** * {@inheritdoc} */ - public function warning($message, array $context = []) + public function warning($message, array $context = []): void { $this->log->warning('[TweakWise] ' . $message, $context); } @@ -84,7 +84,7 @@ public function warning($message, array $context = []) /** * {@inheritdoc} */ - public function notice($message, array $context = []) + public function notice($message, array $context = []): void { $this->log->notice('[TweakWise] ' . $message, $context); } @@ -92,7 +92,7 @@ public function notice($message, array $context = []) /** * {@inheritdoc} */ - public function info($message, array $context = []) + public function info($message, array $context = []): void { $this->log->info('[TweakWise] ' . $message, $context); } @@ -100,7 +100,7 @@ public function info($message, array $context = []) /** * {@inheritdoc} */ - public function debug($message, array $context = []) + public function debug($message, array $context = []): void { if ($this->enableDebugLog) { $this->log->debug('[TweakWise] ' . $message, $context); @@ -110,7 +110,7 @@ public function debug($message, array $context = []) /** * {@inheritdoc} */ - public function log($level, $message, array $context = []) + public function log($level, $message, array $context = []): void { $this->log->log($level, '[TweakWise] ' . $message, $context); } @@ -121,7 +121,7 @@ public function log($level, $message, array $context = []) * @param Exception $exception * @throws Exception */ - public function throwException(Exception $exception) + public function throwException(Exception $exception): void { $this->log->error($exception->getMessage()); throw $exception; From 2ff37cfdae1cd675f1c417960c04f6332dfd87c5 Mon Sep 17 00:00:00 2001 From: evs-xsarus <44158071+evs-xsarus@users.noreply.github.com> Date: Tue, 30 Apr 2024 16:19:19 +0200 Subject: [PATCH 2/3] Make installable on PHP 8.x (#58) * fix: make installable on php 8.x --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d83c3b3..a261c44 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "minimum-stability": "dev", "prefer-stable": true, "require": { - "php": ">=8.0 <8.3", + "php": "^8.0", "laminas/laminas-http": "^2.15.0" }, "require-dev": { From e8a836b0e366628cf5b1690f4e4a02d8ff1096fb Mon Sep 17 00:00:00 2001 From: ah-net <103565001+ah-net@users.noreply.github.com> Date: Wed, 1 May 2024 10:39:22 +0200 Subject: [PATCH 3/3] chore: fix style (#63) --- Controller/Adminhtml/Export/Trigger.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Controller/Adminhtml/Export/Trigger.php b/Controller/Adminhtml/Export/Trigger.php index 8b28213..d83d190 100644 --- a/Controller/Adminhtml/Export/Trigger.php +++ b/Controller/Adminhtml/Export/Trigger.php @@ -1,4 +1,5 @@ _url->getUrl('adminhtml'); } + $resultRedirect->setUrl($redirectUrl); return $resultRedirect;