Merge pull request #220 from llwt/develop

add option to configure icon prefix
braincrafted · Apr 27, 2014 · 323f009 · 323f009
2 parents a03bc03 + 04e7609
commit 323f009
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 17 deletions.
diff --git a/DependencyInjection/BraincraftedBootstrapExtension.php b/DependencyInjection/BraincraftedBootstrapExtension.php
@@ -58,6 +58,7 @@ public function load(array $configs, ContainerBuilder $container)
         $container->setParameter('braincrafted_bootstrap.assets_dir', $config['assets_dir']);
         $container->setParameter('braincrafted_bootstrap.output_dir', $config['output_dir']);
         $container->setParameter('braincrafted_bootstrap.less_filter', $config['less_filter']);
+        $container->setParameter('braincrafted_bootstrap.icon_prefix', $config['icon_prefix']);
     }
 
     /**

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -51,6 +51,9 @@ private function buildConfigTree()
                         ->thenInvalid('Invalid less filter "%s"')
                     ->end()
                 ->end()
+                ->scalarNode('icon_prefix')
+                    ->defaultValue('glyphicon')
+                ->end()
                 ->arrayNode('customize')
                     ->addDefaultsIfNotSet()
                     ->children()

diff --git a/Resources/config/services/twig.xml b/Resources/config/services/twig.xml
@@ -8,12 +8,14 @@
         <parameter key="braincrafted_bootstrap.twig.label_extension.class">Braincrafted\Bundle\BootstrapBundle\Twig\BootstrapLabelExtension</parameter>
         <parameter key="braincrafted_bootstrap.twig.badge_extension.class">Braincrafted\Bundle\BootstrapBundle\Twig\BootstrapBadgeExtension</parameter>
         <parameter key="braincrafted_bootstrap.twig.form_extension.class">Braincrafted\Bundle\BootstrapBundle\Twig\BootstrapFormExtension</parameter>
+        <parameter key="braincrafted_bootstrap.icon_prefix" />
     </parameters>
 
     <services>
 
         <service id="braincrafted_bootstrap.twig.icon_extension" class="%braincrafted_bootstrap.twig.icon_extension.class%">
             <tag name="twig.extension" />
+            <argument>%braincrafted_bootstrap.icon_prefix%</argument>
         </service>
 
         <service id="braincrafted_bootstrap.twig.label_extension" class="%braincrafted_bootstrap.twig.label_extension.class%">

diff --git a/Tests/Twig/BootstrapIconExtensionTest.php b/Tests/Twig/BootstrapIconExtensionTest.php
@@ -28,31 +28,20 @@
  */
 class BootstrapIconExtensionTest extends \PHPUnit_Framework_TestCase
 {
-    /** @var BootstrapIconExtension */
-    private $extension;
-
-    /**
-     * Set up
-     */
-    public function setUp()
-    {
-        $this->extension = new BootstrapIconExtension();
-    }
-
     /**
      * @covers Braincrafted\Bundle\BootstrapBundle\Twig\BootstrapIconExtension::getFilters()
      */
     public function testGetFilters()
     {
-        $this->assertCount(1, $this->extension->getFilters());
+        $this->assertCount(1, $this->getIconExtension()->getFilters());
     }
 
     /**
      * @covers Braincrafted\Bundle\BootstrapBundle\Twig\BootstrapIconExtension::getFunctions()
      */
     public function testGetFunctions()
     {
-        $this->assertCount(1, $this->extension->getFunctions());
+        $this->assertCount(1, $this->getIconExtension()->getFunctions());
     }
 
     /**
@@ -62,9 +51,14 @@ public function testIconFilter()
     {
         $this->assertEquals(
             '<span class="glyphicon glyphicon-heart"></span>',
-            $this->extension->iconFunction('heart'),
+            $this->getIconExtension('glyphicon')->iconFunction('heart'),
             '->iconFunction() returns the HTML code for the given icon.'
         );
+        $this->assertEquals(
+            '<span class="fa fa-heart"></span>',
+            $this->getIconExtension('fa')->iconFunction('heart'),
+            '->iconFunction() uses the iconPrefix passed into the IconExtension constructor.'
+        );
     }
 
     /**
@@ -74,16 +68,27 @@ public function testParseIconsFilter()
     {
         $this->assertEquals(
             '<span class="glyphicon glyphicon-heart"></span> foobar',
-            $this->extension->parseIconsFilter('.icon-heart foobar'),
+            $this->getIconExtension('glyphicon')->parseIconsFilter('.icon-heart foobar'),
             '->parseIconsFilter() returns the HTML code with the replaced icons.'
         );
+
+        $this->assertEquals(
+            '<span class="fa fa-heart"></span> foobar',
+            $this->getIconExtension('fa')->parseIconsFilter('.icon-heart foobar'),
+            '->parseIconsFilter() uses the iconPrefix passed into the IconExtension constructor.'
+        );
     }
 
     /**
      * @covers Braincrafted\Bundle\BootstrapBundle\Twig\BootstrapIconExtension::getName()
      */
     public function testGetName()
     {
-        $this->assertEquals('braincrafted_bootstrap_icon', $this->extension->getName());
+        $this->assertEquals('braincrafted_bootstrap_icon', $this->getIconExtension()->getName());
+    }
+
+    private function getIconExtension($iconPrefix = null)
+    {
+        return new BootstrapIconExtension($iconPrefix);
     }
 }
diff --git a/Twig/BootstrapIconExtension.php b/Twig/BootstrapIconExtension.php
@@ -22,6 +22,16 @@
  */
 class BootstrapIconExtension extends Twig_Extension
 {
+    /**
+     * @var string
+     */
+    private $iconPrefix;
+
+    public function __construct($iconPrefix)
+    {
+        $this->iconPrefix = $iconPrefix;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -78,7 +88,7 @@ function ($matches) use ($that) {
      */
     public function iconFunction($icon)
     {
-        return sprintf('<span class="glyphicon glyphicon-%s"></span>', $icon);
+        return sprintf('<span class="%1$s %1$s-%2$s"></span>', $this->iconPrefix, $icon);
     }
 
     /**