From 46047bb3012d87e99895255a2a6a55eff7282ccb Mon Sep 17 00:00:00 2001 From: lsmith77 Date: Sat, 17 Mar 2012 16:48:56 -0400 Subject: [PATCH] first steps towards testing on travis using composer --- .gitignore | 6 +++- .gitmodules | 12 -------- .travis.yml | 2 ++ bootstrap.php | 38 ++++++++++++++++++++++++++ cli-config.doctrine_dbal.php.dist | 18 ++---------- cli-config.jackrabbit.php.dist | 17 ++---------- cli-config.midgard_mysql.php.dist | 16 ++--------- cli-config.midgard_sqlite.php.dist | 15 ++-------- composer.json | 5 ++-- lib/vendor/Symfony/Component/Yaml | 1 - lib/vendor/doctrine-common | 1 - lib/vendor/phpcr | 1 - lib/vendor/phpcr-utils | 1 - tests/bootstrap.php | 37 ------------------------- tests/bootstrap_doctrine_dbal.php | 21 -------------- tests/bootstrap_jackrabbit.php | 22 --------------- tests/bootstrap_midgard.php | 14 ---------- tests/phpunit_doctrine_dbal.xml.dist | 2 +- tests/phpunit_jackrabbit.xml.dist | 2 +- tests/phpunit_midgard_mysql.xml.dist | 2 +- tests/phpunit_midgard_sqlite.xml.dist | 2 +- tests/travis_doctrine_dbal.sh | 5 ---- tests/travis_jackrabbit.sh | 7 +---- tests/vendor/vendors_doctrine_dbal.php | 23 ---------------- tests/vendor/vendors_jackrabbit.php | 23 ---------------- tests/vendor/vendors_midgard.php | 23 ---------------- 26 files changed, 61 insertions(+), 255 deletions(-) delete mode 100644 .gitmodules create mode 100644 bootstrap.php delete mode 160000 lib/vendor/Symfony/Component/Yaml delete mode 160000 lib/vendor/doctrine-common delete mode 160000 lib/vendor/phpcr delete mode 160000 lib/vendor/phpcr-utils delete mode 100644 tests/bootstrap.php delete mode 100644 tests/bootstrap_doctrine_dbal.php delete mode 100644 tests/bootstrap_jackrabbit.php delete mode 100644 tests/bootstrap_midgard.php delete mode 100644 tests/vendor/vendors_doctrine_dbal.php delete mode 100644 tests/vendor/vendors_jackrabbit.php delete mode 100644 tests/vendor/vendors_midgard.php diff --git a/.gitignore b/.gitignore index b1a26682f..13dee4ce2 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,10 @@ nbproject *~ tests/phpunit.xml -lib/vendor /cli-config.php jackrabbit/ + +vendor/ + +composer.lock +composer.phar \ No newline at end of file diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 2b152bf18..000000000 --- a/.gitmodules +++ /dev/null @@ -1,12 +0,0 @@ -[submodule "lib/vendor/doctrine-common"] - path = lib/vendor/doctrine-common - url = git://github.com/doctrine/common.git -[submodule "lib/vendor/Symfony/Component/Yaml"] - path = lib/vendor/Symfony/Component/Yaml - url = git://github.com/symfony/Yaml.git -[submodule "lib/vendor/phpcr"] - path = lib/vendor/phpcr - url = git://github.com/phpcr/phpcr.git -[submodule "lib/vendor/phpcr-utils"] - path = lib/vendor/phpcr-utils - url = git://github.com/phpcr/phpcr-utils.git diff --git a/.travis.yml b/.travis.yml index ed124367d..adee1d1ef 100644 --- 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 new file mode 100644 index 000000000..25e54e153 --- /dev/null +++ b/bootstrap.php @@ -0,0 +1,38 @@ +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 index 5654ce197..674a43014 100644 --- 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 index ba12693ff..e23ce55d1 100644 --- 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 index d6d100e59..334933955 100644 --- 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 index 02b128684..f0e57a4b1 100644 --- 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 index 1e8413200..46912d3f9 100644 --- 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 deleted file mode 160000 index 1eaee09e4..000000000 --- a/lib/vendor/Symfony/Component/Yaml +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1eaee09e4ac15923594502bc37e769b29eb7101d diff --git a/lib/vendor/doctrine-common b/lib/vendor/doctrine-common deleted file mode 160000 index 38c854c37..000000000 --- a/lib/vendor/doctrine-common +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 38c854c37d20b1f67c979772089b2cd30908bcb6 diff --git a/lib/vendor/phpcr b/lib/vendor/phpcr deleted file mode 160000 index a1ebfa3e9..000000000 --- a/lib/vendor/phpcr +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a1ebfa3e9a4b44b825c788031ee767f4a5f05465 diff --git a/lib/vendor/phpcr-utils b/lib/vendor/phpcr-utils deleted file mode 160000 index 778846bdf..000000000 --- a/lib/vendor/phpcr-utils +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 778846bdf94243233f4064e08e47b6aead882ad7 diff --git a/tests/bootstrap.php b/tests/bootstrap.php deleted file mode 100644 index 4713e0891..000000000 --- a/tests/bootstrap.php +++ /dev/null @@ -1,37 +0,0 @@ -register(); - -$classLoader = new ClassLoader('Doctrine\ODM', __DIR__ . '/../lib'); -$classLoader->register(); - -$classLoader = new ClassLoader('Doctrine', __DIR__ . '/../lib/vendor/doctrine-common/lib'); -$classLoader->register(); - -$classLoader = new ClassLoader('Documents', __DIR__); -$classLoader->register(); - -$classLoader = new ClassLoader('PHPCR\Util', __DIR__ . '/../lib/vendor/phpcr-utils/src'); -$classLoader->register(); - -$classLoader = new ClassLoader('PHPCR', __DIR__ . '/../lib/vendor/phpcr/src'); -$classLoader->register(); - -$classLoader = new ClassLoader('Symfony\Component\Console', __DIR__ . '/../lib/vendor/jackalope/lib/phpcr-utils/lib/vendor'); -$classLoader->register(); - -$classLoader = new ClassLoader('Symfony', __DIR__ . '/../lib/vendor'); -$classLoader->register(); - -AnnotationRegistry::registerLoader(function($class) use ($classLoader) { - $classLoader->loadClass($class); - return class_exists($class, false); -}); -AnnotationRegistry::registerFile(__DIR__.'/../lib/Doctrine/ODM/PHPCR/Mapping/Annotations/DoctrineAnnotations.php'); diff --git a/tests/bootstrap_doctrine_dbal.php b/tests/bootstrap_doctrine_dbal.php deleted file mode 100644 index 5cb95fe15..000000000 --- a/tests/bootstrap_doctrine_dbal.php +++ /dev/null @@ -1,21 +0,0 @@ -register(); - -$classLoader = new ClassLoader('Jackalope', __DIR__.'/../lib/vendor/jackalope-doctrine-dbal/lib/jackalope/src'); -$classLoader->register(); - -//$classLoader = new ClassLoader('Jackalope', __DIR__.'/../lib/vendor/jackalope-doctrine-dbal/src'); -//$classLoader->register(); - -require_once __DIR__.'/bootstrap.php'; - -require_once __DIR__.'/../lib/vendor/jackalope-doctrine-dbal/src/Jackalope/RepositoryFactoryDoctrineDBAL.php'; -require_once __DIR__.'/../lib/vendor/jackalope-doctrine-dbal/src/Jackalope/Transport/DoctrineDBAL/Client.php'; -require_once __DIR__.'/../lib/vendor/jackalope-doctrine-dbal/src/Jackalope/Transport/DoctrineDBAL/RepositorySchema.php'; -require_once __DIR__.'/../lib/vendor/jackalope-doctrine-dbal/src/Jackalope/Transport/DoctrineDBAL/Query/QOMWalker.php'; diff --git a/tests/bootstrap_jackrabbit.php b/tests/bootstrap_jackrabbit.php deleted file mode 100644 index 07aa43642..000000000 --- a/tests/bootstrap_jackrabbit.php +++ /dev/null @@ -1,22 +0,0 @@ -register(); - -$classLoader = new ClassLoader('Jackalope', __DIR__.'/../lib/vendor/jackalope-jackrabbit/lib/jackalope/src'); -$classLoader->register(); - -//$classLoader = new ClassLoader('Jackalope', __DIR__.'/../lib/vendor/jackalope-jackrabbit/src'); -//$classLoader->register(); - -require_once __DIR__.'/bootstrap.php'; - -require_once __DIR__.'/../lib/vendor/jackalope-jackrabbit/src/Jackalope/RepositoryFactoryJackrabbit.php'; -require_once __DIR__.'/../lib/vendor/jackalope-jackrabbit/src/Jackalope/Transport/Jackrabbit/Client.php'; -require_once __DIR__.'/../lib/vendor/jackalope-jackrabbit/src/Jackalope/Transport/Jackrabbit/curl.php'; -require_once __DIR__.'/../lib/vendor/jackalope-jackrabbit/src/Jackalope/Transport/Jackrabbit/HTTPErrorException.php'; -require_once __DIR__.'/../lib/vendor/jackalope-jackrabbit/src/Jackalope/Transport/Jackrabbit/Request.php'; diff --git a/tests/bootstrap_midgard.php b/tests/bootstrap_midgard.php deleted file mode 100644 index 14ed50294..000000000 --- a/tests/bootstrap_midgard.php +++ /dev/null @@ -1,14 +0,0 @@ -register(); diff --git a/tests/phpunit_doctrine_dbal.xml.dist b/tests/phpunit_doctrine_dbal.xml.dist index 2c7f65131..5a65c9ccb 100644 --- a/tests/phpunit_doctrine_dbal.xml.dist +++ b/tests/phpunit_doctrine_dbal.xml.dist @@ -1,4 +1,4 @@ - + diff --git a/tests/phpunit_jackrabbit.xml.dist b/tests/phpunit_jackrabbit.xml.dist index f99ee5011..5d11bd552 100644 --- a/tests/phpunit_jackrabbit.xml.dist +++ b/tests/phpunit_jackrabbit.xml.dist @@ -1,4 +1,4 @@ - + diff --git a/tests/phpunit_midgard_mysql.xml.dist b/tests/phpunit_midgard_mysql.xml.dist index d2524b678..736cc7205 100644 --- a/tests/phpunit_midgard_mysql.xml.dist +++ b/tests/phpunit_midgard_mysql.xml.dist @@ -1,4 +1,4 @@ - + diff --git a/tests/phpunit_midgard_sqlite.xml.dist b/tests/phpunit_midgard_sqlite.xml.dist index eb2820fd3..6105a4633 100644 --- a/tests/phpunit_midgard_sqlite.xml.dist +++ b/tests/phpunit_midgard_sqlite.xml.dist @@ -1,4 +1,4 @@ - + diff --git a/tests/travis_doctrine_dbal.sh b/tests/travis_doctrine_dbal.sh index 54eed5179..05dff7a88 100755 --- 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 index 9667ab3f2..1efaed917 100755 --- 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 deleted file mode 100644 index 4e02ea7a7..000000000 --- a/tests/vendor/vendors_doctrine_dbal.php +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env php - Installing/Updating $name\n"; - - $installDir = $vendorDir.'/'.$name; - if (!is_dir($installDir)) { - echo "Cloning $name into $installDir\n"; - system(sprintf('git clone -q %s %s', escapeshellarg($url), escapeshellarg($installDir))); - } - - system(sprintf('cd %s && git fetch -q origin && git reset --hard %s && git submodule update --init --recursive', escapeshellarg($installDir), escapeshellarg($rev))); -} diff --git a/tests/vendor/vendors_jackrabbit.php b/tests/vendor/vendors_jackrabbit.php deleted file mode 100644 index c16e25c67..000000000 --- a/tests/vendor/vendors_jackrabbit.php +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env php - Installing/Updating $name\n"; - - $installDir = $vendorDir.'/'.$name; - if (!is_dir($installDir)) { - echo "Cloning $name into $installDir\n"; - system(sprintf('git clone -q %s %s', escapeshellarg($url), escapeshellarg($installDir))); - } - - system(sprintf('cd %s && git fetch -q origin && git reset --hard %s && git submodule update --init --recursive', escapeshellarg($installDir), escapeshellarg($rev))); -} diff --git a/tests/vendor/vendors_midgard.php b/tests/vendor/vendors_midgard.php deleted file mode 100644 index b84ed14bf..000000000 --- a/tests/vendor/vendors_midgard.php +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env php - Installing/Updating $name\n"; - - $installDir = $vendorDir.'/'.$name; - if (!is_dir($installDir)) { - echo "Cloning $name into $installDir\n"; - system(sprintf('git clone -q %s %s', escapeshellarg($url), escapeshellarg($installDir))); - } - - system(sprintf('cd %s && git fetch -q origin && git reset --hard %s && git submodule update --init --recursive', escapeshellarg($installDir), escapeshellarg($rev))); -}