Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit cab859c4aed8 · 2019-11-17T15:08:02.000+01:00
* 4.3:
  Add conflict rule for Monolog 2.
diff --git a/composer.json b/composer.json
@@ -127,6 +127,7 @@
     },
     "conflict": {
         "masterminds/html5": "<2.6",
+        "monolog/monolog": ">=2",
         "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2",
         "phpdocumentor/type-resolver": "<0.3.0",
         "ocramius/proxy-manager": "<2.1",
