Merge branch '4.8' into 5.0

CONTRIBUTING.md

@@ -21,7 +21,7 @@ Due to time constraints, we are not always able to respond as quickly as we woul
 
 This project comes with a configuration file for [php-cs-fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer) (`.php_cs`) that you can use to (re)format your sourcecode for compliance with this project's coding guidelines:
 
-```
+```bash
 $ wget http://get.sensiolabs.org/php-cs-fixer.phar
 
 $ php php-cs-fixer.phar fix
@@ -31,23 +31,23 @@ $ php php-cs-fixer.phar fix
 
 The following commands can be used to perform the initial checkout of PHPUnit:
 
-```
+```bash
 $ git clone git://github.com/sebastianbergmann/phpunit.git
 
 $ cd phpunit
 ```
 
 Retrieve PHPUnit's dependencies using [Composer](http://getcomposer.org/):
 
-```
+```bash
 $ wget http://getcomposer.org/composer.phar
 
 $ php composer.phar install
 ```
 
 The `phpunit` script can be used to invoke the PHPUnit test runner:
 
-```
+```bash
 $ ./phpunit --version
 ```
 

README.md

@@ -2,23 +2,31 @@
 
 PHPUnit is a programmer-oriented testing framework for PHP. It is an instance of the xUnit architecture for unit testing frameworks.
 
-[![Build Status](https://img.shields.io/travis/sebastianbergmann/phpunit/5.0.svg?style=flat-square)](https://travis-ci.org/sebastianbergmann/phpunit)
 [![Latest Stable Version](https://img.shields.io/packagist/v/phpunit/phpunit.svg?style=flat-square)](https://packagist.org/packages/phpunit/phpunit)
+[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%205.6-8892BF.svg?style=flat-square)](https://php.net/)
+[![Build Status](https://img.shields.io/travis/sebastianbergmann/phpunit/5.0.svg?style=flat-square)](https://travis-ci.org/sebastianbergmann/phpunit)
 
 ## Installation
 
-We distribute a [PHP Archive (PHAR)](http://php.net/phar) that has all required (as well as some optional) dependencies of PHPUnit bundled in a single file:
+We distribute a [PHP Archive (PHAR)](https://php.net/phar) that has all required (as well as some optional) dependencies of PHPUnit bundled in a single file:
+
+```bash
+$ wget https://phar.phpunit.de/phpunit.phar
 
-    wget https://phar.phpunit.de/phpunit.phar
-    chmod +x phpunit.phar
-    mv phpunit.phar /usr/local/bin/phpunit
+$ chmod +x phpunit.phar
+
+$ mv phpunit.phar /usr/local/bin/phpunit
+```
 
 You can also immediately use the PHAR after you have downloaded it, of course:
 
-    wget https://phar.phpunit.de/phpunit.phar
-    php phpunit.phar
+```bash
+$ wget https://phar.phpunit.de/phpunit.phar
+
+$ php phpunit.phar
+```
 
-Alternatively, you may use [Composer](http://getcomposer.org/) to download and install PHPUnit as well as its dependencies. Please refer to the [documentation](https://phpunit.de/documentation.html) for details on how to do this.
+Alternatively, you may use [Composer](https://getcomposer.org/) to download and install PHPUnit as well as its dependencies. Please refer to the [documentation](https://phpunit.de/documentation.html) for details on how to do this.
 
 ## Contribute