Skip to content

Commit 29ddde8

Browse files
Merge branch '3.2'
* 3.2: Fix typo in process error message Update to PHPUnit namespaces Minor typo fix messsagesData -> messagesData remove translation data collector when not usable
2 parents 2ec2d3e + 63ec976 commit 29ddde8

Some content is hidden

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

48 files changed

+98
-48
lines changed

Tests/Bundle/BundleTest.php

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

1212
namespace Symfony\Component\HttpKernel\Tests\Bundle;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\DependencyInjection\ContainerBuilder;
1516
use Symfony\Component\HttpKernel\Bundle\Bundle;
1617
use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionNotValidBundle\ExtensionNotValidBundle;
1718
use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\ExtensionPresentBundle;
1819
use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionAbsentBundle\ExtensionAbsentBundle;
1920
use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\Command\FooCommand;
2021

21-
class BundleTest extends \PHPUnit_Framework_TestCase
22+
class BundleTest extends TestCase
2223
{
2324
public function testGetContainerExtension()
2425
{

Tests/CacheClearer/ChainCacheClearerTest.php

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

1212
namespace Symfony\Component\HttpKernel\Tests\CacheClearer;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\HttpKernel\CacheClearer\ChainCacheClearer;
1516

16-
class ChainCacheClearerTest extends \PHPUnit_Framework_TestCase
17+
class ChainCacheClearerTest extends TestCase
1718
{
1819
protected static $cacheDir;
1920

Tests/CacheWarmer/CacheWarmerAggregateTest.php

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

1212
namespace Symfony\Component\HttpKernel\Tests\CacheWarmer;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerAggregate;
1516

16-
class CacheWarmerAggregateTest extends \PHPUnit_Framework_TestCase
17+
class CacheWarmerAggregateTest extends TestCase
1718
{
1819
protected static $cacheDir;
1920

Tests/CacheWarmer/CacheWarmerTest.php

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

1212
namespace Symfony\Component\HttpKernel\Tests\CacheWarmer;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmer;
1516

16-
class CacheWarmerTest extends \PHPUnit_Framework_TestCase
17+
class CacheWarmerTest extends TestCase
1718
{
1819
protected static $cacheFile;
1920

Tests/ClientTest.php

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

1212
namespace Symfony\Component\HttpKernel\Tests;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\HttpKernel\Client;
1516
use Symfony\Component\HttpFoundation\Response;
1617
use Symfony\Component\HttpFoundation\StreamedResponse;
@@ -21,7 +22,7 @@
2122
/**
2223
* @group time-sensitive
2324
*/
24-
class ClientTest extends \PHPUnit_Framework_TestCase
25+
class ClientTest extends TestCase
2526
{
2627
public function testDoRequest()
2728
{

Tests/Config/EnvParametersResourceTest.php

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

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

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\HttpKernel\Config\EnvParametersResource;
1516

16-
class EnvParametersResourceTest extends \PHPUnit_Framework_TestCase
17+
class EnvParametersResourceTest extends TestCase
1718
{
1819
protected $prefix = '__DUMMY_';
1920
protected $initialEnv;

Tests/Config/FileLocatorTest.php

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

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

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\HttpKernel\Config\FileLocator;
1516

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

Tests/Controller/ControllerResolverTest.php

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

1212
namespace Symfony\Component\HttpKernel\Tests\Controller;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Psr\Log\LoggerInterface;
1516
use Symfony\Component\HttpKernel\Controller\ControllerResolver;
1617
use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\NullableController;
1718
use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\VariadicController;
1819
use Symfony\Component\HttpFoundation\Request;
1920

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

Tests/DataCollector/ConfigDataCollectorTest.php

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

1212
namespace Symfony\Component\HttpKernel\Tests\DataCollector;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\HttpKernel\DataCollector\ConfigDataCollector;
1516
use Symfony\Component\HttpKernel\Kernel;
1617
use Symfony\Component\Config\Loader\LoaderInterface;
1718
use Symfony\Component\HttpFoundation\Request;
1819
use Symfony\Component\HttpFoundation\Response;
1920

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

Tests/DataCollector/DumpDataCollectorTest.php

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

1212
namespace Symfony\Component\HttpKernel\Tests\DataCollector;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\HttpKernel\DataCollector\DumpDataCollector;
1516
use Symfony\Component\HttpFoundation\Request;
1617
use Symfony\Component\HttpFoundation\Response;
@@ -19,7 +20,7 @@
1920
/**
2021
* @author Nicolas Grekas <p@tchwork.com>
2122
*/
22-
class DumpDataCollectorTest extends \PHPUnit_Framework_TestCase
23+
class DumpDataCollectorTest extends TestCase
2324
{
2425
public function testDump()
2526
{

0 commit comments

Comments
 (0)