From 5ba147663d1c378a7a01a59042c214c32821fc46 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Sun, 5 May 2013 10:57:21 +0200 Subject: [PATCH] Use ClassLoader::set to initialize the class loader paths --- src/Composer/Autoload/AutoloadGenerator.php | 2 +- .../Autoload/Fixtures/autoload_real_files_by_dependency.php | 2 +- .../Composer/Test/Autoload/Fixtures/autoload_real_functions.php | 2 +- .../Test/Autoload/Fixtures/autoload_real_include_path.php | 2 +- .../Test/Autoload/Fixtures/autoload_real_target_dir.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php index 127f048c5..6c03ff330 100644 --- a/src/Composer/Autoload/AutoloadGenerator.php +++ b/src/Composer/Autoload/AutoloadGenerator.php @@ -395,7 +395,7 @@ INCLUDE_PATH; $file .= <<<'PSR0' $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { - $loader->add($namespace, $path); + $loader->set($namespace, $path); } diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_files_by_dependency.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_files_by_dependency.php index 9c4b77c85..564df29cc 100644 --- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_files_by_dependency.php +++ b/tests/Composer/Test/Autoload/Fixtures/autoload_real_files_by_dependency.php @@ -28,7 +28,7 @@ class ComposerAutoloaderInitFilesAutoloadOrder $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { - $loader->add($namespace, $path); + $loader->set($namespace, $path); } $classMap = require __DIR__ . '/autoload_classmap.php'; diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php index 2ee1040d6..ac167bd83 100644 --- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php +++ b/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php @@ -28,7 +28,7 @@ class ComposerAutoloaderInitFilesAutoload $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { - $loader->add($namespace, $path); + $loader->set($namespace, $path); } $classMap = require __DIR__ . '/autoload_classmap.php'; diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_include_path.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_include_path.php index 2378bf0c4..e24d4752c 100644 --- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_include_path.php +++ b/tests/Composer/Test/Autoload/Fixtures/autoload_real_include_path.php @@ -28,7 +28,7 @@ class ComposerAutoloaderInitIncludePath $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { - $loader->add($namespace, $path); + $loader->set($namespace, $path); } $classMap = require __DIR__ . '/autoload_classmap.php'; diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php index 67ef4a9db..2d66cf16f 100644 --- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php +++ b/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php @@ -28,7 +28,7 @@ class ComposerAutoloaderInitTargetDir $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { - $loader->add($namespace, $path); + $loader->set($namespace, $path); } $classMap = require __DIR__ . '/autoload_classmap.php';