diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
parent 5ca27373e8 49fb0c033c
commit 9746314ecb
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
View File

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

3
src/Symfony/Component/Form/Tests/FormRegistryTest.php
View File

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