Skip to content
This repository has been archived by the owner on Jun 23, 2021. It is now read-only.

Commit

Permalink
Merge 0f32ff8 into 074f7a2
Browse files Browse the repository at this point in the history
  • Loading branch information
Luc Wollants committed Feb 16, 2017
2 parents 074f7a2 + 0f32ff8 commit 3bba209
Show file tree
Hide file tree
Showing 3 changed files with 164 additions and 74 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
language: php
php:
- 5.6
- 7.0
- 7.1
install:
- composer install
script:
Expand Down
11 changes: 5 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"authors": [],
"require": {
"silex/silex": "~1.3",
"cultuurnet/udb3": "~0.1",
"cultuurnet/udb3": "dev-feature/III-555 as 0.1",
"cultuurnet/broadway-tools": "~0.1",
"deralex/yaml-config-service-provider": "~1.0",
"knplabs/console-service-provider": "~1.0",
Expand All @@ -15,10 +15,10 @@
"doctrine/mongodb": "~1.3",
"doctrine/migrations": "~1.0",
"broadway/broadway": "~0.10.0",
"cultuurnet/silex-amqp": "~1.0",
"cultuurnet/silex-service-provider-jwt": "~1.0",
"cultuurnet/symfony-security-jwt": "~1.0",
"cultuurnet/udb3-http-foundation": "~0.1",
"cultuurnet/silex-amqp": "dev-feature/III-555 as 1.0",
"cultuurnet/silex-service-provider-jwt": "dev-feature/III-555 as 1.0",
"cultuurnet/symfony-security-jwt": "dev-feature/III-555 as 1.0",
"cultuurnet/udb3-http-foundation": "dev-feature/III-555 as 0.1",
"cultuurnet/monolog-socketio": "~0.1"
},
"require-dev": {
Expand Down Expand Up @@ -50,7 +50,6 @@
},
"config": {
"platform": {
"php": "5.6.27",
"ext-redis": "2.2.7.0",
"ext-mongo": "1.6.14"
}
Expand Down
Loading

0 comments on commit 3bba209

Please sign in to comment.