From 1984c2d1f05e4e0a60826e697a8f99babd900fa8 Mon Sep 17 00:00:00 2001
From: Hubert Filar <hubert.filar@gmail.com>
Date: Mon, 22 Jul 2024 13:29:45 +0200
Subject: [PATCH] OP-291: Update dependencies

---
 .github/workflows/build.yml                            |  4 ++--
 composer.json                                          | 10 +---------
 ...ge.json.~1.12.0.dist => package.json.~1.12.13.dist} |  0
 3 files changed, 3 insertions(+), 11 deletions(-)
 rename tests/Application/{package.json.~1.12.0.dist => package.json.~1.12.13.dist} (100%)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 42bc283d..c6fc16b0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,14 +24,14 @@ jobs:
             matrix:
                 php: ["8.1"]
                 symfony: ["^5.4", "^6.0"]
-                sylius: ["~1.12.0", "~1.13.0"]
+                sylius: ["~1.12.13", "~1.13.0"]
                 node: ["^14.17.x"]
                 mysql: ["8.0"]
                 state_machine_adapter: ["winzou_state_machine", "symfony_workflow"]
 
                 exclude:
                     -
-                        sylius: ~1.12.0
+                        sylius: ~1.12.13
                         state_machine_adapter: "symfony_workflow"
         env:
             APP_ENV: test
diff --git a/composer.json b/composer.json
index 9afd79a3..30fd6bc6 100644
--- a/composer.json
+++ b/composer.json
@@ -5,8 +5,7 @@
     "license": "MIT",
     "require": {
         "php": "^8.1",
-        "sylius/sylius": "~1.12.0 || ~1.13.0",
-        "symfony/webpack-encore-bundle": "^1.15",
+        "sylius/sylius": "~1.12.13 || ~1.13.0",
         "dompdf/dompdf": "^2.0"
     },
     "require-dev": {
@@ -38,13 +37,6 @@
         "lchrusciel/api-test-case": "^4.1 || ^5.0",
         "nelmio/alice": "^3.10"
     },
-    "conflict": {
-        "symfony/symfony": "4.1.8",
-        "symfony/browser-kit": "4.1.8",
-        "symfony/dom-crawler": "4.1.8",
-        "symfony/routing": "4.1.8",
-        "symfony/doctrine-bridge": "4.4.16"
-    },
     "prefer-stable": true,
     "autoload": {
         "psr-4": {
diff --git a/tests/Application/package.json.~1.12.0.dist b/tests/Application/package.json.~1.12.13.dist
similarity index 100%
rename from tests/Application/package.json.~1.12.0.dist
rename to tests/Application/package.json.~1.12.13.dist