diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FrameworkBundle] switched back to Doctrine Common 2.1

Browse Source
This commit is contained in:
Fabien Potencier 2011-06-24 14:08:56 +02:00
parent cca21a84e3
commit 46680d4565
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml
View File

@ -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" />

4
tests/Symfony/Tests/Component/Validator/Mapping/Loader/AnnotationLoaderTest.php
View File

@ -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));

2
vendors.php
View File

@ -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'),