Skip to content

Commit c40de39

Browse files
committed
Merge branch '3.4' into 4.0
* 3.4: [FrameworkBundle] fixed brackets position in method calls [Form] Fix PHPDoc for FormConfigBuilder $dataClass argument [Security] Update user phpdoc on tokens [WebProfilerBundle] Fixed icon alignment issue using Bootstrap 4.1.2 suppress side effects in 'get' or 'has' methods of NamespacedAttributeBag [HttpFoundation] reset callback on StreamedResponse when setNotModified() is called [HttpFoundation] Fixed phpdoc for get method of HeaderBag fix typo in ContainerBuilder docblock [Form/Profiler] Massively reducing memory footprint of form profiling pages by removing redundant 'form' variable from view variables. [Console] correctly return parameter's default value on "--"
2 parents 5fbe3df + e0aa422 commit c40de39

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,8 @@ public function testWorkflowMultipleTransitionsWithSameName()
286286
{
287287
$container = $this->createContainerFromFile('workflow_with_multiple_transitions_with_same_name');
288288

289-
$this->assertTrue($container->hasDefinition('workflow.article', 'Workflow is registered as a service'));
290-
$this->assertTrue($container->hasDefinition('workflow.article.definition', 'Workflow definition is registered as a service'));
289+
$this->assertTrue($container->hasDefinition('workflow.article'), 'Workflow is registered as a service');
290+
$this->assertTrue($container->hasDefinition('workflow.article.definition'), 'Workflow definition is registered as a service');
291291

292292
$workflowDefinition = $container->getDefinition('workflow.article.definition');
293293

0 commit comments

Comments
 (0)