Fix storage backend class namespaces and move to subdir

All classes that were previously \OC\Files\Storage\FooBar are now
\OCA\Files_External\Lib\Storage\FooBar

15 files changed, 100 insertions, 80 deletions

diff --git a/apps/files_external/tests/amazons3migration.php b/apps/files_external/tests/amazons3migration.php
index d4ea9e2c261..614d6ca33df 100644
--- a/apps/files_external/tests/amazons3migration.php
+++ b/apps/files_external/tests/amazons3migration.php
@@ -24,14 +24,16 @@
  */
 
 
-namespace Test\Files\Storage;
+namespace OCA\Files_External\Tests;
+
+use OCA\Files_External\Lib\Storage\AmazonS3;
 
 /**
  * Class AmazonS3Migration
  *
  * @group DB
  *
- * @package Test\Files\Storage
+ * @package OCA\Files_External\Tests
  */
 class AmazonS3Migration extends \Test\TestCase {
 
@@ -77,7 +79,7 @@ class AmazonS3Migration extends \Test\TestCase {
 		$fileId = $oldCache->put('foobar', array('size' => 0, 'mtime' => time(), 'mimetype' => 'httpd/directory'));
 
 		try {
-			$this->instance = new \OC\Files\Storage\AmazonS3($this->params);
+			$this->instance = new AmazonS3($this->params);
 		} catch (\Exception $e) {
 			//ignore
 		}
@@ -103,7 +105,7 @@ class AmazonS3Migration extends \Test\TestCase {
 		$fileId = $oldCache->put('/', array('size' => 0, 'mtime' => time(), 'mimetype' => 'httpd/directory'));
 
 		try {
-			$this->instance = new \OC\Files\Storage\AmazonS3($this->params);
+			$this->instance = new AmazonS3($this->params);
 		} catch (\Exception $e) {
 			//ignore
 		}
diff --git a/apps/files_external/tests/controller/storagescontrollertest.php b/apps/files_external/tests/controller/storagescontrollertest.php
index 5854cb00fee..4c3c62d5d6f 100644
--- a/apps/files_external/tests/controller/storagescontrollertest.php
+++ b/apps/files_external/tests/controller/storagescontrollertest.php
@@ -51,7 +51,7 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 	/**
 	 * @return \OCA\Files_External\Lib\Backend\Backend
 	 */
-	protected function getBackendMock($class = '\OCA\Files_External\Lib\Backend\SMB', $storageClass = '\OC\Files\Storage\SMB') {
+	protected function getBackendMock($class = '\OCA\Files_External\Lib\Backend\SMB', $storageClass = '\OCA\Files_External\Lib\Storage\SMB') {
 		$backend = $this->getMockBuilder('\OCA\Files_External\Lib\Backend\Backend')
 			->disableOriginalConstructor()
 			->getMock();
@@ -104,7 +104,7 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 
 		$response = $this->controller->create(
 			'mount',
-			'\OC\Files\Storage\SMB',
+			'\OCA\Files_External\Lib\Storage\SMB',
 			'\OCA\Files_External\Lib\Auth\NullMechanism',
 			array(),
 			[],
@@ -146,7 +146,7 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$response = $this->controller->update(
 			1,
 			'mount',
-			'\OC\Files\Storage\SMB',
+			'\OCA\Files_External\Lib\Storage\SMB',
 			'\OCA\Files_External\Lib\Auth\NullMechanism',
 			array(),
 			[],
@@ -188,7 +188,7 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 
 		$response = $this->controller->create(
 			$mountPoint,
-			'\OC\Files\Storage\SMB',
+			'\OCA\Files_External\Lib\Storage\SMB',
 			'\OCA\Files_External\Lib\Auth\NullMechanism',
 			array(),
 			[],
@@ -202,7 +202,7 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$response = $this->controller->update(
 			1,
 			$mountPoint,
-			'\OC\Files\Storage\SMB',
+			'\OCA\Files_External\Lib\Storage\SMB',
 			'\OCA\Files_External\Lib\Auth\NullMechanism',
 			array(),
 			[],
@@ -279,7 +279,7 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$response = $this->controller->update(
 			255,
 			'mount',
-			'\OC\Files\Storage\SMB',
+			'\OCA\Files_External\Lib\Storage\SMB',
 			'\OCA\Files_External\Lib\Auth\NullMechanism',
 			array(),
 			[],
@@ -375,7 +375,7 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 
 		$response = $this->controller->create(
 			'mount',
-			'\OC\Files\Storage\SMB',
+			'\OCA\Files_External\Lib\Storage\SMB',
 			'\OCA\Files_External\Lib\Auth\NullMechanism',
 			array(),
 			[],
diff --git a/apps/files_external/tests/controller/userstoragescontrollertest.php b/apps/files_external/tests/controller/userstoragescontrollertest.php
index a7e854471b5..804b752b6af 100644
--- a/apps/files_external/tests/controller/userstoragescontrollertest.php
+++ b/apps/files_external/tests/controller/userstoragescontrollertest.php
@@ -78,7 +78,7 @@ class UserStoragesControllerTest extends StoragesControllerTest {
 
 		$response = $this->controller->create(
 			'mount',
-			'\OC\Files\Storage\SMB',
+			'\OCA\Files_External\Lib\Storage\SMB',
 			'\Auth\Mechanism',
 			array(),
 			[],
@@ -92,7 +92,7 @@ class UserStoragesControllerTest extends StoragesControllerTest {
 		$response = $this->controller->update(
 			1,
 			'mount',
-			'\OC\Files\Storage\SMB',
+			'\OCA\Files_External\Lib\Storage\SMB',
 			'\Auth\Mechanism',
 			array(),
 			[],
diff --git a/apps/files_external/tests/owncloudfunctions.php b/apps/files_external/tests/owncloudfunctions.php
index 019f988275e..25aaa90d178 100644
--- a/apps/files_external/tests/owncloudfunctions.php
+++ b/apps/files_external/tests/owncloudfunctions.php
@@ -23,14 +23,14 @@
  *
  */
 
-namespace Test\Files\Storage;
+namespace OCA\Files_External\Tests;
 
 /**
  * Class OwnCloudFunctions
  *
  * @group DB
  *
- * @package Test\Files\Storage
+ * @package OCA\Files_External\Tests
  */
 class OwnCloudFunctions extends \Test\TestCase {
 
@@ -109,7 +109,7 @@ class OwnCloudFunctions extends \Test\TestCase {
 	public function testConfig($config, $expectedUri) {
 		$config['user'] = 'someuser';
 		$config['password'] = 'somepassword';
-		$instance = new \OC\Files\Storage\OwnCloud($config);
+		$instance = new \OCA\Files_External\Lib\Storage\OwnCloud($config);
 		$this->assertEquals($expectedUri, $instance->createBaseUri());
 	}
 }
diff --git a/apps/files_external/tests/service/storagesservicetest.php b/apps/files_external/tests/service/storagesservicetest.php
index 3fbe3b755e1..f93c0134814 100644
--- a/apps/files_external/tests/service/storagesservicetest.php
+++ b/apps/files_external/tests/service/storagesservicetest.php
@@ -121,9 +121,9 @@ abstract class StoragesServiceTest extends \Test\TestCase {
 		$this->backendService->method('getAuthMechanisms')
 			->will($this->returnValue($authMechanisms));
 
-		$sftpBackend = $this->getBackendMock('\OCA\Files_External\Lib\Backend\SFTP', '\OC\Files\Storage\SFTP');
+		$sftpBackend = $this->getBackendMock('\OCA\Files_External\Lib\Backend\SFTP', '\OCA\Files_External\Lib\Storage\SFTP');
 		$backends = [
-			'identifier:\OCA\Files_External\Lib\Backend\SMB' => $this->getBackendMock('\OCA\Files_External\Lib\Backend\SMB', '\OC\Files\Storage\SMB'),
+			'identifier:\OCA\Files_External\Lib\Backend\SMB' => $this->getBackendMock('\OCA\Files_External\Lib\Backend\SMB', '\OCA\Files_External\Lib\Storage\SMB'),
 			'identifier:\OCA\Files_External\Lib\Backend\SFTP' => $sftpBackend,
 			'identifier:sftp_alias' => $sftpBackend,
 		];
@@ -171,7 +171,7 @@ abstract class StoragesServiceTest extends \Test\TestCase {
 		}
 	}
 
-	protected function getBackendMock($class = '\OCA\Files_External\Lib\Backend\SMB', $storageClass = '\OC\Files\Storage\SMB') {
+	protected function getBackendMock($class = '\OCA\Files_External\Lib\Backend\SMB', $storageClass = '\OCA\Files_External\Lib\Storage\SMB') {
 		$backend = $this->getMockBuilder('\OCA\Files_External\Lib\Backend\Backend')
 			->disableOriginalConstructor()
 			->getMock();
diff --git a/apps/files_external/tests/backends/amazons3.php b/apps/files_external/tests/storage/amazons3test.php
index 3b43f81a926..eb0e410764c 100644
--- a/apps/files_external/tests/backends/amazons3.php
+++ b/apps/files_external/tests/storage/amazons3test.php
@@ -24,16 +24,18 @@
  *
  */
 
-namespace Test\Files\Storage;
+namespace OCA\Files_External\Tests\Storage;
+
+use \OCA\Files_External\Lib\Storage\AmazonS3;
 
 /**
- * Class AmazonS3
+ * Class AmazonS3Test
  *
  * @group DB
  *
- * @package Test\Files\Storage
+ * @package OCA\Files_External\Tests\Storage
  */
-class AmazonS3 extends Storage {
+class AmazonS3Test extends \Test\Files\Storage\Storage {
 
 	private $config;
 
@@ -44,7 +46,7 @@ class AmazonS3 extends Storage {
 		if ( ! is_array($this->config) or ! $this->config['run']) {
 			$this->markTestSkipped('AmazonS3 backend not configured');
 		}
-		$this->instance = new \OC\Files\Storage\AmazonS3($this->config);
+		$this->instance = new AmazonS3($this->config);
 	}
 
 	protected function tearDown() {
diff --git a/apps/files_external/tests/backends/dropbox.php b/apps/files_external/tests/storage/dropboxtest.php
index 1bf8b4171fb..d466d4b1b44 100644
--- a/apps/files_external/tests/backends/dropbox.php
+++ b/apps/files_external/tests/storage/dropboxtest.php
@@ -24,16 +24,18 @@
  *
  */
 
-namespace Test\Files\Storage;
+namespace OCA\Files_External\Tests\Storage;
+
+use \OCA\Files_External\Lib\Storage\Dropbox;
 
 /**
- * Class Dropbox
+ * Class DropboxTest
  *
  * @group DB
  *
- * @package Test\Files\Storage
+ * @package OCA\Files_External\Tests\Storage
  */
-class Dropbox extends Storage {
+class DropboxTest extends \Test\Files\Storage\Storage {
 	private $config;
 
 	protected function setUp() {
@@ -45,7 +47,7 @@ class Dropbox extends Storage {
 			$this->markTestSkipped('Dropbox backend not configured');
 		}
 		$this->config['dropbox']['root'] .= '/' . $id; //make sure we have an new empty folder to work in
-		$this->instance = new \OC\Files\Storage\Dropbox($this->config['dropbox']);
+		$this->instance = new Dropbox($this->config['dropbox']);
 	}
 
 	protected function tearDown() {
diff --git a/apps/files_external/tests/backends/ftp.php b/apps/files_external/tests/storage/ftptest.php
index 868a022d38f..9af9ccff012 100644
--- a/apps/files_external/tests/backends/ftp.php
+++ b/apps/files_external/tests/storage/ftptest.php
@@ -24,16 +24,18 @@
  *
  */
 
-namespace Test\Files\Storage;
+namespace OCA\Files_External\Tests\Storage;
+
+use \OCA\Files_External\Lib\Storage\FTP;
 
 /**
- * Class FTP
+ * Class FTPTest
  *
  * @group DB
  *
- * @package Test\Files\Storage
+ * @package OCA\Files_External\Tests\Storage
  */
-class FTP extends Storage {
+class FTPTest extends \Test\Files\Storage\Storage {
 	private $config;
 
 	protected function setUp() {
@@ -45,7 +47,7 @@ class FTP extends Storage {
 			$this->markTestSkipped('FTP backend not configured');
 		}
 		$this->config['root'] .= '/' . $id; //make sure we have an new empty folder to work in
-		$this->instance = new \OC\Files\Storage\FTP($this->config);
+		$this->instance = new FTP($this->config);
 		$this->instance->mkdir('/');
 	}
 
@@ -63,31 +65,31 @@ class FTP extends Storage {
 						  'password' => 'ftp',
 						  'root' => '/',
 						  'secure' => false );
-		$instance = new \OC\Files\Storage\FTP($config);
+		$instance = new FTP($config);
 		$this->assertEquals('ftp://ftp:ftp@localhost/', $instance->constructUrl(''));
 
 		$config['secure'] = true;
-		$instance = new \OC\Files\Storage\FTP($config);
+		$instance = new FTP($config);
 		$this->assertEquals('ftps://ftp:ftp@localhost/', $instance->constructUrl(''));
 
 		$config['secure'] = 'false';
-		$instance = new \OC\Files\Storage\FTP($config);
+		$instance = new FTP($config);
 		$this->assertEquals('ftp://ftp:ftp@localhost/', $instance->constructUrl(''));
 
 		$config['secure'] = 'true';
-		$instance = new \OC\Files\Storage\FTP($config);
+		$instance = new FTP($config);
 		$this->assertEquals('ftps://ftp:ftp@localhost/', $instance->constructUrl(''));
 
 		$config['root'] = '';
-		$instance = new \OC\Files\Storage\FTP($config);
+		$instance = new FTP($config);
 		$this->assertEquals('ftps://ftp:ftp@localhost/somefile.txt', $instance->constructUrl('somefile.txt'));
 
 		$config['root'] = '/abc';
-		$instance = new \OC\Files\Storage\FTP($config);
+		$instance = new FTP($config);
 		$this->assertEquals('ftps://ftp:ftp@localhost/abc/somefile.txt', $instance->constructUrl('somefile.txt'));
 
 		$config['root'] = '/abc/';
-		$instance = new \OC\Files\Storage\FTP($config);
+		$instance = new FTP($config);
 		$this->assertEquals('ftps://ftp:ftp@localhost/abc/somefile.txt', $instance->constructUrl('somefile.txt'));
 	}
 }
diff --git a/apps/files_external/tests/backends/google.php b/apps/files_external/tests/storage/googletest.php
index 7622f796407..46aa4555b12 100644
--- a/apps/files_external/tests/backends/google.php
+++ b/apps/files_external/tests/storage/googletest.php
@@ -25,18 +25,18 @@
  *
  */
 
-namespace Test\Files\Storage;
+namespace OCA\Files_External\Tests\Storage;
 
-require_once 'files_external/lib/google.php';
+use \OCA\Files_External\Lib\Storage\Google;
 
 /**
- * Class Google
+ * Class GoogleTest
  *
  * @group DB
  *
- * @package Test\Files\Storage
+ * @package OCA\Files_External\Tests\Storage
  */
-class Google extends Storage {
+class GoogleTest extends \Test\Files\Storage\Storage {
 
 	private $config;
 
@@ -49,7 +49,7 @@ class Google extends Storage {
 		) {
 			$this->markTestSkipped('Google Drive backend not configured');
 		}
-		$this->instance = new \OC\Files\Storage\Google($this->config['google']);
+		$this->instance = new Google($this->config['google']);
 	}
 
 	protected function tearDown() {
diff --git a/apps/files_external/tests/backends/owncloud.php b/apps/files_external/tests/storage/owncloudtest.php
index a56e9b2a186..cbc25e46fa0 100644
--- a/apps/files_external/tests/backends/owncloud.php
+++ b/apps/files_external/tests/storage/owncloudtest.php
@@ -22,16 +22,18 @@
  *
  */
 
-namespace Test\Files\Storage;
+namespace OCA\Files_External\Tests\Storage;
+
+use \OCA\Files_External\Lib\Storage\OwnCloud;
 
 /**
- * Class OwnCloud
+ * Class OwnCloudTest
  *
  * @group DB
  *
- * @package Test\Files\Storage
+ * @package OCA\Files_External\Tests\Storage
  */
-class OwnCloud extends Storage {
+class OwnCloudTest extends \Test\Files\Storage\Storage {
 
 	private $config;
 
@@ -44,7 +46,7 @@ class OwnCloud extends Storage {
 			$this->markTestSkipped('ownCloud backend not configured');
 		}
 		$this->config['owncloud']['root'] .= '/' . $id; //make sure we have an new empty folder to work in
-		$this->instance = new \OC\Files\Storage\OwnCloud($this->config['owncloud']);
+		$this->instance = new OwnCloud($this->config['owncloud']);
 		$this->instance->mkdir('/');
 	}
 
diff --git a/apps/files_external/tests/backends/sftp_key.php b/apps/files_external/tests/storage/sftp_keytest.php
index 73c6a0b6432..b974f88555f 100644
--- a/apps/files_external/tests/backends/sftp_key.php
+++ b/apps/files_external/tests/storage/sftp_keytest.php
@@ -22,16 +22,18 @@
  *
  */
 
-namespace Test\Files\Storage;
+namespace OCA\Files_External\Tests\Storage;
+
+use \OCA\Files_External\Lib\Storage\SFTP_Key;
 
 /**
- * Class SFTP_Key
+ * Class SFTP_KeyTest
  *
  * @group DB
  *
- * @package Test\Files\Storage
+ * @package OCA\Files_External\Tests\Storage
  */
-class SFTP_Key extends Storage {
+class SFTP_KeyTest extends \Test\Files\Storage\Storage {
 	private $config;
 
 	protected function setUp() {
@@ -44,7 +46,7 @@ class SFTP_Key extends Storage {
 		}
 		// Make sure we have an new empty folder to work in
 		$this->config['sftp_key']['root'] .= '/' . $id;
-		$this->instance = new \OC\Files\Storage\SFTP_Key($this->config['sftp_key']);
+		$this->instance = new SFTP_Key($this->config['sftp_key']);
 		$this->instance->mkdir('/');
 	}
 
diff --git a/apps/files_external/tests/backends/sftp.php b/apps/files_external/tests/storage/sftptest.php
index 608982adbc4..329e93819fc 100644
--- a/apps/files_external/tests/backends/sftp.php
+++ b/apps/files_external/tests/storage/sftptest.php
@@ -24,18 +24,20 @@
  *
  */
 
-namespace Test\Files\Storage;
+namespace OCA\Files_External\Tests\Storage;
+
+use \OCA\Files_External\Lib\Storage\SFTP;
 
 /**
- * Class SFTP
+ * Class SFTPTest
  *
  * @group DB
  *
- * @package Test\Files\Storage
+ * @package OCA\Files_External\Tests\Storage
  */
-class SFTP extends Storage {
+class SFTPTest extends \Test\Files\Storage\Storage {
 	/**
-	 * @var \OC\Files\Storage\SFTP instance
+	 * @var SFTP instance
 	 */
 	protected $instance;
 
@@ -50,7 +52,7 @@ class SFTP extends Storage {
 			$this->markTestSkipped('SFTP backend not configured');
 		}
 		$this->config['root'] .= '/' . $id; //make sure we have an new empty folder to work in
-		$this->instance = new \OC\Files\Storage\SFTP($this->config);
+		$this->instance = new SFTP($this->config);
 		$this->instance->mkdir('/');
 	}
 
@@ -66,7 +68,7 @@ class SFTP extends Storage {
 	 * @dataProvider configProvider
 	 */
 	public function testStorageId($config, $expectedStorageId) {
-		$instance = new \OC\Files\Storage\SFTP($config);
+		$instance = new SFTP($config);
 		$this->assertEquals($expectedStorageId, $instance->getId());
 	}
 
diff --git a/apps/files_external/tests/backends/smb.php b/apps/files_external/tests/storage/smbtest.php
index f9a377c271b..fc2795702c6 100644
--- a/apps/files_external/tests/backends/smb.php
+++ b/apps/files_external/tests/storage/smbtest.php
@@ -23,16 +23,18 @@
  *
  */
 
-namespace Test\Files\Storage;
+namespace OCA\Files_External\Tests\Storage;
+
+use \OCA\Files_External\Lib\Storage\SMB;
 
 /**
- * Class SMB
+ * Class SMBTest
  *
  * @group DB
  *
- * @package Test\Files\Storage
+ * @package OCA\Files_External\Tests\Storage
  */
-class SMB extends Storage {
+class SMBTest extends \Test\Files\Storage\Storage {
 
 	protected function setUp() {
 		parent::setUp();
@@ -46,7 +48,7 @@ class SMB extends Storage {
 			$config['root'] .= '/';
 		}
 		$config['root'] .= $id; //make sure we have an new empty folder to work in
-		$this->instance = new \OC\Files\Storage\SMB($config);
+		$this->instance = new SMB($config);
 		$this->instance->mkdir('/');
 	}
 
@@ -71,7 +73,7 @@ class SMB extends Storage {
 	}
 
 	public function testStorageId() {
-		$this->instance = new \OC\Files\Storage\SMB([
+		$this->instance = new SMB([
 			'host' => 'testhost',
 			'user' => 'testuser',
 			'password' => 'somepass',
diff --git a/apps/files_external/tests/backends/swift.php b/apps/files_external/tests/storage/swifttest.php
index 9bdcd48ee68..1bcbb815067 100644
--- a/apps/files_external/tests/backends/swift.php
+++ b/apps/files_external/tests/storage/swifttest.php
@@ -24,16 +24,18 @@
  *
  */
 
-namespace Test\Files\Storage;
+namespace OCA\Files_External\Tests\Storage;
+
+use \OCA\Files_External\Lib\Storage\Swift;
 
 /**
- * Class Swift
+ * Class SwiftTest
  *
  * @group DB
  *
- * @package Test\Files\Storage
+ * @package OCA\Files_External\Tests\Storage
  */
-class Swift extends Storage {
+class SwiftTest extends \Test\Files\Storage\Storage {
 
 	private $config;
 
@@ -44,7 +46,7 @@ class Swift extends Storage {
 		if (!is_array($this->config) or !$this->config['run']) {
 			$this->markTestSkipped('OpenStack Object Storage backend not configured');
 		}
-		$this->instance = new \OC\Files\Storage\Swift($this->config);
+		$this->instance = new Swift($this->config);
 	}
 
 	protected function tearDown() {
diff --git a/apps/files_external/tests/backends/webdav.php b/apps/files_external/tests/storage/webdavtest.php
index e1a710c94b4..f8c5b19e04f 100644
--- a/apps/files_external/tests/backends/webdav.php
+++ b/apps/files_external/tests/storage/webdavtest.php
@@ -23,16 +23,18 @@
  *
  */
 
-namespace Test\Files\Storage;
+namespace OCA\Files_External\Tests\Storage;
+
+use \OC\Files\Storage\DAV;
 
 /**
- * Class DAV
+ * Class WebDAVTest
  *
  * @group DB
  *
- * @package Test\Files\Storage
+ * @package OCA\Files_External\Tests\Storage
  */
-class DAV extends Storage {
+class WebDAVTest extends \Test\Files\Storage\Storage {
 
 	protected function setUp() {
 		parent::setUp();
@@ -46,7 +48,7 @@ class DAV extends Storage {
 			$this->waitDelay = $config['wait'];
 		}
 		$config['root'] .= '/' . $id; //make sure we have an new empty folder to work in
-		$this->instance = new \OC\Files\Storage\DAV($config);
+		$this->instance = new DAV($config);
 		$this->instance->mkdir('/');
 	}