Replace calls to setExpectedException by Pollyfill

jderusse · jderusse · commit ee43e5825150 · 2019-08-01T22:42:50.000+02:00
diff --git a/Tests/ConstraintTest.php b/Tests/ConstraintTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Validator\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Tests\Fixtures\ClassConstraint;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
@@ -22,6 +23,8 @@
 
 class ConstraintTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     public function testSetProperties()
     {
         $constraint = new ConstraintA([
@@ -35,7 +38,7 @@ public function testSetProperties()
 
     public function testSetNotExistingPropertyThrowsException()
     {
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\InvalidOptionsException');
+        $this->expectException('Symfony\Component\Validator\Exception\InvalidOptionsException');
 
         new ConstraintA([
             'foo' => 'bar',
@@ -46,14 +49,14 @@ public function testMagicPropertiesAreNotAllowed()
     {
         $constraint = new ConstraintA();
 
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\InvalidOptionsException');
+        $this->expectException('Symfony\Component\Validator\Exception\InvalidOptionsException');
 
         $constraint->foo = 'bar';
     }
 
     public function testInvalidAndRequiredOptionsPassed()
     {
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\InvalidOptionsException');
+        $this->expectException('Symfony\Component\Validator\Exception\InvalidOptionsException');
 
         new ConstraintC([
             'option1' => 'default',
@@ -101,14 +104,14 @@ public function testDontSetDefaultPropertyIfValuePropertyExists()
 
     public function testSetUndefinedDefaultProperty()
     {
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
+        $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
 
         new ConstraintB('foo');
     }
 
     public function testRequiredOptionsMustBeDefined()
     {
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\MissingOptionsException');
+        $this->expectException('Symfony\Component\Validator\Exception\MissingOptionsException');
 
         new ConstraintC();
     }
diff --git a/Tests/Constraints/AbstractComparisonValidatorTestCase.php b/Tests/Constraints/AbstractComparisonValidatorTestCase.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Validator\Tests\Constraints;
 
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
@@ -41,6 +42,8 @@ public function getValue()
  */
 abstract class AbstractComparisonValidatorTestCase extends ConstraintValidatorTestCase
 {
+    use ForwardCompatTestTrait;
+
     protected static function addPhp5Dot5Comparisons(array $comparisons)
     {
         $result = $comparisons;
@@ -163,12 +166,8 @@ public function testInvalidValuePath()
     {
         $constraint = $this->createConstraint(['propertyPath' => 'foo']);
 
-        if (method_exists($this, 'expectException')) {
-            $this->expectException(ConstraintDefinitionException::class);
-            $this->expectExceptionMessage(sprintf('Invalid property path "foo" provided to "%s" constraint', \get_class($constraint)));
-        } else {
-            $this->setExpectedException(ConstraintDefinitionException::class, sprintf('Invalid property path "foo" provided to "%s" constraint', \get_class($constraint)));
-        }
+        $this->expectException(ConstraintDefinitionException::class);
+        $this->expectExceptionMessage(sprintf('Invalid property path "foo" provided to "%s" constraint', \get_class($constraint)));
 
         $object = new ComparisonTest_Class(5);
 
diff --git a/Tests/Mapping/ClassMetadataTest.php b/Tests/Mapping/ClassMetadataTest.php
@@ -43,14 +43,14 @@ private function doTearDown()
 
     public function testAddConstraintDoesNotAcceptValid()
     {
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
+        $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
 
         $this->metadata->addConstraint(new Valid());
     }
 
     public function testAddConstraintRequiresClassConstraints()
     {
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
+        $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
 
         $this->metadata->addConstraint(new PropertyConstraint());
     }
diff --git a/Tests/Mapping/GetterMetadataTest.php b/Tests/Mapping/GetterMetadataTest.php
@@ -12,16 +12,19 @@
 namespace Symfony\Component\Validator\Tests\Mapping;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Validator\Mapping\GetterMetadata;
 use Symfony\Component\Validator\Tests\Fixtures\Entity;
 
 class GetterMetadataTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     const CLASSNAME = 'Symfony\Component\Validator\Tests\Fixtures\Entity';
 
     public function testInvalidPropertyName()
     {
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ValidatorException');
+        $this->expectException('Symfony\Component\Validator\Exception\ValidatorException');
 
         new GetterMetadata(self::CLASSNAME, 'foobar');
     }
diff --git a/Tests/Mapping/Loader/XmlFileLoaderTest.php b/Tests/Mapping/Loader/XmlFileLoaderTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Validator\Tests\Mapping\Loader;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Validator\Constraints\All;
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Constraints\Choice;
@@ -29,6 +30,8 @@
 
 class XmlFileLoaderTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     public function testLoadClassMetadataReturnsTrueIfSuccessful()
     {
         $loader = new XmlFileLoader(__DIR__.'/constraint-mapping.xml');
@@ -114,7 +117,7 @@ public function testThrowExceptionIfDocTypeIsSet()
         $loader = new XmlFileLoader(__DIR__.'/withdoctype.xml');
         $metadata = new ClassMetadata('Symfony\Component\Validator\Tests\Fixtures\Entity');
 
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('\Symfony\Component\Validator\Exception\MappingException');
+        $this->expectException('\Symfony\Component\Validator\Exception\MappingException');
         $loader->loadClassMetadata($metadata);
     }
 
@@ -129,7 +132,7 @@ public function testDoNotModifyStateIfExceptionIsThrown()
         try {
             $loader->loadClassMetadata($metadata);
         } catch (MappingException $e) {
-            $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('\Symfony\Component\Validator\Exception\MappingException');
+            $this->expectException('\Symfony\Component\Validator\Exception\MappingException');
             $loader->loadClassMetadata($metadata);
         }
     }
diff --git a/Tests/Mapping/Loader/YamlFileLoaderTest.php b/Tests/Mapping/Loader/YamlFileLoaderTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Validator\Tests\Mapping\Loader;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Validator\Constraints\All;
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Constraints\Choice;
@@ -26,6 +27,8 @@
 
 class YamlFileLoaderTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     public function testLoadClassMetadataReturnsFalseIfEmpty()
     {
         $loader = new YamlFileLoader(__DIR__.'/empty-mapping.yml');
@@ -69,7 +72,7 @@ public function testDoNotModifyStateIfExceptionIsThrown()
             $loader->loadClassMetadata($metadata);
         } catch (\InvalidArgumentException $e) {
             // Call again. Again an exception should be thrown
-            $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('\InvalidArgumentException');
+            $this->expectException('\InvalidArgumentException');
             $loader->loadClassMetadata($metadata);
         }
     }
diff --git a/Tests/Mapping/MemberMetadataTest.php b/Tests/Mapping/MemberMetadataTest.php
@@ -41,7 +41,7 @@ private function doTearDown()
 
     public function testAddConstraintRequiresClassConstraints()
     {
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
+        $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
 
         $this->metadata->addConstraint(new ClassConstraint());
     }
diff --git a/Tests/Mapping/PropertyMetadataTest.php b/Tests/Mapping/PropertyMetadataTest.php
@@ -12,17 +12,20 @@
 namespace Symfony\Component\Validator\Tests\Mapping;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Validator\Mapping\PropertyMetadata;
 use Symfony\Component\Validator\Tests\Fixtures\Entity;
 
 class PropertyMetadataTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     const CLASSNAME = 'Symfony\Component\Validator\Tests\Fixtures\Entity';
     const PARENTCLASS = 'Symfony\Component\Validator\Tests\Fixtures\EntityParent';
 
     public function testInvalidPropertyName()
     {
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ValidatorException');
+        $this->expectException('Symfony\Component\Validator\Exception\ValidatorException');
 
         new PropertyMetadata(self::CLASSNAME, 'foobar');
     }
@@ -50,7 +53,7 @@ public function testGetPropertyValueFromRemovedProperty()
         $metadata = new PropertyMetadata(self::CLASSNAME, 'internal');
         $metadata->name = 'test';
 
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ValidatorException');
+        $this->expectException('Symfony\Component\Validator\Exception\ValidatorException');
         $metadata->getPropertyValue($entity);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`namespace Symfony\Component\Validator\Tests;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
	`15`	`+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`15`	`16`	`use Symfony\Component\Validator\Constraint;`
`16`	`17`	`use Symfony\Component\Validator\Tests\Fixtures\ClassConstraint;`
`17`	`18`	`use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;`
`@@ -22,6 +23,8 @@`
`22`	`23`
`23`	`24`	`class ConstraintTest extends TestCase`
`24`	`25`	`{`
	`26`	`+ use ForwardCompatTestTrait;`
	`27`	`+`
`25`	`28`	`public function testSetProperties()`
`26`	`29`	`{`
`27`	`30`	`$constraint = new ConstraintA([`
`@@ -35,7 +38,7 @@ public function testSetProperties()`
`35`	`38`
`36`	`39`	`public function testSetNotExistingPropertyThrowsException()`
`37`	`40`	`{`
`38`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\InvalidOptionsException');`
	`41`	`+ $this->expectException('Symfony\Component\Validator\Exception\InvalidOptionsException');`
`39`	`42`
`40`	`43`	`new ConstraintA([`
`41`	`44`	`'foo' => 'bar',`
`@@ -46,14 +49,14 @@ public function testMagicPropertiesAreNotAllowed()`
`46`	`49`	`{`
`47`	`50`	`$constraint = new ConstraintA();`
`48`	`51`
`49`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\InvalidOptionsException');`
	`52`	`+ $this->expectException('Symfony\Component\Validator\Exception\InvalidOptionsException');`
`50`	`53`
`51`	`54`	`$constraint->foo = 'bar';`
`52`	`55`	`}`
`53`	`56`
`54`	`57`	`public function testInvalidAndRequiredOptionsPassed()`
`55`	`58`	`{`
`56`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\InvalidOptionsException');`
	`59`	`+ $this->expectException('Symfony\Component\Validator\Exception\InvalidOptionsException');`
`57`	`60`
`58`	`61`	`new ConstraintC([`
`59`	`62`	`'option1' => 'default',`
`@@ -101,14 +104,14 @@ public function testDontSetDefaultPropertyIfValuePropertyExists()`
`101`	`104`
`102`	`105`	`public function testSetUndefinedDefaultProperty()`
`103`	`106`	`{`
`104`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ConstraintDefinitionException');`
	`107`	`+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');`
`105`	`108`
`106`	`109`	`new ConstraintB('foo');`
`107`	`110`	`}`
`108`	`111`
`109`	`112`	`public function testRequiredOptionsMustBeDefined()`
`110`	`113`	`{`
`111`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\MissingOptionsException');`
	`114`	`+ $this->expectException('Symfony\Component\Validator\Exception\MissingOptionsException');`
`112`	`115`
`113`	`116`	`new ConstraintC();`
`114`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,14 +43,14 @@ private function doTearDown()`
`43`	`43`
`44`	`44`	`public function testAddConstraintDoesNotAcceptValid()`
`45`	`45`	`{`
`46`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ConstraintDefinitionException');`
	`46`	`+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');`
`47`	`47`
`48`	`48`	`$this->metadata->addConstraint(new Valid());`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public function testAddConstraintRequiresClassConstraints()`
`52`	`52`	`{`
`53`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ConstraintDefinitionException');`
	`53`	`+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');`
`54`	`54`
`55`	`55`	`$this->metadata->addConstraint(new PropertyConstraint());`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,16 +12,19 @@`
`12`	`12`	`namespace Symfony\Component\Validator\Tests\Mapping;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
	`15`	`+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`15`	`16`	`use Symfony\Component\Validator\Mapping\GetterMetadata;`
`16`	`17`	`use Symfony\Component\Validator\Tests\Fixtures\Entity;`
`17`	`18`
`18`	`19`	`class GetterMetadataTest extends TestCase`
`19`	`20`	`{`
	`21`	`+ use ForwardCompatTestTrait;`
	`22`	`+`
`20`	`23`	`const CLASSNAME = 'Symfony\Component\Validator\Tests\Fixtures\Entity';`
`21`	`24`
`22`	`25`	`public function testInvalidPropertyName()`
`23`	`26`	`{`
`24`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ValidatorException');`
	`27`	`+ $this->expectException('Symfony\Component\Validator\Exception\ValidatorException');`
`25`	`28`
`26`	`29`	`new GetterMetadata(self::CLASSNAME, 'foobar');`
`27`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ private function doTearDown()`
`41`	`41`
`42`	`42`	`public function testAddConstraintRequiresClassConstraints()`
`43`	`43`	`{`
`44`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ConstraintDefinitionException');`
	`44`	`+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');`
`45`	`45`
`46`	`46`	`$this->metadata->addConstraint(new ClassConstraint());`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,17 +12,20 @@`
`12`	`12`	`namespace Symfony\Component\Validator\Tests\Mapping;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
	`15`	`+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`15`	`16`	`use Symfony\Component\Validator\Mapping\PropertyMetadata;`
`16`	`17`	`use Symfony\Component\Validator\Tests\Fixtures\Entity;`
`17`	`18`
`18`	`19`	`class PropertyMetadataTest extends TestCase`
`19`	`20`	`{`
	`21`	`+ use ForwardCompatTestTrait;`
	`22`	`+`
`20`	`23`	`const CLASSNAME = 'Symfony\Component\Validator\Tests\Fixtures\Entity';`
`21`	`24`	`const PARENTCLASS = 'Symfony\Component\Validator\Tests\Fixtures\EntityParent';`
`22`	`25`
`23`	`26`	`public function testInvalidPropertyName()`
`24`	`27`	`{`
`25`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ValidatorException');`
	`28`	`+ $this->expectException('Symfony\Component\Validator\Exception\ValidatorException');`
`26`	`29`
`27`	`30`	`new PropertyMetadata(self::CLASSNAME, 'foobar');`
`28`	`31`	`}`
`@@ -50,7 +53,7 @@ public function testGetPropertyValueFromRemovedProperty()`
`50`	`53`	`$metadata = new PropertyMetadata(self::CLASSNAME, 'internal');`
`51`	`54`	`$metadata->name = 'test';`
`52`	`55`
`53`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ValidatorException');`
	`56`	`+ $this->expectException('Symfony\Component\Validator\Exception\ValidatorException');`
`54`	`57`	`$metadata->getPropertyValue($entity);`
`55`	`58`	`}`
`56`	`59`	`}`