summaryrefslogtreecommitdiffstats
path: root/Http/Tests/EntryPoint
diff options
context:
space:
mode:
authorNicolas Grekas <nicolas.grekas@gmail.com>2016-08-26 14:04:02 +0200
committerNicolas Grekas <nicolas.grekas@gmail.com>2016-08-26 14:04:02 +0200
commit1e647f605f41c2d7a29be9e38365adf85b68b1c9 (patch)
tree8eb3519f109c536d0a44df0133e6c5e53714687b /Http/Tests/EntryPoint
parent7bd9e9947f8fc1e9b0df21a4bb69e588133316f5 (diff)
parentcc1acd8d76c84b8bddbf0ad884954ba0523e5c7d (diff)
downloadsymfony-security-3.1.4.zip
symfony-security-3.1.4.tar.gz
symfony-security-3.1.4.tar.bz2
Merge branch '2.8' into 3.1v3.1.4
* 2.8: [Validator][GroupSequence] fixed GroupSequence validation ignores PropertyMetadata of parent classes [FrameworkBundle][Security] Remove useless mocks [DoctrineBridge] Enhance exception message in EntityUserProvider added friendly exception when constraint validator does not exist or it is not enabled remove duplicate instruction [FrameworkBundle] Remove TranslatorBagInterface check [FrameworkBundle] Remove duplicated code in RouterDebugCommand [Validator] fixed duplicate constraints with parent class interfaces SecurityBundle:BasicAuthenticationListener: removed a default argument on getting a header value
Diffstat (limited to 'Http/Tests/EntryPoint')
-rw-r--r--Http/Tests/EntryPoint/FormAuthenticationEntryPointTest.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/Http/Tests/EntryPoint/FormAuthenticationEntryPointTest.php b/Http/Tests/EntryPoint/FormAuthenticationEntryPointTest.php
index 3acb9c2..75a6be4 100644
--- a/Http/Tests/EntryPoint/FormAuthenticationEntryPointTest.php
+++ b/Http/Tests/EntryPoint/FormAuthenticationEntryPointTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Security\Http\Tests\EntryPoint;
+use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Security\Http\EntryPoint\FormAuthenticationEntryPoint;
use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -19,7 +20,7 @@ class FormAuthenticationEntryPointTest extends \PHPUnit_Framework_TestCase
public function testStart()
{
$request = $this->getMock('Symfony\Component\HttpFoundation\Request', array(), array(), '', false, false);
- $response = $this->getMock('Symfony\Component\HttpFoundation\Response');
+ $response = new Response();
$httpKernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
$httpUtils = $this->getMock('Symfony\Component\Security\Http\HttpUtils');
@@ -39,7 +40,7 @@ class FormAuthenticationEntryPointTest extends \PHPUnit_Framework_TestCase
{
$request = $this->getMock('Symfony\Component\HttpFoundation\Request', array(), array(), '', false, false);
$subRequest = $this->getMock('Symfony\Component\HttpFoundation\Request', array(), array(), '', false, false);
- $response = new \Symfony\Component\HttpFoundation\Response('', 200);
+ $response = new Response('', 200);
$httpUtils = $this->getMock('Symfony\Component\Security\Http\HttpUtils');
$httpUtils