Skip to content

Commit d09c2b0

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.4' into 6.2
* 5.4: [FrameworkBundle] Improve error message in MicroKernelTrait when using deprecated configureRoutes(RouteCollectionBuilder) with symfony/routing >= 6.0 Add warning about Symfony 5.2 changing pcntl_async_signals [Tests] Fix static calls and Mock var annotation [FrameworkBundle] Fix checkboxes check assertions [Notifier][WebProfilerBundle] Ignore messages whose `getNotification` returns `null` [HttpClient] Fix over-encoding of URL parts to match browser's behavior Fix Psalm job [HttpClient] Fix data collector [Tests] Migrate tests to static data providers [Semaphore] Fix test Fix: Split and clean up tests Remove unused data provider add Sender to the list of bypassed headers
2 parents 9343a35 + 8854493 commit d09c2b0

File tree

4 files changed

+33
-33
lines changed

4 files changed

+33
-33
lines changed

‎Tests/Dumper/GraphvizDumperTest.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,28 +47,28 @@ public function testDumpWithMarking($definition, $marking, $expected)
4747
$this->assertEquals($expected, $dump);
4848
}
4949

50-
public function provideWorkflowDefinitionWithMarking()
50+
public static function provideWorkflowDefinitionWithMarking()
5151
{
5252
yield [
53-
$this->createComplexWorkflowDefinition(),
53+
self::createComplexWorkflowDefinition(),
5454
new Marking(['b' => 1]),
55-
$this->createComplexWorkflowDefinitionDumpWithMarking(),
55+
self::createComplexWorkflowDefinitionDumpWithMarking(),
5656
];
5757

5858
yield [
59-
$this->createSimpleWorkflowDefinition(),
59+
self::createSimpleWorkflowDefinition(),
6060
new Marking(['c' => 1, 'd' => 1]),
61-
$this->createSimpleWorkflowDumpWithMarking(),
61+
self::createSimpleWorkflowDumpWithMarking(),
6262
];
6363
}
6464

65-
public function provideWorkflowDefinitionWithoutMarking()
65+
public static function provideWorkflowDefinitionWithoutMarking()
6666
{
67-
yield [$this->createComplexWorkflowDefinition(), $this->provideComplexWorkflowDumpWithoutMarking()];
68-
yield [$this->createSimpleWorkflowDefinition(), $this->provideSimpleWorkflowDumpWithoutMarking()];
67+
yield [self::createComplexWorkflowDefinition(), self::provideComplexWorkflowDumpWithoutMarking()];
68+
yield [self::createSimpleWorkflowDefinition(), self::provideSimpleWorkflowDumpWithoutMarking()];
6969
}
7070

71-
public function createComplexWorkflowDefinitionDumpWithMarking()
71+
public static function createComplexWorkflowDefinitionDumpWithMarking()
7272
{
7373
return 'digraph workflow {
7474
ratio="compress" rankdir="LR"
@@ -106,7 +106,7 @@ public function createComplexWorkflowDefinitionDumpWithMarking()
106106
';
107107
}
108108

109-
public function createSimpleWorkflowDumpWithMarking()
109+
public static function createSimpleWorkflowDumpWithMarking()
110110
{
111111
return 'digraph workflow {
112112
ratio="compress" rankdir="LR"
@@ -126,7 +126,7 @@ public function createSimpleWorkflowDumpWithMarking()
126126
';
127127
}
128128

129-
public function provideComplexWorkflowDumpWithoutMarking()
129+
public static function provideComplexWorkflowDumpWithoutMarking()
130130
{
131131
return 'digraph workflow {
132132
ratio="compress" rankdir="LR"
@@ -164,7 +164,7 @@ public function provideComplexWorkflowDumpWithoutMarking()
164164
';
165165
}
166166

167-
public function provideSimpleWorkflowDumpWithoutMarking()
167+
public static function provideSimpleWorkflowDumpWithoutMarking()
168168
{
169169
return 'digraph workflow {
170170
ratio="compress" rankdir="LR"

‎Tests/Dumper/MermaidDumperTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ public function testDumpWorkflowWithMarking(Definition $definition, Marking $mar
7171
$this->assertEquals($expected, $dump);
7272
}
7373

74-
public function provideWorkflowDefinitionWithoutMarking(): array
74+
public static function provideWorkflowDefinitionWithoutMarking(): array
7575
{
7676
return [
7777
[
78-
$this->createComplexWorkflowDefinition(),
78+
self::createComplexWorkflowDefinition(),
7979
"graph LR\n"
8080
."a0([\"a\"])\n"
8181
."b1((\"b\"))\n"
@@ -108,7 +108,7 @@ public function provideWorkflowDefinitionWithoutMarking(): array
108108
.'transition5-->g6',
109109
],
110110
[
111-
$this->createWorkflowWithSameNameTransition(),
111+
self::createWorkflowWithSameNameTransition(),
112112
"graph LR\n"
113113
."a0([\"a\"])\n"
114114
."b1((\"b\"))\n"
@@ -128,7 +128,7 @@ public function provideWorkflowDefinitionWithoutMarking(): array
128128
.'transition3-->a0',
129129
],
130130
[
131-
$this->createSimpleWorkflowDefinition(),
131+
self::createSimpleWorkflowDefinition(),
132132
"graph LR\n"
133133
."a0([\"a\"])\n"
134134
."b1((\"b\"))\n"
@@ -146,7 +146,7 @@ public function provideWorkflowDefinitionWithoutMarking(): array
146146
];
147147
}
148148

149-
public function provideWorkflowWithReservedWords()
149+
public static function provideWorkflowWithReservedWords()
150150
{
151151
$builder = new DefinitionBuilder();
152152

@@ -177,11 +177,11 @@ public function provideWorkflowWithReservedWords()
177177
];
178178
}
179179

180-
public function provideStatemachine(): array
180+
public static function provideStatemachine(): array
181181
{
182182
return [
183183
[
184-
$this->createComplexStateMachineDefinition(),
184+
self::createComplexStateMachineDefinition(),
185185
"graph LR\n"
186186
."a0([\"a\"])\n"
187187
."b1((\"b\"))\n"
@@ -196,15 +196,15 @@ public function provideStatemachine(): array
196196
];
197197
}
198198

199-
public function provideWorkflowWithMarking(): array
199+
public static function provideWorkflowWithMarking(): array
200200
{
201201
$marking = new Marking();
202202
$marking->mark('b');
203203
$marking->mark('c');
204204

205205
return [
206206
[
207-
$this->createSimpleWorkflowDefinition(),
207+
self::createSimpleWorkflowDefinition(),
208208
$marking,
209209
"graph LR\n"
210210
."a0([\"a\"])\n"

‎Tests/Dumper/PlantUmlDumperTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ public function testDumpWorkflowWithoutMarking($definition, $marking, $expectedF
3636
$this->assertStringEqualsFile($file, $dump);
3737
}
3838

39-
public function provideWorkflowDefinitionWithoutMarking()
39+
public static function provideWorkflowDefinitionWithoutMarking()
4040
{
41-
yield [$this->createSimpleWorkflowDefinition(), null, 'simple-workflow-nomarking', 'SimpleDiagram'];
42-
yield [$this->createComplexWorkflowDefinition(), null, 'complex-workflow-nomarking', 'ComplexDiagram'];
41+
yield [self::createSimpleWorkflowDefinition(), null, 'simple-workflow-nomarking', 'SimpleDiagram'];
42+
yield [self::createComplexWorkflowDefinition(), null, 'complex-workflow-nomarking', 'ComplexDiagram'];
4343
$marking = new Marking(['b' => 1]);
44-
yield [$this->createSimpleWorkflowDefinition(), $marking, 'simple-workflow-marking', 'SimpleDiagram'];
44+
yield [self::createSimpleWorkflowDefinition(), $marking, 'simple-workflow-marking', 'SimpleDiagram'];
4545
$marking = new Marking(['c' => 1, 'e' => 1]);
46-
yield [$this->createComplexWorkflowDefinition(), $marking, 'complex-workflow-marking', 'ComplexDiagram'];
46+
yield [self::createComplexWorkflowDefinition(), $marking, 'complex-workflow-marking', 'ComplexDiagram'];
4747
}
4848

4949
/**
@@ -59,11 +59,11 @@ public function testDumpStateMachineWithoutMarking($definition, $marking, $expec
5959
$this->assertStringEqualsFile($file, $dump);
6060
}
6161

62-
public function provideStateMachineDefinitionWithoutMarking()
62+
public static function provideStateMachineDefinitionWithoutMarking()
6363
{
64-
yield [$this->createComplexStateMachineDefinition(), null, 'complex-state-machine-nomarking', 'SimpleDiagram'];
64+
yield [static::createComplexStateMachineDefinition(), null, 'complex-state-machine-nomarking', 'SimpleDiagram'];
6565
$marking = new Marking(['c' => 1, 'e' => 1]);
66-
yield [$this->createComplexStateMachineDefinition(), $marking, 'complex-state-machine-marking', 'SimpleDiagram'];
66+
yield [static::createComplexStateMachineDefinition(), $marking, 'complex-state-machine-marking', 'SimpleDiagram'];
6767
}
6868

6969
public function testDumpWorkflowWithSpacesInTheStateNamesAndDescription()

‎Tests/WorkflowBuilderTrait.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
trait WorkflowBuilderTrait
1919
{
20-
private function createComplexWorkflowDefinition()
20+
private static function createComplexWorkflowDefinition()
2121
{
2222
$places = range('a', 'g');
2323

@@ -52,7 +52,7 @@ private function createComplexWorkflowDefinition()
5252
// +----+ +----+ +----+ +----+
5353
}
5454

55-
private function createSimpleWorkflowDefinition()
55+
private static function createSimpleWorkflowDefinition()
5656
{
5757
$places = range('a', 'c');
5858

@@ -87,7 +87,7 @@ private function createSimpleWorkflowDefinition()
8787
// +---+ +----+ +---+ +----+ +---+
8888
}
8989

90-
private function createWorkflowWithSameNameTransition()
90+
private static function createWorkflowWithSameNameTransition()
9191
{
9292
$places = range('a', 'c');
9393

@@ -115,7 +115,7 @@ private function createWorkflowWithSameNameTransition()
115115
// +--------------------------------------------------------------------+
116116
}
117117

118-
private function createComplexStateMachineDefinition()
118+
private static function createComplexStateMachineDefinition()
119119
{
120120
$places = ['a', 'b', 'c', 'd'];
121121

0 commit comments

Comments
 (0)