Add new styles

Author: Maxim Vanhove

src/FontAwesomeSVG.php

@@ -175,8 +175,8 @@ public function get_icon_details($id) {
         $icon = array();
 
         $id = explode(' ', $id);
-        $dir = $this->get_icon_dir($id[0]);
-        $filename = $this->get_icon_filename($id[1]);
+        $dir = $this->get_icon_dir($id);
+        $filename = $this->get_icon_filename(end($id));
 
         $icon['dir'] = $dir;
         $icon['filename'] = $filename;
@@ -198,30 +198,33 @@ public function get_icon_details($id) {
      * @param string $style
      * @return string
      */
-    public function get_icon_dir($style) {
-        switch($style) {
-            case 'far':
-                $dir = 'regular';
-                break;
+    public function get_icon_dir($classes) {
+        if (in_array('fa-sharp', $classes)) {
+            if (in_array('fa-regular', $classes)) return 'sharp-regular';
+            if (in_array('fa-light', $classes)) return 'sharp-light';
+            if (in_array('fa-solid', $classes)) return 'sharp-solid';
+        }
 
-            case 'fal':
-                $dir = 'light';
-                break;
+        if (in_array('fasr', $classes)) return 'sharp-regular';
+        if (in_array('fasl', $classes)) return 'sharp-light';
+        if (in_array('fass', $classes)) return 'sharp-solid';
 
-            case 'fab':
-                $dir = 'brands';
-                break;
+        if (in_array('far', $classes)) return 'regular';
+        if (in_array('fa-regular', $classes)) return 'regular';
 
-            case 'fad':
-                $dir = 'duotone';
-                break;
+        if (in_array('fal', $classes)) return 'light';
+        if (in_array('fa-light', $classes)) return 'light';
 
-            case 'fas': 
-            default:
-                $dir = 'solid';
-        }
+        if (in_array('fab', $classes)) return 'brands';
+        if (in_array('fa-brands', $classes)) return 'brands';
+
+        if (in_array('fad', $classes)) return 'duotone';
+        if (in_array('fa-duotone', $classes)) return 'duotone';
+
+        if (in_array('fat', $classes)) return 'thin';
+        if (in_array('fa-thin', $classes)) return 'thin';
 
-        return $dir;
+        return 'solid';
     }
 
 
@@ -236,4 +239,4 @@ public function get_icon_dir($style) {
     public function get_icon_filename($icon_name) {
         return str_replace('fa-', '', $icon_name);
     }
-}
+}

tests/Fixtures/icons/sharp-light/test.svg

@@ -11,11 +11,24 @@ final class FontAwesomeSVGTest extends TestCase
     static public function icons(): array
     {
         return [
-            ['fab fa-test'],
-            ['fad fa-test'],
-            ['fal fa-test'],
-            ['far fa-test'],
-            ['fas fa-test'],
+            ['fab fa-test', 'brands', 'test'],
+            ['fad fa-test', 'duotone', 'test'],
+            ['fal fa-test', 'light', 'test'],
+            ['far fa-test', 'regular', 'test'],
+            ['fas fa-test', 'solid', 'test'],
+            ['fat fa-test', 'thin', 'test'],
+            ['fa-brands fa-test', 'brands', 'test'],
+            ['fa-duotone fa-test', 'duotone', 'test'],
+            ['fa-light fa-test', 'light', 'test'],
+            ['fa-regular fa-test', 'regular', 'test'],
+            ['fa-solid fa-test', 'solid', 'test'],
+            ['fa-thin fa-test', 'thin', 'test'],
+            ['fa-sharp fa-light fa-test', 'sharp-light', 'test'],
+            ['fa-sharp fa-regular fa-test', 'sharp-regular', 'test'],
+            ['fa-sharp fa-solid fa-test', 'sharp-solid', 'test'],
+            ['fasl fa-test', 'sharp-light', 'test'],
+            ['fasr fa-test', 'sharp-regular', 'test'],
+            ['fass fa-test', 'sharp-solid', 'test'],
         ];
     }
 
@@ -173,4 +186,17 @@ public function test_it_can_remove_duotone_inline_styles(): void
         $this->assertStringNotContainsString('--fa-secondary-color', $svg);
         $this->assertStringNotContainsString('--fa-secondary-opacity', $svg);
     }
+
+    /**
+     * @dataProvider icons
+     */
+    public function test_it_can_get_the_icons($icon, $dir, $filename): void
+    {
+        $fa = $this->createInstance();
+
+        $details = $fa->get_icon_details($icon);
+
+        $this->assertStringContainsString($dir, $details['dir']);
+        $this->assertStringContainsString($filename, $details['filename']);
+    }
 }