simplified PHPUnit exception expectations

fabpot · fabpot · commit 2d31393eddd5 · 2019-01-16T07:59:14.000+01:00
diff --git a/Tests/Extension/Core/DataTransformer/DateIntervalToArrayTransformerTest.php b/Tests/Extension/Core/DataTransformer/DateIntervalToArrayTransformerTest.php
@@ -176,15 +176,15 @@ public function testReverseTransformRequiresDateTime()
     {
         $transformer = new DateIntervalToArrayTransformer();
         $this->assertNull($transformer->reverseTransform(null));
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(UnexpectedTypeException::class);
+        $this->expectException(UnexpectedTypeException::class);
         $transformer->reverseTransform('12345');
     }
 
     public function testReverseTransformWithUnsetFields()
     {
         $transformer = new DateIntervalToArrayTransformer();
         $input = array('years' => '1');
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(TransformationFailedException::class);
+        $this->expectException(TransformationFailedException::class);
         $transformer->reverseTransform($input);
     }
 
diff --git a/Tests/Extension/Core/DataTransformer/DateIntervalToStringTransformerTest.php b/Tests/Extension/Core/DataTransformer/DateIntervalToStringTransformerTest.php
@@ -75,7 +75,7 @@ public function testTransformEmpty()
     public function testTransformExpectsDateTime()
     {
         $transformer = new DateIntervalToStringTransformer();
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(UnexpectedTypeException::class);
+        $this->expectException(UnexpectedTypeException::class);
         $transformer->transform('1234');
     }
 
@@ -96,7 +96,7 @@ public function testReverseTransformDateString($format, $input, $output)
     {
         $reverseTransformer = new DateIntervalToStringTransformer($format, true);
         $interval = new \DateInterval($output);
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(TransformationFailedException::class);
+        $this->expectException(TransformationFailedException::class);
         $this->assertDateIntervalEquals($interval, $reverseTransformer->reverseTransform($input));
     }
 
@@ -109,14 +109,14 @@ public function testReverseTransformEmpty()
     public function testReverseTransformExpectsString()
     {
         $reverseTransformer = new DateIntervalToStringTransformer();
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(UnexpectedTypeException::class);
+        $this->expectException(UnexpectedTypeException::class);
         $reverseTransformer->reverseTransform(1234);
     }
 
     public function testReverseTransformExpectsValidIntervalString()
     {
         $reverseTransformer = new DateIntervalToStringTransformer();
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(TransformationFailedException::class);
+        $this->expectException(TransformationFailedException::class);
         $reverseTransformer->reverseTransform('10Y');
     }
 }
diff --git a/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php b/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php
@@ -196,7 +196,7 @@ public function testTransformWrapsIntlErrors()
 
         // HOW TO REPRODUCE?
 
-        //$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Extension\Core\DataTransformer\TransformationFailedException');
+        //$this->expectException('Symfony\Component\Form\Extension\Core\DataTransformer\TransformationFailedException');
 
         //$transformer->transform(1.5);
     }
diff --git a/Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php b/Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php
@@ -111,7 +111,7 @@ public function testTransformExpectsDateTime()
     {
         $transformer = new DateTimeToStringTransformer();
 
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');
+        $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
 
         $transformer->transform('1234');
     }
@@ -150,7 +150,7 @@ public function testReverseTransformExpectsString()
     {
         $reverseTransformer = new DateTimeToStringTransformer();
 
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');
+        $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
 
         $reverseTransformer->reverseTransform(1234);
     }
@@ -159,7 +159,7 @@ public function testReverseTransformExpectsValidDateString()
     {
         $reverseTransformer = new DateTimeToStringTransformer();
 
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');
+        $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
 
         $reverseTransformer->reverseTransform('2010-2010-2010');
     }
@@ -168,7 +168,7 @@ public function testReverseTransformWithNonExistingDate()
     {
         $reverseTransformer = new DateTimeToStringTransformer();
 
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');
+        $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
 
         $reverseTransformer->reverseTransform('2010-04-31');
     }
diff --git a/Tests/Extension/Core/DataTransformer/DateTimeToTimestampTransformerTest.php b/Tests/Extension/Core/DataTransformer/DateTimeToTimestampTransformerTest.php
@@ -72,7 +72,7 @@ public function testTransformExpectsDateTime()
     {
         $transformer = new DateTimeToTimestampTransformer();
 
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');
+        $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
 
         $transformer->transform('1234');
     }
@@ -109,7 +109,7 @@ public function testReverseTransformExpectsValidTimestamp()
     {
         $reverseTransformer = new DateTimeToTimestampTransformer();
 
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');
+        $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
 
         $reverseTransformer->reverseTransform('2010-2010-2010');
     }
diff --git a/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php b/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php
@@ -33,7 +33,7 @@ public function testTransformExpectsNumeric()
     {
         $transformer = new MoneyToLocalizedStringTransformer(null, null, null, 100);
 
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');
+        $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
 
         $transformer->transform('abcd');
     }
@@ -61,7 +61,7 @@ public function testReverseTransformExpectsString()
     {
         $transformer = new MoneyToLocalizedStringTransformer(null, null, null, 100);
 
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');
+        $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
 
         $transformer->reverseTransform(12345);
     }
diff --git a/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php b/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php
@@ -106,7 +106,7 @@ public function testTransformExpectsNumeric()
     {
         $transformer = new PercentToLocalizedStringTransformer();
 
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');
+        $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
 
         $transformer->transform('foo');
     }
@@ -115,7 +115,7 @@ public function testReverseTransformExpectsString()
     {
         $transformer = new PercentToLocalizedStringTransformer();
 
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');
+        $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
 
         $transformer->reverseTransform(1);
     }
diff --git a/Tests/Extension/Core/Type/CollectionTypeTest.php b/Tests/Extension/Core/Type/CollectionTypeTest.php
@@ -61,7 +61,7 @@ public function testThrowsExceptionIfObjectIsNotTraversable()
         $form = $this->factory->create(static::TESTED_TYPE, null, array(
             'entry_type' => TextTypeTest::TESTED_TYPE,
         ));
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\UnexpectedTypeException');
+        $this->expectException('Symfony\Component\Form\Exception\UnexpectedTypeException');
         $form->setData(new \stdClass());
     }
 
diff --git a/Tests/FormBuilderTest.php b/Tests/FormBuilderTest.php
@@ -51,13 +51,13 @@ public function testNoSetName()
 
     public function testAddNameNoStringAndNoInteger()
     {
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\UnexpectedTypeException');
+        $this->expectException('Symfony\Component\Form\Exception\UnexpectedTypeException');
         $this->builder->add(true);
     }
 
     public function testAddTypeNoString()
     {
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\UnexpectedTypeException');
+        $this->expectException('Symfony\Component\Form\Exception\UnexpectedTypeException');
         $this->builder->add('foo', 1234);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -176,15 +176,15 @@ public function testReverseTransformRequiresDateTime()`
`176`	`176`	`{`
`177`	`177`	`$transformer = new DateIntervalToArrayTransformer();`
`178`	`178`	`$this->assertNull($transformer->reverseTransform(null));`
`179`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(UnexpectedTypeException::class);`
	`179`	`+ $this->expectException(UnexpectedTypeException::class);`
`180`	`180`	`$transformer->reverseTransform('12345');`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`public function testReverseTransformWithUnsetFields()`
`184`	`184`	`{`
`185`	`185`	`$transformer = new DateIntervalToArrayTransformer();`
`186`	`186`	`$input = array('years' => '1');`
`187`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(TransformationFailedException::class);`
	`187`	`+ $this->expectException(TransformationFailedException::class);`
`188`	`188`	`$transformer->reverseTransform($input);`
`189`	`189`	`}`
`190`	`190`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public function testTransformEmpty()`
`75`	`75`	`public function testTransformExpectsDateTime()`
`76`	`76`	`{`
`77`	`77`	`$transformer = new DateIntervalToStringTransformer();`
`78`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(UnexpectedTypeException::class);`
	`78`	`+ $this->expectException(UnexpectedTypeException::class);`
`79`	`79`	`$transformer->transform('1234');`
`80`	`80`	`}`
`81`	`81`
`@@ -96,7 +96,7 @@ public function testReverseTransformDateString($format, $input, $output)`
`96`	`96`	`{`
`97`	`97`	`$reverseTransformer = new DateIntervalToStringTransformer($format, true);`
`98`	`98`	`$interval = new \DateInterval($output);`
`99`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(TransformationFailedException::class);`
	`99`	`+ $this->expectException(TransformationFailedException::class);`
`100`	`100`	`$this->assertDateIntervalEquals($interval, $reverseTransformer->reverseTransform($input));`
`101`	`101`	`}`
`102`	`102`
`@@ -109,14 +109,14 @@ public function testReverseTransformEmpty()`
`109`	`109`	`public function testReverseTransformExpectsString()`
`110`	`110`	`{`
`111`	`111`	`$reverseTransformer = new DateIntervalToStringTransformer();`
`112`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(UnexpectedTypeException::class);`
	`112`	`+ $this->expectException(UnexpectedTypeException::class);`
`113`	`113`	`$reverseTransformer->reverseTransform(1234);`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`public function testReverseTransformExpectsValidIntervalString()`
`117`	`117`	`{`
`118`	`118`	`$reverseTransformer = new DateIntervalToStringTransformer();`
`119`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(TransformationFailedException::class);`
	`119`	`+ $this->expectException(TransformationFailedException::class);`
`120`	`120`	`$reverseTransformer->reverseTransform('10Y');`
`121`	`121`	`}`
`122`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ public function testTransformWrapsIntlErrors()`
`196`	`196`
`197`	`197`	`// HOW TO REPRODUCE?`
`198`	`198`
`199`		`- //$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Extension\Core\DataTransformer\TransformationFailedException');`
	`199`	`+ //$this->expectException('Symfony\Component\Form\Extension\Core\DataTransformer\TransformationFailedException');`
`200`	`200`
`201`	`201`	`//$transformer->transform(1.5);`
`202`	`202`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public function testTransformExpectsDateTime()`
`111`	`111`	`{`
`112`	`112`	`$transformer = new DateTimeToStringTransformer();`
`113`	`113`
`114`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');`
	`114`	`+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');`
`115`	`115`
`116`	`116`	`$transformer->transform('1234');`
`117`	`117`	`}`
`@@ -150,7 +150,7 @@ public function testReverseTransformExpectsString()`
`150`	`150`	`{`
`151`	`151`	`$reverseTransformer = new DateTimeToStringTransformer();`
`152`	`152`
`153`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');`
	`153`	`+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');`
`154`	`154`
`155`	`155`	`$reverseTransformer->reverseTransform(1234);`
`156`	`156`	`}`
`@@ -159,7 +159,7 @@ public function testReverseTransformExpectsValidDateString()`
`159`	`159`	`{`
`160`	`160`	`$reverseTransformer = new DateTimeToStringTransformer();`
`161`	`161`
`162`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');`
	`162`	`+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');`
`163`	`163`
`164`	`164`	`$reverseTransformer->reverseTransform('2010-2010-2010');`
`165`	`165`	`}`
`@@ -168,7 +168,7 @@ public function testReverseTransformWithNonExistingDate()`
`168`	`168`	`{`
`169`	`169`	`$reverseTransformer = new DateTimeToStringTransformer();`
`170`	`170`
`171`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');`
	`171`	`+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');`
`172`	`172`
`173`	`173`	`$reverseTransformer->reverseTransform('2010-04-31');`
`174`	`174`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function testTransformExpectsDateTime()`
`72`	`72`	`{`
`73`	`73`	`$transformer = new DateTimeToTimestampTransformer();`
`74`	`74`
`75`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');`
	`75`	`+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');`
`76`	`76`
`77`	`77`	`$transformer->transform('1234');`
`78`	`78`	`}`
`@@ -109,7 +109,7 @@ public function testReverseTransformExpectsValidTimestamp()`
`109`	`109`	`{`
`110`	`110`	`$reverseTransformer = new DateTimeToTimestampTransformer();`
`111`	`111`
`112`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');`
	`112`	`+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');`
`113`	`113`
`114`	`114`	`$reverseTransformer->reverseTransform('2010-2010-2010');`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function testTransformExpectsNumeric()`
`33`	`33`	`{`
`34`	`34`	`$transformer = new MoneyToLocalizedStringTransformer(null, null, null, 100);`
`35`	`35`
`36`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');`
	`36`	`+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');`
`37`	`37`
`38`	`38`	`$transformer->transform('abcd');`
`39`	`39`	`}`
`@@ -61,7 +61,7 @@ public function testReverseTransformExpectsString()`
`61`	`61`	`{`
`62`	`62`	`$transformer = new MoneyToLocalizedStringTransformer(null, null, null, 100);`
`63`	`63`
`64`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');`
	`64`	`+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');`
`65`	`65`
`66`	`66`	`$transformer->reverseTransform(12345);`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public function testTransformExpectsNumeric()`
`106`	`106`	`{`
`107`	`107`	`$transformer = new PercentToLocalizedStringTransformer();`
`108`	`108`
`109`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');`
	`109`	`+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');`
`110`	`110`
`111`	`111`	`$transformer->transform('foo');`
`112`	`112`	`}`
`@@ -115,7 +115,7 @@ public function testReverseTransformExpectsString()`
`115`	`115`	`{`
`116`	`116`	`$transformer = new PercentToLocalizedStringTransformer();`
`117`	`117`
`118`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');`
	`118`	`+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');`
`119`	`119`
`120`	`120`	`$transformer->reverseTransform(1);`
`121`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function testThrowsExceptionIfObjectIsNotTraversable()`
`61`	`61`	`$form = $this->factory->create(static::TESTED_TYPE, null, array(`
`62`	`62`	`'entry_type' => TextTypeTest::TESTED_TYPE,`
`63`	`63`	`));`
`64`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\UnexpectedTypeException');`
	`64`	`+ $this->expectException('Symfony\Component\Form\Exception\UnexpectedTypeException');`
`65`	`65`	`$form->setData(new \stdClass());`
`66`	`66`	`}`
`67`	`67`
Original file line number	Diff line number	Diff line change
`@@ -51,13 +51,13 @@ public function testNoSetName()`
`51`	`51`
`52`	`52`	`public function testAddNameNoStringAndNoInteger()`
`53`	`53`	`{`
`54`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\UnexpectedTypeException');`
	`54`	`+ $this->expectException('Symfony\Component\Form\Exception\UnexpectedTypeException');`
`55`	`55`	`$this->builder->add(true);`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`public function testAddTypeNoString()`
`59`	`59`	`{`
`60`		`- $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\UnexpectedTypeException');`
	`60`	`+ $this->expectException('Symfony\Component\Form\Exception\UnexpectedTypeException');`
`61`	`61`	`$this->builder->add('foo', 1234);`
`62`	`62`	`}`
`63`	`63`