From 8dc00bbe8d901d80c2916295607a82b0e0233ed9 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 14 Jun 2017 14:54:47 -0700 Subject: [PATCH] fixed bad merge --- .../Component/PropertyAccess/Tests/PropertyAccessorTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php index 61100c0d6894..275c76e0f3b5 100644 --- 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()