Further refactorings to PHPUnit namespaces

peterrehm · nicolas-grekas · commit f82135d7a75c · 2017-02-21T09:32:25.000+01:00
diff --git a/Tests/ConstraintTest.php b/Tests/ConstraintTest.php
@@ -35,7 +35,7 @@ public function testSetProperties()
 
     public function testSetNotExistingPropertyThrowsException()
     {
-        $this->setExpectedException('Symfony\Component\Validator\Exception\InvalidOptionsException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\InvalidOptionsException');
 
         new ConstraintA(array(
             'foo' => 'bar',
@@ -46,14 +46,14 @@ public function testMagicPropertiesAreNotAllowed()
     {
         $constraint = new ConstraintA();
 
-        $this->setExpectedException('Symfony\Component\Validator\Exception\InvalidOptionsException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\InvalidOptionsException');
 
         $constraint->foo = 'bar';
     }
 
     public function testInvalidAndRequiredOptionsPassed()
     {
-        $this->setExpectedException('Symfony\Component\Validator\Exception\InvalidOptionsException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\InvalidOptionsException');
 
         new ConstraintC(array(
             'option1' => 'default',
@@ -101,14 +101,14 @@ public function testDontSetDefaultPropertyIfValuePropertyExists()
 
     public function testSetUndefinedDefaultProperty()
     {
-        $this->setExpectedException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
 
         new ConstraintB('foo');
     }
 
     public function testRequiredOptionsMustBeDefined()
     {
-        $this->setExpectedException('Symfony\Component\Validator\Exception\MissingOptionsException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\MissingOptionsException');
 
         new ConstraintC();
     }
diff --git a/Tests/Mapping/ClassMetadataTest.php b/Tests/Mapping/ClassMetadataTest.php
@@ -39,14 +39,14 @@ protected function tearDown()
 
     public function testAddConstraintDoesNotAcceptValid()
     {
-        $this->setExpectedException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
 
         $this->metadata->addConstraint(new Valid());
     }
 
     public function testAddConstraintRequiresClassConstraints()
     {
-        $this->setExpectedException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
 
         $this->metadata->addConstraint(new PropertyConstraint());
     }
@@ -249,14 +249,14 @@ public function testGroupSequencesWorkIfContainingDefaultGroup()
 
     public function testGroupSequencesFailIfNotContainingDefaultGroup()
     {
-        $this->setExpectedException('Symfony\Component\Validator\Exception\GroupDefinitionException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\GroupDefinitionException');
 
         $this->metadata->setGroupSequence(array('Foo', 'Bar'));
     }
 
     public function testGroupSequencesFailIfContainingDefault()
     {
-        $this->setExpectedException('Symfony\Component\Validator\Exception\GroupDefinitionException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\GroupDefinitionException');
 
         $this->metadata->setGroupSequence(array('Foo', $this->metadata->getDefaultGroup(), Constraint::DEFAULT_GROUP));
     }
diff --git a/Tests/Mapping/GetterMetadataTest.php b/Tests/Mapping/GetterMetadataTest.php
@@ -21,7 +21,7 @@ class GetterMetadataTest extends TestCase
 
     public function testInvalidPropertyName()
     {
-        $this->setExpectedException('Symfony\Component\Validator\Exception\ValidatorException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ValidatorException');
 
         new GetterMetadata(self::CLASSNAME, 'foobar');
     }
diff --git a/Tests/Mapping/Loader/XmlFileLoaderTest.php b/Tests/Mapping/Loader/XmlFileLoaderTest.php
@@ -114,7 +114,7 @@ public function testThrowExceptionIfDocTypeIsSet()
         $loader = new XmlFileLoader(__DIR__.'/withdoctype.xml');
         $metadata = new ClassMetadata('Symfony\Component\Validator\Tests\Fixtures\Entity');
 
-        $this->setExpectedException('\Symfony\Component\Validator\Exception\MappingException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('\Symfony\Component\Validator\Exception\MappingException');
         $loader->loadClassMetadata($metadata);
     }
 
@@ -129,7 +129,7 @@ public function testDoNotModifyStateIfExceptionIsThrown()
         try {
             $loader->loadClassMetadata($metadata);
         } catch (MappingException $e) {
-            $this->setExpectedException('\Symfony\Component\Validator\Exception\MappingException');
+            $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('\Symfony\Component\Validator\Exception\MappingException');
             $loader->loadClassMetadata($metadata);
         }
     }
diff --git a/Tests/Mapping/Loader/YamlFileLoaderTest.php b/Tests/Mapping/Loader/YamlFileLoaderTest.php
@@ -69,7 +69,7 @@ public function testDoNotModifyStateIfExceptionIsThrown()
             $loader->loadClassMetadata($metadata);
         } catch (\InvalidArgumentException $e) {
             // Call again. Again an exception should be thrown
-            $this->setExpectedException('\InvalidArgumentException');
+            $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('\InvalidArgumentException');
             $loader->loadClassMetadata($metadata);
         }
     }
diff --git a/Tests/Mapping/MemberMetadataTest.php b/Tests/Mapping/MemberMetadataTest.php
@@ -62,7 +62,7 @@ public function testLegacyAddOtherConstraintDoesNotSetMemberToCascaded()
 
     public function testAddConstraintRequiresClassConstraints()
     {
-        $this->setExpectedException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
 
         $this->metadata->addConstraint(new ClassConstraint());
     }
diff --git a/Tests/Mapping/PropertyMetadataTest.php b/Tests/Mapping/PropertyMetadataTest.php
@@ -22,7 +22,7 @@ class PropertyMetadataTest extends TestCase
 
     public function testInvalidPropertyName()
     {
-        $this->setExpectedException('Symfony\Component\Validator\Exception\ValidatorException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ValidatorException');
 
         new PropertyMetadata(self::CLASSNAME, 'foobar');
     }
@@ -50,7 +50,7 @@ public function testGetPropertyValueFromRemovedProperty()
         $metadata = new PropertyMetadata(self::CLASSNAME, 'internal');
         $metadata->name = 'test';
 
-        $this->setExpectedException('Symfony\Component\Validator\Exception\ValidatorException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ValidatorException');
         $metadata->getPropertyValue($entity);
     }
 }
diff --git a/Tests/Resources/TranslationFilesTest.php b/Tests/Resources/TranslationFilesTest.php
@@ -20,7 +20,11 @@ class TranslationFilesTest extends TestCase
      */
     public function testTranslationFileIsValid($filePath)
     {
-        \PHPUnit_Util_XML::loadfile($filePath, false, false, true);
+        if (class_exists('PHPUnit_Util_XML')) {
+            \PHPUnit_Util_XML::loadfile($filePath, false, false, true);
+        } else {
+            \PHPUnit\Util\XML::loadfile($filePath, false, false, true);
+        }
     }
 
     public function provideTranslationFiles()

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function testSetProperties()`
`35`	`35`
`36`	`36`	`public function testSetNotExistingPropertyThrowsException()`
`37`	`37`	`{`
`38`		`- $this->setExpectedException('Symfony\Component\Validator\Exception\InvalidOptionsException');`
	`38`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\InvalidOptionsException');`
`39`	`39`
`40`	`40`	`new ConstraintA(array(`
`41`	`41`	`'foo' => 'bar',`
`@@ -46,14 +46,14 @@ public function testMagicPropertiesAreNotAllowed()`
`46`	`46`	`{`
`47`	`47`	`$constraint = new ConstraintA();`
`48`	`48`
`49`		`- $this->setExpectedException('Symfony\Component\Validator\Exception\InvalidOptionsException');`
	`49`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\InvalidOptionsException');`
`50`	`50`
`51`	`51`	`$constraint->foo = 'bar';`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`public function testInvalidAndRequiredOptionsPassed()`
`55`	`55`	`{`
`56`		`- $this->setExpectedException('Symfony\Component\Validator\Exception\InvalidOptionsException');`
	`56`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\InvalidOptionsException');`
`57`	`57`
`58`	`58`	`new ConstraintC(array(`
`59`	`59`	`'option1' => 'default',`
`@@ -101,14 +101,14 @@ public function testDontSetDefaultPropertyIfValuePropertyExists()`
`101`	`101`
`102`	`102`	`public function testSetUndefinedDefaultProperty()`
`103`	`103`	`{`
`104`		`- $this->setExpectedException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');`
	`104`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ConstraintDefinitionException');`
`105`	`105`
`106`	`106`	`new ConstraintB('foo');`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`public function testRequiredOptionsMustBeDefined()`
`110`	`110`	`{`
`111`		`- $this->setExpectedException('Symfony\Component\Validator\Exception\MissingOptionsException');`
	`111`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\MissingOptionsException');`
`112`	`112`
`113`	`113`	`new ConstraintC();`
`114`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,14 +39,14 @@ protected function tearDown()`
`39`	`39`
`40`	`40`	`public function testAddConstraintDoesNotAcceptValid()`
`41`	`41`	`{`
`42`		`- $this->setExpectedException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');`
	`42`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ConstraintDefinitionException');`
`43`	`43`
`44`	`44`	`$this->metadata->addConstraint(new Valid());`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`public function testAddConstraintRequiresClassConstraints()`
`48`	`48`	`{`
`49`		`- $this->setExpectedException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');`
	`49`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ConstraintDefinitionException');`
`50`	`50`
`51`	`51`	`$this->metadata->addConstraint(new PropertyConstraint());`
`52`	`52`	`}`
`@@ -249,14 +249,14 @@ public function testGroupSequencesWorkIfContainingDefaultGroup()`
`249`	`249`
`250`	`250`	`public function testGroupSequencesFailIfNotContainingDefaultGroup()`
`251`	`251`	`{`
`252`		`- $this->setExpectedException('Symfony\Component\Validator\Exception\GroupDefinitionException');`
	`252`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\GroupDefinitionException');`
`253`	`253`
`254`	`254`	`$this->metadata->setGroupSequence(array('Foo', 'Bar'));`
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`public function testGroupSequencesFailIfContainingDefault()`
`258`	`258`	`{`
`259`		`- $this->setExpectedException('Symfony\Component\Validator\Exception\GroupDefinitionException');`
	`259`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\GroupDefinitionException');`
`260`	`260`
`261`	`261`	`$this->metadata->setGroupSequence(array('Foo', $this->metadata->getDefaultGroup(), Constraint::DEFAULT_GROUP));`
`262`	`262`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class GetterMetadataTest extends TestCase`
`21`	`21`
`22`	`22`	`public function testInvalidPropertyName()`
`23`	`23`	`{`
`24`		`- $this->setExpectedException('Symfony\Component\Validator\Exception\ValidatorException');`
	`24`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ValidatorException');`
`25`	`25`
`26`	`26`	`new GetterMetadata(self::CLASSNAME, 'foobar');`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public function testThrowExceptionIfDocTypeIsSet()`
`114`	`114`	`$loader = new XmlFileLoader(__DIR__.'/withdoctype.xml');`
`115`	`115`	`$metadata = new ClassMetadata('Symfony\Component\Validator\Tests\Fixtures\Entity');`
`116`	`116`
`117`		`- $this->setExpectedException('\Symfony\Component\Validator\Exception\MappingException');`
	`117`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('\Symfony\Component\Validator\Exception\MappingException');`
`118`	`118`	`$loader->loadClassMetadata($metadata);`
`119`	`119`	`}`
`120`	`120`
`@@ -129,7 +129,7 @@ public function testDoNotModifyStateIfExceptionIsThrown()`
`129`	`129`	`try {`
`130`	`130`	`$loader->loadClassMetadata($metadata);`
`131`	`131`	`} catch (MappingException $e) {`
`132`		`- $this->setExpectedException('\Symfony\Component\Validator\Exception\MappingException');`
	`132`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('\Symfony\Component\Validator\Exception\MappingException');`
`133`	`133`	`$loader->loadClassMetadata($metadata);`
`134`	`134`	`}`
`135`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public function testDoNotModifyStateIfExceptionIsThrown()`
`69`	`69`	`$loader->loadClassMetadata($metadata);`
`70`	`70`	`} catch (\InvalidArgumentException $e) {`
`71`	`71`	`// Call again. Again an exception should be thrown`
`72`		`- $this->setExpectedException('\InvalidArgumentException');`
	`72`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('\InvalidArgumentException');`
`73`	`73`	`$loader->loadClassMetadata($metadata);`
`74`	`74`	`}`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function testLegacyAddOtherConstraintDoesNotSetMemberToCascaded()`
`62`	`62`
`63`	`63`	`public function testAddConstraintRequiresClassConstraints()`
`64`	`64`	`{`
`65`		`- $this->setExpectedException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');`
	`65`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ConstraintDefinitionException');`
`66`	`66`
`67`	`67`	`$this->metadata->addConstraint(new ClassConstraint());`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class PropertyMetadataTest extends TestCase`
`22`	`22`
`23`	`23`	`public function testInvalidPropertyName()`
`24`	`24`	`{`
`25`		`- $this->setExpectedException('Symfony\Component\Validator\Exception\ValidatorException');`
	`25`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ValidatorException');`
`26`	`26`
`27`	`27`	`new PropertyMetadata(self::CLASSNAME, 'foobar');`
`28`	`28`	`}`
`@@ -50,7 +50,7 @@ public function testGetPropertyValueFromRemovedProperty()`
`50`	`50`	`$metadata = new PropertyMetadata(self::CLASSNAME, 'internal');`
`51`	`51`	`$metadata->name = 'test';`
`52`	`52`
`53`		`- $this->setExpectedException('Symfony\Component\Validator\Exception\ValidatorException');`
	`53`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ValidatorException');`
`54`	`54`	`$metadata->getPropertyValue($entity);`
`55`	`55`	`}`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,11 @@ class TranslationFilesTest extends TestCase`
`20`	`20`	`*/`
`21`	`21`	`public function testTranslationFileIsValid($filePath)`
`22`	`22`	`{`
`23`		`- \PHPUnit_Util_XML::loadfile($filePath, false, false, true);`
	`23`	`+ if (class_exists('PHPUnit_Util_XML')) {`
	`24`	`+ \PHPUnit_Util_XML::loadfile($filePath, false, false, true);`
	`25`	`+ } else {`
	`26`	`+ \PHPUnit\Util\XML::loadfile($filePath, false, false, true);`
	`27`	`+ }`
`24`	`28`	`}`
`25`	`29`
`26`	`30`	`public function provideTranslationFiles()`