Merge branch '5.0' into 5.1

* 5.0: [travis] display deprecations in nightly jobs
2020-05-24 10:58:05 +02:00 · 2020-05-24 10:58:05 +02:00 · 6868f6cd1a
parent 2ed4e0efce 466b70d655
commit 6868f6cd1a
2 changed files with 1 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -254,7 +254,7 @@ install:
      # Set composer's platform to php 7.4 if we're on php 8.
      if [[ $PHP = nightly ]]; then
          composer config platform.php 7.4.99
-          export SYMFONY_DEPRECATIONS_HELPER=weak
+          export SYMFONY_DEPRECATIONS_HELPER=max[total]=999
      fi

    - |
--- a/src/Symfony/Component/Notifier/composer.json
+++ b/src/Symfony/Component/Notifier/composer.json
@ -17,7 +17,6 @@
    ],
    "require": {
        "php": ">=7.2.5",
-        "psr/log": "^1.0",
        "symfony/polyfill-php80": "^1.15"
    },
    "conflict": {