Merge pull request #36580 from owncloud/coding-standard-2.0.0

Implement coding-standard 2.0.0
owncloud · Dec 12, 2019 · 5b1c76c · 5b1c76c
2 parents 73dfc5b + 93eb7f5
commit 5b1c76c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/apps/dav/tests/unit/Connector/Sabre/PublicDavLocksPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/PublicDavLocksPluginTest.php
@@ -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);
@@ -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);
@@ -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);

diff --git a/apps/dav/tests/unit/TrashBin/RootCollectionTest.php b/apps/dav/tests/unit/TrashBin/RootCollectionTest.php
@@ -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);

diff --git a/vendor-bin/owncloud-codestyle/composer.json b/vendor-bin/owncloud-codestyle/composer.json
@@ -1,6 +1,6 @@
 {
     "require": {
-      "owncloud/coding-standard": "^1.0"
+      "owncloud/coding-standard": "^2.0"
     }
   }