1
0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2026-02-04 07:57:11 +00:00

update phpstan to 1.1.2; update php-qrcode to 3.4.1

This commit is contained in:
Andrew Dolgov
2021-11-15 18:33:35 +03:00
parent 109b702ed0
commit 4c37fa4b41
29 changed files with 1397 additions and 1750 deletions

View File

@@ -41,9 +41,9 @@ class QRImageWithLogo extends QRImage{
}
$this->matrix->setLogoSpace(
$this->options->logoWidth,
$this->options->logoHeight
// not utilizing the position here
$this->options->logoSpaceWidth,
$this->options->logoSpaceHeight
// not utilizing the position here
);
// there's no need to save the result of dump() into $this->image here
@@ -55,9 +55,9 @@ class QRImageWithLogo extends QRImage{
$w = imagesx($im);
$h = imagesy($im);
// set new logo size, leave a border of 1 module
$lw = ($this->options->logoWidth - 2) * $this->options->scale;
$lh = ($this->options->logoHeight - 2) * $this->options->scale;
// set new logo size, leave a border of 1 module (no proportional resize/centering)
$lw = ($this->options->logoSpaceWidth - 2) * $this->options->scale;
$lh = ($this->options->logoSpaceHeight - 2) * $this->options->scale;
// get the qrcode size
$ql = $this->matrix->size() * $this->options->scale;