Merge branch '3.1' into 3.2

nicolas-grekas · nicolas-grekas · commit 6bcc2c3820c9 · 2017-01-24T13:58:58.000+01:00
* 3.1:
  [Serializer] Add missing conflict for property-info&lt;3.1
diff --git a/src/Symfony/Component/Serializer/composer.json b/src/Symfony/Component/Serializer/composer.json
@@ -31,6 +31,7 @@
     },
     "conflict": {
         "symfony/property-access": ">=3.0,<3.0.4|>=2.8,<2.8.4",
+        "symfony/property-info": "<3.1",
         "symfony/yaml": "<3.1"
     },
     "suggest": {
diff --git a/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php b/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
@@ -289,7 +289,7 @@ public function testThrowingCaster()
       %sTemplate.php:%d: {
         : try {
         :     \$this->display(\$context);
-        : } catch (Exception \$e) {
+        : } catch (%s \$e) {
       }
       %sCliDumperTest.php:{$line}: {
         :         }

Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ public function testThrowingCaster()`
`289`	`289`	`%sTemplate.php:%d: {`
`290`	`290`	`: try {`
`291`	`291`	`: \$this->display(\$context);`
`292`		`- : } catch (Exception \$e) {`
	`292`	`+ : } catch (%s \$e) {`
`293`	`293`	`}`
`294`	`294`	`%sCliDumperTest.php:{$line}: {`
`295`	`295`	`: }`