open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor: Apply rector changes

Browse Source 
Signed-off-by: GitHub <noreply@github.com>
pull/59151/head
nextcloud-command 5 months ago committed by GitHub
parent cde3780f01
commit 1ed0769d4c
8 changed files with 30 additions and 24 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      apps/dav/tests/unit/Connector/Sabre/AddExtraHeadersPluginTest.php
  2. 2
      tests/lib/AppFramework/Http/DispatcherTest.php
  3. 3
      tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php
  4. 3
      tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php
  5. 3
      tests/lib/AppFramework/Middleware/Security/PasswordConfirmationMiddlewareTest.php
  6. 3
      tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php
  7. 3
      tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php
  8. 31
      tests/lib/AppFramework/Utility/ControllerMethodReflectorTest.php

6
apps/dav/tests/unit/Connector/Sabre/AddExtraHeadersPluginTest.php
Unescape View File

@ -47,7 +47,7 @@ class AddExtraHeadersPluginTest extends TestCase {
$this->server->expects($this->once())
->method('on')
->willReturnCallback(
function ($method, $callback) use (&$afterPut) {
function ($method, $callback) use (&$afterPut): void {
$this->assertSame('afterMethod:PUT', $method);
$afterPut = $callback;
});
@ -70,7 +70,7 @@ class AddExtraHeadersPluginTest extends TestCase {
$this->server->expects($this->once())
->method('on')
->willReturnCallback(
function ($method, $callback) use (&$afterPut) {
function ($method, $callback) use (&$afterPut): void {
$this->assertSame('afterMethod:PUT', $method);
$afterPut = $callback;
});
@ -92,7 +92,7 @@ class AddExtraHeadersPluginTest extends TestCase {
$expectPermissionsHeader,
$expectOwnerIdHeader,
$matcher,
$ownerId, $permissions) {
$ownerId, $permissions): void {
$invocationNumber = $matcher->numberOfInvocations();
if ($invocationNumber === 0) {
throw new LogicException('No invocations were expected');

2
tests/lib/AppFramework/Http/DispatcherTest.php
Unescape View File

@ -123,7 +123,7 @@ class DispatcherTest extends \Test\TestCase {
$this->request = $this->createMock(Request::class);
$this->reflector = new ControllerMethodReflector(\OCP\Server::get(LoggerInterface::class));
$this->reflector = new ControllerMethodReflector(Server::get(LoggerInterface::class));
$this->dispatcher = new Dispatcher(
$this->http,

3
tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php
Unescape View File

@ -12,6 +12,7 @@ use OC\AppFramework\Utility\ControllerMethodReflector;
use OCP\AppFramework\Http\Response;
use OCP\IRequest;
use OCP\Security\Bruteforce\IThrottler;
use OCP\Server;
use Psr\Log\LoggerInterface;
use Test\AppFramework\Middleware\Security\Mock\BruteForceMiddlewareController;
use Test\TestCase;
@ -30,7 +31,7 @@ class BruteForceMiddlewareTest extends TestCase {
protected function setUp(): void {
parent::setUp();
$this->reflector = new ControllerMethodReflector(\OCP\Server::get(LoggerInterface::class));
$this->reflector = new ControllerMethodReflector(Server::get(LoggerInterface::class));
$this->throttler = $this->createMock(IThrottler::class);
$this->request = $this->createMock(IRequest::class);
$this->logger = $this->createMock(LoggerInterface::class);

3
tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php
Unescape View File

@ -20,6 +20,7 @@ use OCP\IConfig;
use OCP\IRequest;
use OCP\IRequestId;
use OCP\Security\Bruteforce\IThrottler;
use OCP\Server;
use PHPUnit\Framework\MockObject\MockObject;
use Psr\Log\LoggerInterface;
use Test\AppFramework\Middleware\Security\Mock\CORSMiddlewareController;
@ -33,7 +34,7 @@ class CORSMiddlewareTest extends \Test\TestCase {
protected function setUp(): void {
parent::setUp();
$this->reflector = new ControllerMethodReflector(\OCP\Server::get(LoggerInterface::class));
$this->reflector = new ControllerMethodReflector(Server::get(LoggerInterface::class));
$this->session = $this->createMock(Session::class);
$this->throttler = $this->createMock(IThrottler::class);
$this->logger = $this->createMock(LoggerInterface::class);

3
tests/lib/AppFramework/Middleware/Security/PasswordConfirmationMiddlewareTest.php
Unescape View File

@ -18,6 +18,7 @@ use OCP\IRequest;
use OCP\ISession;
use OCP\IUser;
use OCP\IUserSession;
use OCP\Server;
use Psr\Log\LoggerInterface;
use Test\AppFramework\Middleware\Security\Mock\PasswordConfirmationMiddlewareController;
use Test\TestCase;
@ -45,7 +46,7 @@ class PasswordConfirmationMiddlewareTest extends TestCase {
private Manager $userManager;
protected function setUp(): void {
$this->reflector = new ControllerMethodReflector(\OCP\Server::get(LoggerInterface::class));
$this->reflector = new ControllerMethodReflector(Server::get(LoggerInterface::class));
$this->session = $this->createMock(ISession::class);
$this->userSession = $this->createMock(IUserSession::class);
$this->user = $this->createMock(IUser::class);

3
tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php
Unescape View File

@ -22,6 +22,7 @@ use OCP\IRequest;
use OCP\ISession;
use OCP\IUser;
use OCP\IUserSession;
use OCP\Server;
use PHPUnit\Framework\MockObject\MockObject;
use Psr\Log\LoggerInterface;
use Test\AppFramework\Middleware\Security\Mock\RateLimitingMiddlewareController;
@ -45,7 +46,7 @@ class RateLimitingMiddlewareTest extends TestCase {
$this->request = $this->createMock(IRequest::class);
$this->userSession = $this->createMock(IUserSession::class);
$this->reflector = new ControllerMethodReflector(\OCP\Server::get(LoggerInterface::class));
$this->reflector = new ControllerMethodReflector(Server::get(LoggerInterface::class));
$this->limiter = $this->createMock(Limiter::class);
$this->session = $this->createMock(ISession::class);
$this->appConfig = $this->createMock(IAppConfig::class);

3
tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php
Unescape View File

@ -38,6 +38,7 @@ use OCP\IURLGenerator;
use OCP\IUser;
use OCP\IUserSession;
use OCP\Security\Ip\IRemoteAddress;
use OCP\Server;
use PHPUnit\Framework\MockObject\MockObject;
use Psr\Log\LoggerInterface;
use Test\AppFramework\Middleware\Security\Mock\NormalController;
@ -72,7 +73,7 @@ class SecurityMiddlewareTest extends \Test\TestCase {
'test',
$this->request
);
$this->reader = new ControllerMethodReflector(\OCP\Server::get(LoggerInterface::class));
$this->reader = new ControllerMethodReflector(Server::get(LoggerInterface::class));
$this->logger = $this->createMock(LoggerInterface::class);
$this->navigationManager = $this->createMock(INavigationManager::class);
$this->urlGenerator = $this->createMock(IURLGenerator::class);

31
tests/lib/AppFramework/Utility/ControllerMethodReflectorTest.php
Unescape View File

@ -9,6 +9,7 @@
namespace Test\AppFramework\Utility;
use OC\AppFramework\Utility\ControllerMethodReflector;
use OCP\Server;
use Psr\Log\LoggerInterface;
class BaseController {
@ -70,7 +71,7 @@ class ControllerMethodReflectorTest extends \Test\TestCase {
* @Annotation
*/
public function testReadAnnotation(): void {
$reader = new ControllerMethodReflector(\OCP\Server::get(LoggerInterface::class));
$reader = new ControllerMethodReflector(Server::get(LoggerInterface::class));
$reader->reflect(
'\Test\AppFramework\Utility\ControllerMethodReflectorTest',
'testReadAnnotation'
@ -83,7 +84,7 @@ class ControllerMethodReflectorTest extends \Test\TestCase {
* @Annotation(parameter=value)
*/
public function testGetAnnotationParameterSingle(): void {
$reader = new ControllerMethodReflector(\OCP\Server::get(LoggerInterface::class));
$reader = new ControllerMethodReflector(Server::get(LoggerInterface::class));
$reader->reflect(
self::class,
__FUNCTION__
@ -96,7 +97,7 @@ class ControllerMethodReflectorTest extends \Test\TestCase {
* @Annotation(parameter1=value1, parameter2=value2,parameter3=value3)
*/
public function testGetAnnotationParameterMultiple(): void {
$reader = new ControllerMethodReflector(\OCP\Server::get(LoggerInterface::class));
$reader = new ControllerMethodReflector(Server::get(LoggerInterface::class));
$reader->reflect(
self::class,
__FUNCTION__
@ -112,7 +113,7 @@ class ControllerMethodReflectorTest extends \Test\TestCase {
* @param test
*/
public function testReadAnnotationNoLowercase(): void {
$reader = new ControllerMethodReflector(\OCP\Server::get(LoggerInterface::class));
$reader = new ControllerMethodReflector(Server::get(LoggerInterface::class));
$reader->reflect(
'\Test\AppFramework\Utility\ControllerMethodReflectorTest',
'testReadAnnotationNoLowercase'
@ -128,7 +129,7 @@ class ControllerMethodReflectorTest extends \Test\TestCase {
* @param int $test
*/
public function testReadTypeIntAnnotations(): void {
$reader = new ControllerMethodReflector(\OCP\Server::get(LoggerInterface::class));
$reader = new ControllerMethodReflector(Server::get(LoggerInterface::class));
$reader->reflect(
'\Test\AppFramework\Utility\ControllerMethodReflectorTest',
'testReadTypeIntAnnotations'
@ -146,7 +147,7 @@ class ControllerMethodReflectorTest extends \Test\TestCase {
}
public function testReadTypeIntAnnotationsScalarTypes(): void {
$reader = new ControllerMethodReflector(\OCP\Server::get(LoggerInterface::class));
$reader = new ControllerMethodReflector(Server::get(LoggerInterface::class));
$reader->reflect(
'\Test\AppFramework\Utility\ControllerMethodReflectorTest',
'arguments3'
@ -164,7 +165,7 @@ class ControllerMethodReflectorTest extends \Test\TestCase {
* @param double $test something special
*/
public function testReadTypeDoubleAnnotations(): void {
$reader = new ControllerMethodReflector(\OCP\Server::get(LoggerInterface::class));
$reader = new ControllerMethodReflector(Server::get(LoggerInterface::class));
$reader->reflect(
'\Test\AppFramework\Utility\ControllerMethodReflectorTest',
'testReadTypeDoubleAnnotations'
@ -178,7 +179,7 @@ class ControllerMethodReflectorTest extends \Test\TestCase {
* @param string $foo
*/
public function testReadTypeWhitespaceAnnotations(): void {
$reader = new ControllerMethodReflector(\OCP\Server::get(LoggerInterface::class));
$reader = new ControllerMethodReflector(Server::get(LoggerInterface::class));
$reader->reflect(
'\Test\AppFramework\Utility\ControllerMethodReflectorTest',
'testReadTypeWhitespaceAnnotations'
@ -191,7 +192,7 @@ class ControllerMethodReflectorTest extends \Test\TestCase {
public function arguments($arg, $arg2 = 'hi') {
}
public function testReflectParameters(): void {
$reader = new ControllerMethodReflector(\OCP\Server::get(LoggerInterface::class));
$reader = new ControllerMethodReflector(Server::get(LoggerInterface::class));
$reader->reflect(
'\Test\AppFramework\Utility\ControllerMethodReflectorTest',
'arguments'
@ -204,7 +205,7 @@ class ControllerMethodReflectorTest extends \Test\TestCase {
public function arguments2($arg) {
}
public function testReflectParameters2(): void {
$reader = new ControllerMethodReflector(\OCP\Server::get(LoggerInterface::class));
$reader = new ControllerMethodReflector(Server::get(LoggerInterface::class));
$reader->reflect(
'\Test\AppFramework\Utility\ControllerMethodReflectorTest',
'arguments2'
@ -215,7 +216,7 @@ class ControllerMethodReflectorTest extends \Test\TestCase {
public function testInheritance(): void {
$reader = new ControllerMethodReflector(\OCP\Server::get(LoggerInterface::class));
$reader = new ControllerMethodReflector(Server::get(LoggerInterface::class));
$reader->reflect('Test\AppFramework\Utility\EndController', 'test');
$this->assertTrue($reader->hasAnnotation('Annotation'));
@ -223,7 +224,7 @@ class ControllerMethodReflectorTest extends \Test\TestCase {
public function testInheritanceOverride(): void {
$reader = new ControllerMethodReflector(\OCP\Server::get(LoggerInterface::class));
$reader = new ControllerMethodReflector(Server::get(LoggerInterface::class));
$reader->reflect('Test\AppFramework\Utility\EndController', 'test2');
$this->assertTrue($reader->hasAnnotation('NoAnnotation'));
@ -232,14 +233,14 @@ class ControllerMethodReflectorTest extends \Test\TestCase {
public function testInheritanceOverrideNoDocblock(): void {
$reader = new ControllerMethodReflector(\OCP\Server::get(LoggerInterface::class));
$reader = new ControllerMethodReflector(Server::get(LoggerInterface::class));
$reader->reflect('Test\AppFramework\Utility\EndController', 'test3');
$this->assertFalse($reader->hasAnnotation('Annotation'));
}
public function testRangeDetectionPsalm(): void {
$reader = new ControllerMethodReflector(\OCP\Server::get(LoggerInterface::class));
$reader = new ControllerMethodReflector(Server::get(LoggerInterface::class));
$reader->reflect('Test\AppFramework\Utility\EndController', 'test4');
$rangeInfo1 = $reader->getRange('rangedOne');
@ -260,7 +261,7 @@ class ControllerMethodReflectorTest extends \Test\TestCase {
}
public function testRangeDetectionNative(): void {
$reader = new ControllerMethodReflector(\OCP\Server::get(LoggerInterface::class));
$reader = new ControllerMethodReflector(Server::get(LoggerInterface::class));
$reader->reflect('Test\AppFramework\Utility\EndController', 'test5');
$rangeInfo1 = $reader->getRange('rangedOne');

Write Preview
Loading…
Cancel
Save