Use icon helper with different icon-set

braincrafted · Sep 20, 2015 · 48386aa · 48386aa
1 parent 5708f4f
commit 48386aa
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 5 deletions.
diff --git a/Tests/Twig/BootstrapIconExtensionTest.php b/Tests/Twig/BootstrapIconExtensionTest.php
@@ -61,6 +61,23 @@ public function testIconFilter()
         );
     }
 
+    /**
+     * @covers Braincrafted\Bundle\BootstrapBundle\Twig\BootstrapIconExtension::iconFunction
+     */
+    public function testIconFilterWithDifferntPrefix()
+    {
+        $this->assertEquals(
+            '<span class="glyphicon glyphicon-heart"></span>',
+            $this->getIconExtension('default')->iconFunction('heart', 'glyphicon'),
+            '->iconFunction() returns the HTML code for the given icon.'
+        );
+        $this->assertEquals(
+            '<span class="fa fa-heart"></span>',
+            $this->getIconExtension('default')->iconFunction('heart', 'fa'),
+            '->iconFunction() uses the iconPrefix passed into the IconExtension constructor.'
+        );
+    }
+
     /**
      * @covers Braincrafted\Bundle\BootstrapBundle\Twig\BootstrapIconExtension::parseIconsFilter
      */
@@ -79,6 +96,24 @@ public function testParseIconsFilter()
         );
     }
 
+    /**
+     * @covers Braincrafted\Bundle\BootstrapBundle\Twig\BootstrapIconExtension::parseIconsFilter
+     */
+    public function testParseIconsFilterWithDifferntPrefix()
+    {
+        $this->assertEquals(
+            '<span class="glyphicon glyphicon-heart"></span> foobar',
+            $this->getIconExtension('default')->parseIconsFilter('.glyphicon-heart foobar'),
+            '->parseIconsFilter() returns the HTML code with the replaced icons.'
+        );
+
+        $this->assertEquals(
+            '<span class="fa fa-heart"></span> foobar',
+            $this->getIconExtension('default')->parseIconsFilter('.fa-heart foobar'),
+            '->parseIconsFilter() uses the iconPrefix passed into the IconExtension constructor.'
+        );
+    }
+
     /**
      * @covers Braincrafted\Bundle\BootstrapBundle\Twig\BootstrapIconExtension::getName()
      */

diff --git a/Twig/BootstrapIconExtension.php b/Twig/BootstrapIconExtension.php
@@ -82,9 +82,9 @@ public function parseIconsFilter($text)
         $that = $this;
 
         return preg_replace_callback(
-            '/\.icon-([a-z0-9+-]+)/',
+            '/\.([a-z]+)-([a-z0-9+-]+)/',
             function ($matches) use ($that) {
-                return $that->iconFunction($matches[1]);
+                return $that->iconFunction($matches[2], $matches[1]);
             },
             $text
         );
@@ -94,14 +94,16 @@ function ($matches) use ($that) {
      * Returns the HTML code for the given icon.
      *
      * @param string $icon The name of the icon
+     * @param string $iconSet The icon-set name
      *
      * @return string The HTML code for the icon
      */
-    public function iconFunction($icon)
+    public function iconFunction($icon, $iconSet = 'icon')
     {
-        $icon = str_replace('+', ' '.$this->iconPrefix.'-', $icon);
+        if ($iconSet == 'icon') $iconSet = $this->iconPrefix;
+        $icon = str_replace('+', ' '.$iconSet.'-', $icon);
 
-        return sprintf('<%1$s class="%2$s %2$s-%3$s"></%1$s>', $this->iconTag, $this->iconPrefix, $icon);
+        return sprintf('<%1$s class="%2$s %2$s-%3$s"></%1$s>', $this->iconTag, $iconSet, $icon);
     }
 
     /**