Skip to content

Commit 05a4ae5

Browse files
authored
add php 7.3 to travis (#2403)
* add php 7.3 to travis * Improve .travis.yaml * Bump Doctrine version * Bump dependencies
1 parent e51024c commit 05a4ae5

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

.travis.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,18 @@ jobs:
99
include:
1010
- php: '7.1'
1111
- php: '7.2'
12-
- php: '7.2'
12+
- php: '7.3'
13+
- php: '7.3'
1314
env: deps=low
14-
- php: '7.2'
15+
- php: '7.3'
1516
env: SYMFONY_DEPRECATIONS_HELPER=0
16-
- php: '7.2'
17+
- php: '7.3'
1718
services:
1819
- postgresql
1920
before_script:
2021
- psql -c 'create database api_platform_test;' -U postgres
2122
env: APP_ENV=postgres
22-
- php: '7.2'
23+
- php: '7.3'
2324
services:
2425
- mysql
2526
before_script:

composer.json

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,43 +33,42 @@
3333
"behatch/contexts": "3.1.0",
3434
"doctrine/annotations": "^1.2",
3535
"doctrine/doctrine-bundle": "^1.8",
36-
"doctrine/orm": "^2.5.2",
36+
"doctrine/orm": "^2.6.3",
3737
"friendsofsymfony/user-bundle": "^2.1",
3838
"guzzlehttp/guzzle": "^6.0",
3939
"justinrainbow/json-schema": "^5.0",
4040
"nelmio/api-doc-bundle": "^2.13.3",
4141
"php-mock/php-mock-phpunit": "^2.0",
4242
"phpdocumentor/reflection-docblock": "^3.0 || ^4.0",
43-
"phpdocumentor/type-resolver": "^0.2.1 || ^0.3 || 0.4",
43+
"phpdocumentor/type-resolver": "^0.3 || ^0.4",
4444
"phpunit/phpunit": "^6.1",
4545
"psr/log": "^1.0",
4646
"ramsey/uuid": "^3.7",
4747
"ramsey/uuid-doctrine": "^1.4",
48-
"symfony/asset": "^3.3 || ^4.0",
49-
"symfony/cache": "^3.3 || ^4.0",
48+
"symfony/asset": "^3.4 || ^4.0",
49+
"symfony/cache": "^3.4 || ^4.0",
5050
"symfony/config": "^3.4 || ^4.0",
5151
"symfony/console": "^3.4 || ^4.0",
52-
"symfony/debug": "^2.8 || ^3.0 || ^4.0",
52+
"symfony/debug": "^3.4 || ^4.0",
5353
"symfony/dependency-injection": "^3.4 || ^4.0",
54-
"symfony/doctrine-bridge": "^2.8.12 || ^3.0 || ^4.0",
54+
"symfony/doctrine-bridge": "^3.4 || ^4.0",
5555
"symfony/event-dispatcher": "^3.4 || ^4.0",
56-
"symfony/expression-language": "^2.8 || ^3.0 || ^4.0",
57-
"symfony/finder": "^3.3 || ^4.0",
58-
"symfony/form": "^3.3 || ^4.0",
59-
"symfony/framework-bundle": "^3.3 || ^4.0",
60-
"symfony/phpunit-bridge": "^3.3 || ^4.0",
61-
"symfony/routing": "^3.3 || ^4.0",
62-
"symfony/security": "^3.0 || ^4.0",
56+
"symfony/expression-language": "^3.4 || ^4.0",
57+
"symfony/finder": "^3.4 || ^4.0",
58+
"symfony/form": "^3.4 || ^4.0",
59+
"symfony/framework-bundle": "^3.4 || ^4.0",
60+
"symfony/phpunit-bridge": "^3.4 || ^4.0",
61+
"symfony/routing": "^3.4 || ^4.0",
62+
"symfony/security": "^3.4 || ^4.0",
6363
"symfony/security-bundle": "^3.4 || ^4.0",
6464
"symfony/twig-bundle": "^3.4 || ^4.0",
65-
"symfony/validator": "^3.3 || ^4.0",
66-
"symfony/web-profiler-bundle": "^3.3 || ^4.0",
67-
"symfony/yaml": "^3.3 || ^4.0",
65+
"symfony/validator": "^3.4 || ^4.0",
66+
"symfony/web-profiler-bundle": "^3.4 || ^4.0",
67+
"symfony/yaml": "^3.4 || ^4.0",
6868
"webonyx/graphql-php": ">=0.13 <1.0"
6969
},
7070
"conflict": {
71-
"doctrine/common": "<2.7",
72-
"symfony/dependency-injection": "<3.4"
71+
"doctrine/common": "<2.7"
7372
},
7473
"suggest": {
7574
"friendsofsymfony/user-bundle": "To use the FOSUserBundle bridge.",

0 commit comments

Comments
 (0)