Skip to content

Commit f69829c

Browse files
xabbuhxabbuh
committed
Merge branch '5.2' into 5.3
* 5.2: do not mock the Request class do not mock event classes Fix use_notify default value for PostgreSqlConnection recover from failed deserializations [ErrorHandle] Remove a link from the exception page [Validator] Added Ukrainian translations [GHA] Clarify some bits in the deps=high script
2 parents b1be87e + b29c191 commit f69829c

7 files changed

+54
-190
lines changed

‎Tests/Firewall/AbstractPreAuthenticatedListenerTest.php‎

Lines changed: 6 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Component\HttpFoundation\Request;
1616
use Symfony\Component\HttpKernel\Event\RequestEvent;
17+
use Symfony\Component\HttpKernel\HttpKernelInterface;
1718
use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface;
1819
use Symfony\Component\Security\Core\Authentication\Token\PreAuthenticatedToken;
1920
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
@@ -65,14 +66,7 @@ public function testHandleWithValidValues()
6566
->method('getPreAuthenticatedData')
6667
->willReturn($userCredentials);
6768

68-
$event = $this->createMock(RequestEvent::class);
69-
$event
70-
->expects($this->any())
71-
->method('getRequest')
72-
->willReturn($request)
73-
;
74-
75-
$listener($event);
69+
$listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST));
7670
}
7771

7872
public function testHandleWhenAuthenticationFails()
@@ -112,14 +106,7 @@ public function testHandleWhenAuthenticationFails()
112106
->method('getPreAuthenticatedData')
113107
->willReturn($userCredentials);
114108

115-
$event = $this->createMock(RequestEvent::class);
116-
$event
117-
->expects($this->any())
118-
->method('getRequest')
119-
->willReturn($request)
120-
;
121-
122-
$listener($event);
109+
$listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST));
123110
}
124111

125112
public function testHandleWhenAuthenticationFailsWithDifferentToken()
@@ -161,12 +148,7 @@ public function testHandleWhenAuthenticationFailsWithDifferentToken()
161148
->method('getPreAuthenticatedData')
162149
->willReturn($userCredentials);
163150

164-
$event = $this->createMock(RequestEvent::class);
165-
$event
166-
->expects($this->any())
167-
->method('getRequest')
168-
->willReturn($request)
169-
;
151+
$event = new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST);
170152

171153
$listener($event);
172154
}
@@ -203,14 +185,7 @@ public function testHandleWithASimilarAuthenticatedToken()
203185
->method('getPreAuthenticatedData')
204186
->willReturn($userCredentials);
205187

206-
$event = $this->createMock(RequestEvent::class);
207-
$event
208-
->expects($this->any())
209-
->method('getRequest')
210-
->willReturn($request)
211-
;
212-
213-
$listener($event);
188+
$listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST));
214189
}
215190

216191
public function testHandleWithAnInvalidSimilarToken()
@@ -253,13 +228,6 @@ public function testHandleWithAnInvalidSimilarToken()
253228
->method('getPreAuthenticatedData')
254229
->willReturn($userCredentials);
255230

256-
$event = $this->createMock(RequestEvent::class);
257-
$event
258-
->expects($this->any())
259-
->method('getRequest')
260-
->willReturn($request)
261-
;
262-
263-
$listener($event);
231+
$listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST));
264232
}
265233
}

‎Tests/Firewall/BasicAuthenticationListenerTest.php‎

Lines changed: 10 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use Symfony\Component\HttpFoundation\Request;
1616
use Symfony\Component\HttpFoundation\Response;
1717
use Symfony\Component\HttpKernel\Event\RequestEvent;
18+
use Symfony\Component\HttpKernel\HttpKernelInterface;
1819
use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface;
1920
use Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager;
2021
use Symfony\Component\Security\Core\Authentication\Provider\AuthenticationProviderInterface;
@@ -67,14 +68,7 @@ public function testHandleWithValidUsernameAndPasswordServerParameters()
6768
$this->createMock(AuthenticationEntryPointInterface::class)
6869
);
6970

70-
$event = $this->createMock(RequestEvent::class);
71-
$event
72-
->expects($this->any())
73-
->method('getRequest')
74-
->willReturn($request)
75-
;
76-
77-
$listener($event);
71+
$listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST));
7872
}
7973

8074
public function testHandleWhenAuthenticationFails()
@@ -112,19 +106,11 @@ public function testHandleWhenAuthenticationFails()
112106
$authenticationEntryPoint
113107
);
114108

115-
$event = $this->createMock(RequestEvent::class);
116-
$event
117-
->expects($this->any())
118-
->method('getRequest')
119-
->willReturn($request)
120-
;
121-
$event
122-
->expects($this->once())
123-
->method('setResponse')
124-
->with($this->equalTo($response))
125-
;
109+
$event = new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST);
126110

127111
$listener($event);
112+
113+
$this->assertSame($response, $event->getResponse());
128114
}
129115

130116
public function testHandleWithNoUsernameServerParameter()
@@ -144,14 +130,7 @@ public function testHandleWithNoUsernameServerParameter()
144130
$this->createMock(AuthenticationEntryPointInterface::class)
145131
);
146132

147-
$event = $this->createMock(RequestEvent::class);
148-
$event
149-
->expects($this->any())
150-
->method('getRequest')
151-
->willReturn($request)
152-
;
153-
154-
$listener($event);
133+
$listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST));
155134
}
156135

157136
public function testHandleWithASimilarAuthenticatedToken()
@@ -180,14 +159,7 @@ public function testHandleWithASimilarAuthenticatedToken()
180159
$this->createMock(AuthenticationEntryPointInterface::class)
181160
);
182161

183-
$event = $this->createMock(RequestEvent::class);
184-
$event
185-
->expects($this->any())
186-
->method('getRequest')
187-
->willReturn($request)
188-
;
189-
190-
$listener($event);
162+
$listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST));
191163
}
192164

193165
public function testItRequiresProviderKey()
@@ -239,18 +211,10 @@ public function testHandleWithADifferentAuthenticatedToken()
239211
$authenticationEntryPoint
240212
);
241213

242-
$event = $this->createMock(RequestEvent::class);
243-
$event
244-
->expects($this->any())
245-
->method('getRequest')
246-
->willReturn($request)
247-
;
248-
$event
249-
->expects($this->once())
250-
->method('setResponse')
251-
->with($this->equalTo($response))
252-
;
214+
$event = new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST);
253215

254216
$listener($event);
217+
218+
$this->assertSame($response, $event->getResponse());
255219
}
256220
}

‎Tests/Firewall/ChannelListenerTest.php‎

Lines changed: 13 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use Symfony\Component\HttpFoundation\Request;
1616
use Symfony\Component\HttpFoundation\Response;
1717
use Symfony\Component\HttpKernel\Event\RequestEvent;
18+
use Symfony\Component\HttpKernel\HttpKernelInterface;
1819
use Symfony\Component\Security\Http\AccessMapInterface;
1920
use Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface;
2021
use Symfony\Component\Security\Http\Firewall\ChannelListener;
@@ -44,19 +45,12 @@ public function testHandleWithNotSecuredRequestAndHttpChannel()
4445
->method('start')
4546
;
4647

47-
$event = $this->createMock(RequestEvent::class);
48-
$event
49-
->expects($this->any())
50-
->method('getRequest')
51-
->willReturn($request)
52-
;
53-
$event
54-
->expects($this->never())
55-
->method('setResponse')
56-
;
48+
$event = new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST);
5749

5850
$listener = new ChannelListener($accessMap, $entryPoint);
5951
$listener($event);
52+
53+
$this->assertNull($event->getResponse());
6054
}
6155

6256
public function testHandleWithSecuredRequestAndHttpsChannel()
@@ -82,19 +76,12 @@ public function testHandleWithSecuredRequestAndHttpsChannel()
8276
->method('start')
8377
;
8478

85-
$event = $this->createMock(RequestEvent::class);
86-
$event
87-
->expects($this->any())
88-
->method('getRequest')
89-
->willReturn($request)
90-
;
91-
$event
92-
->expects($this->never())
93-
->method('setResponse')
94-
;
79+
$event = new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST);
9580

9681
$listener = new ChannelListener($accessMap, $entryPoint);
9782
$listener($event);
83+
84+
$this->assertNull($event->getResponse());
9885
}
9986

10087
public function testHandleWithNotSecuredRequestAndHttpsChannel()
@@ -124,20 +111,12 @@ public function testHandleWithNotSecuredRequestAndHttpsChannel()
124111
->willReturn($response)
125112
;
126113

127-
$event = $this->createMock(RequestEvent::class);
128-
$event
129-
->expects($this->any())
130-
->method('getRequest')
131-
->willReturn($request)
132-
;
133-
$event
134-
->expects($this->once())
135-
->method('setResponse')
136-
->with($this->equalTo($response))
137-
;
114+
$event = new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST);
138115

139116
$listener = new ChannelListener($accessMap, $entryPoint);
140117
$listener($event);
118+
119+
$this->assertSame($response, $event->getResponse());
141120
}
142121

143122
public function testHandleWithSecuredRequestAndHttpChannel()
@@ -167,19 +146,11 @@ public function testHandleWithSecuredRequestAndHttpChannel()
167146
->willReturn($response)
168147
;
169148

170-
$event = $this->createMock(RequestEvent::class);
171-
$event
172-
->expects($this->any())
173-
->method('getRequest')
174-
->willReturn($request)
175-
;
176-
$event
177-
->expects($this->once())
178-
->method('setResponse')
179-
->with($this->equalTo($response))
180-
;
149+
$event = new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST);
181150

182151
$listener = new ChannelListener($accessMap, $entryPoint);
183152
$listener($event);
153+
154+
$this->assertSame($response, $event->getResponse());
184155
}
185156
}

‎Tests/Firewall/ContextListenerTest.php‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ public function testOnKernelResponseWithoutSessionNorToken()
148148
public function testInvalidTokenInSession($token)
149149
{
150150
$tokenStorage = $this->createMock(TokenStorageInterface::class);
151-
$event = $this->createMock(RequestEvent::class);
152151
$session = $this->createMock(SessionInterface::class);
153152
$session->expects($this->any())->method('getName')->willReturn('SESSIONNAME');
154153
$session->expects($this->any())
@@ -158,15 +157,12 @@ public function testInvalidTokenInSession($token)
158157
$request = new Request([], [], [], ['SESSIONNAME' => true]);
159158
$request->setSession($session);
160159

161-
$event->expects($this->any())
162-
->method('getRequest')
163-
->willReturn($request);
164160
$tokenStorage->expects($this->once())
165161
->method('setToken')
166162
->with(null);
167163

168164
$listener = new ContextListener($tokenStorage, [], 'key123');
169-
$listener($event);
165+
$listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST));
170166
}
171167

172168
public function provideInvalidToken()
@@ -184,22 +180,13 @@ public function testHandleAddsKernelResponseListener()
184180
{
185181
$tokenStorage = $this->createMock(TokenStorageInterface::class);
186182
$dispatcher = $this->createMock(EventDispatcherInterface::class);
187-
$event = $this->createMock(RequestEvent::class);
188-
189183
$listener = new ContextListener($tokenStorage, [], 'key123', null, $dispatcher);
190184

191-
$event->expects($this->any())
192-
->method('isMainRequest')
193-
->willReturn(true);
194-
$event->expects($this->any())
195-
->method('getRequest')
196-
->willReturn(new Request());
197-
198185
$dispatcher->expects($this->once())
199186
->method('addListener')
200187
->with(KernelEvents::RESPONSE, [$listener, 'onKernelResponse']);
201188

202-
$listener($event);
189+
$listener(new RequestEvent($this->createMock(HttpKernelInterface::class), new Request(), HttpKernelInterface::MAIN_REQUEST));
203190
}
204191

205192
public function testOnKernelResponseListenerRemovesItself()
@@ -228,14 +215,11 @@ public function testHandleRemovesTokenIfNoPreviousSessionWasFound()
228215
{
229216
$request = new Request();
230217

231-
$event = $this->createMock(RequestEvent::class);
232-
$event->expects($this->any())->method('getRequest')->willReturn($request);
233-
234218
$tokenStorage = $this->createMock(TokenStorageInterface::class);
235219
$tokenStorage->expects($this->once())->method('setToken')->with(null);
236220

237221
$listener = new ContextListener($tokenStorage, [], 'key123');
238-
$listener($event);
222+
$listener(new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST));
239223
}
240224

241225
public function testIfTokenIsDeauthenticated()

0 commit comments

Comments
 (0)