More cleanups and fixes

Author: nicolas-grekas

Tests/Controller/UserValueResolverTest.php

@@ -71,7 +71,7 @@ public function testResolve()
 
     public function testResolveWithAttribute()
     {
-        $user = $this->getMockBuilder(UserInterface::class)->getMock();
+        $user = $this->createMock(UserInterface::class);
         $token = new UsernamePasswordToken($user, 'password', 'provider');
         $tokenStorage = new TokenStorage();
         $tokenStorage->setToken($token);

Tests/Firewall/UsernamePasswordJsonAuthenticationListenerTest.php

@@ -98,7 +98,7 @@ public function testHandleFailure()
     {
         $this->createListener([], false, true, false);
         $request = new Request([], [], [], [], [], ['HTTP_CONTENT_TYPE' => 'application/json'], '{"username": "dunglas", "password": "foo"}');
-        $event = new RequestEvent($this->getMockBuilder(KernelInterface::class)->getMock(), $request, KernelInterface::MASTER_REQUEST);
+        $event = new RequestEvent($this->createMock(KernelInterface::class), $request, KernelInterface::MASTER_REQUEST);
 
         ($this->listener)($event);
         $this->assertSame(['error' => 'An authentication exception occurred.'], json_decode($event->getResponse()->getContent(), true));