10000 Merge branch '4.3' into 4.4 · symfony/symfony@f5cef02 · GitHub
[go: up one dir, main page]
Skip to content

Commit f5cef02

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.3' into 4.4
* 4.3: Fix small typo in Exception message
2 parents bbafd76 + afbbea3 commit f5cef02

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ public function testWorkflowLegacy()
318318
public function testWorkflowAreValidated()
319319
{
320320
$this->expectException('Symfony\Component\Workflow\Exception\InvalidDefinitionException');
321-
$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".');
321+
$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".');
322322
$this->createContainerFromFile('workflow_not_valid');
323323
}
324324

‎src/Symfony/Bundle/FrameworkBundle/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' => [

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"symfony/twig-bundle": "^4.4|^5.0",
5858
"symfony/validator": "^4.4|^5.0",
5959
"symfony/var-dumper": "^4.4|^5.0",
60-
"symfony/workflow": "^4.3|^5.0",
60+
"symfony/workflow": "^4.3.6|^5.0",
6161
"symfony/yaml": "^3.4|^4.0|^5.0",
6262
"symfony/property-info": "^3.4|^4.0|^5.0",
6363
"symfony/web-link": "^4.4|^5.0",
@@ -88,7 +88,7 @@
8888
"symfony/twig-bundle": "<4.4",
8989
"symfony/validator": "<4.4",
9090
"symfony/var-dumper": "<4.4",
91-
"symfony/workflow": "<4.3"
91+
"symfony/workflow": "<4.3.6"
9292
},
9393
"suggest": {
9494
"ext-apcu": "For best performance of the system caches",

‎src/Symfony/Component/Workflow/Validator/StateMachineValidator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function validate(Definition $definition, $name)
3737
// Enforcing uniqueness of the names of transitions starting at each node
3838
$from = reset($froms);
3939
if (isset($transitionFromNames[$from][$transition->getName()])) {
40-
throw new InvalidDefinitionException(sprintf('A transition from a place/state must have an unique name. Multiple transitions named "%s" from place/state "%s" where found on StateMachine "%s".', $transition->getName(), $from, $name));
40+
throw new InvalidDefinitionException(sprintf('A transition from a place/state must have an unique name. Multiple transitions named "%s" from place/state "%s" were found on StateMachine "%s".', $transition->getName(), $from, $name));
4141
}
4242

4343
$transitionFromNames[$from][$transition->getName()] = true;

0 commit comments

Comments
 (0)
0