Skip to content

Commit 1fc7526

Browse files
Merge branch '5.4' into 6.2
* 5.4: minor #49253 [PHPUnit 10] Use `TestCase` suffix for abstract tests in `/Tests/` (OskarStark)
2 parents bb0115c + a95ab35 commit 1fc7526

39 files changed

+59
-53
lines changed

Tests/Console/Descriptor/AbstractDescriptorTest.php renamed to Tests/Console/Descriptor/AbstractDescriptorTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
use Symfony\Component\Routing\Route;
2525
use Symfony\Component\Routing\RouteCollection;
2626

27-
abstract class AbstractDescriptorTest extends TestCase
27+
abstract class AbstractDescriptorTestCase extends TestCase
2828
{
2929
private $colSize;
3030

Tests/Console/Descriptor/JsonDescriptorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
use Symfony\Bundle\FrameworkBundle\Console\Descriptor\JsonDescriptor;
1515

16-
class JsonDescriptorTest extends AbstractDescriptorTest
16+
class JsonDescriptorTest extends AbstractDescriptorTestCase
1717
{
1818
protected static function getDescriptor()
1919
{

Tests/Console/Descriptor/MarkdownDescriptorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
use Symfony\Bundle\FrameworkBundle\Console\Descriptor\MarkdownDescriptor;
1515

16-
class MarkdownDescriptorTest extends AbstractDescriptorTest
16+
class MarkdownDescriptorTest extends AbstractDescriptorTestCase
1717
{
1818
protected static function getDescriptor()
1919
{

Tests/Console/Descriptor/TextDescriptorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
1616
use Symfony\Component\Routing\Route;
1717

18-
class TextDescriptorTest extends AbstractDescriptorTest
18+
class TextDescriptorTest extends AbstractDescriptorTestCase
1919
{
2020
private static $fileLinkFormatter = null;
2121

Tests/Console/Descriptor/XmlDescriptorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
use Symfony\Bundle\FrameworkBundle\Console\Descriptor\XmlDescriptor;
1515

16-
class XmlDescriptorTest extends AbstractDescriptorTest
16+
class XmlDescriptorTest extends AbstractDescriptorTestCase
1717
{
1818
protected static function getDescriptor()
1919
{

Tests/DependencyInjection/Fixtures/php/workflow_not_valid.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?php
22

3-
use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest;
3+
use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase;
44

55
$container->loadFromExtension('framework', [
66
'http_method_override' => false,
77
'workflows' => [
88
'my_workflow' => [
99
'type' => 'state_machine',
1010
'supports' => [
11-
FrameworkExtensionTest::class,
11+
FrameworkExtensionTestCase::class,
1212
],
1313
'places' => [
1414
'first',

Tests/DependencyInjection/Fixtures/php/workflow_with_guard_expression.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?php
22

3-
use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest;
3+
use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase;
44

55
$container->loadFromExtension('framework', [
66
'http_method_override' => false,
77
'workflows' => [
88
'article' => [
99
'type' => 'workflow',
1010
'supports' => [
11-
FrameworkExtensionTest::class,
11+
FrameworkExtensionTestCase::class,
1212
],
1313
'initial_marking' => ['draft'],
1414
'places' => [

Tests/DependencyInjection/Fixtures/php/workflow_with_multiple_transitions_with_same_name.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?php
22

3-
use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest;
3+
use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase;
44

55
$container->loadFromExtension('framework', [
66
'http_method_override' => false,
77
'workflows' => [
88
'article' => [
99
'type' => 'workflow',
1010
'supports' => [
11-
FrameworkExtensionTest::class,
11+
FrameworkExtensionTestCase::class,
1212
],
1313
'initial_marking' => ['draft'],
1414
'places' => [

Tests/DependencyInjection/Fixtures/php/workflow_with_no_events_to_dispatch.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest;
3+
use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase;
44

55
$container->loadFromExtension('framework', [
66
'http_method_override' => false,
@@ -12,7 +12,7 @@
1212
'property' => 'state',
1313
],
1414
'supports' => [
15-
FrameworkExtensionTest::class,
15+
FrameworkExtensionTestCase::class,
1616
],
1717
'events_to_dispatch' => [],
1818
'places' => [

Tests/DependencyInjection/Fixtures/php/workflow_with_specified_events_to_dispatch.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest;
3+
use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase;
44

55
$container->loadFromExtension('framework', [
66
'http_method_override' => false,
@@ -12,7 +12,7 @@
1212
'property' => 'state',
1313
],
1414
'supports' => [
15-
FrameworkExtensionTest::class,
15+
FrameworkExtensionTestCase::class,
1616
],
1717
'events_to_dispatch' => [
1818
'workflow.leave',

0 commit comments

Comments
 (0)