1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
From 5818e1abe0155401b066a416e98d3623973004c7 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
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;
}
|
