feat: add sylius 2.0 support

monsieurbiz · Dec 5, 2024 · 9ea12e8 · 9ea12e8
1 parent 91e5721
commit 9ea12e8
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 18 deletions.
diff --git a/.php-version.dist b/.php-version.dist
@@ -1 +1 @@
-8.2
+8.3
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 .DEFAULT_GOAL := help
 SHELL=/bin/bash
 APP_DIR=tests/Application
-SYLIUS_VERSION=1.13.0
+SYLIUS_VERSION=2.0.0
 SYMFONY=cd ${APP_DIR} && symfony
 COMPOSER=symfony composer
 CONSOLE=${SYMFONY} console

diff --git a/composer.json b/composer.json
@@ -5,8 +5,8 @@
     "description": "Adds a simple message on top of your shop.",
     "license": "MIT",
     "require": {
-        "php": "^8.0",
-        "sylius/sylius": ">=1.11 <1.14"
+        "php": "^8.2",
+        "sylius/sylius": "~2.0.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.16",
@@ -36,7 +36,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.2-dev"
+            "dev-master": "2.0-dev"
         },
         "symfony": {
             "docker": false,

diff --git a/src/Helper/MessageHelper.php b/src/Helper/MessageHelper.php
@@ -15,12 +15,11 @@
 
 use MonsieurBiz\SyliusAlertMessagePlugin\Entity\Message;
 use MonsieurBiz\SyliusAlertMessagePlugin\Repository\MessageRepositoryInterface;
-use Sonata\BlockBundle\Model\Block;
 use Sylius\Component\Channel\Context\ChannelContextInterface;
 use Sylius\Component\Customer\Context\CustomerContextInterface;
 use Sylius\Component\Locale\Context\LocaleContextInterface;
 
-final class MessageHelper extends Block
+final class MessageHelper
 {
     /**
      * @var ChannelContextInterface
@@ -51,7 +50,6 @@ public function __construct(
         CustomerContextInterface $customerContext,
         MessageRepositoryInterface $messageRepository
     ) {
-        parent::__construct();
         $this->channelContext = $channelContext;
         $this->localeContext = $localeContext;
         $this->customerContext = $customerContext;

diff --git a/src/Resources/config/config.yaml b/src/Resources/config/config.yaml
@@ -1,5 +1,5 @@
 imports:
   - { resource: "sylius/resources.yaml" }
   - { resource: "sylius/grid.yaml" }
-  - { resource: "sylius/ui_events.yaml" }
+  - { resource: "sylius/twig_hooks.yaml" }
   - { resource: "sylius/fixtures.yaml" }
diff --git a/src/Resources/config/routing/admin.yaml b/src/Resources/config/routing/admin.yaml
@@ -3,7 +3,7 @@ monsieurbiz_sylius_alert_message_admin:
     alias: monsieurbiz_alert_message.message
     section: admin
     permission: true
-    templates: "@SyliusAdmin\\Crud"
+    templates: "@SyliusAdmin\\shared\\crud"
     except: ['show']
     redirect: update
     grid: monsieurbiz_alert_message

diff --git a/src/Resources/config/sylius/twig_hooks.yaml b/src/Resources/config/sylius/twig_hooks.yaml
@@ -0,0 +1,6 @@
+sylius_twig_hooks:
+    hooks:
+        'sylius_shop.base.header':
+            monsieurbiz.alertmessage.message:
+                template: '@MonsieurBizSyliusAlertMessagePlugin/message.html.twig'
+                priority: 900
diff --git a/src/Resources/config/sylius/ui_events.yaml b/src/Resources/config/sylius/ui_events.yaml
diff --git a/src/Resources/views/_default_template.html.twig b/src/Resources/views/_default_template.html.twig
@@ -1,6 +1,6 @@
-<div class="ui error message" style="margin: 0; border-radius: 0">
+<div class="alert alert-danger mb-0" role="alert">
     {% if message.title is defined -%}
-    <div class="header">{{ message.title }}</div>
+        <div class="h5">{{ message.title }}</div>
     {%- endif %}
     <div>{{ message.message|raw }}</div>
 </div>