Merge pull request #31 from Pixelrobin/default-attributes-changes

Store attributes like icons

Author: Nate Wiebe

bin/build.php

@@ -46,15 +46,11 @@ function writeAttributes(array $attributes): void
     $export = var_export($attributes, true);
 
     file_put_contents(
-        implode(DIRECTORY_SEPARATOR, [$rootDir, 'src', 'defaultAttributes.php']),
+        implode(DIRECTORY_SEPARATOR, [$rootDir, 'resources', 'attributes.php']),
         <<<EOT
     <?php
 
-    /* !!! THIS FILE IS AUTO-GENERATED !!! */
-
-    namespace Feather;
-
-    const DEFAULT_ATTRIBUTES = $export;
+    return $export;
 
     EOT
     );

src/defaultAttributes.php renamed to resources/attributes.php

@@ -1,10 +1,6 @@
 <?php
 
-/* !!! THIS FILE IS AUTO-GENERATED !!! */
-
-namespace Feather;
-
-const DEFAULT_ATTRIBUTES = array (
+return array (
   'xmlns' => 'http://www.w3.org/2000/svg',
   'width' => '24',
   'height' => '24',

src/Icons.php

@@ -4,17 +4,16 @@
 
 use Feather\Exception\IconNotFoundException;
 
-require __DIR__ . '/defaultAttributes.php';
-
 class Icons
 {
-    private $attributes = DEFAULT_ATTRIBUTES;
+    private $attributes;
 
     private $icons;
 
     public function __construct()
     {
-        $this->icons = require implode(DIRECTORY_SEPARATOR, [dirname(__FILE__), '..', 'resources', 'icons.php']);
+        $this->attributes = require implode(DIRECTORY_SEPARATOR, [dirname(__FILE__), '..', 'resources', 'attributes.php']);
+        $this->icons      = require implode(DIRECTORY_SEPARATOR, [dirname(__FILE__), '..', 'resources', 'icons.php']);
     }
 
     public function get(string $name, array $attributes = []): string

tests/FeatherTest.php

@@ -39,7 +39,9 @@ protected function setUp(): void
 
     public function testIconsHasDefaultAttributes(): void
     {
-        $this->assertEquals(Feather\DEFAULT_ATTRIBUTES, $this->icons->getAttributes());
+        $attributes = require implode(DIRECTORY_SEPARATOR, [dirname(__FILE__), '..', 'resources', 'attributes.php']);
+
+        $this->assertEquals($attributes, $this->icons->getAttributes());
     }
 
     public function testIconDefaultXML(): void
@@ -68,6 +70,8 @@ public function testIconXMLWithAttributes(): void
 
     public function testIconXMLWithAttributesFromClass(): void
     {
+        $attributes = require implode(DIRECTORY_SEPARATOR, [dirname(__FILE__), '..', 'resources', 'attributes.php']);
+
         $test_data = $this->AttributeTestData;
 
         $this->icons->setattributes($test_data['attributes']);
@@ -79,7 +83,7 @@ public function testIconXMLWithAttributesFromClass(): void
             'XML custom attribute on class fail'
         );
 
-        $this->icons->setAttributes(Feather\DEFAULT_ATTRIBUTES);
+        $this->icons->setAttributes($attributes);
     }
 
     public function testIconNotFound(): void