Skip to content

Commit 597591d

Browse files
Merge branch '3.4' into 4.3
* 3.4: Fix small typo in Exception message
2 parents 151ee0e + e029ca9 commit 597591d

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ public function testWorkflowLegacy()
316316
public function testWorkflowAreValidated()
317317
{
318318
$this->expectException('Symfony\Component\Workflow\Exception\InvalidDefinitionException');
319-
$this->expectExceptionMessage('A transition from a place/state must have an unique name. Multiple transitions named "go" from place/state "first" where found on StateMachine "my_workflow".');
319+
$this->expectExceptionMessage('A transition from a place/state must have an unique name. Multiple transitions named "go" from place/state "first" were found on StateMachine "my_workflow".');
320320
$this->createContainerFromFile('workflow_not_valid');
321321
}
322322

Tests/DependencyInjection/PhpFrameworkExtensionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function testAssetPackageCannotHavePathAndUrl()
5656
public function testWorkflowValidationStateMachine()
5757
{
5858
$this->expectException('Symfony\Component\Workflow\Exception\InvalidDefinitionException');
59-
$this->expectExceptionMessage('A transition from a place/state must have an unique name. Multiple transitions named "a_to_b" from place/state "a" where found on StateMachine "article".');
59+
$this->expectExceptionMessage('A transition from a place/state must have an unique name. Multiple transitions named "a_to_b" from place/state "a" were found on StateMachine "article".');
6060
$this->createContainerFromClosure(function ($container) {
6161
$container->loadFromExtension('framework', [
6262
'workflows' => [

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"symfony/twig-bundle": "~2.8|~3.2|~4.0",
5555
"symfony/validator": "^4.1",
5656
"symfony/var-dumper": "^4.3",
57-
"symfony/workflow": "^4.3",
57+
"symfony/workflow": "^4.3.6",
5858
"symfony/yaml": "~3.4|~4.0",
5959
"symfony/property-info": "~3.4|~4.0",
6060
"symfony/lock": "~3.4|~4.0",
@@ -80,7 +80,7 @@
8080
"symfony/translation": "<4.3",
8181
"symfony/twig-bridge": "<4.1.1",
8282
"symfony/validator": "<4.1",
83-
"symfony/workflow": "<4.3"
83+
"symfony/workflow": "<4.3.6"
8484
},
8585
"suggest": {
8686
"ext-apcu": "For best performance of the system caches",

0 commit comments

Comments
 (0)