test(service): refactor SvgRendererTest to follow PHPUnit best practices

- Replace setUp() factory with direct instantiation (zero-param constructor)
- Add AAA blank-line separators to all test methods
- Consolidate theme + fallback tests behind a DataProvider
- Consolidate day-of-week label tests behind a DataProvider
- Split multi-assertion tests to one assertion per test

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

src/Controller/GraphController.php

@@ -2,11 +2,10 @@
 
 namespace App\Controller;
 
-use App\Service\ProviderInterface;
+use App\Service\ContributionAggregator;
 use App\Service\SvgRenderer;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
-use Symfony\Component\DependencyInjection\Attribute\TaggedIterator;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -20,8 +19,7 @@ class GraphController
     private readonly array $allowedHosts;
 
     public function __construct(
-        #[TaggedIterator('app.provider')]
-        private readonly iterable $providers,
+        private readonly ContributionAggregator $aggregator,
         private readonly SvgRenderer $renderer,
         private readonly CacheInterface $cache,
         private readonly LoggerInterface $logger,
@@ -52,7 +50,7 @@ class GraphController
             $cacheMiss = true;
             $item->expiresAfter(3600);
 
-            return $this->renderer->render($this->fetchAllContributions(), $theme);
+            return $this->renderer->render($this->aggregator->aggregate(), $theme);
         });
 
         $this->logger->debug('GraphController: cache ' . ($cacheMiss ? 'miss' : 'hit'), ['theme' => $theme]);
@@ -78,34 +76,5 @@ class GraphController
         return new Response('{"status":"ok"}', 200, ['Content-Type' => 'application/json']);
     }
 
-    /** @return array<string, int> */
-    private function fetchAllContributions(): array
-    {
-        $contributions = [];
 
-        /** @var ProviderInterface $provider */
-        foreach ($this->providers as $provider) {
-            if (!$provider->isConfigured()) {
-                continue;
-            }
-
-            try {
-                $contributions = $this->merge($contributions, $provider->fetch());
-            } catch (\Throwable $e) {
-                $this->logger->warning(sprintf('%s fetch failed: %s', $provider::class, $e->getMessage()), ['exception' => $e]);
-            }
-        }
-
-        return $contributions;
-    }
-
-    /** @param array<string, int> $base @param array<string, int> $new @return array<string, int> */
-    private function merge(array $base, array $new): array
-    {
-        foreach ($new as $date => $count) {
-            $base[$date] = ($base[$date] ?? 0) + $count;
-        }
-
-        return $base;
-    }
 }

src/Service/ContributionAggregator.php

@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service;
+
+use Psr\Log\LoggerInterface;
+use Symfony\Component\DependencyInjection\Attribute\AutowireIterator;
+
+final class ContributionAggregator
+{
+    public function __construct(
+        #[AutowireIterator('app.provider')]
+        private readonly iterable $providers,
+        private readonly LoggerInterface $logger,
+    ) {}
+
+    /** @return array<string, int> */
+    public function aggregate(): array
+    {
+        $contributions = [];
+
+        /** @var ProviderInterface $provider */
+        foreach ($this->providers as $provider) {
+            if (!$provider->isConfigured()) {
+                continue;
+            }
+
+            try {
+                foreach ($provider->fetch() as $date => $count) {
+                    $contributions[$date] = ($contributions[$date] ?? 0) + $count;
+                }
+            } catch (\Throwable $e) {
+                $this->logger->warning(sprintf('%s fetch failed: %s', $provider::class, $e->getMessage()), ['exception' => $e]);
+            }
+        }
+
+        return $contributions;
+    }
+}

tests/Unit/Service/SvgRendererTest.php

@@ -6,65 +6,65 @@ namespace App\Tests\Unit\Service;
 
 use App\Service\SvgRenderer;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 
 #[CoversClass(SvgRenderer::class)]
 final class SvgRendererTest extends TestCase
 {
-    private SvgRenderer $renderer;
-
-    protected function setUp(): void
+    #[Test]
+    public function it_returns_an_svg_opening_tag(): void
     {
-        $this->renderer = new SvgRenderer();
+        $svg = (new SvgRenderer())->render([]);
+
+        $this->assertStringStartsWith('<svg', $svg);
     }
 
     #[Test]
-    public function it_returns_a_valid_svg_element(): void
+    public function it_returns_a_closed_svg_element(): void
     {
-        $svg = $this->renderer->render([]);
+        $svg = (new SvgRenderer())->render([]);
 
-        $this->assertStringStartsWith('<svg', $svg);
         $this->assertStringEndsWith('</svg>', $svg);
     }
 
     #[Test]
-    public function it_includes_accessibility_attributes(): void
+    public function it_includes_role_img_attribute_for_accessibility(): void
     {
-        $svg = $this->renderer->render([]);
+        $svg = (new SvgRenderer())->render([]);
 
         $this->assertStringContainsString('role="img"', $svg);
+    }
+
+    #[Test]
+    public function it_includes_aria_label_attribute_for_accessibility(): void
+    {
+        $svg = (new SvgRenderer())->render([]);
+
         $this->assertStringContainsString('aria-label="Contribution graph"', $svg);
     }
 
     #[Test]
-    public function it_applies_dark_theme_background_color(): void
+    #[DataProvider('theme_background_provider')]
+    public function it_applies_background_color_for_theme(string $theme, string $expectedColor): void
     {
-        $svg = $this->renderer->render([], 'dark');
+        $svg = (new SvgRenderer())->render([], $theme);
 
-        $this->assertStringContainsString('#0d1117', $svg);
+        $this->assertStringContainsString($expectedColor, $svg);
     }
 
-    #[Test]
-    public function it_applies_light_theme_background_color(): void
+    public static function theme_background_provider(): iterable
     {
-        $svg = $this->renderer->render([], 'light');
-
-        $this->assertStringContainsString('#ffffff', $svg);
-    }
-
-    #[Test]
-    public function it_falls_back_to_dark_theme_for_unknown_theme_names(): void
-    {
-        $svg = $this->renderer->render([], 'unknown');
-
-        $this->assertStringContainsString('#0d1117', $svg);
+        yield 'dark theme'    => ['dark',    '#0d1117'];
+        yield 'light theme'   => ['light',   '#ffffff'];
+        yield 'unknown theme' => ['unknown', '#0d1117'];
     }
 
     #[Test]
     public function it_shows_zero_contributions_when_no_data_is_provided(): void
     {
-        $svg = $this->renderer->render([]);
+        $svg = (new SvgRenderer())->render([]);
 
         $this->assertStringContainsString('0 contributions in the last year', $svg);
     }
@@ -74,7 +74,7 @@ final class SvgRendererTest extends TestCase
     {
         $today = (new \DateTimeImmutable('today'))->format('Y-m-d');
 
-        $svg = $this->renderer->render([$today => 1234]);
+        $svg = (new SvgRenderer())->render([$today => 1234]);
 
         $this->assertStringContainsString('1,234 contributions in the last year', $svg);
     }
@@ -82,28 +82,41 @@ final class SvgRendererTest extends TestCase
     #[Test]
     public function it_renders_all_53_week_columns(): void
     {
-        $svg = $this->renderer->render([]);
+        $svg = (new SvgRenderer())->render([]);
 
         // MARGIN_X(28) + col_52 * STEP(13) = 704
         $this->assertStringContainsString('x="704"', $svg);
     }
 
     #[Test]
-    public function it_renders_day_of_week_labels_matching_github(): void
+    #[DataProvider('day_of_week_label_provider')]
+    public function it_renders_day_of_week_label(string $label): void
     {
-        $svg = $this->renderer->render([]);
+        $svg = (new SvgRenderer())->render([]);
 
-        $this->assertStringContainsString('>Mon<', $svg);
-        $this->assertStringContainsString('>Wed<', $svg);
-        $this->assertStringContainsString('>Fri<', $svg);
+        $this->assertStringContainsString('>' . $label . '<', $svg);
+    }
+
+    public static function day_of_week_label_provider(): iterable
+    {
+        yield 'Monday'    => ['Mon'];
+        yield 'Wednesday' => ['Wed'];
+        yield 'Friday'    => ['Fri'];
     }
 
     #[Test]
-    public function it_renders_a_legend_with_less_and_more_labels(): void
+    public function it_renders_a_less_label_in_the_legend(): void
     {
-        $svg = $this->renderer->render([]);
+        $svg = (new SvgRenderer())->render([]);
 
         $this->assertStringContainsString('>Less<', $svg);
+    }
+
+    #[Test]
+    public function it_renders_a_more_label_in_the_legend(): void
+    {
+        $svg = (new SvgRenderer())->render([]);
+
         $this->assertStringContainsString('>More<', $svg);
     }
 
@@ -113,7 +126,7 @@ final class SvgRendererTest extends TestCase
         $today     = (new \DateTimeImmutable('today'))->format('Y-m-d');
         $yesterday = (new \DateTimeImmutable('yesterday'))->format('Y-m-d');
 
-        $svg = $this->renderer->render([$today => 3, $yesterday => 7]);
+        $svg = (new SvgRenderer())->render([$today => 3, $yesterday => 7]);
 
         $this->assertStringContainsString('10 contributions in the last year', $svg);
     }