wip

tests/lib/Contacts/ContactsMenu/ContactsStoreTest.php

@@ -77,10 +77,10 @@ public function testGetContactsWithoutFilter(): void {
 			->with($this->equalTo(''), $this->equalTo(['FN', 'EMAIL']))
 			->willReturn([
 				[
-					'UID' => 123,
+					'UID' => '123',
 				],
 				[
-					'UID' => 567,
+					'UID' => '567',
 					'FN' => 'Darren Roner',
 					'EMAIL' => [
 						'darren@roner.au'
@@ -110,7 +110,7 @@ public function testGetContactsHidesOwnEntry(): void {
 					'UID' => 'user123',
 				],
 				[
-					'UID' => 567,
+					'UID' => '567',
 					'FN' => 'Darren Roner',
 					'EMAIL' => [
 						'darren@roner.au'
@@ -138,10 +138,10 @@ public function testGetContactsWithoutBinaryImage(): void {
 			->with($this->equalTo(''), $this->equalTo(['FN', 'EMAIL']))
 			->willReturn([
 				[
-					'UID' => 123,
+					'UID' => '123',
 				],
 				[
-					'UID' => 567,
+					'UID' => '567',
 					'FN' => 'Darren Roner',
 					'EMAIL' => [
 						'darren@roner.au'
@@ -167,10 +167,10 @@ public function testGetContactsWithoutAvatarURI(): void {
 			->with($this->equalTo(''), $this->equalTo(['FN', 'EMAIL']))
 			->willReturn([
 				[
-					'UID' => 123,
+					'UID' => '123',
 				],
 				[
-					'UID' => 567,
+					'UID' => '567',
 					'FN' => 'Darren Roner',
 					'EMAIL' => [
 						'darren@roner.au'
@@ -868,7 +868,7 @@ public function testFindOneUser(): void {
 			->with($this->equalTo('a567'), $this->equalTo(['UID']))
 			->willReturn([
 				[
-					'UID' => 123,
+					'UID' => '123',
 					'isLocalSystemBook' => false
 				],
 				[
@@ -899,7 +899,7 @@ public function testFindOneEMail(): void {
 			->with($this->equalTo('darren@roner.au'), $this->equalTo(['EMAIL']))
 			->willReturn([
 				[
-					'UID' => 123,
+					'UID' => '123',
 					'isLocalSystemBook' => false
 				],
 				[
@@ -939,7 +939,7 @@ public function testFindOneNoMatches(): void {
 			->with($this->equalTo('a567'), $this->equalTo(['UID']))
 			->willReturn([
 				[
-					'UID' => 123,
+					'UID' => '123',
 					'isLocalSystemBook' => false
 				],
 				[

tests/lib/Files/Mount/MountPointTest.php

@@ -18,7 +18,7 @@ public function testGetStorage(): void {
 		$storage = $this->createMock(Storage::class);
 		$storage->expects($this->once())
 			->method('getId')
-			->willReturn(123);
+			->willReturn('123');
 
 		$loader = $this->createMock(StorageFactory::class);
 		$loader->expects($this->once())
@@ -34,7 +34,7 @@ public function testGetStorage(): void {
 		);
 
 		$this->assertEquals($storage, $mountPoint->getStorage());
-		$this->assertEquals(123, $mountPoint->getStorageId());
+		$this->assertEquals('123', $mountPoint->getStorageId());
 		$this->assertEquals('/mountpoint/', $mountPoint->getMountPoint());
 
 		$mountPoint->setMountPoint('another');

tests/lib/Files/ViewTest.php

@@ -1750,6 +1750,8 @@ public function basicOperationProviderForLocks() {
 				ILockingProvider::LOCK_SHARED,
 				ILockingProvider::LOCK_EXCLUSIVE,
 				ILockingProvider::LOCK_SHARED,
+				null,
+				0,
 			],
 
 			// ---- delete hook ----
@@ -2515,7 +2517,7 @@ public function testRemoveMoveableMountPoint(): void {
 			->willReturn($mountPoint);
 		$mount->expects($this->once())
 			->method('removeMount')
-			->willReturn('foo');
+			->willReturn(true);
 		$mount->expects($this->any())
 			->method('getInternalPath')
 			->willReturn('');
@@ -2548,7 +2550,7 @@ public function testRemoveMoveableMountPoint(): void {
 
 		//Delete the mountpoint
 		$view = new View('/' . $this->user . '/files');
-		$this->assertEquals('foo', $view->rmdir('mount'));
+		$this->assertEquals(true, $view->rmdir('mount'));
 	}
 
 	public function mimeFilterProvider() {

tests/lib/Template/ResourceLocatorTest.php

@@ -41,12 +41,12 @@ public function testFind(): void {
 		$locator = $this->getResourceLocator('theme');
 		$locator->expects($this->once())
 			->method('doFind')
-			->with('foo');
+			->with('app/foo');
 		$locator->expects($this->once())
 			->method('doFindTheme')
-			->with('foo');
+			->with('app/foo');
 		/** @var \OC\Template\ResourceLocator $locator */
-		$locator->find(['foo']);
+		$locator->find(['app/foo']);
 	}
 
 	public function testFindNotFound(): void {
@@ -59,17 +59,17 @@ public function testFindNotFound(): void {
 			['core' => 'map'], ['3rd' => 'party'], ['foo' => 'bar']);
 		$locator->expects($this->once())
 			->method('doFind')
-			->with('foo')
-			->will($this->throwException(new ResourceNotFoundException('foo', 'map')));
+			->with('app/foo')
+			->will($this->throwException(new ResourceNotFoundException('app/foo', 'map')));
 		$locator->expects($this->once())
 			->method('doFindTheme')
-			->with('foo')
-			->will($this->throwException(new ResourceNotFoundException('foo', 'map')));
+			->with('app/foo')
+			->will($this->throwException(new ResourceNotFoundException('app/foo', 'map')));
 		$this->logger->expects($this->exactly(2))
 			->method('debug')
-			->with($this->stringContains('map/foo'));
+			->with($this->stringContains('map/app/foo'));
 		/** @var \OC\Template\ResourceLocator $locator */
-		$locator->find(['foo']);
+		$locator->find(['app/foo']);
 	}
 
 	public function testAppendIfExist(): void {

tests/lib/TemplateFunctionsTest.php

@@ -170,12 +170,12 @@ public function testRelativeDateLastYear(): void {
 	public function testRelativeDateYearsAgo(): void {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime - 86400 * 365.25 * 2;
-		$result = (string)relative_modified_date($elementTime, $currentTime, true);
+		$result = (string)relative_modified_date((int)$elementTime, $currentTime, true);
 
 		$this->assertEquals('2 years ago', $result);
 
 		$elementTime = $currentTime - 86400 * 365.25 * 3;
-		$result = (string)relative_modified_date($elementTime, $currentTime, true);
+		$result = (string)relative_modified_date((int)$elementTime, $currentTime, true);
 
 		$this->assertEquals('3 years ago', $result);
 	}
@@ -264,12 +264,12 @@ public function testRelativeTimeLastYear(): void {
 	public function testRelativeTimeYearsAgo(): void {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime - 86400 * 365.25 * 2;
-		$result = (string)relative_modified_date($elementTime, $currentTime, false);
+		$result = (string)relative_modified_date((int)$elementTime, $currentTime, false);
 
 		$this->assertEquals('2 years ago', $result);
 
 		$elementTime = $currentTime - 86400 * 365.25 * 3;
-		$result = (string)relative_modified_date($elementTime, $currentTime, false);
+		$result = (string)relative_modified_date((int)$elementTime, $currentTime, false);
 
 		$this->assertEquals('3 years ago', $result);
 	}

tests/lib/User/ManagerTest.php

@@ -154,7 +154,7 @@ public function testCheckPassword(): void {
 		$backend->expects($this->once())
 			->method('checkPassword')
 			->with($this->equalTo('foo'), $this->equalTo('bar'))
-			->willReturn(true);
+			->willReturn('foo');
 
 		$backend->expects($this->any())
 			->method('implementsActions')

tests/lib/User/SessionTest.php

@@ -970,7 +970,7 @@ public function testCreateRememberedSessionToken(): void {
 			->method('generateToken')
 			->with($sessionId, $uid, $loginName, $password, 'Firefox', IToken::TEMPORARY_TOKEN, IToken::REMEMBER);
 
-		$this->assertTrue($userSession->createSessionToken($request, $uid, $loginName, $password, true));
+		$this->assertTrue($userSession->createSessionToken($request, $uid, $loginName, $password, IToken::REMEMBER));
 	}
 
 	public function testCreateSessionTokenWithTokenPassword(): void {