Switch to PHPUnit 6 (#17755)

composer.json

@@ -74,7 +74,7 @@
         "doctrine/dbal": "~2.5",
         "mockery/mockery": "~0.9.4",
         "pda/pheanstalk": "~3.0",
-        "phpunit/phpunit": "~5.7",
+        "phpunit/phpunit": "~6.0",
         "predis/predis": "~1.0",
         "symfony/css-selector": "~3.2",
         "symfony/dom-crawler": "~3.2"

src/Illuminate/Foundation/Testing/Concerns/InteractsWithDatabase.php

@@ -2,8 +2,8 @@
 
 namespace Illuminate\Foundation\Testing\Concerns;
 
-use PHPUnit_Framework_Constraint_Not as ReverseConstraint;
 use Illuminate\Foundation\Testing\Constraints\HasInDatabase;
+use PHPUnit\Framework\Constraint\LogicalNot as ReverseConstraint;
 
 trait InteractsWithDatabase
 {

src/Illuminate/Foundation/Testing/Constraints/HasInDatabase.php

@@ -2,10 +2,10 @@
 
 namespace Illuminate\Foundation\Testing\Constraints;
 
-use PHPUnit_Framework_Constraint;
 use Illuminate\Database\Connection;
+use PHPUnit\Framework\Constraint\Constraint;
 
-class HasInDatabase extends PHPUnit_Framework_Constraint
+class HasInDatabase extends Constraint
 {
     /**
      * Number of records that will be shown in the console in case of failure.

src/Illuminate/Foundation/Testing/HttpException.php

@@ -2,9 +2,9 @@
 
 namespace Illuminate\Foundation\Testing;
 
-use PHPUnit_Framework_ExpectationFailedException;
+use PHPUnit\Framework\ExpectationFailedException;
 
-class HttpException extends PHPUnit_Framework_ExpectationFailedException
+class HttpException extends ExpectationFailedException
 {
     //
 }

src/Illuminate/Support/Testing/Fakes/BusFake.php

@@ -3,7 +3,7 @@
 namespace Illuminate\Support\Testing\Fakes;
 
 use Illuminate\Contracts\Bus\Dispatcher;
-use PHPUnit_Framework_Assert as PHPUnit;
+use PHPUnit\Framework\Assert as PHPUnit;
 
 class BusFake implements Dispatcher
 {

src/Illuminate/Support/Testing/Fakes/EventFake.php

@@ -2,7 +2,7 @@
 
 namespace Illuminate\Support\Testing\Fakes;
 
-use PHPUnit_Framework_Assert as PHPUnit;
+use PHPUnit\Framework\Assert as PHPUnit;
 use Illuminate\Contracts\Events\Dispatcher;
 
 class EventFake implements Dispatcher

src/Illuminate/Support/Testing/Fakes/MailFake.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Contracts\Mail\Mailer;
 use Illuminate\Contracts\Mail\Mailable;
-use PHPUnit_Framework_Assert as PHPUnit;
+use PHPUnit\Framework\Assert as PHPUnit;
 
 class MailFake implements Mailer
 {

src/Illuminate/Support/Testing/Fakes/NotificationFake.php

@@ -4,7 +4,7 @@
 
 use Ramsey\Uuid\Uuid;
 use Illuminate\Support\Collection;
-use PHPUnit_Framework_Assert as PHPUnit;
+use PHPUnit\Framework\Assert as PHPUnit;
 use Illuminate\Contracts\Notifications\Factory as NotificationFactory;
 
 class NotificationFake implements NotificationFactory

src/Illuminate/Support/Testing/Fakes/QueueFake.php

@@ -3,7 +3,7 @@
 namespace Illuminate\Support\Testing\Fakes;
 
 use Illuminate\Contracts\Queue\Queue;
-use PHPUnit_Framework_Assert as PHPUnit;
+use PHPUnit\Framework\Assert as PHPUnit;
 
 class QueueFake implements Queue
 {

tests/Foundation/FoundationInteractsWithDatabaseTest.php

@@ -36,7 +36,7 @@ public function testSeeInDatabaseFindsResults()
     }
 
     /**
-     * @expectedException \PHPUnit_Framework_ExpectationFailedException
+     * @expectedException \PHPUnit\Framework\ExpectationFailedException
      * @expectedExceptionMessage The table is empty.
      */
     public function testSeeInDatabaseDoesNotFindResults()
@@ -49,7 +49,7 @@ public function testSeeInDatabaseDoesNotFindResults()
     }
 
     /**
-     * @expectedException \PHPUnit_Framework_ExpectationFailedException
+     * @expectedException \PHPUnit\Framework\ExpectationFailedException
      */
     public function testSeeInDatabaseFindsNotMatchingResults()
     {
@@ -64,7 +64,7 @@ public function testSeeInDatabaseFindsNotMatchingResults()
     }
 
     /**
-     * @expectedException \PHPUnit_Framework_ExpectationFailedException
+     * @expectedException \PHPUnit\Framework\ExpectationFailedException
      */
     public function testSeeInDatabaseFindsManyNotMatchingResults()
     {
@@ -88,7 +88,7 @@ public function testDontSeeInDatabaseDoesNotFindResults()
     }
 
     /**
-     * @expectedException \PHPUnit_Framework_ExpectationFailedException
+     * @expectedException \PHPUnit\Framework\ExpectationFailedException
      * @expectedExceptionMessage a row in the table [products] does not match the attributes {"title":"Spark"}
      */
     public function testDontSeeInDatabaseFindsResults()

tests/Support/SupportCollectionTest.php

@@ -9,7 +9,6 @@
 use JsonSerializable;
 use PHPUnit\Framework\TestCase;
 use Illuminate\Support\Collection;
-use PHPUnit_Framework_Error_Notice;
 use Illuminate\Contracts\Support\Jsonable;
 use Illuminate\Contracts\Support\Arrayable;
 
@@ -229,7 +228,7 @@ public function testArrayAccessOffsetGet()
     }
 
     /**
-     * @expectedException PHPUnit_Framework_Error_Notice
+     * @expectedException \PHPUnit\Framework\Error\Notice
      */
     public function testArrayAccessOffsetGetOnNonExist()
     {
@@ -249,7 +248,7 @@ public function testArrayAccessOffsetSet()
     }
 
     /**
-     * @expectedException PHPUnit_Framework_Error_Notice
+     * @expectedException \PHPUnit\Framework\Error\Notice
      */
     public function testArrayAccessOffsetUnset()
     {