From 41c9fdec9b64b8412fce955a7cfab650f77bc4d9 Mon Sep 17 00:00:00 2001
From: Sebastian Bergmann <sb@sebastian-bergmann.de>
Date: Fri, 13 Jul 2018 05:24:35 +0200
Subject: [PATCH 1/3] Closes #3209

---
 ChangeLog-6.5.md           | 7 +++++++
 src/Framework/TestCase.php | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog-6.5.md b/ChangeLog-6.5.md
index 6a78b4b32f3..a0e7b6708b7 100644
--- a/ChangeLog-6.5.md
+++ b/ChangeLog-6.5.md
@@ -2,6 +2,12 @@
 
 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.10] - 2018-MM-DD
+
+### Fixed
+
+* Fixed [#3209](https://github.com/sebastianbergmann/phpunit/issues/3209): `Test::run()` and `TestCase::run()` interface contradiction
+
 ## [6.5.9] - 2018-07-03
 
 ### Fixed
@@ -68,6 +74,7 @@ All notable changes of the PHPUnit 6.5 release series are documented in this fil
 * Fixed [#2654](https://github.com/sebastianbergmann/phpunit/issues/2654): Problems with `assertJsonStringEqualsJsonString()`
 * Fixed [#2810](https://github.com/sebastianbergmann/phpunit/pull/2810): Code Coverage for PHPT tests does not work
 
+[6.5.10]: https://github.com/sebastianbergmann/phpunit/compare/6.5.9...6.5.10
 [6.5.9]: https://github.com/sebastianbergmann/phpunit/compare/6.5.8...6.5.9
 [6.5.8]: https://github.com/sebastianbergmann/phpunit/compare/6.5.7...6.5.8
 [6.5.7]: https://github.com/sebastianbergmann/phpunit/compare/6.5.6...6.5.7
diff --git a/src/Framework/TestCase.php b/src/Framework/TestCase.php
index 938ff4b79e5..6c1e462ebec 100644
--- a/src/Framework/TestCase.php
+++ b/src/Framework/TestCase.php
@@ -755,7 +755,7 @@ public function hasFailed()
      *
      * @param TestResult $result
      *
-     * @return TestResult|null
+     * @return TestResult
      *
      * @throws Exception
      */
@@ -778,7 +778,7 @@ public function run(TestResult $result = null)
         if (!$this instanceof WarningTestCase &&
             !$this instanceof SkippedTestCase &&
             !$this->handleDependencies()) {
-            return;
+            return $result;
         }
 
         $runEntireClass =  $this->runClassInSeparateProcess && !$this->runTestInSeparateProcess;

From 36101dc9c31b9c49ad41f20de48fc1af8c34e5f8 Mon Sep 17 00:00:00 2001
From: Sebastian Bergmann <sb@sebastian-bergmann.de>
Date: Fri, 13 Jul 2018 05:31:38 +0200
Subject: [PATCH 2/3] Ensure the latest release of phpunit-mock-objects is used

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 707b842753b..0c9ddcc8f27 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
         "phpunit/php-file-iterator": "^1.4.3",
         "phpunit/php-text-template": "^1.2.1",
         "phpunit/php-timer": "^1.0.9",
-        "phpunit/phpunit-mock-objects": "^5.0.5",
+        "phpunit/phpunit-mock-objects": "^5.0.8",
         "sebastian/comparator": "^2.1",
         "sebastian/diff": "^2.0",
         "sebastian/environment": "^3.1",

From 2d53bd5ae8ec6f81bb3be9d397f1f4cfac69ff97 Mon Sep 17 00:00:00 2001
From: Sebastian Bergmann <sb@sebastian-bergmann.de>
Date: Thu, 19 Jul 2018 08:58:00 +0200
Subject: [PATCH 3/3] Closes #3218

---
 ChangeLog-6.5.md | 1 +
 phpunit.xsd      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ChangeLog-6.5.md b/ChangeLog-6.5.md
index a0e7b6708b7..03502077993 100644
--- a/ChangeLog-6.5.md
+++ b/ChangeLog-6.5.md
@@ -7,6 +7,7 @@ All notable changes of the PHPUnit 6.5 release series are documented in this fil
 ### Fixed
 
 * Fixed [#3209](https://github.com/sebastianbergmann/phpunit/issues/3209): `Test::run()` and `TestCase::run()` interface contradiction
+* Fixed [#3218](https://github.com/sebastianbergmann/phpunit/issues/3218): `prefix` attribute for `directory` node missing from `phpunit.xml` XSD
 
 ## [6.5.9] - 2018-07-03
 
diff --git a/phpunit.xsd b/phpunit.xsd
index b2a2a81800e..3f8fe6e9111 100644
--- a/phpunit.xsd
+++ b/phpunit.xsd
@@ -152,6 +152,7 @@
   <xs:complexType name="directoryFilterType">
     <xs:simpleContent>
       <xs:extension base="xs:anyURI">
+        <xs:attribute type="xs:string" name="prefix" default=""/>
         <xs:attribute type="xs:string" name="suffix" default="Test.php"/>
         <xs:attributeGroup ref="phpVersionGroup"/>
       </xs:extension>