Merge branch '4.4' into 5.0

* 4.4: [travis] display deprecations in nightly jobs
symfony · May 24, 2020 · 466b70d · 466b70d
2 parents 49eb5c9 + 6e7658b
commit 466b70d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -31,8 +31,6 @@ matrix:
         - php: nightly
           services: [memcached]
     fast_finish: true
-    allow_failures:
-      - php: nightly
 
 cache:
     directories:
@@ -254,7 +252,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
 
     - |

diff --git 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": {