@@ -134,9 +134,9 @@ public function __construct(array $config = [])
134
134
public function handleRequest (RequestInterface $ request , callable $ next , callable $ first )
135
135
{
136
136
// Check in storage
137
- if (array_key_exists ($ request ->getRequestTarget (), $ this ->redirectStorage )) {
138
- $ uri = $ this ->redirectStorage [$ request ->getRequestTarget ()]['uri ' ];
139
- $ statusCode = $ this ->redirectStorage [$ request ->getRequestTarget ()]['status ' ];
137
+ if (array_key_exists (( string ) $ request ->getUri (), $ this ->redirectStorage )) {
138
+ $ uri = $ this ->redirectStorage [( string ) $ request ->getUri ()]['uri ' ];
139
+ $ statusCode = $ this ->redirectStorage [( string ) $ request ->getUri ()]['status ' ];
140
140
$ redirectRequest = $ this ->buildRedirectRequest ($ request , $ uri , $ statusCode );
141
141
142
142
return $ first ($ redirectRequest );
@@ -157,14 +157,14 @@ public function handleRequest(RequestInterface $request, callable $next, callabl
157
157
$ this ->circularDetection [$ chainIdentifier ] = [];
158
158
}
159
159
160
- $ this ->circularDetection [$ chainIdentifier ][] = $ request ->getRequestTarget ();
160
+ $ this ->circularDetection [$ chainIdentifier ][] = ( string ) $ request ->getUri ();
161
161
162
- if (in_array ($ redirectRequest ->getRequestTarget (), $ this ->circularDetection [$ chainIdentifier ])) {
162
+ if (in_array (( string ) $ redirectRequest ->getUri (), $ this ->circularDetection [$ chainIdentifier ])) {
163
163
throw new CircularRedirectionException ('Circular redirection detected ' , $ request , $ response );
164
164
}
165
165
166
166
if ($ this ->redirectCodes [$ statusCode ]['permanent ' ]) {
167
- $ this ->redirectStorage [$ request ->getRequestTarget ()] = [
167
+ $ this ->redirectStorage [( string ) $ request ->getUri ()] = [
168
168
'uri ' => $ uri ,
169
169
'status ' => $ statusCode ,
170
170
];
0 commit comments