some cleanups

autoload.php.dist

@@ -13,7 +13,6 @@ $loader->registerNamespaces(array(
     'Doctrine'         => __DIR__.'/vendor/doctrine/lib',
     'Assetic'          => __DIR__.'/vendor/assetic/src',
     'Monolog'          => __DIR__.'/vendor/monolog/src',
-    'Annotations'      => array(__DIR__.'/vendor/annotations/src', __DIR__.'/vendor/annotations/doctrine-compat-src'),
 ));
 $loader->registerPrefixes(array(
     'Swift_' => __DIR__.'/vendor/swiftmailer/lib/classes',

src/Symfony/Bundle/DoctrineBundle/Tests/TestCase.php

@@ -11,8 +11,7 @@
 
 namespace Symfony\Bundle\DoctrineBundle\Tests;
 
-use Annotations\Reader;
-
+use Doctrine\Common\Annotations\Reader;
 use Doctrine\ORM\EntityManager;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
@@ -27,9 +26,6 @@ class TestCase extends \PHPUnit_Framework_TestCase
         if (!class_exists('Doctrine\\Common\\Version')) {
             $this->markTestSkipped('Doctrine is not available.');
         }
-        if (!class_exists('Annotations\Reader')) {
-            $this->markTestSkipped('Annotations is not available.');
-        }
     }
 
     /**

src/Symfony/Component/Validator/ValidatorFactory.php

@@ -11,8 +11,7 @@ namespace Symfony\Component\Validator;
  * file that was distributed with this source code.
  */
 
-use Annotations\Reader;
-
+use Doctrine\Common\Annotations\Reader;
 use Symfony\Component\Validator\Exception\MappingException;
 use Symfony\Component\Validator\Mapping\ClassMetadataFactory;
 use Symfony\Component\Validator\Mapping\ClassMetadataFactoryInterface;