Move imap related classes to OCA\Mail\IMAP namespace

nextcloud · Feb 28, 2017 · b98fe0e · b98fe0e
1 parent 03573e2
commit b98fe0e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/lib/Service/IMAP/IMAPClientFactory.php → lib/IMAP/IMAPClientFactory.php b/lib/Service/IMAP/IMAPClientFactory.php → lib/IMAP/IMAPClientFactory.php
@@ -19,10 +19,11 @@
  *
  */
 
-namespace OCA\Mail\Service\IMAP;
+namespace OCA\Mail\IMAP;
 
 use Horde_Imap_Client_Socket;
 use OCA\Mail\Account;
+use OCA\Mail\Cache\Cache;
 use OCP\ICacheFactory;
 use OCP\IConfig;
 use OCP\Security\ICrypto;

diff --git a/tests/Imap/AbstractTest.php → tests/IMAP/AbstractTest.php b/tests/Imap/AbstractTest.php → tests/IMAP/AbstractTest.php
@@ -21,7 +21,7 @@
  *
  */
 
-namespace OCA\Mail\Tests\Imap;
+namespace OCA\Mail\Tests\IMAP;
 
 use Exception;
 use OC;

diff --git a/tests/Imap/AccountTest.php → tests/IMAP/AccountTest.php b/tests/Imap/AccountTest.php → tests/IMAP/AccountTest.php
@@ -21,7 +21,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-namespace OCA\Mail\Tests\Imap;
+namespace OCA\Mail\Tests\IMAP;
 
 /**
  * @group IMAP

diff --git a/tests/Service/IMAP/IMAPClientFactoryTest.php → tests/IMAP/IMAPClientFactoryTest.php b/tests/Service/IMAP/IMAPClientFactoryTest.php → tests/IMAP/IMAPClientFactoryTest.php
@@ -19,20 +19,20 @@
  *
  */
 
-namespace OCA\Mail\Tests\Service\IMAP;
+namespace OCA\Mail\Tests\IMAP;
 
 use Horde_Imap_Client_Socket;
 use OC;
 use OCA\Mail\Account;
 use OCA\Mail\Db\MailAccount;
-use OCA\Mail\Service\IMAP\IMAPClientFactory;
+use OCA\Mail\IMAP\IMAPClientFactory;
 use OCP\ICacheFactory;
 use OCP\IConfig;
 use OCP\Security\ICrypto;
 use PHPUnit_Framework_MockObject_MockObject;
-use Test\TestCase;
+use PHPUnit_Framework_TestCase;
 
-class IMAPClientFactoryTest extends TestCase {
+class IMAPClientFactoryTest extends PHPUnit_Framework_TestCase {
 
 	/** @var ICrypto|PHPUnit_Framework_MockObject_MockObject */
 	private $crypto;
@@ -77,7 +77,7 @@ public function testGetClient() {
 			->method('decrypt')
 			->with($account->getMailAccount()->getInboundPassword())
 			->willReturn('mypassword');
-		
+
 		$client = $this->factory->getClient($account);
 
 		$this->assertInstanceOf(Horde_Imap_Client_Socket::class, $client);
@@ -89,7 +89,7 @@ public function testClientConectivity() {
 			->method('decrypt')
 			->with($account->getMailAccount()->getInboundPassword())
 			->willReturn('mypassword');
-		
+
 		$client = $this->factory->getClient($account);
 		$client->login();
 	}