diff --git a/examples/imageWithLogo.php b/examples/imageWithLogo.php index 730acfefc..201d8ea8e 100644 --- a/examples/imageWithLogo.php +++ b/examples/imageWithLogo.php @@ -64,7 +64,7 @@ class QRImageWithLogo extends QRGdImage{ } if($this->options->imageBase64){ - $imageData = $this->base64encode($imageData, 'image/'.$this->options->outputType); + $imageData = $this->toBase64DataURI($imageData, 'image/'.$this->options->outputType); } return $imageData; diff --git a/examples/imageWithText.php b/examples/imageWithText.php index b7e85c397..c32a66965 100644 --- a/examples/imageWithText.php +++ b/examples/imageWithText.php @@ -44,7 +44,7 @@ class QRImageWithText extends QRGdImage{ } if($this->options->imageBase64){ - $imageData = $this->base64encode($imageData, 'image/'.$this->options->outputType); + $imageData = $this->toBase64DataURI($imageData, 'image/'.$this->options->outputType); } return $imageData; diff --git a/examples/svgRoundQuietzone.php b/examples/svgRoundQuietzone.php index 16c68ec38..f9a8ea4c3 100644 --- a/examples/svgRoundQuietzone.php +++ b/examples/svgRoundQuietzone.php @@ -57,7 +57,7 @@ class RoundQuietzoneSVGoutput extends QRMarkupSVG{ // transform to data URI only when not saving to file if(!$saveToFile && $this->options->imageBase64){ - $svg = $this->base64encode($svg, 'image/svg+xml'); + $svg = $this->toBase64DataURI($svg, 'image/svg+xml'); } return $svg; diff --git a/src/Output/QRFpdf.php b/src/Output/QRFpdf.php index 2a38ff95e..31c686c42 100644 --- a/src/Output/QRFpdf.php +++ b/src/Output/QRFpdf.php @@ -106,7 +106,7 @@ class QRFpdf extends QROutputAbstract{ } if($this->options->imageBase64){ - $pdfData = $this->base64encode($pdfData, 'application/pdf'); + $pdfData = $this->toBase64DataURI($pdfData, 'application/pdf'); } return $pdfData; diff --git a/src/Output/QRGdImage.php b/src/Output/QRGdImage.php index 71f5def02..7449358e4 100644 --- a/src/Output/QRGdImage.php +++ b/src/Output/QRGdImage.php @@ -131,7 +131,7 @@ class QRGdImage extends QROutputAbstract{ } if($this->options->imageBase64){ - $imageData = $this->base64encode($imageData, 'image/'.$this->options->outputType); + $imageData = $this->toBase64DataURI($imageData, 'image/'.$this->options->outputType); } restore_error_handler(); diff --git a/src/Output/QRMarkupSVG.php b/src/Output/QRMarkupSVG.php index 910e8673b..b00f9ea69 100644 --- a/src/Output/QRMarkupSVG.php +++ b/src/Output/QRMarkupSVG.php @@ -40,7 +40,7 @@ class QRMarkupSVG extends QRMarkup{ // transform to data URI only when not saving to file if(!$saveToFile && $this->options->imageBase64){ - $svg = $this->base64encode($svg, 'image/svg+xml'); + $svg = $this->toBase64DataURI($svg, 'image/svg+xml'); } return $svg; diff --git a/src/Output/QROutputAbstract.php b/src/Output/QROutputAbstract.php index ca4309641..e2cb670c8 100644 --- a/src/Output/QROutputAbstract.php +++ b/src/Output/QROutputAbstract.php @@ -117,7 +117,7 @@ abstract class QROutputAbstract implements QROutputInterface{ /** * Returns a base64 data URI for the given string and mime type */ - protected function base64encode(string $data, string $mime):string{ + protected function toBase64DataURI(string $data, string $mime):string{ return sprintf('data:%s;base64,%s', $mime, base64_encode($data)); }