Merge pull request #18079 from nextcloud/fixes/phpcs

Some php-cs fixes

13 files changed, 27 insertions, 21 deletions

diff --git a/core/Controller/AutoCompleteController.php b/core/Controller/AutoCompleteController.php
index 80f5d3c8630..df244df987c 100644
--- a/core/Controller/AutoCompleteController.php
+++ b/core/Controller/AutoCompleteController.php
@@ -24,8 +24,8 @@ declare(strict_types=1);
 
 namespace OC\Core\Controller;
 
-use OCP\AppFramework\OCSController as Controller;
 use OCP\AppFramework\Http\DataResponse;
+use OCP\AppFramework\OCSController as Controller;
 use OCP\Collaboration\AutoComplete\AutoCompleteEvent;
 use OCP\Collaboration\AutoComplete\IManager;
 use OCP\Collaboration\Collaborators\ISearch;
diff --git a/core/Controller/AvatarController.php b/core/Controller/AvatarController.php
index 9ee344f7ed8..cef68ec8348 100644
--- a/core/Controller/AvatarController.php
+++ b/core/Controller/AvatarController.php
@@ -25,6 +25,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
+
 namespace OC\Core\Controller;
 
 use OC\AppFramework\Utility\TimeFactory;
@@ -37,8 +38,8 @@ use OCP\Files\File;
 use OCP\Files\IRootFolder;
 use OCP\IAvatarManager;
 use OCP\ICache;
-use OCP\ILogger;
 use OCP\IL10N;
+use OCP\ILogger;
 use OCP\IRequest;
 use OCP\IUserManager;
 use OCP\IUserSession;
diff --git a/core/Controller/CollaborationResourcesController.php b/core/Controller/CollaborationResourcesController.php
index 46ec1136c94..caa1f1a16d0 100644
--- a/core/Controller/CollaborationResourcesController.php
+++ b/core/Controller/CollaborationResourcesController.php
@@ -24,8 +24,8 @@ namespace OC\Core\Controller;
 
 use Exception;
 use OCP\AppFramework\Http;
-use OCP\AppFramework\OCSController;
 use OCP\AppFramework\Http\DataResponse;
+use OCP\AppFramework\OCSController;
 use OCP\Collaboration\Resources\CollectionException;
 use OCP\Collaboration\Resources\ICollection;
 use OCP\Collaboration\Resources\IManager;
diff --git a/core/Controller/CssController.php b/core/Controller/CssController.php
index 901074d0285..bb9b7a37d8f 100644
--- a/core/Controller/CssController.php
+++ b/core/Controller/CssController.php
@@ -30,8 +30,8 @@ namespace OC\Core\Controller;
 use OC\Files\AppData\Factory;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
-use OCP\AppFramework\Http\NotFoundResponse;
 use OCP\AppFramework\Http\FileDisplayResponse;
+use OCP\AppFramework\Http\NotFoundResponse;
 use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Files\IAppData;
diff --git a/core/Controller/JsController.php b/core/Controller/JsController.php
index cdf22eda5fa..207b7113ab5 100644
--- a/core/Controller/JsController.php
+++ b/core/Controller/JsController.php
@@ -23,13 +23,14 @@ declare(strict_types=1);
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+
 namespace OC\Core\Controller;
 
 use OC\Files\AppData\Factory;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
-use OCP\AppFramework\Http\NotFoundResponse;
 use OCP\AppFramework\Http\FileDisplayResponse;
+use OCP\AppFramework\Http\NotFoundResponse;
 use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Files\IAppData;
diff --git a/core/Controller/LostController.php b/core/Controller/LostController.php
index 49f015d511d..1a3f86f95d3 100644
--- a/core/Controller/LostController.php
+++ b/core/Controller/LostController.php
@@ -31,29 +31,29 @@
 
 namespace OC\Core\Controller;
 
+use function array_filter;
+use function count;
 use OC\Authentication\TwoFactorAuth\Manager;
 use OC\Core\Exception\ResetPasswordException;
 use OC\HintException;
-use \OCP\AppFramework\Controller;
+use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\JSONResponse;
-use \OCP\AppFramework\Http\TemplateResponse;
+use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Defaults;
 use OCP\Encryption\IEncryptionModule;
 use OCP\Encryption\IManager;
+use OCP\IConfig;
 use OCP\IInitialStateService;
+use OCP\IL10N;
 use OCP\ILogger;
-use \OCP\IURLGenerator;
-use \OCP\IRequest;
-use \OCP\IL10N;
-use \OCP\IConfig;
+use OCP\IRequest;
+use OCP\IURLGenerator;
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\Mail\IMailer;
 use OCP\Security\ICrypto;
 use OCP\Security\ISecureRandom;
-use function array_filter;
-use function count;
 use function reset;
 
 /**
diff --git a/core/Controller/NavigationController.php b/core/Controller/NavigationController.php
index eb3b0968da3..654cb6d253d 100644
--- a/core/Controller/NavigationController.php
+++ b/core/Controller/NavigationController.php
@@ -20,6 +20,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
+
 namespace OC\Core\Controller;
 
 use OCP\AppFramework\Http;
diff --git a/core/Controller/OCJSController.php b/core/Controller/OCJSController.php
index 37fe17c8dd1..8ffc6d99290 100644
--- a/core/Controller/OCJSController.php
+++ b/core/Controller/OCJSController.php
@@ -23,6 +23,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+
 namespace OC\Core\Controller;
 
 use bantu\IniGetWrapper\IniGetWrapper;
diff --git a/core/Controller/OCSController.php b/core/Controller/OCSController.php
index 68861ce7e95..ce08fb657e2 100644
--- a/core/Controller/OCSController.php
+++ b/core/Controller/OCSController.php
@@ -23,6 +23,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+
 namespace OC\Core\Controller;
 
 use OC\CapabilitiesManager;
diff --git a/core/Controller/PreviewController.php b/core/Controller/PreviewController.php
index c25d9178310..edda49d0ded 100644
--- a/core/Controller/PreviewController.php
+++ b/core/Controller/PreviewController.php
@@ -26,11 +26,11 @@ declare(strict_types=1);
 namespace OC\Core\Controller;
 
 use OCP\AppFramework\Controller;
-use OCP\AppFramework\Utility\ITimeFactory;
-use OCP\Files\File;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\FileDisplayResponse;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\Files\File;
 use OCP\Files\IRootFolder;
 use OCP\Files\Node;
 use OCP\Files\NotFoundException;
diff --git a/core/Controller/SvgController.php b/core/Controller/SvgController.php
index 5ad6697eef3..a94394e6ffe 100644
--- a/core/Controller/SvgController.php
+++ b/core/Controller/SvgController.php
@@ -24,14 +24,14 @@ declare (strict_types = 1);
 
 namespace OC\Core\Controller;
 
+use OC\Template\IconsCacher;
+use OCP\App\IAppManager;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataDisplayResponse;
 use OCP\AppFramework\Http\NotFoundResponse;
 use OCP\AppFramework\Utility\ITimeFactory;
-use OCP\App\IAppManager;
 use OCP\IRequest;
-use OC\Template\IconsCacher;
 
 class SvgController extends Controller {
 
diff --git a/core/Controller/UserController.php b/core/Controller/UserController.php
index 24746c65e5f..a04e350b2b1 100644
--- a/core/Controller/UserController.php
+++ b/core/Controller/UserController.php
@@ -24,10 +24,10 @@
 
 namespace OC\Core\Controller;
 
-use \OCP\AppFramework\Controller;
-use \OCP\AppFramework\Http\JSONResponse;
-use \OCP\IRequest;
-use \OCP\IUserManager;
+use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\JSONResponse;
+use OCP\IRequest;
+use OCP\IUserManager;
 
 class UserController extends Controller {
 	/**
diff --git a/core/Controller/WalledGardenController.php b/core/Controller/WalledGardenController.php
index 737f5396779..be34b25b904 100644
--- a/core/Controller/WalledGardenController.php
+++ b/core/Controller/WalledGardenController.php
@@ -20,6 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+
 namespace OC\Core\Controller;
 
 use OCP\AppFramework\Controller;