diff --git a/lib/Providers/Qr/BaconQrCodeProvider.php b/lib/Providers/Qr/BaconQrCodeProvider.php index 089ad0b..4b53445 100644 --- a/lib/Providers/Qr/BaconQrCodeProvider.php +++ b/lib/Providers/Qr/BaconQrCodeProvider.php @@ -51,7 +51,7 @@ class BaconQrCodeProvider implements IQRCodeProvider throw new RuntimeException(sprintf('Unknown MIME-type: %s', $this->format)); } - public function getQRCodeImage(string $qrtext, int $size): string + public function getQRCodeImage(string $qrText, int $size): string { $backend = match ($this->format) { 'svg' => new SvgImageBackEnd(), @@ -59,7 +59,7 @@ class BaconQrCodeProvider implements IQRCodeProvider default => new ImagickImageBackEnd($this->format), }; - $output = $this->getQRCodeByBackend($qrtext, $size, $backend); + $output = $this->getQRCodeByBackend($qrText, $size, $backend); if ($this->format === 'svg') { $svg = explode("\n", $output); diff --git a/lib/Providers/Qr/EndroidQrCodeProvider.php b/lib/Providers/Qr/EndroidQrCodeProvider.php index f6aacd4..3750df5 100755 --- a/lib/Providers/Qr/EndroidQrCodeProvider.php +++ b/lib/Providers/Qr/EndroidQrCodeProvider.php @@ -41,19 +41,19 @@ class EndroidQrCodeProvider implements IQRCodeProvider return 'image/png'; } - public function getQRCodeImage(string $qrtext, int $size): string + public function getQRCodeImage(string $qrText, int $size): string { if (!$this->endroid4) { - return $this->qrCodeInstance($qrtext, $size)->writeString(); + return $this->qrCodeInstance($qrText, $size)->writeString(); } $writer = new PngWriter(); - return $writer->write($this->qrCodeInstance($qrtext, $size))->getString(); + return $writer->write($this->qrCodeInstance($qrText, $size))->getString(); } - protected function qrCodeInstance(string $qrtext, int $size): QrCode + protected function qrCodeInstance(string $qrText, int $size): QrCode { - $qrCode = new QrCode($qrtext); + $qrCode = new QrCode($qrText); $qrCode->setSize($size); $qrCode->setErrorCorrectionLevel($this->errorcorrectionlevel); diff --git a/lib/Providers/Qr/EndroidQrCodeWithLogoProvider.php b/lib/Providers/Qr/EndroidQrCodeWithLogoProvider.php index 71a5559..0a0b2d2 100755 --- a/lib/Providers/Qr/EndroidQrCodeWithLogoProvider.php +++ b/lib/Providers/Qr/EndroidQrCodeWithLogoProvider.php @@ -25,10 +25,10 @@ class EndroidQrCodeWithLogoProvider extends EndroidQrCodeProvider $this->logoSize = (array)$size; } - public function getQRCodeImage(string $qrtext, int $size): string + public function getQRCodeImage(string $qrText, int $size): string { if (!$this->endroid4) { - return $this->qrCodeInstance($qrtext, $size)->writeString(); + return $this->qrCodeInstance($qrText, $size)->writeString(); } $logo = null; @@ -42,12 +42,12 @@ class EndroidQrCodeWithLogoProvider extends EndroidQrCodeProvider } } $writer = new PngWriter(); - return $writer->write($this->qrCodeInstance($qrtext, $size), $logo)->getString(); + return $writer->write($this->qrCodeInstance($qrText, $size), $logo)->getString(); } - protected function qrCodeInstance(string $qrtext, int $size): QrCode + protected function qrCodeInstance(string $qrText, int $size): QrCode { - $qrCode = parent::qrCodeInstance($qrtext, $size); + $qrCode = parent::qrCodeInstance($qrText, $size); if (!$this->endroid4 && $this->logoPath) { $qrCode->setLogoPath($this->logoPath); diff --git a/lib/Providers/Qr/GoogleChartsQrCodeProvider.php b/lib/Providers/Qr/GoogleChartsQrCodeProvider.php index bbcb7ac..4dd6c2f 100644 --- a/lib/Providers/Qr/GoogleChartsQrCodeProvider.php +++ b/lib/Providers/Qr/GoogleChartsQrCodeProvider.php @@ -16,19 +16,19 @@ class GoogleChartsQrCodeProvider extends BaseHTTPQRCodeProvider return 'image/png'; } - public function getQRCodeImage(string $qrtext, int $size): string + public function getQRCodeImage(string $qrText, int $size): string { - return $this->getContent($this->getUrl($qrtext, $size)); + return $this->getContent($this->getUrl($qrText, $size)); } - public function getUrl(string $qrtext, int $size): string + public function getUrl(string $qrText, int $size): string { $queryParameters = array( 'chs' => $size . 'x' . $size, 'chld' => strtoupper($this->errorcorrectionlevel) . '|' . $this->margin, 'cht' => 'qr', 'choe' => $this->encoding, - 'chl' => $qrtext, + 'chl' => $qrText, ); return 'https://chart.googleapis.com/chart?' . http_build_query($queryParameters); diff --git a/lib/Providers/Qr/IQRCodeProvider.php b/lib/Providers/Qr/IQRCodeProvider.php index dc53365..9240741 100644 --- a/lib/Providers/Qr/IQRCodeProvider.php +++ b/lib/Providers/Qr/IQRCodeProvider.php @@ -9,12 +9,12 @@ interface IQRCodeProvider /** * Generate and return the QR code to embed in a web page * - * @param string $qrtext the value to encode in the QR code + * @param string $qrText the value to encode in the QR code * @param int $size the desired size of the QR code * * @return string file contents of the QR code */ - public function getQRCodeImage(string $qrtext, int $size): string; + public function getQRCodeImage(string $qrText, int $size): string; /** * Returns the appropriate mime type for the QR code diff --git a/lib/Providers/Qr/ImageChartsQRCodeProvider.php b/lib/Providers/Qr/ImageChartsQRCodeProvider.php index 6460e13..2f1079e 100644 --- a/lib/Providers/Qr/ImageChartsQRCodeProvider.php +++ b/lib/Providers/Qr/ImageChartsQRCodeProvider.php @@ -18,18 +18,18 @@ class ImageChartsQRCodeProvider extends BaseHTTPQRCodeProvider return 'image/png'; } - public function getQRCodeImage(string $qrtext, int $size): string + public function getQRCodeImage(string $qrText, int $size): string { - return $this->getContent($this->getUrl($qrtext, $size)); + return $this->getContent($this->getUrl($qrText, $size)); } - public function getUrl(string $qrtext, int $size): string + public function getUrl(string $qrText, int $size): string { $queryParameters = array( 'cht' => 'qr', 'chs' => ceil($size / 2) . 'x' . ceil($size / 2), 'chld' => $this->errorcorrectionlevel . '|' . $this->margin, - 'chl' => $qrtext, + 'chl' => $qrText, ); return 'https://image-charts.com/chart?' . http_build_query($queryParameters); diff --git a/lib/Providers/Qr/QRServerProvider.php b/lib/Providers/Qr/QRServerProvider.php index 96cb3fd..9244795 100644 --- a/lib/Providers/Qr/QRServerProvider.php +++ b/lib/Providers/Qr/QRServerProvider.php @@ -31,12 +31,12 @@ class QRServerProvider extends BaseHTTPQRCodeProvider throw new QRException(sprintf('Unknown MIME-type: %s', $this->format)); } - public function getQRCodeImage(string $qrtext, int $size): string + public function getQRCodeImage(string $qrText, int $size): string { - return $this->getContent($this->getUrl($qrtext, $size)); + return $this->getContent($this->getUrl($qrText, $size)); } - public function getUrl(string $qrtext, int $size): string + public function getUrl(string $qrText, int $size): string { $queryParameters = array( 'size' => $size . 'x' . $size, @@ -46,7 +46,7 @@ class QRServerProvider extends BaseHTTPQRCodeProvider 'bgcolor' => $this->decodeColor($this->bgcolor), 'color' => $this->decodeColor($this->color), 'format' => strtolower($this->format), - 'data' => $qrtext, + 'data' => $qrText, ); return 'https://api.qrserver.com/v1/create-qr-code/?' . http_build_query($queryParameters); diff --git a/lib/Providers/Qr/QRicketProvider.php b/lib/Providers/Qr/QRicketProvider.php index a56088a..d976b5f 100644 --- a/lib/Providers/Qr/QRicketProvider.php +++ b/lib/Providers/Qr/QRicketProvider.php @@ -27,12 +27,12 @@ class QRicketProvider extends BaseHTTPQRCodeProvider throw new QRException(sprintf('Unknown MIME-type: %s', $this->format)); } - public function getQRCodeImage(string $qrtext, int $size): string + public function getQRCodeImage(string $qrText, int $size): string { - return $this->getContent($this->getUrl($qrtext, $size)); + return $this->getContent($this->getUrl($qrText, $size)); } - public function getUrl(string $qrtext, int $size): string + public function getUrl(string $qrText, int $size): string { $queryParameters = array( 'qrsize' => $size, @@ -40,7 +40,7 @@ class QRicketProvider extends BaseHTTPQRCodeProvider 'bgdcolor' => $this->bgcolor, 'fgdcolor' => $this->color, 't' => strtolower($this->format), - 'd' => $qrtext, + 'd' => $qrText, ); return 'http://qrickit.com/api/qr?' . http_build_query($queryParameters); diff --git a/tests/Providers/Qr/TestQrProvider.php b/tests/Providers/Qr/TestQrProvider.php index f7b790c..2f46954 100644 --- a/tests/Providers/Qr/TestQrProvider.php +++ b/tests/Providers/Qr/TestQrProvider.php @@ -8,9 +8,9 @@ use RobThree\Auth\Providers\Qr\IQRCodeProvider; class TestQrProvider implements IQRCodeProvider { - public function getQRCodeImage(string $qrtext, int $size): string + public function getQRCodeImage(string $qrText, int $size): string { - return $qrtext . '@' . $size; + return $qrText . '@' . $size; } public function getMimeType(): string