Skip to content

Commit 7c87939

Browse files
Merge branch '3.4' into 4.3
* 3.4: Use PHP 7.4 on deps=low
2 parents f59d37a + b1cad51 commit 7c87939

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
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": "^7.1.3",
2020
"ext-xml": "*",
21-
"symfony/cache": "~4.3",
21+
"symfony/cache": "^4.3.4",
2222
"symfony/config": "^4.3.4",
2323
"symfony/debug": "~4.0",
2424
"symfony/dependency-injection": "^4.3",
@@ -34,7 +34,7 @@
3434
"fig/link-util": "^1.0",
3535
"symfony/asset": "~3.4|~4.0",
3636
"symfony/browser-kit": "^4.3",
37-
"symfony/console": "^4.3",
37+
"symfony/console": "^4.3.4",
3838
"symfony/css-selector": "~3.4|~4.0",
3939
"symfony/dom-crawler": "^4.3",
4040
"symfony/polyfill-intl-icu": "~1.0",
@@ -59,7 +59,7 @@
5959
"symfony/property-info": "~3.4|~4.0",
6060
"symfony/lock": "~3.4|~4.0",
6161
"symfony/web-link": "~3.4|~4.0",
62-
"doctrine/annotations": "~1.0",
62+
"doctrine/annotations": "~1.7",
6363
"phpdocumentor/reflection-docblock": "^3.0|^4.0",
6464
"twig/twig": "~1.34|~2.4"
6565
},

0 commit comments

Comments
 (0)