Skip to content

Commit 5e8c8e2

Browse files
Merge branch '2.7' into 2.8
* 2.7: Update to PHPUnit namespaces remove translation data collector when not usable
2 parents 75c7f5f + 463c016 commit 5e8c8e2

16 files changed

+32
-16
lines changed

Tests/Annotation/GroupsTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@
1111

1212
namespace Symfony\Component\Serializer\Tests\Annotation;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Serializer\Annotation\Groups;
1516

1617
/**
1718
* @author Kévin Dunglas <[email protected]>
1819
*/
19-
class GroupsTest extends \PHPUnit_Framework_TestCase
20+
class GroupsTest extends TestCase
2021
{
2122
/**
2223
* @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException

Tests/Encoder/JsonEncoderTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@
1111

1212
namespace Symfony\Component\Serializer\Tests\Encoder;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Serializer\Encoder\JsonEncoder;
1516
use Symfony\Component\Serializer\Serializer;
1617
use Symfony\Component\Serializer\Normalizer\CustomNormalizer;
1718

18-
class JsonEncoderTest extends \PHPUnit_Framework_TestCase
19+
class JsonEncoderTest extends TestCase
1920
{
2021
private $encoder;
2122
private $serializer;

Tests/Encoder/XmlEncoderTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\Serializer\Tests\Encoder;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Serializer\Tests\Fixtures\Dummy;
1516
use Symfony\Component\Serializer\Tests\Fixtures\NormalizableTraversableDummy;
1617
use Symfony\Component\Serializer\Tests\Fixtures\ScalarDummy;
@@ -19,7 +20,7 @@
1920
use Symfony\Component\Serializer\Exception\UnexpectedValueException;
2021
use Symfony\Component\Serializer\Normalizer\CustomNormalizer;
2122

22-
class XmlEncoderTest extends \PHPUnit_Framework_TestCase
23+
class XmlEncoderTest extends TestCase
2324
{
2425
private $encoder;
2526

Tests/Mapping/AttributeMetadataTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@
1111

1212
namespace Symfony\Component\Serializer\Tests\Mapping;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Serializer\Mapping\AttributeMetadata;
1516

1617
/**
1718
* @author Kévin Dunglas <[email protected]>
1819
*/
19-
class AttributeMetadataTest extends \PHPUnit_Framework_TestCase
20+
class AttributeMetadataTest extends TestCase
2021
{
2122
public function testInterface()
2223
{

Tests/Mapping/ClassMetadataTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@
1111

1212
namespace Symfony\Component\Serializer\Tests\Mapping;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Serializer\Mapping\ClassMetadata;
1516

1617
/**
1718
* @author Kévin Dunglas <[email protected]>
1819
*/
19-
class ClassMetadataTest extends \PHPUnit_Framework_TestCase
20+
class ClassMetadataTest extends TestCase
2021
{
2122
public function testInterface()
2223
{

Tests/Mapping/Factory/ClassMetadataFactoryTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Component\Serializer\Tests\Mapping\Factory;
1313

1414
use Doctrine\Common\Annotations\AnnotationReader;
15+
use PHPUnit\Framework\TestCase;
1516
use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory;
1617
use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader;
1718
use Symfony\Component\Serializer\Mapping\Loader\LoaderChain;
@@ -20,7 +21,7 @@
2021
/**
2122
* @author Kévin Dunglas <[email protected]>
2223
*/
23-
class ClassMetadataFactoryTest extends \PHPUnit_Framework_TestCase
24+
class ClassMetadataFactoryTest extends TestCase
2425
{
2526
public function testInterface()
2627
{

Tests/Mapping/Loader/AnnotationLoaderTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@
1212
namespace Symfony\Component\Serializer\Tests\Mapping\Loader;
1313

1414
use Doctrine\Common\Annotations\AnnotationReader;
15+
use PHPUnit\Framework\TestCase;
1516
use Symfony\Component\Serializer\Mapping\ClassMetadata;
1617
use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader;
1718
use Symfony\Component\Serializer\Tests\Mapping\TestClassMetadataFactory;
1819

1920
/**
2021
* @author Kévin Dunglas <[email protected]>
2122
*/
22-
class AnnotationLoaderTest extends \PHPUnit_Framework_TestCase
23+
class AnnotationLoaderTest extends TestCase
2324
{
2425
/**
2526
* @var AnnotationLoader

Tests/Mapping/Loader/XmlFileLoaderTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@
1111

1212
namespace Symfony\Component\Serializer\Tests\Mapping\Loader;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader;
1516
use Symfony\Component\Serializer\Mapping\ClassMetadata;
1617
use Symfony\Component\Serializer\Tests\Mapping\TestClassMetadataFactory;
1718

1819
/**
1920
* @author Kévin Dunglas <[email protected]>
2021
*/
21-
class XmlFileLoaderTest extends \PHPUnit_Framework_TestCase
22+
class XmlFileLoaderTest extends TestCase
2223
{
2324
/**
2425
* @var XmlFileLoader

Tests/Mapping/Loader/YamlFileLoaderTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@
1111

1212
namespace Symfony\Component\Serializer\Tests\Mapping\Loader;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Serializer\Mapping\Loader\YamlFileLoader;
1516
use Symfony\Component\Serializer\Mapping\ClassMetadata;
1617
use Symfony\Component\Serializer\Tests\Mapping\TestClassMetadataFactory;
1718

1819
/**
1920
* @author Kévin Dunglas <[email protected]>
2021
*/
21-
class YamlFileLoaderTest extends \PHPUnit_Framework_TestCase
22+
class YamlFileLoaderTest extends TestCase
2223
{
2324
/**
2425
* @var YamlFileLoader

Tests/NameConverter/CamelCaseToSnakeCaseNameConverterTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@
1111

1212
namespace Symfony\Component\Serializer\Tests\NameConverter;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter;
1516

1617
/**
1718
* @author Kévin Dunglas <[email protected]>
1819
*/
19-
class CamelCaseToSnakeCaseNameConverterTest extends \PHPUnit_Framework_TestCase
20+
class CamelCaseToSnakeCaseNameConverterTest extends TestCase
2021
{
2122
public function testInterface()
2223
{

0 commit comments

Comments
 (0)