Skip to content

Add support for using GD library #299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Add support for using GD library #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d993db1
Add support for GD library
raditzfarhan Apr 15, 2024
b7d084a
Update formatter
raditzfarhan Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
}
],
"require": {
"php": ">=7.2|^8.0",
"php": "^8.1",
"ext-gd": "*",
"bacon/bacon-qr-code": "^2.0"
"bacon/bacon-qr-code": "dev-main"
},
"require-dev": {
"mockery/mockery": "~1",
Expand Down
30 changes: 22 additions & 8 deletions src/Generator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@
use BaconQrCode\Renderer\Eye\ModuleEye;
use BaconQrCode\Renderer\Eye\SimpleCircleEye;
use BaconQrCode\Renderer\Eye\SquareEye;
use BaconQrCode\Renderer\GDLibRenderer;
use BaconQrCode\Renderer\ImageRenderer;
use BaconQrCode\Renderer\Image\EpsImageBackEnd;
use BaconQrCode\Renderer\Image\ImageBackEndInterface;
use BaconQrCode\Renderer\Image\ImagickImageBackEnd;
use BaconQrCode\Renderer\Image\SvgImageBackEnd;
use BaconQrCode\Renderer\ImageRenderer;
use BaconQrCode\Renderer\Module\DotsModule;
use BaconQrCode\Renderer\Module\ModuleInterface;
use BaconQrCode\Renderer\Module\RoundnessModule;
Expand Down Expand Up @@ -423,7 +424,7 @@ public function margin(int $margin): self
* @param ImageRenderer $renderer
* @return Writer
*/
public function getWriter(ImageRenderer $renderer): Writer
public function getWriter(ImageRenderer | GDLibRenderer $renderer): Writer
{
return new Writer($renderer);
}
Expand All @@ -433,14 +434,27 @@ public function getWriter(ImageRenderer $renderer): Writer
*
* @return ImageRenderer
*/
public function getRenderer(): ImageRenderer
public function getRenderer(): ImageRenderer | GDLibRenderer
{
$renderer = new ImageRenderer(
$this->getRendererStyle(),
$this->getFormatter()
);
if (extension_loaded('imagick')) {
$renderer = new ImageRenderer(
$this->getRendererStyle(),
$this->getFormatter()
);

return $renderer;
} elseif (extension_loaded('gd')) {
$renderer = new GDLibRenderer(
size: $this->pixels,
margin: $this->margin,
imageFormat: $this->format,
fill: $this->getFill()
);

return $renderer;
}

return $renderer;
throw new InvalidArgumentException("You need to install either Imagick or GD extension.");
}

/**
Expand Down