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',

Tests/DependencyInjection/Fixtures/php/workflow_with_support_and_support_strategy.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' => 'workflow',
1010
'supports' => [
11-
FrameworkExtensionTest::class,
11+
FrameworkExtensionTestCase::class,
1212
],
1313
'support_strategy' => 'foobar',
1414
'places' => [

Tests/DependencyInjection/Fixtures/php/workflows.php

Lines changed: 4 additions & 4 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
'metadata' => [
@@ -44,7 +44,7 @@
4444
],
4545
'pull_request' => [
4646
'supports' => [
47-
FrameworkExtensionTest::class,
47+
FrameworkExtensionTestCase::class,
4848
],
4949
'initial_marking' => 'start',
5050
'metadata' => [
@@ -103,7 +103,7 @@
103103
'service' => 'workflow_service',
104104
],
105105
'supports' => [
106-
FrameworkExtensionTest::class,
106+
FrameworkExtensionTestCase::class,
107107
],
108108
'places' => [
109109
['name' => 'first'],

Tests/DependencyInjection/Fixtures/php/workflows_explicitly_enabled.php

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

3+
use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase;
4+
35
$container->loadFromExtension('framework', [
46
'http_method_override' => false,
57
'workflows' => [
68
'enabled' => true,
79
'foo' => [
810
'type' => 'workflow',
9-
'supports' => ['Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest'],
11+
'supports' => [FrameworkExtensionTestCase::class],
1012
'initial_marking' => ['bar'],
1113
'places' => ['bar', 'baz'],
1214
'transitions' => [

Tests/DependencyInjection/Fixtures/php/workflows_explicitly_enabled_named_workflows.php

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

3+
use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase;
4+
35
$container->loadFromExtension('framework', [
46
'http_method_override' => false,
57
'workflows' => [
68
'enabled' => true,
79
'workflows' => [
810
'type' => 'workflow',
9-
'supports' => ['Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest'],
11+
'supports' => [FrameworkExtensionTestCase::class],
1012
'initial_marking' => ['bar'],
1113
'places' => ['bar', 'baz'],
1214
'transitions' => [

Tests/DependencyInjection/Fixtures/xml/workflow_not_valid.xml

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

99
<framework:config http-method-override="false">
1010
<framework:workflow name="my_workflow" type="state_machine">
11-
<framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
11+
<framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase</framework:support>
1212
<framework:place name="first" />
1313
<framework:place name="middle" />
1414
<framework:place name="last" />

Tests/DependencyInjection/Fixtures/xml/workflow_with_guard_expression.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<framework:config http-method-override="false">
1010
<framework:workflow name="article" type="workflow">
1111
<framework:initial-marking>draft</framework:initial-marking>
12-
<framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
12+
<framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase</framework:support>
1313
<framework:place>draft</framework:place>
1414
<framework:place>wait_for_journalist</framework:place>
1515
<framework:place>approved_by_journalist</framework:place>

Tests/DependencyInjection/Fixtures/xml/workflow_with_multiple_transitions_with_same_name.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<framework:config http-method-override="false">
1010
<framework:workflow name="article" type="workflow">
1111
<framework:initial-marking>draft</framework:initial-marking>
12-
<framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
12+
<framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase</framework:support>
1313
<framework:place name="draft" />
1414
<framework:place name="wait_for_journalist" />
1515
<framework:place name="approved_by_journalist" />

Tests/DependencyInjection/Fixtures/xml/workflow_with_no_events_to_dispatch.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<framework:workflow name="my_workflow" type="state_machine">
1111
<framework:initial-marking>one</framework:initial-marking>
1212
<framework:marking-store type="method" property="state" />
13-
<framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
13+
<framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase</framework:support>
1414
<framework:event-to-dispatch></framework:event-to-dispatch>
1515
<framework:place name="one" />
1616
<framework:place name="two" />

Tests/DependencyInjection/Fixtures/xml/workflow_with_specified_events_to_dispatch.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<framework:workflow name="my_workflow" type="state_machine">
1111
<framework:initial-marking>one</framework:initial-marking>
1212
<framework:marking-store type="method" property="state" />
13-
<framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
13+
<framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase</framework:support>
1414
<framework:event-to-dispatch>workflow.leave</framework:event-to-dispatch>
1515
<framework:event-to-dispatch>workflow.completed</framework:event-to-dispatch>
1616
<framework:place name="one" />

Tests/DependencyInjection/Fixtures/xml/workflow_with_support_and_support_strategy.xml

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

99
<framework:config http-method-override="false">
1010
<framework:workflow name="my_workflow" support-strategy="foobar" type="workflow">
11-
<framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
11+
<framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase</framework:support>
1212
<framework:place name="first" />
1313
<framework:place name="last" />
1414
<framework:transition name="foobar">

Tests/DependencyInjection/Fixtures/xml/workflows.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<framework:audit-trail enabled="true"/>
1212
<framework:initial-marking>draft</framework:initial-marking>
1313
<framework:marking-store type="method" property="state" />
14-
<framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
14+
<framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase</framework:support>
1515
<framework:place name="draft" />
1616
<framework:place name="wait_for_journalist" />
1717
<framework:place name="approved_by_journalist" />
@@ -45,7 +45,7 @@
4545
<framework:workflow name="pull_request">
4646
<framework:audit-trail enabled="false"/>
4747
<framework:initial-marking>start</framework:initial-marking>
48-
<framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
48+
<framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase</framework:support>
4949
<framework:place name="start">
5050
<framework:metadata>
5151
<framework:title>place start title</framework:title>
@@ -96,7 +96,7 @@
9696

9797
<framework:workflow name="service_marking_store_workflow" type="workflow">
9898
<framework:marking-store service="workflow_service"/>
99-
<framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
99+
<framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase</framework:support>
100100
<!-- Simple format -->
101101
<framework:place>first</framework:place>
102102
<framework:place>last</framework:place>

Tests/DependencyInjection/Fixtures/xml/workflows_explicitly_enabled.xml

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

88
<framework:config http-method-override="false">
99
<framework:workflow enabled="true" name="foo" type="workflow" initial-marking="bar">
10-
<framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
10+
<framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase</framework:support>
1111
<framework:place>bar</framework:place>
1212
<framework:place>baz</framework:place>
1313
<framework:transition name="bar_baz">

Tests/DependencyInjection/Fixtures/xml/workflows_explicitly_enabled_named_workflows.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<framework:config http-method-override="false">
99
<framework:workflow enabled="true" name="workflows" type="workflow">
1010
<framework:initial-marking>bar</framework:initial-marking>
11-
<framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
11+
<framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase</framework:support>
1212
<framework:place>bar</framework:place>
1313
<framework:place>baz</framework:place>
1414
<framework:transition name="bar_baz">

Tests/DependencyInjection/Fixtures/yml/workflow_not_valid.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ framework:
44
my_workflow:
55
type: state_machine
66
supports:
7-
- Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
7+
- Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase
88
places: [first, middle, last]
99
transitions:
1010
go:

Tests/DependencyInjection/Fixtures/yml/workflow_with_guard_expression.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ framework:
44
article:
55
type: workflow
66
supports:
7-
- Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
7+
- Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase
88
initial_marking: [draft]
99
places:
1010
- draft

Tests/DependencyInjection/Fixtures/yml/workflow_with_multiple_transitions_with_same_name.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ framework:
44
article:
55
type: workflow
66
supports:
7-
- Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
7+
- Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase
88
initial_marking: [draft]
99
places:
1010
- draft

Tests/DependencyInjection/Fixtures/yml/workflow_with_no_events_to_dispatch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ framework:
99
type: method
1010
property: state
1111
supports:
12-
- Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
12+
- Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase
1313
places:
1414
- one
1515
- two

Tests/DependencyInjection/Fixtures/yml/workflow_with_specified_events_to_dispatch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ framework:
99
type: method
1010
property: state
1111
supports:
12-
- Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
12+
- Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase
1313
places:
1414
- one
1515
- two

Tests/DependencyInjection/Fixtures/yml/workflow_with_support_and_support_strategy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ framework:
44
my_workflow:
55
type: workflow
66
supports:
7-
- Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
7+
- Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase
88
support_strategy: foobar
99
places:
1010
- first

Tests/DependencyInjection/Fixtures/yml/workflows.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ framework:
44
article:
55
type: workflow
66
supports:
7-
- Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
7+
- Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase
88
initial_marking: [draft]
99
metadata:
1010
title: article workflow
@@ -32,7 +32,7 @@ framework:
3232
to: [published]
3333
pull_request:
3434
supports:
35-
- Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
35+
- Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase
3636
initial_marking: start
3737
metadata:
3838
title: workflow title
@@ -75,7 +75,7 @@ framework:
7575
marking_store:
7676
service: workflow_service
7777
supports:
78-
- Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
78+
- Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase
7979
places:
8080
- { name: first }
8181
- { name: last }

0 commit comments

Comments
 (0)