Merge branch '5.0'

* 5.0:
  [travis] fix patching return types of symfony/contracts
  [FrameworkBundle] fix fix fix deps=low
  [FrameworkBundle] fix fix deps=low
  [FrameworkBundle] fix deps=low
This commit is contained in:
Nicolas Grekas 2020-02-07 10:38:36 +01:00
commit c37acb9952

View File

@ -336,7 +336,7 @@ install:
else else
if [[ $PHP = 7.4* ]]; then if [[ $PHP = 7.4* ]]; then
# add return types before running the test suite # add return types before running the test suite
rm vendor/symfony/contracts -Rf rm src/Symfony/Contract -Rf && mv vendor/symfony/contracts src/Symfony/Contract
ln -sd $(realpath src/Symfony/Contracts) vendor/symfony/contracts ln -sd $(realpath src/Symfony/Contracts) vendor/symfony/contracts
sed -i 's/"\*\*\/Tests\/"//' composer.json sed -i 's/"\*\*\/Tests\/"//' composer.json
composer install --optimize-autoloader composer install --optimize-autoloader