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
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
|
Description: Adapt to PHPUnit 8.x and 9.x API.
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
--- /dev/null
+++ b/Horde_Controller-2.0.5/test/Horde/Controller/phpunit.xml
@@ -0,0 +1 @@
+<phpunit bootstrap="bootstrap.php"></phpunit>
--- a/Horde_Controller-2.0.5/test/Horde/Controller/FilterRunnerTest.php
+++ b/Horde_Controller-2.0.5/test/Horde/Controller/FilterRunnerTest.php
@@ -8,26 +8,32 @@
{
public function testFilterRunnerDoesNotCallControllerWhenAPreFilterHandlesTheRequest()
{
- $filter = $this->getMock('Horde_Controller_PreFilter', array('processRequest'));
+ $filter = $this->getMockBuilder('Horde_Controller_PreFilter')
+ ->setMethods(array('processRequest'))
+ ->getMock();
$filter->expects($this->once())
->method('processRequest')
->will($this->returnValue(Horde_Controller_PreFilter::REQUEST_HANDLED));
$runner = new Horde_Controller_FilterRunner($this->_getControllerMockNeverCalled());
$runner->addPreFilter($filter);
- $runner->processRequest($this->getMock('Horde_Controller_Request'), new Horde_Controller_Response());
+ $runner->processRequest($this->getMockBuilder('Horde_Controller_Request')->getMock(), new Horde_Controller_Response());
}
public function testShouldUsePreFiltersInFirstInFirstOutOrder()
{
// The second filter should never be called because first filter returns
// REQUEST_HANDLED, meaning it can handle the request.
- $preFilter1 = $this->getMock('Horde_Controller_PreFilter', array('processRequest'));
+ $preFilter1 = $this->getMockBuilder('Horde_Controller_PreFilter')
+ ->setMethods(array('processRequest'))
+ ->getMock();
$preFilter1->expects($this->once())
->method('processRequest')
->will($this->returnValue(Horde_Controller_PreFilter::REQUEST_HANDLED));
- $preFilter2 = $this->getMock('Horde_Controller_PreFilter', array('processRequest'));
+ $preFilter2 = $this->getMockBuilder('Horde_Controller_PreFilter')
+ ->setMethods(array('processRequest'))
+ ->getMock();
$preFilter2->expects($this->never())
->method('processRequest');
@@ -41,17 +47,23 @@
{
// Both filters should be called because the first filter returns
// REQUEST_HANDLED, meaning it can handle the request
- $postFilter1 = $this->getMock('Horde_Controller_PostFilter', array('processResponse'));
+ $postFilter1 = $this->getMockBuilder('Horde_Controller_PostFilter')
+ ->setMethods(array('processResponse'))
+ ->getMock();
$postFilter1->expects($this->once())
->method('processResponse')
->will($this->returnValue(Horde_Controller_PreFilter::REQUEST_HANDLED));
- $postFilter2 = $this->getMock('Horde_Controller_PostFilter', array('processResponse'));
+ $postFilter2 = $this->getMockBuilder('Horde_Controller_PostFilter')
+ ->setMethods(array('processResponse'))
+ ->getMock();
$postFilter2->expects($this->once())
->method('processResponse');
- $controller = $this->getMock('Horde_Controller', array('processRequest'));
+ $controller = $this->getMockBuilder('Horde_Controller')
+ ->setMethods(array('processRequest'))
+ ->getMock();
$controller->expects($this->once())
->method('processRequest');
@@ -63,7 +75,9 @@
private function _getControllerMockNeverCalled()
{
- $controller = $this->getMock('Horde_Controller', array('processRequest'));
+ $controller = $this->getMockBuilder('Horde_Controller')
+ ->setMethods(array('processRequest'))
+ ->getMock();
$controller->expects($this->never())
->method('processRequest');
return $controller;
@@ -71,7 +85,9 @@
private function _runFilterRunner(Horde_Controller_FilterRunner $runner)
{
- $response = $this->getMock('Horde_Controller_Response', array('processRequest'));
+ $response = $this->getMockBuilder('Horde_Controller_Response')
+ ->setMethods(array('processRequest'))
+ ->getMock();
$response->expects($this->never())->method('processRequest');
$runner->processRequest(new Horde_Controller_Request_Null(), $response);
}
|
