10000 Merge branch '3.2' · symfony/symfony@56642c4 · GitHub
[go: up one dir, main page]
Skip to content

Commit 56642c4

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.2'
* 3.2: Updated PHPUnit namespaces Add missing conflict rules for phpunit
2 parents 2f20a6c + 13983d9 commit 56642c4

File tree

80 files changed

+171
-85
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+171
-85
lines changed

‎src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterMappingsPassTest.php

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

33
namespace Symfony\Bridge\Doctrine\Tests\DependencyInjection\CompilerPass;
44

5+
use PHPUnit\Framework\TestCase;
56
use Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterMappingsPass;
67
use Symfony\Component\DependencyInjection\Definition;
78
use Symfony\Component\DependencyInjection\ContainerBuilder;
89

9-
class RegisterMappingsPassTest extends \PHPUnit_Framework_TestCase
10+
class RegisterMappingsPassTest extends TestCase
1011
{
1112
/**
1213
* @expectedException \InvalidArgumentException

‎src/Symfony/Bridge/Doctrine/Tests/Form/EventListener/MergeDoctrineCollectionListenerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@
1212
namespace Symfony\Bridge\Doctrine\Tests\Form\EventListener;
1313

1414
use Doctrine\Common\Collections\ArrayCollection;
15+
use PHPUnit\Framework\TestCase;
1516
use Symfony\Bridge\Doctrine\Form\EventListener\MergeDoctrineCollectionListener;
1617
use Symfony\Component\EventDispatcher\EventDispatcher;
1718
use Symfony\Component\Form\FormBuilder;
1819
use Symfony\Component\Form\FormEvent;
1920
use Symfony\Component\Form\FormEvents;
2021

21-
class MergeDoctrineCollectionListenerTest extends \PHPUnit_Framework_TestCase
22+
class MergeDoctrineCollectionListenerTest extends TestCase
2223
{
2324
/** @var \Doctrine\Common\Collections\ArrayCollection */
2425
private $collection;

‎src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php

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

1212
namespace Symfony\Bridge\Doctrine\Tests;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Bridge\Doctrine\ManagerRegistry;
1516
use Symfony\Bridge\ProxyManager\Tests\LazyProxy\Dumper\PhpDumperTest;
1617

17-
class ManagerRegistryTest extends \PHPUnit_Framework_TestCase
18+
class ManagerRegistryTest extends TestCase
1819
{
1920
public static function setUpBeforeClass()
2021
{

‎src/Symfony/Bridge/Doctrine/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"doctrine/orm": "^2.4.5"
3838
},
3939
"conflict": {
40+
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
4041
"symfony/dependency-injection": "<3.3"
4142
},
4243
"suggest": {

‎src/Symfony/Bundle/FrameworkBundle/Tests/Command/YamlLintCommandTest.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\Command;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Bundle\FrameworkBundle\Command\YamlLintCommand;
1516
use Symfony\Bundle\FrameworkBundle\Console\Application;
1617
use Symfony\Component\Console\Application as BaseApplication;
@@ -25,7 +26,7 @@
2526
*
2627
* @author Robin Chalas <robin.chalas@gmail.com>
2728
*/
28-
class YamlLintCommandTest extends \PHPUnit_Framework_TestCase
29+
class YamlLintCommandTest extends TestCase
2930
{
3031
private $files;
3132

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CachePoolClearerPassTest.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\CachePoolClearerPass;
1516
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\CachePoolPass;
1617
use Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass;
@@ -20,7 +21,7 @@
2021
use Symfony\Component\DependencyInjection\Reference;
2122
use Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer;
2223

23-
class CachePoolClearerPassTest extends \PHPUnit_Framework_TestCase
24+
class CachePoolClearerPassTest extends TestCase
2425
{
2526
public function testPoolRefsAreWeak()
2627
{

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

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

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

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\CachePoolPass;
1516
use Symfony\Component\DependencyInjection\ChildDefinition;
1617
use Symfony\Component\DependencyInjection\ContainerBuilder;
1718
use Symfony\Component\DependencyInjection\Definition;
1819
use Symfony\Component\DependencyInjection\Reference;
1920

20-
class CachePoolPassTest extends \PHPUnit_Framework_TestCase
21+
class CachePoolPassTest extends TestCase
2122
{
2223
private $cachePoolPass;
2324

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

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

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

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ControllerArgumentValueResolverPass;
1516
use Symfony\Component\DependencyInjection\ContainerBuilder;
1617
use Symfony\Component\DependencyInjection\Definition;
1718
use Symfony\Component\DependencyInjection\Reference;
1819
use Symfony\Component\HttpKernel\Controller\ArgumentResolver;
1920

20-
class ControllerArgumentValueResolverPassTest extends \PHPUnit_Framework_TestCase
21+
class ControllerArgumentValueResolverPassTest extends TestCase
2122
{
2223
public function testServicesAreOrderedAccordingToPriority()
2324
{

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
"conflict": {
6161
"phpdocumentor/reflection-docblock": "<3.0",
6262
"phpdocumentor/type-resolver": "<0.2.0",
63+
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
6364
"symfony/asset": "<3.3",
6465
"symfony/console": "<3.3",
6566
"symfony/serializer": "<3.3",

‎src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallConfigTest.php

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

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

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Bundle\SecurityBundle\Security\FirewallConfig;
1516

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

‎src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallContextTest.php

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

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

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Bundle\SecurityBundle\Security\FirewallConfig;
1516
use Symfony\Bundle\SecurityBundle\Security\FirewallContext;
1617
use Symfony\Component\Security\Http\Firewall\ExceptionListener;
1718
use Symfony\Component\Security\Http\Firewall\ListenerInterface;
1819

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

‎src/Symfony/Bundle/SecurityBundle/Tests/SecurityUserValueResolverTest.php

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

1212
namespace Symfony\Bundle\SecurityBundle\Tests;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Bundle\SecurityBundle\SecurityUserValueResolver;
1516
use Symfony\Component\HttpFoundation\Request;
1617
use Symfony\Component\HttpKernel\Controller\ArgumentResolver;
@@ -20,7 +21,7 @@
2021
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
2122
use Symfony\Component\Security\Core\User\UserInterface;
2223

23-
class SecurityUserValueResolverTest extends \PHPUnit_Framework_TestCase
24+
class SecurityUserValueResolverTest extends TestCase
2425
{
2526
public function testResolveNoToken()
2627
{

‎src/Symfony/Bundle/WebProfilerBundle/Tests/Csp/ContentSecurityPolicyHandlerTest.php

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

1212
namespace Symfony\Bundle\WebProfilerBundle\Tests\Csp;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Bundle\WebProfilerBundle\Csp\ContentSecurityPolicyHandler;
1516
use Symfony\Component\HttpFoundation\Request;
1617
use Symfony\Component\HttpFoundation\Response;
1718

18-
class ContentSecurityPolicyHandlerTest extends \PHPUnit_Framework_TestCase
19+
class ContentSecurityPolicyHandlerTest extends TestCase
1920
{
2021
/**
2122
* @dataProvider provideRequestAndResponses

‎src/Symfony/Component/Cache/Tests/Adapter/MaxIdLengthAdapterTest.php

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

1212
namespace Symfony\Component\Cache\Tests\Adapter;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Cache\Adapter\AbstractAdapter;
1516

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

‎src/Symfony/Component/Cache/Tests/Adapter/NullAdapterTest.php

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

1212
namespace Symfony\Component\Cache\Tests\Adapter;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Psr\Cache\CacheItemInterface;
1516
use Symfony\Component\Cache\Adapter\NullAdapter;
1617

1718
/**
1819
* @group time-sensitive
1920
*/
20-
class NullAdapterTest extends \PHPUnit_Framework_TestCase
21+
class NullAdapterTest extends TestCase
2122
{
2223
public function createCachePool()
2324
{

‎src/Symfony/Component/Cache/Tests/CacheItemTest.php

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

1212
namespace Symfony\Component\Cache\Tests;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Cache\CacheItem;
1516

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

‎src/Symfony/Component/Cache/Tests/DoctrineProviderTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@
1212
namespace Symfony\Component\Cache\Tests;
1313

1414
use Doctrine\Common\Cache\CacheProvider;
15+
use PHPUnit\Framework\TestCase;
1516
use Symfony\Component\Cache\Adapter\ArrayAdapter;
1617
use Symfony\Component\Cache\DoctrineProvider;
1718

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

‎src/Symfony/Component/Config/Tests/Definition/Builder/BooleanNodeDefinitionTest.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\Definition\Builder;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Config\Definition\Builder\BooleanNodeDefinition;
1516

16-
class BooleanNodeDefinitionTest extends \PHPUnit_Framework_TestCase
17+
class BooleanNodeDefinitionTest extends TestCase
1718
{
1819
/**
1920
* @expectedException \Symfony\Component\Config\Definition\Exception\InvalidDefinitionException

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

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

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

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Config\Resource\ClassExistenceResource;
1516
use Symfony\Component\Config\Tests\Fixtures\Resource\ConditionalClass;
1617

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

‎src/Symfony/Component/Console/Tests/Command/LockableTraitTest.php

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

1212
namespace Symfony\Component\Console\Tests\Command;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Console\Tester\CommandTester;
1516
use Symfony\Component\Filesystem\LockHandler;
1617

17-
class LockableTraitTest extends \PHPUnit_Framework_TestCase
18+
class LockableTraitTest extends TestCase
1819
{
1920
protected static $fixturesPath;
2021

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

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

1212
namespace Symfony\Component\Console\Tests\Helper;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Console\Input\StreamableInputInterface;
1516

16-
abstract class AbstractQuestionHelperTest extends \PHPUnit_Framework_TestCase
17+
abstract class AbstractQuestionHelperTest extends TestCase
1718
{
1819
protected function createStreamableInputInterfaceMock($stream = null, $interactive = true)
1920
{

‎src/Symfony/Component/Console/Tests/TerminalTest.php

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

1212
namespace Symfony\Component\Console\Tests;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Console\Terminal;
1516

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

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/FactoryReturnTypePassTest.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\FactoryReturnTypePass;
1516
use Symfony\Component\DependencyInjection\ContainerBuilder;
1617
use Symfony\Component\DependencyInjection\Reference;
@@ -23,7 +24,7 @@
2324
*
2425
* @group legacy
2526
*/
26-
class FactoryReturnTypePassTest extends \PHPUnit_Framework_TestCase
27+
class FactoryReturnTypePassTest extends TestCase
2728
{
2829
public function testProcess()
2930
{

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

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

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

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\DependencyInjection\Compiler\PassConfig;
1516
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
1617

1718
/**
1819
* @author Guilhem N <egetick@gmail.com>
1920
*/
20-
class PassConfigTest extends \PHPUnit_Framework_TestCase
21+
class PassConfigTest extends TestCase
2122
{
2223
public function testPassOrdering()
2324
{

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

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

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

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\DependencyInjection\Compiler\PriorityTaggedServiceTrait;
1516
use Symfony\Component\DependencyInjection\ContainerBuilder;
1617
use Symfony\Component\DependencyInjection\Reference;
1718

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

‎src/Symfony/Component/DependencyInjection/Tests/Config/AutowireServiceResourceTest.php

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

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

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\DependencyInjection\Compiler\AutowirePass;
1516
use Symfony\Component\DependencyInjection\Config\AutowireServiceResource;
1617

1718
/**
1819
* @group legacy
1920
*/
20-
class AutowireServiceResourceTest extends \PHPUnit_Framework_TestCase
21+
class AutowireServiceResourceTest extends TestCase
2122
{
2223
/**
2324
* @var AutowireServiceResource

‎src/Symfony/Component/DependencyInjection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php

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

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

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\DependencyInjection\ParameterBag\EnvPlaceholderParameterBag;
1516

16-
class EnvPlaceholderParameterBagTest extends \PHPUnit_Framework_TestCase
17+
class EnvPlaceholderParameterBagTest extends TestCase
1718
{
1819
/**
1920
* @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException

‎src/Symfony/Component/DomCrawler/Tests/ImageTest.php

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

1212
namespace Symfony\Component\DomCrawler\Tests;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\DomCrawler\Image;
1516

16-
class ImageTest extends \PHPUnit_Framework_TestCase
17+
class ImageTest extends TestCase
1718
{
1819
/**
1920
* @expectedException \LogicException

0 commit comments

Comments
 (0)
0