Skip to content

Commit 0a53396

Browse files
committed
Merge pull request #19 from chrisryan/php7
Updates to use a new MongoDB lib that supports php7.
2 parents 594fa94 + 6ced761 commit 0a53396

5 files changed

Lines changed: 810 additions & 347 deletions

File tree

.travis.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
language: php
22
php:
3+
- 7.0
34
- 5.6
4-
- 5.4
55
env:
6-
- EXT_VERSION=1.3.7 DB_PACKAGE=mongodb-10gen
7-
- EXT_VERSION=1.3.7 DB_PACKAGE=mongodb-org
8-
- EXT_VERSION=1.5.4 DB_PACKAGE=mongodb-10gen
9-
- EXT_VERSION=1.5.4 DB_PACKAGE=mongodb-org
6+
- EXT_VERSION=1.1 DB_PACKAGE=mongodb-10gen
7+
- EXT_VERSION=1.1 DB_PACKAGE=mongodb-org
108
services:
119
- redis-server
1210
before_install:
@@ -16,7 +14,7 @@ before_install:
1614
- "sudo apt-get install ${DB_PACKAGE}"
1715
before_script:
1816
- composer self-update || true
19-
- yes '' | pecl install -f mongo-${EXT_VERSION}
17+
- yes '' | pecl install -f mongodb-${EXT_VERSION}
2018
# wait for mongo, start is only needed for 2.4 package, see http://tldp.org/LDP/abs/html/devref1.html for description of this syntax.
2119
- sudo service mongodb start; bash -c 'while ! exec 6<>/dev/tcp/localhost/27017; do echo "$(date) - still trying to connect to mongo"; sleep 1; done'
2220
script: ./build.php

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,22 @@
2121
],
2222
"license": "MIT",
2323
"require": {
24-
"php": "~5.4",
24+
"php": "~5.6||~7.0",
2525
"dominionenterprises/util": "~1.4",
2626
"guzzle/http": "~3.7",
2727
"ext-curl": "*",
2828
"lib-curl": "~7.15"
2929
},
3030
"require-dev": {
31-
"phpunit/phpunit": "~4.0",
31+
"phpunit/phpunit": "~5.0",
3232
"satooshi/php-coveralls": "~0.6.1",
3333
"squizlabs/php_codesniffer": "~1.5",
3434
"dominionenterprises/dws-coding-standard": "~1.1",
35-
"ext-mongo": ">=1.3.5,<2.0",
35+
"mongodb/mongodb": "^1.0.0",
3636
"predis/predis": "~1.0"
3737
},
3838
"suggests": {
39-
"ext-mongo": ">=1.3.5,<2.0",
39+
"mongodb/mongodb": "^1.0.0",
4040
"predis/predis": "~1.0"
4141
},
4242
"autoload": {

0 commit comments

Comments
 (0)