Fix DoctrineMongoDBBundle to work with recent changes to Doctrine MongoDB ODM.
This commit is contained in:
parent
47e5344eda
commit
7c47fd77cc
|
@ -7,7 +7,8 @@ use Symfony\Component\HttpFoundation\UniversalClassLoader;
|
||||||
$loader = new UniversalClassLoader();
|
$loader = new UniversalClassLoader();
|
||||||
$loader->registerNamespaces(array(
|
$loader->registerNamespaces(array(
|
||||||
'Symfony' => __DIR__.'/src',
|
'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\\DataFixtures' => __DIR__.'/vendor/doctrine-data-fixtures/lib',
|
||||||
'Doctrine\\Common' => __DIR__.'/vendor/doctrine-common/lib',
|
'Doctrine\\Common' => __DIR__.'/vendor/doctrine-common/lib',
|
||||||
'Doctrine\\DBAL\\Migrations' => __DIR__.'/vendor/doctrine-migrations/lib',
|
'Doctrine\\DBAL\\Migrations' => __DIR__.'/vendor/doctrine-migrations/lib',
|
||||||
|
@ -19,4 +20,4 @@ $loader->registerPrefixes(array(
|
||||||
'Swift_' => __DIR__.'/vendor/swiftmailer/lib/classes',
|
'Swift_' => __DIR__.'/vendor/swiftmailer/lib/classes',
|
||||||
'Twig_' => __DIR__.'/vendor/twig/lib',
|
'Twig_' => __DIR__.'/vendor/twig/lib',
|
||||||
));
|
));
|
||||||
$loader->register();
|
$loader->register();
|
|
@ -25,7 +25,10 @@ git clone git://github.com/doctrine/common.git doctrine-common
|
||||||
git clone git://github.com/doctrine/migrations.git doctrine-migrations
|
git clone git://github.com/doctrine/migrations.git doctrine-migrations
|
||||||
|
|
||||||
# Doctrine MongoDB
|
# 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
|
# Swiftmailer
|
||||||
git clone git://github.com/swiftmailer/swiftmailer.git swiftmailer
|
git clone git://github.com/swiftmailer/swiftmailer.git swiftmailer
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
<parameter key="doctrine.odm.mongodb.default_connection">default</parameter>
|
<parameter key="doctrine.odm.mongodb.default_connection">default</parameter>
|
||||||
<parameter key="doctrine.odm.mongodb.default_database">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.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.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.document_manager_class">Doctrine\ODM\MongoDB\DocumentManager</parameter>
|
||||||
<parameter key="doctrine.odm.mongodb.logger_class">Symfony\Bundle\DoctrineMongoDBBundle\Logger\DoctrineMongoDBLogger</parameter>
|
<parameter key="doctrine.odm.mongodb.logger_class">Symfony\Bundle\DoctrineMongoDBBundle\Logger\DoctrineMongoDBLogger</parameter>
|
||||||
|
@ -92,4 +92,4 @@
|
||||||
</call>
|
</call>
|
||||||
</service>
|
</service>
|
||||||
</services>
|
</services>
|
||||||
</container>
|
</container>
|
|
@ -47,7 +47,7 @@ class ContainerTest extends TestCase
|
||||||
$this->assertInstanceOf('Doctrine\Common\Cache\ArrayCache', $container->get('doctrine.odm.mongodb.cache.array'));
|
$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\Logger\DoctrineMongoDBLogger', $container->get('doctrine.odm.mongodb.logger'));
|
||||||
$this->assertInstanceOf('Symfony\Bundle\DoctrineMongoDBBundle\DataCollector\DoctrineMongoDBDataCollector', $container->get('doctrine.odm.mongodb.data_collector'));
|
$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\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\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'));
|
$this->assertInstanceOf('Doctrine\Common\Cache\ArrayCache', $container->get('doctrine.odm.mongodb.default_metadata_cache'));
|
||||||
|
|
|
@ -29,7 +29,7 @@ abstract class AbstractMongoDBExtensionTest extends TestCase
|
||||||
|
|
||||||
$loader->mongodbLoad(array(), $container);
|
$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\Configuration', $container->getParameter('doctrine.odm.mongodb.configuration_class'));
|
||||||
$this->assertEquals('Doctrine\ODM\MongoDB\DocumentManager', $container->getParameter('doctrine.odm.mongodb.document_manager_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'));
|
$this->assertEquals('Proxies', $container->getParameter('doctrine.odm.mongodb.proxy_namespace'));
|
||||||
|
|
|
@ -20,6 +20,9 @@ cd $CURRENT/doctrine-migrations && git pull
|
||||||
# Doctrine MongoDB
|
# Doctrine MongoDB
|
||||||
cd $CURRENT/doctrine-mongodb && git pull
|
cd $CURRENT/doctrine-mongodb && git pull
|
||||||
|
|
||||||
|
# Doctrine MongoDB ODM
|
||||||
|
cd $CURRENT/doctrine-mongodb-odm && git pull
|
||||||
|
|
||||||
# Swiftmailer
|
# Swiftmailer
|
||||||
cd $CURRENT/swiftmailer && git pull
|
cd $CURRENT/swiftmailer && git pull
|
||||||
|
|
||||||
|
|
Reference in New Issue