Merge pull request #24514 from owncloud/federation-psr4

Move federation app to PSR-4

23 files changed, 21 insertions, 11 deletions

diff --git a/apps/federation/api/ocsauthapi.php b/apps/federation/lib/API/OCSAuthAPI.php
index 1c4e73cc8de..1c4e73cc8de 100644
--- a/apps/federation/api/ocsauthapi.php
+++ b/apps/federation/lib/API/OCSAuthAPI.php
diff --git a/apps/federation/appinfo/application.php b/apps/federation/lib/AppInfo/Application.php
index 74185345329..74185345329 100644
--- a/apps/federation/appinfo/application.php
+++ b/apps/federation/lib/AppInfo/Application.php
diff --git a/apps/federation/backgroundjob/getsharedsecret.php b/apps/federation/lib/BackgroundJob/GetSharedSecret.php
index 66ab082c1a2..66ab082c1a2 100644
--- a/apps/federation/backgroundjob/getsharedsecret.php
+++ b/apps/federation/lib/BackgroundJob/GetSharedSecret.php
diff --git a/apps/federation/backgroundjob/requestsharedsecret.php b/apps/federation/lib/BackgroundJob/RequestSharedSecret.php
index 040e8e1d8e2..040e8e1d8e2 100644
--- a/apps/federation/backgroundjob/requestsharedsecret.php
+++ b/apps/federation/lib/BackgroundJob/RequestSharedSecret.php
diff --git a/apps/federation/command/syncfederationaddressbooks.php b/apps/federation/lib/Command/SyncFederationAddressBooks.php
index 879d38f8c22..879d38f8c22 100644
--- a/apps/federation/command/syncfederationaddressbooks.php
+++ b/apps/federation/lib/Command/SyncFederationAddressBooks.php
diff --git a/apps/federation/controller/settingscontroller.php b/apps/federation/lib/Controller/SettingsController.php
index 3adb6fced66..3adb6fced66 100644
--- a/apps/federation/controller/settingscontroller.php
+++ b/apps/federation/lib/Controller/SettingsController.php
diff --git a/apps/federation/dav/fedauth.php b/apps/federation/lib/DAV/FedAuth.php
index bb1041adcdf..bb1041adcdf 100644
--- a/apps/federation/dav/fedauth.php
+++ b/apps/federation/lib/DAV/FedAuth.php
diff --git a/apps/federation/lib/dbhandler.php b/apps/federation/lib/DbHandler.php
index 8720560efc6..8720560efc6 100644
--- a/apps/federation/lib/dbhandler.php
+++ b/apps/federation/lib/DbHandler.php
diff --git a/apps/federation/lib/hooks.php b/apps/federation/lib/Hooks.php
index b7f63d27f55..b7f63d27f55 100644
--- a/apps/federation/lib/hooks.php
+++ b/apps/federation/lib/Hooks.php
diff --git a/apps/federation/middleware/addservermiddleware.php b/apps/federation/lib/Middleware/AddServerMiddleware.php
index 15781251349..4b752f51ee4 100644
--- a/apps/federation/middleware/addservermiddleware.php
+++ b/apps/federation/lib/Middleware/AddServerMiddleware.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace OCA\Federation\Middleware ;
+namespace OCA\Federation\Middleware;
 
 use OC\HintException;
 use OCP\AppFramework\Http;
diff --git a/apps/federation/lib/syncfederationaddressbooks.php b/apps/federation/lib/SyncFederationAddressBooks.php
index 209094266ca..209094266ca 100644
--- a/apps/federation/lib/syncfederationaddressbooks.php
+++ b/apps/federation/lib/SyncFederationAddressBooks.php
diff --git a/apps/federation/lib/syncjob.php b/apps/federation/lib/SyncJob.php
index 2b904813b92..2b904813b92 100644
--- a/apps/federation/lib/syncjob.php
+++ b/apps/federation/lib/SyncJob.php
diff --git a/apps/federation/lib/trustedservers.php b/apps/federation/lib/TrustedServers.php
index 3b356ea2a49..3b356ea2a49 100644
--- a/apps/federation/lib/trustedservers.php
+++ b/apps/federation/lib/TrustedServers.php
diff --git a/apps/federation/tests/api/ocsauthapitest.php b/apps/federation/tests/API/OCSAuthAPITest.php
index d3e61c0641a..d3e61c0641a 100644
--- a/apps/federation/tests/api/ocsauthapitest.php
+++ b/apps/federation/tests/API/OCSAuthAPITest.php
diff --git a/apps/federation/tests/backgroundjob/getsharedsecrettest.php b/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php
index 25f7502741d..25f7502741d 100644
--- a/apps/federation/tests/backgroundjob/getsharedsecrettest.php
+++ b/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php
diff --git a/apps/federation/tests/backgroundjob/requestsharedsecrettest.php b/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php
index 5b4a1f87a5f..2fc4fe881a6 100644
--- a/apps/federation/tests/backgroundjob/requestsharedsecrettest.php
+++ b/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php
@@ -24,7 +24,13 @@ namespace OCA\Federation\Tests\BackgroundJob;
 
 
 use OCA\Federation\BackgroundJob\RequestSharedSecret;
+use OCA\Federation\DbHandler;
+use OCA\Federation\TrustedServers;
 use OCP\AppFramework\Http;
+use OCP\BackgroundJob\IJobList;
+use OCP\Http\Client\IClient;
+use OCP\Http\Client\IResponse;
+use OCP\IURLGenerator;
 use Test\TestCase;
 
 class RequestSharedSecretTest extends TestCase {
diff --git a/apps/federation/tests/controller/settingscontrollertest.php b/apps/federation/tests/Controller/SettingsControllerTest.php
index 65f7d5f91d3..65f7d5f91d3 100644
--- a/apps/federation/tests/controller/settingscontrollertest.php
+++ b/apps/federation/tests/Controller/SettingsControllerTest.php
diff --git a/apps/federation/tests/dav/fedauthtest.php b/apps/federation/tests/DAV/FedAuthTest.php
index b716084a45d..b716084a45d 100644
--- a/apps/federation/tests/dav/fedauthtest.php
+++ b/apps/federation/tests/DAV/FedAuthTest.php
diff --git a/apps/federation/tests/lib/dbhandlertest.php b/apps/federation/tests/DbHandlerTest.php
index 3ded486d36a..6e5b8f2f06c 100644
--- a/apps/federation/tests/lib/dbhandlertest.php
+++ b/apps/federation/tests/DbHandlerTest.php
@@ -21,7 +21,7 @@
  */
 
 
-namespace OCA\Federation\Tests\lib;
+namespace OCA\Federation\Tests;
 
 
 use OCA\Federation\DbHandler;
diff --git a/apps/federation/tests/lib/hookstest.php b/apps/federation/tests/HooksTest.php
index 71569226dd2..014829d9cf6 100644
--- a/apps/federation/tests/lib/hookstest.php
+++ b/apps/federation/tests/HooksTest.php
@@ -20,7 +20,7 @@
  */
 
 
-namespace OCA\Federation\Tests\lib;
+namespace OCA\Federation\Tests;
 
 
 use OCA\Federation\Hooks;
diff --git a/apps/federation/tests/middleware/addservermiddlewaretest.php b/apps/federation/tests/Middleware/AddServerMiddlewareTest.php
index be1d97c4035..be1d97c4035 100644
--- a/apps/federation/tests/middleware/addservermiddlewaretest.php
+++ b/apps/federation/tests/Middleware/AddServerMiddlewareTest.php
diff --git a/apps/federation/tests/lib/syncfederationaddressbookstest.php b/apps/federation/tests/SyncFederationAddressbooksTest.php
index aa2bd9ac2cb..4c266fae3a0 100644
--- a/apps/federation/tests/lib/syncfederationaddressbookstest.php
+++ b/apps/federation/tests/SyncFederationAddressbooksTest.php
@@ -20,7 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-namespace OCA\Federation\Tests\lib;
+namespace OCA\Federation\Tests;
 
 use OCA\Federation\DbHandler;
 use OCA\Federation\SyncFederationAddressBooks;
@@ -52,6 +52,7 @@ class SyncFederationAddressbooksTest extends \Test\TestCase {
 		$syncService->expects($this->once())->method('syncRemoteAddressBook')
 			->willReturn(1);
 
+		/** @var \OCA\DAV\CardDAV\SyncService $syncService */
 		$s = new SyncFederationAddressBooks($dbHandler, $syncService);
 		$s->syncThemAll(function($url, $ex) {
 			$this->callBacks[] = [$url, $ex];
@@ -79,6 +80,7 @@ class SyncFederationAddressbooksTest extends \Test\TestCase {
 		$syncService->expects($this->once())->method('syncRemoteAddressBook')
 			->willThrowException(new \Exception('something did not work out'));
 
+		/** @var \OCA\DAV\CardDAV\SyncService $syncService */
 		$s = new SyncFederationAddressBooks($dbHandler, $syncService);
 		$s->syncThemAll(function($url, $ex) {
 			$this->callBacks[] = [$url, $ex];
diff --git a/apps/federation/tests/lib/trustedserverstest.php b/apps/federation/tests/TrustedServersTest.php
index a8c7c7afb1f..e49db2556be 100644
--- a/apps/federation/tests/lib/trustedserverstest.php
+++ b/apps/federation/tests/TrustedServersTest.php
@@ -21,7 +21,7 @@
  */
 
 
-namespace OCA\Federation\Tests\lib;
+namespace OCA\Federation\Tests;
 
 
 use OCA\Federation\DbHandler;
@@ -38,7 +38,7 @@ use Test\TestCase;
 
 class TrustedServersTest extends TestCase {
 
-	/** @var  TrustedServers */
+	/** @var \PHPUnit_Framework_MockObject_MockObject | TrustedServers */
 	private $trustedServers;
 
 	/** @var  \PHPUnit_Framework_MockObject_MockObject | DbHandler */
@@ -101,7 +101,7 @@ class TrustedServersTest extends TestCase {
 	 * @param bool $success
 	 */
 	public function testAddServer($success) {
-		/** @var \PHPUnit_Framework_MockObject_MockObject | TrustedServers $trustedServer */
+		/** @var \PHPUnit_Framework_MockObject_MockObject|TrustedServers $trustedServers */
 		$trustedServers = $this->getMockBuilder('OCA\Federation\TrustedServers')
 			->setConstructorArgs(
 				[
@@ -172,7 +172,7 @@ class TrustedServersTest extends TestCase {
 			->with('federation', 'autoAddServers', '1')->willReturn($status);
 
 		$this->assertSame($expected,
-			$this->trustedServers->getAutoAddServers($status)
+			$this->trustedServers->getAutoAddServers()
 		);
 	}
 
@@ -208,6 +208,7 @@ class TrustedServersTest extends TestCase {
 				function($eventId, $event) {
 					$this->assertSame($eventId, 'OCP\Federation\TrustedServerEvent::remove');
 					$this->assertInstanceOf('Symfony\Component\EventDispatcher\GenericEvent', $event);
+					/** @var \Symfony\Component\EventDispatcher\GenericEvent $event */
 					$this->assertSame('url_hash', $event->getSubject());
 				}
 			);
@@ -215,9 +216,10 @@ class TrustedServersTest extends TestCase {
 	}
 
 	public function testGetServers() {
-		$this->dbHandler->expects($this->once())->method('getAllServer')->willReturn(true);
+		$this->dbHandler->expects($this->once())->method('getAllServer')->willReturn(['servers']);
 
-		$this->assertTrue(
+		$this->assertEquals(
+			['servers'],
 			$this->trustedServers->getServers()
 		);
 	}
@@ -257,7 +259,7 @@ class TrustedServersTest extends TestCase {
 
 		$server = 'server1';
 
-		/** @var \PHPUnit_Framework_MockObject_MockObject | TrustedServers $trustedServer */
+		/** @var \PHPUnit_Framework_MockObject_MockObject | TrustedServers $trustedServers */
 		$trustedServers = $this->getMockBuilder('OCA\Federation\TrustedServers')
 			->setConstructorArgs(
 				[