first steps towards testing on travis using composer

uwej711 · Mar 17, 2012 · 46047bb · 46047bb
1 parent 29b015e
commit 46047bb
Show file tree

Hide file tree

Showing 26 changed files with 61 additions and 255 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,10 @@ nbproject
 *~
 tests/phpunit.xml
 
-lib/vendor
 /cli-config.php
 jackrabbit/
+
+vendor/
+
+composer.lock
+composer.phar
diff --git a/.gitmodules b/.gitmodules
diff --git a/.travis.yml b/.travis.yml
@@ -11,6 +11,8 @@ env:
 #  - TRANSPORT=midgard_mysql
 
 before_script:
+  - wget -nc http://getcomposer.org/composer.phar
+  - php composer.phar install --install-suggests
   - ./tests/travis_${TRANSPORT}.sh
 
 script: phpunit -c tests/phpunit_${TRANSPORT}.xml.dist

diff --git a/bootstrap.php b/bootstrap.php
@@ -0,0 +1,38 @@
+<?php
+
+$vendorDir = __DIR__.'/vendor';
+
+spl_autoload_register(function($class)
+{
+    if (0 === strpos($class, 'Doctrine\ODM\PHPCR')) {
+        $path = __DIR__.'/lib/'.implode('/', explode('\\', $class)).'.php';
+        if (!stream_resolve_include_path($path)) {
+            return false;
+        }
+        require_once $path;
+        return true;
+    }
+    if (0 === strpos($class, 'Doctrine\Tests')) {
+        $path = __DIR__.'/tests/'.implode('/', explode('\\', $class)).'.php';
+        if (!stream_resolve_include_path($path)) {
+            return false;
+        }
+        require_once $path;
+        return true;
+    }
+});
+
+$file = $vendorDir.'/.composer/autoload.php';
+if (file_exists($file)) {
+    $autoload = require_once $file;
+} else {
+    throw new RuntimeException('Install dependencies to run test suite.');
+}
+
+use Doctrine\Common\Annotations\AnnotationRegistry;
+
+AnnotationRegistry::registerLoader(function($class) use ($autoload) {
+    $autoload->loadClass($class);
+    return class_exists($class, false);
+});
+AnnotationRegistry::registerFile(__DIR__.'/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/DoctrineAnnotations.php');
diff --git a/cli-config.doctrine_dbal.php.dist b/cli-config.doctrine_dbal.php.dist
@@ -7,23 +7,9 @@
  * Add instances of commands for eventual implementation specific commands to this array.
  */
 
-$extraCommands = array();
-
-$vendorDir = __DIR__.'/lib/vendor';
-
-require_once $vendorDir.'/phpcr-utils/lib/vendor/Symfony/Component/ClassLoader/UniversalClassLoader.php';
-$classLoader = new \Symfony\Component\ClassLoader\UniversalClassLoader();
-$classLoader->register();
-
-$classLoader->registerNamespaces(array(
-    'Doctrine\ODM' => dirname($vendorDir),
-    'Doctrine\Common' => $vendorDir.'/doctrine-common/lib',
-    'Symfony' => array($vendorDir.'/jackalope-doctrine-dbal/lib/jackalope/lib/phpcr-utils/lib/vendor'),
-    'PHPCR' => array($vendorDir.'/phpcr/src', $vendorDir.'/phpcr-utils/src'),
-    'Jackalope'=> array($vendorDir.'/jackalope-doctrine-dbal/src', $vendorDir.'/jackalope-doctrine-dbal/lib/jackalope/src'),
-    'Doctrine\DBAL'=> $vendorDir.'/jackalope-doctrine-dbal/lib/vendor/doctrine-dbal/lib',
-));
+require_once './bootstrap.php';
 
+$extraCommands = array();
 $extraCommands[] = new \Jackalope\Tools\Console\Command\InitDoctrineDbalCommand();
 
 $params = array(

diff --git a/cli-config.jackrabbit.php.dist b/cli-config.jackrabbit.php.dist
@@ -7,22 +7,9 @@
  * Add instances of commands for eventual implementation specific commands to this array.
  */
 
-$extraCommands = array();
-
-$vendorDir = __DIR__.'/lib/vendor';
-
-require_once $vendorDir.'/phpcr-utils/lib/vendor/Symfony/Component/ClassLoader/UniversalClassLoader.php';
-$classLoader = new \Symfony\Component\ClassLoader\UniversalClassLoader();
-$classLoader->register();
-
-$classLoader->registerNamespaces(array(
-    'Doctrine\ODM' => dirname($vendorDir),
-    'Doctrine\Common' => $vendorDir.'/doctrine-common/lib',
-    'Symfony' => array($vendorDir.'/phpcr-utils/lib/vendor'),
-    'PHPCR' => array($vendorDir.'/phpcr/src', $vendorDir.'/phpcr-utils/src'),
-    'Jackalope'=> array($vendorDir.'/jackalope-jackrabbit/src', $vendorDir.'/jackalope-jackrabbit/lib/jackalope/src'),
-));
+require_once './bootstrap.php';
 
+$extraCommands = array();
 $extraCommands[] = new \Jackalope\Tools\Console\Command\JackrabbitCommand();
 
 $params = array(

diff --git a/cli-config.midgard_mysql.php.dist b/cli-config.midgard_mysql.php.dist
@@ -7,21 +7,9 @@
  * Add instances of commands for eventual implementation specific commands to this array.
  */
 
-$extraCommands = array();
-
-$vendorDir = __DIR__.'/lib/vendor';
-
-require_once $vendorDir.'/jackalope/lib/phpcr-utils/lib/vendor/Symfony/Component/ClassLoader/UniversalClassLoader.php';
-$classLoader = new \Symfony\Component\ClassLoader\UniversalClassLoader();
-$classLoader->register();
+require_once './bootstrap.php';
 
-$classLoader->registerNamespaces(array(
-    'Doctrine\ODM' => dirname($vendorDir),
-    'Doctrine\Common' => $vendorDir.'/doctrine-common/lib',
-    'Symfony' => array($vendorDir.'/jackalope/lib/phpcr-utils/lib/vendor'),
-    'PHPCR' => array($vendorDir.'/phpcr/src', $vendorDir.'/phpcr-utils/src'),
-    'Midgard\PHPCR' =>  __DIR__ . '/lib/vendor/Midgard/PHPCR/src'
-));
+$extraCommands = array();
 
 $params = array(
     'midgard2.configuration.db.type' => 'MySQL',

diff --git a/cli-config.midgard_sqlite.php.dist b/cli-config.midgard_sqlite.php.dist
@@ -7,20 +7,9 @@
  * Add instances of commands for eventual implementation specific commands to this array.
  */
 
-$extraCommands = array();
-
-$vendorDir = __DIR__.'/lib/vendor';
-
-require_once $vendorDir.'/jackalope/lib/phpcr-utils/lib/vendor/Symfony/Component/ClassLoader/UniversalClassLoader.php';
-$classLoader = new \Symfony\Component\ClassLoader\UniversalClassLoader();
-$classLoader->register();
+require_once './bootstrap.php';
 
-$classLoader->registerNamespaces(array(
-    'Doctrine\ODM' => dirname($vendorDir),
-    'Doctrine\Common' => $vendorDir.'/doctrine-common/lib',
-    'Symfony' => array($vendorDir, $vendorDir.'/jackalope/lib/phpcr-utils/lib/vendor'),
-    'PHPCR' => array($vendorDir.'/jackalope/lib/phpcr/src', $vendorDir.'/jackalope/lib/phpcr-utils/src'),
-));
+$extraCommands = array();
 
 $classLoader->registerNamespaces(array(
     'Midgard\PHPCR' =>  __DIR__ . '/lib/vendor/Midgard/PHPCR/src'

diff --git a/composer.json b/composer.json
@@ -14,10 +14,11 @@
         "php": ">=5.3.2",
         "doctrine/common": "dev-master",
         "phpcr/phpcr-implementation": "2.1.0-beta3",
-        "phpcr/phpcr-utils": "1.0-beta2"
+        "phpcr/phpcr-utils": "dev-master"
     },
     "suggest": {
-        "symfony/yaml": ">=2.0.0,<2.2.0-dev"
+        "symfony/yaml": ">=2.0.0,<2.2.0-dev",
+        "jackalope/jackalope-jackrabbit": "dev-master"
     },
     "autoload": {
         "psr-0": { "Doctrine\\ODM\\PHPCR": "lib/" }

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/phpcr b/lib/vendor/phpcr
diff --git a/lib/vendor/phpcr-utils b/lib/vendor/phpcr-utils
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
diff --git a/tests/bootstrap_doctrine_dbal.php b/tests/bootstrap_doctrine_dbal.php
diff --git a/tests/bootstrap_jackrabbit.php b/tests/bootstrap_jackrabbit.php
diff --git a/tests/bootstrap_midgard.php b/tests/bootstrap_midgard.php
diff --git a/tests/phpunit_doctrine_dbal.xml.dist b/tests/phpunit_doctrine_dbal.xml.dist
@@ -1,4 +1,4 @@
-<phpunit bootstrap="./bootstrap_doctrine_dbal.php">
+<phpunit bootstrap="../bootstrap.php">
     <php>
         <var name="DOCTRINE_PHPCR_FACTORY" value="\Jackalope\RepositoryFactoryDoctrineDBAL" />
         <var name="jackalope.doctrine.dbal.driver" value="pdo_mysql" />

diff --git a/tests/phpunit_jackrabbit.xml.dist b/tests/phpunit_jackrabbit.xml.dist
@@ -1,4 +1,4 @@
-<phpunit bootstrap="./bootstrap_jackrabbit.php">
+<phpunit bootstrap="../bootstrap.php">
     <php>
         <var name="DOCTRINE_PHPCR_FACTORY" value="\Jackalope\RepositoryFactoryJackrabbit" />
         <var name="jackalope.jackrabbit_uri" value="http://localhost:8080/server/" />

diff --git a/tests/phpunit_midgard_mysql.xml.dist b/tests/phpunit_midgard_mysql.xml.dist
@@ -1,4 +1,4 @@
-<phpunit bootstrap="./bootstrap_midgard.php">
+<phpunit bootstrap="../bootstrap.php">
     <php>
         <var name="DOCTRINE_PHPCR_FACTORY" value="\Midgard\PHPCR\RepositoryFactory" />
         <var name="midgard2.configuration.db.type" value="MySQL" />

diff --git a/tests/phpunit_midgard_sqlite.xml.dist b/tests/phpunit_midgard_sqlite.xml.dist
@@ -1,4 +1,4 @@
-<phpunit bootstrap="./bootstrap_midgard.php">
+<phpunit bootstrap="../bootstrap.php">
     <php>
         <var name="DOCTRINE_PHPCR_FACTORY" value="\Midgard\PHPCR\RepositoryFactory" />
         <var name="midgard2.configuration.db.type" value="SQLite" />

diff --git a/tests/travis_doctrine_dbal.sh b/tests/travis_doctrine_dbal.sh
@@ -1,12 +1,7 @@
 #!/bin/bash
 
-git submodule update --init --recursive
-
 mysql -e 'create database IF NOT EXISTS phpcr_odm_tests;' -u root
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-php $DIR/vendor/vendors_doctrine_dbal.php
-
 cp cli-config.doctrine_dbal.php.dist cli-config.php
 ./bin/phpcr jackalope:init:dbal
 ./bin/phpcr doctrine:phpcr:register-system-node-types
diff --git a/tests/travis_jackrabbit.sh b/tests/travis_jackrabbit.sh
@@ -1,11 +1,6 @@
 #!/bin/bash
 
-git submodule update --init --recursive
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-php $DIR/vendor/vendors_jackrabbit.php
-
-./lib/vendor/jackalope-jackrabbit/tests/travis.sh
+./vendor/jackalope/jackalope-jackrabbit/tests/travis.sh
 
 cp cli-config.jackrabbit.php.dist cli-config.php
 ./bin/phpcr doctrine:phpcr:register-system-node-types
diff --git a/tests/vendor/vendors_doctrine_dbal.php b/tests/vendor/vendors_doctrine_dbal.php
diff --git a/tests/vendor/vendors_jackrabbit.php b/tests/vendor/vendors_jackrabbit.php