Merge pull request doctrine#278 from doctrine/composer-ci

Remove submodules and utilize Composer for CI
scottaubrey · Mar 13, 2012 · bd65a47 · bd65a47
2 parents 5505bf9 + 58dfc86
commit bd65a47
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 36 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,7 @@ build/
 logs/
 reports/
 dist/
-phpunit.xml
+phpunit.xml
+vendor
+composer.lock
+composer.phar
diff --git a/.gitmodules b/.gitmodules
diff --git a/.travis.yml b/.travis.yml
@@ -11,6 +11,7 @@ before_script:
   - tar -xzf mongo-1.2.7.tgz
   - sh -c "cd mongo-1.2.7 && phpize && ./configure --enable-mongo && make && sudo make install"
   - echo "extension=mongo.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
-  - git submodule update --init
+  - wget -nc http://getcomposer.org/composer.phar
+  - php composer.phar install
 
 script: phpunit -c .
diff --git a/composer.json b/composer.json
@@ -14,8 +14,8 @@
         "php": ">=5.3.2",
         "symfony/yaml": ">=2.0",
         "symfony/console": ">=2.0",
-        "doctrine/common": ">=2.1.0",
-	"doctrine/mongodb": "*"
+        "doctrine/common": ">=2.2.0",
+        "doctrine/mongodb": "*"
     },
     "autoload": {
         "psr-0": { "Doctrine\\ODM\\MongoDB": "lib/" }

diff --git a/lib/vendor/Symfony/Component/Console b/lib/vendor/Symfony/Component/Console
diff --git a/lib/vendor/Symfony/Component/Yaml b/lib/vendor/Symfony/Component/Yaml
diff --git a/lib/vendor/doctrine-common b/lib/vendor/doctrine-common
diff --git a/lib/vendor/doctrine-mongodb b/lib/vendor/doctrine-mongodb
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -1,29 +1,21 @@
 <?php
 
-require_once __DIR__ . '/../lib/vendor/doctrine-common/lib/Doctrine/Common/ClassLoader.php';
-require_once __DIR__ . '/Doctrine/ODM/MongoDB/Tests/BaseTest.php';
+$file = __DIR__.'/../vendor/.composer/autoload.php';
+if (!file_exists($file)) {
+    throw new RuntimeException('Install dependencies to run test suite.');
+}
 
-use Doctrine\Common\ClassLoader,
-    Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver;
+require_once $file;
+
+use Doctrine\Common\ClassLoader;
+use Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver;
 
 $classLoader = new ClassLoader('Doctrine\ODM\MongoDB\Tests', __DIR__ . '/../tests');
 $classLoader->register();
 
 $classLoader = new ClassLoader('Doctrine\ODM\MongoDB', __DIR__ . '/../lib');
 $classLoader->register();
 
-$classLoader = new ClassLoader('Doctrine\MongoDB', __DIR__ . '/../lib/vendor/doctrine-mongodb/lib');
-$classLoader->register();
-
-$classLoader = new ClassLoader('Doctrine', __DIR__ . '/../lib/vendor/doctrine-common/lib');
-$classLoader->register();
-
-$classLoader = new ClassLoader('Symfony\Component\Yaml', __DIR__ . '/../lib/vendor');
-$classLoader->register();
-
-$classLoader = new ClassLoader('Symfony\Component\Console', __DIR__ . '/../lib/vendor');
-$classLoader->register();
-
 $classLoader = new ClassLoader('Documents', __DIR__);
 $classLoader->register();