Fix font handling + simplify Twig extension

endroid · Oct 21, 2024 · 379b3e7 · 379b3e7
1 parent a7605f0
commit 379b3e7
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 22 deletions.
diff --git a/src/DependencyInjection/EndroidQrCodeExtension.php b/src/DependencyInjection/EndroidQrCodeExtension.php
@@ -10,7 +10,7 @@
 use Endroid\QrCode\Encoding\Encoding;
 use Endroid\QrCode\ErrorCorrectionLevel;
 use Endroid\QrCode\Label\Font\Font;
-use Endroid\QrCode\Label\Font\NotoSans;
+use Endroid\QrCode\Label\Font\OpenSans;
 use Endroid\QrCode\Label\LabelAlignment;
 use Endroid\QrCode\RoundBlockSizeMode;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
@@ -81,7 +81,7 @@ private function createBuilderDefinition(string $builderName, array $builderConf
                     $arguments['labelFont'] = new Definition(Font::class, [$value, $labelFontSize]);
                     break;
                 case 'labelFontSize':
-                    $labelFontPath = $builderConfig['labelFontPath'] ?? (new NotoSans())->getPath();
+                    $labelFontPath = $builderConfig['labelFontPath'] ?? (new OpenSans())->getPath();
                     $arguments['labelFont'] = new Definition(Font::class, [$labelFontPath, $value]);
                     break;
                 case 'labelAlignment':

diff --git a/src/Twig/QrCodeRuntime.php b/src/Twig/QrCodeRuntime.php
@@ -48,17 +48,12 @@ public function qrCodeResultFunction(string $data, string $builder = 'default',
     {
         $builder = $this->builderRegistry->get($builder);
 
-        foreach ($options as $option => $value) {
-            if (!method_exists($builder, $option)) {
-                throw new \Exception(sprintf('Builder option "%s" does not exist', $option));
-            }
-            $builder->$option($value);
-        }
-
         if (!$builder instanceof Builder) {
             throw new \Exception('This twig extension only handles Builder instances');
         }
 
-        return $builder->build(data: $data);
+        $options['data'] = $data;
+
+        return $builder->build(...$options);
     }
 }
diff --git a/tests/application/assets/open_sans.ttf b/tests/application/assets/open_sans.ttf
diff --git a/tests/application/tests/BuilderTest.php b/tests/application/tests/BuilderTest.php
@@ -7,13 +7,12 @@
 use Endroid\QrCode\Builder\Builder;
 use Endroid\QrCode\Builder\BuilderRegistryInterface;
 use Endroid\QrCode\Writer\Result\SvgResult;
+use PHPUnit\Framework\Attributes\TestDox;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 final class BuilderTest extends WebTestCase
 {
-    /**
-     * @testdox The builder registry contains the configured builders
-     */
+    #[TestDox('The builder registry contains the configured builders')]
     public function testBuilderRegistry(): void
     {
         self::bootKernel();
@@ -27,16 +26,14 @@ public function testBuilderRegistry(): void
         /** @var BuilderRegistryInterface $builderRegistry */
         $builderRegistry = $container->get(BuilderRegistryInterface::class);
 
-        $defaultBuilder = $builderRegistry->getBuilder('default');
+        $defaultBuilder = $builderRegistry->get('default');
         $this->assertInstanceOf(Builder::class, $defaultBuilder);
 
-        $customBuilder = $builderRegistry->getBuilder('custom');
+        $customBuilder = $builderRegistry->get('custom');
         $this->assertInstanceOf(Builder::class, $customBuilder);
     }
 
-    /**
-     * @testdox Builder can generate QR code
-     */
+    #[TestDox('The builder can generate a QR code')]
     public function testBuilderDefault()
     {
         self::bootKernel();
@@ -50,7 +47,7 @@ public function testBuilderDefault()
         /** @var BuilderRegistryInterface $builderRegistry */
         $builderRegistry = $container->get(BuilderRegistryInterface::class);
 
-        $customBuilder = $builderRegistry->getBuilder('custom');
+        $customBuilder = $builderRegistry->get('custom');
         $result = $customBuilder->build();
 
         $this->assertInstanceOf(SvgResult::class, $result);

diff --git a/tests/application/tests/Controller/GenerateControllerTest.php b/tests/application/tests/Controller/GenerateControllerTest.php
@@ -4,13 +4,12 @@
 
 namespace Endroid\QrCodeBundle\Tests;
 
+use PHPUnit\Framework\Attributes\TestDox;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 final class GenerateControllerTest extends WebTestCase
 {
-    /**
-     * @testdox QR Codes can be generated via the url
-     */
+    #[TestDox('QR Codes can be generated via the url')]
     public function testGenerateController()
     {
         $client = static::createClient();