Merge 8c48396 into 8523a35

sonata-project · Jun 8, 2016 · 47af62d · 47af62d
2 parents 8523a35 + 8c48396
commit 47af62d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -14,6 +14,7 @@ php:
   - '5.4'
   - '5.5'
   - '5.6'
+  - '7.0'  
   - nightly
   - hhvm
 

diff --git a/.travis/before_install_test.sh b/.travis/before_install_test.sh
@@ -7,6 +7,8 @@ if [ "${TRAVIS_PHP_VERSION}" != "hhvm" ]; then
 
     if [ ${TRAVIS_PHP_VERSION} '<' '7.0' ]; then
         echo "extension=mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+    else
+        echo "extension=mongodb.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
     fi
 fi
 

diff --git a/composer.json b/composer.json
@@ -17,7 +17,8 @@
         }
     ],
     "require": {
-        "php": "^5.3",
+        "php": "^5.3 || ^7.0",
+        "alcaeus/mongo-php-adapter": "^1.0.0",
         "doctrine/mongodb-odm": "^1.0",
         "doctrine/mongodb-odm-bundle": "^3.0",
         "sonata-project/admin-bundle": "^3.1"
@@ -27,6 +28,7 @@
         "symfony/phpunit-bridge": "^2.7 || ^3.0"
     },
     "provide": {
+        "ext-mongo": "*",
         "sonata-project/admin-bundle-persistency-layer": "1.0.0"
     },
     "autoload": {