Merge branch 'master' of https://github.com/yiisoft/yii2

tests/unit/data/travis/cubrid-setup.sh

@@ -71,7 +71,7 @@ install_pdo_cubrid() {
     return $?
 }
 
-install_pdo_cubrid > ~/pdo_cubrid.log || ( echo "=== PDO CUBRID BUILD FAILED ==="; cat ~/pdo_cubrid.log ) && exit 1
+install_pdo_cubrid > ~/pdo_cubrid.log || ( echo "=== PDO CUBRID BUILD FAILED ==="; cat ~/pdo_cubrid.log; exit 1 )
 
 echo ""
 echo "Installed CUBRID PDO $CUBRID_PDO_VERSION"

tests/unit/data/travis/mongodb-setup.sh

@@ -4,7 +4,11 @@
 
 mongod --version
 
-echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+if (php --version | grep -i HipHop > /dev/null); then
+  echo "mongodb does not work on HHVM currently, skipping"
+else
+  echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+fi
 
 # enable text search
 mongo --eval 'db.adminCommand( { setParameter: true, textSearchEnabled : true})'