瀏覽代碼

DevKit updates (#3883)

Sonata CI 9 年之前
父節點
當前提交
36faf7c6d0
共有 4 個文件被更改,包括 9 次插入3 次删除
  1. 4 0
      .travis/before_install_test.sh
  2. 1 1
      .travis/install_test.sh
  3. 1 1
      CONTRIBUTING.md
  4. 3 1
      README.md

+ 4 - 0
.travis/before_install_test.sh

@@ -4,6 +4,10 @@ set -ev
 if [ "${TRAVIS_PHP_VERSION}" != "hhvm" ]; then
     mv "$HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini" /tmp
     echo "memory_limit=3072M" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+
+    if [ ${TRAVIS_PHP_VERSION} '<' '7.0' ]; then
+        echo "extension=mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+    fi
 fi
 
 # To be removed when following PR will be merged: https://github.com/travis-ci/travis-build/pull/718

+ 1 - 1
.travis/install_test.sh

@@ -13,7 +13,7 @@ wget "https://phar.phpunit.de/${PHPUNIT_PHAR}" --output-document="${HOME}/bin/ph
 chmod u+x "${HOME}/bin/phpunit"
 
 # To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355
-if [ ${COMPOSER_FLAGS} = '--prefer-lowest' ]; then
+if [ "${COMPOSER_FLAGS}" = '--prefer-lowest' ]; then
     composer update --prefer-dist --no-interaction --prefer-stable --quiet
 fi
 composer update --prefer-dist --no-interaction --prefer-stable ${COMPOSER_FLAGS}

+ 1 - 1
CONTRIBUTING.md

@@ -130,7 +130,7 @@ Notes:
     * If your BC PR is accepted, you can do a new one on the `master` branch which remove the deprecated code.
     * SYMFONY DOC REF (same logic)?
 
-If you have a non-BC PR to propose, please first try to create a related BC PR first.
+If you have a non-BC PR to propose, please try to create a related BC PR first.
 This BC PR should mark every piece of code that needs to be removed / uncommented / reworked
 in the corresponding non-BC PR with the following marker comment : `NEXT_MAJOR`.
 When the BC PR is merged in the stable branch, wait for the stable branch to be

+ 3 - 1
README.md

@@ -10,7 +10,9 @@ The missing Symfony Admin Generator
 [![Monthly Downloads](https://poser.pugx.org/sonata-project/admin-bundle/d/monthly)](https://packagist.org/packages/sonata-project/admin-bundle)
 [![Daily Downloads](https://poser.pugx.org/sonata-project/admin-bundle/d/daily)](https://packagist.org/packages/sonata-project/admin-bundle)
 
-[![Build Status](https://travis-ci.org/sonata-project/SonataAdminBundle.svg?branch=3.x)](https://travis-ci.org/sonata-project/SonataAdminBundle)
+3.x status: [![Build Status](https://travis-ci.org/sonata-project/SonataAdminBundle.svg?branch=3.x)](https://travis-ci.org/sonata-project/SonataAdminBundle)
+
+master status: [![Build Status](https://travis-ci.org/sonata-project/SonataAdminBundle.svg?branch=master)](https://travis-ci.org/sonata-project/SonataAdminBundle)
 
 ## Documentation