Merge branch '2.8'

* 2.8:
  bumped minimal version in appveyor to 5.3.9
  [VarDumper] Fix missing support for dumping PHP7 return type
  Require security-acl 2.7 for BC
  [travis] disable symfony_debug ext when deps!=no
  Require actual version of ACL component until ACL/2.8 branch released
  Do not normalize the kernel root directory path (see symfony/symfony#15474).
  Don't trigger deprecation on interfaces
  [Debug] Ignore silencing for deprecations
  [ci] Run minimal versions on appveyor only
  Deprecated Security ClassUtils in favor of Acl ClassUtils
  Fix appveyor file
  consistently use str_replace to unify directory separators (remaining)

5 files changed, 25 insertions, 11 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f202692..0728da9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@ CHANGELOG
    `Symfony\Component\Security\Http\Authentication\SimplePreAuthenticatorInterface` instead
  * deprecated `Symfony\Component\Security\Core\Authentication\SimpleFormAuthenticatorInterface`, use
    `Symfony\Component\Security\Http\Authentication\SimpleFormAuthenticatorInterface` instead
+ * deprecated `Symfony\Component\Security\Core\Util\ClassUtils`, use
+   `Symfony\Component\Security\Acl\Util\ClassUtils` instead
 
 2.7.0
 -----
diff --git a/Core/SecurityContextInterface.php b/Core/SecurityContextInterface.php
index a759feb..2a06ca4 100644
--- a/Core/SecurityContextInterface.php
+++ b/Core/SecurityContextInterface.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\Security\Core;
 
-@trigger_error('The '.__NAMESPACE__.'\SecurityContextInterface interface is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
-
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 
diff --git a/Core/Tests/Util/ClassUtilsTest.php b/Core/Tests/Util/ClassUtilsTest.php
index e8f0143..b048206 100644
--- a/Core/Tests/Util/ClassUtilsTest.php
+++ b/Core/Tests/Util/ClassUtilsTest.php
@@ -13,6 +13,9 @@ namespace Symfony\Component\Security\Core\Tests\Util
 {
     use Symfony\Component\Security\Core\Util\ClassUtils;
 
+    /**
+     * @group legacy
+     */
     class ClassUtilsTest extends \PHPUnit_Framework_TestCase
     {
         public static function dataGetClass()
diff --git a/Core/Util/ClassUtils.php b/Core/Util/ClassUtils.php
index 6c87096..06186ef 100644
--- a/Core/Util/ClassUtils.php
+++ b/Core/Util/ClassUtils.php
@@ -11,13 +11,15 @@
 
 namespace Symfony\Component\Security\Core\Util;
 
-use Doctrine\Common\Util\ClassUtils as DoctrineClassUtils;
+use Symfony\Component\Security\Acl\Util\ClassUtils as AclClassUtils;
+
+@trigger_error('The '.__NAMESPACE__.'\ClassUtils class is deprecated since version 2.8, to be removed in 3.0. Use Symfony\Component\Security\Acl\Util\ClassUtils instead.', E_USER_DEPRECATED);
 
 /**
  * Class related functionality for objects that
  * might or might not be proxy objects at the moment.
  *
- * @see DoctrineClassUtils
+ * @deprecated ClassUtils is deprecated since version 2.8, to be removed in 3.0. Use Acl ClassUtils instead.
  *
  * @author Benjamin Eberlei <kontakt@beberlei.de>
  * @author Johannes Schmitt <schmittjoh@gmail.com>
@@ -54,6 +56,11 @@ class ClassUtils
      */
     public static function getRealClass($object)
     {
+        if (class_exists('Symfony\Component\Security\Acl\Util\ClassUtils')) {
+            return AclClassUtils::getRealClass($object);
+        }
+
+        // fallback in case security-acl is not installed
         $class = is_object($object) ? get_class($object) : $object;
 
         if (false === $pos = strrpos($class, '\\'.self::MARKER.'\\')) {
diff --git a/composer.json b/composer.json
index ec3c626..e323fc7 100644
--- a/composer.json
+++ b/composer.json
@@ -1,3 +1,4 @@
+<<<<<<< Local Changes
 {
     "name": "symfony/security",
     "type": "library",
@@ -27,15 +28,16 @@
         "symfony/security-http": "self.version"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "~2.8|~3.0",
-        "symfony/intl": "~2.8|~3.0",
-        "symfony/routing": "~2.8|~3.0",
-        "symfony/translation": "~2.8|~3.0",
-        "symfony/validator": "~2.8|~3.0",
+        "symfony/phpunit-bridge": "~2.7|~3.0.0",
+        "symfony/intl": "~2.3|~3.0.0",
+        "symfony/routing": "~2.2|~3.0.0",
+        "symfony/translation": "~2.0,>=2.0.5|~3.0.0",
+        "symfony/validator": "~2.5,>=2.5.5|~3.0.0",
         "doctrine/common": "~2.2",
         "doctrine/dbal": "~2.2",
         "psr/log": "~1.0",
-        "symfony/expression-language": "~2.8|~3.0"
+        "ircmaxell/password-compat": "~1.0",
+        "symfony/expression-language": "~2.6|~3.0.0"
     },
     "suggest": {
         "symfony/class-loader": "For using the ACL generateSql script",
@@ -51,7 +53,9 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "3.0-dev"
+            "dev-master": "2.8-dev"
         }
     }
 }
+=======
+>>>>>>> External Changes