geckon01/php-qrcode
1
0
Fork 0
mirror of https://github.com/chillerlan/php-qrcode.git synced 2026-09-05 23:18:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

:octocat: simplify base64 URI creation

Browse Source
This commit is contained in:
codemasher
2021-01-20 16:19:48 +01:00
parent abf6c2fd94
commit e06c4a38f7
6 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/QRImageWithLogo.php
+1 -1
View File
@@ -72,7 +72,7 @@ class QRImageWithLogo extends QRImage{
}
if($this->options->imageBase64){
$imageData = 'data:image/'.$this->options->outputType.';base64,'.base64_encode($imageData);
$imageData = $this->base64encode($imageData, 'image/'.$this->options->outputType);
}
return $imageData;
examples/QRImageWithText.php
+2 -2
View File
@@ -20,7 +20,7 @@ namespace chillerlan\QRCodeExamples;
use chillerlan\QRCode\Output\QRImage;
use function base64_encode, imagechar, imagecolorallocate, imagecolortransparent, imagecopymerge, imagecreatetruecolor,
use function imagechar, imagecolorallocate, imagecolortransparent, imagecopymerge, imagecreatetruecolor,
imagedestroy, imagefilledrectangle, imagefontwidth, in_array, round, str_split, strlen;
class QRImageWithText extends QRImage{
@@ -50,7 +50,7 @@ class QRImageWithText extends QRImage{
}
if($this->options->imageBase64){
$imageData = 'data:image/'.$this->options->outputType.';base64,'.base64_encode($imageData);
$imageData = $this->base64encode($imageData, 'image/'.$this->options->outputType);
}
return $imageData;
src/Output/QRFpdf.php
+1 -1
View File
@@ -103,7 +103,7 @@ class QRFpdf extends QROutputAbstract{
}
if($this->options->imageBase64){
$pdfData = sprintf('data:application/pdf;base64,%s', base64_encode($pdfData));
$pdfData = $this->base64encode($pdfData, 'application/pdf');
}
return $pdfData;
src/Output/QRImage.php
+3 -3
View File
@@ -19,9 +19,9 @@ use chillerlan\QRCode\{QRCode, QRCodeException};
use chillerlan\Settings\SettingsContainerInterface;
use Exception;
use function array_values, base64_encode, call_user_func, count, extension_loaded, imagecolorallocate, imagecolortransparent,
use function array_values, call_user_func, count, extension_loaded, imagecolorallocate, imagecolortransparent,
imagecreatetruecolor, imagedestroy, imagefilledrectangle, imagegif, imagejpeg, imagepng, in_array,
is_array, ob_end_clean, ob_get_contents, ob_start, range, sprintf;
is_array, ob_end_clean, ob_get_contents, ob_start, range;
/**
* Converts the matrix into GD images, raw or base64 output (requires ext-gd)
@@ -127,7 +127,7 @@ class QRImage extends QROutputAbstract{
}
if($this->options->imageBase64){
$imageData = sprintf('data:image/%s;base64,%s', $this->options->outputType, base64_encode($imageData));
$imageData = $this->base64encode($imageData, 'image/'.$this->options->outputType);
}
return $imageData;
src/Output/QRMarkup.php
+1 -1
View File
@@ -151,7 +151,7 @@ class QRMarkup extends QROutputAbstract{
}
if($this->options->imageBase64){
$svg = sprintf('data:image/svg+xml;base64,%s', base64_encode($svg));
$svg = $this->base64encode($svg, 'image/svg+xml');
}
return $svg;
src/Output/QROutputAbstract.php
+8 -2
View File
@@ -14,8 +14,7 @@ namespace chillerlan\QRCode\Output;
use chillerlan\QRCode\{Data\QRMatrix, QRCode};
use chillerlan\Settings\SettingsContainerInterface;
use function call_user_func_array, dirname, file_put_contents, get_called_class, in_array, is_writable, sprintf;
use function base64_encode, call_user_func_array, dirname, file_put_contents, get_called_class, in_array, is_writable, sprintf;
/**
* common output abstract
@@ -92,6 +91,13 @@ abstract class QROutputAbstract implements QROutputInterface{
*/
abstract protected function setModuleValues():void;
/**
* Returns a base64 data URI for the given string and mime type
*/
protected function base64encode(string $data, string $mime):string{
return sprintf('data:%s;base64,%s', $mime, base64_encode($data));
}
/**
* saves the qr data to a file
*