Merge branch '2.7' into 2.8

* 2.7:
  [Console] Fix transient HHVM test
  [OptionsResolver] Fix catched exception along the dependency tree mistakenly detects cyclic dependencies
  fixed tests
  Fixing test locations
  [VarDumper] Fix dump comparison on large arrays
  [expression-language] Code Cleanup for GetAttrNode

2 files changed, 3 insertions, 3 deletions

diff --git a/Tests/Core/Authentication/Voter/AbstractVoterTest.php b/Core/Tests/Authorization/Voter/AbstractVoterTest.php
index ecf82fb..4e38fd6 100644
--- a/Tests/Core/Authentication/Voter/AbstractVoterTest.php
+++ b/Core/Tests/Authorization/Voter/AbstractVoterTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Tests\Core\Authentication\Voter;
+namespace Symfony\Component\Security\Core\Tests\Authorization\Voter;
 
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\AbstractVoter;
@@ -78,7 +78,7 @@ class VoterFixture extends AbstractVoter
     protected function getSupportedClasses()
     {
         return array(
-            'Symfony\Component\Security\Tests\Core\Authentication\Voter\ObjectFixture',
+            'Symfony\Component\Security\Core\Tests\Authorization\Voter\ObjectFixture',
         );
     }
 
diff --git a/Tests/Core/LegacySecurityContextInterfaceTest.php b/Core/Tests/LegacySecurityContextInterfaceTest.php
index 5225eb5..a45ecf9 100644
--- a/Tests/Core/LegacySecurityContextInterfaceTest.php
+++ b/Core/Tests/LegacySecurityContextInterfaceTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Tests\Core;
+namespace Symfony\Component\Security\Core\Tests;
 
 use Symfony\Component\Security\Core\SecurityContextInterface;
 use Symfony\Component\Security\Core\Security;