diff options
| author | Fabio Bas <ctrlaltca@gmail.com> | 2013-09-20 16:52:03 +0200 |
|---|---|---|
| committer | Fabio Bas <ctrlaltca@gmail.com> | 2013-09-20 16:52:03 +0200 |
| commit | 5dea687c29b89d792e9653d6e5f3c64cddb26b04 (patch) | |
| tree | e6201ff8895dd609fe0625289e13944b3eb3614a | |
| parent | 3fdbb2cbfe778fcf48c61bb9fe40d4ac85f8004f (diff) | |
Enable travis for php 5.3, 5.4, 5.5; enabled coveralls
| -rw-r--r-- | .coveralls.yml | 4 | ||||
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | build.xml | 15 | ||||
| -rw-r--r-- | composer.json | 1 | ||||
| -rw-r--r-- | composer.lock | 18 |
5 files changed, 32 insertions, 12 deletions
diff --git a/.coveralls.yml b/.coveralls.yml new file mode 100644 index 00000000..4d06f5f8 --- /dev/null +++ b/.coveralls.yml @@ -0,0 +1,4 @@ +service_name: travis-ci +src_dir: framework/ +coverage_clover: build/test-reports/clover.xml +json_path: build/test-reports/coveralls.json diff --git a/.travis.yml b/.travis.yml index 144442d4..1532598c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,8 @@ language: php php: - 5.3 + - 5.4 + - 5.5 before_script: - composer self-update @@ -11,5 +13,5 @@ before_script: script: - ./bin/phing test -#after_script: - #- php ./bin/coveralls -v
\ No newline at end of file +after_script: + - php ./bin/coveralls -v
\ No newline at end of file @@ -45,6 +45,15 @@ </fileset> <!-- + Only php source files in framework + --> + <fileset dir="." id="framework-php"> + <exclude name="**/pradolite.php"/> + <exclude name="**/prado-cli.php"/> + <include name="framework/**/*.php"/> + </fileset> + + <!-- Surrounding files --> <fileset dir="." id="misc"> @@ -255,13 +264,17 @@ <target name="test" description="Running unit tests"> <delete dir="${build.test.dir}"/> <mkdir dir="${build.test.dir}"/> - <phpunit codecoverage="false" haltonfailure="false" haltonerror="false" printsummary="true" bootstrap="./tests/unit/bootstrap.php"> + <coverage-setup database="${build.test.dir}/coverage.db"> + <fileset refid="framework-php" /> + </coverage-setup> + <phpunit codecoverage="true" haltonfailure="false" haltonerror="false" printsummary="false" bootstrap="./tests/unit/bootstrap.php"> <batchtest> <fileset dir="tests/unit"> <include name="**/*Test.php"/> </fileset> </batchtest> <formatter type="xml" todir="${build.test.dir}" outfile="unit-tests.xml"/> + <formatter type="clover" todir="${build.test.dir}" outfile="clover.xml"/> </phpunit> <phpunitreporttask infile="${build.test.dir}/unit-tests.xml" format="frames" todir="${build.test.dir}"/> </target> diff --git a/composer.json b/composer.json index 481e52a1..81573d01 100644 --- a/composer.json +++ b/composer.json @@ -36,6 +36,7 @@ "ext-spl": "*" }, "require-dev" : { + "ext-xdebug": "*", "phpunit/phpunit" : "3.7.*", "phpunit/dbunit": ">=1.2", "phpunit/phpunit-selenium": ">=1.2", diff --git a/composer.lock b/composer.lock index 086e5c94..4a907065 100644 --- a/composer.lock +++ b/composer.lock @@ -3,7 +3,7 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "eb691c1d28ed1a4df80b55b78c0bf9f8", + "hash": "5d13e6a7e5d1c16086fabc64d066f227", "packages": [ ], @@ -788,16 +788,16 @@ }, { "name": "phpunit/phpunit", - "version": "3.7.26", + "version": "3.7.27", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "551d18555488f385aea9dfb33f2ba3fe6f3050f8" + "reference": "4b024e753e3421837afbcca962c8724c58b39376" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/551d18555488f385aea9dfb33f2ba3fe6f3050f8", - "reference": "551d18555488f385aea9dfb33f2ba3fe6f3050f8", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4b024e753e3421837afbcca962c8724c58b39376", + "reference": "4b024e753e3421837afbcca962c8724c58b39376", "shasum": "" }, "require": { @@ -858,7 +858,7 @@ "testing", "xunit" ], - "time": "2013-09-13 05:00:10" + "time": "2013-09-16 03:09:52" }, { "name": "phpunit/phpunit-mock-objects", @@ -1431,7 +1431,7 @@ "ext-pcre": "*", "ext-spl": "*" }, - "platform-dev": [ - - ] + "platform-dev": { + "ext-xdebug": "*" + } } |