Merge branch 'release/1.1.12'

.travis.yml

@@ -0,0 +1,41 @@
+language: php
+
+php:
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
+  - hhvm
+  - nightly
+
+matrix:
+  allow_failures:
+    - php: 7.0
+    - php: hhvm
+    - php: nightly
+
+before_script:
+  - composer self-update
+  - flags=""
+  - if [ `phpenv version-name` == "5.3" ]; then flags="--ignore-platform-reqs"; fi
+  - composer -n install --no-interaction $flags
+  - composer require satooshi/php-coveralls:dev-master --no-interaction $flags
+
+script:
+  - make qa_all
+  - make report
+
+after_success:
+  - cat ./target/report/phploc.txt
+  - cat ./target/report/phpcompatinfo.txt
+
+after_failure:
+  - cat ./target/logs/junit.xml
+  - cat ./target/report/phpcpd.txt
+
+after_script:
+ - "echo 'src_dir: src' > .coveralls.yml"
+ - "echo 'coverage_clover: target/coverage/coverage.xml' >> .coveralls.yml"
+ - "echo 'json_path: target/coverage/coveralls-upload.json' >> .coveralls.yml"
+ - php vendor/bin/coveralls -v

README.md

@@ -7,7 +7,14 @@
 * **author**      Nicola Asuni <info@tecnick.com>
 * **copyright**   2015-2015 Nicola Asuni - Tecnick.com LTD
 * **license**     http://www.gnu.org/copyleft/lesser.html GNU-LGPL v3 (see LICENSE.TXT)
-* **link **       https://github.com/tecnickcom/tc-lib-file
+* **link**       https://github.com/tecnickcom/tc-lib-file
+
+## Status
+* **MASTER**: [![Build Status](https://secure.travis-ci.org/tecnickcom/tc-lib-file.png?branch=master)](https://travis-ci.org/tecnickcom/tc-lib-file?branch=master)
+[![Coverage Status](https://coveralls.io/repos/tecnickcom/tc-lib-file/badge.svg?branch=master&service=github)](https://coveralls.io/github/tecnickcom/tc-lib-file?branch=master)
+* **DEVELOP**: [![Build Status](https://secure.travis-ci.org/tecnickcom/tc-lib-file.png?branch=develop)](https://travis-ci.org/tecnickcom/tc-lib-file?branch=develop)
+[![Coverage Status](https://coveralls.io/repos/tecnickcom/tc-lib-file/badge.svg?branch=develop&service=github)](https://coveralls.io/github/tecnickcom/tc-lib-file?branch=develop)
+
 
 ## Description
 

VERSION

@@ -1 +1 @@
-1.1.11
+1.1.12

phpunit.xml.dist

@@ -22,6 +22,7 @@
 	</filter>
 	<logging>
 		<log type="coverage-html" target="target/coverage" charset="UTF-8"/>
+		<log type="coverage-clover" target="target/coverage/coverage.xml" charset="UTF-8"/>
 		<log type="junit" target="target/logs/junit.xml" logIncompleteSkipped="false"/>
 	</logging>
 </phpunit>