Merge branch 'master' of https://github.com/sebastianbergmann/phpunit …

…into 2015-prefix-phar

.github/stale.yml

@@ -0,0 +1,47 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 60
+
+# Number of days of inactivity before a stale Issue or Pull Request is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 7
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - blocked
+  - enhancement
+  - backward-compatibility-break
+  - feature-removal
+  - php-support-removal
+  - process
+  - rfc
+  - refactoring
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Comment to post when marking as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had activity within the last 60 days. It will be closed after 7 days if no further activity occurs. Thank you for your contributions.
+
+# Comment to post when removing the stale label.
+# unmarkComment: >
+#   Your comment here.
+
+# Comment to post when closing a stale Issue or Pull Request.
+closeComment: >
+  This issue has been automatically closed because it has not had activity since it was marked as stale. Thank you for your contributions.
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+# Limit to only `issues` or `pulls`
+only: issues
+

.php_cs.dist

@@ -164,8 +164,6 @@ return PhpCsFixer\Config::create()
         ->files()
         ->in(__DIR__ . '/build')
         ->in(__DIR__ . '/src')
-        ->in(__DIR__ . '/tests/Framework')
-        ->in(__DIR__ . '/tests/Runner')
-        ->in(__DIR__ . '/tests/Util')
-        ->name('*.php')
+        ->in(__DIR__ . '/tests')
+        ->notName('*.phpt')
     );

ChangeLog-6.5.md

@@ -2,7 +2,7 @@
 
 All notable changes of the PHPUnit 6.5 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
-## [6.5.8] - 2018-MM-DD
+## [6.5.8] - 2018-04-10
 
 ### Fixed
 

ChangeLog-7.1.md

@@ -2,13 +2,25 @@
 
 All notable changes of the PHPUnit 7.1 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
-## [7.1.2] - 2018-MM-DD
+## [7.1.4] - 2018-04-18
+
+### Fixed
+
+* Fixed [#3034](https://github.com/sebastianbergmann/phpunit/pull/3034): `$this->getStatus()` returns `STATUS_PASSED` in `tearDown()` after unexpected exception
+
+## [7.1.3] - 2018-04-13
+
+### Fixed
+
+* Fixed [#3094](https://github.com/sebastianbergmann/phpunit/issues/3094): Faulty dependency constraint affecting `getObjectForTrait()` (failure using `--prefer-lowest`)
+
+## [7.1.2] - 2018-04-10
 
 ### Fixed
 
 * Fixed [#2830](https://github.com/sebastianbergmann/phpunit/issues/2830): `@runClassInSeparateProcess` does not work for tests that use `@dataProvider`
 * Fixed [#3059](https://github.com/sebastianbergmann/phpunit/pull/3059): `StringMatchesFormatDescription` constraint fails when matching multiline with `\r\n`
-* Fixed [#3083](https://github.com/sebastianbergmann/phpunit/pull/3083): `@runClassInSeparateProcess` and `@dataProvider` cannot be used together
+* Fixed [#3087](https://github.com/sebastianbergmann/phpunit/pull/3087): `TestCase::getTestResultObject()` can return `null`
 
 ## [7.1.1] - 2018-04-06
 
@@ -28,6 +40,8 @@ All notable changes of the PHPUnit 7.1 release series are documented in this fil
 * `PHPUnit\Framework\Assert` is no longer searched for test methods
 * `ReflectionMethod::invokeArgs()` is no longer used to invoke test methods
 
+[7.1.4]: https://github.com/sebastianbergmann/phpunit/compare/7.1.3...7.1.4
+[7.1.3]: https://github.com/sebastianbergmann/phpunit/compare/7.1.2...7.1.3
 [7.1.2]: https://github.com/sebastianbergmann/phpunit/compare/7.1.1...7.1.2
 [7.1.1]: https://github.com/sebastianbergmann/phpunit/compare/7.1.0...7.1.1
 [7.1.0]: https://github.com/sebastianbergmann/phpunit/compare/7.0...7.1.0

ChangeLog-7.2.md

@@ -6,6 +6,7 @@ All notable changes of the PHPUnit 7.2 release series are documented in this fil
 
 ### Added
 
+* Implemented [#3042](https://github.com/sebastianbergmann/phpunit/pull/3042): Add `TestCase::expectNotToPerformAssertions()` method as alternative to `@doesNotPerformAssertions` annotation
 * Implemented [#3064](https://github.com/sebastianbergmann/phpunit/issues/3064): Mark tests as risky when they claim not to perform assertions but do
 * Implemented [#3066](https://github.com/sebastianbergmann/phpunit/issues/3066): Validate XML configuration against XSD
 * Implemented [#3076](https://github.com/sebastianbergmann/phpunit/issues/3076): Extensions can be configured via PHPUnit's XML configuration

build.xml

@@ -125,6 +125,8 @@
     <target name="-phar-prepare" depends="clean,install-dependencies">
         <mkdir dir="${basedir}/build/phar"/>
 
+        <copy file="${basedir}/phpunit.xsd" tofile="${basedir}/build/phar/phpunit.xsd"/>
+
         <exec executable="${basedir}/build/phar-manifest.php" output="${basedir}/build/phar/manifest.txt"/>
 
         <copy file="${basedir}/vendor/phpunit/php-code-coverage/LICENSE" tofile="${basedir}/build/phar/php-code-coverage/LICENSE"/>

composer.json

@@ -35,8 +35,8 @@
         "phpunit/php-file-iterator": "^1.4.3",
         "phpunit/php-text-template": "^1.2.1",
         "phpunit/php-timer": "^2.0",
-        "phpunit/phpunit-mock-objects": "^6.1",
-        "sebastian/comparator": "^2.1",
+        "phpunit/phpunit-mock-objects": "^6.1.1",
+        "sebastian/comparator": "^2.1 || ^3.0",
         "sebastian/diff": "^3.0",
         "sebastian/environment": "^3.1",
         "sebastian/exporter": "^3.1",

phpunit.xsd

@@ -2,7 +2,7 @@
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:annotation>
     <xs:documentation source="https://phpunit.de/documentation.html">
-      This Schema file defines the rules by which the XML configuration file of PHPUnit 7.0 may be structured.
+      This Schema file defines the rules by which the XML configuration file of PHPUnit 7.2 may be structured.
     </xs:documentation>
     <xs:appinfo source="https://phpunit.de/documentation.html"/>
   </xs:annotation>

src/Framework/ExceptionWrapper.php

@@ -75,12 +75,12 @@ public function getPreviousWrapped(): ?self
     /**
      * @param string $className
      */
-    public function setClassName(string $className)
+    public function setClassName(string $className): void
     {
         $this->className = $className;
     }
 
-    public function setOriginalException(\Throwable $t)
+    public function setOriginalException(\Throwable $t): void
     {
         $this->originalException($t);