Merge branch 'v5'

# Conflicts:
#	.github/workflows/tests.yml
#	.travis.yml
#	README.md
#	composer.json
#	examples/imageWithLogo.php
#	examples/svg.php
#	src/QRCode.php
This commit is contained in:
codemasher
2021-11-18 12:00:10 +01:00
110 changed files with 7866 additions and 1776 deletions
+7 -5
View File
@@ -1,7 +1,5 @@
<?php
/**
*
* @filesource imageWithLogo.php
* @created 18.11.2020
* @author smiley <smiley@chillerlan.net>
* @copyright 2020 smiley
@@ -11,6 +9,7 @@
namespace chillerlan\QRCodeExamples;
use chillerlan\QRCode\{QRCode, QROptions};
use chillerlan\QRCode\Common\EccLevel;
require_once __DIR__.'/../vendor/autoload.php';
@@ -30,16 +29,19 @@ class LogoOptions extends QROptions{
$options = new LogoOptions;
$options->version = 7;
$options->eccLevel = QRCode::ECC_H;
$options->eccLevel = EccLevel::H;
$options->imageBase64 = false;
$options->logoSpaceWidth = 13;
$options->logoSpaceHeight = 13;
$options->logoSpaceWidth = 13;
$options->scale = 5;
$options->imageTransparent = false;
$qrcode = new QRCode($options);
$qrcode->addByteSegment($data);
header('Content-type: image/png');
$qrOutputInterface = new QRImageWithLogo($options, (new QRCode($options))->getMatrix($data));
$qrOutputInterface = new QRImageWithLogo($options, $qrcode->getMatrix());
// dump the output, with an additional logo
echo $qrOutputInterface->dump(null, __DIR__.'/octocat.png');