sebastianbergmann · Aug 30, 2015 · Aug 30, 2015 · Aug 30, 2015 · Aug 31, 2015 · Aug 31, 2015
diff --git a/.php_cs b/.php_cs
@@ -0,0 +1,44 @@
+<?php
+$finder = Symfony\CS\Finder\DefaultFinder::create()
+    ->files()
+    ->in('build')
+    ->in('src')
+    ->in('tests')
+    ->name('*.php')
+    ->name('*.phpt');
+
+return Symfony\CS\Config\Config::create()
+    ->level(\Symfony\CS\FixerInterface::NONE_LEVEL)
+    ->fixers(
+        array(
+            'duplicate_semicolon',
+            'empty_return',
+            'extra_empty_lines',
+            'join_function',
+            'list_commas',
+            'no_blank_lines_after_class_opening',
+            'no_empty_lines_after_phpdocs',
+            'phpdoc_indent',
+            'phpdoc_no_access',
+            'phpdoc_no_empty_return',
+            'phpdoc_no_package',
+            'phpdoc_params',
+            'phpdoc_scalar',
+            'phpdoc_to_comment',
+            'phpdoc_trim',
+            'return',
+            'self_accessor',
+            'single_quote',
+            'spaces_before_semicolon',
+            'spaces_cast',
+            'ternary_spaces',
+            'trim_array_spaces',
+            'unused_use',
+            'whitespacy_lines',
+            'align_double_arrow',
+            'align_equals',
+            'concat_with_spaces'
+        )
+    )
+    ->finder($finder);
+
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,31 +1,57 @@
 # Contributing to PHPUnit
 
+## Contributor Code of Conduct
+
 Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.
 
+## Workflow
+
 * Fork the project.
 * Make your bug fix or feature addition.
 * Add tests for it. This is important so we don't break it in a future version unintentionally.
 * Send a pull request. Bonus points for topic branches.
 
+Please make sure that you have [set up your user name and email address](http://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup) for use with Git. Strings such as `silly nick name <root@localhost>` look really stupid in the commit history of a project.
+
 Pull requests for bug fixes must be based on the current stable branch whereas pull requests for new features must be based on `master`.
 
 We are trying to keep backwards compatibility breaks in PHPUnit to an absolute minimum. Please take this into account when proposing changes.
 
 Due to time constraints, we are not always able to respond as quickly as we would like. Please do not take delays personal and feel free to remind us if you feel that we forgot to respond.
 
+## Coding Guidelines
+
+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
+```
+
 ## Using PHPUnit from a Git checkout
 
 The following commands can be used to perform the initial checkout of PHPUnit:
 
-    git clone git://github.com/sebastianbergmann/phpunit.git
-    cd phpunit
+```bash
+$ git clone git://github.com/sebastianbergmann/phpunit.git
+
+$ cd phpunit
+```
 
 Retrieve PHPUnit's dependencies using [Composer](http://getcomposer.org/):
 
-    wget http://getcomposer.org/composer.phar
-    php composer.phar install
+```bash
+$ wget http://getcomposer.org/composer.phar
+
+$ php composer.phar install
+```
+
+The `phpunit` script can be used to invoke the PHPUnit test runner:
 
-The `phpunit` script can be used to invoke the PHPUnit test runner.
+```bash
+$ ./phpunit --version
+```
 
 ## Reporting issues
 

diff --git a/ChangeLog-4.8.md b/ChangeLog-4.8.md
@@ -2,6 +2,10 @@
 
 All notable changes of the PHPUnit 4.8 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [4.8.7] - 2015-09-14
+
+New PHAR release due to updated dependencies
+
 ## [4.8.6] - 2015-08-24
 
 ### Fixed
@@ -53,6 +57,7 @@ All notable changes of the PHPUnit 4.8 release series are documented in this fil
 * Made the argument check of `assertContains()` and `assertNotContains()` more strict to prevent undefined behavior such as [#1808](https://github.com/sebastianbergmann/phpunit/issues/1808)
 * Changed the name of the default group from `__nogroup__` to `default`
 
+[4.8.7]: https://github.com/sebastianbergmann/phpunit/compare/4.8.6...4.8.7
 [4.8.6]: https://github.com/sebastianbergmann/phpunit/compare/4.8.5...4.8.6
 [4.8.5]: https://github.com/sebastianbergmann/phpunit/compare/4.8.4...4.8.5
 [4.8.4]: https://github.com/sebastianbergmann/phpunit/compare/4.8.3...4.8.4

diff --git a/README.md b/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/4.8.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.3.3-8892BF.svg?style=flat-square)](https://php.net/)
+[![Build Status](https://img.shields.io/travis/sebastianbergmann/phpunit/4.8.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
 

diff --git a/src/Runner/Version.php b/src/Runner/Version.php
@@ -30,7 +30,7 @@ public static function id()
         }
 
         if (self::$version === null) {
-            $version       = new SebastianBergmann\Version('4.8.6', dirname(dirname(__DIR__)));
+            $version       = new SebastianBergmann\Version('4.8.7', dirname(dirname(__DIR__)));
             self::$version = $version->getVersion();
         }
 

diff --git a/src/Util/Blacklist.php b/src/Util/Blacklist.php
@@ -28,7 +28,6 @@ class PHPUnit_Util_Blacklist
         'PHPUnit_Extensions_Database_TestCase'       => 2,
         'PHPUnit_Framework_MockObject_Generator'     => 2,
         'PHPUnit_Extensions_SeleniumTestCase'        => 2,
-        'PHPUnit_Extensions_Story_TestCase'          => 2,
         'Text_Template'                              => 1,
         'Symfony\Component\Yaml\Yaml'                => 1,
         'SebastianBergmann\Diff\Diff'                => 1,

diff --git a/tests/Regression/1021.phpt b/tests/Regression/1021.phpt
@@ -4,7 +4,7 @@
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue1021Test';
-$_SERVER['argv'][3] = dirname(__FILE__).'/1021/Issue1021Test.php';
+$_SERVER['argv'][3] = dirname(__FILE__) . '/1021/Issue1021Test.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();

diff --git a/tests/Regression/523.phpt b/tests/Regression/523.phpt
@@ -4,7 +4,7 @@
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue523Test';
-$_SERVER['argv'][3] = dirname(__FILE__).'/523/Issue523Test.php';
+$_SERVER['argv'][3] = dirname(__FILE__) . '/523/Issue523Test.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();

diff --git a/tests/Regression/578.phpt b/tests/Regression/578.phpt
@@ -4,7 +4,7 @@
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue578Test';
-$_SERVER['argv'][3] = dirname(__FILE__).'/578/Issue578Test.php';
+$_SERVER['argv'][3] = dirname(__FILE__) . '/578/Issue578Test.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();

diff --git a/tests/Regression/684.phpt b/tests/Regression/684.phpt
@@ -4,7 +4,7 @@
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue684Test';
-$_SERVER['argv'][3] = dirname(__FILE__).'/684/Issue684Test.php';
+$_SERVER['argv'][3] = dirname(__FILE__) . '/684/Issue684Test.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();

diff --git a/tests/Regression/783.phpt b/tests/Regression/783.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--group';
 $_SERVER['argv'][3] = 'foo,bar';
 $_SERVER['argv'][4] = 'ParentSuite';
-$_SERVER['argv'][5] = dirname(__FILE__).'/783/ParentSuite.php';
+$_SERVER['argv'][5] = dirname(__FILE__) . '/783/ParentSuite.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();

diff --git a/tests/Regression/GitHub/1149.phpt b/tests/Regression/GitHub/1149.phpt
@@ -5,7 +5,7 @@ GH-1149: Test swallows output buffer when run in a separate process
 
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue1149Test';
-$_SERVER['argv'][3] = dirname(__FILE__).'/1149/Issue1149Test.php';
+$_SERVER['argv'][3] = dirname(__FILE__) . '/1149/Issue1149Test.php';
 
 require __DIR__ . '/../../bootstrap.php';
 PHPUnit_TextUI_Command::main();

diff --git a/tests/Regression/GitHub/1216.phpt b/tests/Regression/GitHub/1216.phpt
@@ -4,10 +4,10 @@ GH-1216: PHPUnit bootstrap must take globals vars even when the file is specifie
 <?php
 
 $_SERVER['argv'][1] = '--configuration';
-$_SERVER['argv'][2] = dirname(__FILE__).'/1216/phpunit1216.xml';
+$_SERVER['argv'][2] = dirname(__FILE__) . '/1216/phpunit1216.xml';
 $_SERVER['argv'][3] = '--debug';
 $_SERVER['argv'][4] = '--bootstrap';
-$_SERVER['argv'][5] = dirname(__FILE__).'/1216/bootstrap1216.php';
+$_SERVER['argv'][5] = dirname(__FILE__) . '/1216/bootstrap1216.php';
 $_SERVER['argv'][6] = dirname(__FILE__) . '/1216/Issue1216Test.php';
 
 require __DIR__ . '/../../bootstrap.php';

diff --git a/tests/Regression/GitHub/1265.phpt b/tests/Regression/GitHub/1265.phpt
@@ -4,9 +4,9 @@ GH-1265: Could not use "PHPUnit_Runner_StandardTestSuiteLoader" as loader
 <?php
 
 $_SERVER['argv'][1] = '--configuration';
-$_SERVER['argv'][2] = dirname(__FILE__).'/1265/phpunit1265.xml';
+$_SERVER['argv'][2] = dirname(__FILE__) . '/1265/phpunit1265.xml';
 $_SERVER['argv'][3] = 'Issue1265Test';
-$_SERVER['argv'][4] = dirname(__FILE__).'/1265/Issue1265Test.php';
+$_SERVER['argv'][4] = dirname(__FILE__) . '/1265/Issue1265Test.php';
 
 require __DIR__ . '/../../bootstrap.php';
 PHPUnit_TextUI_Command::main();

diff --git a/tests/Regression/GitHub/1330.phpt b/tests/Regression/GitHub/1330.phpt
@@ -5,9 +5,9 @@ GH-1330: Allow non-ambiguous shortened longopts
 
 $_SERVER['argv'][1] = '--deb';
 $_SERVER['argv'][2] = '--config';
-$_SERVER['argv'][3] = dirname(__FILE__).'/1330/phpunit1330.xml';
+$_SERVER['argv'][3] = dirname(__FILE__) . '/1330/phpunit1330.xml';
 $_SERVER['argv'][4] = 'Issue1330Test';
-$_SERVER['argv'][5] = dirname(__FILE__).'/1330/Issue1330Test.php';
+$_SERVER['argv'][5] = dirname(__FILE__) . '/1330/Issue1330Test.php';
 
 require __DIR__ . '/../../bootstrap.php';
 PHPUnit_TextUI_Command::main();

diff --git a/tests/Regression/GitHub/1335.phpt b/tests/Regression/GitHub/1335.phpt
@@ -5,8 +5,8 @@ GH-1335: exportVariable multiple backslash problem
 
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--bootstrap';
-$_SERVER['argv'][3] = dirname(__FILE__).'/1335/bootstrap1335.php';
-$_SERVER['argv'][4] = dirname(__FILE__).'/1335/Issue1335Test.php';
+$_SERVER['argv'][3] = dirname(__FILE__) . '/1335/bootstrap1335.php';
+$_SERVER['argv'][4] = dirname(__FILE__) . '/1335/Issue1335Test.php';
 
 require __DIR__ . '/../../bootstrap.php';
 PHPUnit_TextUI_Command::main();

diff --git a/tests/Regression/GitHub/1337.phpt b/tests/Regression/GitHub/1337.phpt
@@ -6,7 +6,7 @@ GH-1337: Data Provider with \ at the end of the name breaks with process isolati
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--process-isolation';
 $_SERVER['argv'][3] = 'Issue1337Test';
-$_SERVER['argv'][4] = dirname(__FILE__).'/1337/Issue1337Test.php';
+$_SERVER['argv'][4] = dirname(__FILE__) . '/1337/Issue1337Test.php';
 
 require __DIR__ . '/../../bootstrap.php';
 PHPUnit_TextUI_Command::main();

diff --git a/tests/Regression/GitHub/1348.phpt b/tests/Regression/GitHub/1348.phpt
@@ -3,16 +3,16 @@ GH-1348: STDOUT/STDERR IO streams should exist in process isolation
 --SKIPIF--
 <?php
 if (defined('HHVM_VERSION'))
-    print "skip: PHP runtime required";
+    print 'skip: PHP runtime required';
 ?>
 --FILE--
 <?php
 
 $_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][] = '--report-useless-tests';
-$_SERVER['argv'][] = '--process-isolation';
-$_SERVER['argv'][] = 'Issue1348Test';
-$_SERVER['argv'][] = __DIR__ . '/1348/Issue1348Test.php';
+$_SERVER['argv'][]  = '--report-useless-tests';
+$_SERVER['argv'][]  = '--process-isolation';
+$_SERVER['argv'][]  = 'Issue1348Test';
+$_SERVER['argv'][]  = __DIR__ . '/1348/Issue1348Test.php';
 
 require __DIR__ . '/../../bootstrap.php';
 PHPUnit_TextUI_Command::main();

diff --git a/tests/Regression/GitHub/1374.phpt b/tests/Regression/GitHub/1374.phpt
@@ -5,7 +5,7 @@ GH-1374: tearDown() is called despite unmet requirements
 
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue1374Test';
-$_SERVER['argv'][3] = dirname(__FILE__).'/1374/Issue1374Test.php';
+$_SERVER['argv'][3] = dirname(__FILE__) . '/1374/Issue1374Test.php';
 
 require __DIR__ . '/../../bootstrap.php';
 PHPUnit_TextUI_Command::main();

diff --git a/tests/Regression/GitHub/1437.phpt b/tests/Regression/GitHub/1437.phpt
@@ -5,7 +5,7 @@ GH-1437: Risky test messages mask failures
 
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue1437Test';
-$_SERVER['argv'][3] = dirname(__FILE__).'/1437/Issue1437Test.php';
+$_SERVER['argv'][3] = dirname(__FILE__) . '/1437/Issue1437Test.php';
 
 require __DIR__ . '/../../bootstrap.php';
 PHPUnit_TextUI_Command::main();

diff --git a/tests/Regression/GitHub/244.phpt b/tests/Regression/GitHub/244.phpt
@@ -5,7 +5,7 @@ GH-244: Expected Exception should support string codes
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--process-isolation';
 $_SERVER['argv'][3] = 'Issue244Test';
-$_SERVER['argv'][4] = dirname(__FILE__).'/244/Issue244Test.php';
+$_SERVER['argv'][4] = dirname(__FILE__) . '/244/Issue244Test.php';
 
 require __DIR__ . '/../../bootstrap.php';
 PHPUnit_TextUI_Command::main();

diff --git a/tests/Regression/GitHub/322.phpt b/tests/Regression/GitHub/322.phpt
@@ -4,12 +4,12 @@ GH-322: group commandline option should override group/exclude setting in phpuni
 <?php
 
 $_SERVER['argv'][1] = '--configuration';
-$_SERVER['argv'][2] = dirname(__FILE__).'/322/phpunit322.xml';
+$_SERVER['argv'][2] = dirname(__FILE__) . '/322/phpunit322.xml';
 $_SERVER['argv'][3] = '--debug';
 $_SERVER['argv'][4] = '--group';
 $_SERVER['argv'][5] = 'one';
 $_SERVER['argv'][6] = 'Issue322Test';
-$_SERVER['argv'][7] = dirname(__FILE__).'/322/Issue322Test.php';
+$_SERVER['argv'][7] = dirname(__FILE__) . '/322/Issue322Test.php';
 
 require __DIR__ . '/../../bootstrap.php';
 PHPUnit_TextUI_Command::main();

diff --git a/tests/Regression/GitHub/433.phpt b/tests/Regression/GitHub/433.phpt
@@ -5,7 +5,7 @@ GH-433: expectOutputString not completely working as expected
 
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue433Test';
-$_SERVER['argv'][3] = dirname(__FILE__).'/433/Issue433Test.php';
+$_SERVER['argv'][3] = dirname(__FILE__) . '/433/Issue433Test.php';
 
 require __DIR__ . '/../../bootstrap.php';
 PHPUnit_TextUI_Command::main();

diff --git a/tests/Regression/GitHub/445.phpt b/tests/Regression/GitHub/445.phpt
@@ -6,7 +6,7 @@ GH-455: expectOutputString not working in strict mode
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--disallow-test-output';
 $_SERVER['argv'][3] = 'Issue445Test';
-$_SERVER['argv'][4] = dirname(__FILE__).'/445/Issue445Test.php';
+$_SERVER['argv'][4] = dirname(__FILE__) . '/445/Issue445Test.php';
 
 require __DIR__ . '/../../bootstrap.php';
 PHPUnit_TextUI_Command::main();

diff --git a/tests/Regression/GitHub/498.phpt b/tests/Regression/GitHub/498.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--group';
 $_SERVER['argv'][3] = 'trueOnly';
 $_SERVER['argv'][4] = 'Issue498Test';
-$_SERVER['argv'][5] = dirname(__FILE__).'/498/Issue498Test.php';
+$_SERVER['argv'][5] = dirname(__FILE__) . '/498/Issue498Test.php';
 
 require __DIR__ . '/../../bootstrap.php';
 PHPUnit_TextUI_Command::main();

diff --git a/tests/Regression/GitHub/503.phpt b/tests/Regression/GitHub/503.phpt
@@ -5,7 +5,7 @@ GH-503: assertEquals() Line Ending Differences Are Obscure
 
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue503Test';
-$_SERVER['argv'][3] = dirname(__FILE__).'/503/Issue503Test.php';
+$_SERVER['argv'][3] = dirname(__FILE__) . '/503/Issue503Test.php';
 
 require __DIR__ . '/../../bootstrap.php';
 PHPUnit_TextUI_Command::main();