Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit f9f53b2

Browse filesBrowse files
Merge branch '2.7' into 2.8
* 2.7: Add missing conflict rules for phpunit
2 parents f2754eb + 347f529 commit f9f53b2
Copy full SHA for f9f53b2

File tree

Expand file treeCollapse file tree

4 files changed

+10
-0
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+10
-0
lines changed

‎src/Symfony/Bridge/Doctrine/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/composer.json
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535
"doctrine/dbal": "~2.4",
3636
"doctrine/orm": "^2.4.5"
3737
},
38+
"conflict": {
39+
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
40+
},
3841
"suggest": {
3942
"symfony/form": "",
4043
"symfony/validator": "",

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/composer.json
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@
5353
"twig/twig": "~1.23|~2.0",
5454
"sensio/framework-extra-bundle": "^3.0.2"
5555
},
56+
"conflict": {
57+
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
58+
},
5659
"suggest": {
5760
"symfony/console": "For using the console commands",
5861
"symfony/form": "For using forms",

‎src/Symfony/Component/Form/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/composer.json
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"symfony/translation": "^2.0.5|~3.0.0"
3434
},
3535
"conflict": {
36+
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
3637
"symfony/doctrine-bridge": "<2.7",
3738
"symfony/framework-bundle": "<2.7",
3839
"symfony/twig-bridge": "<2.7"

‎src/Symfony/Component/VarDumper/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/VarDumper/composer.json
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
"require-dev": {
2323
"twig/twig": "~1.20|~2.0"
2424
},
25+
"conflict": {
26+
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
27+
},
2528
"suggest": {
2629
"ext-symfony_debug": ""
2730
},

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.