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

Fix DoctrineMongoDBBundle to work with recent changes to Doctrine MongoDB ODM.

This commit is contained in:
Jonathan H. Wage 2010-12-02 12:46:08 -06:00 committed by Fabien Potencier
parent 47e5344eda
commit 7c47fd77cc
6 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
autoload.php.dist
View File

@ -7,7 +7,8 @@ use Symfony\Component\HttpFoundation\UniversalClassLoader;
$loader = new UniversalClassLoader();
$loader->registerNamespaces(array(
'Symfony' => __DIR__.'/src',
'Doctrine\\ODM\\MongoDB' => __DIR__.'/vendor/doctrine-mongodb/lib',
'Doctrine\\MongoDB' => __DIR__.'/vendor/doctrine-mongodb/lib',
'Doctrine\\ODM\\MongoDB' => __DIR__.'/vendor/doctrine-mongodb-odm/lib',
'Doctrine\\Common\\DataFixtures' => __DIR__.'/vendor/doctrine-data-fixtures/lib',
'Doctrine\\Common' => __DIR__.'/vendor/doctrine-common/lib',
'Doctrine\\DBAL\\Migrations' => __DIR__.'/vendor/doctrine-migrations/lib',
@ -19,4 +20,4 @@ $loader->registerPrefixes(array(
'Swift_' => __DIR__.'/vendor/swiftmailer/lib/classes',
'Twig_' => __DIR__.'/vendor/twig/lib',
));
$loader->register();
$loader->register();

5
install_vendors.sh
View File

@ -25,7 +25,10 @@ git clone git://github.com/doctrine/common.git doctrine-common
git clone git://github.com/doctrine/migrations.git doctrine-migrations
# Doctrine MongoDB
git clone git://github.com/doctrine/mongodb-odm.git doctrine-mongodb
git clone git://github.com/doctrine/mongodb.git doctrine-mongodb
# Doctrine MongoDB
git clone git://github.com/doctrine/mongodb-odm.git doctrine-mongodb-odm
# Swiftmailer
git clone git://github.com/swiftmailer/swiftmailer.git swiftmailer

4
src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/config/mongodb.xml
View File

@ -9,7 +9,7 @@
<parameter key="doctrine.odm.mongodb.default_connection">default</parameter>
<parameter key="doctrine.odm.mongodb.default_database">default</parameter>
<parameter key="doctrine.odm.mongodb.metadata_cache_driver">array</parameter>
<parameter key="doctrine.odm.mongodb.connection_class">Doctrine\ODM\MongoDB\Mongo</parameter>
<parameter key="doctrine.odm.mongodb.connection_class">Doctrine\MongoDB\Connection</parameter>
<parameter key="doctrine.odm.mongodb.configuration_class">Doctrine\ODM\MongoDB\Configuration</parameter>
<parameter key="doctrine.odm.mongodb.document_manager_class">Doctrine\ODM\MongoDB\DocumentManager</parameter>
<parameter key="doctrine.odm.mongodb.logger_class">Symfony\Bundle\DoctrineMongoDBBundle\Logger\DoctrineMongoDBLogger</parameter>
@ -92,4 +92,4 @@
</call>
</service>
</services>
</container>
</container>

2
src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/ContainerTest.php
View File

@ -47,7 +47,7 @@ class ContainerTest extends TestCase
$this->assertInstanceOf('Doctrine\Common\Cache\ArrayCache', $container->get('doctrine.odm.mongodb.cache.array'));
$this->assertInstanceOf('Symfony\Bundle\DoctrineMongoDBBundle\Logger\DoctrineMongoDBLogger', $container->get('doctrine.odm.mongodb.logger'));
$this->assertInstanceOf('Symfony\Bundle\DoctrineMongoDBBundle\DataCollector\DoctrineMongoDBDataCollector', $container->get('doctrine.odm.mongodb.data_collector'));
$this->assertInstanceOf('Doctrine\ODM\MongoDB\Mongo', $container->get('doctrine.odm.mongodb.default_connection'));
$this->assertInstanceOf('Doctrine\MongoDB\Connection', $container->get('doctrine.odm.mongodb.default_connection'));
$this->assertInstanceOf('Doctrine\ODM\MongoDB\Configuration', $container->get('doctrine.odm.mongodb.default_configuration'));
$this->assertInstanceOf('Doctrine\ODM\MongoDB\Mapping\Driver\DriverChain', $container->get('doctrine.odm.mongodb.metadata'));
$this->assertInstanceOf('Doctrine\Common\Cache\ArrayCache', $container->get('doctrine.odm.mongodb.default_metadata_cache'));

2
src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/AbstractMongoDBExtensionTest.php
View File

@ -29,7 +29,7 @@ abstract class AbstractMongoDBExtensionTest extends TestCase
$loader->mongodbLoad(array(), $container);
$this->assertEquals('Doctrine\ODM\MongoDB\Mongo', $container->getParameter('doctrine.odm.mongodb.connection_class'));
$this->assertEquals('Doctrine\MongoDB\Connection', $container->getParameter('doctrine.odm.mongodb.connection_class'));
$this->assertEquals('Doctrine\ODM\MongoDB\Configuration', $container->getParameter('doctrine.odm.mongodb.configuration_class'));
$this->assertEquals('Doctrine\ODM\MongoDB\DocumentManager', $container->getParameter('doctrine.odm.mongodb.document_manager_class'));
$this->assertEquals('Proxies', $container->getParameter('doctrine.odm.mongodb.proxy_namespace'));

3
update_vendors.sh
View File

@ -20,6 +20,9 @@ cd $CURRENT/doctrine-migrations && git pull
# Doctrine MongoDB
cd $CURRENT/doctrine-mongodb && git pull
# Doctrine MongoDB ODM
cd $CURRENT/doctrine-mongodb-odm && git pull
# Swiftmailer
cd $CURRENT/swiftmailer && git pull