Merge pull request #301 from mumia/issue300/generatorFailsForCustomVa…

…riable.less Proposal for fixing custom bootstrap.less generator
braincrafted · Sep 18, 2014 · f4ba62a · f4ba62a
2 parents 5623159 + 6df8f5a
commit f4ba62a
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 2 deletions.
diff --git a/Command/GenerateCommand.php b/Command/GenerateCommand.php
@@ -13,6 +13,8 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 use Braincrafted\Bundle\BootstrapBundle\Util\PathUtil;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Kernel;
 
 /**
  * GenerateCommand
@@ -100,8 +102,15 @@ protected function executeGenerateBootstrap(array $config)
             basename($config['variables_file'])
         );
 
+        $container = $this->getContainer();
+
+        if (Kernel::VERSION_ID >= 20500) {
+            $container->enterScope('request');
+            $container->set('request', new Request(), 'request');
+        }
+
         // We can now use Twig to render the bootstrap.less file and save it
-        $content = $this->getContainer()->get('twig')->render(
+        $content = $container->get('twig')->render(
             $config['bootstrap_template'],
             array(
                 'variables_file' => $variablesFile,

diff --git a/Tests/Command/GenerateCommandTest.php b/Tests/Command/GenerateCommandTest.php
@@ -13,6 +13,9 @@
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 
 use Braincrafted\Bundle\BootstrapBundle\Command\GenerateCommand;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\HttpKernel\KernelInterface;
 
 /**
  * GenerateCommandTest
@@ -28,6 +31,21 @@
  */
 class GenerateCommandTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @var m\Mock|\Twig_Environment
+     */
+    private $twig;
+
+    /**
+     * @var m\Mock|ContainerInterface
+     */
+    private $container;
+
+    /**
+     * @var m\Mock|KernelInterface
+     */
+    private $kernel;
+
     public function setUp()
     {
         $this->twig = m::mock('\Twig_Environment');
@@ -66,6 +84,17 @@ public function testExecute()
         $this->container->shouldReceive('getParameter')->with('braincrafted_bootstrap.less_filter')->andReturn('less');
         $this->container->shouldReceive('getParameter')->with('braincrafted_bootstrap.assets_dir')->andReturn(__DIR__);
 
+        if (Kernel::VERSION_ID >= 20500) {
+            $this->container->shouldReceive('enterScope')->with('request');
+            $this->container->shouldReceive('set')->withArgs(
+                array(
+                    'request',
+                    \Mockery::type('Symfony\Component\HttpFoundation\Request'),
+                    'request'
+                )
+            );
+        }
+
         $this->twig
             ->shouldReceive('render')
             ->with(__DIR__.'/bootstrap.html.twig', array(

diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
         "knplabs/knp-menu-bundle":      "~2.0@alpha",
         "knplabs/knp-paginator-bundle": "dev-master",
         "phpunit/phpunit":              "3.7.*",
-        "mockery/mockery":              "0.8.*"
+        "mockery/mockery":              "0.9.*"
     },
     "suggest":      {
         "knplabs/knp-paginator-bundle": "BraincraftedBootstrapBundle styles the pagination provided by KnpPaginatorBundle.",