Some refactoring

src/Exception/MissingWriterException.php → src/Exception/InvalidWriterException.php

@@ -9,6 +9,6 @@
 
 namespace Endroid\QrCode\Exception;
 
-class MissingWriterException extends QrCodeException
+class InvalidWriterException extends QrCodeException
 {
 }

src/Exception/UnsupportedExtensionException.php

@@ -0,0 +1,14 @@
+<?php
+
+/*
+ * (c) Jeroen van den Enden <[email protected]>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Endroid\QrCode\Exception;
+
+class UnsupportedExtensionException extends QrCodeException
+{
+}

src/QrCode.php

@@ -10,7 +10,8 @@
 namespace Endroid\QrCode;
 
 use Endroid\QrCode\Exception\InvalidPathException;
-use Endroid\QrCode\Exception\MissingWriterException;
+use Endroid\QrCode\Exception\InvalidWriterException;
+use Endroid\QrCode\Exception\UnsupportedExtensionException;
 use Endroid\QrCode\Writer\BinaryWriter;
 use Endroid\QrCode\Writer\EpsWriter;
 use Endroid\QrCode\Writer\PngDataUriWriter;
@@ -152,6 +153,14 @@ public function registerWriter(WriterInterface $writer)
         }
     }
 
+    /**
+     * @return WriterInterface[]
+     */
+    public function getRegisteredWriters()
+    {
+        return $this->writers;
+    }
+
     /**
      * @param string $text
      * @return $this
@@ -474,7 +483,7 @@ public function getValidateResult()
     /**
      * @param string $writerClass
      * @return string
-     * @throws MissingWriterException
+     * @throws InvalidWriterException
      */
     public function getContentType($writerClass)
     {
@@ -485,12 +494,12 @@ public function getContentType($writerClass)
 
     /**
      * @param string $writerClass
-     * @throws MissingWriterException
+     * @throws InvalidWriterException
      */
     protected function assertValidWriterClass($writerClass)
     {
         if (!isset($this->writers[$writerClass])) {
-            throw new MissingWriterException('Invalid writer "'.$writerClass.'"');
+            throw new InvalidWriterException('Invalid writer "'.$writerClass.'"');
         }
     }
 
@@ -535,16 +544,16 @@ public function getWriterByPath($path)
     /**
      * @param string $extension
      * @return WriterInterface
-     * @throws MissingWriterException
+     * @throws UnsupportedExtensionException
      */
     public function getWriterByExtension($extension)
     {
         foreach ($this->writers as $writer) {
-            if (in_array($extension, $writer->getSupportedExtensions())) {
+            if ($writer->supportsExtension($extension)) {
                 return $writer;
             }
         }
 
-        throw new MissingWriterException('Missing writer for extension "'.$extension.'"');
+        throw new UnsupportedExtensionException('Missing writer for extension "'.$extension.'"');
     }
 }

src/Twig/Extension/QrCodeExtension.php

@@ -9,7 +9,9 @@
 
 namespace Endroid\QrCode\Twig\Extension;
 
+use Endroid\QrCode\Exception\UnsupportedExtensionException;
 use Endroid\QrCode\Factory\QrCodeFactory;
+use Endroid\QrCode\Writer\AbstractDataUriWriter;
 use Endroid\QrCode\Writer\PngDataUriWriter;
 use Endroid\QrCode\Writer\SvgDataUriWriter;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
@@ -91,8 +93,9 @@ public function getQrCodeReference($text, array $options = [], $referenceType)
 
     /**
      * @param string $text
-     * @param array  $options
+     * @param array $options
      * @return string
+     * @throws UnsupportedExtensionException
      */
     public function qrcodeDataUriFunction($text, array $options = [])
     {
@@ -103,8 +106,14 @@ public function qrcodeDataUriFunction($text, array $options = [])
         }
 
         $qrCode = $this->qrCodeFactory->create($text, $options);
-        $writer = $qrCode->getWriterByExtension($extension);
+        $internalWriter = $qrCode->getWriterByExtension($extension);
+
+        foreach ($qrCode->getRegisteredWriters() as $writer) {
+            if ($writer instanceof AbstractDataUriWriter && $writer->getInternalWriterClass() == get_class($internalWriter)) {
+                return $writer->writeString();
+            }
+        }
 
-        return $writer->writeString();
+        throw new UnsupportedExtensionException('Extenstion '.$extension.' is not supported by any of the writers');
     }
 }

src/Writer/AbstractDataUriWriter.php

@@ -33,7 +33,7 @@ public function getContentType()
     /**
      * {@inheritdoc}
      */
-    public function getSupportedExtensions()
+    protected function getSupportedExtensions()
     {
         return [];
     }

src/Writer/AbstractWriter.php

@@ -46,9 +46,18 @@ public function writeFile($path)
     abstract public function getContentType();
 
     /**
-     * {@inheritdoc}
+     * @param string $extension
+     * @return bool
+     */
+    public function supportsExtension($extension)
+    {
+        return in_array($extension, $this->getSupportedExtensions());
+    }
+
+    /**
+     * @return array
      */
-    public function getSupportedExtensions()
+    protected function getSupportedExtensions()
     {
         return [];
     }

src/Writer/BinaryWriter.php

@@ -46,7 +46,7 @@ public function getContentType()
     /**
      * {@inheritdoc}
      */
-    public function getSupportedExtensions()
+    protected function getSupportedExtensions()
     {
         return ['bin', 'txt'];
     }

src/Writer/EpsWriter.php

@@ -48,7 +48,7 @@ public function getContentType()
     /**
      * {@inheritdoc}
      */
-    public function getSupportedExtensions()
+    protected function getSupportedExtensions()
     {
         return ['eps'];
     }

src/Writer/PngWriter.php

@@ -150,7 +150,7 @@ public function getContentType()
     /**
      * {@inheritdoc}
      */
-    public function getSupportedExtensions()
+    protected function getSupportedExtensions()
     {
         return ['png'];
     }

src/Writer/SvgWriter.php

@@ -47,7 +47,7 @@ public function getContentType()
     /**
      * {@inheritdoc}
      */
-    public function getSupportedExtensions()
+    protected function getSupportedExtensions()
     {
         return ['svg'];
     }

src/Writer/WriterInterface.php

@@ -34,7 +34,8 @@ public function writeFile($path);
     public function getContentType();
 
     /**
-     * @return array
+     * @param string $extension
+     * @return bool
      */
-    public function getSupportedExtensions();
+    public function supportsExtension($extension);
 }