Merge branch '1.11' into 1.12

* 1.11: Generate changelog for v1.11.4 [Composer] Bump sylius/grid-bundle dev dependency
Sylius · Oct 7, 2024 · 3ca4970 · 3ca4970
2 parents 816e7ea + 136ab02
commit 3ca4970
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -180,12 +180,10 @@ jobs:
                     composer require winzou/state-machine-bundle --no-scripts
 
             -
-                name: Run lint container without twig/twig package
+                name: Run lint container without sylius/grid-bundle package
                 if: matrix.app_env == 'test'
                 run: |
-                    composer remove symfony/twig-bundle --no-scripts
                     composer remove sylius/grid-bundle --no-scripts --dev
                     (cd tests/Application && bin/console cache:clear --env=test_without_twig)
                     (cd tests/Application && bin/console lint:container --env=test_without_twig)
-                    composer require symfony/twig-bundle --no-scripts
-                    composer require "sylius/grid-bundle: ^1.7 || v1.12.0-ALPHA.1" --no-scripts --dev
+                    composer require "sylius/grid-bundle: ^1.11" --no-scripts --dev
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -36,6 +36,13 @@
 - [#924](https://github.com/Sylius/SyliusResourceBundle/issues/924) Remove Twig 2 support ([@loic425](https://github.com/loic425))
 - [#926](https://github.com/Sylius/SyliusResourceBundle/issues/926) [Composer] Allow GridBundle ^v1.13@alpha ([@GSadee](https://github.com/GSadee))
 
+## v1.11.4 (2024-10-07)
+
+#### Details
+
+- [#948](https://github.com/Sylius/SyliusResourceBundle/issues/948) Remove usage of Symfony\Component\HttpKernel\DependencyInjection\Exte… ([@loic425](https://github.com/loic425))
+- [#949](https://github.com/Sylius/SyliusResourceBundle/issues/949) [Composer] Bump sylius/grid-bundle dev dependency ([@GSadee](https://github.com/GSadee))
+
 ## v1.11.3 (2024-09-23)
 
 #### Details

diff --git a/composer.json b/composer.json
@@ -71,7 +71,7 @@
         "phpunit/phpunit": "^9.5",
         "rector/rector": "^0.18.2",
         "sylius-labs/coding-standard": "^4.0",
-        "sylius/grid-bundle": "^1.7 || ^1.13@alpha",
+        "sylius/grid-bundle": "^1.11",
         "symfony/console": "^5.4 || ^6.4 || ^7.0",
         "symfony/css-selector": "^5.4 || ^6.4 || ^7.0",
         "symfony/dependency-injection": "^5.4 || ^6.4 || ^7.0",