Skip to content

Commit b0cc44f

Browse files
committed
Merge branch '2.8' into 3.1
* 2.8: [DI] minor FileLoaders tests update [HttpKernel] Revert BC breaking change of Request::isMethodSafe() [DOMCrawler] Bug fixed [Process] Do feat test before enabling TTY mode bumped Symfony version to 2.8.15 updated VERSION for 2.8.14 updated CHANGELOG for 2.8.14 bumped Symfony version to 2.7.22 updated VERSION for 2.7.21 update CONTRIBUTORS for 2.7.21 updated CHANGELOG for 2.7.21 Fix annotation type for $context [Doctrine][Form] support large integers
2 parents 87598e2 + 0d62fc8 commit b0cc44f

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Tests/Loader/XmlFileLoaderTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ public function testLoadImports()
131131
{
132132
$container = new ContainerBuilder();
133133
$resolver = new LoaderResolver(array(
134-
new IniFileLoader($container, new FileLocator(self::$fixturesPath.'/xml')),
135-
new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml')),
134+
new IniFileLoader($container, new FileLocator(self::$fixturesPath.'/ini')),
135+
new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yml')),
136136
$loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml')),
137137
));
138138
$loader->setResolver($resolver);

Tests/Loader/YamlFileLoaderTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ public function testLoadImports()
104104
{
105105
$container = new ContainerBuilder();
106106
$resolver = new LoaderResolver(array(
107-
new IniFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml')),
108-
new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml')),
107+
new IniFileLoader($container, new FileLocator(self::$fixturesPath.'/ini')),
108+
new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml')),
109109
new PhpFileLoader($container, new FileLocator(self::$fixturesPath.'/php')),
110110
$loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml')),
111111
));

0 commit comments

Comments
 (0)