Skip to content

Commit 2ad5a42

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.7' into 2.8
* 2.7: Update to PHPUnit namespaces remove translation data collector when not usable
2 parents 81acd97 + 298e6be commit 2ad5a42

Some content is hidden

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

41 files changed

+83
-41
lines changed

‎Tests/Compiler/AnalyzeServiceReferencesPassTest.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\Definition;
1516
use Symfony\Component\DependencyInjection\Compiler\AnalyzeServiceReferencesPass;
1617
use Symfony\Component\DependencyInjection\Compiler\RepeatedPass;
1718
use Symfony\Component\DependencyInjection\Reference;
1819
use Symfony\Component\DependencyInjection\ContainerBuilder;
1920

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

‎Tests/Compiler/AutoAliasServicePassTest.php

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

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

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

17-
class AutoAliasServicePassTest extends \PHPUnit_Framework_TestCase
18+
class AutoAliasServicePassTest extends TestCase
1819
{
1920
/**
2021
* @expectedException \Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException

‎Tests/Compiler/CheckCircularReferencesPassTest.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\Reference;
1516
use Symfony\Component\DependencyInjection\Compiler\CheckCircularReferencesPass;
1617
use Symfony\Component\DependencyInjection\Compiler\AnalyzeServiceReferencesPass;
1718
use Symfony\Component\DependencyInjection\Compiler\Compiler;
1819
use Symfony\Component\DependencyInjection\ContainerBuilder;
1920

20-
class CheckCircularReferencesPassTest extends \PHPUnit_Framework_TestCase
21+
class CheckCircularReferencesPassTest extends TestCase
2122
{
2223
/**
2324
* @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException

‎Tests/Compiler/CheckDefinitionValidityPassTest.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\CheckDefinitionValidityPass;
1516
use Symfony\Component\DependencyInjection\ContainerInterface;
1617
use Symfony\Component\DependencyInjection\ContainerBuilder;
1718

18-
class CheckDefinitionValidityPassTest extends \PHPUnit_Framework_TestCase
19+
class CheckDefinitionValidityPassTest extends TestCase
1920
{
2021
/**
2122
* @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException

‎Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php

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

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

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

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

‎Tests/Compiler/CheckReferenceValidityPassTest.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\Scope;
1516
use Symfony\Component\DependencyInjection\Compiler\CheckReferenceValidityPass;
1617
use Symfony\Component\DependencyInjection\ContainerInterface;
1718
use Symfony\Component\DependencyInjection\Reference;
1819
use Symfony\Component\DependencyInjection\ContainerBuilder;
1920

20-
class CheckReferenceValidityPassTest extends \PHPUnit_Framework_TestCase
21+
class CheckReferenceValidityPassTest extends TestCase
2122
{
2223
/**
2324
* @group legacy

‎Tests/Compiler/DecoratorServicePassTest.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\Alias;
1516
use Symfony\Component\DependencyInjection\ContainerBuilder;
1617
use Symfony\Component\DependencyInjection\Compiler\DecoratorServicePass;
1718

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

‎Tests/Compiler/ExtensionCompilerPassTest.php

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

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

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\DependencyInjection\Compiler\ExtensionCompilerPass;
1516

1617
/**
1718
* @author Wouter J <[email protected]>
1819
*/
19-
class ExtensionCompilerPassTest extends \PHPUnit_Framework_TestCase
20+
class ExtensionCompilerPassTest extends TestCase
2021
{
2122
private $container;
2223
private $pass;

‎Tests/Compiler/InlineServiceDefinitionsPassTest.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\Scope;
1516
use Symfony\Component\DependencyInjection\Definition;
1617
use Symfony\Component\DependencyInjection\Compiler\AnalyzeServiceReferencesPass;
@@ -19,7 +20,7 @@
1920
use Symfony\Component\DependencyInjection\Reference;
2021
use Symfony\Component\DependencyInjection\ContainerBuilder;
2122

22-
class InlineServiceDefinitionsPassTest extends \PHPUnit_Framework_TestCase
23+
class InlineServiceDefinitionsPassTest extends TestCase
2324
{
2425
public function testProcess()
2526
{

‎Tests/Compiler/IntegrationTest.php

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

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

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

1819
/**
1920
* This class tests the integration of the different compiler passes.
2021
*/
21-
class IntegrationTest extends \PHPUnit_Framework_TestCase
22+
class IntegrationTest extends TestCase
2223
{
2324
/**
2425
* This tests that dependencies are correctly processed.

0 commit comments

Comments
 (0)