summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2015-01-08 11:46:13 +0100
committerFabien Potencier <fabien.potencier@gmail.com>2015-01-08 11:46:13 +0100
commitf48e5ef1e4525271202a602ebcaf789934aa1458 (patch)
tree810cab64fe072635d66ee6ceebdf78de0bfc31f6
parent73461e3f87d84dd07792abbb7acfd7c1cd99aefd (diff)
parentd5541a8851c283d068d46c0d116aaeeb672abc64 (diff)
downloadsymfony-security-f48e5ef1e4525271202a602ebcaf789934aa1458.zip
symfony-security-f48e5ef1e4525271202a602ebcaf789934aa1458.tar.gz
symfony-security-f48e5ef1e4525271202a602ebcaf789934aa1458.tar.bz2
Merge branch '2.5' into 2.6
* 2.5: [Security] moved test files into the right place
-rw-r--r--Core/Tests/Authentication/Token/RememberMeTokenTest.php (renamed from Tests/Core/Authentication/Token/RememberMeTokenTest.php)2
-rw-r--r--Core/Tests/User/InMemoryUserProviderTest.php (renamed from Tests/Core/User/InMemoryUserProviderTest.php)2
-rw-r--r--Core/Tests/User/UserCheckerTest.php (renamed from Tests/Core/User/UserCheckerTest.php)2
-rw-r--r--Http/Tests/Firewall/ExceptionListenerTest.php (renamed from Tests/Http/Firewall/ExceptionListenerTest.php)2
4 files changed, 4 insertions, 4 deletions
diff --git a/Tests/Core/Authentication/Token/RememberMeTokenTest.php b/Core/Tests/Authentication/Token/RememberMeTokenTest.php
index cef3d28..691f54c 100644
--- a/Tests/Core/Authentication/Token/RememberMeTokenTest.php
+++ b/Core/Tests/Authentication/Token/RememberMeTokenTest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Security\Tests\Core\Authentication\Token;
+namespace Symfony\Component\Security\Core\Tests\Authentication\Token;
use Symfony\Component\Security\Core\Authentication\Token\RememberMeToken;
use Symfony\Component\Security\Core\Role\Role;
diff --git a/Tests/Core/User/InMemoryUserProviderTest.php b/Core/Tests/User/InMemoryUserProviderTest.php
index 826e390..dfc4237 100644
--- a/Tests/Core/User/InMemoryUserProviderTest.php
+++ b/Core/Tests/User/InMemoryUserProviderTest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Security\Tests\Core\User;
+namespace Symfony\Component\Security\Core\Tests\User;
use Symfony\Component\Security\Core\User\InMemoryUserProvider;
use Symfony\Component\Security\Core\User\User;
diff --git a/Tests/Core/User/UserCheckerTest.php b/Core/Tests/User/UserCheckerTest.php
index dca6311..ac21781 100644
--- a/Tests/Core/User/UserCheckerTest.php
+++ b/Core/Tests/User/UserCheckerTest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Security\Tests\Core\User;
+namespace Symfony\Component\Security\Core\Tests\User;
use Symfony\Component\Security\Core\User\UserChecker;
diff --git a/Tests/Http/Firewall/ExceptionListenerTest.php b/Http/Tests/Firewall/ExceptionListenerTest.php
index bc19da4..f1409e4 100644
--- a/Tests/Http/Firewall/ExceptionListenerTest.php
+++ b/Http/Tests/Firewall/ExceptionListenerTest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Security\Tests\Http\Firewall;
+namespace Symfony\Component\Security\Http\Tests\Firewall;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;