8000 Merge branch '3.2' · symfony/symfony@2f20a6c · GitHub
[go: up one dir, main page]
Skip to content

Commit 2f20a6c

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.2'
* 3.2: Updated PHPUnit namespaces
2 parents 5037c2a + 95f30de commit 2f20a6c

File tree

38 files changed

+76
-38
lines changed

38 files changed

+76
-38
lines changed

‎src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@
1414
use Doctrine\DBAL\Types\Type as DBALType;
1515
use Doctrine\ORM\EntityManager;
1616
use Doctrine\ORM\Tools\Setup;
17+
use PHPUnit\Framework\TestCase;
1718
use Symfony\Bridge\Doctrine\PropertyInfo\DoctrineExtractor;
1819
use Symfony\Component\PropertyInfo\Type;
1920

2021
/**
2122
* @author Kévin Dunglas <dunglas@gmail.com>
2223
*/
23-
class DoctrineExtractorTest extends \PHPUnit_Framework_TestCase
24+
class DoctrineExtractorTest extends TestCase
2425
{
2526
/**
2627
* @var DoctrineExtractor

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/ConfigCachePassTest.php

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

1212
namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\DependencyInjection\Reference;
1516
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ConfigCachePass;
1617

17-
class ConfigCachePassTest extends \PHPUnit_Framework_TestCase
18+
class ConfigCachePassTest extends TestCase
1819
{
1920
public function testThatCheckersAreProcessedInPriorityOrder()
2021
{

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/DataCollectorTranslatorPassTest.php

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

1212
namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\DataCollectorTranslatorPass;
1516
use Symfony\Component\DependencyInjection\ContainerBuilder;
1617
use Symfony\Component\DependencyInjection\Reference;
1718
use Symfony\Component\Translation\TranslatorInterface;
1819

19-
class DataCollectorTranslatorPassTest extends \PHPUnit_Framework_TestCase
20+
class DataCollectorTranslatorPassTest extends TestCase
2021
{
2122
private $container;
2223
private $dataCollectorTranslatorPass;

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/FormPassTest.php

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

1212
namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\FormPass;
1516
use Symfony\Component\DependencyInjection\ContainerBuilder;
1617
use Symfony\Component\DependencyInjection\Definition;
@@ -22,7 +23,7 @@
2223
*
2324
* @author Bernhard Schussek <bschussek@gmail.com>
2425
*/
25-
class FormPassTest extends \PHPUnit_Framework_TestCase
26+
class FormPassTest extends TestCase
2627
{
2728
public function testDoNothingIfFormExtensionNotLoaded()
2829
{

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/PropertyInfoPassTest.php

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

1212
namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\PropertyInfoPass;
1516
use Symfony\Component\DependencyInjection\Reference;
1617

17-
class PropertyInfoPassTest extends \PHPUnit_Framework_TestCase
18+
class PropertyInfoPassTest extends TestCase
1819
{
1920
public function testServicesAreOrderedAccordingToPriority()
2021
{

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php

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

1212
namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\UnusedTagsPass;
1516

16-
class UnusedTagsPassTest extends \PHPUnit_Framework_TestCase
17+
class UnusedTagsPassTest extends TestCase
1718
{
1819
public function testProcess()
1920
{

‎src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/MicroKernelTraitTest.php

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

1212
namespace Symfony\Bundle\FrameworkBundle\Tests\Kernel;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\HttpFoundation\Request;
1516

16-
class MicroKernelTraitTest extends \PHPUnit_Framework_TestCase
17+
class MicroKernelTraitTest extends TestCase
1718
{
1819
public function test()
1920
{

‎src/Symfony/Bundle/FrameworkBundle/Tests/Routing/DelegatingLoaderTest.php

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

33
namespace Symfony\Bundle\FrameworkBundle\Tests\Routing;
44

5+
use PHPUnit\Framework\TestCase;
56
use Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser;
67
use Symfony\Bundle\FrameworkBundle\Routing\DelegatingLoader;
78
use Symfony\Component\Config\Loader\LoaderResolver;
89

9-
class DelegatingLoaderTest extends \PHPUnit_Framework_TestCase
10+
class DelegatingLoaderTest extends TestCase
1011
{
1112
public function testConstructorApi()
1213
{

‎src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Security/Factory/GuardAuthenticationFactoryTest.php

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

1212
namespace Symfony\Bundle\SecurityBundle\Tests\DependencyInjection\Security\Factory;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\GuardAuthenticationFactory;
1516
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
1617
use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
1718
use Symfony\Component\DependencyInjection\ContainerBuilder;
1819
use Symfony\Component\DependencyInjection\Reference;
1920

20-
class GuardAuthenticationFactoryTest extends \PHPUnit_Framework_TestCase
21+
class GuardAuthenticationFactoryTest extends TestCase
2122
{
2223
/**
2324
* @dataProvider getValidConfigurationTests

‎src/Symfony/Component/Config/Tests/Resource/FileExistenceResourceTest.php

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

1212
namespace Symfony\Component\Config\Tests\Resource;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Config\Resource\FileExistenceResource;
1516

16-
class FileExistenceResourceTest extends \PHPUnit_Framework_TestCase
17+
class FileExistenceResourceTest extends TestCase
1718
{
1819
protected $resource;
1920
protected $file;

‎src/Symfony/Component/Config/Tests/ResourceCheckerConfigCacheTest.php

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

1212
namespace Symfony\Component\Config\Tests;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Config\Tests\Resource\ResourceStub;
1516
use Symfony\Component\Config\Resource\FileResource;
1617
use Symfony\Component\Config\ResourceCheckerConfigCache;
1718

18-
class ResourceCheckerConfigCacheTest extends \PHPUnit_Framework_TestCase
19+
class ResourceCheckerConfigCacheTest extends TestCase
1920
{
2021
private $cacheFile = null;
2122

‎src/Symfony/Component/Console/Tests/Helper/ProgressIndicatorTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
10000
@@ -2,13 +2,14 @@
22

33
namespace Symfony\Component\Console\Tests\Helper;
44

5+
use PHPUnit\Framework\TestCase;
56
use Symfony\Component\Console\Helper\ProgressIndicator;
67
use Symfony\Component\Console\Output\StreamOutput;
78

89
/**
910
* @group time-sensitive
1011
*/
11-
class ProgressIndicatorTest extends \PHPUnit_Framework_TestCase
12+
class ProgressIndicatorTest extends TestCase
1213
{
1314
public function testDefaultIndicator()
1415
{

‎src/Symfony/Component/CssSelector/Tests/CssSelectorConverterTest.php

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

1212
namespace Symfony\Component\CssSelector\Tests;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\CssSelector\CssSelectorConverter;
1516

16-
class CssSelectorConverterTest extends \PHPUnit_Framework_TestCase
17+
class CssSelectorConverterTest extends TestCase
1718
{
1819
public function testCssToXPath()
1920
{

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php

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

1212
namespace Symfony\Component\DependencyInjection\Tests\Compiler;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\DependencyInjection\Compiler\AutowirePass;
1516
use Symfony\Component\DependencyInjection\ContainerBuilder;
1617
use Symfony\Component\DependencyInjection\Reference;
@@ -20,7 +21,7 @@
2021
/**
2122
* @author Kévin Dunglas <dunglas@gmail.com>
2223
*/
23-
class AutowirePassTest extends \PHPUnit_Framework_TestCase
24+
class AutowirePassTest extends TestCase
2425
{
2526
public function testProcess()
2627
{

‎src/Symfony/Component/DependencyInjection/Tests/Loader/DirectoryLoaderTest.php

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

1212
namespace Symfony\Component\DependencyInjection\Tests\Loader;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\DependencyInjection\ContainerBuilder;
1516
use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
1617
use Symfony\Component\DependencyInjection\Loader\IniFileLoader;
@@ -19,7 +20,7 @@
1920
use Symfony\Component\Config\Loader\LoaderResolver;
2021
use Symfony\Component\Config\FileLocator;
2122

22-
class DirectoryLoaderTest extends \PHPUnit_Framework_TestCase
23+
class DirectoryLoaderTest extends TestCase
2324
{
2425
private static $fixturesPath;
2526

‎src/Symfony/Component/Form/Tests/Extension/DependencyInjection/DependencyInjectionExtensionTest.php

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

1212
namespace Symfony\Component\Form\Tests\Extension\DependencyInjection;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
1516
use Symfony\Component\Form\Extension\DependencyInjection\DependencyInjectionExtension;
1617

17-
class DependencyInjectionExtensionTest extends \PHPUnit_Framework_TestCase
18+
class DependencyInjectionExtensionTest extends TestCase
1819
{
1920
public function testGetTypeExtensions()
2021
{

‎src/Symfony/Component/Form/Tests/Util/StringUtilTest.php

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

1212
namespace Symfony\Component\Form\Tests\Util;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Form\Util\StringUtil;
1516

16-
class StringUtilTest extends \PHPUnit_Framework_TestCase
17+
class StringUtilTest extends TestCase
1718
{
1819
public function testTrim()
1920
{

‎src/Symfony/Component/PropertyInfo/Tests/Extractors/PhpDocExtractorTest.php

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

1212
namespace Symfony\Component\PropertyInfo\Tests\PhpDocExtractors;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor;
1516
use Symfony\Component\PropertyInfo\Type;
1617

1718
/**
1819
* @author Kévin Dunglas <dunglas@gmail.com>
1920
*/
20-
class PhpDocExtractorTest extends \PHPUnit_Framework_TestCase
21+
class PhpDocExtractorTest extends TestCase
2122
{
2223
/**
2324
* @var PhpDocExtractor

‎src/Symfony/Component/PropertyInfo/Tests/Extractors/ReflectionExtractorTest.php

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

1212
namespace Symfony\Component\PropertyInfo\Tests\Extractor;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\PropertyInfo\Extractor\ReflectionExtractor;
1516
use Symfony\Component\PropertyInfo\Tests\Fixtures\AdderRemoverDummy;
1617
use Symfony\Component\PropertyInfo\Type;
1718

1819
/**
1920
* @author Kévin Dunglas <dunglas@gmail.com>
2021
*/
21-
class ReflectionExtractorTest extends \PHPUnit_Framework_TestCase
22+
class ReflectionExtractorTest extends TestCase
2223
{
2324
/**
2425
* @var ReflectionExtractor

‎src/Symfony/Component/PropertyInfo/Tests/Extractors/SerializerExtractorTest.php

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

1414
use Doctrine\Common\Annotations\AnnotationReader;
15+
use PHPUnit\Framework\TestCase;
1516
use Symfony\Component\PropertyInfo\Extractor\SerializerExtractor;
1617
use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory;
1718
use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader;
1819

1920
/**
2021
* @author Kévin Dunglas <dunglas@gmail.com>
2122
*/
22-
class SerializerExtractorTest extends \PHPUnit_Framework_TestCase
23+
class SerializerExtractorTest extends TestCase
2324
{
2425
/**
2526
* @var SerializerExtractor

‎src/Symfony/Component/PropertyInfo/Tests/TypeTest.php

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

1212
namespace Symfony\Component\PropertyInfo\Tests;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\PropertyInfo\Type;
1516

1617
/**
1718
* @author Kévin Dunglas <dunglas@gmail.com>
1819
*/
19-
class TypeTest extends \PHPUnit_Framework_TestCase
20+
class TypeTest extends TestCase
2021
{
2122
public function testConstruct()
2223
{

‎src/Symfony/Component/Routing/Tests/Loader/ObjectRouteLoaderTest.php

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

1212
namespace Symfony\Component\Routing\Tests\Loader;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Routing\Loader\ObjectRouteLoader;
1516
use Symfony\Component\Routing\Route;
1617
use Symfony\Component\Routing\RouteCollection;
1718

18-
class ObjectRouteLoaderTest extends \PHPUnit_Framework_TestCase
19+
class ObjectRouteLoaderTest extends TestCase
1920
{
2021
public function testLoadCallsServiceAndReturnsCollection()
2122
{

‎src/Symfony/Component/Routing/Tests/RouteCollectionBuilderTest.php

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

1212
namespace Symfony\Component\Routing\Tests;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Config\Resource\FileResource;
1516
use Symfony\Component\Routing\Route;
1617
use Symfony\Component\Routing\RouteCollection;
1718
use Symfony\Component\Routing\RouteCollectionBuilder;
1819

19-
class RouteCollectionBuilderTest extends \PHPUnit_Framework_TestCase
20+
class RouteCollectionBuilderTest extends TestCase
2021
{
2122
public function testImport()
2223
{

‎src/Symfony/Component/Security/Core/Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php

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

1212
namespace Symfony\Component\Security\Core\Tests\Authentication\Provider;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Ldap\LdapInterface;
1516
use Symfony\Component\Ldap\Entry;
1617
use Symfony\Component\Ldap\Adapter\QueryInterface;
@@ -25,7 +26,7 @@
2526
/**
2627
* @requires extension ldap
2728
*/
28-
class LdapBindAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
29+
class LdapBindAuthenticationProviderTest extends TestCase
2930
{
3031
/**
3132
* @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException

‎src/Symfony/Component/Security/Core/Tests/Authorization/Voter/VoterTest.php

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

1212
namespace Symfony\Component\Security\Core\Tests\Authorization\Voter;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
1516
use Symfony\Component\Security\Core\Authorization\Voter\Voter;
1617
use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
1718

18-
class VoterTest extends \PHPUnit_Framework_TestCase
19+
class VoterTest extends TestCase
1920
{
2021
protected $token;
2122

‎src/Symfony/Component/Security/Core/Tests/Exception/CustomUserMessageAuthenticationExceptionTest.php

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

1212
namespace Symfony\Component\Security\Core\Tests\Exception;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Security\Core\Exception\CustomUserMessageAuthenticationException;
1516

16-
class CustomUserMessageAuthenticationExceptionTest extends \PHPUnit_Framework_TestCase
17+
class CustomUserMessageAuthenticationExceptionTest extends TestCase
1718
{
1819
public function testConstructWithSAfeMessage()
1920
{

‎src/Symfony/Component/Security/Core/Tests/User/LdapUserProviderTest.php

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

1212
namespace Symfony\Component\Security\Core\Tests\User;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Ldap\Adapter\CollectionInterface;
1516
use Symfony\Component\Ldap\Adapter\QueryInterface;
1617
use Symfony\Component\Ldap\Entry;
@@ -21,7 +22,7 @@
2122
/**
2223
* @requires extension ldap
2324
*/
24-
class LdapUserProviderTest extends \PHPUnit_Framework_TestCase
25+
class LdapUserProviderTest extends TestCase
2526
{
2627
/**
2728
* @expectedException \Symfony\Component\Security\Core\Exception\UsernameNotFoundException

0 commit comments

Comments
 (0)
0