Skip to content

Commit

Permalink
merged branch stof/fix_testsuite (PR #5403)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
fabpot committed Aug 31, 2012
2 parents 0f61b2e + 7ef6295 commit c0673d7
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion autoload.php.dist
Expand Up @@ -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');

0 comments on commit c0673d7

Please sign in to comment.