fixed bad merge

fabpot · fabpot · commit 8dc00bbe8d90 · 2017-06-14T14:54:47.000-07:00
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
@@ -641,6 +641,7 @@ public function setFoo($foo)
     }
 
     /**
+     * @requires PHP 7.0
      * @expectedException \TypeError
      */
     public function testThrowTypeErrorInsideSetterCall()

Original file line number	Diff line number	Diff line change
`@@ -641,6 +641,7 @@ public function setFoo($foo)`
`641`	`641`	`}`
`642`	`642`
`643`	`643`	`/**`
	`644`	`+ * @requires PHP 7.0`
`644`	`645`	`* @expectedException \TypeError`
`645`	`646`	`*/`
`646`	`647`	`public function testThrowTypeErrorInsideSetterCall()`