Fix merge

nicolas-grekas · nicolas-grekas · commit 59d04447b867 · 2016-12-08T16:16:50.000+01:00
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
@@ -148,7 +148,7 @@ public function testSetValueCallsAdderAndRemoverForNestedCollections()
 
     /**
      * @expectedException \Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException
-     * @expectedExceptionMessage Neither the property "axes" nor one of the methods "addAx()"/"removeAx()", "addAxe()"/"removeAxe()", "addAxis()"/"removeAxis()", "setAxes()", "axes()", "__set()" or "__call()" exist and have public access in class "Mock_PropertyAccessorCollectionTest_CarNoAdderAndRemover
+     * @expectedExceptionMessage Could not determine access type for property "axes".
      */
     public function testSetValueFailsIfNoAdderNorRemoverFound()
     {

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ public function testSetValueCallsAdderAndRemoverForNestedCollections()`
`148`	`148`
`149`	`149`	`/**`
`150`	`150`	`* @expectedException \Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException`
`151`		`- * @expectedExceptionMessage Neither the property "axes" nor one of the methods "addAx()"/"removeAx()", "addAxe()"/"removeAxe()", "addAxis()"/"removeAxis()", "setAxes()", "axes()", "__set()" or "__call()" exist and have public access in class "Mock_PropertyAccessorCollectionTest_CarNoAdderAndRemover`
	`151`	`+ * @expectedExceptionMessage Could not determine access type for property "axes".`
`152`	`152`	`*/`
`153`	`153`	`public function testSetValueFailsIfNoAdderNorRemoverFound()`
`154`	`154`	`{`