From 5dee24eb280452fe46e76f99706c21ab417462ac Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 2 Jan 2012 18:13:57 +0100 Subject: [PATCH] updated Doctrine bundle configuration as it has moved to the Doctrine organization --- app/AppKernel.php | 2 +- app/autoload.php | 1 + deps | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/AppKernel.php b/app/AppKernel.php index 5bd97b74c7..d37b90f6d9 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -13,8 +13,8 @@ public function registerBundles() new Symfony\Bundle\TwigBundle\TwigBundle(), new Symfony\Bundle\MonologBundle\MonologBundle(), new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(), - new Symfony\Bundle\DoctrineBundle\DoctrineBundle(), new Symfony\Bundle\AsseticBundle\AsseticBundle(), + new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(), new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(), new JMS\SecurityExtraBundle\JMSSecurityExtraBundle(), ); diff --git a/app/autoload.php b/app/autoload.php index 64ba187734..f36067f824 100644 --- a/app/autoload.php +++ b/app/autoload.php @@ -8,6 +8,7 @@ 'Symfony' => array(__DIR__.'/../vendor/symfony/src', __DIR__.'/../vendor/bundles'), 'Sensio' => __DIR__.'/../vendor/bundles', 'JMS' => __DIR__.'/../vendor/bundles', + 'Doctrine\\Bundle' => __DIR__.'/../vendor/bundles', 'Doctrine\\Common' => __DIR__.'/../vendor/doctrine-common/lib', 'Doctrine\\DBAL' => __DIR__.'/../vendor/doctrine-dbal/lib', 'Doctrine' => __DIR__.'/../vendor/doctrine/lib', diff --git a/deps b/deps index 129472ba0e..e78732ce39 100644 --- a/deps +++ b/deps @@ -58,3 +58,7 @@ git=http://github.com/symfony/AsseticBundle.git target=/bundles/Symfony/Bundle/AsseticBundle version=v1.0.1 + +[DoctrineBundle] + git=http://github.com/doctrine/DoctrineBundle.git + target=/bundles/Doctrine/Bundle/DoctrineBundle