Skip to content

Commit 92e5335

Browse files
Merge branch '3.4'
* 3.4: Skip tests affected by PHP bug 75354 fix deps fix PHP 7.2 compatibility [Form] Fix error message in circular reference dependencies check
2 parents 2198c50 + 8406018 commit 92e5335

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
@@ -61,7 +61,7 @@
6161
},
6262
"conflict": {
6363
"phpdocumentor/reflection-docblock": "<3.0",
64-
"phpdocumentor/type-resolver": "<0.2.0",
64+
"phpdocumentor/type-resolver": "<0.2.1",
6565
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
6666
"symfony/asset": "<3.4",
6767
"symfony/console": "<3.4",

0 commit comments

Comments
 (0)