diff --git a/src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php similarity index 99% rename from src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php rename to src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php index be6cab90b1..71d9059218 100644 --- a/src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php +++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Bundle\DoctrineAbstractBundle\DependencyInjection; +namespace Symfony\Bridge\Doctrine\DependencyInjection; use Symfony\Component\HttpKernel\DependencyInjection\Extension; use Symfony\Component\DependencyInjection\ContainerBuilder; @@ -19,6 +19,8 @@ use Symfony\Component\Config\Resource\FileResource; /** * This abstract classes groups common code that Doctrine Object Manager extensions (ORM, MongoDB, CouchDB) need. + * + * @author Benjamin Eberlei */ abstract class AbstractDoctrineExtension extends Extension { diff --git a/src/Symfony/Bundle/DoctrineAbstractBundle/README b/src/Symfony/Bundle/DoctrineAbstractBundle/README deleted file mode 100644 index dae8408f9a..0000000000 --- a/src/Symfony/Bundle/DoctrineAbstractBundle/README +++ /dev/null @@ -1,16 +0,0 @@ -This is a meta-bundle. It does not contain a Bundle nor a DependencyInjection file. The code is only -ever used by the following bundles: - -* DoctrineBundle -* DoctrineMigrationsBundle -* DoctrineMongoDBBundle - -Future benefactors: - -* DoctrineCouchDBBundle -* DoctrinePHPCRBundle - -Additional code that could be put here: - -* General Doctrine Form code -* General Doctrine Validator code \ No newline at end of file diff --git a/src/Symfony/Bundle/DoctrineAbstractBundle/composer.json b/src/Symfony/Bundle/DoctrineAbstractBundle/composer.json deleted file mode 100644 index b613c7ac2b..0000000000 --- a/src/Symfony/Bundle/DoctrineAbstractBundle/composer.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "symfony/doctrine-abstract-bundle", - "type": "symfony-bundle", - "description": "Symfony DoctrineAbstractBundle", - "keywords": [], - "homepage": "http://symfony.com", - "version": "2.1.0", - "license": "MIT", - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - } - ], - "require": { - "php": ">=5.3.2" - } -} diff --git a/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php index d7e5e89c2a..07533d0107 100644 --- a/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php +++ b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php @@ -17,7 +17,7 @@ use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Definition; use Symfony\Component\DependencyInjection\DefinitionDecorator; use Symfony\Component\DependencyInjection\Reference; -use Symfony\Bundle\DoctrineAbstractBundle\DependencyInjection\AbstractDoctrineExtension; +use Symfony\Bridge\Doctrine\DependencyInjection\AbstractDoctrineExtension; use Symfony\Component\Config\FileLocator; /**