Update phpunit (#25986)

* Update phpunit dependency to 5.5

* getMock() -> createMock() or getMockBuilder()

* Fix integration tests - comment enable/disable app tests for now

* Update .htaccess

.htaccess

@@ -72,7 +72,3 @@ Options -Indexes
 <IfModule pagespeed_module>
   ModPagespeed Off
 </IfModule>
-#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####
-
-ErrorDocument 403 //core/templates/403.php
-ErrorDocument 404 //core/templates/404.php

apps/dav/lib/Connector/Sabre/File.php

@@ -73,7 +73,7 @@ class File extends Node implements IFile {
 	 * different object on a subsequent GET you are strongly recommended to not
 	 * return an ETag, and just return null.
 	 *
-	 * @param resource $data
+	 * @param resource|string $data
 	 *
 	 * @throws Forbidden
 	 * @throws UnsupportedMediaType

apps/dav/lib/Connector/Sabre/Node.php

@@ -115,6 +115,7 @@ public function getPath() {
 	 * @param string $name The new name
 	 * @throws \Sabre\DAV\Exception\BadRequest
 	 * @throws \Sabre\DAV\Exception\Forbidden
+	 * @throws InvalidPath
 	 */
 	public function setName($name) {
 

apps/dav/tests/unit/CardDAV/AddressBookImplTest.php

@@ -64,8 +64,8 @@ public function setUp() {
 			->disableOriginalConstructor()->getMock();
 		$this->backend = $this->getMockBuilder('\OCA\DAV\CardDAV\CardDavBackend')
 			->disableOriginalConstructor()->getMock();
-		$this->vCard = $this->getMock('Sabre\VObject\Component\VCard');
-		$this->urlGenerator = $this->getMock('OCP\IURLGenerator');
+		$this->vCard = $this->createMock('Sabre\VObject\Component\VCard');
+		$this->urlGenerator = $this->createMock('OCP\IURLGenerator');
 
 		$this->addressBookImpl = new AddressBookImpl(
 			$this->addressBook,

apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php

@@ -105,8 +105,10 @@ public function testOnCardChanged($expectedOp) {
 		$this->cardDav->expects($this->once())->method('getShares')->willReturn([]);
 
 		/** @var BirthdayService | \PHPUnit_Framework_MockObject_MockObject $service */
-		$service = $this->getMock('\OCA\DAV\CalDAV\BirthdayService',
-			['buildBirthdayFromContact', 'birthdayEvenChanged'], [$this->calDav, $this->cardDav, $this->groupPrincialBackend]);
+		$service = $this->getMockBuilder(BirthdayService::class)
+			->setMethods(['buildBirthdayFromContact', 'birthdayEvenChanged'])
+			->setConstructorArgs([$this->calDav, $this->cardDav, $this->groupPrincialBackend])
+			->getMock();
 
 		if ($expectedOp === 'delete') {
 			$this->calDav->expects($this->once())->method('getCalendarObject')->willReturn('');

apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php

@@ -57,7 +57,10 @@ function setUp() {
 		$this->server->tree = $this->tree;
 		$this->logger = $this->getMockBuilder('\OCP\ILogger')->getMock();
 
-		$this->plugin = $this->getMock('OCA\DAV\CardDAV\ImageExportPlugin', ['getPhoto'], [$this->logger]);
+		$this->plugin = $this->getMockBuilder('OCA\DAV\CardDAV\ImageExportPlugin')
+			->setMethods(['getPhoto'])
+			->setConstructorArgs([$this->logger])
+			->getMock();
 		$this->plugin->initialize($this->server);
 	}
 

apps/dav/tests/unit/CardDAV/SyncServiceTest.php

@@ -132,7 +132,7 @@ private function getSyncServiceMock($backend, $response) {
 		$userManager = $this->getMockBuilder('OCP\IUserManager')->disableOriginalConstructor()->getMock();
 		$logger = $this->getMockBuilder('OCP\ILogger')->disableOriginalConstructor()->getMock();
 		/** @var SyncService | \PHPUnit_Framework_MockObject_MockObject $ss */
-		$ss = $this->getMock('OCA\DAV\CardDAV\SyncService', ['ensureSystemAddressBookExists', 'requestSyncReport', 'download'], [$backend, $userManager, $logger]);
+		$ss = $this->createMock('OCA\DAV\CardDAV\SyncService', ['ensureSystemAddressBookExists', 'requestSyncReport', 'download'], [$backend, $userManager, $logger]);
 		$ss->method('requestSyncReport')->withAnyParameters()->willReturn(['response' => $response, 'token' => 'sync-token-1']);
 		$ss->method('ensureSystemAddressBookExists')->willReturn(['id' => 1]);
 		$ss->method('download')->willReturn([

apps/dav/tests/unit/Comments/CommentsNodeTest.php

@@ -38,11 +38,11 @@ class CommentsNodeTest extends \Test\TestCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->commentsManager = $this->getMock('\OCP\Comments\ICommentsManager');
-		$this->comment = $this->getMock('\OCP\Comments\IComment');
-		$this->userManager = $this->getMock('\OCP\IUserManager');
-		$this->userSession = $this->getMock('\OCP\IUserSession');
-		$this->logger = $this->getMock('\OCP\ILogger');
+		$this->commentsManager = $this->createMock('\OCP\Comments\ICommentsManager');
+		$this->comment = $this->createMock('\OCP\Comments\IComment');
+		$this->userManager = $this->createMock('\OCP\IUserManager');
+		$this->userSession = $this->createMock('\OCP\IUserSession');
+		$this->logger = $this->createMock('\OCP\ILogger');
 
 		$this->node = new CommentNode(
 			$this->commentsManager,
@@ -54,7 +54,7 @@ public function setUp() {
 	}
 
 	public function testDelete() {
-		$user = $this->getMock('\OCP\IUser');
+		$user = $this->createMock('\OCP\IUser');
 
 		$user->expects($this->once())
 			->method('getUID')
@@ -87,7 +87,7 @@ public function testDelete() {
 	 * @expectedException \Sabre\DAV\Exception\Forbidden
 	 */
 	public function testDeleteForbidden() {
-		$user = $this->getMock('\OCP\IUser');
+		$user = $this->createMock('\OCP\IUser');
 
 		$user->expects($this->once())
 			->method('getUID')
@@ -137,7 +137,7 @@ public function testGetLastModified() {
 	public function testUpdateComment() {
 		$msg = 'Hello Earth';
 
-		$user = $this->getMock('\OCP\IUser');
+		$user = $this->createMock('\OCP\IUser');
 
 		$user->expects($this->once())
 			->method('getUID')
@@ -173,7 +173,7 @@ public function testUpdateComment() {
 	public function testUpdateCommentLogException() {
 		$msg = null;
 
-		$user = $this->getMock('\OCP\IUser');
+		$user = $this->createMock('\OCP\IUser');
 
 		$user->expects($this->once())
 			->method('getUID')
@@ -210,7 +210,7 @@ public function testUpdateCommentLogException() {
 	 * @expectedExceptionMessage Message exceeds allowed character limit of
 	 */
 	public function testUpdateCommentMessageTooLongException() {
-		$user = $this->getMock('\OCP\IUser');
+		$user = $this->createMock('\OCP\IUser');
 
 		$user->expects($this->once())
 			->method('getUID')
@@ -248,7 +248,7 @@ public function testUpdateCommentMessageTooLongException() {
 	public function testUpdateForbiddenByUser() {
 		$msg = 'HaXX0r';
 
-		$user = $this->getMock('\OCP\IUser');
+		$user = $this->createMock('\OCP\IUser');
 
 		$user->expects($this->once())
 			->method('getUID')
@@ -281,7 +281,7 @@ public function testUpdateForbiddenByUser() {
 	public function testUpdateForbiddenByType() {
 		$msg = 'HaXX0r';
 
-		$user = $this->getMock('\OCP\IUser');
+		$user = $this->createMock('\OCP\IUser');
 
 		$user->expects($this->never())
 			->method('getUID');
@@ -454,7 +454,7 @@ public function testGetPropertiesUnreadProperty($creationDT, $readDT, $expected)
 
 		$this->userSession->expects($this->once())
 			->method('getUser')
-			->will($this->returnValue($this->getMock('\OCP\IUser')));
+			->will($this->returnValue($this->createMock('\OCP\IUser')));
 
 		$properties = $this->node->getProperties(null);
 

apps/dav/tests/unit/Comments/CommentsPluginTest.php

@@ -54,8 +54,8 @@ public function setUp() {
 			->setMethods(['getRequestUri'])
 			->getMock();
 
-		$this->commentsManager = $this->getMock('\OCP\Comments\ICommentsManager');
-		$this->userSession = $this->getMock('\OCP\IUserSession');
+		$this->commentsManager = $this->createMock('\OCP\Comments\ICommentsManager');
+		$this->userSession = $this->createMock('\OCP\IUserSession');
 
 		$this->plugin = new CommentsPluginImplementation($this->commentsManager, $this->userSession);
 	}
@@ -79,7 +79,7 @@ public function testCreateComment() {
 
 		$requestData = json_encode($commentData);
 
-		$user = $this->getMock('OCP\IUser');
+		$user = $this->createMock('OCP\IUser');
 		$user->expects($this->once())
 			->method('getUID')
 			->will($this->returnValue('alice'));
@@ -173,7 +173,7 @@ public function testCreateCommentInvalidObject() {
 
 		$path = 'comments/files/666';
 
-		$user = $this->getMock('OCP\IUser');
+		$user = $this->createMock('OCP\IUser');
 		$user->expects($this->never())
 			->method('getUID');
 
@@ -255,7 +255,7 @@ public function testCreateCommentInvalidActor() {
 
 		$requestData = json_encode($commentData);
 
-		$user = $this->getMock('OCP\IUser');
+		$user = $this->createMock('OCP\IUser');
 		$user->expects($this->never())
 			->method('getUID');
 
@@ -341,7 +341,7 @@ public function testCreateCommentUnsupportedMediaType() {
 
 		$requestData = json_encode($commentData);
 
-		$user = $this->getMock('OCP\IUser');
+		$user = $this->createMock('OCP\IUser');
 		$user->expects($this->never())
 			->method('getUID');
 
@@ -429,7 +429,7 @@ public function testCreateCommentInvalidPayload() {
 
 		$requestData = json_encode($commentData);
 
-		$user = $this->getMock('OCP\IUser');
+		$user = $this->createMock('OCP\IUser');
 		$user->expects($this->once())
 			->method('getUID')
 			->will($this->returnValue('alice'));
@@ -521,7 +521,7 @@ public function testCreateCommentMessageTooLong() {
 
 		$requestData = json_encode($commentData);
 
-		$user = $this->getMock('OCP\IUser');
+		$user = $this->createMock('OCP\IUser');
 		$user->expects($this->once())
 			->method('getUID')
 			->will($this->returnValue('alice'));
@@ -598,7 +598,7 @@ public function testOnReportInvalidNode() {
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('/' . $path)
-			->will($this->returnValue($this->getMock('\Sabre\DAV\INode')));
+			->will($this->returnValue($this->createMock('\Sabre\DAV\INode')));
 
 		$this->server->expects($this->any())
 			->method('getRequestUri')
@@ -617,7 +617,7 @@ public function testOnReportInvalidReportName() {
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('/' . $path)
-			->will($this->returnValue($this->getMock('\Sabre\DAV\INode')));
+			->will($this->returnValue($this->createMock('\Sabre\DAV\INode')));
 
 		$this->server->expects($this->any())
 			->method('getRequestUri')

apps/dav/tests/unit/Comments/EntityCollectionTest.php

@@ -38,10 +38,10 @@ class EntityCollectionTest extends \Test\TestCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->commentsManager = $this->getMock('\OCP\Comments\ICommentsManager');
-		$this->userManager = $this->getMock('\OCP\IUserManager');
-		$this->userSession = $this->getMock('\OCP\IUserSession');
-		$this->logger = $this->getMock('\OCP\ILogger');
+		$this->commentsManager = $this->createMock('\OCP\Comments\ICommentsManager');
+		$this->userManager = $this->createMock('\OCP\IUserManager');
+		$this->userSession = $this->createMock('\OCP\IUserSession');
+		$this->logger = $this->createMock('\OCP\ILogger');
 
 		$this->collection = new \OCA\DAV\Comments\EntityCollection(
 			'19',
@@ -61,7 +61,7 @@ public function testGetChild() {
 		$this->commentsManager->expects($this->once())
 			->method('get')
 			->with('55')
-			->will($this->returnValue($this->getMock('\OCP\Comments\IComment')));
+			->will($this->returnValue($this->createMock('\OCP\Comments\IComment')));
 
 		$node = $this->collection->getChild('55');
 		$this->assertTrue($node instanceof \OCA\DAV\Comments\CommentNode);
@@ -83,7 +83,7 @@ public function testGetChildren() {
 		$this->commentsManager->expects($this->once())
 			->method('getForObject')
 			->with('files', '19')
-			->will($this->returnValue([$this->getMock('\OCP\Comments\IComment')]));
+			->will($this->returnValue([$this->createMock('\OCP\Comments\IComment')]));
 
 		$result = $this->collection->getChildren();
 
@@ -96,7 +96,7 @@ public function testFindChildren() {
 		$this->commentsManager->expects($this->once())
 			->method('getForObject')
 			->with('files', '19', 5, 15, $dt)
-			->will($this->returnValue([$this->getMock('\OCP\Comments\IComment')]));
+			->will($this->returnValue([$this->createMock('\OCP\Comments\IComment')]));
 
 		$result = $this->collection->findChildren(5, 15, $dt);
 

apps/dav/tests/unit/Comments/EntityTypeCollectionTest.php

@@ -42,10 +42,10 @@ class EntityTypeCollectionTest extends \Test\TestCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->commentsManager = $this->getMock('\OCP\Comments\ICommentsManager');
-		$this->userManager = $this->getMock('\OCP\IUserManager');
-		$this->userSession = $this->getMock('\OCP\IUserSession');
-		$this->logger = $this->getMock('\OCP\ILogger');
+		$this->commentsManager = $this->createMock('\OCP\Comments\ICommentsManager');
+		$this->userManager = $this->createMock('\OCP\IUserManager');
+		$this->userSession = $this->createMock('\OCP\IUserSession');
+		$this->logger = $this->createMock('\OCP\ILogger');
 
 		$instance = $this;
 

apps/dav/tests/unit/Comments/RootCollectionTest.php

@@ -46,13 +46,13 @@ class RootCollectionTest extends \Test\TestCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->user = $this->getMock('\OCP\IUser');
+		$this->user = $this->createMock('\OCP\IUser');
 
-		$this->commentsManager = $this->getMock('\OCP\Comments\ICommentsManager');
-		$this->userManager = $this->getMock('\OCP\IUserManager');
-		$this->userSession = $this->getMock('\OCP\IUserSession');
+		$this->commentsManager = $this->createMock('\OCP\Comments\ICommentsManager');
+		$this->userManager = $this->createMock('\OCP\IUserManager');
+		$this->userSession = $this->createMock('\OCP\IUserSession');
 		$this->dispatcher = new EventDispatcher();
-		$this->logger = $this->getMock('\OCP\ILogger');
+		$this->logger = $this->createMock('\OCP\ILogger');
 
 		$this->collection = new \OCA\DAV\Comments\RootCollection(
 			$this->commentsManager,

apps/dav/tests/unit/Connector/PublicAuthTest.php

@@ -52,9 +52,9 @@ class PublicAuthTest extends \Test\TestCase {
 	protected function setUp() {
 		parent::setUp();
 
-		$this->session = $this->getMock('\OCP\ISession');
-		$this->request = $this->getMock('\OCP\IRequest');
-		$this->shareManager = $this->getMock('\OCP\Share\IManager');
+		$this->session = $this->createMock('\OCP\ISession');
+		$this->request = $this->createMock('\OCP\IRequest');
+		$this->shareManager = $this->createMock('\OCP\Share\IManager');
 
 		$this->auth = new \OCA\DAV\Connector\PublicAuth(
 			$this->request,
@@ -87,7 +87,7 @@ public function testNoShare() {
 	}
 
 	public function testShareNoPassword() {
-		$share = $this->getMock('OCP\Share\IShare');
+		$share = $this->createMock('OCP\Share\IShare');
 		$share->method('getPassword')->willReturn(null);
 
 		$this->shareManager->expects($this->once())
@@ -100,7 +100,7 @@ public function testShareNoPassword() {
 	}
 
 	public function testSharePasswordFancyShareType() {
-		$share = $this->getMock('OCP\Share\IShare');
+		$share = $this->createMock('OCP\Share\IShare');
 		$share->method('getPassword')->willReturn('password');
 		$share->method('getShareType')->willReturn(42);
 
@@ -115,7 +115,7 @@ public function testSharePasswordFancyShareType() {
 
 
 	public function testSharePasswordRemote() {
-		$share = $this->getMock('OCP\Share\IShare');
+		$share = $this->createMock('OCP\Share\IShare');
 		$share->method('getPassword')->willReturn('password');
 		$share->method('getShareType')->willReturn(\OCP\Share::SHARE_TYPE_REMOTE);
 
@@ -129,7 +129,7 @@ public function testSharePasswordRemote() {
 	}
 
 	public function testSharePasswordLinkValidPassword() {
-		$share = $this->getMock('OCP\Share\IShare');
+		$share = $this->createMock('OCP\Share\IShare');
 		$share->method('getPassword')->willReturn('password');
 		$share->method('getShareType')->willReturn(\OCP\Share::SHARE_TYPE_LINK);
 
@@ -149,7 +149,7 @@ public function testSharePasswordLinkValidPassword() {
 	}
 
 	public function testSharePasswordLinkValidSession() {
-		$share = $this->getMock('OCP\Share\IShare');
+		$share = $this->createMock('OCP\Share\IShare');
 		$share->method('getPassword')->willReturn('password');
 		$share->method('getShareType')->willReturn(\OCP\Share::SHARE_TYPE_LINK);
 		$share->method('getId')->willReturn('42');
@@ -173,7 +173,7 @@ public function testSharePasswordLinkValidSession() {
 	}
 
 	public function testSharePasswordLinkInvalidSession() {
-		$share = $this->getMock('OCP\Share\IShare');
+		$share = $this->createMock('OCP\Share\IShare');
 		$share->method('getPassword')->willReturn('password');
 		$share->method('getShareType')->willReturn(\OCP\Share::SHARE_TYPE_LINK);
 		$share->method('getId')->willReturn('42');

apps/dav/tests/unit/Connector/Sabre/AuthTest.php

@@ -586,7 +586,7 @@ public function testAuthenticateNoBasicAuthenticateHeadersProvidedWithAjaxButUse
 			->disableOriginalConstructor()
 			->getMock();
 		/** @var IUser */
-		$user = $this->getMock('OCP\IUser');
+		$user = $this->createMock('OCP\IUser');
 		$user->method('getUID')->willReturn('MyTestUser');
 		$this->userSession
 			->expects($this->any())