Update to PHPUnit namespaces

peterrehm · fabpot · commit 6b0ed01effcd · 2017-02-18T08:02:39.000-08:00
diff --git a/Tests/ConstraintTest.php b/Tests/ConstraintTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Validator\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Tests\Fixtures\ClassConstraint;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
@@ -19,7 +20,7 @@
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintWithValue;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintWithValueAsDefault;
 
-class ConstraintTest extends \PHPUnit_Framework_TestCase
+class ConstraintTest extends TestCase
 {
     public function testSetProperties()
     {
diff --git a/Tests/ConstraintViolationListTest.php b/Tests/ConstraintViolationListTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Validator\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\ConstraintViolation;
 use Symfony\Component\Validator\ConstraintViolationList;
 
-class ConstraintViolationListTest extends \PHPUnit_Framework_TestCase
+class ConstraintViolationListTest extends TestCase
 {
     protected $list;
 
diff --git a/Tests/ConstraintViolationTest.php b/Tests/ConstraintViolationTest.php
@@ -11,9 +11,10 @@
 
 namespace Symfony\Component\Validator\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\ConstraintViolation;
 
-class ConstraintViolationTest extends \PHPUnit_Framework_TestCase
+class ConstraintViolationTest extends TestCase
 {
     public function testToStringHandlesArrays()
     {
diff --git a/Tests/Constraints/AbstractConstraintValidatorTest.php b/Tests/Constraints/AbstractConstraintValidatorTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Validator\Tests\Constraints;
 
+use PHPUnit\Framework\Assert;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Constraints\NotNull;
 use Symfony\Component\Validator\ConstraintValidatorInterface;
@@ -26,7 +28,7 @@
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-abstract class AbstractConstraintValidatorTest extends \PHPUnit_Framework_TestCase
+abstract class AbstractConstraintValidatorTest extends TestCase
 {
     /**
      * @var ExecutionContextInterface
@@ -411,12 +413,12 @@ public function assertRaised()
 
         $violations = iterator_to_array($this->context->getViolations());
 
-        \PHPUnit_Framework_Assert::assertSame($expectedCount = count($expected), $violationsCount = count($violations), sprintf('%u violation(s) expected. Got %u.', $expectedCount, $violationsCount));
+        Assert::assertSame($expectedCount = count($expected), $violationsCount = count($violations), sprintf('%u violation(s) expected. Got %u.', $expectedCount, $violationsCount));
 
         reset($violations);
 
         foreach ($expected as $violation) {
-            \PHPUnit_Framework_Assert::assertEquals($violation, current($violations));
+            Assert::assertEquals($violation, current($violations));
             next($violations);
         }
     }
diff --git a/Tests/Constraints/AllTest.php b/Tests/Constraints/AllTest.php
@@ -11,13 +11,14 @@
 
 namespace Symfony\Component\Validator\Tests\Constraints;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Constraints\All;
 use Symfony\Component\Validator\Constraints\Valid;
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class AllTest extends \PHPUnit_Framework_TestCase
+class AllTest extends TestCase
 {
     /**
      * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
diff --git a/Tests/Constraints/CollectionTest.php b/Tests/Constraints/CollectionTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Validator\Tests\Constraints;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Constraints\Collection;
 use Symfony\Component\Validator\Constraints\Email;
 use Symfony\Component\Validator\Constraints\Optional;
@@ -20,7 +21,7 @@
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class CollectionTest extends \PHPUnit_Framework_TestCase
+class CollectionTest extends TestCase
 {
     /**
      * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
diff --git a/Tests/Constraints/CompositeTest.php b/Tests/Constraints/CompositeTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Validator\Tests\Constraints;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Constraints\Composite;
 use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Validator\Constraints\NotNull;
@@ -34,7 +35,7 @@ public function getDefaultOption()
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class CompositeTest extends \PHPUnit_Framework_TestCase
+class CompositeTest extends TestCase
 {
     public function testMergeNestedGroupsIfNoExplicitParentGroup()
     {
diff --git a/Tests/Constraints/FileTest.php b/Tests/Constraints/FileTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Validator\Tests\Constraints;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Constraints\File;
 use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
 
-class FileTest extends \PHPUnit_Framework_TestCase
+class FileTest extends TestCase
 {
     /**
      * @param mixed $maxSize
diff --git a/Tests/Constraints/GroupSequenceTest.php b/Tests/Constraints/GroupSequenceTest.php
@@ -11,12 +11,13 @@
 
 namespace Symfony\Component\Validator\Tests\Constraints;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Constraints\GroupSequence;
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class GroupSequenceTest extends \PHPUnit_Framework_TestCase
+class GroupSequenceTest extends TestCase
 {
     public function testCreate()
     {
diff --git a/Tests/Constraints/RegexTest.php b/Tests/Constraints/RegexTest.php
@@ -11,12 +11,13 @@
 
 namespace Constraints;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Constraints\Regex;
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class RegexTest extends \PHPUnit_Framework_TestCase
+class RegexTest extends TestCase
 {
     public function testConstraintGetDefaultOption()
     {
diff --git a/Tests/Constraints/ValidTest.php b/Tests/Constraints/ValidTest.php
@@ -11,12 +11,13 @@
 
 namespace Symfony\Component\Validator\Tests\Constraints;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Constraints\Valid;
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class ValidTest extends \PHPUnit_Framework_TestCase
+class ValidTest extends TestCase
 {
     /**
      * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
diff --git a/Tests/LegacyExecutionContextTest.php b/Tests/LegacyExecutionContextTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Validator\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Constraints\Collection;
 use Symfony\Component\Validator\Constraints\All;
 use Symfony\Component\Validator\ConstraintValidatorFactory;
@@ -23,7 +24,7 @@
 /**
  * @group legacy
  */
-class LegacyExecutionContextTest extends \PHPUnit_Framework_TestCase
+class LegacyExecutionContextTest extends TestCase
 {
     const TRANS_DOMAIN = 'trans_domain';
 
diff --git a/Tests/Mapping/Cache/DoctrineCacheTest.php b/Tests/Mapping/Cache/DoctrineCacheTest.php
@@ -12,9 +12,10 @@
 namespace Symfony\Component\Validator\Tests\Mapping\Cache;
 
 use Doctrine\Common\Cache\ArrayCache;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Mapping\Cache\DoctrineCache;
 
-class DoctrineCacheTest extends \PHPUnit_Framework_TestCase
+class DoctrineCacheTest extends TestCase
 {
     private $cache;
 
diff --git a/Tests/Mapping/Cache/LegacyApcCacheTest.php b/Tests/Mapping/Cache/LegacyApcCacheTest.php
@@ -11,13 +11,14 @@
 
 namespace Symfony\Component\Validator\Tests\Mapping\Cache;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Mapping\Cache\ApcCache;
 
 /**
  * @group legacy
  * @requires extension apc
  */
-class LegacyApcCacheTest extends \PHPUnit_Framework_TestCase
+class LegacyApcCacheTest extends TestCase
 {
     protected function setUp()
     {
diff --git a/Tests/Mapping/ClassMetadataTest.php b/Tests/Mapping/ClassMetadataTest.php
@@ -11,14 +11,15 @@
 
 namespace Symfony\Component\Validator\Tests\Mapping;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Constraints\Valid;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintB;
 use Symfony\Component\Validator\Tests\Fixtures\PropertyConstraint;
 
-class ClassMetadataTest extends \PHPUnit_Framework_TestCase
+class ClassMetadataTest extends TestCase
 {
     const CLASSNAME = 'Symfony\Component\Validator\Tests\Fixtures\Entity';
     const PARENTCLASS = 'Symfony\Component\Validator\Tests\Fixtures\EntityParent';
diff --git a/Tests/Mapping/Factory/BlackHoleMetadataFactoryTest.php b/Tests/Mapping/Factory/BlackHoleMetadataFactoryTest.php
@@ -11,9 +11,10 @@
 
 namespace Symfony\Component\Validator\Tests\Mapping\Factory;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Mapping\Factory\BlackHoleMetadataFactory;
 
-class BlackHoleMetadataFactoryTest extends \PHPUnit_Framework_TestCase
+class BlackHoleMetadataFactoryTest extends TestCase
 {
     /**
      * @expectedException \LogicException
diff --git a/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php b/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php
@@ -11,13 +11,14 @@
 
 namespace Symfony\Component\Validator\Tests\Mapping\Factory;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory;
 use Symfony\Component\Validator\Mapping\Loader\LoaderInterface;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
 
-class LazyLoadingMetadataFactoryTest extends \PHPUnit_Framework_TestCase
+class LazyLoadingMetadataFactoryTest extends TestCase
 {
     const CLASS_NAME = 'Symfony\Component\Validator\Tests\Fixtures\Entity';
     const PARENT_CLASS = 'Symfony\Component\Validator\Tests\Fixtures\EntityParent';
diff --git a/Tests/Mapping/GetterMetadataTest.php b/Tests/Mapping/GetterMetadataTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Validator\Tests\Mapping;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Mapping\GetterMetadata;
 use Symfony\Component\Validator\Tests\Fixtures\Entity;
 
-class GetterMetadataTest extends \PHPUnit_Framework_TestCase
+class GetterMetadataTest extends TestCase
 {
     const CLASSNAME = 'Symfony\Component\Validator\Tests\Fixtures\Entity';
 
diff --git a/Tests/Mapping/LegacyElementMetadataTest.php b/Tests/Mapping/LegacyElementMetadataTest.php
@@ -11,14 +11,15 @@
 
 namespace Symfony\Component\Validator\Tests\Mapping;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Mapping\ElementMetadata;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintB;
 
 /**
  * @group legacy
  */
-class LegacyElementMetadataTest extends \PHPUnit_Framework_TestCase
+class LegacyElementMetadataTest extends TestCase
 {
     protected $metadata;
 
diff --git a/Tests/Mapping/Loader/AnnotationLoaderTest.php b/Tests/Mapping/Loader/AnnotationLoaderTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Validator\Tests\Mapping\Loader;
 
 use Doctrine\Common\Annotations\AnnotationReader;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Constraints\All;
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Constraints\Choice;
@@ -23,7 +24,7 @@
 use Symfony\Component\Validator\Mapping\Loader\AnnotationLoader;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
 
-class AnnotationLoaderTest extends \PHPUnit_Framework_TestCase
+class AnnotationLoaderTest extends TestCase
 {
     public function testLoadClassMetadataReturnsTrueIfSuccessful()
     {
diff --git a/Tests/Mapping/Loader/FilesLoaderTest.php b/Tests/Mapping/Loader/FilesLoaderTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Validator\Tests\Mapping\Loader;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Symfony\Component\Validator\Mapping\Loader\LoaderInterface;
 
-class FilesLoaderTest extends \PHPUnit_Framework_TestCase
+class FilesLoaderTest extends TestCase
 {
     public function testCallsGetFileLoaderInstanceForeachPath()
     {
diff --git a/Tests/Mapping/Loader/LoaderChainTest.php b/Tests/Mapping/Loader/LoaderChainTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Validator\Tests\Mapping\Loader;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Symfony\Component\Validator\Mapping\Loader\LoaderChain;
 
-class LoaderChainTest extends \PHPUnit_Framework_TestCase
+class LoaderChainTest extends TestCase
 {
     public function testAllLoadersAreCalled()
     {
diff --git a/Tests/Mapping/Loader/StaticMethodLoaderTest.php b/Tests/Mapping/Loader/StaticMethodLoaderTest.php
@@ -11,11 +11,12 @@
 
 namespace Symfony\Component\Validator\Tests\Mapping\Loader;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Symfony\Component\Validator\Mapping\Loader\StaticMethodLoader;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
 
-class StaticMethodLoaderTest extends \PHPUnit_Framework_TestCase
+class StaticMethodLoaderTest extends TestCase
 {
     private $errorLevel;
 
diff --git a/Tests/Mapping/Loader/XmlFileLoaderTest.php b/Tests/Mapping/Loader/XmlFileLoaderTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Validator\Tests\Mapping\Loader;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Constraints\All;
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Constraints\Choice;
@@ -26,7 +27,7 @@
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintB;
 
-class XmlFileLoaderTest extends \PHPUnit_Framework_TestCase
+class XmlFileLoaderTest extends TestCase
 {
     public function testLoadClassMetadataReturnsTrueIfSuccessful()
     {
diff --git a/Tests/Mapping/Loader/YamlFileLoaderTest.php b/Tests/Mapping/Loader/YamlFileLoaderTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Validator\Tests\Mapping\Loader;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Constraints\All;
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Constraints\Choice;
@@ -23,7 +24,7 @@
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintB;
 
-class YamlFileLoaderTest extends \PHPUnit_Framework_TestCase
+class YamlFileLoaderTest extends TestCase
 {
     public function testLoadClassMetadataReturnsFalseIfEmpty()
     {
diff --git a/Tests/Mapping/MemberMetadataTest.php b/Tests/Mapping/MemberMetadataTest.php
diff --git a/Tests/Mapping/PropertyMetadataTest.php b/Tests/Mapping/PropertyMetadataTest.php
diff --git a/Tests/Resources/TranslationFilesTest.php b/Tests/Resources/TranslationFilesTest.php
diff --git a/Tests/Util/PropertyPathTest.php b/Tests/Util/PropertyPathTest.php
diff --git a/Tests/Validator/AbstractValidatorTest.php b/Tests/Validator/AbstractValidatorTest.php
diff --git a/Tests/ValidatorBuilderTest.php b/Tests/ValidatorBuilderTest.php

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Validator\Tests;`
`13`	`13`
	`14`	`+use PHPUnit\Framework\TestCase;`
`14`	`15`	`use Symfony\Component\Validator\Constraint;`
`15`	`16`	`use Symfony\Component\Validator\Tests\Fixtures\ClassConstraint;`
`16`	`17`	`use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;`
`@@ -19,7 +20,7 @@`
`19`	`20`	`use Symfony\Component\Validator\Tests\Fixtures\ConstraintWithValue;`
`20`	`21`	`use Symfony\Component\Validator\Tests\Fixtures\ConstraintWithValueAsDefault;`
`21`	`22`
`22`		`-class ConstraintTest extends \PHPUnit_Framework_TestCase`
	`23`	`+class ConstraintTest extends TestCase`
`23`	`24`	`{`
`24`	`25`	`public function testSetProperties()`
`25`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,11 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Validator\Tests;`
`13`	`13`
	`14`	`+use PHPUnit\Framework\TestCase;`
`14`	`15`	`use Symfony\Component\Validator\ConstraintViolation;`
`15`	`16`	`use Symfony\Component\Validator\ConstraintViolationList;`
`16`	`17`
`17`		`-class ConstraintViolationListTest extends \PHPUnit_Framework_TestCase`
	`18`	`+class ConstraintViolationListTest extends TestCase`
`18`	`19`	`{`
`19`	`20`	`protected $list;`
`20`	`21`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,10 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Validator\Tests;`
`13`	`13`
	`14`	`+use PHPUnit\Framework\TestCase;`
`14`	`15`	`use Symfony\Component\Validator\ConstraintViolation;`
`15`	`16`
`16`		`-class ConstraintViolationTest extends \PHPUnit_Framework_TestCase`
	`17`	`+class ConstraintViolationTest extends TestCase`
`17`	`18`	`{`
`18`	`19`	`public function testToStringHandlesArrays()`
`19`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,13 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Validator\Tests\Constraints;`
`13`	`13`
	`14`	`+use PHPUnit\Framework\TestCase;`
`14`	`15`	`use Symfony\Component\Validator\Constraints\GroupSequence;`
`15`	`16`
`16`	`17`	`/**`
`17`	`18`	`* @author Bernhard Schussek <[email protected]>`
`18`	`19`	`*/`
`19`		`-class GroupSequenceTest extends \PHPUnit_Framework_TestCase`
	`20`	`+class GroupSequenceTest extends TestCase`
`20`	`21`	`{`
`21`	`22`	`public function testCreate()`
`22`	`23`	`{`