From e9a05201b3866cecc52f6f5b907cbf3d8a3c4c83 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 30 Oct 2017 05:25:58 +0100 Subject: Update to 3.1.1 add autoloader for class aliases --- 55.patch | 38 -------------------------------------- 1 file changed, 38 deletions(-) delete mode 100644 55.patch (limited to '55.patch') diff --git a/55.patch b/55.patch deleted file mode 100644 index f5e5c95..0000000 --- a/55.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 5818e1abe0155401b066a416e98d3623973004c7 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Sun, 29 Oct 2017 10:53:40 +0100 -Subject: [PATCH] Prefer expectException over deprecated setExpectedException - ---- - src/PHPUnit/Controller/AbstractControllerTestCase.php | 3 ++- - test/ExpectedExceptionTrait.php | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/PHPUnit/Controller/AbstractControllerTestCase.php b/src/PHPUnit/Controller/AbstractControllerTestCase.php -index eda6eed68..b60ad9228 100644 ---- a/src/PHPUnit/Controller/AbstractControllerTestCase.php -+++ b/src/PHPUnit/Controller/AbstractControllerTestCase.php -@@ -490,7 +490,8 @@ public function assertApplicationException($type, $message = null) - $this->getApplication()->getMvcEvent()->setParam('exception', null); - } - -- if (method_exists($this, 'setExpectedException')) { -+ if (!method_exists($this, 'expectException')) { -+ // For old PHPUnit 4 - $this->setExpectedException($type, $message); - } else { - $this->expectException($type); -diff --git a/test/ExpectedExceptionTrait.php b/test/ExpectedExceptionTrait.php -index 25793dda1..4270ec8b7 100644 ---- a/test/ExpectedExceptionTrait.php -+++ b/test/ExpectedExceptionTrait.php -@@ -16,7 +16,8 @@ - */ - public function expectedException($exceptionClass, $message = '') - { -- if (method_exists($this, 'setExpectedException')) { -+ if (!method_exists($this, 'expectException')) { -+ // For old PHPUnit 4 - $this->setExpectedException($exceptionClass, $message); - return; - } -- cgit