mirrors/shlink
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2024-11-28 00:38:46 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #510 from acelaya-forks/feature/update-common

Browse source 
Updated common and qr-code
This commit is contained in:
Alejandro Celaya 2019-10-15 19:17:44 +02:00 committed by GitHub
commit a61a7db275
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
composer.json
View file

@ -23,7 +23,7 @@
"doctrine/dbal": "^2.9", "doctrine/dbal": "^2.9",
"doctrine/migrations": "^2.0", "doctrine/migrations": "^2.0",
"doctrine/orm": "^2.5", "doctrine/orm": "^2.5",
"endroid/qr-code": "^1.7", "endroid/qr-code": "^3.6",
"firebase/php-jwt": "^4.0", "firebase/php-jwt": "^4.0",
"geoip2/geoip2": "^2.9", "geoip2/geoip2": "^2.9",
"guzzlehttp/guzzle": "^6.3", "guzzlehttp/guzzle": "^6.3",
@ -34,7 +34,7 @@
"phly/phly-event-dispatcher": "^1.0", "phly/phly-event-dispatcher": "^1.0",
"predis/predis": "^1.1", "predis/predis": "^1.1",
"pugx/shortid-php": "^0.5", "pugx/shortid-php": "^0.5",
"shlinkio/shlink-common": "^2.0", "shlinkio/shlink-common": "^2.1",
"shlinkio/shlink-event-dispatcher": "^1.0", "shlinkio/shlink-event-dispatcher": "^1.0",
"shlinkio/shlink-installer": "^2.1", "shlinkio/shlink-installer": "^2.1",
"shlinkio/shlink-ip-geolocation": "^1.0", "shlinkio/shlink-ip-geolocation": "^1.0",

4
module/Core/src/Action/QrCodeAction.php
View file

@ -70,8 +70,8 @@ class QrCodeAction implements MiddlewareInterface
$size = $this->getSizeParam($request); $size = $this->getSizeParam($request);
$qrCode = new QrCode((string) $request->getUri()->withPath($path)->withQuery('')); $qrCode = new QrCode((string) $request->getUri()->withPath($path)->withQuery(''));
$qrCode->setSize($size) $qrCode->setSize($size);
->setPadding(0); $qrCode->setMargin(0);
return new QrCodeResponse($qrCode); return new QrCodeResponse($qrCode);
} }