Merge pull request #32051 from owncloud/tech-dept/deprecate-storage-i…

…nterface Remove deprecated interface OCP\Files\Storage in favor of OCP\Files\S…
owncloud · Jul 23, 2018 · 7fb3bbb · 7fb3bbb
2 parents d1f5aec + c2d096e
commit 7fb3bbb
Show file tree

Hide file tree

Showing 41 changed files with 656 additions and 1,043 deletions.
diff --git a/apps/dav/lib/Connector/Sabre/File.php b/apps/dav/lib/Connector/Sabre/File.php
@@ -437,7 +437,7 @@ public function getDirectDownload() {
 		if (\OCP\App::isEnabled('encryption')) {
 			return [];
 		}
-		/** @var \OCP\Files\Storage $storage */
+		/** @var \OCP\Files\Storage\IStorage $storage */
 		list($storage, $internalPath) = $this->fileView->resolvePath($this->path);
 		if ($storage === null) {
 			return [];
@@ -610,7 +610,7 @@ private static function isChecksumValid(Storage $storage, $path) {
 	 * or whether the file can be assembled/uploaded directly on the
 	 * target storage.
 	 *
-	 * @param \OCP\Files\Storage $storage
+	 * @param \OCP\Files\Storage\IStorage $storage
 	 * @return bool true if the storage needs part file handling
 	 */
 	private function needsPartFile($storage) {

diff --git a/apps/dav/tests/unit/Connector/Sabre/FileTest.php b/apps/dav/tests/unit/Connector/Sabre/FileTest.php
@@ -98,7 +98,7 @@ public function tearDown() {
 	 * @return \PHPUnit_Framework_MockObject_MockObject | Storage
 	 */
 	private function getMockStorage() {
-		$storage = $this->createMock(Storage::class);
+		$storage = $this->createMock(Storage\IStorage::class);
 		$storage->expects($this->any())
 			->method('getId')
 			->will($this->returnValue('home::someuser'));

diff --git a/apps/dav/tests/unit/Connector/Sabre/NodeTest.php b/apps/dav/tests/unit/Connector/Sabre/NodeTest.php
@@ -25,6 +25,13 @@
 
 namespace OCA\DAV\Tests\unit\Connector\Sabre;
 
+use OCP\Files\Storage\IStorage;
+use OC\Files\View;
+use OC\Files\FileInfo;
+use OCP\Share\IShare;
+use OCP\Share\IManager;
+use OCP\Files\Mount\IMountPoint;
+
 /**
  * Class NodeTest
  *
@@ -50,7 +57,7 @@ public function davPermissionsProvider() {
 	 * @dataProvider davPermissionsProvider
 	 */
 	public function testDavPermissions($permissions, $type, $shared, $mounted, $expected) {
-		$info = $this->getMockBuilder('\OC\Files\FileInfo')
+		$info = $this->getMockBuilder(FileInfo::class)
 			->disableOriginalConstructor()
 			->setMethods(['getPermissions', 'isShared', 'isMounted', 'getType'])
 			->getMock();
@@ -66,7 +73,7 @@ public function testDavPermissions($permissions, $type, $shared, $mounted, $expe
 		$info->expects($this->any())
 			->method('getType')
 			->will($this->returnValue($type));
-		$view = $this->createMock('\OC\Files\View');
+		$view = $this->createMock(View::class);
 
 		$node = new  \OCA\DAV\Connector\Sabre\File($view, $info);
 		$this->assertEquals($expected, $node->getDavPermissions());
@@ -116,13 +123,13 @@ public function sharePermissionsProvider() {
 	 * @dataProvider sharePermissionsProvider
 	 */
 	public function testSharePermissions($type, $user, $permissions, $expected) {
-		$storage = $this->createMock('\OCP\Files\Storage');
+		$storage = $this->createMock(IStorage::class);
 		$storage->method('getPermissions')->willReturn($permissions);
 
-		$mountpoint = $this->createMock('\OCP\Files\Mount\IMountPoint');
+		$mountpoint = $this->createMock(IMountPoint::class);
 		$mountpoint->method('getMountPoint')->willReturn('myPath');
-		$shareManager = $this->getMockBuilder('OCP\Share\IManager')->disableOriginalConstructor()->getMock();
-		$share = $this->getMockBuilder('OCP\Share\IShare')->disableOriginalConstructor()->getMock();
+		$shareManager = $this->getMockBuilder(IManager::class)->disableOriginalConstructor()->getMock();
+		$share = $this->getMockBuilder(IShare::class)->disableOriginalConstructor()->getMock();
 
 		if ($user === null) {
 			$shareManager->expects($this->never())->method('getShareByToken');
@@ -133,7 +140,7 @@ public function testSharePermissions($type, $user, $permissions, $expected) {
 			$share->expects($this->once())->method('getPermissions')->willReturn($permissions);
 		}
 
-		$info = $this->getMockBuilder('\OC\Files\FileInfo')
+		$info = $this->getMockBuilder(FileInfo::class)
 			->disableOriginalConstructor()
 			->setMethods(['getStorage', 'getType', 'getMountPoint'])
 			->getMock();
@@ -142,7 +149,7 @@ public function testSharePermissions($type, $user, $permissions, $expected) {
 		$info->method('getType')->willReturn($type);
 		$info->method('getMountPoint')->willReturn($mountpoint);
 
-		$view = $this->createMock('\OC\Files\View');
+		$view = $this->createMock(View::class);
 
 		$node = new  \OCA\DAV\Connector\Sabre\File($view, $info);
 		$this->invokePrivate($node, 'shareManager', [$shareManager]);
@@ -163,14 +170,14 @@ public function fileIdProvider() {
 	 * @dataProvider fileIdProvider
 	 */
 	public function testFileId($instanceid, $numericid, $fullid) {
-		$info = $this->getMockBuilder('\OC\Files\FileInfo')
+		$info = $this->getMockBuilder(FileInfo::class)
 			->disableOriginalConstructor()
 			->setMethods(['getId'])
 			->getMock();
 		$info->expects($this->any())
 			->method('getId')
 			->will($this->returnValue($numericid));
-		$view = $this->createMock('\OC\Files\View');
+		$view = $this->createMock(View::class);
 
 		\OC::$server->getSystemConfig()->setValue('instanceid', $instanceid);
 

diff --git a/apps/federation/tests/DbHandlerTest.php b/apps/federation/tests/DbHandlerTest.php
@@ -50,7 +50,7 @@ public function setUp() {
 		parent::setUp();
 
 		$this->connection = \OC::$server->getDatabaseConnection();
-		$this->il10n = $this->createMock('OCP\IL10N');
+		$this->il10n = $this->createMock(IL10N::class);
 
 		$this->dbHandler = new DbHandler(
 			$this->connection,
@@ -74,6 +74,7 @@ public function tearDown() {
 	 * @param string $url passed to the method
 	 * @param string $expectedUrl the url we expect to be written to the db
 	 * @param string $expectedHash the hash value we expect to be written to the db
+	 * @throws \OC\HintException
 	 */
 	public function testAddServer($url, $expectedUrl, $expectedHash) {
 		$id = $this->dbHandler->addServer($url);
@@ -141,6 +142,7 @@ public function testGetAll() {
 	 * @param string $serverInTable
 	 * @param string $checkForServer
 	 * @param bool $expected
+	 * @throws \OC\HintException
 	 */
 	public function testServerExists($serverInTable, $checkForServer, $expected) {
 		$this->dbHandler->addServer($serverInTable);
@@ -272,6 +274,10 @@ public function dataTestNormalizeUrl() {
 
 	/**
 	 * @dataProvider providesAuth
+	 * @param $expectedResult
+	 * @param $user
+	 * @param $password
+	 * @throws \OC\HintException
 	 */
 	public function testAuth($expectedResult, $user, $password) {
 		if ($expectedResult) {

diff --git a/apps/files_sharing/lib/SharedStorage.php b/apps/files_sharing/lib/SharedStorage.php
@@ -374,7 +374,7 @@ public function unshareStorage() {
 	 * @throws \OCP\Lock\LockedException
 	 */
 	public function acquireLock($path, $type, ILockingProvider $provider) {
-		/** @var \OCP\Files\Storage $targetStorage */
+		/** @var \OCP\Files\Storage\IStorage $targetStorage */
 		list($targetStorage, $targetInternalPath) = $this->resolvePath($path);
 		$targetStorage->acquireLock($targetInternalPath, $type, $provider);
 		// lock the parent folders of the owner when locking the share as recipient
@@ -390,7 +390,7 @@ public function acquireLock($path, $type, ILockingProvider $provider) {
 	 * @param \OCP\Lock\ILockingProvider $provider
 	 */
 	public function releaseLock($path, $type, ILockingProvider $provider) {
-		/** @var \OCP\Files\Storage $targetStorage */
+		/** @var \OCP\Files\Storage\IStorage $targetStorage */
 		list($targetStorage, $targetInternalPath) = $this->resolvePath($path);
 		$targetStorage->releaseLock($targetInternalPath, $type, $provider);
 		// unlock the parent folders of the owner when unlocking the share as recipient
@@ -406,7 +406,7 @@ public function releaseLock($path, $type, ILockingProvider $provider) {
 	 * @param \OCP\Lock\ILockingProvider $provider
 	 */
 	public function changeLock($path, $type, ILockingProvider $provider) {
-		/** @var \OCP\Files\Storage $targetStorage */
+		/** @var \OCP\Files\Storage\IStorage $targetStorage */
 		list($targetStorage, $targetInternalPath) = $this->resolvePath($path);
 		$targetStorage->changeLock($targetInternalPath, $type, $provider);
 	}