Merge pull request #16 from delyriand/feature/sylius-2-0

maximehuran · web-flow · commit 163dc4467f0c · 2025-05-21T14:14:36.000+02:00
diff --git a/.github/workflows/recipe.yaml b/.github/workflows/recipe.yaml
@@ -2,7 +2,7 @@ name: Flex Recipe
 
 on:
   push:
-    branches: [ master ]
+    branches: [ $default-branch ]
   pull_request:
 
 jobs:
@@ -14,8 +14,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.1', '8.2', '8.3']
-        sylius: ["~1.12.0", "~1.13.0", "1.14.0"]
+        php: ['8.2', '8.3']
+        sylius: ["~2.0.0"]
 
     steps:
       - name: Setup PHP
diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.1', '8.2', '8.3']
+        php: ['8.2', '8.3']
 
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -2,7 +2,7 @@ name: Tests
 
 on:
   push:
-    branches: [ master ]
+    branches: [ $default-branch ]
   pull_request:
 
 jobs:
@@ -14,7 +14,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.1', '8.2', '8.3']
+        php: ['8.2', '8.3']
+        node: ['20']
 
     env:
       SYMFONY_ARGS: --no-tls
@@ -25,7 +26,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: '14'
+          node-version: ${{ matrix.node }}
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 .DEFAULT_GOAL := help
 SHELL=/bin/bash
 APP_DIR=tests/Application
-SYLIUS_VERSION=1.14.0
+SYLIUS_VERSION=2.0.0
 SYMFONY=cd ${APP_DIR} && symfony
 COMPOSER=symfony composer
 CONSOLE=${SYMFONY} console
diff --git a/README.md b/README.md
@@ -14,15 +14,15 @@ The messages can be different for logged-in customers.
 The message is displayed just after the opening `body`. You can change the HTML template directly in the admin panel.  
 By default it'll use the Semantic UI classes.
 
-![](screenshot.png) 
+![](docs/images/alert-message.png) 
 
 ## Compatibility
 
 | Sylius Version | PHP Version     |
 |----------------|-----------------|
-| 1.12           | 8.1 - 8.2 - 8.3 |
-| 1.13           | 8.1 - 8.2 - 8.3 |
-| 1.14           | 8.1 - 8.2 - 8.3 |
+| 2.0            | 8.2 - 8.3       |
+
+ℹ️ For Sylius 1.x, see our [1.x branch](https://github.com/monsieurbiz/SyliusAlertMessagePlugin/tree/1.x) and all 1.x releases.
 
 ## Installation
 
@@ -64,7 +64,7 @@ Being able to add a well seen message on your shop can be useful.
 
 ## Admin form
 
-![](admin-form.jpg)
+![](docs/images/admin-form.png)
 
 ## Testing
 
diff --git a/admin-form.jpg b/admin-form.jpg
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.1",
-        "sylius/sylius": ">=1.12 <2.0"
+        "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/docs/images/admin-form.png b/docs/images/admin-form.png
diff --git a/docs/images/alert-message.png b/docs/images/alert-message.png
diff --git a/screenshot.png b/screenshot.png
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/grid.yaml b/src/Resources/config/sylius/grid.yaml
@@ -4,7 +4,7 @@ sylius_grid:
       driver:
         name: doctrine/orm
         options:
-          class: MonsieurBiz\SyliusAlertMessagePlugin\Entity\Message
+          class: '%monsieurbiz_alert_message.model.message.class%'
       limits: [25, 50, 100, 200]
       fields:
         name:
@@ -23,12 +23,12 @@ sylius_grid:
           type: twig
           label: monsieurbiz_alert_message.ui.form.enabled
           options:
-            template: "@SyliusUi/Grid/Field/enabled.html.twig"
+            template: "@SyliusAdmin/shared/grid/field/boolean.html.twig"
         customersOnly:
           type: twig
           label: monsieurbiz_alert_message.ui.form.customers_only
           options:
-            template: "@MonsieurBizSyliusAlertMessagePlugin/Grid/Field/customers_only.html.twig"
+            template: "@SyliusAdmin/shared/grid/field/boolean.html.twig"
       actions:
         main:
           create:
diff --git a/src/Resources/config/sylius/twig_hooks.yaml b/src/Resources/config/sylius/twig_hooks.yaml
@@ -0,0 +1,18 @@
+sylius_twig_hooks:
+    hooks:
+        'sylius_shop.base.header':
+            monsieurbiz.alertmessage.message:
+                template: '@MonsieurBizSyliusAlertMessagePlugin/message.html.twig'
+                priority: 900
+        'sylius_admin.message.create.content.form.sections.general':
+            default:
+                enabled: false
+            general:
+                template: '@MonsieurBizSyliusAlertMessagePlugin/admin/message/form/sections/general.html.twig'
+                priority: 100
+        'sylius_admin.message.update.content.form.sections.general':
+            default:
+                enabled: false
+            general:
+                template: '@MonsieurBizSyliusAlertMessagePlugin/admin/message/form/sections/general.html.twig'
+                priority: 100
diff --git a/src/Resources/config/sylius/ui_events.yaml b/src/Resources/config/sylius/ui_events.yaml
diff --git a/src/Resources/translations/messages.en.yaml b/src/Resources/translations/messages.en.yaml
@@ -1,5 +1,6 @@
 monsieurbiz_alert_message:
   ui:
+    message: Alert message
     messages: Alert messages
     messages_subheader: Manage alerts on your shop
     new_message: New message
diff --git a/src/Resources/translations/messages.fr.yaml b/src/Resources/translations/messages.fr.yaml
@@ -1,5 +1,6 @@
 monsieurbiz_alert_message:
   ui:
+    message: Message d'alerte
     messages: Messages d'alerte
     messages_subheader: Gérer les alertes sur votre boutique
     new_message: Nouveau message
diff --git a/src/Resources/views/Grid/Field/customers_only.html.twig b/src/Resources/views/Grid/Field/customers_only.html.twig
diff --git a/src/Resources/views/Macro/customers_only.html.twig b/src/Resources/views/Macro/customers_only.html.twig
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>
diff --git a/src/Resources/views/admin/message/form/sections/general.html.twig b/src/Resources/views/admin/message/form/sections/general.html.twig
@@ -0,0 +1,21 @@
+{% import '@SyliusAdmin/shared/helper/translations.html.twig' as translations %}
+
+{% set form = hookable_metadata.context.form %}
+
+{{ form_row(form.enabled) }}
+{{ form_row(form.customersOnly) }}
+{{ form_row(form.channels) }}
+{{ form_row(form.name) }}
+{{ form_row(form.description) }}
+{{ form_row(form.fromDate) }}
+{{ form_row(form.toDate) }}
+{{ form_row(form.templateHtml) }}
+
+<div class="card mb-3">
+    <div class="card-header">
+        <div class="card-title">
+            {{ 'sylius.ui.translations'|trans }}
+        </div>
+    </div>
+    {{ translations.default(form.translations, null, { accordion_flush: true }) }}
+</div>
