From 99de44e96f5e7dc35f1ed14fc30cd0d960e80f38 Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Wed, 21 Nov 2012 15:08:31 -0600 Subject: [PATCH 1/7] tighten up dist file --- phpunit.xml.dist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index f67ad2a..268d082 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,9 +1,9 @@ - + - ./tests/ + tests/ From be61012d742d460bdee8efbc4a342291f024610a Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Wed, 21 Nov 2012 15:09:22 -0600 Subject: [PATCH 2/7] add --dev deps --- composer.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index bf92771..d8d76e5 100644 --- a/composer.json +++ b/composer.json @@ -11,5 +11,8 @@ }, "autoload": { "psr-0": {"phpDocumentor": ["src/"]} + }, + "require-dev": { + "phpunit/phpunit": "*@stable" } -} \ No newline at end of file +} From a79e4c174c3aba293f572d3dc3bd3ae8ad4fb47f Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Wed, 21 Nov 2012 15:09:44 -0600 Subject: [PATCH 3/7] initial travis build --- .travis.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..f370557 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,23 @@ +language: php +php: + - 5.3.3 + - 5.3 + - 5.4 + +script: + - php bin/phpunit + +before_script: + - sudo apt-get -qq update > /dev/null + - sudo apt-get -qq install graphviz > /dev/null + - phpenv rehash > /dev/null + - composer selfupdate --quiet + - composer install --dev + - php bin/phpunit + - composer update --dev + +notifications: + irc: "irc.freenode.org#phpdocumentor" + email: + - mike.vanriel@naenius.com + - ashnazg@php.net From 620b932272152e08f955d7989e782c4908e5fd29 Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Wed, 21 Nov 2012 19:05:59 -0600 Subject: [PATCH 4/7] restore color=true --- phpunit.xml.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 268d082..83d0d5f 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,6 +1,6 @@ - + tests/ From f01f8ea41d98f98d50c9a1a886c8bb86bc7bc278 Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Wed, 21 Nov 2012 19:08:28 -0600 Subject: [PATCH 5/7] use phpunit in vendor --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f370557..7ec99ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ php: - 5.4 script: - - php bin/phpunit + - vendor/phpunit/phpunit/composer/bin/phpunit before_script: - sudo apt-get -qq update > /dev/null @@ -13,7 +13,7 @@ before_script: - phpenv rehash > /dev/null - composer selfupdate --quiet - composer install --dev - - php bin/phpunit + - vendor/phpunit/phpunit/composer/bin/phpunit - composer update --dev notifications: From 87ed52257918dd234ade192a4f8eae092c1f8bd0 Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Wed, 21 Nov 2012 19:15:29 -0600 Subject: [PATCH 6/7] graphviz isn't necessary --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7ec99ef..21d288c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,6 @@ script: before_script: - sudo apt-get -qq update > /dev/null - - sudo apt-get -qq install graphviz > /dev/null - phpenv rehash > /dev/null - composer selfupdate --quiet - composer install --dev From 4a9ddd15feab62e86ce97060356e2d5b7a83cce6 Mon Sep 17 00:00:00 2001 From: Chuck Burgess Date: Wed, 21 Nov 2012 19:16:31 -0600 Subject: [PATCH 7/7] restore original --- phpunit.xml.dist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 83d0d5f..f67ad2a 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,9 +1,9 @@ - + - tests/ + ./tests/