[FrameworkBundle] switched back to Doctrine Common 2.1

symfony · Jun 24, 2011 · 46680d4 · 46680d4
1 parent cca21a8
commit 46680d4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -35,7 +35,9 @@ protected function setUp()
 
     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
@@ -26,7 +26,7 @@
 $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'),