From 81bac308b81b21c193e9f49bb390dd58d1a7e5cb Mon Sep 17 00:00:00 2001
From: Maxime Huran <m.huran@monsieurbiz.com>
Date: Tue, 21 Jan 2025 18:44:10 +0100
Subject: [PATCH] feat(deps): add Sylius 1.14 compatibility

---
 .github/workflows/recipe.yaml         | 11 ++---------
 .github/workflows/security.yaml       |  2 +-
 .github/workflows/tests.yaml          |  2 +-
 .php-version.dist                     |  2 +-
 Makefile                              |  2 +-
 README.md                             | 10 +++++-----
 composer.json                         |  4 ++--
 docker-compose.yaml.dist              |  1 -
 src/Repository/MenuItemRepository.php |  2 --
 9 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/recipe.yaml b/.github/workflows/recipe.yaml
index f18740b..e14cc2d 100644
--- a/.github/workflows/recipe.yaml
+++ b/.github/workflows/recipe.yaml
@@ -14,15 +14,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.0', '8.1', '8.2']
-        sylius: ["~1.11.0", "~1.12.0", "~1.13.0"]
-        exclude:
-          - php: '8.2'
-            sylius: '~1.11.0'
-          - php: '8.0'
-            sylius: '~1.12.0'
-          - php: '8.0'
-            sylius: '~1.13.0'
+        php: ['8.1', '8.2', '8.3']
+        sylius: ["~1.12.0", "~1.13.0", "1.14.0"]
 
     steps:
       - name: Setup PHP
diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml
index c100cfa..df6525a 100644
--- 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']
+        php: ['8.1', '8.2', '8.3']
 
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 877ce6a..35e1014 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.1', '8.2']
+        php: ['8.1', '8.2', '8.3']
 
     env:
       SYMFONY_ARGS: --no-tls
diff --git a/.php-version.dist b/.php-version.dist
index 2983cad..cf02201 100644
--- a/.php-version.dist
+++ b/.php-version.dist
@@ -1 +1 @@
-8.2
+8.3
diff --git a/Makefile b/Makefile
index 4d10791..0c23559 100644
--- 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=1.14.0
 SYMFONY=cd ${APP_DIR} && symfony
 COMPOSER=symfony composer
 CONSOLE=${SYMFONY} console
diff --git a/README.md b/README.md
index 4d8166a..80e86b7 100644
--- a/README.md
+++ b/README.md
@@ -11,11 +11,11 @@ This plugins allows you to manage your menus.
 
 ## Compatibility
 
-| Sylius Version | PHP Version |
-|---|---|
-| 1.11 | 8.0 - 8.1 |
-| 1.12 | 8.1 - 8.2 |
-| 1.13 | 8.1 - 8.2 |
+| 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 |
 
 ## Installation
 
diff --git a/composer.json b/composer.json
index 33bbf88..a14f395 100644
--- a/composer.json
+++ b/composer.json
@@ -5,8 +5,8 @@
     "description": "This plugins allows you to manage menus.",
     "license": "MIT",
     "require": {
-        "php": "^8.0",
-        "sylius/sylius": ">=1.11 <1.14"
+        "php": "^8.1",
+        "sylius/sylius": ">=1.12 <2.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.16",
diff --git a/docker-compose.yaml.dist b/docker-compose.yaml.dist
index 955683c..24d6f0c 100644
--- a/docker-compose.yaml.dist
+++ b/docker-compose.yaml.dist
@@ -1,4 +1,3 @@
-version: '3.8'
 services:
     database:
         image: mysql:8.0
diff --git a/src/Repository/MenuItemRepository.php b/src/Repository/MenuItemRepository.php
index 096ada7..bdb9d82 100644
--- a/src/Repository/MenuItemRepository.php
+++ b/src/Repository/MenuItemRepository.php
@@ -34,7 +34,6 @@ public function getLastPositionWithinMenu(MenuInterface $menu): int
             ->setParameter('menu', $menu)
         ;
 
-        /** @phpstan-ignore-next-line */
         return (int) $queryBuilder->getQuery()->getSingleScalarResult();
     }
 
@@ -51,7 +50,6 @@ public function getLastPositionWithinMenuItem(MenuItemInterface $menuItem): int
             ->setParameter('parent', $menuItem)
         ;
 
-        /** @phpstan-ignore-next-line */
         return (int) $queryBuilder->getQuery()->getSingleScalarResult();
     }
 }