Permalink
Browse files

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
  • Loading branch information...
2 parents 0d794c4 + 2d0ba77 commit 319b42119e702916dfad5faf6aea64e8c80b2b22 @nicolas-grekas nicolas-grekas committed Aug 23, 2016
Showing with 5 additions and 5 deletions.
  1. +5 −5 Tests/ClassCollectionLoaderTest.php
View
10 Tests/ClassCollectionLoaderTest.php
@@ -30,14 +30,14 @@ public function testTraitDependencies()
$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'),
@@ -61,7 +61,7 @@ public function testClassReordering(array $classes)
$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));
}
@@ -118,7 +118,7 @@ public function testClassWithTraitsReordering(array $classes)
$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));
}
@@ -157,7 +157,7 @@ public function testFixClassWithTraitsOrdering()
$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));
}

0 comments on commit 319b421

Please sign in to comment.