bug #1607 [Icons] Compute viewBox with iconset data (+tests) (smnandre)

This PR was squashed before being merged into the 2.x branch.

Discussion
----------

[Icons] Compute viewBox with iconset data (+tests)

There were a bug for icons with no individual "height" attribute.

Now it fallbacks on IconSet metada.

And i started a test class for Iconify

Commits
-------

f3f9d12 [Icons] Compute viewBox with iconset data (+tests)

Author: kbond

src/Icons/src/Iconify.php

@@ -64,8 +64,14 @@ public function fetchIcon(string $prefix, string $name): Icon
             throw new IconNotFoundException(sprintf('The icon "%s:%s" does not exist on iconify.design.', $prefix, $name));
         }
 
+        $height = $data['icons'][$name]['height'] ?? $this->sets()[$prefix]['height'] ?? null;
+        $width = $data['icons'][$name]['width'] ?? $this->sets()[$prefix]['width'] ?? null;
+        if (null === $width && null === $height) {
+            throw new \RuntimeException(sprintf('The icon "%s:%s" does not have a width or height.', $prefix, $name));
+        }
+
         return new Icon($data['icons'][$name]['body'], [
-            'viewBox' => sprintf('0 0 %s %s', $data['width'], $data['height']),
+            'viewBox' => sprintf('0 0 %s %s', $width ?? $height, $height ?? $width),
         ]);
     }
 

src/Icons/tests/Unit/IconifyTest.php

@@ -0,0 +1,120 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\UX\Icons\Tests\Unit;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Cache\Adapter\NullAdapter;
+use Symfony\Component\HttpClient\MockHttpClient;
+use Symfony\Component\HttpClient\Response\JsonMockResponse;
+use Symfony\UX\Icons\Exception\IconNotFoundException;
+use Symfony\UX\Icons\Iconify;
+
+/**
+ * @author Simon André <[email protected]>
+ */
+class IconifyTest extends TestCase
+{
+    public function testFetchIcon(): void
+    {
+        $iconify = new Iconify(
+            cache: new NullAdapter(),
+            endpoint: 'https://example.com',
+            http: new MockHttpClient([
+                new JsonMockResponse([
+                    'bi' => [],
+                ]),
+                new JsonMockResponse([
+                    'icons' => [
+                        'heart' => [
+                            'body' => '<path d="M0 0h24v24H0z" fill="none"/>',
+                            'height' => 24,
+                        ],
+                    ],
+                ]),
+            ]),
+        );
+
+        $icon = $iconify->fetchIcon('bi', 'heart');
+
+        $this->assertEquals($icon->getInnerSvg(), '<path d="M0 0h24v24H0z" fill="none"/>');
+        $this->assertEquals($icon->getAttributes(), ['viewBox' => '0 0 24 24']);
+    }
+
+    public function testFetchIconThrowsWhenIconSetDoesNotExists(): void
+    {
+        $iconify = new Iconify(
+            cache: new NullAdapter(),
+            endpoint: 'https://example.com',
+            http: new MockHttpClient([
+                new JsonMockResponse([]),
+            ]),
+        );
+
+        $this->expectException(IconNotFoundException::class);
+        $this->expectExceptionMessage('The icon "bi:heart" does not exist on iconify.design.');
+
+        $iconify->fetchIcon('bi', 'heart');
+    }
+
+    public function testFetchIconUsesIconsetViewBoxHeight(): void
+    {
+        $iconify = new Iconify(
+            cache: new NullAdapter(),
+            endpoint: 'https://example.com',
+            http: new MockHttpClient([
+                new JsonMockResponse([
+                    'bi' => [
+                        'height' => 17,
+                    ],
+                ]),
+                new JsonMockResponse([
+                    'icons' => [
+                        'heart' => [
+                            'body' => '<path d="M0 0h24v24H0z" fill="none"/>',
+                        ],
+                    ],
+                ]),
+            ]),
+        );
+
+        $icon = $iconify->fetchIcon('bi', 'heart');
+
+        $this->assertIsArray($icon->getAttributes());
+        $this->assertArrayHasKey('viewBox', $icon->getAttributes());
+        $this->assertEquals('0 0 17 17', $icon->getAttributes()['viewBox']);
+    }
+
+    public function testFetchIconThrowsWhenViewBoxCannotBeComputed(): void
+    {
+        $iconify = new Iconify(
+            cache: new NullAdapter(),
+            endpoint: 'https://example.com',
+            http: new MockHttpClient([
+                new JsonMockResponse([
+                    'bi' => [],
+                ]),
+                new JsonMockResponse([
+                    'icons' => [
+                        'heart' => [
+                            'body' => '<path d="M0 0h24v24H0z" fill="none"/>',
+                        ],
+                    ],
+                ]),
+            ]),
+        );
+
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('The icon "bi:heart" does not have a width or height.');
+
+        $iconify->fetchIcon('bi', 'heart');
+    }
+}