Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement coding-standard 2.0.0 #36580

Merged
merged 1 commit into from
Dec 12, 2019
Merged

Implement coding-standard 2.0.0 #36580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions apps/dav/tests/unit/Connector/Sabre/PublicDavLocksPluginTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,10 @@ public function testGetHTTPMethodsForPublic() {
}

/**
* @expectedException \Sabre\DAV\Exception\MethodNotAllowed
*/
public function testHttpLockForPublicWithoutLocks() {
$this->expectException(\Sabre\DAV\Exception\MethodNotAllowed::class);

$this->matcher->method('__invoke')->willReturn(true);

$request = $this->createMock(RequestInterface::class);
Expand All @@ -71,9 +72,10 @@ public function testHttpLockForPublicWithoutLocks() {
}

/**
* @expectedException \Sabre\DAV\Exception\Locked
*/
public function testHttpLockForPublicWithLocks() {
$this->expectException(\Sabre\DAV\Exception\Locked::class);

$this->matcher->method('__invoke')->willReturn(true);

$request = $this->createMock(RequestInterface::class);
Expand All @@ -89,9 +91,10 @@ public function testHttpLockForPublicWithLocks() {
}

/**
* @expectedException \Sabre\DAV\Exception\MethodNotAllowed
*/
public function testHttpUnlockForPublic() {
$this->expectException(\Sabre\DAV\Exception\MethodNotAllowed::class);

$this->matcher->method('__invoke')->willReturn(true);

$request = $this->createMock(RequestInterface::class);
Expand Down
3 changes: 2 additions & 1 deletion apps/dav/tests/unit/TrashBin/RootCollectionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,10 @@ public function testGetChildForPrincipal() {
}

/**
* @expectedException \Sabre\DAV\Exception\NotAuthenticated
*/
public function testGetChildForPrincipalWithUnauthorizedUser() {
$this->expectException(\Sabre\DAV\Exception\NotAuthenticated::class);

$user = $this->createMock(IUser::class);
$user->method('getUID')->willReturn('john');
$userSession = $this->createMock(IUserSession::class);
Expand Down
2 changes: 1 addition & 1 deletion vendor-bin/owncloud-codestyle/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"require": {
"owncloud/coding-standard": "^1.0"
"owncloud/coding-standard": "^2.0"
}
}