Skip to content

Commit b6541d1

Browse files
committed
Merge branch '4.0' into 4.1
* 4.0: fixed typo [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 1711d40 + aec316c commit b6541d1

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ public function testWorkflows()
268268
$this->assertInstanceOf(Reference::class, $markingStoreRef);
269269
$this->assertEquals('workflow_service', (string) $markingStoreRef);
270270

271-
$this->assertTrue($container->hasDefinition('workflow.registry', 'Workflow registry is registered as a service'));
271+
$this->assertTrue($container->hasDefinition('workflow.registry'), 'Workflow registry is registered as a service');
272272
$registryDefinition = $container->getDefinition('workflow.registry');
273273
$this->assertGreaterThan(0, count($registryDefinition->getMethodCalls()));
274274
}
@@ -313,8 +313,8 @@ public function testWorkflowMultipleTransitionsWithSameName()
313313
{
314314
$container = $this->createContainerFromFile('workflow_with_multiple_transitions_with_same_name');
315315

316-
$this->assertTrue($container->hasDefinition('workflow.article', 'Workflow is registered as a service'));
317-
$this->assertTrue($container->hasDefinition('workflow.article.definition', 'Workflow definition is registered as a service'));
316+
$this->assertTrue($container->hasDefinition('workflow.article'), 'Workflow is registered as a service');
317+
$this->assertTrue($container->hasDefinition('workflow.article.definition'), 'Workflow definition is registered as a service');
318318

319319
$workflowDefinition = $container->getDefinition('workflow.article.definition');
320320

0 commit comments

Comments
 (0)