Skip to content

Loading…

[WIP] [Doctrine] Remove abtract doctrine bundle #2484

Merged
merged 1 commit into from

5 participants

@beberlei

Remove AbstractDoctrineBundle and move code into Doctrine Bridge. It is a BC break because all the "other" Doctrine Bundles MongoDB ODM, CouchDB ODM and PHPCR need to be updated to cope with this.

I will prepare PRs for them aswell and then remove the [WIP] here.

Bug fix: no
Feature addition: no
Backwards compatibility break: yes
Symfony2 tests pass: yes
Fixes the following tickets: #2463

@lsmith77

all good for me ..

@stof
Symfony member

Well, this does not fix #2463. A change done in the bridge will still be able to break the service definitions of the other bundles or require tricky stuff to keep different versions of the logic.

@beberlei

@stof true, that is what doctrine/common#71 will be about.

@stloyd

Comment just for linking cross PRs and for watching ;-) doctrine/common#71

@lsmith77

please add forward compatibly into symfony 2.0 as per #2522

@beberlei

This doesn't make sense imho, since the number of people using the doctrine extension is 4 and everybody also prepared their pull request for this.

The problem is really that we need a branch for the MongoDB Bundle

@beberlei

@fabpot i created a branch in MongoDBBundle for 2.0 so this is ready to be merged.

@fabpot fabpot added a commit that referenced this pull request
@fabpot fabpot merged branch beberlei/RemoveAbtractDoctrineBundle (PR #2484)
Commits
-------

661421f [Doctrine] Remove AbstractDoctrineBundle and move code into Doctrine Bridge

Discussion
----------

[WIP] [Doctrine] Remove abtract doctrine bundle

Remove AbstractDoctrineBundle and move code into Doctrine Bridge. It is a BC break because all the "other" Doctrine Bundles MongoDB ODM, CouchDB ODM and PHPCR need to be updated to cope with this.

I will prepare PRs for them aswell and then remove the [WIP] here.

Bug fix: no
Feature addition: no
Backwards compatibility break: yes
Symfony2 tests pass: yes
Fixes the following tickets: #2463

---------------------------------------------------------------------------

by beberlei at 2011/10/26 12:32:51 -0700

Here are all 3 PRs, can we coordinate on merging them somehow?

https://github.com/symfony/DoctrineMongoDBBundle/pull/50
symfony-cmf/symfony-cmf#118
doctrine/DoctrineCouchDBBundle#4

---------------------------------------------------------------------------

by beberlei at 2011/10/26 12:33:38 -0700

Ping @lsmith77 @jwage

---------------------------------------------------------------------------

by lsmith77 at 2011/10/26 12:35:29 -0700

all good for me ..

---------------------------------------------------------------------------

by stof at 2011/10/26 14:58:01 -0700

Well, this does not fix #2463. A change done in the bridge will still be able to break the service definitions of the other bundles or require tricky stuff to keep different versions of the logic.

---------------------------------------------------------------------------

by beberlei at 2011/10/26 22:49:39 -0700

@stof true, that is what doctrine/common#71 will be about.

---------------------------------------------------------------------------

by stloyd at 2011/10/26 23:51:25 -0700

Comment just for linking cross PRs and for watching ;-) doctrine/common#71

---------------------------------------------------------------------------

by lsmith77 at 2011/10/31 08:18:45 -0700

please add forward compatibly into symfony 2.0 as per #2522

---------------------------------------------------------------------------

by beberlei at 2011/11/01 05:11:34 -0700

This doesn't make sense imho, since the number of people using the doctrine extension is 4 and everybody also prepared their pull request for this.

The problem is really that we need a branch for the MongoDB Bundle

---------------------------------------------------------------------------

by beberlei at 2011/11/01 05:40:49 -0700

@fabpot i created a branch in MongoDBBundle for 2.0 so this is ready to be merged.
d633d60
@fabpot fabpot merged commit 661421f into symfony:master
@beberlei

Thanks, merged in CouchDB and MongoDB (and fixed typos). They both work now, @lsmith77 will merge the CMF stuff.

@lsmith77

done for the CMF

@stof
Symfony member

One thing is missing here: updating the composer.json files for DoctrineBundle (which does not require this abstractBundle anymore) and the main one (which does not replaces it anymore)

@mmucklo mmucklo pushed a commit that referenced this pull request
@fabpot fabpot merged branch beberlei/RemoveAbtractDoctrineBundle (PR #2484)
Commits
-------

661421f [Doctrine] Remove AbstractDoctrineBundle and move code into Doctrine Bridge

Discussion
----------

[WIP] [Doctrine] Remove abtract doctrine bundle

Remove AbstractDoctrineBundle and move code into Doctrine Bridge. It is a BC break because all the "other" Doctrine Bundles MongoDB ODM, CouchDB ODM and PHPCR need to be updated to cope with this.

I will prepare PRs for them aswell and then remove the [WIP] here.

Bug fix: no
Feature addition: no
Backwards compatibility break: yes
Symfony2 tests pass: yes
Fixes the following tickets: #2463

---------------------------------------------------------------------------

by beberlei at 2011/10/26 12:32:51 -0700

Here are all 3 PRs, can we coordinate on merging them somehow?

https://github.com/symfony/DoctrineMongoDBBundle/pull/50
symfony-cmf/symfony-cmf#118
doctrine/DoctrineCouchDBBundle#4

---------------------------------------------------------------------------

by beberlei at 2011/10/26 12:33:38 -0700

Ping @lsmith77 @jwage

---------------------------------------------------------------------------

by lsmith77 at 2011/10/26 12:35:29 -0700

all good for me ..

---------------------------------------------------------------------------

by stof at 2011/10/26 14:58:01 -0700

Well, this does not fix #2463. A change done in the bridge will still be able to break the service definitions of the other bundles or require tricky stuff to keep different versions of the logic.

---------------------------------------------------------------------------

by beberlei at 2011/10/26 22:49:39 -0700

@stof true, that is what doctrine/common#71 will be about.

---------------------------------------------------------------------------

by stloyd at 2011/10/26 23:51:25 -0700

Comment just for linking cross PRs and for watching ;-) doctrine/common#71

---------------------------------------------------------------------------

by lsmith77 at 2011/10/31 08:18:45 -0700

please add forward compatibly into symfony 2.0 as per #2522

---------------------------------------------------------------------------

by beberlei at 2011/11/01 05:11:34 -0700

This doesn't make sense imho, since the number of people using the doctrine extension is 4 and everybody also prepared their pull request for this.

The problem is really that we need a branch for the MongoDB Bundle

---------------------------------------------------------------------------

by beberlei at 2011/11/01 05:40:49 -0700

@fabpot i created a branch in MongoDBBundle for 2.0 so this is ready to be merged.
1a039f3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
View
4 ...cyInjection/AbstractDoctrineExtension.php → ...cyInjection/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 @@
/**
* This abstract classes groups common code that Doctrine Object Manager extensions (ORM, MongoDB, CouchDB) need.
+ *
+ * @author Benjamin Eberlei <kontakt@beberlei.de>
*/
abstract class AbstractDoctrineExtension extends Extension
{
View
16 src/Symfony/Bundle/DoctrineAbstractBundle/README
@@ -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
View
22 src/Symfony/Bundle/DoctrineAbstractBundle/composer.json
@@ -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"
- }
-}
View
2 src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
@@ -17,7 +17,7 @@
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;
/**
Something went wrong with that request. Please try again.