Merge branch 'hotfix-1.1.5' into stable

CHANGELOG.md

@@ -1,7 +1,14 @@
-ChangeLog
-=========
+Change log
+==========
 
 
+## Version 1.1.5 (2013-07-03)
+
+Doc:
+
+  - [#2](https://github.com/geoffroy-aubry/ErrorHandler/issues/2): Add continuous integration section in `README.md`.
+  - [#1](https://github.com/geoffroy-aubry/ErrorHandler/issues/1): Add badge poser in `README.md`.
+
 ## Version 1.1.4 (2013-06-13)
 
 Doc:

README.md

@@ -1,4 +1,6 @@
 # ErrorHandler
+
+[![Latest stable version](https://poser.pugx.org/geoffroy-aubry/ErrorHandler/v/stable.png "Latest stable version")](https://packagist.org/packages/geoffroy-aubry/ErrorHandler)
 [![Build Status](https://secure.travis-ci.org/geoffroy-aubry/ErrorHandler.png?branch=stable)](http://travis-ci.org/geoffroy-aubry/ErrorHandler)
 [![Coverage Status](https://coveralls.io/repos/geoffroy-aubry/ErrorHandler/badge.png?branch=stable)](https://coveralls.io/r/geoffroy-aubry/ErrorHandler)
 
@@ -63,16 +65,33 @@ $ php vendor/bin/apigen.php -c apigen.neon
 Licensed under the GNU Lesser General Public License v3 (LGPL version 3).
 See [LICENSE](LICENSE) file for details.
 
-## ChangeLog
+## Change log
 See [CHANGELOG](CHANGELOG.md) file for details.
 
-## Running tests
-To run the test suite, simply:
+## Continuous integration
 
-```bash
-$ cp phpunit-dist.php phpunit.php    # and adapt, if necessary
-$ phpunit -c phpunit.xml
-```
+[![Build Status](https://secure.travis-ci.org/geoffroy-aubry/ErrorHandler.png?branch=stable)](http://travis-ci.org/geoffroy-aubry/ErrorHandler)
+[![Coverage Status](https://coveralls.io/repos/geoffroy-aubry/ErrorHandler/badge.png?branch=stable)](https://coveralls.io/r/geoffroy-aubry/ErrorHandler)
+
+Following commands are executed during each build and must report neither errors nor warnings:
+
+ * Unit tests with [PHPUnit](https://github.com/sebastianbergmann/phpunit/):
+
+    ```bash
+    $ php vendor/bin/phpunit --configuration phpunit.xml
+    ```
+
+ *  Coding standards with [PHP CodeSniffer](http://pear.php.net/package/PHP_CodeSniffer):
+
+    ```bash
+    $ php vendor/bin/phpcs --standard=PSR2 src/ tests/ -v
+    ```
+
+ *  Code quality with [PHP Mess Detector](http://phpmd.org/):
+
+    ```bash
+    $ php vendor/bin/phpmd src/ text codesize,design,unusedcode,naming,controversial
+    ```
 
 ## Git branching model
 The git branching model used for development is the one described and assisted by `twgit` tool: [https://github.com/Twenga/twgit](https://github.com/Twenga/twgit).