summaryrefslogtreecommitdiffstats
path: root/tests/lib/AppFramework
diff options
context:
space:
mode:
Diffstat (limited to 'tests/lib/AppFramework')
-rw-r--r--tests/lib/AppFramework/AppTest.php14
-rw-r--r--tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php4
-rw-r--r--tests/lib/AppFramework/Controller/ControllerTest.php2
-rw-r--r--tests/lib/AppFramework/Db/MapperTest.php4
-rw-r--r--tests/lib/AppFramework/Db/MapperTestUtility.php8
-rw-r--r--tests/lib/AppFramework/Http/DispatcherTest.php30
-rw-r--r--tests/lib/AppFramework/Http/RequestTest.php104
-rw-r--r--tests/lib/AppFramework/Http/StreamResponseTest.php12
-rw-r--r--tests/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php4
-rw-r--r--tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php6
-rw-r--r--tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php26
-rw-r--r--tests/lib/AppFramework/Routing/RoutingTest.php22
12 files changed, 118 insertions, 118 deletions
diff --git a/tests/lib/AppFramework/AppTest.php b/tests/lib/AppFramework/AppTest.php
index ccc694942a1..3fb18979b8a 100644
--- a/tests/lib/AppFramework/AppTest.php
+++ b/tests/lib/AppFramework/AppTest.php
@@ -93,7 +93,7 @@ class AppTest extends \Test\TestCase {
->method('dispatch')
->with($this->equalTo($this->controller),
$this->equalTo($this->controllerMethod))
- ->will($this->returnValue($return));
+ ->willReturn($return);
$this->io->expects($this->never())
->method('setOutput');
@@ -133,7 +133,7 @@ class AppTest extends \Test\TestCase {
->method('dispatch')
->with($this->equalTo($this->controller),
$this->equalTo($this->controllerMethod))
- ->will($this->returnValue($return));
+ ->willReturn($return);
$this->io->expects($this->once())
->method('setOutput')
->with($this->equalTo($this->output));
@@ -156,7 +156,7 @@ class AppTest extends \Test\TestCase {
->method('dispatch')
->with($this->equalTo($this->controller),
$this->equalTo($this->controllerMethod))
- ->will($this->returnValue($return));
+ ->willReturn($return);
$this->io->expects($this->once())
->method('setHeader')
->with($this->equalTo($statusCode));
@@ -175,7 +175,7 @@ class AppTest extends \Test\TestCase {
->method('dispatch')
->with($this->equalTo($this->controller),
$this->equalTo($this->controllerMethod))
- ->will($this->returnValue($return));
+ ->willReturn($return);
$mock->expects($this->once())
->method('callback');
App::main($this->controllerName, $this->controllerMethod, $this->container, []);
@@ -190,7 +190,7 @@ class AppTest extends \Test\TestCase {
->method('dispatch')
->with($this->equalTo($this->controller),
$this->equalTo($this->controllerMethod))
- ->will($this->returnValue($return));
+ ->willReturn($return);
$this->io->expects($this->never())
->method('setOutput');
@@ -207,7 +207,7 @@ class AppTest extends \Test\TestCase {
->method('dispatch')
->with($this->equalTo($this->controller),
$this->equalTo($this->controllerMethod))
- ->will($this->returnValue($return));
+ ->willReturn($return);
$this->io->expects($this->never())
->method('setOutput');
@@ -224,7 +224,7 @@ class AppTest extends \Test\TestCase {
->method('dispatch')
->with($this->equalTo($this->controller),
$this->equalTo($this->controllerMethod))
- ->will($this->returnValue($return));
+ ->willReturn($return);
$this->io->expects($this->never())
->method('setOutput');
diff --git a/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php b/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php
index 8eb76d3cb27..0f4b83ff5ca 100644
--- a/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php
+++ b/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php
@@ -136,7 +136,7 @@ class AuthPublicShareControllerTest extends \Test\TestCase {
$hashSet = false;
$this->session
->method('set')
- ->will($this->returnCallback(function($key, $value) use (&$tokenSet, &$hashSet) {
+ ->willReturnCallback(function($key, $value) use (&$tokenSet, &$hashSet) {
if ($key === 'public_link_authenticated_token' && $value === 'token') {
$tokenSet = true;
return true;
@@ -146,7 +146,7 @@ class AuthPublicShareControllerTest extends \Test\TestCase {
return true;
}
return false;
- }));
+ });
$this->urlGenerator->method('linkToRoute')
->willReturn('myLink!');
diff --git a/tests/lib/AppFramework/Controller/ControllerTest.php b/tests/lib/AppFramework/Controller/ControllerTest.php
index b1cb1ceab6f..23ebe6ec984 100644
--- a/tests/lib/AppFramework/Controller/ControllerTest.php
+++ b/tests/lib/AppFramework/Controller/ControllerTest.php
@@ -89,7 +89,7 @@ class ControllerTest extends \Test\TestCase {
->getMock();
$this->app->expects($this->any())
->method('getAppName')
- ->will($this->returnValue('apptemplate_advanced'));
+ ->willReturn('apptemplate_advanced');
$this->controller = new ChildController($this->app, $request);
}
diff --git a/tests/lib/AppFramework/Db/MapperTest.php b/tests/lib/AppFramework/Db/MapperTest.php
index a69980fbb26..67d88c879a3 100644
--- a/tests/lib/AppFramework/Db/MapperTest.php
+++ b/tests/lib/AppFramework/Db/MapperTest.php
@@ -148,7 +148,7 @@ class MapperTest extends MapperTestUtility {
$this->db->expects($this->once())
->method('lastInsertId')
->with($this->equalTo('*PREFIX*table'))
- ->will($this->returnValue(3));
+ ->willReturn(3);
$this->mapper = new ExampleMapper($this->db);
$sql = 'INSERT INTO `*PREFIX*table`(`pre_name`,`email`) ' .
@@ -168,7 +168,7 @@ class MapperTest extends MapperTestUtility {
$this->db->expects($this->once())
->method('lastInsertId')
->with($this->equalTo('*PREFIX*table'))
- ->will($this->returnValue(3));
+ ->willReturn(3);
$this->mapper = new ExampleMapper($this->db);
$sql = 'INSERT INTO `*PREFIX*table`(`pre_name`,`email`) ' .
diff --git a/tests/lib/AppFramework/Db/MapperTestUtility.php b/tests/lib/AppFramework/Db/MapperTestUtility.php
index 83156a3932b..cddf015cbea 100644
--- a/tests/lib/AppFramework/Db/MapperTestUtility.php
+++ b/tests/lib/AppFramework/Db/MapperTestUtility.php
@@ -124,7 +124,7 @@ abstract class MapperTestUtility extends \Test\TestCase {
$this->query->expects($this->any())
->method('fetch')
- ->will($this->returnCallback(
+ ->willReturnCallback(
function() use ($iterators, $fetchAt){
$iterator = $iterators[$fetchAt];
$result = $iterator->next();
@@ -137,7 +137,7 @@ abstract class MapperTestUtility extends \Test\TestCase {
return $result;
}
- ));
+ );
if ($this->isAssocArray($arguments)) {
foreach($arguments as $key => $argument) {
@@ -165,9 +165,9 @@ abstract class MapperTestUtility extends \Test\TestCase {
$this->query->expects($this->at($this->queryAt))
->method('execute')
- ->will($this->returnCallback(function($sql, $p=null, $o=null, $s=null) {
+ ->willReturnCallback(function($sql, $p=null, $o=null, $s=null) {
- }));
+ });
$this->queryAt++;
diff --git a/tests/lib/AppFramework/Http/DispatcherTest.php b/tests/lib/AppFramework/Http/DispatcherTest.php
index 1c4dc067b5d..494f19a6d24 100644
--- a/tests/lib/AppFramework/Http/DispatcherTest.php
+++ b/tests/lib/AppFramework/Http/DispatcherTest.php
@@ -156,7 +156,7 @@ class DispatcherTest extends \Test\TestCase {
->with($this->equalTo($this->controller),
$this->equalTo($this->controllerMethod),
$this->equalTo($exception))
- ->will($this->returnValue($this->response));
+ ->willReturn($this->response);
} else {
$this->middlewareDispatcher->expects($this->once())
->method('afterException')
@@ -173,51 +173,51 @@ class DispatcherTest extends \Test\TestCase {
$this->equalTo($this->controllerMethod));
$this->controller->expects($this->once())
->method($this->controllerMethod)
- ->will($this->returnValue($this->response));
+ ->willReturn($this->response);
}
$this->response->expects($this->once())
->method('render')
- ->will($this->returnValue($out));
+ ->willReturn($out);
$this->response->expects($this->once())
->method('getStatus')
- ->will($this->returnValue(Http::STATUS_OK));
+ ->willReturn(Http::STATUS_OK);
$this->response->expects($this->once())
->method('getLastModified')
- ->will($this->returnValue($this->lastModified));
+ ->willReturn($this->lastModified);
$this->response->expects($this->once())
->method('getETag')
- ->will($this->returnValue($this->etag));
+ ->willReturn($this->etag);
$this->response->expects($this->once())
->method('getHeaders')
- ->will($this->returnValue($responseHeaders));
+ ->willReturn($responseHeaders);
$this->http->expects($this->once())
->method('getStatusHeader')
->with($this->equalTo(Http::STATUS_OK),
$this->equalTo($this->lastModified),
$this->equalTo($this->etag))
- ->will($this->returnValue($httpHeaders));
+ ->willReturn($httpHeaders);
$this->middlewareDispatcher->expects($this->once())
->method('afterController')
->with($this->equalTo($this->controller),
$this->equalTo($this->controllerMethod),
$this->equalTo($this->response))
- ->will($this->returnValue($this->response));
+ ->willReturn($this->response);
$this->middlewareDispatcher->expects($this->once())
->method('afterController')
->with($this->equalTo($this->controller),
$this->equalTo($this->controllerMethod),
$this->equalTo($this->response))
- ->will($this->returnValue($this->response));
+ ->willReturn($this->response);
$this->middlewareDispatcher->expects($this->once())
->method('beforeOutput')
->with($this->equalTo($this->controller),
$this->equalTo($this->controllerMethod),
$this->equalTo($out))
- ->will($this->returnValue($out));
+ ->willReturn($out);
}
@@ -281,14 +281,14 @@ class DispatcherTest extends \Test\TestCase {
->method('beforeController');
$this->middlewareDispatcher->expects($this->once())
->method('afterController')
- ->will($this->returnCallback(function($a, $b, $in) {
+ ->willReturnCallback(function($a, $b, $in) {
return $in;
- }));
+ });
$this->middlewareDispatcher->expects($this->once())
->method('beforeOutput')
- ->will($this->returnCallback(function($a, $b, $in) {
+ ->willReturnCallback(function($a, $b, $in) {
return $in;
- }));
+ });
}
diff --git a/tests/lib/AppFramework/Http/RequestTest.php b/tests/lib/AppFramework/Http/RequestTest.php
index be019050e1b..67fef79dcff 100644
--- a/tests/lib/AppFramework/Http/RequestTest.php
+++ b/tests/lib/AppFramework/Http/RequestTest.php
@@ -378,7 +378,7 @@ class RequestTest extends \Test\TestCase {
$this->secureRandom->expects($this->once())
->method('generate')
->with('20')
- ->will($this->returnValue('GeneratedByOwnCloudItself'));
+ ->willReturn('GeneratedByOwnCloudItself');
$request = new Request(
[],
@@ -409,7 +409,7 @@ class RequestTest extends \Test\TestCase {
->expects($this->once())
->method('getSystemValue')
->with('trusted_proxies')
- ->will($this->returnValue([]));
+ ->willReturn([]);
$request = new Request(
[
@@ -433,12 +433,12 @@ class RequestTest extends \Test\TestCase {
->expects($this->at(0))
->method('getSystemValue')
->with('trusted_proxies')
- ->will($this->returnValue(['10.0.0.2']));
+ ->willReturn(['10.0.0.2']);
$this->config
->expects($this->at(1))
->method('getSystemValue')
->with('forwarded_for_headers')
- ->will($this->returnValue([]));
+ ->willReturn([]);
$request = new Request(
[
@@ -462,12 +462,12 @@ class RequestTest extends \Test\TestCase {
->expects($this->at(0))
->method('getSystemValue')
->with('trusted_proxies')
- ->will($this->returnValue(['10.0.0.2']));
+ ->willReturn(['10.0.0.2']);
$this->config
->expects($this->at(1))
->method('getSystemValue')
->with('forwarded_for_headers')
- ->will($this->returnValue(['HTTP_X_FORWARDED']));
+ ->willReturn(['HTTP_X_FORWARDED']);
$request = new Request(
[
@@ -491,12 +491,12 @@ class RequestTest extends \Test\TestCase {
->expects($this->at(0))
->method('getSystemValue')
->with('trusted_proxies')
- ->will($this->returnValue(['2001:db8:85a3:8d3:1319:8a2e:370:7348']));
+ ->willReturn(['2001:db8:85a3:8d3:1319:8a2e:370:7348']);
$this->config
->expects($this->at(1))
->method('getSystemValue')
->with('forwarded_for_headers')
- ->will($this->returnValue(['HTTP_X_FORWARDED']));
+ ->willReturn(['HTTP_X_FORWARDED']);
$request = new Request(
[
@@ -520,16 +520,16 @@ class RequestTest extends \Test\TestCase {
->expects($this->at(0))
->method('getSystemValue')
->with('trusted_proxies')
- ->will($this->returnValue(['10.0.0.2']));
+ ->willReturn(['10.0.0.2']);
$this->config
->expects($this->at(1))
->method('getSystemValue')
->with('forwarded_for_headers')
- ->will($this->returnValue([
+ ->willReturn([
'HTTP_CLIENT_IP',
'HTTP_X_FORWARDED_FOR',
'HTTP_X_FORWARDED'
- ]));
+ ]);
$request = new Request(
[
@@ -553,16 +553,16 @@ class RequestTest extends \Test\TestCase {
->expects($this->at(0))
->method('getSystemValue')
->with('trusted_proxies')
- ->will($this->returnValue(['2001:db8:85a3:8d3:1319:8a2e:370:7348']));
+ ->willReturn(['2001:db8:85a3:8d3:1319:8a2e:370:7348']);
$this->config
->expects($this->at(1))
->method('getSystemValue')
->with('forwarded_for_headers')
- ->will($this->returnValue([
+ ->willReturn([
'HTTP_CLIENT_IP',
'HTTP_X_FORWARDED_FOR',
'HTTP_X_FORWARDED'
- ]));
+ ]);
$request = new Request(
[
@@ -586,12 +586,12 @@ class RequestTest extends \Test\TestCase {
->expects($this->at(0))
->method('getSystemValue')
->with('trusted_proxies')
- ->will($this->returnValue(['192.168.2.0/24']));
+ ->willReturn(['192.168.2.0/24']);
$this->config
->expects($this->at(1))
->method('getSystemValue')
->with('forwarded_for_headers')
- ->will($this->returnValue(['HTTP_X_FORWARDED_FOR']));
+ ->willReturn(['HTTP_X_FORWARDED_FOR']);
$request = new Request(
[
@@ -615,7 +615,7 @@ class RequestTest extends \Test\TestCase {
->expects($this->once())
->method('getSystemValue')
->with('trusted_proxies')
- ->will($this->returnValue(['192.168.2.0/24']));
+ ->willReturn(['192.168.2.0/24']);
$request = new Request(
[
@@ -690,17 +690,17 @@ class RequestTest extends \Test\TestCase {
->expects($this->at(0))
->method('getSystemValue')
->with('overwriteprotocol')
- ->will($this->returnValue('customProtocol'));
+ ->willReturn('customProtocol');
$this->config
->expects($this->at(1))
->method('getSystemValue')
->with('overwritecondaddr')
- ->will($this->returnValue(''));
+ ->willReturn('');
$this->config
->expects($this->at(2))
->method('getSystemValue')
->with('overwriteprotocol')
- ->will($this->returnValue('customProtocol'));
+ ->willReturn('customProtocol');
$request = new Request(
[],
@@ -716,13 +716,13 @@ class RequestTest extends \Test\TestCase {
public function testGetServerProtocolWithProtoValid() {
$this->config
->method('getSystemValue')
- ->will($this->returnCallback(function($key, $default) {
+ ->willReturnCallback(function($key, $default) {
if ($key === 'trusted_proxies') {
return ['1.2.3.4'];
}
return $default;
- }));
+ });
$requestHttps = new Request(
[
@@ -757,9 +757,9 @@ class RequestTest extends \Test\TestCase {
public function testGetServerProtocolWithHttpsServerValueOn() {
$this->config
->method('getSystemValue')
- ->will($this->returnCallback(function($key, $default) {
+ ->willReturnCallback(function($key, $default) {
return $default;
- }));
+ });
$request = new Request(
[
@@ -778,9 +778,9 @@ class RequestTest extends \Test\TestCase {
public function testGetServerProtocolWithHttpsServerValueOff() {
$this->config
->method('getSystemValue')
- ->will($this->returnCallback(function($key, $default) {
+ ->willReturnCallback(function($key, $default) {
return $default;
- }));
+ });
$request = new Request(
[
@@ -799,9 +799,9 @@ class RequestTest extends \Test\TestCase {
public function testGetServerProtocolWithHttpsServerValueEmpty() {
$this->config
->method('getSystemValue')
- ->will($this->returnCallback(function($key, $default) {
+ ->willReturnCallback(function($key, $default) {
return $default;
- }));
+ });
$request = new Request(
[
@@ -820,9 +820,9 @@ class RequestTest extends \Test\TestCase {
public function testGetServerProtocolDefault() {
$this->config
->method('getSystemValue')
- ->will($this->returnCallback(function($key, $default) {
+ ->willReturnCallback(function($key, $default) {
return $default;
- }));
+ });
$request = new Request(
[],
@@ -837,13 +837,13 @@ class RequestTest extends \Test\TestCase {
public function testGetServerProtocolBehindLoadBalancers() {
$this->config
->method('getSystemValue')
- ->will($this->returnCallback(function($key, $default) {
+ ->willReturnCallback(function($key, $default) {
if ($key === 'trusted_proxies') {
return ['1.2.3.4'];
}
return $default;
- }));
+ });
$request = new Request(
[
@@ -1059,13 +1059,13 @@ class RequestTest extends \Test\TestCase {
public function testInsecureServerHostHttpFromForwardedHeaderSingle() {
$this->config
->method('getSystemValue')
- ->will($this->returnCallback(function($key, $default) {
+ ->willReturnCallback(function($key, $default) {
if ($key === 'trusted_proxies') {
return ['1.2.3.4'];
}
return $default;
- }));
+ });
$request = new Request(
[
@@ -1088,13 +1088,13 @@ class RequestTest extends \Test\TestCase {
public function testInsecureServerHostHttpFromForwardedHeaderStacked() {
$this->config
->method('getSystemValue')
- ->will($this->returnCallback(function($key, $default) {
+ ->willReturnCallback(function($key, $default) {
if ($key === 'trusted_proxies') {
return ['1.2.3.4'];
}
return $default;
- }));
+ });
$request = new Request(
[
@@ -1117,7 +1117,7 @@ class RequestTest extends \Test\TestCase {
public function testGetServerHostWithOverwriteHost() {
$this->config
->method('getSystemValue')
- ->will($this->returnCallback(function($key, $default) {
+ ->willReturnCallback(function($key, $default) {
if ($key === 'overwritecondaddr') {
return '';
} else if ($key === 'overwritehost') {
@@ -1125,7 +1125,7 @@ class RequestTest extends \Test\TestCase {
}
return $default;
- }));
+ });
$request = new Request(
[],
@@ -1141,7 +1141,7 @@ class RequestTest extends \Test\TestCase {
public function testGetServerHostWithTrustedDomain() {
$this->config
->method('getSystemValue')
- ->will($this->returnCallback(function($key, $default) {
+ ->willReturnCallback(function($key, $default) {
if ($key === 'trusted_proxies') {
return ['1.2.3.4'];
} else if ($key === 'trusted_domains') {
@@ -1149,7 +1149,7 @@ class RequestTest extends \Test\TestCase {
}
return $default;
- }));
+ });
$request = new Request(
[
@@ -1170,7 +1170,7 @@ class RequestTest extends \Test\TestCase {
public function testGetServerHostWithUntrustedDomain() {
$this->config
->method('getSystemValue')
- ->will($this->returnCallback(function($key, $default) {
+ ->willReturnCallback(function($key, $default) {
if ($key === 'trusted_proxies') {
return ['1.2.3.4'];
} else if ($key === 'trusted_domains') {
@@ -1178,7 +1178,7 @@ class RequestTest extends \Test\TestCase {
}
return $default;
- }));
+ });
$request = new Request(
[
@@ -1199,12 +1199,12 @@ class RequestTest extends \Test\TestCase {
public function testGetServerHostWithNoTrustedDomain() {
$this->config
->method('getSystemValue')
- ->will($this->returnCallback(function($key, $default) {
+ ->willReturnCallback(function($key, $default) {
if ($key === 'trusted_proxies') {
return ['1.2.3.4'];
}
return $default;
- }));
+ });
$request = new Request(
[
@@ -1273,7 +1273,7 @@ class RequestTest extends \Test\TestCase {
->expects($this->once())
->method('getSystemValue')
->with('overwritehost')
- ->will($this->returnValue(''));
+ ->willReturn('');
$request = new Request(
[],
$this->secureRandom,
@@ -1290,17 +1290,17 @@ class RequestTest extends \Test\TestCase {
->expects($this->at(0))
->method('getSystemValue')
->with('overwritehost')
- ->will($this->returnValue('www.owncloud.org'));
+ ->willReturn('www.owncloud.org');
$this->config
->expects($this->at(1))
->method('getSystemValue')
->with('overwritecondaddr')
- ->will($this->returnValue(''));
+ ->willReturn('');
$this->config
->expects($this->at(2))
->method('getSystemValue')
->with('overwritehost')
- ->will($this->returnValue('www.owncloud.org'));
+ ->willReturn('www.owncloud.org');
$request = new Request(
[],
@@ -1485,7 +1485,7 @@ class RequestTest extends \Test\TestCase {
->expects($this->once())
->method('getSystemValue')
->with('overwritewebroot')
- ->will($this->returnValue(''));
+ ->willReturn('');
$request = new Request(
[
@@ -1517,12 +1517,12 @@ class RequestTest extends \Test\TestCase {
->expects($this->at(0))
->method('getSystemValue')
->with('overwritewebroot')
- ->will($this->returnValue($overwriteWebRoot));
+ ->willReturn($overwriteWebRoot);
$this->config
->expects($this->at(1))
->method('getSystemValue')
->with('overwritecondaddr')
- ->will($this->returnValue($overwriteCondAddr));
+ ->willReturn($overwriteCondAddr);
$request = $this->getMockBuilder('\OC\AppFramework\Http\Request')
->setMethods(['getScriptName'])
@@ -1542,7 +1542,7 @@ class RequestTest extends \Test\TestCase {
$request
->expects($this->once())
->method('getScriptName')
- ->will($this->returnValue('/scriptname.php'));
+ ->willReturn('/scriptname.php');
$this->assertSame($expectedUri, $request->getRequestUri());
}
diff --git a/tests/lib/AppFramework/Http/StreamResponseTest.php b/tests/lib/AppFramework/Http/StreamResponseTest.php
index ef7132013b6..b66d9c5ed1d 100644
--- a/tests/lib/AppFramework/Http/StreamResponseTest.php
+++ b/tests/lib/AppFramework/Http/StreamResponseTest.php
@@ -44,7 +44,7 @@ class StreamResponseTest extends \Test\TestCase {
$path = __FILE__;
$this->output->expects($this->once())
->method('getHttpResponseCode')
- ->will($this->returnValue(Http::STATUS_NOT_MODIFIED));
+ ->willReturn(Http::STATUS_NOT_MODIFIED);
$this->output->expects($this->never())
->method('setReadfile');
$response = new StreamResponse($path);
@@ -56,11 +56,11 @@ class StreamResponseTest extends \Test\TestCase {
$path = __FILE__;
$this->output->expects($this->once())
->method('getHttpResponseCode')
- ->will($this->returnValue(Http::STATUS_OK));
+ ->willReturn(Http::STATUS_OK);
$this->output->expects($this->once())
->method('setReadfile')
->with($this->equalTo($path))
- ->will($this->returnValue(true));
+ ->willReturn(true);
$response = new StreamResponse($path);
$response->callback($this->output);
@@ -70,7 +70,7 @@ class StreamResponseTest extends \Test\TestCase {
$path = __FILE__ . 'test';
$this->output->expects($this->once())
->method('getHttpResponseCode')
- ->will($this->returnValue(Http::STATUS_OK));
+ ->willReturn(Http::STATUS_OK);
$this->output->expects($this->never())
->method('setReadfile');
$this->output->expects($this->once())
@@ -85,10 +85,10 @@ class StreamResponseTest extends \Test\TestCase {
$path = __FILE__;
$this->output->expects($this->once())
->method('getHttpResponseCode')
- ->will($this->returnValue(Http::STATUS_OK));
+ ->willReturn(Http::STATUS_OK);
$this->output->expects($this->once())
->method('setReadfile')
- ->will($this->returnValue(false));
+ ->willReturn(false);
$this->output->expects($this->once())
->method('setHttpResponseCode')
->with($this->equalTo(Http::STATUS_BAD_REQUEST));
diff --git a/tests/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php b/tests/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php
index 965637cb4c4..4790e9baca7 100644
--- a/tests/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php
+++ b/tests/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php
@@ -158,7 +158,7 @@ class MiddlewareDispatcherTest extends \Test\TestCase {
->getMock();
$m2->expects($this->once())
->method('afterException')
- ->will($this->returnValue($response));
+ ->willReturn($response);
$this->dispatcher->registerMiddleware($m1);
$this->dispatcher->registerMiddleware($m2);
@@ -282,7 +282,7 @@ class MiddlewareDispatcherTest extends \Test\TestCase {
$m3->expects($this->never())
->method('afterController');
$m3->method('beforeOutput')
- ->will($this->returnArgument(2));
+ ->willReturnArgument(2);
$this->dispatcher->registerMiddleware($m3);
diff --git a/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php
index 1c12a4aa153..691553a13d8 100644
--- a/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php
+++ b/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php
@@ -140,7 +140,7 @@ class CORSMiddlewareTest extends \Test\TestCase {
$this->session->expects($this->never())
->method('logClientIn')
->with($this->equalTo('user'), $this->equalTo('pass'))
- ->will($this->returnValue(true));
+ ->willReturn(true);
$this->reflector->reflect($this, __FUNCTION__);
$middleware->beforeController($this->controller, __FUNCTION__);
@@ -163,7 +163,7 @@ class CORSMiddlewareTest extends \Test\TestCase {
$this->session->expects($this->once())
->method('logClientIn')
->with($this->equalTo('user'), $this->equalTo('pass'))
- ->will($this->returnValue(true));
+ ->willReturn(true);
$this->reflector->reflect($this, __FUNCTION__);
$middleware = new CORSMiddleware($request, $this->reflector, $this->session, $this->throttler);
@@ -215,7 +215,7 @@ class CORSMiddlewareTest extends \Test\TestCase {
$this->session->expects($this->once())
->method('logClientIn')
->with($this->equalTo('user'), $this->equalTo('pass'))
- ->will($this->returnValue(false));
+ ->willReturn(false);
$this->reflector->reflect($this, __FUNCTION__);
$middleware = new CORSMiddleware($request, $this->reflector, $this->session, $this->throttler);
diff --git a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php
index ae0e6ff484d..5a8260d7968 100644
--- a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php
+++ b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php
@@ -218,7 +218,7 @@ class SecurityMiddlewareTest extends \Test\TestCase {
public function testNoChecks(){
$this->request->expects($this->never())
->method('passesCSRFCheck')
- ->will($this->returnValue(false));
+ ->willReturn(false);
$sec = $this->getMiddleware(false, false, false);
@@ -262,10 +262,10 @@ class SecurityMiddlewareTest extends \Test\TestCase {
$this->request->expects($this->once())
->method('passesCSRFCheck')
- ->will($this->returnValue(false));
+ ->willReturn(false);
$this->request->expects($this->once())
->method('passesStrictCookieCheck')
- ->will($this->returnValue(true));
+ ->willReturn(true);
$this->reader->reflect(__CLASS__, __FUNCTION__);
$this->middleware->beforeController($this->controller, __FUNCTION__);
}
@@ -278,7 +278,7 @@ class SecurityMiddlewareTest extends \Test\TestCase {
public function testNoCsrfCheck(){
$this->request->expects($this->never())
->method('passesCSRFCheck')
- ->will($this->returnValue(false));
+ ->willReturn(false);
$this->reader->reflect(__CLASS__, __FUNCTION__);
$this->middleware->beforeController($this->controller, __FUNCTION__);
@@ -290,10 +290,10 @@ class SecurityMiddlewareTest extends \Test\TestCase {
public function testPassesCsrfCheck(){
$this->request->expects($this->once())
->method('passesCSRFCheck')
- ->will($this->returnValue(true));
+ ->willReturn(true);
$this->request->expects($this->once())
->method('passesStrictCookieCheck')
- ->will($this->returnValue(true));
+ ->willReturn(true);
$this->reader->reflect(__CLASS__, __FUNCTION__);
$this->middleware->beforeController($this->controller, __FUNCTION__);
@@ -307,10 +307,10 @@ class SecurityMiddlewareTest extends \Test\TestCase {
$this->request->expects($this->once())
->method('passesCSRFCheck')
- ->will($this->returnValue(false));
+ ->willReturn(false);
$this->request->expects($this->once())
->method('passesStrictCookieCheck')
- ->will($this->returnValue(true));
+ ->willReturn(true);
$this->reader->reflect(__CLASS__, __FUNCTION__);
$this->middleware->beforeController($this->controller, __FUNCTION__);
@@ -327,7 +327,7 @@ class SecurityMiddlewareTest extends \Test\TestCase {
->method('passesCSRFCheck');
$this->request->expects($this->once())
->method('passesStrictCookieCheck')
- ->will($this->returnValue(false));
+ ->willReturn(false);
$this->reader->reflect(__CLASS__, __FUNCTION__);
$this->middleware->beforeController($this->controller, __FUNCTION__);
@@ -341,7 +341,7 @@ class SecurityMiddlewareTest extends \Test\TestCase {
public function testNoStrictCookieRequiredCheck() {
$this->request->expects($this->never())
->method('passesStrictCookieCheck')
- ->will($this->returnValue(false));
+ ->willReturn(false);
$this->reader->reflect(__CLASS__, __FUNCTION__);
$this->middleware->beforeController($this->controller, __FUNCTION__);
@@ -393,7 +393,7 @@ class SecurityMiddlewareTest extends \Test\TestCase {
public function testCsrfOcsController(Controller $controller, bool $hasOcsApiHeader, bool $hasBearerAuth, bool $exception) {
$this->request
->method('getHeader')
- ->will(self::returnCallback(function ($header) use ($hasOcsApiHeader, $hasBearerAuth) {
+ ->willReturnCallback(function ($header) use ($hasOcsApiHeader, $hasBearerAuth) {
if ($header === 'OCS-APIREQUEST' && $hasOcsApiHeader) {
return 'true';
}
@@ -401,7 +401,7 @@ class SecurityMiddlewareTest extends \Test\TestCase {
return 'Bearer TOKEN!';
}
return '';
- }));
+ });
$this->request->expects($this->once())
->method('passesStrictCookieCheck')
->willReturn(true);
@@ -511,7 +511,7 @@ class SecurityMiddlewareTest extends \Test\TestCase {
'redirect_url' => 'nextcloud/index.php/apps/specialapp',
]
)
- ->will($this->returnValue('http://localhost/nextcloud/index.php/login?redirect_url=nextcloud/index.php/apps/specialapp'));
+ ->willReturn('http://localhost/nextcloud/index.php/login?redirect_url=nextcloud/index.php/apps/specialapp');
$this->logger
->expects($this->once())
->method('logException');
diff --git a/tests/lib/AppFramework/Routing/RoutingTest.php b/tests/lib/AppFramework/Routing/RoutingTest.php
index 1b7ab054a0f..4d184adcdb1 100644
--- a/tests/lib/AppFramework/Routing/RoutingTest.php
+++ b/tests/lib/AppFramework/Routing/RoutingTest.php
@@ -245,7 +245,7 @@ class RoutingTest extends \Test\TestCase
->expects($this->once())
->method('create')
->with($this->equalTo('app1.' . $name), $this->equalTo($url))
- ->will($this->returnValue($route));
+ ->willReturn($route);
// load route configuration
$config = new RouteConfig($container, $router, $routes);
@@ -293,7 +293,7 @@ class RoutingTest extends \Test\TestCase
->expects($this->once())
->method('create')
->with($this->equalTo('ocs.app1.' . $name), $this->equalTo($url))
- ->will($this->returnValue($route));
+ ->willReturn($route);
// load route configuration
$config = new RouteConfig($container, $router, $routes);
@@ -391,31 +391,31 @@ class RoutingTest extends \Test\TestCase
->expects($this->at(0))
->method('create')
->with($this->equalTo('app1.' . $resourceName . '.index'), $this->equalTo($url))
- ->will($this->returnValue($indexRoute));
+ ->willReturn($indexRoute);
$router
->expects($this->at(1))
->method('create')
->with($this->equalTo('app1.' . $resourceName . '.show'), $this->equalTo($urlWithParam))
- ->will($this->returnValue($showRoute));
+ ->willReturn($showRoute);
$router
->expects($this->at(2))
->method('create')
->with($this->equalTo('app1.' . $resourceName . '.create'), $this->equalTo($url))
- ->will($this->returnValue($createRoute));
+ ->willReturn($createRoute);
$router
->expects($this->at(3))
->method('create')
->with($this->equalTo('app1.' . $resourceName . '.update'), $this->equalTo($urlWithParam))
- ->will($this->returnValue($updateRoute));
+ ->willReturn($updateRoute);
$router
->expects($this->at(4))
->method('create')
->with($this->equalTo('app1.' . $resourceName . '.destroy'), $this->equalTo($urlWithParam))
- ->will($this->returnValue($destroyRoute));
+ ->willReturn($destroyRoute);
// load route configuration
$config = new RouteConfig($container, $router, $yaml);
@@ -448,20 +448,20 @@ class RoutingTest extends \Test\TestCase
->expects($this->exactly(1))
->method('method')
->with($this->equalTo($verb))
- ->will($this->returnValue($route));
+ ->willReturn($route);
$route
->expects($this->exactly(1))
->method('action')
->with($this->equalTo(new RouteActionHandler($container, $controllerName, $actionName)))
- ->will($this->returnValue($route));
+ ->willReturn($route);
if(count($requirements) > 0) {
$route
->expects($this->exactly(1))
->method('requirements')
->with($this->equalTo($requirements))
- ->will($this->returnValue($route));
+ ->willReturn($route);
}
if (count($defaults) > 0) {
@@ -469,7 +469,7 @@ class RoutingTest extends \Test\TestCase
->expects($this->exactly(1))
->method('defaults')
->with($this->equalTo($defaults))
- ->will($this->returnValue($route));
+ ->willReturn($route);
}
return $route;
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-09 07:04:00 +0000