Upgrade phpunit to 9

barryvdh · barryvdh · commit cf3afc205de5 · 2021-05-31T16:55:09.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,5 @@ phpunit.xml
 .directory
 reports/
 documents/
-.idea
+.idea
+.phpunit.result.cache
diff --git a/composer.json b/composer.json
@@ -42,15 +42,15 @@
         "classmap": ["tests/OmnipayTest.php"]
     },
     "require": {
-        "php": "^5.6|^7|^8",
+        "php": "^7.3|^8",
         "php-http/client-implementation": "^1",
         "php-http/message": "^1.5",
         "php-http/discovery": "^1.2.1",
         "symfony/http-foundation": "^2.1|^3|^4|^5",
         "moneyphp/money": "^3.1"
     },
     "require-dev": {
-        "omnipay/tests": "^3",
+        "omnipay/tests": "^4",
         "php-http/mock-client": "^1",
         "squizlabs/php_codesniffer": "^3.5"
     },
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         bootstrap="vendor/autoload.php"
          backupGlobals="false"
          backupStaticAttributes="false"
          colors="true"
@@ -8,21 +9,24 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false">
-    <testsuites>
-        <testsuite name="Omnipay Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="junit" target="build/report.junit.xml"/>
-        <log type="coverage-html" target="build/coverage"/>
-        <log type="coverage-text" target="build/coverage.txt"/>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
-</phpunit>
+         stopOnFailure="false"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+    <report>
+      <clover outputFile="build/logs/clover.xml"/>
+      <html outputDirectory="build/coverage"/>
+      <text outputFile="build/coverage.txt"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="Omnipay Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <logging>
+    <junit outputFile="build/report.junit.xml"/>
+  </logging>
+</phpunit>
diff --git a/tests/Common/AbstractGatewayTest.php b/tests/Common/AbstractGatewayTest.php
@@ -13,7 +13,7 @@ class AbstractGatewayTest extends TestCase
     /** @var \Omnipay\Common\AbstractGateway */
     protected $gateway;
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->gateway = new AbstractGatewayTest_MockAbstractGateway();
         $this->gateway->initialize();
diff --git a/tests/Common/CreditCardTest.php b/tests/Common/CreditCardTest.php
@@ -10,7 +10,7 @@ class CreditCardTest extends TestCase
     /** @var CreditCard */
     private $card;
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->card = new CreditCard;
         $this->card->setNumber('4111111111111111');
diff --git a/tests/Common/GatewayFactoryTest.php b/tests/Common/GatewayFactoryTest.php
@@ -7,12 +7,12 @@
 
 class GatewayFactoryTest extends TestCase
 {
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass() : void
     {
         m::mock('alias:Omnipay\\SpareChange\\TestGateway');
     }
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->factory = new GatewayFactory;
     }
diff --git a/tests/Common/ItemBagTest.php b/tests/Common/ItemBagTest.php
@@ -6,7 +6,7 @@
 
 class ItemBagTest extends TestCase
 {
-    public function setUp()
+    public function setUp() : void
     {
         $this->bag = new ItemBag;
     }
diff --git a/tests/Common/ItemTest.php b/tests/Common/ItemTest.php
@@ -6,7 +6,7 @@
 
 class ItemTest extends TestCase
 {
-    public function setUp()
+    public function setUp() : void
     {
         $this->item = new Item;
     }
diff --git a/tests/Common/Message/AbstractRequestTest.php b/tests/Common/Message/AbstractRequestTest.php
@@ -14,7 +14,7 @@ class AbstractRequestTest extends TestCase
     /** @var AbstractRequest */
     protected $request;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->request = new AbstractRequestTest_MockAbstractRequest($this->getHttpClient(), $this->getHttpRequest());
         $this->request->initialize();
diff --git a/tests/Common/Message/AbstractResponseTest.php b/tests/Common/Message/AbstractResponseTest.php
@@ -10,7 +10,7 @@ class AbstractResponseTest extends TestCase
     /** @var  AbstractResponse */
     protected $response;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->response = m::mock('\Omnipay\Common\Message\AbstractResponse')->makePartial();
     }

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ class AbstractGatewayTest extends TestCase`
`13`	`13`	`/** @var \Omnipay\Common\AbstractGateway */`
`14`	`14`	`protected $gateway;`
`15`	`15`
`16`		`- public function setUp()`
	`16`	`+ public function setUp() : void`
`17`	`17`	`{`
`18`	`18`	`$this->gateway = new AbstractGatewayTest_MockAbstractGateway();`
`19`	`19`	`$this->gateway->initialize();`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ class CreditCardTest extends TestCase`
`10`	`10`	`/** @var CreditCard */`
`11`	`11`	`private $card;`
`12`	`12`
`13`		`- public function setUp()`
	`13`	`+ public function setUp() : void`
`14`	`14`	`{`
`15`	`15`	`$this->card = new CreditCard;`
`16`	`16`	`$this->card->setNumber('4111111111111111');`
Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,12 @@`
`7`	`7`
`8`	`8`	`class GatewayFactoryTest extends TestCase`
`9`	`9`	`{`
`10`		`- public static function setUpBeforeClass()`
	`10`	`+ public static function setUpBeforeClass() : void`
`11`	`11`	`{`
`12`	`12`	`m::mock('alias:Omnipay\\SpareChange\\TestGateway');`
`13`	`13`	`}`
`14`	`14`
`15`		`- public function setUp()`
	`15`	`+ public function setUp() : void`
`16`	`16`	`{`
`17`	`17`	`$this->factory = new GatewayFactory;`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`class ItemBagTest extends TestCase`
`8`	`8`	`{`
`9`		`- public function setUp()`
	`9`	`+ public function setUp() : void`
`10`	`10`	`{`
`11`	`11`	`$this->bag = new ItemBag;`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`class ItemTest extends TestCase`
`8`	`8`	`{`
`9`		`- public function setUp()`
	`9`	`+ public function setUp() : void`
`10`	`10`	`{`
`11`	`11`	`$this->item = new Item;`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class AbstractRequestTest extends TestCase`
`14`	`14`	`/** @var AbstractRequest */`
`15`	`15`	`protected $request;`
`16`	`16`
`17`		`- public function setUp()`
	`17`	`+ public function setUp(): void`
`18`	`18`	`{`
`19`	`19`	`$this->request = new AbstractRequestTest_MockAbstractRequest($this->getHttpClient(), $this->getHttpRequest());`
`20`	`20`	`$this->request->initialize();`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ class AbstractResponseTest extends TestCase`
`10`	`10`	`/** @var AbstractResponse */`
`11`	`11`	`protected $response;`
`12`	`12`
`13`		`- public function setUp()`
	`13`	`+ public function setUp(): void`
`14`	`14`	`{`
`15`	`15`	`$this->response = m::mock('\Omnipay\Common\Message\AbstractResponse')->makePartial();`
`16`	`16`	`}`