From 46680d4565b4b675dc73aa5dca1ec3dddbda6b97 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Fri, 24 Jun 2011 14:08:56 +0200
Subject: [PATCH] [FrameworkBundle] switched back to Doctrine Common 2.1

---
 .../Bundle/FrameworkBundle/Resources/config/annotations.xml   | 4 +++-
 .../Validator/Mapping/Loader/AnnotationLoaderTest.php         | 4 +++-
 vendors.php                                                   | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml
index 1c0c312dc2..7f35a05fdd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml
@@ -11,7 +11,9 @@
     </parameters>
 
     <services>
-        <service id="annotations.reader" class="%annotations.reader.class%" public="false" />
+        <service id="annotations.reader" class="%annotations.reader.class%" public="false">
+            <call method="setAutoloadAnnotations"><argument>true</argument></call>
+        </service>
 
         <service id="annotations.cached_reader" class="%annotations.cached_reader.class%" public="false">
             <argument type="service" id="annotations.reader" />
diff --git a/tests/Symfony/Tests/Component/Validator/Mapping/Loader/AnnotationLoaderTest.php b/tests/Symfony/Tests/Component/Validator/Mapping/Loader/AnnotationLoaderTest.php
index 5eab0607e6..10ad2be891 100644
--- a/tests/Symfony/Tests/Component/Validator/Mapping/Loader/AnnotationLoaderTest.php
+++ b/tests/Symfony/Tests/Component/Validator/Mapping/Loader/AnnotationLoaderTest.php
@@ -35,7 +35,9 @@ class AnnotationLoaderTest extends \PHPUnit_Framework_TestCase
 
     public function testLoadClassMetadataReturnsTrueIfSuccessful()
     {
-        $loader = new AnnotationLoader(new AnnotationReader());
+        $reader = new AnnotationReader();
+        $reader->setAutoloadAnnotations(true);
+        $loader = new AnnotationLoader($reader);
         $metadata = new ClassMetadata('Symfony\Tests\Component\Validator\Fixtures\Entity');
 
         $this->assertTrue($loader->loadClassMetadata($metadata));
diff --git a/vendors.php b/vendors.php
index e009447249..c45934640e 100755
--- a/vendors.php
+++ b/vendors.php
@@ -26,7 +26,7 @@ if (!is_dir($vendorDir = dirname(__FILE__).'/vendor')) {
 $deps = array(
     array('doctrine', 'http://github.com/doctrine/doctrine2.git', 'origin/HEAD'),
     array('doctrine-dbal', 'http://github.com/doctrine/dbal.git', 'origin/HEAD'),
-    array('doctrine-common', 'http://github.com/doctrine/common.git', 'origin/3.0.x'),
+    array('doctrine-common', 'http://github.com/doctrine/common.git', 'origin/HEAD'),
     array('monolog', 'http://github.com/Seldaek/monolog.git', 'origin/HEAD'),
     array('swiftmailer', 'http://github.com/swiftmailer/swiftmailer.git', 'origin/4.1'),
     array('twig', 'http://github.com/fabpot/Twig.git', 'origin/HEAD'),