Skip to content

Commit 783a83b

Browse files
Merge branch '2.3' into 2.7
* 2.3: [travis] Remove PHP 7 from allowed failures [Finder] Optimize the hot-path Update Process.php Conflicts: composer.json src/Symfony/Bridge/Doctrine/composer.json src/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php
2 parents e502c56 + cd699c5 commit 783a83b

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.9",
20-
"doctrine/common": "~2.3"
20+
"doctrine/common": "~2.4"
2121
},
2222
"require-dev": {
2323
"symfony/phpunit-bridge": "~2.7",
@@ -31,8 +31,8 @@
3131
"symfony/validator": "~2.5,>=2.5.5",
3232
"symfony/translation": "~2.0,>=2.0.5",
3333
"doctrine/data-fixtures": "1.0.*",
34-
"doctrine/dbal": "~2.2",
35-
"doctrine/orm": "~2.2,>=2.2.3"
34+
"doctrine/dbal": "~2.4",
35+
"doctrine/orm": "~2.4,>=2.4.5"
3636
},
3737
"suggest": {
3838
"symfony/form": "",

0 commit comments

Comments
 (0)