projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Security update to Drupal 8.4.6
[yaffs-website]
/
vendor
/
guzzlehttp
/
guzzle
/
src
/
UriTemplate.php
diff --git
a/vendor/guzzlehttp/guzzle/src/UriTemplate.php
b/vendor/guzzlehttp/guzzle/src/UriTemplate.php
index 0b1623ecaca007facc98ad039cf08037a213e98c..96dcfd09cd71fb4a2c40b38445faee78568ba0cc 100644
(file)
--- a/
vendor/guzzlehttp/guzzle/src/UriTemplate.php
+++ b/
vendor/guzzlehttp/guzzle/src/UriTemplate.php
@@
-107,7
+107,6
@@
class UriTemplate
$useQuery = self::$operatorHash[$parsed['operator']]['query'];
foreach ($parsed['values'] as $value) {
$useQuery = self::$operatorHash[$parsed['operator']]['query'];
foreach ($parsed['values'] as $value) {
-
if (!isset($this->variables[$value['value']])) {
continue;
}
if (!isset($this->variables[$value['value']])) {
continue;
}
@@
-117,11
+116,9
@@
class UriTemplate
$expanded = '';
if (is_array($variable)) {
$expanded = '';
if (is_array($variable)) {
-
$isAssoc = $this->isAssoc($variable);
$kvp = [];
foreach ($variable as $key => $var) {
$isAssoc = $this->isAssoc($variable);
$kvp = [];
foreach ($variable as $key => $var) {
-
if ($isAssoc) {
$key = rawurlencode($key);
$isNestedArray = is_array($var);
if ($isAssoc) {
$key = rawurlencode($key);
$isNestedArray = is_array($var);
@@
-179,7
+176,6
@@
class UriTemplate
}
$expanded = implode(',', $kvp);
}
}
$expanded = implode(',', $kvp);
}
-
} else {
if ($value['modifier'] === ':') {
$variable = substr($variable, 0, $value['position']);
} else {
if ($value['modifier'] === ':') {
$variable = substr($variable, 0, $value['position']);