From c5e5d5921f4efadd97740da23ffb915e9ac37258 Mon Sep 17 00:00:00 2001 From: Guilherme Blanco Date: Sun, 11 Jan 2015 10:46:37 -0500 Subject: [PATCH] Moved Doctrine\Tests namespace to composer autoload-dev. --- composer.json | 3 +++ tests/Doctrine/Tests/TestInit.php | 8 ++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index b17b5c2504a..9d9e7d3b1c5 100644 --- a/composer.json +++ b/composer.json @@ -26,6 +26,9 @@ "autoload": { "psr-0": { "Doctrine\\DBAL\\": "lib/" } }, + "autoload-dev": { + "psr-0": { "Doctrine\\Tests\\": "tests/" } + }, "extra": { "branch-alias": { "dev-master": "2.6.x-dev" diff --git a/tests/Doctrine/Tests/TestInit.php b/tests/Doctrine/Tests/TestInit.php index 8cb541cac4a..466510e9e85 100644 --- a/tests/Doctrine/Tests/TestInit.php +++ b/tests/Doctrine/Tests/TestInit.php @@ -8,14 +8,10 @@ if (file_exists(__DIR__ . '/../../../vendor/autoload.php')) { // dependencies were installed via composer - this is the main project - $classLoader = require __DIR__ . '/../../../vendor/autoload.php'; + require __DIR__ . '/../../../vendor/autoload.php'; } elseif (file_exists(__DIR__ . '/../../../../../autoload.php')) { // installed as a dependency in `vendor` - $classLoader = require __DIR__ . '/../../../../../autoload.php'; + require __DIR__ . '/../../../../../autoload.php'; } else { throw new Exception('Can\'t find autoload.php. Did you install dependencies via Composer?'); } - -/* @var $classLoader \Composer\Autoload\ClassLoader */ -$classLoader->add('Doctrine\\Tests\\', __DIR__ . '/../../'); -unset($classLoader);