Skip to content

Commit 9746314

Browse files
Merge branch '2.7' into 2.8
* 2.7: Remove dead code
2 parents 5ca2737 + 49fb0c0 commit 9746314

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ public function load(array $configs, ContainerBuilder $container)
106106
foreach ($bundle['paths'] as $path) {
107107
$twigFilesystemLoaderDefinition->addMethodCall('addPath', array($path, $namespace));
108108
}
109-
$container->addResource(new FileExistenceResource($dir));
110109
}
111110

112111
if (is_dir($dir = $container->getParameter('kernel.root_dir').'/Resources/views')) {

src/Symfony/Component/Form/Tests/FormRegistryTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,9 @@ public function testFailIfUnregisteredTypeNoFormType()
118118
$this->registry->getType('stdClass');
119119
}
120120

121+
/**
122+
* @group legacy
123+
*/
121124
public function testLegacyGetTypeFromExtension()
122125
{
123126
$type = new LegacyFooType();

0 commit comments

Comments
 (0)