Fallback to default theme if modern is not installed

Author: raulfraile

src/Ladybug/DependencyInjection/AbstractCompilerPass.php

@@ -35,7 +35,7 @@ abstract class AbstractCompilerPass implements CompilerPassInterface
      * @param string           $tag
      * @param string           $method
      */
-    protected function processTaggedServices(ContainerBuilder $container, $manager, $tag, $method)
+    protected function processTaggedServices(ContainerBuilder $container, $manager, $tag, $method, $params = array())
     {
         if (!$container->hasDefinition($manager)) {
             return;
@@ -46,9 +46,19 @@ protected function processTaggedServices(ContainerBuilder $container, $manager,
         $taggedServices = $container->findTaggedServiceIds($tag);
 
         foreach ($taggedServices as $id => $attributes) {
+            $methodParams = array();
+
+            if (!empty($attributes)) {
+                foreach ($params as $param) {
+                    if (isset($attributes[0][$param])) {
+                        $methodParams[] = $attributes[0][$param];
+                    }
+                }
+            }
+
             $definition->addMethodCall(
                 $method,
-                array(new Reference($id), $id)
+                array_merge(array(new Reference($id), $id), $methodParams)
             );
         }
     }

src/Ladybug/DependencyInjection/ThemeCompilerPass.php

@@ -22,6 +22,8 @@ class ThemeCompilerPass extends AbstractCompilerPass
 {
     public function process(ContainerBuilder $container)
     {
-        $this->processTaggedServices($container, 'theme_resolver', self::TAG_THEME, 'addTheme');
+        $this->processTaggedServices($container, 'theme_resolver', self::TAG_THEME, 'addTheme', array(
+            'theme_default'
+        ));
     }
 }

src/Ladybug/Dumper.php

@@ -111,7 +111,8 @@ public function dump(/*$var1 [, $var2...$varN]*/)
         $render = $this->getRender();
         $render->setGlobals(array(
             'id' => uniqid(),
-            'expanded' => $this->application->container->getParameter('expanded')
+            'expanded' => $this->application->container->getParameter('expanded'),
+            'theme' => $render->getTheme()->getName()
         ));
 
         return $render->render($this->nodes, array(

src/Ladybug/Renderer/HtmlRenderer.php

@@ -45,16 +45,20 @@ protected function getCssContents()
 
         // check last modification
         $lastModification = 0;
+
         foreach ($theme->getHtmlCssDependencies() as $item) {
-            $lastModification = max($lastModification, filemtime($theme->getResourcesPath().$item));
+            $filename = $theme->getResourcesPath().$item;
+
+            if (file_exists($filename)) {
+                $lastModification = max($lastModification, filemtime($filename));
+            }
         }
 
         // cache
         $cacheFile = sprintf('%s/ladybug_cache/theme/%s.css', sys_get_temp_dir(), $theme->getName());
-        $lastModificationCache = file_exists($cacheFile) ? filemtime($cacheFile) : 0;
+        $lastModificationCache = file_exists($cacheFile) ? filemtime($cacheFile) : -1;
 
         if ($lastModification > $lastModificationCache) {
-
             $pce = new \CssEmbed\CssEmbed();
 
             $css = '';

src/Ladybug/Resources/container/themes.xml

@@ -11,7 +11,7 @@
         </service>
 
         <service id="theme_simple" class="Ladybug\Theme\Simple\SimpleTheme">
-            <tag name="ladybug.theme" />
+            <tag name="ladybug.theme" theme_default="true" />
         </service>
 
     </services>

src/Ladybug/Theme/Base/View/Html/iframe.html.twig

@@ -1,5 +1,5 @@
 <iframe id="ladybug_iframe_{{ id }}" frameborder="0" width="500" height="100" style="margin: 5px;overflow:hidden"></iframe>
-
+<input type="hidden" id="ladybug_theme_{{ id }}" value="{{ theme }}" />
 <script>
     function resizeIframe{{ id }}(height, width) {
         document.getElementById("ladybug_iframe_{{ id }}").height = height + "px";

src/Ladybug/Theme/ThemeResolver.php

@@ -18,12 +18,14 @@
  *
  * @author Raul Fraile <raulfraile@gmail.com>
  */
-class ThemeResolver
+class ThemeResolver implements \Countable
 {
 
     /** @var ThemeInterface[] An array of ThemeInterface objects */
     protected $themes;
 
+    protected $default = null;
+
     /**
      * Constructor.
      *
@@ -40,9 +42,15 @@ public function __construct(array $themes = array())
      * @param ThemeInterface $theme A ThemeInterface instance
      * @param $key
      */
-    public function addTheme(ThemeInterface $theme, $key)
+    public function addTheme(ThemeInterface $theme, $key, $default = false)
     {
         $this->themes[$key] = $theme;
+
+        if ($default) {
+            $this->default = $key;
+        }
+
+        return true;
     }
 
     /**
@@ -64,6 +72,10 @@ public function resolve($format)
 
     public function getTheme($key, $format)
     {
+        if (!array_key_exists('theme_' . $key, $this->themes)) {
+            return $this->getDefaultTheme();
+        }
+
         /** @var $theme ThemeInterface */
         $theme = $this->themes['theme_' . $key];
 
@@ -88,4 +100,30 @@ protected function supportsFormat(ThemeInterface $theme, $format)
     {
         return in_array($format, $theme->getFormats());
     }
+
+    /**
+     * Gets the default theme.
+     *
+     * @return ThemeInterface
+     */
+    protected function getDefaultTheme()
+    {
+        if (!is_null($this->default) && array_key_exists($this->default, $this->themes)) {
+            return $this->themes[$this->default];
+        }
+
+        return null;
+    }
+
+    /**
+     * Count number of themes.
+     *
+     * @return int Number of registered themes
+     */
+    public function count()
+    {
+        return count($this->themes);
+    }
+
+
 }

tests/Ladybug/Tests/DumperTest.php

@@ -41,6 +41,18 @@ public function testThemeCanBeSet()
         $this->assertEquals('modern', $this->dumper->getTheme());
     }
 
+    public function testUnknownThemeFallbacksToDefault()
+    {
+        $var = 1;
+        $this->dumper->setTheme('unknown');
+        $this->dumper->setFormat(Format\HtmlFormat::FORMAT_NAME);
+
+        $html = $this->dumper->dump($var);
+
+        $crawler = new Crawler($html);
+        $this->assertEquals('Simple', $crawler->filterXPath('//input[@type="hidden"]')->attr('value'));
+    }
+
     public function testFormatCanBeSet()
     {
         $this->dumper->setFormat(Format\XmlFormat::FORMAT_NAME);

tests/Ladybug/Tests/Theme/ThemeResolverTest.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace Ladybug\Tests\Theme;
+
+use Ladybug\Theme\ThemeResolver;
+use Ladybug\Theme\ThemeInterface;
+use Ladybug\Format\HtmlFormat;
+use \Mockery as m;
+
+class ThemeResolverTest extends \PHPUnit_Framework_TestCase
+{
+
+    /** @var ThemeResolver */
+    protected $resolver;
+
+    protected $theme;
+
+    public function setUp()
+    {
+        $this->resolver = new ThemeResolver();
+
+        $this->theme = m::mock('Ladybug\Theme\ThemeInterface');
+        $this->theme->shouldReceive('getFormats')->andReturn(array(HtmlFormat::FORMAT_NAME));
+    }
+
+    public function tearDown()
+    {
+        m::close();
+    }
+
+    public function testAddTheme()
+    {
+        $result = $this->resolver->addTheme($this->theme, 'theme_test');
+
+        $this->assertTrue($result);
+        $this->assertCount(1, $this->resolver);
+    }
+
+    public function testGetRegisteredTheme()
+    {
+        $this->resolver->addTheme($this->theme, 'theme_test');
+
+        $this->assertInstanceOf('Ladybug\Theme\ThemeInterface', $this->resolver->getTheme('test', 'html'));
+    }
+
+    public function testGetDefaultThemeWhenDoesNotExist()
+    {
+        $this->resolver->addTheme($this->theme, 'theme_test');
+        $this->resolver->addTheme($this->theme, 'theme_test_default', true);
+
+        $this->assertInstanceOf('Ladybug\Theme\ThemeInterface', $this->resolver->getTheme('notfound', HtmlFormat::FORMAT_NAME));
+    }
+
+
+}