Skip to content

Commit ce4914b

Browse files
committed
Merge 2.7 to 2.8.x
2 parents 8e0157d + fdad482 commit ce4914b

File tree

3 files changed

+17
-19
lines changed

3 files changed

+17
-19
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ php:
1111
- 7.1
1212
- 7.2
1313
- 7.3
14-
- 7.4snapshot
14+
- 7.4
1515
- nightly
1616

1717
env:
@@ -86,7 +86,7 @@ jobs:
8686
- stage: Test
8787
dist: xenial
8888
env: DB=mysql MYSQL_VERSION=5.7
89-
php: 7.4snapshot
89+
php: 7.4
9090
services:
9191
- mysql
9292
before_script:
@@ -124,7 +124,7 @@ jobs:
124124
- stage: Code Quality
125125
if: NOT type = pull_request
126126
env: DB=none CODING_STANDARDS
127-
php: 7.4snapshot
127+
php: 7.4
128128
install: travis_retry composer install --prefer-dist
129129
script:
130130
- ./vendor/bin/phpcs

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"doctrine/event-manager": "^1.1",
2727
"doctrine/instantiator": "^1.3",
2828
"doctrine/persistence": "^1.2",
29-
"ocramius/package-versions": "^1.0",
29+
"ocramius/package-versions": "^1.2",
3030
"symfony/console": "^3.0|^4.0|^5.0"
3131
},
3232
"require-dev": {

composer.lock

Lines changed: 13 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)