RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-10 11:07:10 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1243 from doctrine/composer-autoloader-dev

Browse Source 
Fixed phpunit tests autoload requirements and moved to composer autoload-dev
This commit is contained in:
Guilherme Blanco 2015-01-10 16:05:14 -05:00
commit 4dbfdfb9d6
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@ -31,6 +31,9 @@
"autoload": { "autoload": {
"psr-0": { "Doctrine\\ORM\\": "lib/" } "psr-0": { "Doctrine\\ORM\\": "lib/" }
}, },
"autoload-dev": {
"psr-0": { "Doctrine\\Tests\\": "tests/" }
},
"bin": ["bin/doctrine", "bin/doctrine.php"], "bin": ["bin/doctrine", "bin/doctrine.php"],
"extra": { "extra": {
"branch-alias": { "branch-alias": {

8
tests/Doctrine/Tests/TestInit.php
View File

@ -9,18 +9,14 @@ date_default_timezone_set('UTC');
if (file_exists(__DIR__ . '/../../../vendor/autoload.php')) { if (file_exists(__DIR__ . '/../../../vendor/autoload.php')) {
// dependencies were installed via composer - this is the main project // 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')) { } elseif (file_exists(__DIR__ . '/../../../../../autoload.php')) {
// installed as a dependency in `vendor` // installed as a dependency in `vendor`
$classLoader = require __DIR__ . '/../../../../../autoload.php'; require __DIR__ . '/../../../../../autoload.php';
} else { } else {
throw new \Exception('Can\'t find autoload.php. Did you install dependencies via composer?'); 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);
if ( ! file_exists(__DIR__ . '/Proxies') && ! mkdir(__DIR__ . '/Proxies')) { if ( ! file_exists(__DIR__ . '/Proxies') && ! mkdir(__DIR__ . '/Proxies')) {
throw new \Exception("Could not create " . __DIR__."/Proxies Folder."); throw new \Exception("Could not create " . __DIR__."/Proxies Folder.");
} }