Merge pull request #18079 from nextcloud/fixes/phpcs

Some php-cs fixes

apps/accessibility/lib/AppInfo/Application.php

@@ -25,8 +25,8 @@
 
 use OCP\AppFramework\App;
 use OCP\IConfig;
-use OCP\IUserSession;
 use OCP\IURLGenerator;
+use OCP\IUserSession;
 
 class Application extends App {
 

apps/accessibility/lib/Controller/AccessibilityController.php

@@ -26,19 +26,19 @@
 use Leafo\ScssPhp\Compiler;
 use Leafo\ScssPhp\Exception\ParserException;
 use Leafo\ScssPhp\Formatter\Crunched;
+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\DataDownloadResponse;
 use OCP\AppFramework\Utility\ITimeFactory;
-use OCP\App\IAppManager;
 use OCP\IConfig;
 use OCP\ILogger;
 use OCP\IRequest;
 use OCP\IURLGenerator;
 use OCP\IUserManager;
 use OCP\IUserSession;
-use OC\Template\IconsCacher;
 
 class AccessibilityController extends Controller {
 

apps/accessibility/lib/Controller/ConfigController.php

@@ -26,8 +26,8 @@
 use OCA\Accessibility\AccessibilityProvider;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
-use OCP\AppFramework\OCSController;
 use OCP\AppFramework\OCS\OCSBadRequestException;
+use OCP\AppFramework\OCSController;
 use OCP\IConfig;
 use OCP\IRequest;
 use OCP\IUserSession;

apps/admin_audit/lib/AppInfo/Application.php

@@ -47,9 +47,9 @@
 use OCP\ILogger;
 use OCP\IPreview;
 use OCP\IUserSession;
+use OCP\Share;
 use OCP\Util;
 use Symfony\Component\EventDispatcher\GenericEvent;
-use OCP\Share;
 
 class Application extends App {
 

apps/cloud_federation_api/lib/AppInfo/Application.php

@@ -19,7 +19,6 @@
  *
  */
 
-
 namespace OCA\CloudFederationAPI\AppInfo;
 
 

apps/cloud_federation_api/lib/Capabilities.php

@@ -19,7 +19,6 @@
  *
  */
 
-
 namespace OCA\CloudFederationAPI;
 
 

apps/cloud_federation_api/lib/Config.php

@@ -19,13 +19,11 @@
  *
  */
 
-
 namespace OCA\CloudFederationAPI;
 use OCP\Federation\ICloudFederationProviderManager;
 use OCP\GlobalScale\IConfig as IGsConfig;
 use OCP\IConfig;
 
-
 /**
  * Class config
  *

apps/cloud_federation_api/lib/Controller/RequestHandlerController.php

@@ -31,9 +31,9 @@
 use OCP\Federation\Exceptions\AuthenticationFailedException;
 use OCP\Federation\Exceptions\BadRequestException;
 use OCP\Federation\Exceptions\ProviderCouldNotAddShareException;
+use OCP\Federation\Exceptions\ProviderDoesNotExistsException;
 use OCP\Federation\ICloudFederationFactory;
 use OCP\Federation\ICloudFederationProviderManager;
-use OCP\Federation\Exceptions\ProviderDoesNotExistsException;
 use OCP\Federation\ICloudIdManager;
 use OCP\IGroupManager;
 use OCP\ILogger;
@@ -42,7 +42,6 @@
 use OCP\IUserManager;
 use OCP\Share\Exceptions\ShareNotFound;
 
-
 /**
  * Class RequestHandlerController
  *

apps/comments/lib/Activity/Setting.php

@@ -97,4 +97,3 @@ public function isDefaultEnabledMail() {
 		return false;
 	}
 }
-

apps/comments/tests/Unit/EventHandlerTest.php

@@ -23,11 +23,11 @@
 
 namespace OCA\Comments\Tests\Unit\Notification;
 
+use OCA\Comments\Activity\Listener as ActivityListener;
 use OCA\Comments\EventHandler;
+use OCA\Comments\Notification\Listener as NotificationListener;
 use OCP\Comments\CommentsEvent;
 use OCP\Comments\IComment;
-use OCA\Comments\Activity\Listener as ActivityListener;
-use OCA\Comments\Notification\Listener as NotificationListener;
 use Test\TestCase;
 
 class EventHandlerTest extends TestCase {

apps/dav/lib/AppInfo/Application.php

@@ -23,6 +23,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
+
 namespace OCA\DAV\AppInfo;
 
 use OC\AppFramework\Utility\SimpleContainer;
@@ -42,9 +43,9 @@
 use OCA\DAV\CardDAV\PhotoCache;
 use OCA\DAV\CardDAV\SyncService;
 use OCA\DAV\HookManager;
-use \OCP\AppFramework\App;
-use OCP\Contacts\IManager as IContactsManager;
+use OCP\AppFramework\App;
 use OCP\Calendar\IManager as ICalendarManager;
+use OCP\Contacts\IManager as IContactsManager;
 use OCP\IUser;
 use Symfony\Component\EventDispatcher\GenericEvent;
 

apps/dav/lib/AppInfo/PluginManager.php

@@ -20,10 +20,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
+
 namespace OCA\DAV\AppInfo;
 
-use OCP\App\IAppManager;
 use OC\ServerContainer;
+use OCP\App\IAppManager;
 use OCP\AppFramework\QueryException;
 
 /**

apps/dav/lib/Avatars/AvatarHome.php

@@ -22,7 +22,6 @@
  *
  */
 
-
 namespace OCA\DAV\Avatars;
 
 

apps/dav/lib/Avatars/AvatarNode.php

@@ -21,7 +21,6 @@
  *
  */
 
-
 namespace OCA\DAV\Avatars;
 
 

apps/dav/lib/Avatars/RootCollection.php

@@ -22,11 +22,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+
 namespace OCA\DAV\Avatars;
 
 use Sabre\DAVACL\AbstractPrincipalCollection;
 
-
 class RootCollection extends AbstractPrincipalCollection {
 
 	/**

apps/dav/lib/BackgroundJob/BuildReminderIndexBackgroundJob.php

@@ -21,12 +21,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+
 namespace OCA\DAV\BackgroundJob;
 
-use OCP\BackgroundJob\QueuedJob;
 use OCA\DAV\CalDAV\Reminder\ReminderService;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\IJobList;
+use OCP\BackgroundJob\QueuedJob;
 use OCP\IDBConnection;
 use OCP\ILogger;
 
@@ -132,4 +133,4 @@ private function buildIndex(int $offset, int $stopAt):int {
 
 		return $stopAt;
 	}
-}
+}

apps/dav/lib/BackgroundJob/EventReminderJob.php

@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
+
 namespace OCA\DAV\BackgroundJob;
 
 use OC\BackgroundJob\TimedJob;

apps/dav/lib/BackgroundJob/GenerateBirthdayCalendarBackgroundJob.php

@@ -20,6 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+
 namespace OCA\DAV\BackgroundJob;
 
 use OC\BackgroundJob\QueuedJob;

apps/dav/lib/BackgroundJob/RefreshWebcalJob.php

@@ -21,6 +21,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+
 namespace OCA\DAV\BackgroundJob;
 
 use GuzzleHttp\HandlerStack;

apps/dav/lib/BackgroundJob/RegisterRegenerateBirthdayCalendars.php

@@ -20,6 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+
 namespace OCA\DAV\BackgroundJob;
 
 use OCP\AppFramework\Utility\ITimeFactory;
@@ -63,4 +64,4 @@ public function run($argument) {
 		});
 	}
 
-}
+}

apps/dav/lib/CalDAV/Activity/Setting/Calendar.php

@@ -97,4 +97,3 @@ public function isDefaultEnabledMail() {
 		return false;
 	}
 }
-

apps/dav/lib/CalDAV/Activity/Setting/Event.php

@@ -97,4 +97,3 @@ public function isDefaultEnabledMail() {
 		return false;
 	}
 }
-

apps/dav/lib/CalDAV/Activity/Setting/Todo.php

@@ -97,4 +97,3 @@ public function isDefaultEnabledMail() {
 		return false;
 	}
 }
-

apps/dav/lib/CalDAV/BirthdayCalendar/EnablePlugin.php

@@ -25,11 +25,11 @@
 
 use OCA\DAV\CalDAV\BirthdayService;
 use OCA\DAV\CalDAV\CalendarHome;
+use OCP\IConfig;
 use Sabre\DAV\Server;
 use Sabre\DAV\ServerPlugin;
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
-use OCP\IConfig;
 
 /**
  * Class EnablePlugin

apps/dav/lib/CalDAV/CachedSubscription.php

@@ -21,6 +21,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+
 namespace OCA\DAV\CalDAV;
 
 use OCA\DAV\Exception\UnsupportedLimitOnInitialSyncException;

apps/dav/lib/CalDAV/CachedSubscriptionObject.php

@@ -21,6 +21,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+
 namespace OCA\DAV\CalDAV;
 
 use Sabre\DAV\Exception\MethodNotAllowed;

apps/dav/lib/CalDAV/CalDavBackend.php

@@ -33,10 +33,10 @@
 
 namespace OCA\DAV\CalDAV;
 
-use OCA\DAV\DAV\Sharing\IShareable;
-use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCA\DAV\Connector\Sabre\Principal;
 use OCA\DAV\DAV\Sharing\Backend;
+use OCA\DAV\DAV\Sharing\IShareable;
+use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 use OCP\IGroupManager;
 use OCP\ILogger;
@@ -53,6 +53,7 @@
 use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAV\Exception\NotFound;
 use Sabre\DAV\PropPatch;
+use Sabre\Uri;
 use Sabre\VObject\Component;
 use Sabre\VObject\Component\VCalendar;
 use Sabre\VObject\Component\VTimeZone;
@@ -62,7 +63,6 @@
 use Sabre\VObject\Property;
 use Sabre\VObject\Reader;
 use Sabre\VObject\Recur\EventIterator;
-use Sabre\Uri;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\GenericEvent;
 

apps/dav/lib/CalDAV/Calendar.php

@@ -24,6 +24,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
+
 namespace OCA\DAV\CalDAV;
 
 use OCA\DAV\CalDAV\Proxy\ProxyMapper;

apps/dav/lib/CalDAV/CalendarHome.php

@@ -22,6 +22,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
+
 namespace OCA\DAV\CalDAV;
 
 use Sabre\CalDAV\Backend\BackendInterface;
@@ -30,8 +31,8 @@
 use Sabre\CalDAV\Backend\SubscriptionSupport;
 use Sabre\CalDAV\Schedule\Inbox;
 use Sabre\CalDAV\Subscriptions\Subscription;
-use Sabre\DAV\Exception\NotFound;
 use Sabre\DAV\Exception\MethodNotAllowed;
+use Sabre\DAV\Exception\NotFound;
 use Sabre\DAV\MkCol;
 
 class CalendarHome extends \Sabre\CalDAV\CalendarHome {

apps/dav/lib/CalDAV/CalendarImpl.php

@@ -23,8 +23,8 @@
 
 namespace OCA\DAV\CalDAV;
 
-use OCP\Constants;
 use OCP\Calendar\ICalendar;
+use OCP\Constants;
 
 class CalendarImpl implements ICalendar {
 

apps/dav/lib/CalDAV/CalendarObject.php

@@ -22,7 +22,6 @@
  *
  */
 
-
 namespace OCA\DAV\CalDAV;
 
 

apps/dav/lib/CalDAV/CalendarRoot.php

@@ -20,6 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
+
 namespace OCA\DAV\CalDAV;
 
 class CalendarRoot extends \Sabre\CalDAV\CalendarRoot {
@@ -38,4 +39,4 @@ function getName() {
 
 		return parent::getName();
 	}
-}
+}