@@ -51,30 +51,41 @@ public function __invoke(ServerRequest $request, Response $response, callable $n
5151 {
5252 $ outResponse = $ next ($ request , $ response );
5353
54- $ messages = $ this ->formatter ->format ($ request , $ outResponse );
55-
56- if (!is_string ($ messages )) {
57- throw new UnexpectedValueException (sprintf ('%s must return string ' , HttpMessagesFormatter::class));
58- }
59-
60- $ this ->logger ->log ($ this ->level , $ messages );
54+ $ this ->logMessages ($ request , $ outResponse );
6155
6256 return $ outResponse ;
6357 }
6458
59+ /**
60+ * @param ServerRequest $request
61+ * @param DelegateInterface $delegate
62+ *
63+ * @return Response
64+ */
6565 public function process (ServerRequest $ request , DelegateInterface $ delegate )
6666 {
67- $ outResponse = $ delegate ->process ($ request );
67+ $ response = $ delegate ->process ($ request );
6868
69- $ messages = $ this ->formatter ->format ($ request , $ outResponse );
69+ $ this ->logMessages ($ request , $ response );
70+
71+ return $ response ;
72+ }
73+
74+ /**
75+ * @param ServerRequest $request
76+ * @param Response $response
77+ *
78+ * @throws UnexpectedValueException
79+ */
80+ private function logMessages (ServerRequest $ request , Response $ response )
81+ {
82+ $ messages = $ this ->formatter ->format ($ request , $ response );
7083
7184 if (!is_string ($ messages )) {
7285 throw new UnexpectedValueException (sprintf ('%s must return string ' , HttpMessagesFormatter::class));
7386 }
7487
7588 $ this ->logger ->log ($ this ->level , $ messages );
76-
77- return $ outResponse ;
7889 }
7990
8091}
0 commit comments