|
@@ -25,26 +25,15 @@ class ClassLoaderTest extends \PHPUnit_Framework_TestCase
|
|
|
* @dataProvider getLoadClassTests
|
|
|
*
|
|
|
* @param string $class The fully-qualified class name to test, without preceding namespace separator.
|
|
|
- * @param bool $prependSeparator Whether to call ->loadClass() with a class name with preceding
|
|
|
- * namespace separator, as it happens in PHP 5.3.0 - 5.3.2. See https://bugs.php.net/50731
|
|
|
*/
|
|
|
- public function testLoadClass($class, $prependSeparator = false)
|
|
|
+ public function testLoadClass($class)
|
|
|
{
|
|
|
$loader = new ClassLoader();
|
|
|
$loader->add('Namespaced\\', __DIR__ . '/Fixtures');
|
|
|
$loader->add('Pearlike_', __DIR__ . '/Fixtures');
|
|
|
$loader->addPsr4('ShinyVendor\\ShinyPackage\\', __DIR__ . '/Fixtures');
|
|
|
-
|
|
|
- if ($prependSeparator) {
|
|
|
- $prepend = '\\';
|
|
|
- $message = "->loadClass() loads '$class'.";
|
|
|
- } else {
|
|
|
- $prepend = '';
|
|
|
- $message = "->loadClass() loads '\\$class', as required in PHP 5.3.0 - 5.3.2.";
|
|
|
- }
|
|
|
-
|
|
|
- $loader->loadClass($prepend . $class);
|
|
|
- $this->assertTrue(class_exists($class, false), $message);
|
|
|
+ $loader->loadClass($class);
|
|
|
+ $this->assertTrue(class_exists($class, false), "->loadClass() loads '$class'");
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -58,11 +47,6 @@ class ClassLoaderTest extends \PHPUnit_Framework_TestCase
|
|
|
array('Namespaced\\Foo'),
|
|
|
array('Pearlike_Foo'),
|
|
|
array('ShinyVendor\\ShinyPackage\\SubNamespace\\Foo'),
|
|
|
- // "Bar" would not work here, since it is defined in a ".inc" file,
|
|
|
- // instead of a ".php" file. So, use "Baz" instead.
|
|
|
- array('Namespaced\\Baz', true),
|
|
|
- array('Pearlike_Bar', true),
|
|
|
- array('ShinyVendor\\ShinyPackage\\SubNamespace\\Bar', true),
|
|
|
);
|
|
|
}
|
|
|
|