8000 Merge branch '2.8' into 3.4 · JulienMaille/symfony@85df96a · GitHub
[go: up one dir, main page]
Skip to content

Commit 85df96a

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.8' into 3.4
* 2.8: Add framework asset changes to upgrade 3.0 guide [Travis] Bump ext-mongodb to 1.5.2 on Travis bumped Symfony version to 2.8.48 updated VERSION for 2.8.47 update CONTRIBUTORS for 2.8.47 updated CHANGELOG for 2.8.47
2 parents 69ae468 + 613ace6 commit 85df96a

File tree

3 files changed

+96
-39
lines changed

3 files changed

+96
-39
lines changed

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ before_install:
182182
fi
183183
184184
tfold ext.apcu tpecl apcu-5.1.6 apcu.so $INI
185-
tfold ext.mongodb tpecl mongodb-1.5.0 mongodb.so $INI
185+
tfold ext.mongodb tpecl mongodb-1.5.2 mongodb.so $INI
186186
fi
187187
done
188188
@@ -248,7 +248,7 @@ install:
248248
fi
249249
phpenv global ${PHP/hhvm*/hhvm}
250250
if [[ $PHP = 7.* ]]; then
251-
([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; composer config platform.ext-mongodb 1.5.0; composer require --dev --no-update mongodb/mongodb)
251+
([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; composer config platform.ext-mongodb 1.5.2; composer require --dev --no-update mongodb/mongodb)
252252
fi
253253
tfold 'composer update' $COMPOSER_UP
254254
if [[ $TRAVIS_PHP_VERSION = 5.* || $TRAVIS_PHP_VERSION = hhvm* ]]; then

0 commit comments

Comments
 (0)
0