Merge branch '8.2'

ChangeLog-8.2.md

@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 8.2 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [8.2.2] - 2019-06-15
+
+### Changed
+
+* Scoped PHAR built with newer version of PHP-Scoper
+
 ## [8.2.1] - 2019-06-07
 
 ### Fixed
@@ -25,6 +31,7 @@ All notable changes of the PHPUnit 8.2 release series are documented in this fil
 
 * Fixed [#3602](https://github.com/sebastianbergmann/phpunit/issues/3602): PHPUnit silently ignores the return value on a `void` method of test double
 
+[8.2.2]: https://github.com/sebastianbergmann/phpunit/compare/8.2.1...8.2.2
 [8.2.1]: https://github.com/sebastianbergmann/phpunit/compare/8.2.0...8.2.1
 [8.2.0]: https://github.com/sebastianbergmann/phpunit/compare/8.1.6...8.2.0
 

build/scoper.inc.php

@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 /*
  * This file is part of PHPUnit.
  *
@@ -8,14 +7,13 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-$whitelistClasses = [
-    'PHPUnit\*',
-    'SebastianBergmann\CodeCoverage\*',
-    'PharIo\*',
-    'PHP_Token*',
-    'Prophecy\*',
-];
 
 return [
-    'whitelist' => $whitelistClasses,
+    'whitelist' => [
+        'PHPUnit\*',
+        'SebastianBergmann\CodeCoverage\*',
+        'PharIo\*',
+        'PHP_Token*',
+        'Prophecy\*',
+    ],
 ];

composer.json

@@ -32,7 +32,7 @@
         "myclabs/deep-copy": "^1.9.1",
         "phar-io/manifest": "^1.0.3",
         "phar-io/version": "^2.0.1",
-        "phpspec/prophecy": "^1.8.0",
+        "phpspec/prophecy": "^1.8.1",
         "phpunit/php-code-coverage": "^7.0.5",
         "phpunit/php-file-iterator": "^2.0.2",
         "phpunit/php-text-template": "^1.2.1",