From 03534dc3cb2fa6c2beccc18df52f5afe02b04868 Mon Sep 17 00:00:00 2001
From: Maxime Huran <m.huran@monsieurbiz.com>
Date: Mon, 10 Jan 2022 16:28:22 +0100
Subject: [PATCH 1/4] Enable schema validate after Payum update

https://github.com/Sylius/Sylius/pull/13214#pullrequestreview-847924804
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 7fd3655..e3d17cd 100644
--- a/Makefile
+++ b/Makefile
@@ -133,7 +133,7 @@ test.yaml: ## Lint the symfony Yaml files
 	${CONSOLE} lint:yaml ../../recipes ../../src/Resources/config
 
 test.schema: ## Validate MySQL Schema
-	${CONSOLE} doctrine:schema:validate || true
+	${CONSOLE} doctrine:schema:validate
 
 test.twig: ## Validate Twig templates
 	${CONSOLE} lint:twig --no-debug templates/ ../../src/Resources/views/

From 897378dcfe0c7490c6c43d2fcaffec2d1723f38a Mon Sep 17 00:00:00 2001
From: Maxime Leclercq <m.leclercq@monsieurbiz.com>
Date: Fri, 8 Apr 2022 14:46:48 +0200
Subject: [PATCH 2/4] refactor: remove conflict with doctrine/dbal

---
 composer.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/composer.json b/composer.json
index 0a76a88..cdc97f0 100644
--- a/composer.json
+++ b/composer.json
@@ -45,9 +45,6 @@
         "symfony/web-profiler-bundle": "^4.4",
         "phpmd/phpmd": "@stable"
     },
-    "conflict": {
-        "doctrine/dbal": "^3"
-    },
     "prefer-stable": true,
     "autoload": {
         "psr-4": {

From c599413ebe0d5f780cdb6c27bef670381d93137f Mon Sep 17 00:00:00 2001
From: Maxime Leclercq <m.leclercq@monsieurbiz.com>
Date: Fri, 8 Apr 2022 14:47:12 +0200
Subject: [PATCH 3/4] fix: force the sylius version in recipe workflow

---
 .github/workflows/recipe.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/recipe.yaml b/.github/workflows/recipe.yaml
index 9e2237d..f4e1712 100644
--- a/.github/workflows/recipe.yaml
+++ b/.github/workflows/recipe.yaml
@@ -63,6 +63,12 @@ jobs:
         run: |
           composer create-project --prefer-dist --no-scripts --no-progress --no-install sylius/sylius-standard sylius "${{ matrix.sylius }}"
 
+      # Because the sylius-standard has a soft constraint
+      - name: Make sure to install the required version of Sylius
+        working-directory: ./sylius
+        run: |
+            composer require --no-install --no-scripts --no-progress sylius/sylius="${{ matrix.sylius }}"
+
       - name: Setup some requirements
         working-directory: ./sylius
         run: |

From 9d79fc6bd68bb5a8bc9b73752ac05de697209c43 Mon Sep 17 00:00:00 2001
From: Maxime Leclercq <m.leclercq@monsieurbiz.com>
Date: Fri, 8 Apr 2022 14:47:26 +0200
Subject: [PATCH 4/4] fix: makefile improvements

---
 Makefile | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index e3d17cd..42ff75b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 .DEFAULT_GOAL := help
 SHELL=/bin/bash
 APP_DIR=tests/Application
-SYLIUS_VERSION=1.10
+SYLIUS_VERSION=1.10.0
 SYMFONY=cd ${APP_DIR} && symfony
 COMPOSER=symfony composer
 CONSOLE=${SYMFONY} console
@@ -62,19 +62,21 @@ ${APP_DIR}/node_modules: yarn.install
 application: .php-version php.ini ${APP_DIR} setup_application ${APP_DIR}/docker-compose.yaml
 
 ${APP_DIR}:
-	(${COMPOSER} create-project --no-interaction --prefer-dist --no-scripts --no-progress --no-install sylius/sylius-standard="${SYLIUS_VERSION}" ${APP_DIR})
+	(${COMPOSER} create-project --no-interaction --prefer-dist --no-scripts --no-progress --no-install sylius/sylius-standard="~${SYLIUS_VERSION}" ${APP_DIR})
 
 setup_application:
 	rm -f ${APP_DIR}/yarn.lock
 	(cd ${APP_DIR} && ${COMPOSER} config repositories.plugin '{"type": "path", "url": "../../"}')
 	(cd ${APP_DIR} && ${COMPOSER} config extra.symfony.allow-contrib true)
 	(cd ${APP_DIR} && ${COMPOSER} config minimum-stability dev)
-	(cd ${APP_DIR} && ${COMPOSER} require --no-scripts --no-progress --no-install --no-update monsieurbiz/${PLUGIN_NAME}="*@dev")
-	$(MAKE) apply_dist
+	(cd ${APP_DIR} && ${COMPOSER} require --no-install --no-scripts --no-progress sylius/sylius="~${SYLIUS_VERSION}") # Make sure to install the required version of sylius because the sylius-standard has a soft constraint
 	$(MAKE) ${APP_DIR}/.php-version
 	$(MAKE) ${APP_DIR}/php.ini
-	cd ${APP_DIR} && ${COMPOSER} install --no-interaction
-	cd ${APP_DIR} && ${COMPOSER} symfony:recipes:install --no-interaction
+	(cd ${APP_DIR} && ${COMPOSER} install --no-interaction)
+	$(MAKE) apply_dist
+	(cd ${APP_DIR} && ${COMPOSER} require --no-progress monsieurbiz/${PLUGIN_NAME}="*@dev")
+	rm -rf ${APP_DIR}/var/cache
+
 
 ${APP_DIR}/docker-compose.yaml:
 	rm -f ${APP_DIR}/docker-compose.yml
@@ -184,6 +186,11 @@ docker.logs: ## Logs the docker containers
 	cd ${APP_DIR} && ${COMPOSE} logs -f
 .PHONY: docker.logs
 
+docker.dc: ARGS=ps
+docker.dc: ## Run docker-compose command. Use ARGS="" to pass parameters to docker-compose.
+	cd ${APP_DIR} && ${COMPOSE} ${ARGS}
+.PHONY: docker.dc
+
 server.start: ## Run the local webserver using Symfony
 	${SYMFONY} local:server:start -d