From 13722feeaae67ea98ddb166b157c84cf8e42c463 Mon Sep 17 00:00:00 2001 From: pablodip Date: Tue, 20 Dec 2011 16:18:26 +0000 Subject: [PATCH] removed submodules --- .gitignore | 3 ++ .gitmodules | 27 -------------- tests/autoload.php.dist | 23 ++++++++++++ tests/bootstrap.php | 25 +++---------- vendor/Symfony/Component/ClassLoader | 1 - vendor/doctrine-common | 1 - vendor/doctrine-dbal | 1 - vendor/doctrine-mongodb | 1 - vendor/doctrine-mongodb-odm | 1 - vendor/doctrine-orm | 1 - vendor/mandango | 1 - vendor/propel | 1 - vendor/solarium | 1 - vendors.php | 56 ++++++++++++++++++++++++++++ 14 files changed, 87 insertions(+), 56 deletions(-) create mode 100644 .gitignore delete mode 100644 .gitmodules create mode 100644 tests/autoload.php.dist delete mode 160000 vendor/Symfony/Component/ClassLoader delete mode 160000 vendor/doctrine-common delete mode 160000 vendor/doctrine-dbal delete mode 160000 vendor/doctrine-mongodb delete mode 160000 vendor/doctrine-mongodb-odm delete mode 160000 vendor/doctrine-orm delete mode 160000 vendor/mandango delete mode 160000 vendor/propel delete mode 160000 vendor/solarium create mode 100644 vendors.php diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..62ecbe2d --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +phpunit.xml +/tests/autoload.php +/vendor/ diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 7a9e8632..00000000 --- a/.gitmodules +++ /dev/null @@ -1,27 +0,0 @@ -[submodule "vendor/mandango"] - path = vendor/mandango - url = http://github.com/mandango/mandango.git -[submodule "vendor/doctrine-mongodb-odm"] - path = vendor/doctrine-mongodb-odm - url = http://github.com/doctrine/mongodb-odm.git -[submodule "vendor/doctrine-mongodb"] - path = vendor/doctrine-mongodb - url = http://github.com/doctrine/mongodb.git -[submodule "vendor/Symfony/Component/ClassLoader"] - path = vendor/Symfony/Component/ClassLoader - url = http://github.com/symfony/ClassLoader.git -[submodule "vendor/doctrine-common"] - path = vendor/doctrine-common - url = http://github.com/doctrine/common.git -[submodule "vendor/doctrine-dbal"] - path = vendor/doctrine-dbal - url = http://github.com/doctrine/dbal.git -[submodule "vendor/doctrine-orm"] - path = vendor/doctrine-orm - url = http://github.com/doctrine/doctrine2.git -[submodule "vendor/propel"] - path = vendor/propel - url = http://github.com/propelorm/Propel.git -[submodule "vendor/solarium"] - path = vendor/solarium - url = https://github.com/basdenooijer/solarium diff --git a/tests/autoload.php.dist b/tests/autoload.php.dist new file mode 100644 index 00000000..cbf7715d --- /dev/null +++ b/tests/autoload.php.dist @@ -0,0 +1,23 @@ +registerNamespaces(array( + 'Pagerfanta\Tests' => __DIR__, + 'Pagerfanta' => __DIR__.'/../src', + 'Mandango' => $vendorDir.'/mandango/src', + 'Doctrine\Common' => $vendorDir.'/doctrine-common/lib', + 'Doctrine\MongoDB' => $vendorDir.'/doctrine-mongodb/lib', + 'Doctrine\ODM\MongoDB' => $vendorDir.'/doctrine-mongodb-odm/lib', + 'Doctrine\DBAL' => $vendorDir.'/doctrine-dbal/lib', + 'Doctrine\ORM' => $vendorDir.'/doctrine-orm/lib', +)); +$classLoader->registerPrefixes(array( + 'Solarium_' => $vendorDir.'/solarium/library', +)); +$classLoader->register(); diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 387f6491..510c33ae 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -1,22 +1,7 @@ registerNamespaces(array( - 'Pagerfanta\Tests' => __DIR__, - 'Pagerfanta' => __DIR__.'/../src', - 'Mandango' => __DIR__.'/../vendor/mandango/src', - 'Doctrine\Common' => __DIR__.'/../vendor/doctrine-common/lib', - 'Doctrine\MongoDB' => __DIR__.'/../vendor/doctrine-mongodb/lib', - 'Doctrine\ODM\MongoDB' => __DIR__.'/../vendor/doctrine-mongodb-odm/lib', - 'Doctrine\DBAL' => __DIR__.'/../vendor/doctrine-dbal/lib', - 'Doctrine\ORM' => __DIR__.'/../vendor/doctrine-orm/lib', -)); -$classLoader->registerPrefixes(array( - 'Solarium_' => __DIR__.'/../vendor/solarium/library', -)); -$classLoader->register(); +if (file_exists($file = __DIR__.'/autoload.php')) { + require_once $file; +} elseif (file_exists($file = __DIR__.'/autoload.php.dist')) { + require_once $file; +} diff --git a/vendor/Symfony/Component/ClassLoader b/vendor/Symfony/Component/ClassLoader deleted file mode 160000 index 80862ea2..00000000 --- a/vendor/Symfony/Component/ClassLoader +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 80862ea255511dc576f5fb23d6c2cf64ab057c6e diff --git a/vendor/doctrine-common b/vendor/doctrine-common deleted file mode 160000 index 34ce712d..00000000 --- a/vendor/doctrine-common +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 34ce712dd942aa76bc9b97c4000b17290b0c7bc2 diff --git a/vendor/doctrine-dbal b/vendor/doctrine-dbal deleted file mode 160000 index 36c2e76a..00000000 --- a/vendor/doctrine-dbal +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 36c2e76abc75c9d508df87eec02cfbb2f045d307 diff --git a/vendor/doctrine-mongodb b/vendor/doctrine-mongodb deleted file mode 160000 index cdddc37a..00000000 --- a/vendor/doctrine-mongodb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cdddc37a07e9cd7ea45d6bd44ad2c3eaa5fe92bd diff --git a/vendor/doctrine-mongodb-odm b/vendor/doctrine-mongodb-odm deleted file mode 160000 index 8f094543..00000000 --- a/vendor/doctrine-mongodb-odm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8f09454331d0c19434bebd3b1f3f56ce8f0d434a diff --git a/vendor/doctrine-orm b/vendor/doctrine-orm deleted file mode 160000 index 0bb09373..00000000 --- a/vendor/doctrine-orm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0bb09373727793f9cf89846a1c03dcf9e19913ae diff --git a/vendor/mandango b/vendor/mandango deleted file mode 160000 index 6c88aba2..00000000 --- a/vendor/mandango +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6c88aba275ec1bfa53c28eb468880195a8f3d7d7 diff --git a/vendor/propel b/vendor/propel deleted file mode 160000 index c63480fb..00000000 --- a/vendor/propel +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c63480fb4f886d4cb3df053b4d243c9465536080 diff --git a/vendor/solarium b/vendor/solarium deleted file mode 160000 index 2db071c4..00000000 --- a/vendor/solarium +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2db071c48c86791bebd4e74c0afa3f5767caeec0 diff --git a/vendors.php b/vendors.php new file mode 100644 index 00000000..1b50974e --- /dev/null +++ b/vendors.php @@ -0,0 +1,56 @@ + Installing $name\n"; + + system(sprintf('git clone %s %s', escapeshellarg($url), escapeshellarg($installDir))); + } + + if (!$install) { + echo "> Updating $name\n"; + } + + system(sprintf('cd %s && git fetch origin && git reset --hard %s', escapeshellarg($installDir), escapeshellarg($rev))); +}