diff --git a/.gitignore b/.gitignore index 422f1ce840571..024317cb26feb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ phpunit.xml autoload.php -/vendor/ diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000000..d062a9f508127 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,27 @@ +[submodule "vendor/doctrine"] + path = vendor/doctrine + url = git://github.com/doctrine/doctrine2.git +[submodule "vendor/doctrine-data-fixtures"] + path = vendor/doctrine-data-fixtures + url = git://github.com/doctrine/data-fixtures +[submodule "vendor/doctrine-dbal"] + path = vendor/doctrine-dbal + url = git://github.com/doctrine/dbal.git +[submodule "vendor/doctrine-common"] + path = vendor/doctrine-common + url = git://github.com/doctrine/common.git +[submodule "vendor/doctrine-migrations"] + path = vendor/doctrine-migrations + url = git://github.com/doctrine/migrations.git +[submodule "vendor/doctrine-mongodb"] + path = vendor/doctrine-mongodb + url = git://github.com/doctrine/mongodb-odm.git +[submodule "vendor/swiftmailer"] + path = vendor/swiftmailer + url = git://github.com/swiftmailer/swiftmailer.git +[submodule "vendor/twig"] + path = vendor/twig + url = git://github.com/fabpot/Twig.git +[submodule "vendor/zend"] + path = vendor/zend + url = git://github.com/zendframework/zf2.git diff --git a/install_vendors.sh b/install_vendors.sh deleted file mode 100755 index 64a3426c30cfb..0000000000000 --- a/install_vendors.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -# initialization -if [ -d "vendor" ]; then - rm -rf vendor/* -else - mkdir vendor -fi - -cd vendor - -# Doctrine ORM -git clone git://github.com/doctrine/doctrine2.git doctrine - -# Doctrine Data Fixtures Extension -git clone git://github.com/doctrine/data-fixtures doctrine-data-fixtures - -# Doctrine DBAL -git clone git://github.com/doctrine/dbal.git doctrine-dbal - -# Doctrine Common -git clone git://github.com/doctrine/common.git doctrine-common - -# Doctrine migrations -git clone git://github.com/doctrine/migrations.git doctrine-migrations - -# Doctrine MongoDB -git clone git://github.com/doctrine/mongodb-odm.git doctrine-mongodb - -# Swiftmailer -git clone git://github.com/swiftmailer/swiftmailer.git swiftmailer - -# Twig -git clone git://github.com/fabpot/Twig.git twig - -# Zend Framework -git clone git://github.com/zendframework/zf2.git zend diff --git a/update_vendors.sh b/update_vendors.sh deleted file mode 100755 index 8811598622e89..0000000000000 --- a/update_vendors.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -CURRENT=`pwd`/vendor - -# Doctrine ORM -cd $CURRENT/doctrine && git pull - -# Doctrine Data Fixtures Extension -cd $CURRENT/doctrine-data-fixtures && git pull - -# Doctrine DBAL -cd $CURRENT/doctrine-dbal && git pull - -# Doctrine common -cd $CURRENT/doctrine-common && git pull - -# Doctrine migrations -cd $CURRENT/doctrine-migrations && git pull - -# Doctrine MongoDB -cd $CURRENT/doctrine-mongodb && git pull - -# Swiftmailer -cd $CURRENT/swiftmailer && git pull - -# Twig -cd $CURRENT/twig && git pull - -# Zend Framework -cd $CURRENT/zend && git pull diff --git a/vendor/doctrine b/vendor/doctrine new file mode 160000 index 0000000000000..6cd0fefef29ea --- /dev/null +++ b/vendor/doctrine @@ -0,0 +1 @@ +Subproject commit 6cd0fefef29ea81ad3149705cf94f972bb7a3f5a diff --git a/vendor/doctrine-common b/vendor/doctrine-common new file mode 160000 index 0000000000000..ecc8c93850080 --- /dev/null +++ b/vendor/doctrine-common @@ -0,0 +1 @@ +Subproject commit ecc8c938500809e3677a3167ff5cadb303c8da67 diff --git a/vendor/doctrine-data-fixtures b/vendor/doctrine-data-fixtures new file mode 160000 index 0000000000000..e4799a18ad2f1 --- /dev/null +++ b/vendor/doctrine-data-fixtures @@ -0,0 +1 @@ +Subproject commit e4799a18ad2f1288d7274e2c10870a083b943f46 diff --git a/vendor/doctrine-dbal b/vendor/doctrine-dbal new file mode 160000 index 0000000000000..e8734ad7d1012 --- /dev/null +++ b/vendor/doctrine-dbal @@ -0,0 +1 @@ +Subproject commit e8734ad7d10129e43f70305a72977cd2f080076b diff --git a/vendor/doctrine-migrations b/vendor/doctrine-migrations new file mode 160000 index 0000000000000..75354d69f3125 --- /dev/null +++ b/vendor/doctrine-migrations @@ -0,0 +1 @@ +Subproject commit 75354d69f312594ccea9fa42a5df7dce0ca61e55 diff --git a/vendor/doctrine-mongodb b/vendor/doctrine-mongodb new file mode 160000 index 0000000000000..e01c60df1cad7 --- /dev/null +++ b/vendor/doctrine-mongodb @@ -0,0 +1 @@ +Subproject commit e01c60df1cad7a97688b4c78083ebc7f5e57c281 diff --git a/vendor/swiftmailer b/vendor/swiftmailer new file mode 160000 index 0000000000000..b7a1167f10816 --- /dev/null +++ b/vendor/swiftmailer @@ -0,0 +1 @@ +Subproject commit b7a1167f1081698c78568f267270a435d5dc9711 diff --git a/vendor/twig b/vendor/twig new file mode 160000 index 0000000000000..1d2afa097fe9c --- /dev/null +++ b/vendor/twig @@ -0,0 +1 @@ +Subproject commit 1d2afa097fe9cffdf37322571c277ec186c520b2 diff --git a/vendor/zend b/vendor/zend new file mode 160000 index 0000000000000..47332b12bf12a --- /dev/null +++ b/vendor/zend @@ -0,0 +1 @@ +Subproject commit 47332b12bf12ac21223b9a3892b44382c4efae8a