Merge branch '2.7' into 2.8

* 2.7:
  Remove dead code
This commit is contained in:
Nicolas Grekas 2017-01-12 20:18:39 +01:00
commit 9746314ecb
2 changed files with 3 additions and 1 deletions

View File

@ -106,7 +106,6 @@ class TwigExtension extends Extension
foreach ($bundle['paths'] as $path) {
$twigFilesystemLoaderDefinition->addMethodCall('addPath', array($path, $namespace));
}
$container->addResource(new FileExistenceResource($dir));
}
if (is_dir($dir = $container->getParameter('kernel.root_dir').'/Resources/views')) {

View File

@ -118,6 +118,9 @@ class FormRegistryTest extends \PHPUnit_Framework_TestCase
$this->registry->getType('stdClass');
}
/**
* @group legacy
*/
public function testLegacyGetTypeFromExtension()
{
$type = new LegacyFooType();