10000 minor #15831 [travis] Remove PHP 7 from allowed failures (nicolas-gre… · symfony/symfony@b783e40 · GitHub
[go: up one dir, main page]
Skip to content

Commit b783e40

Browse files
TobionTobion
committed
minor #15831 [travis] Remove PHP 7 from allowed failures (nicolas-grekas)
This PR was merged into the 2.3 branch. Discussion ---------- [travis] Remove PHP 7 from allowed failures | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Looking at the latests PRs, PHP 7 does not segfault anymore with our test suite. Commits ------- ba8366e [travis] Remove PHP 7 from allowed failures
2 parents 4e7644c + ba8366e commit b783e40

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

‎.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ matrix:
1616
- php: 5.6
1717
env: deps=high
1818
- php: 7
19-
- php: 5.6
2019
env: deps=low
21-
allow_failures:
22-
- php: 7
2320
fast_finish: true
2421

2522
services: mongodb

‎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.3",
20-
"doctrine/common": "~2.3",
20+
"doctrine/common": "~2.4",
2121
"twig/twig": "~1.20|~2.0",
2222
"psr/log": "~1.0"
2323
},
@@ -63,8 +63,8 @@
6363
"require-dev": {
6464
"symfony/phpunit-bridge": "~2.7",
6565
"doctrine/data-fixtures": "1.0.*",
66-
"doctrine/dbal": "~2.2",
67-
"doctrine/orm": "~2.2,>=2.2.3",
66+
"doctrine/dbal": "~2.4",
67+
"doctrine/orm": "~2.4,>=2.4.5",
6868
"monolog/monolog": "~1.3",
6969
"propel/propel1": "~1.6",
7070
"ircmaxell/password-compat": "~1.0",

‎src/Symfony/Bridge/Doctrine/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.3",
20-
"doctrine/common": "~2.3"
20+
"doctrine/common": "~2.4"
2121
},
2222
"require-dev": {
2323
"symfony/phpunit-bridge": "~2.7",
@@ -30,8 +30,8 @@
3030
"symfony/validator": "~2.3.0,>=2.3.20",
3131
"symfony/translation": "~2.0,>=2.0.5",
3232
"doctrine/data-fixtures": "1.0.*",
33-
"doctrine/dbal": "~2.2",
34-
"doctrine/orm": "~2.2,>=2.2.3"
33+
"doctrine/dbal": "~2.4",
34+
"doctrine/orm": "~2.4,>=2.4.5"
3535
},
3636
"suggest": {
3737
"symfony/form": "",

0 commit comments

Comments
 (0)
0