From 70bbb47850d1ef5ebe80efe0a0fd97d74462f584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20B=C3=B6hmer?= Date: Sun, 15 Jun 2025 22:27:10 +0200 Subject: [PATCH 1/2] Fixed phpunit tests --- src/Services/InfoProviderSystem/Providers/TMEClient.php | 2 +- src/Services/InfoProviderSystem/Providers/TMEProvider.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Services/InfoProviderSystem/Providers/TMEClient.php b/src/Services/InfoProviderSystem/Providers/TMEClient.php index 04cf818c..df198717 100644 --- a/src/Services/InfoProviderSystem/Providers/TMEClient.php +++ b/src/Services/InfoProviderSystem/Providers/TMEClient.php @@ -59,7 +59,7 @@ class TMEClient public function isUsingPrivateToken(): bool { //Private tokens are longer than anonymous ones (50 instead of 45 characters) - return strlen($this->token) > 45; + return strlen($this->settings->apiToken) > 45; } /** diff --git a/src/Services/InfoProviderSystem/Providers/TMEProvider.php b/src/Services/InfoProviderSystem/Providers/TMEProvider.php index 93c897ee..81939a78 100644 --- a/src/Services/InfoProviderSystem/Providers/TMEProvider.php +++ b/src/Services/InfoProviderSystem/Providers/TMEProvider.php @@ -44,7 +44,7 @@ class TMEProvider implements InfoProviderInterface if ($this->tmeClient->isUsingPrivateToken()) { $this->get_gross_prices = false; } else { - $this->get_gross_prices = $get_gross_prices; + $this->get_gross_prices = $this->settings->grossPrices; } } From 64497c4c0da15a7a4d97a45ba8c9d7ccb5165081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20B=C3=B6hmer?= Date: Sun, 15 Jun 2025 22:30:23 +0200 Subject: [PATCH 2/2] Fixed phpstan issues --- .../UserSystem/SetUserTimezoneSubscriber.php | 2 +- .../InfoProviderSystem/Providers/Element14Provider.php | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/EventSubscriber/UserSystem/SetUserTimezoneSubscriber.php b/src/EventSubscriber/UserSystem/SetUserTimezoneSubscriber.php index 35e36375..9964c618 100644 --- a/src/EventSubscriber/UserSystem/SetUserTimezoneSubscriber.php +++ b/src/EventSubscriber/UserSystem/SetUserTimezoneSubscriber.php @@ -49,7 +49,7 @@ final class SetUserTimezoneSubscriber implements EventSubscriberInterface } //Fill with default value if needed - if (null === $timezone && $this->localizationSettings !== '') { + if (null === $timezone && $this->localizationSettings->timezone !== '') { $timezone = $this->localizationSettings->timezone; } diff --git a/src/Services/InfoProviderSystem/Providers/Element14Provider.php b/src/Services/InfoProviderSystem/Providers/Element14Provider.php index 2ab7d9d7..de51de46 100644 --- a/src/Services/InfoProviderSystem/Providers/Element14Provider.php +++ b/src/Services/InfoProviderSystem/Providers/Element14Provider.php @@ -77,7 +77,7 @@ class Element14Provider implements InfoProviderInterface public function isActive(): bool { - return $this->settings->storeId !== null && $this->settings->apiKey !== ''; + return trim($this->settings->apiKey) !== ''; } /** @@ -131,11 +131,6 @@ class Element14Provider implements InfoProviderInterface return $result; } - private function generateProductURL($sku): string - { - return 'https://' . $this->store_id . '/' . $sku; - } - /** * @param array|null $datasheets * @return FileDTO[]|null Array of FileDTOs