Skip to content

Commit 8c47189

Browse files
committed
Merge branch '2.3' into 2.4
* 2.3: fixed various inconsistencies reduced recursion when building DumperPrefixCollection renamed variables - making next change more readable removing dead code. [DomCrawler] Fixed filterXPath() chaining [DomCrawler] Fixed incorrect handling of image inputs Conflicts: src/Symfony/Component/DomCrawler/Crawler.php src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php src/Symfony/Component/Serializer/Tests/Normalizer/CustomNormalizerTest.php src/Symfony/Component/Templating/Tests/Loader/CacheLoaderTest.php src/Symfony/Component/Templating/Tests/Loader/LoaderTest.php
2 parents 27eeb07 + 69c8d1d commit 8c47189

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Tests/Functional/WebTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ protected static function getKernelClass()
3737
{
3838
require_once __DIR__.'/app/AppKernel.php';
3939

40-
return 'Symfony\Bundle\SecurityBundle\Tests\Functional\AppKernel';
40+
return 'Symfony\Bundle\SecurityBundle\Tests\Functional\app\AppKernel';
4141
}
4242

4343
protected static function createKernel(array $options = array())

Tests/Functional/app/AppKernel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Bundle\SecurityBundle\Tests\Functional;
12+
namespace Symfony\Bundle\SecurityBundle\Tests\Functional\app;
1313

1414
// get the autoload file
1515
$dir = __DIR__;

0 commit comments

Comments
 (0)