Skip to content

Commit 6c5fae8

Browse files
committed
Merge branch '2.3' into 2.7
* 2.3: [DomCrawler] Invalid uri created from forms if base tag present [Console] update param type phpdoc for StreamOutput [Console] fix typo in OutputInterface [HttpKernel] fix broken multiline <esi:remove> [DoctrineBridge] Fixed #14840 [FrameworkBundle] add a suggest for the serializer component [Yaml] Fix the parsing of float keys [Console] Ensure the console output is only detected as decorated when both stderr and stdout support colors Improve exception messages. Fix that two DirectoryResources with different patterns would be deduplicated Tests fix clockmock [WebProfilerBundle] Added tabindex="-1" to not interfer with normal UX missing "YAML" in the exception message. [framework-bundle] Add Test for TranslationUpdateCommand Use ObjectManager interface instead of EntityManager
2 parents 2be44b9 + 9ed0492 commit 6c5fae8

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

Tests/Fixtures/bad_format.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
blog_show:
2+
path: /blog/{slug}
3+
defaults: { _controller: "MyBundle:Blog:show" }

Tests/Loader/YamlFileLoaderTest.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,15 @@ public function testLoadThrowsExceptionWithInvalidFile($filePath)
5151

5252
public function getPathsToInvalidFiles()
5353
{
54-
return array(array('nonvalid.yml'), array('nonvalid2.yml'), array('incomplete.yml'), array('nonvalidkeys.yml'), array('nonesense_resource_plus_path.yml'), array('nonesense_type_without_resource.yml'));
54+
return array(
55+
array('nonvalid.yml'),
56+
array('nonvalid2.yml'),
57+
array('incomplete.yml'),
58+
array('nonvalidkeys.yml'),
59+
array('nonesense_resource_plus_path.yml'),
60+
array('nonesense_type_without_resource.yml'),
61+
array('bad_format.yml'),
62+
);
5563
}
5664

5765
public function testLoadSpecialRouteName()

0 commit comments

Comments
 (0)