Skip to content

Commit 4d91d6a

Browse files
committed
use sprintf instead of concatenating
1 parent d60113a commit 4d91d6a

File tree

4 files changed

+34
-26
lines changed

4 files changed

+34
-26
lines changed

lib/Providers/Qr/GoogleChartsQrCodeProvider.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@ public function getQRCodeImage(string $qrtext, int $size): string
2323

2424
public function getUrl(string $qrtext, int $size): string
2525
{
26-
return 'https://chart.googleapis.com/chart'
27-
. '?chs=' . $size . 'x' . $size
28-
. '&chld=' . urlencode(strtoupper($this->errorcorrectionlevel) . '|' . $this->margin)
29-
. '&cht=' . 'qr'
30-
. '&choe=' . $this->encoding
31-
. '&chl=' . rawurlencode($qrtext);
26+
return sprintf(
27+
'https://chart.googleapis.com/chart?chs=%1$sx%1$s&chld=%2$s&cht=qr&choe=%3$s&chl=%4$s',
28+
$size,
29+
urlencode(strtoupper($this->errorcorrectionlevel) . '|' . $this->margin),
30+
$this->encoding,
31+
rawurlencode($qrtext)
32+
);
3233
}
3334
}

lib/Providers/Qr/ImageChartsQRCodeProvider.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,12 @@ public function getQRCodeImage(string $qrtext, int $size): string
2525

2626
public function getUrl(string $qrtext, int $size): string
2727
{
28-
return 'https://image-charts.com/chart?cht=qr'
29-
. '&chs=' . ceil($size / 2) . 'x' . ceil($size / 2)
30-
. '&chld=' . $this->errorcorrectionlevel . '|' . $this->margin
31-
. '&chl=' . rawurlencode($qrtext);
28+
return sprintf(
29+
'https://image-charts.com/chart?cht=qr&chs=%1$dx%1$d&chld=%2$s|%3$s&chl=%4$s',
30+
ceil($size / 2),
31+
$this->errorcorrectionlevel,
32+
$this->margin,
33+
rawurlencode($qrtext)
34+
);
3235
}
3336
}

lib/Providers/Qr/QRServerProvider.php

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,17 @@ public function getQRCodeImage(string $qrtext, int $size): string
3838

3939
public function getUrl(string $qrtext, int $size): string
4040
{
41-
return 'https://api.qrserver.com/v1/create-qr-code/'
42-
. '?size=' . $size . 'x' . $size
43-
. '&ecc=' . strtoupper($this->errorcorrectionlevel)
44-
. '&margin=' . $this->margin
45-
. '&qzone=' . $this->qzone
46-
. '&bgcolor=' . $this->decodeColor($this->bgcolor)
47-
. '&color=' . $this->decodeColor($this->color)
48-
. '&format=' . strtolower($this->format)
49-
. '&data=' . rawurlencode($qrtext);
41+
return sprintf(
42+
'https://api.qrserver.com/v1/create-qr-code/?size=%1$sx%1$s&ecc=%2$s&margin=%3$s&qzone=%4$s&bgcolor=%5$s&color=%6$s&format=%7$s&data=%8$s',
43+
$size,
44+
strtoupper($this->errorcorrectionlevel),
45+
$this->margin,
46+
$this->qzone,
47+
$this->decodeColor($this->bgcolor),
48+
$this->decodeColor($this->color),
49+
strtolower($this->format),
50+
rawurlencode($qrtext)
51+
);
5052
}
5153

5254
private function decodeColor(string $value): string

lib/Providers/Qr/QRicketProvider.php

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,14 @@ public function getQRCodeImage(string $qrtext, int $size): string
3434

3535
public function getUrl(string $qrtext, int $size): string
3636
{
37-
return 'http://qrickit.com/api/qr'
38-
. '?qrsize=' . $size
39-
. '&e=' . strtolower($this->errorcorrectionlevel)
40-
. '&bgdcolor=' . $this->bgcolor
41-
. '&fgdcolor=' . $this->color
42-
. '&t=' . strtolower($this->format)
43-
. '&d=' . rawurlencode($qrtext);
37+
return sprintf(
38+
'http://qrickit.com/api/qr?qrsize=%s&e=%s&bgdcolor=%s&fgdcolor=%s&t=%s&d=%s',
39+
$size,
40+
strtolower($this->errorcorrectionlevel),
41+
$this->bgcolor,
42+
$this->color,
43+
strtolower($this->format),
44+
rawurlencode($qrtext)
45+
);
4446
}
4547
}

0 commit comments

Comments
 (0)