Permalink
Browse files

moved the Twig CodeExtension from the bundle to the bridge

  • Loading branch information...
1 parent e5ba394 commit e553e650471d2a2d60bf98a0fe8df2e68e7c5713 @fabpot fabpot committed Dec 12, 2012
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Bundle\TwigBundle\Extension;
+namespace Symfony\Bridge\Twig\Extension;
if (!defined('ENT_SUBSTITUTE')) {
define('ENT_SUBSTITUTE', 8);
@@ -9,9 +9,9 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Bundle\TwigBundle\Tests\Extension;
+namespace Symfony\Bridge\Twig\Tests\Extension;
-use Symfony\Bundle\TwigBundle\Extension\CodeExtension;
+use Symfony\Bridge\Twig\Extension\CodeExtension;
class CodeExtensionTest extends \PHPUnit_Framework_TestCase
{
@@ -13,7 +13,7 @@
<parameter key="twig.extension.trans.class">Symfony\Bridge\Twig\Extension\TranslationExtension</parameter>
<parameter key="twig.extension.assets.class">Symfony\Bundle\TwigBundle\Extension\AssetsExtension</parameter>
<parameter key="twig.extension.actions.class">Symfony\Bundle\TwigBundle\Extension\ActionsExtension</parameter>
- <parameter key="twig.extension.code.class">Symfony\Bundle\TwigBundle\Extension\CodeExtension</parameter>
+ <parameter key="twig.extension.code.class">Symfony\Bridge\Twig\Extension\CodeExtension</parameter>
<parameter key="twig.extension.routing.class">Symfony\Bridge\Twig\Extension\RoutingExtension</parameter>
<parameter key="twig.extension.yaml.class">Symfony\Bridge\Twig\Extension\YamlExtension</parameter>
<parameter key="twig.extension.form.class">Symfony\Bridge\Twig\Extension\FormExtension</parameter>
@@ -1,89 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bundle\WebProfilerBundle\Tests\Controller;
-
-use Symfony\Bundle\WebProfilerBundle\Tests\TestCase;
-
-use Symfony\Bundle\WebProfilerBundle\Controller\ExceptionController;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Scope;
-use Symfony\Component\DependencyInjection\Definition;
-
-class ExceptionControllerTest extends TestCase
-{
- protected $controller;
- protected $container;
- protected $flatten;
- protected $kernel;
-
- protected function setUp()
- {
- parent::setUp();
-
- $this->flatten = $this->getMock('Symfony\Component\HttpKernel\Exception\FlattenException');
- $this->flatten->expects($this->once())->method('getStatusCode')->will($this->returnValue(404));
- $this->controller = new ExceptionController();
- $this->kernel = $this->getMock('Symfony\\Component\\HttpKernel\\KernelInterface');
- $this->container = $this->getContainer();
- }
-
- protected function tearDown()
- {
- parent::tearDown();
-
- $this->controller = null;
- $this->container = null;
- $this->flatten = null;
- $this->kernel = null;
- }
-
- /**
- * @dataProvider getDebugModes
- */
- public function testShowActionDependingOnDebug($debug)
- {
- $this->container->setParameter('kernel.debug', $debug);
- $this->controller->setContainer($this->container);
- $this->controller->showAction($this->flatten);
- }
-
- public function getDebugModes()
- {
- return array(
- array(true),
- array(false),
- );
- }
-
- private function getContainer()
- {
- $container = new ContainerBuilder();
- $container->addScope(new Scope('request'));
- $container->register('request', 'Symfony\\Component\\HttpFoundation\\Request')->setScope('request');
- $container->register('templating.helper.assets', $this->getMockClass('Symfony\\Component\\Templating\\Helper\\AssetsHelper'));
- $container->register('templating.helper.router', $this->getMockClass('Symfony\\Bundle\\FrameworkBundle\\Templating\\Helper\\RouterHelper'))
- ->addArgument(new Definition($this->getMockClass('Symfony\\Component\\Routing\\RouterInterface')));
- $container->register('twig', 'Twig_Environment');
- $container->register('templating.engine.twig', $this->getMockClass('Symfony\\Bundle\\TwigBundle\\TwigEngine'))
- ->addArgument($this->getMock('Twig_Environment'))
- ->addArgument($this->getMock('Symfony\\Component\\Templating\\TemplateNameParserInterface'))
- ->addArgument(new Definition($this->getMockClass('Symfony\Component\Config\FileLocatorInterface')))
- ->addArgument($this->getMock('Symfony\\Bundle\\FrameworkBundle\\Templating\\GlobalVariables', array(), array($this->getMock('Symfony\\Component\\DependencyInjection\\Container'))));
- $container->setAlias('templating', 'templating.engine.twig');
- $container->setParameter('kernel.bundles', array());
- $container->setParameter('kernel.cache_dir', __DIR__);
- $container->setParameter('kernel.root_dir', __DIR__);
- $container->set('kernel', $this->kernel);
-
- return $container;
- }
-}

0 comments on commit e553e65

Please sign in to comment.