Allow the services to be reset by Symfony if people forget to do it manually

Author: loevgaard

composer.json

@@ -15,7 +15,8 @@
         "sylius/locale": "^1.0",
         "symfony/config": "^5.4 || ^6.4",
         "symfony/dependency-injection": "^5.4 || ^6.4",
-        "symfony/http-kernel": "^5.4 || ^6.4"
+        "symfony/http-kernel": "^5.4 || ^6.4",
+        "symfony/service-contracts": "^1.1 || ^2.0 || ^3.0"
     },
     "require-dev": {
         "infection/infection": "^0.27.11",

src/Context/StaticChannelContext.php

@@ -8,8 +8,9 @@
 use Sylius\Component\Channel\Context\ChannelNotFoundException;
 use Sylius\Component\Channel\Model\ChannelInterface;
 use Sylius\Component\Channel\Repository\ChannelRepositoryInterface;
+use Symfony\Contracts\Service\ResetInterface;
 
-final class StaticChannelContext implements ChannelContextInterface
+final class StaticChannelContext implements ChannelContextInterface, ResetInterface
 {
     private ?ChannelInterface $channel = null;
 
@@ -43,4 +44,9 @@ public function setChannelCode(string $channelCode): void
 
         $this->channel = $channel;
     }
+
+    public function reset(): void
+    {
+        $this->channel = null;
+    }
 }

src/Context/StaticLocaleContext.php

@@ -6,8 +6,9 @@
 
 use Sylius\Component\Locale\Context\LocaleContextInterface;
 use Sylius\Component\Locale\Context\LocaleNotFoundException;
+use Symfony\Contracts\Service\ResetInterface;
 
-final class StaticLocaleContext implements LocaleContextInterface
+final class StaticLocaleContext implements LocaleContextInterface, ResetInterface
 {
     private ?string $localeCode = null;
 
@@ -20,4 +21,9 @@ public function setLocaleCode(?string $localeCode): void
     {
         $this->localeCode = $localeCode;
     }
+
+    public function reset(): void
+    {
+        $this->localeCode = null;
+    }
 }