Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2019-11-22 22:52:10 +0300
committerRoeland Jago Douma <roeland@famdouma.nl>2019-11-22 22:52:10 +0300
commit68748d4f85dd23238aaafb787b1c341f0f2f0419 (patch)
tree7aab3a925dda8dcd6ef4e8c6fe04063abbadd6af /apps/federation
parent21119633041d5ccae19975a58b0ae50ef5a8e33a (diff)
Some php-cs fixes
* Order the imports * No leading slash on imports * Empty line before namespace * One line per import * Empty after imports * Emmpty line at bottom of file Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'apps/federation')
-rw-r--r--apps/federation/lib/AppInfo/Application.php2
-rw-r--r--apps/federation/lib/BackgroundJob/GetSharedSecret.php3
-rw-r--r--apps/federation/lib/BackgroundJob/RequestSharedSecret.php3
-rw-r--r--apps/federation/lib/Command/SyncFederationAddressBooks.php1
-rw-r--r--apps/federation/lib/Controller/OCSAuthAPIController.php1
-rw-r--r--apps/federation/lib/Controller/SettingsController.php1
-rw-r--r--apps/federation/lib/DAV/FedAuth.php1
-rw-r--r--apps/federation/lib/DbHandler.php1
-rw-r--r--apps/federation/lib/Hooks.php1
-rw-r--r--apps/federation/lib/SyncFederationAddressBooks.php1
-rw-r--r--apps/federation/lib/TrustedServers.php1
-rw-r--r--apps/federation/tests/BackgroundJob/GetSharedSecretTest.php3
-rw-r--r--apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php1
-rw-r--r--apps/federation/tests/Controller/OCSAuthAPIControllerTest.php1
-rw-r--r--apps/federation/tests/Controller/SettingsControllerTest.php1
-rw-r--r--apps/federation/tests/DAV/FedAuthTest.php1
-rw-r--r--apps/federation/tests/DbHandlerTest.php1
-rw-r--r--apps/federation/tests/HooksTest.php1
-rw-r--r--apps/federation/tests/Middleware/AddServerMiddlewareTest.php1
-rw-r--r--apps/federation/tests/SyncFederationAddressbooksTest.php1
-rw-r--r--apps/federation/tests/TrustedServersTest.php1
21 files changed, 8 insertions, 20 deletions
diff --git a/apps/federation/lib/AppInfo/Application.php b/apps/federation/lib/AppInfo/Application.php
index 3798a03cb54..76d4bd3596f 100644
--- a/apps/federation/lib/AppInfo/Application.php
+++ b/apps/federation/lib/AppInfo/Application.php
@@ -29,10 +29,10 @@ use OCA\Federation\Hooks;
use OCA\Federation\Middleware\AddServerMiddleware;
use OCP\AppFramework\App;
use OCP\SabrePluginEvent;
+use OCP\Share;
use OCP\Util;
use Sabre\DAV\Auth\Plugin;
use Sabre\DAV\Server;
-use OCP\Share;
class Application extends App {
diff --git a/apps/federation/lib/BackgroundJob/GetSharedSecret.php b/apps/federation/lib/BackgroundJob/GetSharedSecret.php
index 30b04c5b123..d4e403ae45e 100644
--- a/apps/federation/lib/BackgroundJob/GetSharedSecret.php
+++ b/apps/federation/lib/BackgroundJob/GetSharedSecret.php
@@ -27,14 +27,13 @@
*
*/
-
namespace OCA\Federation\BackgroundJob;
use GuzzleHttp\Exception\ClientException;
use GuzzleHttp\Exception\RequestException;
use GuzzleHttp\Ring\Exception\RingException;
-use OC\BackgroundJob\JobList;
use OC\BackgroundJob\Job;
+use OC\BackgroundJob\JobList;
use OCA\Federation\TrustedServers;
use OCP\AppFramework\Http;
use OCP\AppFramework\Utility\ITimeFactory;
diff --git a/apps/federation/lib/BackgroundJob/RequestSharedSecret.php b/apps/federation/lib/BackgroundJob/RequestSharedSecret.php
index fb9fd25888f..863c893e51c 100644
--- a/apps/federation/lib/BackgroundJob/RequestSharedSecret.php
+++ b/apps/federation/lib/BackgroundJob/RequestSharedSecret.php
@@ -27,15 +27,14 @@
*
*/
-
namespace OCA\Federation\BackgroundJob;
use GuzzleHttp\Exception\ClientException;
use GuzzleHttp\Exception\RequestException;
use GuzzleHttp\Ring\Exception\RingException;
-use OC\BackgroundJob\JobList;
use OC\BackgroundJob\Job;
+use OC\BackgroundJob\JobList;
use OCA\Federation\TrustedServers;
use OCP\AppFramework\Http;
use OCP\AppFramework\Utility\ITimeFactory;
diff --git a/apps/federation/lib/Command/SyncFederationAddressBooks.php b/apps/federation/lib/Command/SyncFederationAddressBooks.php
index 3b1f95b0502..ebfcb4dd949 100644
--- a/apps/federation/lib/Command/SyncFederationAddressBooks.php
+++ b/apps/federation/lib/Command/SyncFederationAddressBooks.php
@@ -22,6 +22,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
+
namespace OCA\Federation\Command;
use Symfony\Component\Console\Command\Command;
diff --git a/apps/federation/lib/Controller/OCSAuthAPIController.php b/apps/federation/lib/Controller/OCSAuthAPIController.php
index 0433cd04b1b..8a21603bb96 100644
--- a/apps/federation/lib/Controller/OCSAuthAPIController.php
+++ b/apps/federation/lib/Controller/OCSAuthAPIController.php
@@ -26,7 +26,6 @@
*
*/
-
namespace OCA\Federation\Controller;
use OCA\Federation\DbHandler;
diff --git a/apps/federation/lib/Controller/SettingsController.php b/apps/federation/lib/Controller/SettingsController.php
index 6e64200dc8c..97aff93491e 100644
--- a/apps/federation/lib/Controller/SettingsController.php
+++ b/apps/federation/lib/Controller/SettingsController.php
@@ -31,7 +31,6 @@ use OCP\AppFramework\Http\DataResponse;
use OCP\IL10N;
use OCP\IRequest;
-
class SettingsController extends Controller {
/** @var IL10N */
diff --git a/apps/federation/lib/DAV/FedAuth.php b/apps/federation/lib/DAV/FedAuth.php
index 511888f7683..eb96fa75d76 100644
--- a/apps/federation/lib/DAV/FedAuth.php
+++ b/apps/federation/lib/DAV/FedAuth.php
@@ -20,6 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
+
namespace OCA\Federation\DAV;
use OCA\Federation\DbHandler;
diff --git a/apps/federation/lib/DbHandler.php b/apps/federation/lib/DbHandler.php
index abfb4c2f1b9..60142a8f0a7 100644
--- a/apps/federation/lib/DbHandler.php
+++ b/apps/federation/lib/DbHandler.php
@@ -24,7 +24,6 @@
*
*/
-
namespace OCA\Federation;
diff --git a/apps/federation/lib/Hooks.php b/apps/federation/lib/Hooks.php
index 6601b9c0eb7..48ef0f3c0b7 100644
--- a/apps/federation/lib/Hooks.php
+++ b/apps/federation/lib/Hooks.php
@@ -20,7 +20,6 @@
*
*/
-
namespace OCA\Federation;
diff --git a/apps/federation/lib/SyncFederationAddressBooks.php b/apps/federation/lib/SyncFederationAddressBooks.php
index b5cd9a574c4..cb485ccfc63 100644
--- a/apps/federation/lib/SyncFederationAddressBooks.php
+++ b/apps/federation/lib/SyncFederationAddressBooks.php
@@ -22,6 +22,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
+
namespace OCA\Federation;
use OC\OCS\DiscoveryService;
diff --git a/apps/federation/lib/TrustedServers.php b/apps/federation/lib/TrustedServers.php
index 092279eb2b9..391ba76c998 100644
--- a/apps/federation/lib/TrustedServers.php
+++ b/apps/federation/lib/TrustedServers.php
@@ -24,7 +24,6 @@
*
*/
-
namespace OCA\Federation;
use OC\HintException;
diff --git a/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php b/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php
index d195c81de31..adc621650af 100644
--- a/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php
+++ b/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php
@@ -24,15 +24,14 @@
*
*/
-
namespace OCA\Federation\Tests\BackgroundJob;
use GuzzleHttp\Exception\ConnectException;
use GuzzleHttp\Ring\Exception\RingException;
use OCA\Federation\BackgroundJob\GetSharedSecret;
-use OCA\Files_Sharing\Tests\TestCase;
use OCA\Federation\TrustedServers;
+use OCA\Files_Sharing\Tests\TestCase;
use OCP\AppFramework\Http;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\IJobList;
diff --git a/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php b/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php
index 45bed657ef8..e8f63fb30d3 100644
--- a/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php
+++ b/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php
@@ -23,7 +23,6 @@
*
*/
-
namespace OCA\Federation\Tests\BackgroundJob;
diff --git a/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php b/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php
index 26c0235fa70..df9f284d2c9 100644
--- a/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php
+++ b/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php
@@ -23,7 +23,6 @@
*
*/
-
namespace OCA\Federation\Tests\Controller;
diff --git a/apps/federation/tests/Controller/SettingsControllerTest.php b/apps/federation/tests/Controller/SettingsControllerTest.php
index f023274e3e4..41312b8ef2c 100644
--- a/apps/federation/tests/Controller/SettingsControllerTest.php
+++ b/apps/federation/tests/Controller/SettingsControllerTest.php
@@ -21,7 +21,6 @@
*
*/
-
namespace OCA\Federation\Tests\Controller;
diff --git a/apps/federation/tests/DAV/FedAuthTest.php b/apps/federation/tests/DAV/FedAuthTest.php
index 10c5e165eef..1140df334c8 100644
--- a/apps/federation/tests/DAV/FedAuthTest.php
+++ b/apps/federation/tests/DAV/FedAuthTest.php
@@ -20,7 +20,6 @@
*
*/
-
namespace OCA\Federation\Tests\DAV;
use OCA\Federation\DAV\FedAuth;
diff --git a/apps/federation/tests/DbHandlerTest.php b/apps/federation/tests/DbHandlerTest.php
index 8a1b9e32755..bad02685534 100644
--- a/apps/federation/tests/DbHandlerTest.php
+++ b/apps/federation/tests/DbHandlerTest.php
@@ -23,7 +23,6 @@
*
*/
-
namespace OCA\Federation\Tests;
diff --git a/apps/federation/tests/HooksTest.php b/apps/federation/tests/HooksTest.php
index e60c244d08c..34ac8dfd539 100644
--- a/apps/federation/tests/HooksTest.php
+++ b/apps/federation/tests/HooksTest.php
@@ -21,7 +21,6 @@
*
*/
-
namespace OCA\Federation\Tests;
diff --git a/apps/federation/tests/Middleware/AddServerMiddlewareTest.php b/apps/federation/tests/Middleware/AddServerMiddlewareTest.php
index 7bae5e566fc..eb063019424 100644
--- a/apps/federation/tests/Middleware/AddServerMiddlewareTest.php
+++ b/apps/federation/tests/Middleware/AddServerMiddlewareTest.php
@@ -23,7 +23,6 @@
*
*/
-
namespace OCA\Federation\Tests\Middleware;
diff --git a/apps/federation/tests/SyncFederationAddressbooksTest.php b/apps/federation/tests/SyncFederationAddressbooksTest.php
index 3ee12c8830c..2148b4b3c00 100644
--- a/apps/federation/tests/SyncFederationAddressbooksTest.php
+++ b/apps/federation/tests/SyncFederationAddressbooksTest.php
@@ -23,6 +23,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
+
namespace OCA\Federation\Tests;
use OC\OCS\DiscoveryService;
diff --git a/apps/federation/tests/TrustedServersTest.php b/apps/federation/tests/TrustedServersTest.php
index c350796a01a..209f41322c4 100644
--- a/apps/federation/tests/TrustedServersTest.php
+++ b/apps/federation/tests/TrustedServersTest.php
@@ -25,7 +25,6 @@
*
*/
-
namespace OCA\Federation\Tests;