Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

removed doctrine common and dbal submodules

  • Loading branch information...
commit 8219ac7093a64e3a785cd2d14b2abd9587d2c0a1 1 parent f824dad
@fabpot fabpot authored
View
6 .gitmodules
@@ -7,12 +7,6 @@
[submodule "vendor/doctrine"]
path = vendor/doctrine
url = http://github.com/doctrine/doctrine2.git
-[submodule "vendor/doctrine-dbal"]
- path = vendor/doctrine-dbal
- url = http://github.com/doctrine/dbal.git
-[submodule "vendor/doctrine-common"]
- path = vendor/doctrine-common
- url = http://github.com/doctrine/common.git
[submodule "vendor/swiftmailer"]
path = vendor/swiftmailer
url = http://github.com/swiftmailer/swiftmailer.git
View
4 app/autoload.php
@@ -7,8 +7,8 @@
'Symfony' => array(__DIR__.'/../vendor/symfony/src', __DIR__.'/../vendor/bundles'),
'Sensio' => __DIR__.'/../vendor/bundles',
'JMS' => __DIR__.'/../vendor/bundles',
- 'Doctrine\\Common' => __DIR__.'/../vendor/doctrine-common/lib',
- 'Doctrine\\DBAL' => __DIR__.'/../vendor/doctrine-dbal/lib',
+ 'Doctrine\\Common' => __DIR__.'/../vendor/doctrine/lib/vendor/doctrine-common/lib',
+ 'Doctrine\\DBAL' => __DIR__.'/../vendor/doctrine/lib/vendor/doctrine-dbal/lib',
'Doctrine' => __DIR__.'/../vendor/doctrine/lib',
'Monolog' => __DIR__.'/../vendor/monolog/src',
'Assetic' => __DIR__.'/../vendor/assetic/src',
1  vendor/doctrine-common
@@ -1 +0,0 @@
-Subproject commit 9c3508f7e576f91690f79c8d3a0b9b3d5ad57a8a
1  vendor/doctrine-dbal
@@ -1 +0,0 @@
-Subproject commit 36c2e76abc75c9d508df87eec02cfbb2f045d307

11 comments on commit 8219ac7

@stof
Collaborator

The Doctrine Common will still be duplicated (ORM and DBAL). and you will have YAML and CONSOLE 3 times as both the ORM and DBAL include them

@fabpot
Owner

I know but there is nothing we can do about it.

@marijn

I always thought that recursive dependencies only got fetched when you call git submodule update --init --recursive..?

@abdeltiflouardi

how can i integrate doctrine-fixtures in .gitmodules

@henrikbjorn

@ouardisoft that is a question for git, man git-submodule

@abdeltiflouardi

but i want to use doctrine-fixtures in my app sf2beta2 after this changes i can't to follow this tuto
http://symfony.com/doc/current/cookbook/doctrine/doctrine_fixtures.html#setup-and-configuration

My question is how can i integrate doctrine-fixtures in my app

@lsmith77
Collaborator

the only solution i guess would be to not use --recursive, but instead cd into the respective dir's where we do want to recurse.

@stof
Collaborator

or not using --recursive and re-adding the common and DBAL submodule as they were before.

@dustinwhittle

If we add back the dbal + common submodules as they were just update to "git pull --recurse-submodules ; git submodule update --init ; git submodule foreach 'git checkout master && git pull'"

@abdeltiflouardi

thanks it works now, but i installed its from github

cd vendor
git clone https://github.com/doctrine/data-fixtures.git
mv data-fixtures doctrine-fixtures
cd symfony/src/Symfony/Bundle
git clone https://github.com/symfony/DoctrineFixturesBundle.git

@fabpot
Owner

I have reverted the whole thing as it conflicts with the possibility to use Git for your project. Instead, I have added a way to keep the sha of all deps for a given version so that we can ensure that the proper versions are installed correctly from a tagged version:

2e9dab6

Please sign in to comment.
Something went wrong with that request. Please try again.