Skip to content

Commit 3ca4970

Browse files
committed
Merge branch '1.11' into 1.12
* 1.11: Generate changelog for v1.11.4 [Composer] Bump sylius/grid-bundle dev dependency
2 parents 816e7ea + 136ab02 commit 3ca4970

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,12 +180,10 @@ jobs:
180180
composer require winzou/state-machine-bundle --no-scripts
181181
182182
-
183-
name: Run lint container without twig/twig package
183+
name: Run lint container without sylius/grid-bundle package
184184
if: matrix.app_env == 'test'
185185
run: |
186-
composer remove symfony/twig-bundle --no-scripts
187186
composer remove sylius/grid-bundle --no-scripts --dev
188187
(cd tests/Application && bin/console cache:clear --env=test_without_twig)
189188
(cd tests/Application && bin/console lint:container --env=test_without_twig)
190-
composer require symfony/twig-bundle --no-scripts
191-
composer require "sylius/grid-bundle: ^1.7 || v1.12.0-ALPHA.1" --no-scripts --dev
189+
composer require "sylius/grid-bundle: ^1.11" --no-scripts --dev

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@
3636
- [#924](https://github.com/Sylius/SyliusResourceBundle/issues/924) Remove Twig 2 support ([@loic425](https://github.com/loic425))
3737
- [#926](https://github.com/Sylius/SyliusResourceBundle/issues/926) [Composer] Allow GridBundle ^v1.13@alpha ([@GSadee](https://github.com/GSadee))
3838

39+
## v1.11.4 (2024-10-07)
40+
41+
#### Details
42+
43+
- [#948](https://github.com/Sylius/SyliusResourceBundle/issues/948) Remove usage of Symfony\Component\HttpKernel\DependencyInjection\Exte… ([@loic425](https://github.com/loic425))
44+
- [#949](https://github.com/Sylius/SyliusResourceBundle/issues/949) [Composer] Bump sylius/grid-bundle dev dependency ([@GSadee](https://github.com/GSadee))
45+
3946
## v1.11.3 (2024-09-23)
4047

4148
#### Details

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"phpunit/phpunit": "^9.5",
7272
"rector/rector": "^0.18.2",
7373
"sylius-labs/coding-standard": "^4.0",
74-
"sylius/grid-bundle": "^1.7 || ^1.13@alpha",
74+
"sylius/grid-bundle": "^1.11",
7575
"symfony/console": "^5.4 || ^6.4 || ^7.0",
7676
"symfony/css-selector": "^5.4 || ^6.4 || ^7.0",
7777
"symfony/dependency-injection": "^5.4 || ^6.4 || ^7.0",

0 commit comments

Comments
 (0)