Update for sylius 1.12

monsieurbiz · Dec 29, 2022 · 9972668 · 9972668
1 parent dff3e17
commit 9972668
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
     "license": "MIT",
     "require": {
         "php": "~7.4|~8.0",
-        "sylius/sylius": ">=1.8 <1.12",
+        "sylius/sylius": "^1.12",
         "gedmo/doctrine-extensions": "^2.4.12 || ^3.0",
         "monsieurbiz/sylius-rich-editor-plugin": "^2.0"
     },

diff --git a/src/Context/LastChanceLocaleContext.php b/src/Context/LastChanceLocaleContext.php
@@ -34,8 +34,7 @@ public function __construct(
 
     public function getLocaleCode(): string
     {
-        $request = $this->requestStack->getMasterRequest();
-        if (null === $request) {
+        if (null === $request = $this->requestStack->getMainRequest()) {
             throw new LocaleNotFoundException('Main request not found, therefore no locale found…');
         }
         $pathInfo = $request->getPathInfo();

diff --git a/src/DependencyInjection/MonsieurBizSyliusCmsPageExtension.php b/src/DependencyInjection/MonsieurBizSyliusCmsPageExtension.php
@@ -34,7 +34,7 @@ public function load(array $config, ContainerBuilder $container): void
     /**
      * @inheritdoc
      */
-    public function getAlias()
+    public function getAlias(): string
     {
         return str_replace('monsieur_biz', 'monsieurbiz', parent::getAlias());
     }

diff --git a/src/Entity/PageTranslation.php b/src/Entity/PageTranslation.php
@@ -57,7 +57,7 @@ class PageTranslation extends AbstractTranslation implements PageTranslationInte
      *
      * @var string|null
      */
-    protected $locale;
+    protected ?string $locale;
 
     public function getId(): ?int
     {

diff --git a/src/Resources/config/routing/shop.yaml b/src/Resources/config/routing/shop.yaml
@@ -3,7 +3,7 @@ monsieurbiz_cms_page_show:
     path: /{slug}
     methods: [GET]
     defaults:
-        _controller: monsieurbiz_cms_page.controller.page:showAction
+        _controller: monsieurbiz_cms_page.controller.page::showAction
         _sylius:
             template: "@MonsieurBizSyliusCmsPagePlugin/Shop/Page/show.html.twig"
             repository:

diff --git a/src/Routing/RequestContext.php b/src/Routing/RequestContext.php
@@ -65,7 +65,7 @@ public function __construct(
 
     public function checkPageSlug(Request $request): bool
     {
-        if ($request !== $this->requestStack->getMasterRequest()) {
+        if ($request !== $this->requestStack->getMainRequest()) {
             return false;
         }