Skip to content

Commit 17235ed

Browse files
committed
compatibility with version 2.0 models
1 parent 26f3b03 commit 17235ed

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ before_install:
3131

3232
install:
3333
- if [ "$PACKAGES" != "" ]; then composer require --no-update $PACKAGES; fi
34-
- composer update --prefer-stable $COMPOSER_OPTIONS
34+
- composer update $COMPOSER_OPTIONS
3535

3636
script:
3737
- vendor/bin/phpspec run

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
CHANGELOG
22
=========
33

4+
0.6.0
5+
-----
6+
7+
* allow `2.x` releases of the `php-xapi/model` package too
8+
49
0.5.0
510
-----
611

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"php-http/message": "^1.0",
2020
"php-http/message-factory": "^1.0",
2121
"php-xapi/exception": "^0.1.0",
22-
"php-xapi/model": "^1.0",
22+
"php-xapi/model": "^1.0 || ^2.0",
2323
"php-xapi/serializer": "^2.0",
2424
"php-xapi/serializer-implementation": "^2.0",
2525
"php-xapi/symfony-serializer": "^2.0",
@@ -51,7 +51,7 @@
5151
},
5252
"extra": {
5353
"branch-alias": {
54-
"dev-master": "0.5.x-dev"
54+
"dev-master": "0.6.x-dev"
5555
}
5656
}
5757
}

0 commit comments

Comments
 (0)