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

Coding standard 2.0.0
owncloud · Dec 17, 2019 · 895c798 · 895c798
2 parents 234434b + c2fa9b5
commit 895c798
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.drone.starlark b/.drone.starlark
@@ -1345,7 +1345,7 @@ def setupCeph(serviceParams):
 
 	createFirstBucket = serviceParams['createFirstBucket'] if 'createFirstBucket' in serviceParams else True
 	setupCommands = serviceParams['setupCommands'] if 'setupCommands' in serviceParams else [
-		'wait-for-it -t 120 ceph:80',
+		'wait-for-it -t 600 ceph:80',
 		'cd /var/www/owncloud/server/apps/files_primary_s3',
 		'cp tests/drone/ceph.config.php /var/www/owncloud/server/config',
 		'cd /var/www/owncloud/server',
@@ -1373,7 +1373,7 @@ def setupScality(serviceParams):
 	createFirstBucket = serviceParams['createFirstBucket'] if 'createFirstBucket' in serviceParams else True
 	createExtraBuckets = serviceParams['createExtraBuckets'] if 'createExtraBuckets' in serviceParams else False
 	setupCommands = serviceParams['setupCommands'] if 'setupCommands' in serviceParams else [
-		'wait-for-it -t 120 scality:8000',
+		'wait-for-it -t 600 scality:8000',
 		'cd /var/www/owncloud/server/apps/files_primary_s3',
 		'cp tests/drone/%s /var/www/owncloud/server/config' % configFile,
 		'cd /var/www/owncloud/server'

diff --git a/tests/unit/Db/TotpSecretMapperTest.php b/tests/unit/Db/TotpSecretMapperTest.php
@@ -61,9 +61,10 @@ protected function tearDown(): void {
 	}
 
 	/**
-	 * @expectedException \OCP\AppFramework\Db\DoesNotExistException
 	 */
 	public function testGetNonExistSecret() {
+		$this->expectException(\OCP\AppFramework\Db\DoesNotExistException::class);
+
 		$user = \OC::$server->getUserManager()->get('user2');
 		$this->mapper->getSecret($user);
 	}
@@ -101,9 +102,10 @@ public function testSetAllSecretsVerificationStatus() {
 	}
 
 	/**
-	 * @expectedException \OCP\AppFramework\Db\DoesNotExistException
 	 */
 	public function testDeleteSecretsByUserId() {
+		$this->expectException(\OCP\AppFramework\Db\DoesNotExistException::class);
+
 		$user = \OC::$server->getUserManager()->get('user1');
 		$secret = $this->mapper->getSecret($user);
 		$this->assertEquals($user->getUID(), $secret->getUserId());

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