Skip to content

Commit 9ac315d

Browse files
Merge branch '4.3' into 4.4
* 4.3: fix deps=low [VarExporter] fix support for PHP 7.4 Use PHP 7.4 on deps=low
2 parents 3f42244 + f5b4937 commit 9ac315d

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

Tests/CacheWarmer/ValidatorCacheWarmerTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
class ValidatorCacheWarmerTest extends TestCase
2222
{
2323
/**
24+
* @group issue-32995
25+
*
2426
* @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
2527
*/
2628
public function testWarmUp()

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,11 @@
3030
"symfony/routing": "^4.4|^5.0"
3131
},
3232
"require-dev": {
33+
"doctrine/annotations": "~1.7",
3334
"doctrine/cache": "~1.0",
3435
"symfony/asset": "^3.4|^4.0|^5.0",
3536
"symfony/browser-kit": "^4.3|^5.0",
36-
"symfony/console": "^4.3|^5.0",
37+
"symfony/console": "^4.3.4|^5.0",
3738
"symfony/css-selector": "^3.4|^4.0|^5.0",
3839
"symfony/dom-crawler": "^4.3|^5.0",
3940
"symfony/polyfill-intl-icu": "~1.0",
@@ -58,9 +59,8 @@
5859
"symfony/yaml": "^3.4|^4.0|^5.0",
5960
"symfony/property-info": "^3.4|^4.0|^5.0",
6061
"symfony/web-link": "^4.4|^5.0",
61-
"doctrine/annotations": "~1.0",
6262
"phpdocumentor/reflection-docblock": "^3.0|^4.0",
63-
"twig/twig": "~1.34|~2.4"
63+
"twig/twig": "~1.41|~2.10"
6464
},
6565
"conflict": {
6666
"phpdocumentor/reflection-docblock": "<3.0",

0 commit comments

Comments
 (0)