Skip to content

Commit ca9a7c8

Browse files
Merge branch '3.3' into 3.4
* 3.3: [VarDumper] Fix tests with phpredis 3.1.3 [DI] Fix reading env vars from fastcgi params Allow phpdocumentor/reflection-docblock 4. [VarDumper] play nice with open_basedir when looking for composer.json
2 parents 75b3132 + f0aba8f commit ca9a7c8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"doctrine/annotations": "~1.0",
2929
"symfony/dependency-injection": "~3.2|~4.0",
3030
"doctrine/cache": "~1.0",
31-
"phpdocumentor/reflection-docblock": "~3.0"
31+
"phpdocumentor/reflection-docblock": "^3.0|^4.0"
3232
},
3333
"conflict": {
3434
"symfony/dependency-injection": "<3.2",

0 commit comments

Comments
 (0)