Merge branch '5.0' into 5.1

* 5.0:
  fix merge

Author: nicolas-grekas

composer.json

@@ -31,6 +31,7 @@
         "doctrine/collections": "~1.0",
         "symfony/validator": "^4.4|^5.0",
         "symfony/dependency-injection": "^4.4|^5.0",
+        "symfony/expression-language": "^4.4|^5.0",
         "symfony/config": "^4.4|^5.0",
         "symfony/console": "^4.4|^5.0",
         "symfony/http-foundation": "^4.4|^5.0",