From b08fc8f7c028f43652f051e73f92475a2956df5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20Hochd=C3=B6rfer?= <S.Hochdoerfer@bitExpert.de>
Date: Sat, 25 Jan 2025 09:57:03 +0100
Subject: [PATCH] Sylius 2.0 compatibility

---
 composer.json                                   | 17 +++++++----------
 src/Resources/config/admin_routing.yml          | 12 ++++--------
 src/Resources/translations/messages.en.yaml     |  6 ++----
 .../views/Admin/Whitelist/_form.html.twig       | 13 -------------
 src/Voter/RequestWhitelistVoter.php             |  2 +-
 5 files changed, 14 insertions(+), 36 deletions(-)
 delete mode 100644 src/Resources/views/Admin/Whitelist/_form.html.twig

diff --git a/composer.json b/composer.json
index 8f46cbe..8d795a6 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
     ],
     "require": {
         "php": "^8.1",
-        "sylius/sylius": "^1.14"
+        "sylius/sylius": "^2.0"
     },
     "require-dev": {
         "behat/behat": "^3.6.1",
@@ -38,15 +38,12 @@
         "phpunit/phpunit": "^10.5",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0",
         "sylius-labs/coding-standard": "^4.2",
-        "symfony/browser-kit": "^5.4 || ^6.0",
-        "symfony/debug-bundle": "^5.4 || ^6.0",
-        "symfony/dotenv": "^5.4 || ^6.0",
+        "symfony/browser-kit": "^7.0",
+        "symfony/debug-bundle": "^7.0",
+        "symfony/dotenv": "^7.0",
         "symfony/flex": "^2.2.2",
-        "symfony/intl": "^5.4 || ^6.0",
-        "symfony/web-profiler-bundle": "^5.4 || ^6.0"
-    },
-    "conflict": {
-        "symfony/framework-bundle": "6.2.8"
+        "symfony/intl": "^7.0",
+        "symfony/web-profiler-bundle": "^7.0"
     },
     "config": {
         "sort-packages": true,
@@ -59,7 +56,7 @@
     },
     "extra": {
         "symfony": {
-            "require": "^5.4 || ^6.0"
+            "require": "^7.0"
         }
     },
     "autoload": {
diff --git a/src/Resources/config/admin_routing.yml b/src/Resources/config/admin_routing.yml
index aa301c0..35caea2 100644
--- a/src/Resources/config/admin_routing.yml
+++ b/src/Resources/config/admin_routing.yml
@@ -2,14 +2,10 @@ bitexpert_sylius_forcelogin_admin_whitelist_entry_index:
   resource: |
     alias: bitexpert_sylius_forcelogin.whitelist_entry
     section: admin
-    templates: "@SyliusAdmin\\Crud"
+    templates: "@SyliusAdmin\\shared\\crud"
+    except: ['show']
     redirect: update
     grid: bitexpert_sylius_forcelogin_whitelist_entity
-    vars:
-        all:
-            subheader: bitexpert_sylius_forcelogin.ui.manage_whitelist
-            templates:
-                form: "@BitExpertSyliusForceCustomerLoginPlugin/Admin/Whitelist/_form.html.twig"
-        index:
-            icon: 'check circle outline'
+    form:
+        type: BitExpert\SyliusForceCustomerLoginPlugin\Form\Type\WhitelistEntryType
   type: sylius.resource
diff --git a/src/Resources/translations/messages.en.yaml b/src/Resources/translations/messages.en.yaml
index 12ce4bb..36c0b16 100644
--- a/src/Resources/translations/messages.en.yaml
+++ b/src/Resources/translations/messages.en.yaml
@@ -1,9 +1,7 @@
 bitexpert_sylius_forcelogin:
   ui:
-    whitelist_entries: Force Customer Login
-    manage_whitelist: Manage whitelist configuration
-    new_whitelist_entry: New whitelist entry
-    edit_whitelist_entry: Edit whitelist entry
+    whitelist_entries: Force Login
+    whitelist_entry: Whitelist configuration
     code: Code
     label: Label
     channel: Channel
diff --git a/src/Resources/views/Admin/Whitelist/_form.html.twig b/src/Resources/views/Admin/Whitelist/_form.html.twig
deleted file mode 100644
index f6e86c1..0000000
--- a/src/Resources/views/Admin/Whitelist/_form.html.twig
+++ /dev/null
@@ -1,13 +0,0 @@
-{% from '@SyliusAdmin/Macro/translationForm.html.twig' import translationFormWithSlug %}
-
-<div class="ui segment">
-    {{ form_errors(form) }}
-    <div class="two fields">
-        {{ form_row(form.label) }}
-        {{ form_row(form.channels) }}
-    </div>
-    <div class="two fields">
-        {{ form_row(form.urlRule) }}
-        {{ form_row(form.strategy) }}
-    </div>
-</div>
diff --git a/src/Voter/RequestWhitelistVoter.php b/src/Voter/RequestWhitelistVoter.php
index d9592c1..2c688af 100644
--- a/src/Voter/RequestWhitelistVoter.php
+++ b/src/Voter/RequestWhitelistVoter.php
@@ -28,7 +28,7 @@ public function __construct(
     ) {
     }
 
-    public function vote(TokenInterface $token, mixed $subject, array $attributes)
+    public function vote(TokenInterface $token, mixed $subject, array $attributes): int
     {
         if (!$subject instanceof Request) {
             return self::ACCESS_ABSTAIN;