Skip to content

Commit 595f6c6

Browse files
committed
Rename variables
1 parent ed99e4d commit 595f6c6

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

src/ShopifyApp/Util.php

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -59,42 +59,42 @@ public static function createHmac(array $opts, string $secret): Hmac
5959
* Array parameters such as `name[]=value1&name[]=value2` becomes `['name[]' => ['value1', 'value2']] in Shopify.
6060
* See: https://github.com/rack/rack/blob/f9ad97fd69a6b3616d0a99e6bedcfb9de2f81f6c/lib/rack/query_parser.rb#L36
6161
*
62-
* @param string $qs The query string.
63-
* @param string|null $d The delimiter.
62+
* @param string $queryString The query string.
63+
* @param string|null $delimiter The delimiter.
6464
*
6565
* @return mixed
6666
*/
67-
public static function parseQueryString(string $qs, string $d = null): array
67+
public static function parseQueryString(string $queryString, string $delimiter = null): array
6868
{
69-
$COMMON_SEP = [';' => '/[;]\s*/', ';,' => '/[;,]\s*/', '&' => '/[&]\s*/'];
70-
$DEFAULT_SEP = '/[&;]\s*/';
69+
$commonSeparator = [';' => '/[;]\s*/', ';,' => '/[;,]\s*/', '&' => '/[&]\s*/'];
70+
$defaultSeparator = '/[&;]\s*/';
7171

7272
$params = [];
7373
$split = preg_split(
74-
$d ? $COMMON_SEP[$d] || '/['.$d.']\s*/' : $DEFAULT_SEP,
75-
$qs ?? ''
74+
$delimiter ? $commonSeparator[$delimiter] || '/['.$delimiter.']\s*/' : $defaultSeparator,
75+
$queryString ?? ''
7676
);
7777

78-
foreach ($split as $p) {
79-
if (! $p) {
78+
foreach ($split as $part) {
79+
if (! $part) {
8080
continue;
8181
}
8282

83-
[$k, $v] = strpos($p, '=') !== false ? explode('=', $p, 2) : [$p, null];
83+
[$key, $value] = strpos($part, '=') !== false ? explode('=', $part, 2) : [$part, null];
8484

85-
$k = urldecode($k);
86-
$v = $v !== null ? urldecode($v) : $v;
85+
$key = urldecode($key);
86+
$value = $value !== null ? urldecode($value) : $value;
8787

88-
if (isset($params[$k])) {
89-
$cur = $params[$k];
88+
if (isset($params[$key])) {
89+
$cur = $params[$key];
9090

9191
if (is_array($cur)) {
92-
$params[$k][] = $v;
92+
$params[$key][] = $value;
9393
} else {
94-
$params[$k] = [$cur, $v];
94+
$params[$key] = [$cur, $value];
9595
}
9696
} else {
97-
$params[$k] = $v;
97+
$params[$key] = $value;
9898
}
9999
}
100100

0 commit comments

Comments
 (0)