Update to Drupal 8.1.7. For more information, see https://www.drupal.org/project/drupal/releases/8.1.7
This commit is contained in:
parent
38ba7c357d
commit
e9f047ccf8
61 changed files with 1613 additions and 561 deletions
23
vendor/guzzlehttp/guzzle/src/HandlerStack.php
vendored
23
vendor/guzzlehttp/guzzle/src/HandlerStack.php
vendored
|
|
@ -62,11 +62,8 @@ class HandlerStack
|
|||
*/
|
||||
public function __invoke(RequestInterface $request, array $options)
|
||||
{
|
||||
if (!$this->cached) {
|
||||
$this->cached = $this->resolve();
|
||||
}
|
||||
$handler = $this->resolve();
|
||||
|
||||
$handler = $this->cached;
|
||||
return $handler($request, $options);
|
||||
}
|
||||
|
||||
|
|
@ -193,15 +190,19 @@ class HandlerStack
|
|||
*/
|
||||
public function resolve()
|
||||
{
|
||||
if (!($prev = $this->handler)) {
|
||||
throw new \LogicException('No handler has been specified');
|
||||
if (!$this->cached) {
|
||||
if (!($prev = $this->handler)) {
|
||||
throw new \LogicException('No handler has been specified');
|
||||
}
|
||||
|
||||
foreach (array_reverse($this->stack) as $fn) {
|
||||
$prev = $fn[0]($prev);
|
||||
}
|
||||
|
||||
$this->cached = $prev;
|
||||
}
|
||||
|
||||
foreach (array_reverse($this->stack) as $fn) {
|
||||
$prev = $fn[0]($prev);
|
||||
}
|
||||
|
||||
return $prev;
|
||||
return $this->cached;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Reference in a new issue