Merge branch '2.8' into 3.1

* 2.8: [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
Merge branch '2.7' into 2.8
2026-04-26 18:28:16 +02:00 · 2016-08-23 15:39:15 +02:00 · 2016-08-23 15:37:31 +02:00 · 2016-08-23 11:26:23 +02:00
1 changed files with 5 additions and 5 deletions
@@ -28,14 +28,14 @@ class ClassCollectionLoaderTest extends \PHPUnit_Framework_TestCase
        $m = $r->getMethod('getOrderedClasses');
        $m->setAccessible(true);

-        $ordered = $m->invoke('Symfony\Component\ClassLoader\ClassCollectionLoader', array('CTFoo'));
+        $ordered = $m->invoke(null, array('CTFoo'));

        $this->assertEquals(
            array('TD', 'TC', 'TB', 'TA', 'TZ', 'CTFoo'),
            array_map(function ($class) { return $class->getName(); }, $ordered)
        );

-        $ordered = $m->invoke('Symfony\Component\ClassLoader\ClassCollectionLoader', array('CTBar'));
+        $ordered = $m->invoke(null, array('CTBar'));

        $this->assertEquals(
            array('TD', 'TZ', 'TC', 'TB', 'TA', 'CTBar'),
@@ -59,7 +59,7 @@ class ClassCollectionLoaderTest extends \PHPUnit_Framework_TestCase
        $m = $r->getMethod('getOrderedClasses');
        $m->setAccessible(true);

-        $ordered = $m->invoke('Symfony\Component\ClassLoader\ClassCollectionLoader', $classes);
+        $ordered = $m->invoke(null, $classes);

        $this->assertEquals($expected, array_map(function ($class) { return $class->getName(); }, $ordered));
    }
@@ -116,7 +116,7 @@ class ClassCollectionLoaderTest extends \PHPUnit_Framework_TestCase
        $m = $r->getMethod('getOrderedClasses');
        $m->setAccessible(true);

-        $ordered = $m->invoke('Symfony\Component\ClassLoader\ClassCollectionLoader', $classes);
+        $ordered = $m->invoke(null, $classes);

        $this->assertEquals($expected, array_map(function ($class) { return $class->getName(); }, $ordered));
    }
@@ -155,7 +155,7 @@ class ClassCollectionLoaderTest extends \PHPUnit_Framework_TestCase
        $m = $r->getMethod('getOrderedClasses');
        $m->setAccessible(true);

-        $ordered = $m->invoke('Symfony\Component\ClassLoader\ClassCollectionLoader', $classes);
+        $ordered = $m->invoke(null, $classes);

        $this->assertEquals($expected, array_map(function ($class) { return $class->getName(); }, $ordered));
    }