← All changes | modules/GuzzleHttp/Middleware.php +6 -14 trunk → 1.9.2 View file →

		@@ -33,14 +33,12 @@
33	33	throw new \InvalidArgumentException('cookies must be an instance of Depicter\GuzzleHttp\Cookie\CookieJarInterface');
34	34	}
35	35	$cookieJar = $options['cookies'];
36	36	$request = $cookieJar->withCookieHeader($request);
37		-
38	37	return $handler($request, $options)
39	38	->then(
40	39	static function (ResponseInterface $response) use ($cookieJar, $request): ResponseInterface {
41	40	$cookieJar->extractCookies($request, $response);
42		-
43	41	return $response;
44	42	}
45	43	);
46	44	};
		@@ -61,9 +59,8 @@
61	59	return static function ($request, array $options) use ($handler, $bodySummarizer) {
62	60	if (empty($options['http_errors'])) {
63	61	return $handler($request, $options);
64	62	}
65		-
66	63	return $handler($request, $options)->then(
67	64	static function (ResponseInterface $response) use ($request, $bodySummarizer) {
68	65	$code = $response->getStatusCode();
69	66	if ($code < 400) {
		@@ -95,24 +92,22 @@
95	92	return static function (RequestInterface $request, array $options) use ($handler, &$container) {
96	93	return $handler($request, $options)->then(
97	94	static function ($value) use ($request, &$container, $options) {
98	95	$container[] = [
99		- 'request' => $request,
	96	+ 'request' => $request,
100	97	'response' => $value,
101		- 'error' => null,
102		- 'options' => $options,
	98	+ 'error' => null,
	99	+ 'options' => $options
103	100	];
104		-
105	101	return $value;
106	102	},
107	103	static function ($reason) use ($request, &$container, $options) {
108	104	$container[] = [
109		- 'request' => $request,
	105	+ 'request' => $request,
110	106	'response' => null,
111		- 'error' => $reason,
112		- 'options' => $options,
	107	+ 'error' => $reason,
	108	+ 'options' => $options
113	109	];
114		-
115	110	return P\Create::rejectionFor($reason);
116	111	}
117	112	);
118	113	};
		@@ -142,9 +137,8 @@
142	137	$response = $handler($request, $options);
143	138	if ($after) {
144	139	$after($request, $options, $response);
145	140	}
146		-
147	141	return $response;
148	142	};
149	143	};
150	144	}
		@@ -207,9 +201,8 @@
207	201	return $handler($request, $options)->then(
208	202	static function ($response) use ($logger, $request, $formatter, $logLevel): ResponseInterface {
209	203	$message = $formatter->format($request, $response);
210	204	$logger->log($logLevel, $message);
211		-
212	205	return $response;
213	206	},
214	207	static function ($reason) use ($logger, $request, $formatter): PromiseInterface {
215	208	$response = $reason instanceof RequestException ? $reason->getResponse() : null;
		@@ -214,9 +207,8 @@
214	207	static function ($reason) use ($logger, $request, $formatter): PromiseInterface {
215	208	$response = $reason instanceof RequestException ? $reason->getResponse() : null;
216	209	$message = $formatter->format($request, $response, P\Create::exceptionFor($reason));
217	210	$logger->error($message);
218		-
219	211	return P\Create::rejectionFor($reason);
220	212	}
221	213	);
222	214	};