merged branch stof/fix_testsuite (PR #5403)

fabpot · fabpot · commit c0673d77d02e · 2012-08-31T13:41:36.000+02:00
Commits ------- 7ef6295 Removed the unnecessary file include Discussion ---------- Removed the unnecessary file include As of Doctrine 2.2, the ORM annotations can be found by the autoloader directly. This will also avoid breaking the testsuite in case the dev deps have not been installed as the ORM would not be available in this case (the tests relying on the ORM should already be skipped when it is not available). See #5402
diff --git a/autoload.php.dist b/autoload.php.dist
@@ -14,4 +14,3 @@ if (!function_exists('intl_get_error_code')) {
 }
 
 AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
-AnnotationRegistry::registerFile(__DIR__.'/vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php');

Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,3 @@ if (!function_exists('intl_get_error_code')) {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`AnnotationRegistry::registerLoader(array($loader, 'loadClass'));`
`17`		`-AnnotationRegistry::registerFile(__DIR__.'/vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php');`