Merge pull request #5 from maximehuran/feature/1.14

monsieurbiz · Jan 21, 2025 · 15cc488 · 15cc488
2 parents 0a7291b + a27bd9b
commit 15cc488
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 21 deletions.
diff --git 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
@@ -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
@@ -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
@@ -1 +1 @@
-8.2
+8.3
diff --git a/Makefile b/Makefile
@@ -1,13 +1,13 @@
 .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
 export COMPOSE_PROJECT_NAME=sylius-plus-adapter
 PLUGIN_NAME=sylius-plus-adapter-plugin
-COMPOSE=docker-compose
+COMPOSE=docker compose
 YARN=yarn
 
 ###

diff --git a/README.md b/README.md
@@ -9,11 +9,11 @@ This plugin offer tools to adapt your plugins to Sylius Plus RBAC system.
 
 ## 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
@@ -5,8 +5,8 @@
     "description": "This plugin offer tools to adapt your plugins to Sylius Plus RBAC system.",
     "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",