minor #21779 [Form][Serializer] Add missing conflicts for DI (chalasr)

fabpot · fabpot · commit 29b5a6e15706 · 2017-02-27T12:39:19.000-08:00
This PR was merged into the 3.3-dev branch. Discussion ---------- [Form][Serializer] Add missing conflicts for DI | Q | A | ------------- | --- | Branch? | master | Tests pass? | yes | Fixed tickets | #21375 (comment) | License | MIT They make use of `PriorityTaggedServiceTrait` which is available since 3.2 only Commits ------- ddae4ef [Form][Serializer] Add missing conflicts for DI
diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json
@@ -36,6 +36,7 @@
     },
     "conflict": {
         "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
+        "symfony/dependency-injection": "<3.2",
         "symfony/doctrine-bridge": "<2.7",
         "symfony/framework-bundle": "<2.7",
         "symfony/twig-bridge": "<2.7"
diff --git a/src/Symfony/Component/Serializer/composer.json b/src/Symfony/Component/Serializer/composer.json
@@ -31,6 +31,7 @@
         "phpdocumentor/reflection-docblock": "~3.0"
     },
     "conflict": {
+        "symfony/dependency-injection": "<3.2",
         "symfony/property-access": ">=3.0,<3.0.4|>=2.8,<2.8.4",
         "symfony/property-info": "<3.1",
         "symfony/yaml": "<3.1"
