Merge branch '3.1'

* 3.1:
  [ClassLoader] Fix tests
  [Debug][HttpKernel][VarDumper] Prepare for committed 7.2 changes
  [DependencyInjection] PhpDumper::isFrozen inconsistency
  [DI] Cleanup array_key_exists
  include dynamic services in list of alternatives
  [Debug] Swap dumper services at bootstrap

Author: nicolas-grekas

DataCollector/Util/ValueExporter.php

@@ -27,6 +27,10 @@ class ValueExporter
      */
     public function exportValue($value, $depth = 1, $deep = false)
     {
+        if ($value instanceof \__PHP_Incomplete_Class) {
+            return sprintf('__PHP_Incomplete_Class(%s)', $this->getClassNameFromIncomplete($value));
+        }
+
         if (is_object($value)) {
             if ($value instanceof \DateTimeInterface) {
                 return sprintf('Object(%s) - %s', get_class($value), $value->format(\DateTime::ISO8601));
@@ -35,10 +39,6 @@ public function exportValue($value, $depth = 1, $deep = false)
             return sprintf('Object(%s)', get_class($value));
         }
 
-        if ($value instanceof \__PHP_Incomplete_Class) {
-            return sprintf('__PHP_Incomplete_Class(%s)', $this->getClassNameFromIncomplete($value));
-        }
-
         if (is_array($value)) {
             if (empty($value)) {
                 return '[]';

EventListener/DumpListener.php

@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\HttpKernel\EventListener;
 
+use Symfony\Component\Console\ConsoleEvents;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\VarDumper\Cloner\ClonerInterface;
 use Symfony\Component\VarDumper\Dumper\DataDumperInterface;
 use Symfony\Component\VarDumper\VarDumper;
@@ -50,6 +50,6 @@ public function configure()
     public static function getSubscribedEvents()
     {
         // Register early to have a working dump() as early as possible
-        return array(KernelEvents::REQUEST => array('configure', 1024));
+        return array(ConsoleEvents::COMMAND => array('configure', 1024));
     }
 }

Tests/EventListener/DumpListenerTest.php

@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\HttpKernel\Tests\EventListener;
 
+use Symfony\Component\Console\ConsoleEvents;
 use Symfony\Component\HttpKernel\EventListener\DumpListener;
-use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\VarDumper\Cloner\ClonerInterface;
 use Symfony\Component\VarDumper\Cloner\Data;
 use Symfony\Component\VarDumper\Dumper\DataDumperInterface;
@@ -28,7 +28,7 @@ class DumpListenerTest extends \PHPUnit_Framework_TestCase
     public function testSubscribedEvents()
     {
         $this->assertSame(
-            array(KernelEvents::REQUEST => array('configure', 1024)),
+            array(ConsoleEvents::COMMAND => array('configure', 1024)),
             DumpListener::getSubscribedEvents()
         );
     }