diff --git a/apps/accessibility/lib/AppInfo/Application.php b/apps/accessibility/lib/AppInfo/Application.php index e884acad0af97cfd8ebc48234a0b0e79b2c8c0d5..c6f4e33005cb472cfbef887acdb7a093598dd036 100644 --- a/apps/accessibility/lib/AppInfo/Application.php +++ b/apps/accessibility/lib/AppInfo/Application.php @@ -25,8 +25,8 @@ namespace OCA\Accessibility\AppInfo; use OCP\AppFramework\App; use OCP\IConfig; -use OCP\IUserSession; use OCP\IURLGenerator; +use OCP\IUserSession; class Application extends App { diff --git a/apps/accessibility/lib/Controller/AccessibilityController.php b/apps/accessibility/lib/Controller/AccessibilityController.php index 12014d98e37647bea062a6fa66d50b99cce4b097..577442dc6654402c47605599a0c5ab479f553af2 100644 --- a/apps/accessibility/lib/Controller/AccessibilityController.php +++ b/apps/accessibility/lib/Controller/AccessibilityController.php @@ -26,19 +26,19 @@ namespace OCA\Accessibility\Controller; 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 { diff --git a/apps/accessibility/lib/Controller/ConfigController.php b/apps/accessibility/lib/Controller/ConfigController.php index 589861163f1655fb716e67be43aeaf39b1d6dd32..c4cec595a35cb7e55b073bc4e906bc1b182bb243 100644 --- a/apps/accessibility/lib/Controller/ConfigController.php +++ b/apps/accessibility/lib/Controller/ConfigController.php @@ -26,8 +26,8 @@ namespace OCA\Accessibility\Controller; 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; diff --git a/apps/admin_audit/lib/AppInfo/Application.php b/apps/admin_audit/lib/AppInfo/Application.php index 77b76885a20e7303e979cd8002b8e3cc8ffec035..3f68edc1e5d238b01d572a5bca752bfb31d7a2fc 100644 --- a/apps/admin_audit/lib/AppInfo/Application.php +++ b/apps/admin_audit/lib/AppInfo/Application.php @@ -47,9 +47,9 @@ use OCP\IGroupManager; 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 { diff --git a/apps/cloud_federation_api/lib/AppInfo/Application.php b/apps/cloud_federation_api/lib/AppInfo/Application.php index 3ea3037d12abf932d37188e8e9b267919348cea6..107b54722558b9e6d635af7346a9a4d555d313fe 100644 --- a/apps/cloud_federation_api/lib/AppInfo/Application.php +++ b/apps/cloud_federation_api/lib/AppInfo/Application.php @@ -19,7 +19,6 @@ * */ - namespace OCA\CloudFederationAPI\AppInfo; diff --git a/apps/cloud_federation_api/lib/Capabilities.php b/apps/cloud_federation_api/lib/Capabilities.php index d614d7d473006b9cd0750cd8cdc08df6a8dfcdbc..df85d5b2b169afb578c8386021ea7bafdce94615 100644 --- a/apps/cloud_federation_api/lib/Capabilities.php +++ b/apps/cloud_federation_api/lib/Capabilities.php @@ -19,7 +19,6 @@ * */ - namespace OCA\CloudFederationAPI; diff --git a/apps/cloud_federation_api/lib/Config.php b/apps/cloud_federation_api/lib/Config.php index 2fb842697d44ab8f32055db8625fbf5075337f87..31510cef79dc6d7b91de0ddc139e576784436d80 100644 --- a/apps/cloud_federation_api/lib/Config.php +++ b/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 * diff --git a/apps/cloud_federation_api/lib/Controller/RequestHandlerController.php b/apps/cloud_federation_api/lib/Controller/RequestHandlerController.php index e7c6c415d3c49106a5c1a445cd714ba1be51cd91..3ebfca55d2d11d3fab9d490ded36daa159ba132f 100644 --- a/apps/cloud_federation_api/lib/Controller/RequestHandlerController.php +++ b/apps/cloud_federation_api/lib/Controller/RequestHandlerController.php @@ -31,9 +31,9 @@ use OCP\Federation\Exceptions\ActionNotSupportedException; 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\IURLGenerator; use OCP\IUserManager; use OCP\Share\Exceptions\ShareNotFound; - /** * Class RequestHandlerController * diff --git a/apps/comments/lib/Activity/Setting.php b/apps/comments/lib/Activity/Setting.php index 8a6bd98217313fedd577ba56f42aa6f67cb3192f..e6dd845a25b436207a9b957afc7eaa8eaef05a77 100644 --- a/apps/comments/lib/Activity/Setting.php +++ b/apps/comments/lib/Activity/Setting.php @@ -97,4 +97,3 @@ class Setting implements ISetting { return false; } } - diff --git a/apps/comments/tests/Unit/EventHandlerTest.php b/apps/comments/tests/Unit/EventHandlerTest.php index bb714993f7ac358d1c6467377b077a8dd3d2d0ea..b27b851cc5e7daede6e76927b25501844c1f2883 100644 --- a/apps/comments/tests/Unit/EventHandlerTest.php +++ b/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 { diff --git a/apps/dav/lib/AppInfo/Application.php b/apps/dav/lib/AppInfo/Application.php index 80e9dea882902d14ad52f5865e9478561af6b4ff..1403c70652aba236f94ab4f99d5ed17352b1d615 100644 --- a/apps/dav/lib/AppInfo/Application.php +++ b/apps/dav/lib/AppInfo/Application.php @@ -23,6 +23,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\AppInfo; use OC\AppFramework\Utility\SimpleContainer; @@ -42,9 +43,9 @@ use OCA\DAV\CardDAV\ContactsManager; 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; diff --git a/apps/dav/lib/AppInfo/PluginManager.php b/apps/dav/lib/AppInfo/PluginManager.php index a5c397326b2d642a63644d1ef5bfbf16ea5ee6aa..22ead5c1ca5caaba02d3f10e304c938c4749064f 100644 --- a/apps/dav/lib/AppInfo/PluginManager.php +++ b/apps/dav/lib/AppInfo/PluginManager.php @@ -20,10 +20,11 @@ * along with this program. If not, see * */ + namespace OCA\DAV\AppInfo; -use OCP\App\IAppManager; use OC\ServerContainer; +use OCP\App\IAppManager; use OCP\AppFramework\QueryException; /** diff --git a/apps/dav/lib/Avatars/AvatarHome.php b/apps/dav/lib/Avatars/AvatarHome.php index 2047c5894e49dcb6d20a82896a7c71a4048e255d..0430f3d025adf7d08008ceda06dbc66eed4ffe65 100644 --- a/apps/dav/lib/Avatars/AvatarHome.php +++ b/apps/dav/lib/Avatars/AvatarHome.php @@ -22,7 +22,6 @@ * */ - namespace OCA\DAV\Avatars; diff --git a/apps/dav/lib/Avatars/AvatarNode.php b/apps/dav/lib/Avatars/AvatarNode.php index c40ed1b52dbdb95fd2942846ccd8b9d409e14941..898372ecaeecfdd8c2294dc9e19000f654984898 100644 --- a/apps/dav/lib/Avatars/AvatarNode.php +++ b/apps/dav/lib/Avatars/AvatarNode.php @@ -21,7 +21,6 @@ * */ - namespace OCA\DAV\Avatars; diff --git a/apps/dav/lib/Avatars/RootCollection.php b/apps/dav/lib/Avatars/RootCollection.php index 4fc12b5d3ed5d98fc931ba76a9218263a95667db..3c073f279db27254158f87f925f997882248b540 100644 --- a/apps/dav/lib/Avatars/RootCollection.php +++ b/apps/dav/lib/Avatars/RootCollection.php @@ -22,11 +22,11 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\Avatars; use Sabre\DAVACL\AbstractPrincipalCollection; - class RootCollection extends AbstractPrincipalCollection { /** diff --git a/apps/dav/lib/BackgroundJob/BuildReminderIndexBackgroundJob.php b/apps/dav/lib/BackgroundJob/BuildReminderIndexBackgroundJob.php index 01d39a2193b6eaa6e5e77b824e51ba860b6656a9..4b9f153460adeec65150d530edf82e8455b57d60 100644 --- a/apps/dav/lib/BackgroundJob/BuildReminderIndexBackgroundJob.php +++ b/apps/dav/lib/BackgroundJob/BuildReminderIndexBackgroundJob.php @@ -21,12 +21,13 @@ declare(strict_types=1); * along with this program. If not, see . * */ + 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 @@ class BuildReminderIndexBackgroundJob extends QueuedJob { return $stopAt; } -} \ No newline at end of file +} diff --git a/apps/dav/lib/BackgroundJob/EventReminderJob.php b/apps/dav/lib/BackgroundJob/EventReminderJob.php index dfa76ffe1682e6a64769e56f87d93db3429bf47d..b8169dbb9cde18780d5ed603ae372cd91470a7fc 100644 --- a/apps/dav/lib/BackgroundJob/EventReminderJob.php +++ b/apps/dav/lib/BackgroundJob/EventReminderJob.php @@ -17,6 +17,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\BackgroundJob; use OC\BackgroundJob\TimedJob; diff --git a/apps/dav/lib/BackgroundJob/GenerateBirthdayCalendarBackgroundJob.php b/apps/dav/lib/BackgroundJob/GenerateBirthdayCalendarBackgroundJob.php index dd6fca73c8fece17ba2bd25dcba721dcfa72fde0..243943375e8899b6fe246e69591e96e6a0552d3d 100644 --- a/apps/dav/lib/BackgroundJob/GenerateBirthdayCalendarBackgroundJob.php +++ b/apps/dav/lib/BackgroundJob/GenerateBirthdayCalendarBackgroundJob.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\BackgroundJob; use OC\BackgroundJob\QueuedJob; diff --git a/apps/dav/lib/BackgroundJob/RefreshWebcalJob.php b/apps/dav/lib/BackgroundJob/RefreshWebcalJob.php index e99cd7038f653096ed5c686a7e9450bc0bcc70ae..acd7c103bc25030379b4b0fc16e93ee2852e258b 100644 --- a/apps/dav/lib/BackgroundJob/RefreshWebcalJob.php +++ b/apps/dav/lib/BackgroundJob/RefreshWebcalJob.php @@ -21,6 +21,7 @@ declare(strict_types=1); * along with this program. If not, see . * */ + namespace OCA\DAV\BackgroundJob; use GuzzleHttp\HandlerStack; diff --git a/apps/dav/lib/BackgroundJob/RegisterRegenerateBirthdayCalendars.php b/apps/dav/lib/BackgroundJob/RegisterRegenerateBirthdayCalendars.php index e20547053c50a46bd9f707b82cbc331c8e8c3a79..3608b74019173e15b5af705717b1e3a4cc858a10 100644 --- a/apps/dav/lib/BackgroundJob/RegisterRegenerateBirthdayCalendars.php +++ b/apps/dav/lib/BackgroundJob/RegisterRegenerateBirthdayCalendars.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\BackgroundJob; use OCP\AppFramework\Utility\ITimeFactory; @@ -63,4 +64,4 @@ class RegisterRegenerateBirthdayCalendars extends QueuedJob { }); } -} \ No newline at end of file +} diff --git a/apps/dav/lib/CalDAV/Activity/Setting/Calendar.php b/apps/dav/lib/CalDAV/Activity/Setting/Calendar.php index 24d2cef913eb31481e902fe7a789d2bb169fb64f..1dd95dd70e5feccc0be852c046bf5c37a168f414 100644 --- a/apps/dav/lib/CalDAV/Activity/Setting/Calendar.php +++ b/apps/dav/lib/CalDAV/Activity/Setting/Calendar.php @@ -97,4 +97,3 @@ class Calendar implements ISetting { return false; } } - diff --git a/apps/dav/lib/CalDAV/Activity/Setting/Event.php b/apps/dav/lib/CalDAV/Activity/Setting/Event.php index 14b22ad220e02f3d787068604fbb349aee9d0cd7..3bc4cbc76eeed26500834f629f621cd7ba8dc558 100644 --- a/apps/dav/lib/CalDAV/Activity/Setting/Event.php +++ b/apps/dav/lib/CalDAV/Activity/Setting/Event.php @@ -97,4 +97,3 @@ class Event implements ISetting { return false; } } - diff --git a/apps/dav/lib/CalDAV/Activity/Setting/Todo.php b/apps/dav/lib/CalDAV/Activity/Setting/Todo.php index 272843198a917877f15451fa74947b70b86643b7..184eb5aea6985d2f1d840f01b5b06ef790fb45f7 100644 --- a/apps/dav/lib/CalDAV/Activity/Setting/Todo.php +++ b/apps/dav/lib/CalDAV/Activity/Setting/Todo.php @@ -97,4 +97,3 @@ class Todo implements ISetting { return false; } } - diff --git a/apps/dav/lib/CalDAV/BirthdayCalendar/EnablePlugin.php b/apps/dav/lib/CalDAV/BirthdayCalendar/EnablePlugin.php index 497d7112b3c51c92763a6f4c02b9bc35c7562fa3..2452f5b63ef709a0e3df44666a6c35f0e6d3efa1 100644 --- a/apps/dav/lib/CalDAV/BirthdayCalendar/EnablePlugin.php +++ b/apps/dav/lib/CalDAV/BirthdayCalendar/EnablePlugin.php @@ -25,11 +25,11 @@ namespace OCA\DAV\CalDAV\BirthdayCalendar; 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 diff --git a/apps/dav/lib/CalDAV/CachedSubscription.php b/apps/dav/lib/CalDAV/CachedSubscription.php index da8c5434cf23bb47a08d98a0addf44f52d38b394..2d27f5b42c07fb1103a0b5ad94faa019f426eb11 100644 --- a/apps/dav/lib/CalDAV/CachedSubscription.php +++ b/apps/dav/lib/CalDAV/CachedSubscription.php @@ -21,6 +21,7 @@ declare(strict_types=1); * along with this program. If not, see . * */ + namespace OCA\DAV\CalDAV; use OCA\DAV\Exception\UnsupportedLimitOnInitialSyncException; diff --git a/apps/dav/lib/CalDAV/CachedSubscriptionObject.php b/apps/dav/lib/CalDAV/CachedSubscriptionObject.php index c2f7eeabf419345ea0c1db88d5fec75bd8ce0151..07981bb71b2330f843090e47c2662e212f2fc3b7 100644 --- a/apps/dav/lib/CalDAV/CachedSubscriptionObject.php +++ b/apps/dav/lib/CalDAV/CachedSubscriptionObject.php @@ -21,6 +21,7 @@ declare(strict_types=1); * along with this program. If not, see . * */ + namespace OCA\DAV\CalDAV; use Sabre\DAV\Exception\MethodNotAllowed; diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php index 62d3909ce39117a92540e8369437fe92da50d1f5..454ab7f6f636dd4f9671e8c859d4cb0c0197d037 100644 --- a/apps/dav/lib/CalDAV/CalDavBackend.php +++ b/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; 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\ParseException; 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; diff --git a/apps/dav/lib/CalDAV/Calendar.php b/apps/dav/lib/CalDAV/Calendar.php index b875d42e0a3967e519fcb0f3628c91c8c68a2b87..a80acfda5a3887656f9d8a26118d77f30baf0a50 100644 --- a/apps/dav/lib/CalDAV/Calendar.php +++ b/apps/dav/lib/CalDAV/Calendar.php @@ -24,6 +24,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\CalDAV; use OCA\DAV\CalDAV\Proxy\ProxyMapper; diff --git a/apps/dav/lib/CalDAV/CalendarHome.php b/apps/dav/lib/CalDAV/CalendarHome.php index 9ff71410f87c8d3d6fff27ff3c239d684b298e69..3e1ee3616872de92d52802aca07cccc0c9a7e790 100644 --- a/apps/dav/lib/CalDAV/CalendarHome.php +++ b/apps/dav/lib/CalDAV/CalendarHome.php @@ -22,6 +22,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\CalDAV; use Sabre\CalDAV\Backend\BackendInterface; @@ -30,8 +31,8 @@ use Sabre\CalDAV\Backend\SchedulingSupport; 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 { diff --git a/apps/dav/lib/CalDAV/CalendarImpl.php b/apps/dav/lib/CalDAV/CalendarImpl.php index cfdf821a563506d6a18f53c8ed0ac220e0a88b33..afb333872aba1512e80b8ed67e1fb550a61d7b8f 100644 --- a/apps/dav/lib/CalDAV/CalendarImpl.php +++ b/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 { diff --git a/apps/dav/lib/CalDAV/CalendarObject.php b/apps/dav/lib/CalDAV/CalendarObject.php index 0db592898afdfa0c381c2662a353a09da77cb54e..c527462f53388f06d9ce7fbb7f6e0e34e2471f66 100644 --- a/apps/dav/lib/CalDAV/CalendarObject.php +++ b/apps/dav/lib/CalDAV/CalendarObject.php @@ -22,7 +22,6 @@ * */ - namespace OCA\DAV\CalDAV; diff --git a/apps/dav/lib/CalDAV/CalendarRoot.php b/apps/dav/lib/CalDAV/CalendarRoot.php index f84e8a96780130d54e5d30f1468101c91620a64c..2f8b223a2126ff91e65ba1c129c91e98d77196c6 100644 --- a/apps/dav/lib/CalDAV/CalendarRoot.php +++ b/apps/dav/lib/CalDAV/CalendarRoot.php @@ -20,6 +20,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\CalDAV; class CalendarRoot extends \Sabre\CalDAV\CalendarRoot { @@ -38,4 +39,4 @@ class CalendarRoot extends \Sabre\CalDAV\CalendarRoot { return parent::getName(); } -} \ No newline at end of file +} diff --git a/apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php b/apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php index 61ead99ce12db838cb8efc84fc87421ce529336d..9cb92e4c36425e11a0b106090feb71d864d0fec9 100644 --- a/apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php +++ b/apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php @@ -19,16 +19,17 @@ * along with this program. If not, see * */ + namespace OCA\DAV\CalDAV\InvitationResponse; +use OCA\DAV\AppInfo\PluginManager; +use OCA\DAV\Connector\Sabre\AnonymousOptionsPlugin; use OCA\DAV\Connector\Sabre\BlockLegacyClientPlugin; use OCA\DAV\Connector\Sabre\CachingTree; use OCA\DAV\Connector\Sabre\DavAclPlugin; -use OCA\DAV\Connector\Sabre\AnonymousOptionsPlugin; use OCA\DAV\RootCollection; use OCP\SabrePluginEvent; use Sabre\DAV\Auth\Plugin; -use OCA\DAV\AppInfo\PluginManager; use Sabre\VObject\ITip\Message; class InvitationResponseServer { @@ -115,4 +116,4 @@ class InvitationResponseServer { $schedulingPlugin = $this->server->getPlugin('caldav-schedule'); $schedulingPlugin->scheduleLocalDelivery($iTipMessage); } -} \ No newline at end of file +} diff --git a/apps/dav/lib/CalDAV/Outbox.php b/apps/dav/lib/CalDAV/Outbox.php index 8f0c57c7890aa748241539db7f702b7d54bb253f..5025d41e09b678457c5354b995b440b416fc1527 100644 --- a/apps/dav/lib/CalDAV/Outbox.php +++ b/apps/dav/lib/CalDAV/Outbox.php @@ -19,6 +19,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\CalDAV; use OCP\IConfig; diff --git a/apps/dav/lib/CalDAV/PublicCalendar.php b/apps/dav/lib/CalDAV/PublicCalendar.php index f65ac9797b845260e96d7418133da51115e0e362..d8350242b408d64db438aed02e8e46ebcdff4862 100644 --- a/apps/dav/lib/CalDAV/PublicCalendar.php +++ b/apps/dav/lib/CalDAV/PublicCalendar.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\CalDAV; use Sabre\DAV\Exception\NotFound; @@ -85,4 +86,4 @@ class PublicCalendar extends Calendar { protected function isShared() { return true; } -} \ No newline at end of file +} diff --git a/apps/dav/lib/CalDAV/PublicCalendarObject.php b/apps/dav/lib/CalDAV/PublicCalendarObject.php index aaeea64b237bc0ebde045d64df9b39659dbd57eb..d50701ad36986cfd6008e3a08a2814cde25c53e1 100644 --- a/apps/dav/lib/CalDAV/PublicCalendarObject.php +++ b/apps/dav/lib/CalDAV/PublicCalendarObject.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\CalDAV; class PublicCalendarObject extends CalendarObject { @@ -31,4 +32,4 @@ class PublicCalendarObject extends CalendarObject { protected function isShared() { return true; } -} \ No newline at end of file +} diff --git a/apps/dav/lib/CalDAV/PublicCalendarRoot.php b/apps/dav/lib/CalDAV/PublicCalendarRoot.php index 9385f487bdaf00b2d281585f5cbf4af4775a576e..bd16025b4517d72eb18b172666ce339160dcc9f7 100644 --- a/apps/dav/lib/CalDAV/PublicCalendarRoot.php +++ b/apps/dav/lib/CalDAV/PublicCalendarRoot.php @@ -22,6 +22,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\CalDAV; use OCP\IConfig; diff --git a/apps/dav/lib/CalDAV/Publishing/PublishPlugin.php b/apps/dav/lib/CalDAV/Publishing/PublishPlugin.php index fc276fb25ca4197c95a7f4ae068212ccb734107b..35c00666446b062d4bebf41bc0dc32d67b2916e3 100644 --- a/apps/dav/lib/CalDAV/Publishing/PublishPlugin.php +++ b/apps/dav/lib/CalDAV/Publishing/PublishPlugin.php @@ -21,20 +21,21 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\CalDAV\Publishing; -use Sabre\DAV\PropFind; +use OCA\DAV\CalDAV\Calendar; +use OCA\DAV\CalDAV\Publishing\Xml\Publisher; +use OCP\IConfig; +use OCP\IURLGenerator; +use Sabre\CalDAV\Xml\Property\AllowedSharingModes; +use Sabre\DAV\Exception\NotFound; use Sabre\DAV\INode; +use Sabre\DAV\PropFind; use Sabre\DAV\Server; use Sabre\DAV\ServerPlugin; -use Sabre\DAV\Exception\NotFound; use Sabre\HTTP\RequestInterface; use Sabre\HTTP\ResponseInterface; -use Sabre\CalDAV\Xml\Property\AllowedSharingModes; -use OCA\DAV\CalDAV\Publishing\Xml\Publisher; -use OCA\DAV\CalDAV\Calendar; -use OCP\IURLGenerator; -use OCP\IConfig; class PublishPlugin extends ServerPlugin { const NS_CALENDARSERVER = 'http://calendarserver.org/ns/'; diff --git a/apps/dav/lib/CalDAV/Publishing/Xml/Publisher.php b/apps/dav/lib/CalDAV/Publishing/Xml/Publisher.php index 6d5e05e0cc37173dd43154b3d747009f32c32f8b..4c2aa83527c68be0054108d272698888f201d270 100644 --- a/apps/dav/lib/CalDAV/Publishing/Xml/Publisher.php +++ b/apps/dav/lib/CalDAV/Publishing/Xml/Publisher.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\CalDAV\Publishing\Xml; use Sabre\Xml\Writer; diff --git a/apps/dav/lib/CalDAV/Reminder/Backend.php b/apps/dav/lib/CalDAV/Reminder/Backend.php index b3cc013fb3ecfd4249c05eb418bd81ce7707e5ec..3ddd4b1c3a1675c5ed7ae56186964782666e18b0 100644 --- a/apps/dav/lib/CalDAV/Reminder/Backend.php +++ b/apps/dav/lib/CalDAV/Reminder/Backend.php @@ -23,10 +23,11 @@ declare(strict_types=1); * along with this program. If not, see . * */ + namespace OCA\DAV\CalDAV\Reminder; -use OCP\IDBConnection; use OCP\AppFramework\Utility\ITimeFactory; +use OCP\IDBConnection; /** * Class Backend diff --git a/apps/dav/lib/CalDAV/Reminder/INotificationProvider.php b/apps/dav/lib/CalDAV/Reminder/INotificationProvider.php index d0e526eb0eedb5815c8ef4a4d71b700e601e2ca0..bd182950ee576102659b021d231b066c5196ac24 100644 --- a/apps/dav/lib/CalDAV/Reminder/INotificationProvider.php +++ b/apps/dav/lib/CalDAV/Reminder/INotificationProvider.php @@ -21,6 +21,7 @@ declare(strict_types=1); * along with this program. If not, see . * */ + namespace OCA\DAV\CalDAV\Reminder; use OCP\IUser; @@ -44,4 +45,4 @@ interface INotificationProvider { public function send(VEvent $vevent, string $calendarDisplayName, array $users=[]): void; -} \ No newline at end of file +} diff --git a/apps/dav/lib/CalDAV/Reminder/NotificationProvider/AbstractProvider.php b/apps/dav/lib/CalDAV/Reminder/NotificationProvider/AbstractProvider.php index 6e3a8eaddefaf0b233726165a160621952b3f65a..2d3fefe696ed7d72aeea2f54fd60cfeaff6ce896 100644 --- a/apps/dav/lib/CalDAV/Reminder/NotificationProvider/AbstractProvider.php +++ b/apps/dav/lib/CalDAV/Reminder/NotificationProvider/AbstractProvider.php @@ -23,6 +23,7 @@ declare(strict_types=1); * along with this program. If not, see . * */ + namespace OCA\DAV\CalDAV\Reminder\NotificationProvider; use OCA\DAV\CalDAV\Reminder\INotificationProvider; @@ -30,8 +31,8 @@ use OCP\IConfig; use OCP\IL10N; use OCP\ILogger; use OCP\IURLGenerator; -use OCP\L10N\IFactory as L10NFactory; use OCP\IUser; +use OCP\L10N\IFactory as L10NFactory; use Sabre\VObject\Component\VEvent; use Sabre\VObject\DateTimeParser; use Sabre\VObject\Property; diff --git a/apps/dav/lib/CalDAV/Reminder/NotificationProvider/AudioProvider.php b/apps/dav/lib/CalDAV/Reminder/NotificationProvider/AudioProvider.php index ad4ac342f6697edb3df1e5498fb3a851a0a30565..85dbe86ba2cab465efa05d123fdb08c098138377 100644 --- a/apps/dav/lib/CalDAV/Reminder/NotificationProvider/AudioProvider.php +++ b/apps/dav/lib/CalDAV/Reminder/NotificationProvider/AudioProvider.php @@ -20,6 +20,7 @@ declare(strict_types=1); * along with this program. If not, see * */ + namespace OCA\DAV\CalDAV\Reminder\NotificationProvider; /** diff --git a/apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider.php b/apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider.php index f5932a87b3e16036d29b7e7d864f50a52d1cad4a..3dbf31da8caa403af77a89afc948349b2d9f8936 100644 --- a/apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider.php +++ b/apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider.php @@ -23,19 +23,20 @@ declare(strict_types=1); * along with this program. If not, see . * */ + namespace OCA\DAV\CalDAV\Reminder\NotificationProvider; -use \DateTime; +use DateTime; use OCP\IConfig; use OCP\IL10N; use OCP\ILogger; use OCP\IURLGenerator; +use OCP\IUser; use OCP\L10N\IFactory as L10NFactory; use OCP\Mail\IEMailTemplate; use OCP\Mail\IMailer; -use OCP\IUser; -use Sabre\VObject\Component\VEvent; use Sabre\VObject; +use Sabre\VObject\Component\VEvent; use Sabre\VObject\Parameter; use Sabre\VObject\Property; diff --git a/apps/dav/lib/CalDAV/Reminder/NotificationProvider/ProviderNotAvailableException.php b/apps/dav/lib/CalDAV/Reminder/NotificationProvider/ProviderNotAvailableException.php index bfa6db958521f42f005fc9c347ad491f5f972e4a..251e4bedbf1692280fce54f5b58602ed340c1505 100644 --- a/apps/dav/lib/CalDAV/Reminder/NotificationProvider/ProviderNotAvailableException.php +++ b/apps/dav/lib/CalDAV/Reminder/NotificationProvider/ProviderNotAvailableException.php @@ -21,6 +21,7 @@ declare(strict_types=1); * along with this program. If not, see . * */ + namespace OCA\DAV\CalDAV\Reminder\NotificationProvider; class ProviderNotAvailableException extends \Exception { diff --git a/apps/dav/lib/CalDAV/Reminder/NotificationProvider/PushProvider.php b/apps/dav/lib/CalDAV/Reminder/NotificationProvider/PushProvider.php index 6e9e7831865c1615eea9a9ebca3cf9f34a229edf..c07bb168666f2e6e27ef07abf5f4b5c3b8f0d8d9 100644 --- a/apps/dav/lib/CalDAV/Reminder/NotificationProvider/PushProvider.php +++ b/apps/dav/lib/CalDAV/Reminder/NotificationProvider/PushProvider.php @@ -23,17 +23,18 @@ declare(strict_types=1); * along with this program. If not, see . * */ + namespace OCA\DAV\CalDAV\Reminder\NotificationProvider; use OCA\DAV\AppInfo\Application; +use OCP\AppFramework\Utility\ITimeFactory; use OCP\IConfig; use OCP\ILogger; use OCP\IURLGenerator; +use OCP\IUser; use OCP\L10N\IFactory as L10NFactory; use OCP\Notification\IManager; -use OCP\IUser; use OCP\Notification\INotification; -use OCP\AppFramework\Utility\ITimeFactory; use Sabre\VObject\Component\VEvent; use Sabre\VObject\Property; diff --git a/apps/dav/lib/CalDAV/Reminder/NotificationProviderManager.php b/apps/dav/lib/CalDAV/Reminder/NotificationProviderManager.php index c9bcf2dd0643537320eaeae408dac96ba8b0ffd1..d7ad12b2b8216f478de7c7f057e7810a751dd1f4 100644 --- a/apps/dav/lib/CalDAV/Reminder/NotificationProviderManager.php +++ b/apps/dav/lib/CalDAV/Reminder/NotificationProviderManager.php @@ -22,6 +22,7 @@ declare(strict_types=1); * along with this program. If not, see * */ + namespace OCA\DAV\CalDAV\Reminder; /** diff --git a/apps/dav/lib/CalDAV/Reminder/Notifier.php b/apps/dav/lib/CalDAV/Reminder/Notifier.php index 2c5f05f62ab2bf01ce9d0e7afeb84da745b278b0..5495d672c6b27dd4f8169ff4af78bded483c4ecc 100644 --- a/apps/dav/lib/CalDAV/Reminder/Notifier.php +++ b/apps/dav/lib/CalDAV/Reminder/Notifier.php @@ -25,14 +25,14 @@ declare(strict_types=1); namespace OCA\DAV\CalDAV\Reminder; -use \DateTime; +use DateTime; use OCA\DAV\AppInfo\Application; use OCP\AppFramework\Utility\ITimeFactory; use OCP\IL10N; +use OCP\IURLGenerator; use OCP\L10N\IFactory; use OCP\Notification\INotification; use OCP\Notification\INotifier; -use OCP\IURLGenerator; /** * Class Notifier diff --git a/apps/dav/lib/CalDAV/Reminder/ReminderService.php b/apps/dav/lib/CalDAV/Reminder/ReminderService.php index dd19c400720e060996431a66efdf3a9a1edf2d51..3c815801c96d854fbf5ddaaba7c1d3f99726934d 100644 --- a/apps/dav/lib/CalDAV/Reminder/ReminderService.php +++ b/apps/dav/lib/CalDAV/Reminder/ReminderService.php @@ -22,9 +22,10 @@ declare(strict_types=1); * along with this program. If not, see * */ + namespace OCA\DAV\CalDAV\Reminder; -use \DateTimeImmutable; +use DateTimeImmutable; use OCA\DAV\CalDAV\CalDavBackend; use OCP\AppFramework\Utility\ITimeFactory; use OCP\IGroup; diff --git a/apps/dav/lib/CalDAV/ResourceBooking/AbstractPrincipalBackend.php b/apps/dav/lib/CalDAV/ResourceBooking/AbstractPrincipalBackend.php index 63ed3381d142d5747e14fd5a80bdb7a70b51f6a2..e3e3c117c308f8b50067c61439222a085cd00461 100644 --- a/apps/dav/lib/CalDAV/ResourceBooking/AbstractPrincipalBackend.php +++ b/apps/dav/lib/CalDAV/ResourceBooking/AbstractPrincipalBackend.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\CalDAV\ResourceBooking; use OCA\DAV\CalDAV\Proxy\ProxyMapper; @@ -28,9 +29,9 @@ use OCP\IDBConnection; use OCP\IGroupManager; use OCP\ILogger; use OCP\IUserSession; -use Sabre\DAVACL\PrincipalBackend\BackendInterface; use Sabre\DAV\Exception; -use \Sabre\DAV\PropPatch; +use Sabre\DAV\PropPatch; +use Sabre\DAVACL\PrincipalBackend\BackendInterface; abstract class AbstractPrincipalBackend implements BackendInterface { diff --git a/apps/dav/lib/CalDAV/ResourceBooking/ResourcePrincipalBackend.php b/apps/dav/lib/CalDAV/ResourceBooking/ResourcePrincipalBackend.php index 128e6c21fad49b498256468c593917abdc657d38..b4f7e48a83cf4607b30c4ce597061de9e0a0b002 100644 --- a/apps/dav/lib/CalDAV/ResourceBooking/ResourcePrincipalBackend.php +++ b/apps/dav/lib/CalDAV/ResourceBooking/ResourcePrincipalBackend.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\CalDAV\ResourceBooking; use OCA\DAV\CalDAV\Proxy\ProxyMapper; diff --git a/apps/dav/lib/CalDAV/ResourceBooking/RoomPrincipalBackend.php b/apps/dav/lib/CalDAV/ResourceBooking/RoomPrincipalBackend.php index 3e9e8f688526ce0f0f1e095eb803a57a438fc1b0..dd740d4ee0b5335032f53b6ee1a12315e75c0041 100644 --- a/apps/dav/lib/CalDAV/ResourceBooking/RoomPrincipalBackend.php +++ b/apps/dav/lib/CalDAV/ResourceBooking/RoomPrincipalBackend.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\CalDAV\ResourceBooking; use OCA\DAV\CalDAV\Proxy\ProxyMapper; diff --git a/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php index 56b3ab04ddc5981b2be600ea1fa56432455459fe..f4a233a0f067c58c5f0a3f85050181beadc2d06e 100644 --- a/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php +++ b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php @@ -23,6 +23,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\CalDAV\Schedule; use OCP\AppFramework\Utility\ITimeFactory; @@ -44,6 +45,7 @@ use Sabre\VObject\ITip\Message; use Sabre\VObject\Parameter; use Sabre\VObject\Property; use Sabre\VObject\Recur\EventIterator; + /** * iMIP handler. * diff --git a/apps/dav/lib/CalDAV/Schedule/Plugin.php b/apps/dav/lib/CalDAV/Schedule/Plugin.php index 24fe625e0096cd2a3b3b82c7e75c3486ea81dd3c..79644e1036b0495f85ee26225d2feda3bca57090 100644 --- a/apps/dav/lib/CalDAV/Schedule/Plugin.php +++ b/apps/dav/lib/CalDAV/Schedule/Plugin.php @@ -22,6 +22,7 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\CalDAV\Schedule; use DateTimeZone; @@ -40,11 +41,11 @@ use Sabre\VObject\Component; use Sabre\VObject\Component\VCalendar; use Sabre\VObject\Component\VEvent; use Sabre\VObject\DateTimeParser; +use Sabre\VObject\FreeBusyGenerator; use Sabre\VObject\ITip; use Sabre\VObject\Parameter; use Sabre\VObject\Property; use Sabre\VObject\Reader; -use Sabre\VObject\FreeBusyGenerator; class Plugin extends \Sabre\CalDAV\Schedule\Plugin { diff --git a/apps/dav/lib/CalDAV/Search/SearchPlugin.php b/apps/dav/lib/CalDAV/Search/SearchPlugin.php index e984267ff3702348aaf86f5734401502eef8dc57..c5086ed1b5d22e4cedc2c1fa2576c6c5554cc4fc 100644 --- a/apps/dav/lib/CalDAV/Search/SearchPlugin.php +++ b/apps/dav/lib/CalDAV/Search/SearchPlugin.php @@ -21,12 +21,13 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\CalDAV\Search; +use OCA\DAV\CalDAV\CalendarHome; use OCA\DAV\CalDAV\Search\Xml\Request\CalendarSearchReport; use Sabre\DAV\Server; use Sabre\DAV\ServerPlugin; -use OCA\DAV\CalDAV\CalendarHome; class SearchPlugin extends ServerPlugin { const NS_Nextcloud = 'http://nextcloud.com/ns'; diff --git a/apps/dav/lib/CalDAV/Search/Xml/Filter/CompFilter.php b/apps/dav/lib/CalDAV/Search/Xml/Filter/CompFilter.php index 5cc8f799f90cef117228dc366c349532bfad487d..d68c08204b99b08f9d6f67a8e510f6ff47e40a96 100644 --- a/apps/dav/lib/CalDAV/Search/Xml/Filter/CompFilter.php +++ b/apps/dav/lib/CalDAV/Search/Xml/Filter/CompFilter.php @@ -20,12 +20,13 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\CalDAV\Search\Xml\Filter; +use OCA\DAV\CalDAV\Search\SearchPlugin; use Sabre\DAV\Exception\BadRequest; use Sabre\Xml\Reader; use Sabre\Xml\XmlDeserializable; -use OCA\DAV\CalDAV\Search\SearchPlugin; class CompFilter implements XmlDeserializable { diff --git a/apps/dav/lib/CalDAV/Search/Xml/Filter/LimitFilter.php b/apps/dav/lib/CalDAV/Search/Xml/Filter/LimitFilter.php index bac661b6722bece0d179ff028b5510ce6ef139f9..52e52e6f043cc450650c8a02c031293057e54eb4 100644 --- a/apps/dav/lib/CalDAV/Search/Xml/Filter/LimitFilter.php +++ b/apps/dav/lib/CalDAV/Search/Xml/Filter/LimitFilter.php @@ -20,12 +20,13 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\CalDAV\Search\Xml\Filter; +use OCA\DAV\CalDAV\Search\SearchPlugin; use Sabre\DAV\Exception\BadRequest; use Sabre\Xml\Reader; use Sabre\Xml\XmlDeserializable; -use OCA\DAV\CalDAV\Search\SearchPlugin; class LimitFilter implements XmlDeserializable { @@ -42,4 +43,4 @@ class LimitFilter implements XmlDeserializable { return (int)$value; } -} \ No newline at end of file +} diff --git a/apps/dav/lib/CalDAV/Search/Xml/Filter/OffsetFilter.php b/apps/dav/lib/CalDAV/Search/Xml/Filter/OffsetFilter.php index 8ced850bbc007265302ee2859f95e93d3bd71d36..120310c9c58e1d6a0842fabee6a4de4e110da1fa 100644 --- a/apps/dav/lib/CalDAV/Search/Xml/Filter/OffsetFilter.php +++ b/apps/dav/lib/CalDAV/Search/Xml/Filter/OffsetFilter.php @@ -20,12 +20,13 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\CalDAV\Search\Xml\Filter; +use OCA\DAV\CalDAV\Search\SearchPlugin; use Sabre\DAV\Exception\BadRequest; use Sabre\Xml\Reader; use Sabre\Xml\XmlDeserializable; -use OCA\DAV\CalDAV\Search\SearchPlugin; class OffsetFilter implements XmlDeserializable { @@ -42,4 +43,4 @@ class OffsetFilter implements XmlDeserializable { return (int)$value; } -} \ No newline at end of file +} diff --git a/apps/dav/lib/CalDAV/Search/Xml/Filter/ParamFilter.php b/apps/dav/lib/CalDAV/Search/Xml/Filter/ParamFilter.php index bfcb960d4022a0a4d7e3ec186eeacdf80e107250..81bd2c97f8123aab66cd71833d5024c342897a55 100644 --- a/apps/dav/lib/CalDAV/Search/Xml/Filter/ParamFilter.php +++ b/apps/dav/lib/CalDAV/Search/Xml/Filter/ParamFilter.php @@ -20,12 +20,13 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\CalDAV\Search\Xml\Filter; +use OCA\DAV\CalDAV\Search\SearchPlugin; use Sabre\DAV\Exception\BadRequest; use Sabre\Xml\Reader; use Sabre\Xml\XmlDeserializable; -use OCA\DAV\CalDAV\Search\SearchPlugin; class ParamFilter implements XmlDeserializable { diff --git a/apps/dav/lib/CalDAV/Search/Xml/Filter/PropFilter.php b/apps/dav/lib/CalDAV/Search/Xml/Filter/PropFilter.php index cfb2211fb59c7adc72ef5c57cba2c235afb8bc83..0aa704efed1ddd4344b3f799a211a07d5e9cd167 100644 --- a/apps/dav/lib/CalDAV/Search/Xml/Filter/PropFilter.php +++ b/apps/dav/lib/CalDAV/Search/Xml/Filter/PropFilter.php @@ -20,12 +20,13 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\CalDAV\Search\Xml\Filter; +use OCA\DAV\CalDAV\Search\SearchPlugin; use Sabre\DAV\Exception\BadRequest; use Sabre\Xml\Reader; use Sabre\Xml\XmlDeserializable; -use OCA\DAV\CalDAV\Search\SearchPlugin; class PropFilter implements XmlDeserializable { diff --git a/apps/dav/lib/CalDAV/Search/Xml/Filter/SearchTermFilter.php b/apps/dav/lib/CalDAV/Search/Xml/Filter/SearchTermFilter.php index ddd3681822373ec92395b1e7ad4d688d96956cf8..a00324c9615b88dcce9857a2370499827492b80a 100644 --- a/apps/dav/lib/CalDAV/Search/Xml/Filter/SearchTermFilter.php +++ b/apps/dav/lib/CalDAV/Search/Xml/Filter/SearchTermFilter.php @@ -20,12 +20,13 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\CalDAV\Search\Xml\Filter; +use OCA\DAV\CalDAV\Search\SearchPlugin; use Sabre\DAV\Exception\BadRequest; use Sabre\Xml\Reader; use Sabre\Xml\XmlDeserializable; -use OCA\DAV\CalDAV\Search\SearchPlugin; class SearchTermFilter implements XmlDeserializable { @@ -42,4 +43,4 @@ class SearchTermFilter implements XmlDeserializable { return $value; } -} \ No newline at end of file +} diff --git a/apps/dav/lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php b/apps/dav/lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php index e7c229c7b03914f1a7190a83eec499560957a034..a105a9b695afc7e99cb7d045ea98402bfa045900 100644 --- a/apps/dav/lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php +++ b/apps/dav/lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php @@ -20,12 +20,13 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\CalDAV\Search\Xml\Request; +use OCA\DAV\CalDAV\Search\SearchPlugin; use Sabre\DAV\Exception\BadRequest; use Sabre\Xml\Reader; use Sabre\Xml\XmlDeserializable; -use OCA\DAV\CalDAV\Search\SearchPlugin; /** * CalendarSearchReport request parser. diff --git a/apps/dav/lib/CalDAV/WebcalCaching/Plugin.php b/apps/dav/lib/CalDAV/WebcalCaching/Plugin.php index de2ff5a8e8b7ad5ff78bc366dcb148716c929892..95af7c2e75ab99163161860f27017d105c072a19 100644 --- a/apps/dav/lib/CalDAV/WebcalCaching/Plugin.php +++ b/apps/dav/lib/CalDAV/WebcalCaching/Plugin.php @@ -21,6 +21,7 @@ declare(strict_types=1); * along with this program. If not, see . * */ + namespace OCA\DAV\CalDAV\WebcalCaching; use OCA\DAV\CalDAV\CalendarHome; diff --git a/apps/dav/lib/Capabilities.php b/apps/dav/lib/Capabilities.php index a301a393008d34aa8c8e07f51e4147e63d372289..7bb6908e5f02a1cfa1bf000c3e1daa5840446c3c 100644 --- a/apps/dav/lib/Capabilities.php +++ b/apps/dav/lib/Capabilities.php @@ -20,7 +20,6 @@ * */ - namespace OCA\DAV; use OCP\Capabilities\ICapability; diff --git a/apps/dav/lib/CardDAV/AddressBook.php b/apps/dav/lib/CardDAV/AddressBook.php index 3b02bdf5ba60399e387cfab7ac7cb5a420c642de..171fb461fb2daeacd9131b91292f392f477ba29e 100644 --- a/apps/dav/lib/CardDAV/AddressBook.php +++ b/apps/dav/lib/CardDAV/AddressBook.php @@ -20,6 +20,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\CardDAV; use OCA\DAV\DAV\Sharing\IShareable; diff --git a/apps/dav/lib/CardDAV/AddressBookRoot.php b/apps/dav/lib/CardDAV/AddressBookRoot.php index c52ee2d74f86dea2133cae398aa2a2d8016a453c..d8fe96fabea4b24aed1d78a334a6c2c1c5c042e7 100644 --- a/apps/dav/lib/CardDAV/AddressBookRoot.php +++ b/apps/dav/lib/CardDAV/AddressBookRoot.php @@ -20,6 +20,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\CardDAV; use OCP\IL10N; diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php index 7dbd41a69c8cf7e143eeb4ef65a4901b94fe3cdc..18ac99cd2a8bd8a20d1595241169ce56b77e4f1f 100644 --- a/apps/dav/lib/CardDAV/CardDavBackend.php +++ b/apps/dav/lib/CardDAV/CardDavBackend.php @@ -34,9 +34,9 @@ namespace OCA\DAV\CardDAV; use OCA\DAV\Connector\Sabre\Principal; -use OCP\DB\QueryBuilder\IQueryBuilder; 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\IUser; diff --git a/apps/dav/lib/CardDAV/PhotoCache.php b/apps/dav/lib/CardDAV/PhotoCache.php index 8632fd45f2231a2b2811f81a0d62d4f02246c2df..cf3a1149590ea4170b97494ce76209f2999af1a7 100644 --- a/apps/dav/lib/CardDAV/PhotoCache.php +++ b/apps/dav/lib/CardDAV/PhotoCache.php @@ -21,14 +21,15 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\CardDAV; use OCP\Files\IAppData; -use OCP\ILogger; use OCP\Files\NotFoundException; use OCP\Files\NotPermittedException; use OCP\Files\SimpleFS\ISimpleFile; use OCP\Files\SimpleFS\ISimpleFolder; +use OCP\ILogger; use Sabre\CardDAV\Card; use Sabre\VObject\Property\Binary; use Sabre\VObject\Reader; diff --git a/apps/dav/lib/CardDAV/UserAddressBooks.php b/apps/dav/lib/CardDAV/UserAddressBooks.php index d1fcbf2ce134046c57d4bb0951fa4772cf981fdf..c0f4b434087e0e65b7bb281cf94191ad7a92ce37 100644 --- a/apps/dav/lib/CardDAV/UserAddressBooks.php +++ b/apps/dav/lib/CardDAV/UserAddressBooks.php @@ -20,6 +20,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\CardDAV; use OCP\IConfig; diff --git a/apps/dav/lib/CardDAV/Xml/Groups.php b/apps/dav/lib/CardDAV/Xml/Groups.php index 9240b90a1eb4d40719f425cc25976b168e94235d..ebbc1ef37ea830c61279d09d597fa43b89788ec2 100644 --- a/apps/dav/lib/CardDAV/Xml/Groups.php +++ b/apps/dav/lib/CardDAV/Xml/Groups.php @@ -19,10 +19,11 @@ * along with this program. If not, see * */ + namespace OCA\DAV\CardDAV\Xml; -use Sabre\Xml\XmlSerializable; use Sabre\Xml\Writer; +use Sabre\Xml\XmlSerializable; class Groups implements XmlSerializable { const NS_OWNCLOUD = 'http://owncloud.org/ns'; diff --git a/apps/dav/lib/Command/CreateAddressBook.php b/apps/dav/lib/Command/CreateAddressBook.php index 96ad350121cf2728319bc40ff56c5c01e08c08c7..502021d7f51c48f6c3a21ae4494d06274cc934db 100644 --- a/apps/dav/lib/Command/CreateAddressBook.php +++ b/apps/dav/lib/Command/CreateAddressBook.php @@ -20,6 +20,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Command; use OCA\DAV\CardDAV\CardDavBackend; diff --git a/apps/dav/lib/Command/CreateCalendar.php b/apps/dav/lib/Command/CreateCalendar.php index a40bf48cc8e2c4a0b4549f9c06e7ec95985ef2ac..c6bfffb2425838fc391a9e7df49a037df5a53dc8 100644 --- a/apps/dav/lib/Command/CreateCalendar.php +++ b/apps/dav/lib/Command/CreateCalendar.php @@ -21,6 +21,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Command; use OCA\DAV\CalDAV\CalDavBackend; diff --git a/apps/dav/lib/Command/ListCalendars.php b/apps/dav/lib/Command/ListCalendars.php index 6c2f5bdb506024fcaef503a0b4d7a068baa79753..e31d08dbcb6247378a27adcd3bf16351cf44a0ee 100644 --- a/apps/dav/lib/Command/ListCalendars.php +++ b/apps/dav/lib/Command/ListCalendars.php @@ -20,6 +20,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Command; use OCA\DAV\CalDAV\BirthdayService; diff --git a/apps/dav/lib/Command/MoveCalendar.php b/apps/dav/lib/Command/MoveCalendar.php index a2c7ca8c4d853cd0ff7bb2c604aeb7bbb5f7e2c5..afd924cdfae46282805d44883c58ec984145d479 100644 --- a/apps/dav/lib/Command/MoveCalendar.php +++ b/apps/dav/lib/Command/MoveCalendar.php @@ -17,6 +17,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Command; use OCA\DAV\CalDAV\CalDavBackend; diff --git a/apps/dav/lib/Command/SendEventReminders.php b/apps/dav/lib/Command/SendEventReminders.php index 93477cb0f721a3ecb12afb8ffcb8256355e8d997..bcbc069462551122249cc661b3c8f398ba99b1af 100644 --- a/apps/dav/lib/Command/SendEventReminders.php +++ b/apps/dav/lib/Command/SendEventReminders.php @@ -19,6 +19,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Command; use OCA\DAV\CalDAV\Reminder\ReminderService; diff --git a/apps/dav/lib/Command/SyncBirthdayCalendar.php b/apps/dav/lib/Command/SyncBirthdayCalendar.php index 3d1bcab6c31628f8553d6db4eeaca1ee9328895a..c1244f8b35f067365113abc647ba58e9d0e4a4f0 100644 --- a/apps/dav/lib/Command/SyncBirthdayCalendar.php +++ b/apps/dav/lib/Command/SyncBirthdayCalendar.php @@ -20,6 +20,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Command; use OCA\DAV\CalDAV\BirthdayService; diff --git a/apps/dav/lib/Command/SyncSystemAddressBook.php b/apps/dav/lib/Command/SyncSystemAddressBook.php index e91ab38593dd93fc4fad41005bc04e4fd4ed9e93..e1700b950b1bf985001d82c5418fe63804a5a7f6 100644 --- a/apps/dav/lib/Command/SyncSystemAddressBook.php +++ b/apps/dav/lib/Command/SyncSystemAddressBook.php @@ -19,6 +19,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Command; use OCA\DAV\CardDAV\SyncService; diff --git a/apps/dav/lib/Comments/CommentsPlugin.php b/apps/dav/lib/Comments/CommentsPlugin.php index d49dfdb14ef376c230acd50da531cef9adfb3660..19a825dff8f408599b97923f4220cfcc95c96331 100644 --- a/apps/dav/lib/Comments/CommentsPlugin.php +++ b/apps/dav/lib/Comments/CommentsPlugin.php @@ -29,9 +29,9 @@ use OCP\Comments\IComment; use OCP\Comments\ICommentsManager; use OCP\IUserSession; use Sabre\DAV\Exception\BadRequest; +use Sabre\DAV\Exception\NotFound; use Sabre\DAV\Exception\ReportNotSupported; use Sabre\DAV\Exception\UnsupportedMediaType; -use Sabre\DAV\Exception\NotFound; use Sabre\DAV\Server; use Sabre\DAV\ServerPlugin; use Sabre\DAV\Xml\Element\Response; diff --git a/apps/dav/lib/Comments/EntityCollection.php b/apps/dav/lib/Comments/EntityCollection.php index e84fbb50566bd779fbd2c32d94deae09321b4790..a4f457aa58c8ef7d29d7dbbed126b920cb50f719 100644 --- a/apps/dav/lib/Comments/EntityCollection.php +++ b/apps/dav/lib/Comments/EntityCollection.php @@ -193,4 +193,3 @@ class EntityCollection extends RootCollection implements IProperties { return [self::PROPERTY_NAME_READ_MARKER => $marker]; } } - diff --git a/apps/dav/lib/Comments/RootCollection.php b/apps/dav/lib/Comments/RootCollection.php index 839eb34aa909678417e81d4e3f1fcdeec01fd04c..22c2adcbd2edea945dbf2894e074517124b8b3df 100644 --- a/apps/dav/lib/Comments/RootCollection.php +++ b/apps/dav/lib/Comments/RootCollection.php @@ -28,8 +28,8 @@ use OCP\Comments\ICommentsManager; use OCP\ILogger; use OCP\IUserManager; use OCP\IUserSession; -use Sabre\DAV\Exception\NotAuthenticated; use Sabre\DAV\Exception\Forbidden; +use Sabre\DAV\Exception\NotAuthenticated; use Sabre\DAV\Exception\NotFound; use Sabre\DAV\ICollection; use Symfony\Component\EventDispatcher\EventDispatcherInterface; diff --git a/apps/dav/lib/Connector/Sabre/Auth.php b/apps/dav/lib/Connector/Sabre/Auth.php index 292be61c9dcccd07afc7b2eb3eb7994b0652462f..b5258c107c0a4476d906562fc3f64becccb8464e 100644 --- a/apps/dav/lib/Connector/Sabre/Auth.php +++ b/apps/dav/lib/Connector/Sabre/Auth.php @@ -30,6 +30,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Connector\Sabre; use Exception; diff --git a/apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php b/apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php index 0a70d44395b77c36eb0f60aad9b64d50d2475400..6e6e9b5baa2ee518f5cb8be9cc68bcc9cc10cde7 100644 --- a/apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php +++ b/apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php @@ -24,8 +24,8 @@ namespace OCA\DAV\Connector\Sabre; use OCP\IConfig; -use Sabre\HTTP\RequestInterface; use Sabre\DAV\ServerPlugin; +use Sabre\HTTP\RequestInterface; /** * Class BlockLegacyClientPlugin is used to detect old legacy sync clients and diff --git a/apps/dav/lib/Connector/Sabre/ChecksumList.php b/apps/dav/lib/Connector/Sabre/ChecksumList.php index 1bc38f75fb94858cd27a3e11ef95f6b482db9ad8..7fceacf56cca45d8b271584cc4cfdfbe3841b3c0 100644 --- a/apps/dav/lib/Connector/Sabre/ChecksumList.php +++ b/apps/dav/lib/Connector/Sabre/ChecksumList.php @@ -19,10 +19,11 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Connector\Sabre; -use Sabre\Xml\XmlSerializable; use Sabre\Xml\Writer; +use Sabre\Xml\XmlSerializable; /** * Checksumlist property diff --git a/apps/dav/lib/Connector/Sabre/CopyEtagHeaderPlugin.php b/apps/dav/lib/Connector/Sabre/CopyEtagHeaderPlugin.php index a39a3d29779e888dae8c9b3b52822a518b1c1bb6..b3fe658106337dba3634343edf128f9d25cbdcde 100644 --- a/apps/dav/lib/Connector/Sabre/CopyEtagHeaderPlugin.php +++ b/apps/dav/lib/Connector/Sabre/CopyEtagHeaderPlugin.php @@ -23,8 +23,8 @@ namespace OCA\DAV\Connector\Sabre; -use \Sabre\HTTP\RequestInterface; -use \Sabre\HTTP\ResponseInterface; +use Sabre\HTTP\RequestInterface; +use Sabre\HTTP\ResponseInterface; /** * Copies the "Etag" header to "OC-Etag" after any request. diff --git a/apps/dav/lib/Connector/Sabre/CustomPropertiesBackend.php b/apps/dav/lib/Connector/Sabre/CustomPropertiesBackend.php index f3f685a8b9e9bdeaa01831dc0633ece3b6b9a8da..a844b58c81e71fb013151b25dcfeabb6f7152c3c 100644 --- a/apps/dav/lib/Connector/Sabre/CustomPropertiesBackend.php +++ b/apps/dav/lib/Connector/Sabre/CustomPropertiesBackend.php @@ -27,12 +27,12 @@ namespace OCA\DAV\Connector\Sabre; use OCP\IDBConnection; use OCP\IUser; +use Sabre\DAV\Exception\NotFound; +use Sabre\DAV\Exception\ServiceUnavailable; use Sabre\DAV\PropertyStorage\Backend\BackendInterface; use Sabre\DAV\PropFind; use Sabre\DAV\PropPatch; use Sabre\DAV\Tree; -use Sabre\DAV\Exception\NotFound; -use Sabre\DAV\Exception\ServiceUnavailable; class CustomPropertiesBackend implements BackendInterface { diff --git a/apps/dav/lib/Connector/Sabre/DavAclPlugin.php b/apps/dav/lib/Connector/Sabre/DavAclPlugin.php index 5a0d9e83c6273fd3a64bf2a321b53a7238e3e2fb..8e6b5af0d3cd3a8915b23d3d916d28f7ff1e4195 100644 --- a/apps/dav/lib/Connector/Sabre/DavAclPlugin.php +++ b/apps/dav/lib/Connector/Sabre/DavAclPlugin.php @@ -23,11 +23,11 @@ namespace OCA\DAV\Connector\Sabre; +use OCA\DAV\CardDAV\AddressBook; use Sabre\CalDAV\Principal\User; use Sabre\DAV\Exception\NotFound; use Sabre\DAV\INode; -use \Sabre\DAV\PropFind; -use OCA\DAV\CardDAV\AddressBook; +use Sabre\DAV\PropFind; use Sabre\HTTP\RequestInterface; use Sabre\HTTP\ResponseInterface; diff --git a/apps/dav/lib/Connector/Sabre/Directory.php b/apps/dav/lib/Connector/Sabre/Directory.php index aaf5f54ec26e3b9c9e76ddaa527602b2666bcc73..e61470a52a0a35bcc1178f1228ecda09607b4416 100644 --- a/apps/dav/lib/Connector/Sabre/Directory.php +++ b/apps/dav/lib/Connector/Sabre/Directory.php @@ -31,23 +31,23 @@ namespace OCA\DAV\Connector\Sabre; +use OC\Files\Mount\MoveableMount; use OC\Files\View; +use OCA\DAV\Connector\Sabre\Exception\FileLocked; use OCA\DAV\Connector\Sabre\Exception\Forbidden; use OCA\DAV\Connector\Sabre\Exception\InvalidPath; -use OCA\DAV\Connector\Sabre\Exception\FileLocked; use OCP\Files\FileInfo; use OCP\Files\ForbiddenException; use OCP\Files\InvalidPathException; use OCP\Files\StorageNotAvailableException; use OCP\Lock\ILockingProvider; use OCP\Lock\LockedException; +use Sabre\DAV\Exception\BadRequest; use Sabre\DAV\Exception\Locked; +use Sabre\DAV\Exception\NotFound; use Sabre\DAV\Exception\ServiceUnavailable; -use Sabre\DAV\INode; -use Sabre\DAV\Exception\BadRequest; -use OC\Files\Mount\MoveableMount; use Sabre\DAV\IFile; -use Sabre\DAV\Exception\NotFound; +use Sabre\DAV\INode; class Directory extends \OCA\DAV\Connector\Sabre\Node implements \Sabre\DAV\ICollection, \Sabre\DAV\IQuota, \Sabre\DAV\IMoveTarget { diff --git a/apps/dav/lib/Connector/Sabre/DummyGetResponsePlugin.php b/apps/dav/lib/Connector/Sabre/DummyGetResponsePlugin.php index f28f86e502e291de44382ba6c68a04b2b60003c2..54a07b137156a4caf24afb7cac5e6a09e4676246 100644 --- a/apps/dav/lib/Connector/Sabre/DummyGetResponsePlugin.php +++ b/apps/dav/lib/Connector/Sabre/DummyGetResponsePlugin.php @@ -24,8 +24,8 @@ */ namespace OCA\DAV\Connector\Sabre; -use Sabre\HTTP\ResponseInterface; use Sabre\HTTP\RequestInterface; +use Sabre\HTTP\ResponseInterface; /** * Class DummyGetResponsePlugin is a plugin used to not show a "Not implemented" diff --git a/apps/dav/lib/Connector/Sabre/Exception/EntityTooLarge.php b/apps/dav/lib/Connector/Sabre/Exception/EntityTooLarge.php index 09ced838037408e28d1353d3acc65130b1108027..ff124435af8aa24439bfacacbef6515f617506a7 100644 --- a/apps/dav/lib/Connector/Sabre/Exception/EntityTooLarge.php +++ b/apps/dav/lib/Connector/Sabre/Exception/EntityTooLarge.php @@ -21,6 +21,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Connector\Sabre\Exception; /** diff --git a/apps/dav/lib/Connector/Sabre/Exception/PasswordLoginForbidden.php b/apps/dav/lib/Connector/Sabre/Exception/PasswordLoginForbidden.php index 2a90ceeb7ff14d40cf58ab45ff9d60370bb91def..9a4915d44fad09759a38b89dd84a1f09ed3f0d8f 100644 --- a/apps/dav/lib/Connector/Sabre/Exception/PasswordLoginForbidden.php +++ b/apps/dav/lib/Connector/Sabre/Exception/PasswordLoginForbidden.php @@ -24,8 +24,8 @@ namespace OCA\DAV\Connector\Sabre\Exception; use DOMElement; -use Sabre\DAV\Server; use Sabre\DAV\Exception\NotAuthenticated; +use Sabre\DAV\Server; class PasswordLoginForbidden extends NotAuthenticated { diff --git a/apps/dav/lib/Connector/Sabre/Exception/UnsupportedMediaType.php b/apps/dav/lib/Connector/Sabre/Exception/UnsupportedMediaType.php index 5edead6c1e37477c2c51c69ce970e9901e312f0c..95ea92558b13a81c2a80e17bb8e930ce6b75128e 100644 --- a/apps/dav/lib/Connector/Sabre/Exception/UnsupportedMediaType.php +++ b/apps/dav/lib/Connector/Sabre/Exception/UnsupportedMediaType.php @@ -21,6 +21,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Connector\Sabre\Exception; /** diff --git a/apps/dav/lib/Connector/Sabre/FakeLockerPlugin.php b/apps/dav/lib/Connector/Sabre/FakeLockerPlugin.php index 4fa208d8805a12a55009f321ba5047d7d937fcbd..0ef7619cda5cbc76484882af97b12b825ea2ba3c 100644 --- a/apps/dav/lib/Connector/Sabre/FakeLockerPlugin.php +++ b/apps/dav/lib/Connector/Sabre/FakeLockerPlugin.php @@ -24,14 +24,14 @@ namespace OCA\DAV\Connector\Sabre; +use Sabre\DAV\INode; use Sabre\DAV\Locks\LockInfo; +use Sabre\DAV\PropFind; use Sabre\DAV\ServerPlugin; use Sabre\DAV\Xml\Property\LockDiscovery; use Sabre\DAV\Xml\Property\SupportedLock; use Sabre\HTTP\RequestInterface; use Sabre\HTTP\ResponseInterface; -use Sabre\DAV\PropFind; -use Sabre\DAV\INode; /** * Class FakeLockerPlugin is a plugin only used when connections come in from diff --git a/apps/dav/lib/Connector/Sabre/File.php b/apps/dav/lib/Connector/Sabre/File.php index 3ce305d75f38ab74b02e578343752a484a6ba616..bcbddc305454edb557c266d7693d96ce9c39b032 100644 --- a/apps/dav/lib/Connector/Sabre/File.php +++ b/apps/dav/lib/Connector/Sabre/File.php @@ -62,10 +62,10 @@ use OCP\Share\IManager; use Sabre\DAV\Exception; use Sabre\DAV\Exception\BadRequest; use Sabre\DAV\Exception\Forbidden; +use Sabre\DAV\Exception\NotFound; use Sabre\DAV\Exception\NotImplemented; use Sabre\DAV\Exception\ServiceUnavailable; use Sabre\DAV\IFile; -use Sabre\DAV\Exception\NotFound; class File extends Node implements IFile { diff --git a/apps/dav/lib/Connector/Sabre/FilesPlugin.php b/apps/dav/lib/Connector/Sabre/FilesPlugin.php index b2a0e9a31b46a002dee533fbce0c81653975b052..1ae62a70d2dc10a060111ffcd0e59c27057de63c 100644 --- a/apps/dav/lib/Connector/Sabre/FilesPlugin.php +++ b/apps/dav/lib/Connector/Sabre/FilesPlugin.php @@ -35,19 +35,19 @@ namespace OCA\DAV\Connector\Sabre; use OC\AppFramework\Http\Request; use OCP\Constants; use OCP\Files\ForbiddenException; +use OCP\Files\StorageNotAvailableException; +use OCP\IConfig; use OCP\IPreview; +use OCP\IRequest; use Sabre\DAV\Exception\Forbidden; use Sabre\DAV\Exception\NotFound; use Sabre\DAV\IFile; -use \Sabre\DAV\PropFind; -use \Sabre\DAV\PropPatch; +use Sabre\DAV\PropFind; +use Sabre\DAV\PropPatch; use Sabre\DAV\ServerPlugin; use Sabre\DAV\Tree; -use \Sabre\HTTP\RequestInterface; -use \Sabre\HTTP\ResponseInterface; -use OCP\Files\StorageNotAvailableException; -use OCP\IConfig; -use OCP\IRequest; +use Sabre\HTTP\RequestInterface; +use Sabre\HTTP\ResponseInterface; class FilesPlugin extends ServerPlugin { diff --git a/apps/dav/lib/Connector/Sabre/FilesReportPlugin.php b/apps/dav/lib/Connector/Sabre/FilesReportPlugin.php index d679fa307c20dc59b98201da55c2291d31ec57e6..8d7a47eebd6bf5a7f1214fa9f49f747a3eeb6dbc 100644 --- a/apps/dav/lib/Connector/Sabre/FilesReportPlugin.php +++ b/apps/dav/lib/Connector/Sabre/FilesReportPlugin.php @@ -26,20 +26,20 @@ namespace OCA\DAV\Connector\Sabre; use OC\Files\View; use OCP\App\IAppManager; -use Sabre\DAV\Exception\PreconditionFailed; +use OCP\Files\Folder; +use OCP\IGroupManager; +use OCP\ITagManager; +use OCP\IUserSession; +use OCP\SystemTag\ISystemTagManager; +use OCP\SystemTag\ISystemTagObjectMapper; +use OCP\SystemTag\TagNotFoundException; use Sabre\DAV\Exception\BadRequest; +use Sabre\DAV\Exception\PreconditionFailed; +use Sabre\DAV\PropFind; use Sabre\DAV\ServerPlugin; use Sabre\DAV\Tree; use Sabre\DAV\Xml\Element\Response; use Sabre\DAV\Xml\Response\MultiStatus; -use Sabre\DAV\PropFind; -use OCP\SystemTag\ISystemTagObjectMapper; -use OCP\IUserSession; -use OCP\Files\Folder; -use OCP\IGroupManager; -use OCP\SystemTag\ISystemTagManager; -use OCP\SystemTag\TagNotFoundException; -use OCP\ITagManager; class FilesReportPlugin extends ServerPlugin { diff --git a/apps/dav/lib/Connector/Sabre/Node.php b/apps/dav/lib/Connector/Sabre/Node.php index 2a3e8145f6faeb156213a7b86997dd6e6c0c0eaa..effc360738d0d2c902c25474cfd1ec603aab0f4a 100644 --- a/apps/dav/lib/Connector/Sabre/Node.php +++ b/apps/dav/lib/Connector/Sabre/Node.php @@ -39,12 +39,11 @@ use OC\Files\View; use OCA\DAV\Connector\Sabre\Exception\InvalidPath; use OCP\Files\FileInfo; use OCP\Files\StorageNotAvailableException; +use OCP\Share; use OCP\Share\Exceptions\ShareNotFound; use OCP\Share\IManager; -use OCP\Share; use OCP\Share\IShare; - abstract class Node implements \Sabre\DAV\INode { /** diff --git a/apps/dav/lib/Connector/Sabre/ObjectTree.php b/apps/dav/lib/Connector/Sabre/ObjectTree.php index ae185b1a611216906c9035ddba68dad433d21a56..5288745362c51869d7adfd8665d7352b531771d0 100644 --- a/apps/dav/lib/Connector/Sabre/ObjectTree.php +++ b/apps/dav/lib/Connector/Sabre/ObjectTree.php @@ -29,11 +29,11 @@ namespace OCA\DAV\Connector\Sabre; +use OC\Files\FileInfo; use OC\Files\Storage\FailedStorage; +use OCA\DAV\Connector\Sabre\Exception\FileLocked; use OCA\DAV\Connector\Sabre\Exception\Forbidden; use OCA\DAV\Connector\Sabre\Exception\InvalidPath; -use OCA\DAV\Connector\Sabre\Exception\FileLocked; -use OC\Files\FileInfo; use OCP\Files\ForbiddenException; use OCP\Files\StorageInvalidException; use OCP\Files\StorageNotAvailableException; diff --git a/apps/dav/lib/Connector/Sabre/QuotaPlugin.php b/apps/dav/lib/Connector/Sabre/QuotaPlugin.php index 0388bc48f8d2234b6508c475ebe63df3abf00068..b3ca822ed86843d3c441143176c2ee89bcf156e1 100644 --- a/apps/dav/lib/Connector/Sabre/QuotaPlugin.php +++ b/apps/dav/lib/Connector/Sabre/QuotaPlugin.php @@ -25,6 +25,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Connector\Sabre; use OCA\DAV\Upload\FutureFile; use OCP\Files\FileInfo; diff --git a/apps/dav/lib/Connector/Sabre/SharesPlugin.php b/apps/dav/lib/Connector/Sabre/SharesPlugin.php index 5edf28e6e50c733eff12ef1a084ec6b74ffc86eb..8aaacefb85b7e1f3cf9c00cd20ef74900e247f25 100644 --- a/apps/dav/lib/Connector/Sabre/SharesPlugin.php +++ b/apps/dav/lib/Connector/Sabre/SharesPlugin.php @@ -25,11 +25,12 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Connector\Sabre; -use \Sabre\DAV\PropFind; use OCP\IUserSession; use OCP\Share\IShare; +use Sabre\DAV\PropFind; /** * Sabre Plugin to provide share-related properties diff --git a/apps/dav/lib/Connector/Sabre/TagsPlugin.php b/apps/dav/lib/Connector/Sabre/TagsPlugin.php index c9c9ec8661fcc21d4707b836457ec989c67d99e1..5f33220942028c45135202612d0d006e3d648070 100644 --- a/apps/dav/lib/Connector/Sabre/TagsPlugin.php +++ b/apps/dav/lib/Connector/Sabre/TagsPlugin.php @@ -22,6 +22,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Connector\Sabre; /** @@ -45,8 +46,8 @@ namespace OCA\DAV\Connector\Sabre; * */ -use \Sabre\DAV\PropFind; -use \Sabre\DAV\PropPatch; +use Sabre\DAV\PropFind; +use Sabre\DAV\PropPatch; class TagsPlugin extends \Sabre\DAV\ServerPlugin { diff --git a/apps/dav/lib/Controller/InvitationResponseController.php b/apps/dav/lib/Controller/InvitationResponseController.php index e3bdab90aaf281bbf1f5056cf967ecb1254d610f..1ec4c031b42637999b98ce0346ba93097c1845fc 100644 --- a/apps/dav/lib/Controller/InvitationResponseController.php +++ b/apps/dav/lib/Controller/InvitationResponseController.php @@ -21,6 +21,7 @@ declare(strict_types=1); * along with this program. If not, see . * */ + namespace OCA\DAV\Controller; use OCA\DAV\CalDAV\InvitationResponse\InvitationResponseServer; diff --git a/apps/dav/lib/DAV/GroupPrincipalBackend.php b/apps/dav/lib/DAV/GroupPrincipalBackend.php index a797a25f90b8beba514d108d7807bb4333bab76f..88ca421f39a34cf21fef444e88c622b6e19ee9c4 100644 --- a/apps/dav/lib/DAV/GroupPrincipalBackend.php +++ b/apps/dav/lib/DAV/GroupPrincipalBackend.php @@ -22,15 +22,16 @@ * along with this program. If not, see * */ + namespace OCA\DAV\DAV; use OCP\IGroup; use OCP\IGroupManager; +use OCP\IUser; use OCP\IUserSession; use OCP\Share\IManager as IShareManager; -use OCP\IUser; use Sabre\DAV\Exception; -use \Sabre\DAV\PropPatch; +use Sabre\DAV\PropPatch; use Sabre\DAVACL\PrincipalBackend\BackendInterface; class GroupPrincipalBackend implements BackendInterface { diff --git a/apps/dav/lib/DAV/PublicAuth.php b/apps/dav/lib/DAV/PublicAuth.php index 636039eeb3c957ec5e2fc43fd6634c11a238b61a..99e4851d3b645e7b23976116083a96b4f2b6e22d 100644 --- a/apps/dav/lib/DAV/PublicAuth.php +++ b/apps/dav/lib/DAV/PublicAuth.php @@ -19,6 +19,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\DAV; use Sabre\DAV\Auth\Backend\BackendInterface; diff --git a/apps/dav/lib/DAV/Sharing/IShareable.php b/apps/dav/lib/DAV/Sharing/IShareable.php index 07492d70a24452322a6f55238b4f5c981a065f81..ef30ecac153a9505154f6985c300bee33a1648d6 100644 --- a/apps/dav/lib/DAV/Sharing/IShareable.php +++ b/apps/dav/lib/DAV/Sharing/IShareable.php @@ -19,6 +19,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\DAV\Sharing; use Sabre\DAV\INode; @@ -72,4 +73,4 @@ interface IShareable extends INode { */ public function getOwner(); -} \ No newline at end of file +} diff --git a/apps/dav/lib/DAV/Sharing/Xml/Invite.php b/apps/dav/lib/DAV/Sharing/Xml/Invite.php index 376ae3ee78c3c89d55a07159e7599b9019db1809..e4092643d3f8bf882e5b33d9a0ef499089e23b89 100644 --- a/apps/dav/lib/DAV/Sharing/Xml/Invite.php +++ b/apps/dav/lib/DAV/Sharing/Xml/Invite.php @@ -21,6 +21,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\DAV\Sharing\Xml; use OCA\DAV\DAV\Sharing\Plugin; diff --git a/apps/dav/lib/DAV/Sharing/Xml/ShareRequest.php b/apps/dav/lib/DAV/Sharing/Xml/ShareRequest.php index 6bdf8c1aca2aee92aade81ce6f116e7abb16111f..5384d9b6c20118b7505a01527b9b8ca884fc6e0c 100644 --- a/apps/dav/lib/DAV/Sharing/Xml/ShareRequest.php +++ b/apps/dav/lib/DAV/Sharing/Xml/ShareRequest.php @@ -19,6 +19,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\DAV\Sharing\Xml; use OCA\DAV\DAV\Sharing\Plugin; diff --git a/apps/dav/lib/Exception/UnsupportedLimitOnInitialSyncException.php b/apps/dav/lib/Exception/UnsupportedLimitOnInitialSyncException.php index b065a9007898ed13904cba6307e3e5b3d14e9136..2c04e78acedec71fbb914f0bba53c501bc7abdfe 100644 --- a/apps/dav/lib/Exception/UnsupportedLimitOnInitialSyncException.php +++ b/apps/dav/lib/Exception/UnsupportedLimitOnInitialSyncException.php @@ -20,6 +20,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Exception; use Sabre\DAV\Exception\InsufficientStorage; diff --git a/apps/dav/lib/Files/FileSearchBackend.php b/apps/dav/lib/Files/FileSearchBackend.php index 0157ae038cb51f43639aaf4b6a61f622cddf6385..3eba158c9449920c7ed231caf827a25399502ea7 100644 --- a/apps/dav/lib/Files/FileSearchBackend.php +++ b/apps/dav/lib/Files/FileSearchBackend.php @@ -45,10 +45,10 @@ use Sabre\DAV\Exception\NotFound; use SearchDAV\Backend\ISearchBackend; use SearchDAV\Backend\SearchPropertyDefinition; use SearchDAV\Backend\SearchResult; -use SearchDAV\Query\Query; use SearchDAV\Query\Literal; use SearchDAV\Query\Operator; use SearchDAV\Query\Order; +use SearchDAV\Query\Query; class FileSearchBackend implements ISearchBackend { /** @var CachingTree */ diff --git a/apps/dav/lib/Files/FilesHome.php b/apps/dav/lib/Files/FilesHome.php index 1ff918aabbb6972901202b026d2f8badc37c831a..bdf6638f1cc100149f7110f171199165fdb040df 100644 --- a/apps/dav/lib/Files/FilesHome.php +++ b/apps/dav/lib/Files/FilesHome.php @@ -22,6 +22,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Files; use OCA\DAV\Connector\Sabre\Directory; diff --git a/apps/dav/lib/Files/RootCollection.php b/apps/dav/lib/Files/RootCollection.php index f5544693f2cf3924644f27c83ecad070fe2be2a9..8f7e3f6e1b11225bfd481725703e967be6fa328c 100644 --- a/apps/dav/lib/Files/RootCollection.php +++ b/apps/dav/lib/Files/RootCollection.php @@ -21,12 +21,13 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Files; use OCP\Files\FileInfo; use Sabre\DAV\INode; -use Sabre\DAVACL\AbstractPrincipalCollection; use Sabre\DAV\SimpleCollection; +use Sabre\DAVACL\AbstractPrincipalCollection; class RootCollection extends AbstractPrincipalCollection { diff --git a/apps/dav/lib/Files/Sharing/FilesDropPlugin.php b/apps/dav/lib/Files/Sharing/FilesDropPlugin.php index 3485df09d0fe8b5edbf49b3fcfb3ded1e36787ee..23a5091fb2371d1a550ff64dd3682ccf25cf214f 100644 --- a/apps/dav/lib/Files/Sharing/FilesDropPlugin.php +++ b/apps/dav/lib/Files/Sharing/FilesDropPlugin.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\Files\Sharing; use OC\Files\View; diff --git a/apps/dav/lib/HookManager.php b/apps/dav/lib/HookManager.php index 272c4cd1ad3a2d0eb2fdf60799e04ea1384d72a0..d0f8c3047506263cbd97ea9adee4005b645c2630 100644 --- a/apps/dav/lib/HookManager.php +++ b/apps/dav/lib/HookManager.php @@ -24,6 +24,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV; use OCA\DAV\CalDAV\CalDavBackend; diff --git a/apps/dav/lib/Migration/BuildCalendarSearchIndex.php b/apps/dav/lib/Migration/BuildCalendarSearchIndex.php index 22274e36c6b65e503e788e783ae39c7f701764ee..35f5fd426a7d1eee73674708e553a34bb0dc7dee 100644 --- a/apps/dav/lib/Migration/BuildCalendarSearchIndex.php +++ b/apps/dav/lib/Migration/BuildCalendarSearchIndex.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\Migration; use OCP\BackgroundJob\IJobList; @@ -83,4 +84,4 @@ class BuildCalendarSearchIndex implements IRepairStep { // if all were done, no need to redo the repair during next upgrade $this->config->setAppValue('dav', 'buildCalendarSearchIndex', 'yes'); } -} \ No newline at end of file +} diff --git a/apps/dav/lib/Migration/BuildCalendarSearchIndexBackgroundJob.php b/apps/dav/lib/Migration/BuildCalendarSearchIndexBackgroundJob.php index a4fa2c63e02be9f2983b503012bfead816383ef3..2d66b03a208a8830fbf7e3e6fd4a956aa1891cf2 100644 --- a/apps/dav/lib/Migration/BuildCalendarSearchIndexBackgroundJob.php +++ b/apps/dav/lib/Migration/BuildCalendarSearchIndexBackgroundJob.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\Migration; use OC\BackgroundJob\QueuedJob; diff --git a/apps/dav/lib/Migration/RegenerateBirthdayCalendars.php b/apps/dav/lib/Migration/RegenerateBirthdayCalendars.php index 492ae876e8a99a0c5cee4b317b282c7acaa7d613..54d52b04ebb79d16d9a01b9cee566730f21673d6 100644 --- a/apps/dav/lib/Migration/RegenerateBirthdayCalendars.php +++ b/apps/dav/lib/Migration/RegenerateBirthdayCalendars.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\Migration; use OCA\DAV\BackgroundJob\RegisterRegenerateBirthdayCalendars; diff --git a/apps/dav/lib/Migration/RegisterBuildReminderIndexBackgroundJob.php b/apps/dav/lib/Migration/RegisterBuildReminderIndexBackgroundJob.php index c7a1cf63ab9fc023cbd3c3b28527abb651a27ed4..306cdc7c7c32986a870880c025d8f438c1da09a9 100644 --- a/apps/dav/lib/Migration/RegisterBuildReminderIndexBackgroundJob.php +++ b/apps/dav/lib/Migration/RegisterBuildReminderIndexBackgroundJob.php @@ -21,6 +21,7 @@ declare(strict_types=1); * along with this program. If not, see . * */ + namespace OCA\DAV\Migration; use OCA\DAV\BackgroundJob\BuildReminderIndexBackgroundJob; @@ -93,4 +94,4 @@ class RegisterBuildReminderIndexBackgroundJob implements IRepairStep { // if all were done, no need to redo the repair during next upgrade $this->config->setAppValue('dav', self::CONFIG_KEY, 'yes'); } -} \ No newline at end of file +} diff --git a/apps/dav/lib/Migration/Version1004Date20170825134824.php b/apps/dav/lib/Migration/Version1004Date20170825134824.php index 26855c2e23e02a4247e8d5e2338248b18def9828..8ce3ab7ce01b0aafc661f54d2e35a060a4e078da 100644 --- a/apps/dav/lib/Migration/Version1004Date20170825134824.php +++ b/apps/dav/lib/Migration/Version1004Date20170825134824.php @@ -21,11 +21,12 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\Migration; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version1004Date20170825134824 extends SimpleMigrationStep { /** diff --git a/apps/dav/lib/Migration/Version1004Date20170919104507.php b/apps/dav/lib/Migration/Version1004Date20170919104507.php index 2cf4065011be665705c9afe476a712853de0d4d1..33a5797febf31ec88cb2252c72ba3ea90878f37a 100644 --- a/apps/dav/lib/Migration/Version1004Date20170919104507.php +++ b/apps/dav/lib/Migration/Version1004Date20170919104507.php @@ -21,11 +21,12 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\Migration; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version1004Date20170919104507 extends SimpleMigrationStep { diff --git a/apps/dav/lib/Migration/Version1004Date20170924124212.php b/apps/dav/lib/Migration/Version1004Date20170924124212.php index 7a87f6d2b0444228e69359042a4c3bbab8468f66..fda032315c0b59a4c4ae5f58f961549637aef406 100644 --- a/apps/dav/lib/Migration/Version1004Date20170924124212.php +++ b/apps/dav/lib/Migration/Version1004Date20170924124212.php @@ -20,11 +20,12 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\Migration; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version1004Date20170924124212 extends SimpleMigrationStep { diff --git a/apps/dav/lib/Migration/Version1004Date20170926103422.php b/apps/dav/lib/Migration/Version1004Date20170926103422.php index 5da6465bc8661bc3e41a1c57e7da51e5206d6a39..76a13db072576e36b4c232af15432a418ebd824d 100644 --- a/apps/dav/lib/Migration/Version1004Date20170926103422.php +++ b/apps/dav/lib/Migration/Version1004Date20170926103422.php @@ -21,6 +21,7 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\Migration; use OCP\Migration\BigIntMigration; diff --git a/apps/dav/lib/Migration/Version1005Date20180413093149.php b/apps/dav/lib/Migration/Version1005Date20180413093149.php index cd6aeca6b4864c2c2300e857b9ee629cfff47a4e..5081f680fd92a359fc794308e09f249f4ba1465b 100644 --- a/apps/dav/lib/Migration/Version1005Date20180413093149.php +++ b/apps/dav/lib/Migration/Version1005Date20180413093149.php @@ -26,8 +26,8 @@ namespace OCA\DAV\Migration; use Doctrine\DBAL\Types\Type; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version1005Date20180413093149 extends SimpleMigrationStep { diff --git a/apps/dav/lib/Migration/Version1005Date20180530124431.php b/apps/dav/lib/Migration/Version1005Date20180530124431.php index 6f3d6b9cc1f2bb4659cee1d01edce0540c51cac1..fcdb1795589154087d2f215290452c12c1dc089d 100644 --- a/apps/dav/lib/Migration/Version1005Date20180530124431.php +++ b/apps/dav/lib/Migration/Version1005Date20180530124431.php @@ -20,12 +20,13 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\Migration; use Doctrine\DBAL\Types\Type; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version1005Date20180530124431 extends SimpleMigrationStep { diff --git a/apps/dav/lib/Migration/Version1006Date20180619154313.php b/apps/dav/lib/Migration/Version1006Date20180619154313.php index 91d4826c277c182119b8145185cc8acc9016fa84..9af5eac982d4082e5098f6dc4793c808fd013eb4 100644 --- a/apps/dav/lib/Migration/Version1006Date20180619154313.php +++ b/apps/dav/lib/Migration/Version1006Date20180619154313.php @@ -1,10 +1,11 @@ . * */ + namespace OCA\DAV\Migration; use Doctrine\DBAL\Types\Type; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; /** * Auto-generated migration step: Please modify to your needs! diff --git a/apps/dav/lib/RootCollection.php b/apps/dav/lib/RootCollection.php index ed8297783d793c0c88af1a9111f930bf8ee4149c..8c66609ed66bfd3e731f279e50a61c7f4c8306aa 100644 --- a/apps/dav/lib/RootCollection.php +++ b/apps/dav/lib/RootCollection.php @@ -22,10 +22,12 @@ * along with this program. If not, see * */ + namespace OCA\DAV; use OCA\DAV\CalDAV\CalDavBackend; use OCA\DAV\CalDAV\CalendarRoot; +use OCA\DAV\CalDAV\Principal\Collection; use OCA\DAV\CalDAV\Proxy\ProxyMapper; use OCA\DAV\CalDAV\PublicCalendarRoot; use OCA\DAV\CalDAV\ResourceBooking\ResourcePrincipalBackend; @@ -35,7 +37,6 @@ use OCA\DAV\CardDAV\CardDavBackend; use OCA\DAV\Connector\Sabre\Principal; use OCA\DAV\DAV\GroupPrincipalBackend; use OCA\DAV\DAV\SystemPrincipalBackend; -use OCA\DAV\CalDAV\Principal\Collection; use OCA\DAV\Provisioning\Apple\AppleProvisioningNode; use OCA\DAV\Upload\CleanupService; use OCP\AppFramework\Utility\ITimeFactory; diff --git a/apps/dav/lib/Server.php b/apps/dav/lib/Server.php index cd67b3995a47b48d0ad521b4c43168272847d705..7dd1cf3a8fae0ef8442c8292aa3e70078ffd558f 100644 --- a/apps/dav/lib/Server.php +++ b/apps/dav/lib/Server.php @@ -30,14 +30,17 @@ * along with this program. If not, see * */ + namespace OCA\DAV; +use OCA\DAV\AppInfo\PluginManager; use OCA\DAV\CalDAV\BirthdayService; +use OCA\DAV\CardDAV\HasPhotoPlugin; use OCA\DAV\CardDAV\ImageExportPlugin; use OCA\DAV\CardDAV\MultiGetExportPlugin; -use OCA\DAV\CardDAV\HasPhotoPlugin; use OCA\DAV\CardDAV\PhotoCache; use OCA\DAV\Comments\CommentsPlugin; +use OCA\DAV\Connector\Sabre\AnonymousOptionsPlugin; use OCA\DAV\Connector\Sabre\Auth; use OCA\DAV\Connector\Sabre\BearerAuth; use OCA\DAV\Connector\Sabre\BlockLegacyClientPlugin; @@ -49,12 +52,12 @@ use OCA\DAV\Connector\Sabre\DummyGetResponsePlugin; use OCA\DAV\Connector\Sabre\FakeLockerPlugin; use OCA\DAV\Connector\Sabre\FilesPlugin; use OCA\DAV\Connector\Sabre\FilesReportPlugin; +use OCA\DAV\Connector\Sabre\QuotaPlugin; use OCA\DAV\Connector\Sabre\SharesPlugin; -use OCA\DAV\DAV\PublicAuth; +use OCA\DAV\Connector\Sabre\TagsPlugin; use OCA\DAV\DAV\CustomPropertiesBackend; -use OCA\DAV\Connector\Sabre\QuotaPlugin; +use OCA\DAV\DAV\PublicAuth; use OCA\DAV\Files\BrowserErrorPagePlugin; -use OCA\DAV\Connector\Sabre\AnonymousOptionsPlugin; use OCA\DAV\Files\LazySearchBackend; use OCA\DAV\Provisioning\Apple\AppleProvisioningPlugin; use OCA\DAV\SystemTag\SystemTagPlugin; @@ -63,10 +66,8 @@ use OCP\IRequest; use OCP\SabrePluginEvent; use Sabre\CardDAV\VCFExportPlugin; use Sabre\DAV\Auth\Plugin; -use OCA\DAV\Connector\Sabre\TagsPlugin; use Sabre\DAV\UUIDUtil; use SearchDAV\DAV\SearchPlugin; -use OCA\DAV\AppInfo\PluginManager; class Server { diff --git a/apps/dav/lib/SystemTag/SystemTagMappingNode.php b/apps/dav/lib/SystemTag/SystemTagMappingNode.php index b601aef50ec0f8dee06318ea5502cbc83b70622d..6033cd3a207f10f7a133b349aa9e013e146883de 100644 --- a/apps/dav/lib/SystemTag/SystemTagMappingNode.php +++ b/apps/dav/lib/SystemTag/SystemTagMappingNode.php @@ -23,15 +23,15 @@ namespace OCA\DAV\SystemTag; -use Sabre\DAV\Exception\NotFound; -use Sabre\DAV\Exception\Forbidden; -use Sabre\DAV\Exception\MethodNotAllowed; - +use OCP\IUser; use OCP\SystemTag\ISystemTag; use OCP\SystemTag\ISystemTagManager; + use OCP\SystemTag\ISystemTagObjectMapper; use OCP\SystemTag\TagNotFoundException; -use OCP\IUser; +use Sabre\DAV\Exception\Forbidden; +use Sabre\DAV\Exception\MethodNotAllowed; +use Sabre\DAV\Exception\NotFound; /** * Mapping node for system tag to object id diff --git a/apps/dav/lib/SystemTag/SystemTagNode.php b/apps/dav/lib/SystemTag/SystemTagNode.php index b825820aa9d2085059a34d60e9f4afc2986d3390..65b7b7313c167e3e719d9c85788bff690da1056e 100644 --- a/apps/dav/lib/SystemTag/SystemTagNode.php +++ b/apps/dav/lib/SystemTag/SystemTagNode.php @@ -24,16 +24,16 @@ namespace OCA\DAV\SystemTag; -use Sabre\DAV\Exception\Forbidden; -use Sabre\DAV\Exception\NotFound; -use Sabre\DAV\Exception\MethodNotAllowed; -use Sabre\DAV\Exception\Conflict; - +use OCP\IUser; use OCP\SystemTag\ISystemTag; use OCP\SystemTag\ISystemTagManager; -use OCP\SystemTag\TagNotFoundException; use OCP\SystemTag\TagAlreadyExistsException; -use OCP\IUser; + +use OCP\SystemTag\TagNotFoundException; +use Sabre\DAV\Exception\Conflict; +use Sabre\DAV\Exception\Forbidden; +use Sabre\DAV\Exception\MethodNotAllowed; +use Sabre\DAV\Exception\NotFound; /** * DAV node representing a system tag, with the name being the tag id. diff --git a/apps/dav/lib/SystemTag/SystemTagPlugin.php b/apps/dav/lib/SystemTag/SystemTagPlugin.php index 98c730906c690fec672c0a5b69385cd2908a8cc0..88706c979995ab250ce051f07ba1b66f7933f9ee 100644 --- a/apps/dav/lib/SystemTag/SystemTagPlugin.php +++ b/apps/dav/lib/SystemTag/SystemTagPlugin.php @@ -21,19 +21,20 @@ * along with this program. If not, see * */ + namespace OCA\DAV\SystemTag; use OCP\IGroupManager; use OCP\IUserSession; -use Sabre\DAV\PropFind; -use Sabre\DAV\PropPatch; +use OCP\SystemTag\ISystemTag; +use OCP\SystemTag\ISystemTagManager; +use OCP\SystemTag\TagAlreadyExistsException; use Sabre\DAV\Exception\BadRequest; use Sabre\DAV\Exception\Conflict; use Sabre\DAV\Exception\Forbidden; use Sabre\DAV\Exception\UnsupportedMediaType; -use OCP\SystemTag\ISystemTag; -use OCP\SystemTag\ISystemTagManager; -use OCP\SystemTag\TagAlreadyExistsException; +use Sabre\DAV\PropFind; +use Sabre\DAV\PropPatch; use Sabre\HTTP\RequestInterface; use Sabre\HTTP\ResponseInterface; diff --git a/apps/dav/lib/SystemTag/SystemTagsByIdCollection.php b/apps/dav/lib/SystemTag/SystemTagsByIdCollection.php index ca423739de455805a39163705cac4597eeb0d070..7d384c74c1b86c3de44f9af3cbfe538d2a299710 100644 --- a/apps/dav/lib/SystemTag/SystemTagsByIdCollection.php +++ b/apps/dav/lib/SystemTag/SystemTagsByIdCollection.php @@ -23,15 +23,15 @@ namespace OCA\DAV\SystemTag; +use OCP\IGroupManager; +use OCP\IUserSession; +use OCP\SystemTag\ISystemTag; +use OCP\SystemTag\ISystemTagManager; +use OCP\SystemTag\TagNotFoundException; +use Sabre\DAV\Exception\BadRequest; use Sabre\DAV\Exception\Forbidden; use Sabre\DAV\Exception\NotFound; -use Sabre\DAV\Exception\BadRequest; use Sabre\DAV\ICollection; -use OCP\SystemTag\ISystemTagManager; -use OCP\SystemTag\ISystemTag; -use OCP\SystemTag\TagNotFoundException; -use OCP\IGroupManager; -use OCP\IUserSession; class SystemTagsByIdCollection implements ICollection { diff --git a/apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php b/apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php index b23bf8f14db43b614bcacfd9b1ba10fe2de64ab0..4d57667e0b437589bed7dc115a92df5697f222c3 100644 --- a/apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php +++ b/apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php @@ -23,16 +23,16 @@ namespace OCA\DAV\SystemTag; +use OCP\IUser; +use OCP\SystemTag\ISystemTag; +use OCP\SystemTag\ISystemTagManager; +use OCP\SystemTag\ISystemTagObjectMapper; +use OCP\SystemTag\TagNotFoundException; +use Sabre\DAV\Exception\BadRequest; use Sabre\DAV\Exception\Forbidden; use Sabre\DAV\Exception\NotFound; -use Sabre\DAV\Exception\BadRequest; use Sabre\DAV\Exception\PreconditionFailed; use Sabre\DAV\ICollection; -use OCP\SystemTag\ISystemTagManager; -use OCP\SystemTag\ISystemTagObjectMapper; -use OCP\SystemTag\ISystemTag; -use OCP\SystemTag\TagNotFoundException; -use OCP\IUser; /** * Collection containing tags by object id diff --git a/apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php b/apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php index 0ed246faa5af4f9dd95cdb720a89ce0eba64168f..4887eba6281e5baf33c7cb95246f6e3092797f7e 100644 --- a/apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php +++ b/apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php @@ -24,14 +24,14 @@ namespace OCA\DAV\SystemTag; +use OCP\IGroupManager; +use OCP\IUserSession; +use OCP\SystemTag\ISystemTagManager; +use OCP\SystemTag\ISystemTagObjectMapper; use Sabre\DAV\Exception\Forbidden; use Sabre\DAV\Exception\MethodNotAllowed; use Sabre\DAV\Exception\NotFound; use Sabre\DAV\ICollection; -use OCP\SystemTag\ISystemTagManager; -use OCP\SystemTag\ISystemTagObjectMapper; -use OCP\IUserSession; -use OCP\IGroupManager; /** * Collection containing object ids by object type diff --git a/apps/dav/lib/SystemTag/SystemTagsRelationsCollection.php b/apps/dav/lib/SystemTag/SystemTagsRelationsCollection.php index eb4b3a7c9e6f86b38301932010f0770eddf9ec0b..c89bbf3d01ad5fad9ca3cb624e0d85180d0a9c8c 100644 --- a/apps/dav/lib/SystemTag/SystemTagsRelationsCollection.php +++ b/apps/dav/lib/SystemTag/SystemTagsRelationsCollection.php @@ -25,13 +25,13 @@ namespace OCA\DAV\SystemTag; +use OCP\IGroupManager; +use OCP\IUserSession; use OCP\SystemTag\ISystemTagManager; use OCP\SystemTag\ISystemTagObjectMapper; use OCP\SystemTag\SystemTagsEntityEvent; use Sabre\DAV\Exception\Forbidden; use Sabre\DAV\SimpleCollection; -use OCP\IUserSession; -use OCP\IGroupManager; use Symfony\Component\EventDispatcher\EventDispatcherInterface; class SystemTagsRelationsCollection extends SimpleCollection { diff --git a/apps/dav/lib/Traits/PrincipalProxyTrait.php b/apps/dav/lib/Traits/PrincipalProxyTrait.php index 5e16d3a2f839de62de9d62a81d17c043ea2f38bd..a86e631e2111b0c599b9b15d8ca1b361904770fc 100644 --- a/apps/dav/lib/Traits/PrincipalProxyTrait.php +++ b/apps/dav/lib/Traits/PrincipalProxyTrait.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\Traits; use OCA\DAV\CalDAV\Proxy\Proxy; diff --git a/apps/dav/lib/Upload/ChunkingPlugin.php b/apps/dav/lib/Upload/ChunkingPlugin.php index 421a2dd519ac9375ae02254137689ea56a6010a4..dff9d811569e2dc7448a0d883875944c3b601f38 100644 --- a/apps/dav/lib/Upload/ChunkingPlugin.php +++ b/apps/dav/lib/Upload/ChunkingPlugin.php @@ -19,7 +19,6 @@ * */ - namespace OCA\DAV\Upload; use Sabre\DAV\Exception\BadRequest; diff --git a/apps/dav/lib/Upload/FutureFile.php b/apps/dav/lib/Upload/FutureFile.php index d86603fd8c2d8bc0dd4804772a46a2c4e47b3dcf..ad59cb60a9238cb3770338628f44ef8bdf399d20 100644 --- a/apps/dav/lib/Upload/FutureFile.php +++ b/apps/dav/lib/Upload/FutureFile.php @@ -20,6 +20,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Upload; use OCA\DAV\Connector\Sabre\Directory; diff --git a/apps/dav/lib/Upload/RootCollection.php b/apps/dav/lib/Upload/RootCollection.php index 436792e25ec7674adcd6e9d13e6309f107661927..8c2dc7e15cf0f0019eab508e79c6e02efdb6ff9f 100644 --- a/apps/dav/lib/Upload/RootCollection.php +++ b/apps/dav/lib/Upload/RootCollection.php @@ -21,6 +21,7 @@ declare(strict_types=1); * along with this program. If not, see * */ + namespace OCA\DAV\Upload; use Sabre\DAVACL\AbstractPrincipalCollection; diff --git a/apps/dav/lib/Upload/UploadFolder.php b/apps/dav/lib/Upload/UploadFolder.php index 233c3ac3e521b0429920fa6981a991f0b73870ea..79801193aa4db238935dfd363150415be6c66bd2 100644 --- a/apps/dav/lib/Upload/UploadFolder.php +++ b/apps/dav/lib/Upload/UploadFolder.php @@ -20,6 +20,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Upload; use OCA\DAV\BackgroundJob\UploadCleanup; diff --git a/apps/dav/lib/Upload/UploadHome.php b/apps/dav/lib/Upload/UploadHome.php index fcfd978b33d4eaa93dfc38245ed5e4d0a81c3034..75a615815b1df9b23509637c5a73296e4cf272f3 100644 --- a/apps/dav/lib/Upload/UploadHome.php +++ b/apps/dav/lib/Upload/UploadHome.php @@ -21,6 +21,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Upload; use OC\Files\Filesystem; diff --git a/apps/dav/tests/unit/AppInfo/PluginManagerTest.php b/apps/dav/tests/unit/AppInfo/PluginManagerTest.php index 0e4c0d20eaac66e122e55301a087f9845e9b62fc..ee3f13c6127b45d77fee6b4516e028ea540cbb01 100644 --- a/apps/dav/tests/unit/AppInfo/PluginManagerTest.php +++ b/apps/dav/tests/unit/AppInfo/PluginManagerTest.php @@ -23,9 +23,9 @@ namespace OCA\DAV\Tests\unit\AppInfo; use OC\App\AppManager; -use Test\TestCase; use OC\ServerContainer; use OCA\DAV\AppInfo\PluginManager; +use Test\TestCase; /** * Class PluginManagerTest diff --git a/apps/dav/tests/unit/Avatars/AvatarHomeTest.php b/apps/dav/tests/unit/Avatars/AvatarHomeTest.php index 2dffa8b7424ebfbf16ef62f22641e71988cdfaa2..07eb967027925027245b8df4c98df76502148393 100644 --- a/apps/dav/tests/unit/Avatars/AvatarHomeTest.php +++ b/apps/dav/tests/unit/Avatars/AvatarHomeTest.php @@ -21,7 +21,6 @@ * */ - namespace OCA\DAV\Tests\Unit\Avatars; diff --git a/apps/dav/tests/unit/Avatars/AvatarNodeTest.php b/apps/dav/tests/unit/Avatars/AvatarNodeTest.php index 98a868aa14c7a427f7e008605d7571d87a3d7101..66098ab0822b86e018a24ced46c40d19edb9e95f 100644 --- a/apps/dav/tests/unit/Avatars/AvatarNodeTest.php +++ b/apps/dav/tests/unit/Avatars/AvatarNodeTest.php @@ -20,7 +20,6 @@ * */ - namespace OCA\DAV\Tests\Unit\Avatars; diff --git a/apps/dav/tests/unit/BackgroundJob/RefreshWebcalJobTest.php b/apps/dav/tests/unit/BackgroundJob/RefreshWebcalJobTest.php index 8e24fb1f638910197dcf53fc7b30dc23d5371a3b..a26378038d13de9f1431b692179f6f037e9a69f4 100644 --- a/apps/dav/tests/unit/BackgroundJob/RefreshWebcalJobTest.php +++ b/apps/dav/tests/unit/BackgroundJob/RefreshWebcalJobTest.php @@ -32,10 +32,10 @@ use OCP\Http\Client\IClientService; use OCP\Http\Client\IResponse; use OCP\IConfig; use OCP\ILogger; -use Test\TestCase; - use Sabre\VObject; +use Test\TestCase; + class RefreshWebcalJobTest extends TestCase { /** @var CalDavBackend | \PHPUnit_Framework_MockObject_MockObject */ diff --git a/apps/dav/tests/unit/BackgroundJob/RegisterRegenerateBirthdayCalendarsTest.php b/apps/dav/tests/unit/BackgroundJob/RegisterRegenerateBirthdayCalendarsTest.php index c118e7497fa0ee353a06bcd59ad9f363e7216f67..a08d3824d7f871ce197e3eae7737d0b11c9dbbaf 100644 --- a/apps/dav/tests/unit/BackgroundJob/RegisterRegenerateBirthdayCalendarsTest.php +++ b/apps/dav/tests/unit/BackgroundJob/RegisterRegenerateBirthdayCalendarsTest.php @@ -98,4 +98,4 @@ class RegisterRegenerateBirthdayCalendarsTest extends TestCase { $this->backgroundJob->run([]); } -} \ No newline at end of file +} diff --git a/apps/dav/tests/unit/CalDAV/Activity/Provider/BaseTest.php b/apps/dav/tests/unit/CalDAV/Activity/Provider/BaseTest.php index 9c4f5eeb47c444557a8bbf5e51e932f25477baa4..db4d3e55fd897a45080780bebdef7d238624e8e7 100644 --- a/apps/dav/tests/unit/CalDAV/Activity/Provider/BaseTest.php +++ b/apps/dav/tests/unit/CalDAV/Activity/Provider/BaseTest.php @@ -26,10 +26,10 @@ namespace OCA\DAV\Tests\unit\CalDAV\Activity\Provider; use OCA\DAV\CalDAV\Activity\Provider\Base; use OCP\Activity\IEvent; use OCP\Activity\IProvider; +use OCP\IGroupManager; use OCP\IL10N; use OCP\IUser; use OCP\IUserManager; -use OCP\IGroupManager; use Test\TestCase; class BaseTest extends TestCase { diff --git a/apps/dav/tests/unit/CalDAV/CachedSubscriptionObjectTest.php b/apps/dav/tests/unit/CalDAV/CachedSubscriptionObjectTest.php index 131c3011e46afa132697961eb7e355958b84f8f6..7d4463c81b4bf85d47cba19faceb3b60dd79127d 100644 --- a/apps/dav/tests/unit/CalDAV/CachedSubscriptionObjectTest.php +++ b/apps/dav/tests/unit/CalDAV/CachedSubscriptionObjectTest.php @@ -92,4 +92,4 @@ class CachedSubscriptionObjectTest extends \Test\TestCase { $calendarObject->delete(); } -} \ No newline at end of file +} diff --git a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php index 1b2169b6675b3ba67ff24653ab9c3117d50e450e..9a65b7c70c5a3c7a7371fb1964a222e952af2fcb 100644 --- a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php +++ b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php @@ -33,10 +33,10 @@ use OCA\DAV\CalDAV\CalDavBackend; use OCA\DAV\CalDAV\Calendar; use OCP\IConfig; use OCP\IL10N; +use Sabre\DAV\Exception\NotFound; use Sabre\DAV\PropPatch; use Sabre\DAV\Xml\Property\Href; use Sabre\DAVACL\IACL; -use Sabre\DAV\Exception\NotFound; /** * Class CalDavBackendTest diff --git a/apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php b/apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php index 874d4d84ffa77588224393430db3a6a69e6d5e51..51977313ed44ba783957b15fffdc85b36461e319 100644 --- a/apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php +++ b/apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php @@ -25,16 +25,17 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\Tests\unit\CalDAV; +use OCA\DAV\CalDAV\CalDavBackend; use OCA\DAV\CalDAV\Calendar; use OCA\DAV\CalDAV\PublicCalendar; +use OCA\DAV\CalDAV\PublicCalendarRoot; use OCA\DAV\Connector\Sabre\Principal; use OCP\IConfig; use OCP\IGroupManager; use OCP\IL10N; -use OCA\DAV\CalDAV\CalDavBackend; -use OCA\DAV\CalDAV\PublicCalendarRoot; use OCP\ILogger; use OCP\IUserManager; use OCP\Security\ISecureRandom; diff --git a/apps/dav/tests/unit/CalDAV/PublicCalendarTest.php b/apps/dav/tests/unit/CalDAV/PublicCalendarTest.php index 98dd330f427d0f7136a85321829efc60d81fed1e..194fdbfb113be78e6922f4416210c0af868b7772 100644 --- a/apps/dav/tests/unit/CalDAV/PublicCalendarTest.php +++ b/apps/dav/tests/unit/CalDAV/PublicCalendarTest.php @@ -24,8 +24,8 @@ namespace OCA\DAV\Tests\unit\CalDAV; -use OCA\DAV\CalDAV\PublicCalendar; use OCA\DAV\CalDAV\CalDavBackend; +use OCA\DAV\CalDAV\PublicCalendar; use OCP\IConfig; use Sabre\VObject\Reader; diff --git a/apps/dav/tests/unit/CalDAV/Publishing/PublisherTest.php b/apps/dav/tests/unit/CalDAV/Publishing/PublisherTest.php index 36aa4fa449b4c7b7d4fa23972d625311b27b1524..923eaed08a6b590bd4daea0c724f35bbcc2b8cb1 100644 --- a/apps/dav/tests/unit/CalDAV/Publishing/PublisherTest.php +++ b/apps/dav/tests/unit/CalDAV/Publishing/PublisherTest.php @@ -21,6 +21,7 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\Tests\unit\CalDAV\Publishing; use OCA\DAV\CalDAV\Publishing\Xml\Publisher; diff --git a/apps/dav/tests/unit/CalDAV/Publishing/PublishingTest.php b/apps/dav/tests/unit/CalDAV/Publishing/PublishingTest.php index efdafe8bc3318b40dc82314c8a1edc8a02e49644..ed803c67dd3bd5bea4a08554ce0f1dff3a041d20 100644 --- a/apps/dav/tests/unit/CalDAV/Publishing/PublishingTest.php +++ b/apps/dav/tests/unit/CalDAV/Publishing/PublishingTest.php @@ -21,13 +21,14 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\Tests\unit\CalDAV\Publishing; use OCA\DAV\CalDAV\Calendar; use OCA\DAV\CalDAV\Publishing\PublishPlugin; +use OCP\IConfig; use OCP\IRequest; use OCP\IURLGenerator; -use OCP\IConfig; use Sabre\DAV\Server; use Sabre\DAV\SimpleCollection; use Sabre\HTTP\Request; diff --git a/apps/dav/tests/unit/CalDAV/Reminder/BackendTest.php b/apps/dav/tests/unit/CalDAV/Reminder/BackendTest.php index 71453ac73a32db8f97bbe7eed533a3998dcde2ea..dae3cb74e24fb23ae1299c506d14a43315231129 100644 --- a/apps/dav/tests/unit/CalDAV/Reminder/BackendTest.php +++ b/apps/dav/tests/unit/CalDAV/Reminder/BackendTest.php @@ -22,11 +22,12 @@ declare(strict_types=1); * along with this program. If not, see * */ + namespace OCA\DAV\Tests\unit\CalDAV\Reminder; -use OCP\DB\QueryBuilder\IQueryBuilder; -use OCP\AppFramework\Utility\ITimeFactory; use OCA\DAV\CalDAV\Reminder\Backend as ReminderBackend; +use OCP\AppFramework\Utility\ITimeFactory; +use OCP\DB\QueryBuilder\IQueryBuilder; use Test\TestCase; class BackendTest extends TestCase { diff --git a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/AbstractNotificationProviderTest.php b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/AbstractNotificationProviderTest.php index 5a8d328ef81dec4450ae763a7e693c530010bda4..889ac867315842870540a38e8f4eeed933c8cd1e 100644 --- a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/AbstractNotificationProviderTest.php +++ b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/AbstractNotificationProviderTest.php @@ -20,6 +20,7 @@ declare(strict_types=1); * along with this program. If not, see * */ + namespace OCA\DAV\Tests\unit\CalDAV\Reminder\NotificationProvider; use OCA\DAV\CalDAV\Reminder\NotificationProvider\AbstractProvider; @@ -27,10 +28,10 @@ use OCP\IConfig; use OCP\IL10N; use OCP\ILogger; use OCP\IURLGenerator; -use OCP\L10N\IFactory as L10NFactory; use OCP\IUser; -use Test\TestCase; +use OCP\L10N\IFactory as L10NFactory; use Sabre\VObject\Component\VCalendar; +use Test\TestCase; abstract class AbstractNotificationProviderTest extends TestCase { diff --git a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/AudioProviderTest.php b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/AudioProviderTest.php index 9938b2f732c8cd9684312c5be140b31a59525239..2dc95e1ca774be26be0cc63fff2ed53a464c076d 100644 --- a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/AudioProviderTest.php +++ b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/AudioProviderTest.php @@ -20,6 +20,7 @@ declare(strict_types=1); * along with this program. If not, see * */ + namespace OCA\DAV\Tests\unit\CalDAV\Reminder\NotificationProvider; use OCA\DAV\CalDAV\Reminder\NotificationProvider\AudioProvider; @@ -30,4 +31,4 @@ class AudioProviderTest extends PushProviderTest { $this->assertEquals(AudioProvider::NOTIFICATION_TYPE, 'AUDIO'); } -} \ No newline at end of file +} diff --git a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php index 9bf2957e9f0751b3ff18989e14c8b01c6ea5f200..a288907b4bab6baf9ebbb8c569ddec31a7480a4b 100644 --- a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php +++ b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php @@ -22,6 +22,7 @@ declare(strict_types=1); * along with this program. If not, see * */ + namespace OCA\DAV\Tests\unit\CalDAV\Reminder\NotificationProvider; use OCA\DAV\CalDAV\Reminder\NotificationProvider\EmailProvider; @@ -29,11 +30,11 @@ use OCP\IConfig; use OCP\IL10N; use OCP\ILogger; use OCP\IURLGenerator; -use OCP\L10N\IFactory as L10NFactory; use OCP\IUser; +use OCP\L10N\IFactory as L10NFactory; +use OCP\Mail\IAttachment; use OCP\Mail\IEMailTemplate; use OCP\Mail\IMailer; -use OCP\Mail\IAttachment; use OCP\Mail\IMessage; use Sabre\VObject\Component\VCalendar; use Test\TestCase; diff --git a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/PushProviderTest.php b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/PushProviderTest.php index 8bd4a660dc46187bfe27522271bc3dff76253bdc..346faf1a65ec9e063393dd776181ad82cfc76447 100644 --- a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/PushProviderTest.php +++ b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/PushProviderTest.php @@ -22,19 +22,20 @@ declare(strict_types=1); * along with this program. If not, see * */ + namespace OCA\DAV\Tests\unit\CalDAV\Reminder\NotificationProvider; use OCA\DAV\AppInfo\Application; use OCA\DAV\CalDAV\Reminder\NotificationProvider\PushProvider; +use OCP\AppFramework\Utility\ITimeFactory; use OCP\IConfig; use OCP\IL10N; use OCP\ILogger; use OCP\IURLGenerator; -use OCP\L10N\IFactory as L10NFactory; use OCP\IUser; +use OCP\L10N\IFactory as L10NFactory; use OCP\Notification\IManager; use OCP\Notification\INotification; -use OCP\AppFramework\Utility\ITimeFactory; use Test\TestCase; class PushProviderTest extends AbstractNotificationProviderTest { diff --git a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProviderManagerTest.php b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProviderManagerTest.php index b4c62eacd7a5bf904539efc91cd43e36d12c8bd8..d55f15ee5ae1f31d7516ef542c6e9563b553a483 100644 --- a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProviderManagerTest.php +++ b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProviderManagerTest.php @@ -22,6 +22,7 @@ declare(strict_types=1); * along with this program. If not, see * */ + namespace OCA\DAV\Tests\unit\CalDAV\Reminder; use OCA\DAV\CalDAV\Reminder\NotificationProvider\EmailProvider; diff --git a/apps/dav/tests/unit/CalDAV/Reminder/ReminderServiceTest.php b/apps/dav/tests/unit/CalDAV/Reminder/ReminderServiceTest.php index 4dcb688caa189f7554e2fe81f128adfbc750b3b5..73f5ddde15d4a379cdbb26a419b1eca248b4089d 100644 --- a/apps/dav/tests/unit/CalDAV/Reminder/ReminderServiceTest.php +++ b/apps/dav/tests/unit/CalDAV/Reminder/ReminderServiceTest.php @@ -20,15 +20,16 @@ declare(strict_types=1); * along with this program. If not, see * */ + namespace OCA\DAV\Tests\unit\CalDAV\Reminder; use OCA\DAV\CalDAV\CalDavBackend; use OCA\DAV\CalDAV\Reminder\AbstractNotificationProvider; use OCA\DAV\CalDAV\Reminder\Backend; use OCA\DAV\CalDAV\Reminder\INotificationProvider; -use OCA\DAV\CalDAV\Reminder\NotificationProviderManager; use OCA\DAV\CalDAV\Reminder\NotificationProvider\EmailProvider; use OCA\DAV\CalDAV\Reminder\NotificationProvider\PushProvider; +use OCA\DAV\CalDAV\Reminder\NotificationProviderManager; use OCA\DAV\CalDAV\Reminder\ReminderService; use OCP\AppFramework\Utility\ITimeFactory; use OCP\IGroup; diff --git a/apps/dav/tests/unit/CalDAV/ResourceBooking/AbstractPrincipalBackendTest.php b/apps/dav/tests/unit/CalDAV/ResourceBooking/AbstractPrincipalBackendTest.php index c6e16e2c484a7a35fcbf829c9dc8338182a2effc..ea2a752022768061ab650a4908284c2c439da2bf 100644 --- a/apps/dav/tests/unit/CalDAV/ResourceBooking/AbstractPrincipalBackendTest.php +++ b/apps/dav/tests/unit/CalDAV/ResourceBooking/AbstractPrincipalBackendTest.php @@ -19,6 +19,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Tests\unit\CalDAV\ResourceBooking; use OCA\DAV\CalDAV\Proxy\Proxy; diff --git a/apps/dav/tests/unit/CalDAV/ResourceBooking/ResourcePrincipalBackendTest.php b/apps/dav/tests/unit/CalDAV/ResourceBooking/ResourcePrincipalBackendTest.php index 461246dd51da83dda67476bbd5e5fdd7c97e01f1..ef71cd3b8d7ef5d6b0d2eeeb60e6c067d64e8b94 100644 --- a/apps/dav/tests/unit/CalDAV/ResourceBooking/ResourcePrincipalBackendTest.php +++ b/apps/dav/tests/unit/CalDAV/ResourceBooking/ResourcePrincipalBackendTest.php @@ -19,6 +19,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Tests\unit\CalDAV\ResourceBooking; use OCA\DAV\CalDAV\ResourceBooking\ResourcePrincipalBackend; diff --git a/apps/dav/tests/unit/CalDAV/ResourceBooking/RoomPrincipalBackendTest.php b/apps/dav/tests/unit/CalDAV/ResourceBooking/RoomPrincipalBackendTest.php index 6b691400cd118b2608eba6a210e1d8f71589617f..92788f0d7a84431986e99c9cac51c6bf39425ab7 100644 --- a/apps/dav/tests/unit/CalDAV/ResourceBooking/RoomPrincipalBackendTest.php +++ b/apps/dav/tests/unit/CalDAV/ResourceBooking/RoomPrincipalBackendTest.php @@ -19,6 +19,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Tests\unit\CalDAV\ResourceBooking; use OCA\DAV\CalDAV\ResourceBooking\RoomPrincipalBackend; diff --git a/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php b/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php index 89253ce9dc94b4717c5ea71725b23c16b95fb63a..833221bd3ea25be85e039a9ff7e04bdf804f292a 100644 --- a/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php +++ b/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php @@ -24,7 +24,6 @@ * */ - namespace OCA\DAV\Tests\unit\CardDAV; diff --git a/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php b/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php index 1f7ad404251cec579ff4558bf300477f08ceccc1..f7b9137b48027cb1ef0cdfdd4e7b29fcb058b059 100644 --- a/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php +++ b/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php @@ -22,7 +22,6 @@ * */ - namespace OCA\DAV\Tests\unit\CardDAV; diff --git a/apps/dav/tests/unit/CardDAV/Sharing/PluginTest.php b/apps/dav/tests/unit/CardDAV/Sharing/PluginTest.php index 9dbeee2434e28fd55d8996f86b21955c38c2901b..c8dce8598a3958234eeaecf0dc203bc41be03784 100644 --- a/apps/dav/tests/unit/CardDAV/Sharing/PluginTest.php +++ b/apps/dav/tests/unit/CardDAV/Sharing/PluginTest.php @@ -25,9 +25,9 @@ namespace OCA\DAV\Tests\unit\CardDAV\Sharing; +use OCA\DAV\Connector\Sabre\Auth; use OCA\DAV\DAV\Sharing\IShareable; use OCA\DAV\DAV\Sharing\Plugin; -use OCA\DAV\Connector\Sabre\Auth; use OCP\IRequest; use Sabre\DAV\Server; use Sabre\DAV\SimpleCollection; diff --git a/apps/dav/tests/unit/Command/ListCalendarsTest.php b/apps/dav/tests/unit/Command/ListCalendarsTest.php index 1a0ca8c7954a6a398008d2e365dce4a7be0daafd..f2d315504b55b9c2026427f71df6e6c21ed1eba6 100644 --- a/apps/dav/tests/unit/Command/ListCalendarsTest.php +++ b/apps/dav/tests/unit/Command/ListCalendarsTest.php @@ -28,7 +28,6 @@ use OCP\IUserManager; use Symfony\Component\Console\Tester\CommandTester; use Test\TestCase; - /** * Class ListCalendarsTest * diff --git a/apps/dav/tests/unit/Command/MoveCalendarTest.php b/apps/dav/tests/unit/Command/MoveCalendarTest.php index 07d789dbfb25a3ebaaf036b3b75ea020895dc1b2..94bcce03f3a26e0baa81538bfd6dfa4d2431a3e9 100644 --- a/apps/dav/tests/unit/Command/MoveCalendarTest.php +++ b/apps/dav/tests/unit/Command/MoveCalendarTest.php @@ -31,7 +31,6 @@ use OCP\Share\IManager; use Symfony\Component\Console\Tester\CommandTester; use Test\TestCase; - /** * Class MoveCalendarTest * diff --git a/apps/dav/tests/unit/Command/RemoveInvalidSharesTest.php b/apps/dav/tests/unit/Command/RemoveInvalidSharesTest.php index 2574e4d0aecda6216fd8b58d2872f27f78e3bf04..be55ac186b016df74f5a3b891e5e739ecc1f6fdf 100644 --- a/apps/dav/tests/unit/Command/RemoveInvalidSharesTest.php +++ b/apps/dav/tests/unit/Command/RemoveInvalidSharesTest.php @@ -19,12 +19,11 @@ * */ - namespace OCA\DAV\Tests\Unit\Command; -use OCA\DAV\Connector\Sabre\Principal; use OCA\DAV\Command\RemoveInvalidShares; +use OCA\DAV\Connector\Sabre\Principal; use OCP\Migration\IOutput; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; diff --git a/apps/dav/tests/unit/Connector/PublicAuthTest.php b/apps/dav/tests/unit/Connector/PublicAuthTest.php index 5f35182fa27a0487f5632110b0c34816f9ae7066..d23d9743e6b37a3eff3b2fec0142a1d0324fe910 100644 --- a/apps/dav/tests/unit/Connector/PublicAuthTest.php +++ b/apps/dav/tests/unit/Connector/PublicAuthTest.php @@ -24,6 +24,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Tests\unit\Connector; use OCP\IRequest; diff --git a/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php index e6482de8878ba57790825e1fb0c8e2d1da635c63..88baf981acc2e4ff0966af0773ff7333a63b8611 100644 --- a/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php @@ -27,9 +27,9 @@ namespace OCA\DAV\Tests\unit\Connector\Sabre; use OCA\DAV\Connector\Sabre\BlockLegacyClientPlugin; +use OCP\IConfig; use PHPUnit_Framework_MockObject_MockObject; use Test\TestCase; -use OCP\IConfig; /** * Class BlockLegacyClientPluginTest diff --git a/apps/dav/tests/unit/Connector/Sabre/CommentsPropertiesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/CommentsPropertiesPluginTest.php index afb72b09778cf1ec5a71186971fa5d25394de3ac..90bcb5f511c4d65f3ce58dc2a46cbc3bdc2bac97 100644 --- a/apps/dav/tests/unit/Connector/Sabre/CommentsPropertiesPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/CommentsPropertiesPluginTest.php @@ -25,7 +25,7 @@ namespace OCA\DAV\Tests\unit\Connector\Sabre; -use \OCA\DAV\Connector\Sabre\CommentPropertiesPlugin as CommentPropertiesPluginImplementation; +use OCA\DAV\Connector\Sabre\CommentPropertiesPlugin as CommentPropertiesPluginImplementation; use OCA\DAV\Connector\Sabre\File; use OCP\Comments\ICommentsManager; use OCP\IUser; diff --git a/apps/dav/tests/unit/Connector/Sabre/CopyEtagHeaderPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/CopyEtagHeaderPluginTest.php index 580558b9517482e3dc87dc0aab16f6d45f85f08c..cc47a3a480526f558f01202036d56d5ebc775b9c 100644 --- a/apps/dav/tests/unit/Connector/Sabre/CopyEtagHeaderPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/CopyEtagHeaderPluginTest.php @@ -22,6 +22,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Tests\unit\Connector\Sabre; use OCA\DAV\Connector\Sabre\CopyEtagHeaderPlugin; diff --git a/apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php b/apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php index 3b7bd859b9ffa92ad429ce621833cee701809de4..1f58351622fa79a2db896557cc69fed0d5934209 100644 --- a/apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php @@ -23,6 +23,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Tests\unit\Connector\Sabre; /** diff --git a/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php b/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php index 968cb548068b39f491894872f7295e306288eddd..a6dc1592db03bbec5d94e364b172bb905d1057b4 100644 --- a/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php @@ -26,10 +26,10 @@ namespace OCA\DAV\Tests\Unit\Connector\Sabre; -use OC\Files\Storage\Wrapper\Quota; -use OCP\Files\ForbiddenException; use OC\Files\FileInfo; +use OC\Files\Storage\Wrapper\Quota; use OCA\DAV\Connector\Sabre\Directory; +use OCP\Files\ForbiddenException; class TestViewDirectory extends \OC\Files\View { diff --git a/apps/dav/tests/unit/Connector/Sabre/ExceptionLoggerPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/ExceptionLoggerPluginTest.php index 1de9333207f7d25e3559624fc3bb0005c6c2e1c7..01a51dbf4597c3cf0101bc56f8e67a87c125b1a1 100644 --- a/apps/dav/tests/unit/Connector/Sabre/ExceptionLoggerPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/ExceptionLoggerPluginTest.php @@ -24,10 +24,10 @@ namespace OCA\DAV\Tests\unit\Connector\Sabre; +use OC\Log; use OC\SystemConfig; use OCA\DAV\Connector\Sabre\Exception\InvalidPath; use OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin as PluginToTest; -use OC\Log; use PHPUnit_Framework_MockObject_MockObject; use Sabre\DAV\Exception\NotFound; use Sabre\DAV\Exception\ServiceUnavailable; diff --git a/apps/dav/tests/unit/Connector/Sabre/FakeLockerPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FakeLockerPluginTest.php index d8fce27e9e6a73ac40bad45a51f662c040e257f0..0510e36a3621eadd74f46f2397fae6d09ac1daca 100644 --- a/apps/dav/tests/unit/Connector/Sabre/FakeLockerPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/FakeLockerPluginTest.php @@ -23,6 +23,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Tests\unit\Connector\Sabre; use OCA\DAV\Connector\Sabre\FakeLockerPlugin; diff --git a/apps/dav/tests/unit/Connector/Sabre/FileTest.php b/apps/dav/tests/unit/Connector/Sabre/FileTest.php index c579a904260bed711d55b99b3dc87a9b809aa189..0157757a737c2d800be7dd39b88b178f1438043b 100644 --- a/apps/dav/tests/unit/Connector/Sabre/FileTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/FileTest.php @@ -27,6 +27,7 @@ namespace OCA\DAV\Tests\unit\Connector\Sabre; +use OC\Files\Filesystem; use OC\Files\Storage\Local; use OC\Files\Storage\Temporary; use OC\Files\Storage\Wrapper\PermissionsMask; @@ -36,9 +37,8 @@ use OCP\Constants; use OCP\Files\ForbiddenException; use OCP\Files\Storage; use OCP\IConfig; -use Test\HookHelper; -use OC\Files\Filesystem; use OCP\Lock\ILockingProvider; +use Test\HookHelper; use Test\TestCase; use Test\Traits\MountProviderTrait; use Test\Traits\UserTrait; diff --git a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php index ea520bca7e5a22842d02cef314275f3d0678c93f..65130b64a84fc2961a0722e47772162320755dca 100644 --- a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php @@ -26,6 +26,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Tests\unit\Connector\Sabre; use OC\User\User; @@ -33,6 +34,7 @@ use OCA\DAV\Connector\Sabre\Directory; use OCA\DAV\Connector\Sabre\File; use OCA\DAV\Connector\Sabre\FilesPlugin; use OCA\DAV\Connector\Sabre\Node; +use OCP\Files\FileInfo; use OCP\Files\StorageNotAvailableException; use OCP\IConfig; use OCP\IPreview; @@ -44,7 +46,6 @@ use Sabre\DAV\Tree; use Sabre\HTTP\RequestInterface; use Sabre\HTTP\ResponseInterface; use Test\TestCase; -use OCP\Files\FileInfo; /** * Copyright (c) 2015 Vincent Petry diff --git a/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php index 09f9ea4dbfafa7723617046d31c5c63491ae5669..37a72da0bf2dd4492831c33abb91669785a624c2 100644 --- a/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php @@ -26,24 +26,24 @@ namespace OCA\DAV\Tests\unit\Connector\Sabre; +use OC\Files\View; use OCA\DAV\Connector\Sabre\Directory; use OCA\DAV\Connector\Sabre\FilesReportPlugin as FilesReportPluginImplementation; use OCP\App\IAppManager; use OCP\Files\File; +use OCP\Files\FileInfo; +use OCP\Files\Folder; use OCP\IConfig; +use OCP\IGroupManager; use OCP\IPreview; use OCP\IRequest; use OCP\ITagManager; +use OCP\ITags; use OCP\IUser; use OCP\IUserSession; use OCP\SystemTag\ISystemTag; -use OCP\SystemTag\ISystemTagObjectMapper; -use OC\Files\View; -use OCP\Files\Folder; -use OCP\IGroupManager; use OCP\SystemTag\ISystemTagManager; -use OCP\ITags; -use OCP\Files\FileInfo; +use OCP\SystemTag\ISystemTagObjectMapper; use Sabre\DAV\INode; use Sabre\DAV\Tree; use Sabre\HTTP\ResponseInterface; diff --git a/apps/dav/tests/unit/Connector/Sabre/MaintenancePluginTest.php b/apps/dav/tests/unit/Connector/Sabre/MaintenancePluginTest.php index 5a1a4619ead4f64fb87df351863d5c899a756579..71448c1ba12566da17d47d1eb7726d85ecd581ec 100644 --- a/apps/dav/tests/unit/Connector/Sabre/MaintenancePluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/MaintenancePluginTest.php @@ -25,8 +25,8 @@ namespace OCA\DAV\Tests\unit\Connector\Sabre; use OCA\DAV\Connector\Sabre\MaintenancePlugin; -use Test\TestCase; use OCP\IConfig; +use Test\TestCase; /** * Class MaintenancePluginTest diff --git a/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php b/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php index 2a5c122ce9ea7f7a91953d38af1c6894a7e2424f..54ec1f5aeeef091eb511fec4a33c1d9b7c082f2e 100644 --- a/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php @@ -36,10 +36,10 @@ use OCP\IConfig; use OCP\IGroup; use OCP\IGroupManager; use OCP\IUser; +use OCP\IUserManager; use OCP\IUserSession; use OCP\Share\IManager; -use \Sabre\DAV\PropPatch; -use OCP\IUserManager; +use Sabre\DAV\PropPatch; use Test\TestCase; class PrincipalTest extends TestCase { diff --git a/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php index 8d3cf3620e784d2378b56296e13e85f402fffc14..e5d229733c54167168b4992a4ab3b05c091dbc44 100644 --- a/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php @@ -24,6 +24,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Tests\unit\Connector\Sabre; use OC\Files\View; use OCA\DAV\Connector\Sabre\Directory; diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTestCase.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTestCase.php index a869e68fbbe9dec7415da1d0153d10f6485203fb..fe31ccba13c76907327b5b6a571b01b79537a896 100644 --- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTestCase.php +++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTestCase.php @@ -27,9 +27,9 @@ namespace OCA\DAV\Tests\unit\Connector\Sabre\RequestTest; +use OC\Files\View; use OCA\DAV\Connector\Sabre\Server; use OCA\DAV\Connector\Sabre\ServerFactory; -use OC\Files\View; use OCP\IRequest; use Sabre\HTTP\Request; use Test\TestCase; diff --git a/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php index af8208791e0085df8617aff1ed3720380e24094a..6494dab2b19e34f97ad20f52ae64973fabdb072e 100644 --- a/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php @@ -24,6 +24,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Tests\unit\Connector\Sabre; use OCA\DAV\Connector\Sabre\Directory; diff --git a/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php index 37b35bc017844de1892bc1338fca1a0f90a4aa9e..0f6f4f6ef24d8fb9779a73a944ae9f611d048655 100644 --- a/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php @@ -23,6 +23,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Tests\unit\Connector\Sabre; use OCA\DAV\Connector\Sabre\Directory; diff --git a/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php b/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php index 780324abaa65114d3f39f2343bc752d90fc2c344..a7731f8b0262f15043c8c1a9c6807f40b3ee0c99 100644 --- a/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php +++ b/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\Tests\DAV; use OCA\DAV\DAV\CustomPropertiesBackend; diff --git a/apps/dav/tests/unit/DAV/GroupPrincipalTest.php b/apps/dav/tests/unit/DAV/GroupPrincipalTest.php index c9a72e0b948c62443a1ec5bf05135a93d3ed6d55..e5be0d75d5347a813f5183e719de9dd116dbf363 100644 --- a/apps/dav/tests/unit/DAV/GroupPrincipalTest.php +++ b/apps/dav/tests/unit/DAV/GroupPrincipalTest.php @@ -33,7 +33,7 @@ use OCP\IGroupManager; use OCP\IUser; use OCP\IUserSession; use OCP\Share\IManager; -use \Sabre\DAV\PropPatch; +use Sabre\DAV\PropPatch; class GroupPrincipalTest extends \Test\TestCase { diff --git a/apps/dav/tests/unit/DAV/Sharing/PluginTest.php b/apps/dav/tests/unit/DAV/Sharing/PluginTest.php index c3b415903685a201af28a29b0bc1cd79268be467..96cabfab1ce15addfc6483fdbd47389e9d382598 100644 --- a/apps/dav/tests/unit/DAV/Sharing/PluginTest.php +++ b/apps/dav/tests/unit/DAV/Sharing/PluginTest.php @@ -25,9 +25,9 @@ namespace OCA\DAV\Tests\unit\DAV\Sharing; +use OCA\DAV\Connector\Sabre\Auth; use OCA\DAV\DAV\Sharing\IShareable; use OCA\DAV\DAV\Sharing\Plugin; -use OCA\DAV\Connector\Sabre\Auth; use OCP\IRequest; use Sabre\DAV\Server; use Sabre\DAV\SimpleCollection; diff --git a/apps/dav/tests/unit/Files/Sharing/FilesDropPluginTest.php b/apps/dav/tests/unit/Files/Sharing/FilesDropPluginTest.php index e2990f27b605296cad95674d79f77945f9ac1ee7..90e8b007833de1b75fa8171133c4f5dba5427914 100644 --- a/apps/dav/tests/unit/Files/Sharing/FilesDropPluginTest.php +++ b/apps/dav/tests/unit/Files/Sharing/FilesDropPluginTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\Tests\Files\Sharing; use OC\Files\View; diff --git a/apps/dav/tests/unit/Migration/CalDAVRemoveEmptyValueTest.php b/apps/dav/tests/unit/Migration/CalDAVRemoveEmptyValueTest.php index 2c77078bb5ebf69778af6299602033dd475aa8d6..8f2aa7f8b570b8b219dd2d86bbcbee7169cfce4c 100644 --- a/apps/dav/tests/unit/Migration/CalDAVRemoveEmptyValueTest.php +++ b/apps/dav/tests/unit/Migration/CalDAVRemoveEmptyValueTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\Tests\Unit\DAV\Migration; use OCA\DAV\CalDAV\CalDavBackend; diff --git a/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningNodeTest.php b/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningNodeTest.php index fcdb383465eb38252e7ca1e94deb4fc83d9006a0..693b3f61f9dafa407022ac55a3ca478a48ea3d97 100644 --- a/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningNodeTest.php +++ b/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningNodeTest.php @@ -85,4 +85,4 @@ class AppleProvisioningNodeTest extends TestCase { $this->node->propPatch($propPatch); } -} \ No newline at end of file +} diff --git a/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningPluginTest.php b/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningPluginTest.php index 57ad65372e1c7410f52c659f749d40b22bd9e0f6..1b854a541c2153c20ec43a9d98be81c4b3ff4c20 100644 --- a/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningPluginTest.php +++ b/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningPluginTest.php @@ -264,4 +264,4 @@ EOF $this->assertFalse($returnValue); } -} \ No newline at end of file +} diff --git a/apps/dav/tests/unit/ServerTest.php b/apps/dav/tests/unit/ServerTest.php index 986899a2107a2cbb8227a00272ef7fbe9a38da0e..0d1f85fc2980a4065a96510ba7cf4271e900305c 100644 --- a/apps/dav/tests/unit/ServerTest.php +++ b/apps/dav/tests/unit/ServerTest.php @@ -23,11 +23,12 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Tests\unit; +use OCA\DAV\AppInfo\PluginManager; use OCA\DAV\Server; use OCP\IRequest; -use OCA\DAV\AppInfo\PluginManager; /** * Class ServerTest diff --git a/apps/dav/tests/unit/SystemTag/SystemTagMappingNodeTest.php b/apps/dav/tests/unit/SystemTag/SystemTagMappingNodeTest.php index 8992cb78d0f3067ed473daad564c33283a484138..77f69c0734ae0a423adaa48ed98ba0b35cfab16d 100644 --- a/apps/dav/tests/unit/SystemTag/SystemTagMappingNodeTest.php +++ b/apps/dav/tests/unit/SystemTag/SystemTagMappingNodeTest.php @@ -27,10 +27,10 @@ namespace OCA\DAV\Tests\unit\SystemTag; use OC\SystemTag\SystemTag; use OCP\IUser; +use OCP\SystemTag\ISystemTag; use OCP\SystemTag\ISystemTagManager; use OCP\SystemTag\ISystemTagObjectMapper; use OCP\SystemTag\TagNotFoundException; -use OCP\SystemTag\ISystemTag; class SystemTagMappingNodeTest extends \Test\TestCase { diff --git a/apps/dav/tests/unit/SystemTag/SystemTagNodeTest.php b/apps/dav/tests/unit/SystemTag/SystemTagNodeTest.php index b9a6efdcc22323a7163ffb70e061f8a145be751c..bfaff5c2141115e2699f3760d5dfa9027d0d088d 100644 --- a/apps/dav/tests/unit/SystemTag/SystemTagNodeTest.php +++ b/apps/dav/tests/unit/SystemTag/SystemTagNodeTest.php @@ -28,10 +28,10 @@ namespace OCA\DAV\Tests\unit\SystemTag; use OC\SystemTag\SystemTag; use OCP\IUser; +use OCP\SystemTag\ISystemTag; use OCP\SystemTag\ISystemTagManager; -use OCP\SystemTag\TagNotFoundException; use OCP\SystemTag\TagAlreadyExistsException; -use OCP\SystemTag\ISystemTag; +use OCP\SystemTag\TagNotFoundException; use Sabre\DAV\Exception\Forbidden; class SystemTagNodeTest extends \Test\TestCase { diff --git a/apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php b/apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php index 7e1f34a5ebf7a7d00bb888abdda8442cb586cdb4..21afc4fc17795b6c74c2ed6a854587a90241d756 100644 --- a/apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php +++ b/apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php @@ -32,11 +32,11 @@ use OCA\DAV\SystemTag\SystemTagNode; use OCA\DAV\SystemTag\SystemTagsByIdCollection; use OCA\DAV\SystemTag\SystemTagsObjectMappingCollection; use OCP\IGroupManager; +use OCP\IUser; use OCP\IUserSession; +use OCP\SystemTag\ISystemTag; use OCP\SystemTag\ISystemTagManager; use OCP\SystemTag\TagAlreadyExistsException; -use OCP\IUser; -use OCP\SystemTag\ISystemTag; use Sabre\DAV\Tree; use Sabre\HTTP\RequestInterface; use Sabre\HTTP\ResponseInterface; diff --git a/apps/dav/tests/unit/Upload/AssemblyStreamTest.php b/apps/dav/tests/unit/Upload/AssemblyStreamTest.php index 0ac9cbb234e4bd0a8f1d834455802fddbc1fa301..7af034d5dfb6e0ab2a41d1fb8270907b76d1d69b 100644 --- a/apps/dav/tests/unit/Upload/AssemblyStreamTest.php +++ b/apps/dav/tests/unit/Upload/AssemblyStreamTest.php @@ -24,6 +24,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Tests\unit\Upload; use Sabre\DAV\File; @@ -159,4 +160,3 @@ class AssemblyStreamTest extends \Test\TestCase { return $node; } } - diff --git a/apps/dav/tests/unit/Upload/ChunkingPluginTest.php b/apps/dav/tests/unit/Upload/ChunkingPluginTest.php index 3951d1f1795e84c35c13a92af61bd00b00fb91ba..410ab2fc021f3473de39078d34cc382aacddf22f 100644 --- a/apps/dav/tests/unit/Upload/ChunkingPluginTest.php +++ b/apps/dav/tests/unit/Upload/ChunkingPluginTest.php @@ -19,16 +19,15 @@ * */ - namespace OCA\DAV\Tests\unit\Upload; +use OCA\DAV\Connector\Sabre\Directory; use OCA\DAV\Upload\ChunkingPlugin; +use OCA\DAV\Upload\FutureFile; use Sabre\HTTP\RequestInterface; use Sabre\HTTP\ResponseInterface; use Test\TestCase; -use OCA\DAV\Upload\FutureFile; -use OCA\DAV\Connector\Sabre\Directory; class ChunkingPluginTest extends TestCase { diff --git a/apps/dav/tests/unit/Upload/FutureFileTest.php b/apps/dav/tests/unit/Upload/FutureFileTest.php index 1f20642ff09025671a9246492e6ea24910eb2273..94be4ea66dde7b5d80e7e81c35c46f62031c195a 100644 --- a/apps/dav/tests/unit/Upload/FutureFileTest.php +++ b/apps/dav/tests/unit/Upload/FutureFileTest.php @@ -22,6 +22,7 @@ * along with this program. If not, see * */ + namespace OCA\DAV\Tests\unit\Upload; use OCA\DAV\Connector\Sabre\Directory; @@ -112,4 +113,3 @@ class FutureFileTest extends \Test\TestCase { return new \OCA\DAV\Upload\FutureFile($d, 'foo.txt'); } } - diff --git a/apps/encryption/lib/AppInfo/Application.php b/apps/encryption/lib/AppInfo/Application.php index 5846a01db13959c134c7c17ab54a6097a52e8000..0f5533f934dfa2e3146a5d569c18b50244d4cabf 100644 --- a/apps/encryption/lib/AppInfo/Application.php +++ b/apps/encryption/lib/AppInfo/Application.php @@ -22,6 +22,7 @@ * along with this program. If not, see * */ + namespace OCA\Encryption\AppInfo; @@ -45,7 +46,6 @@ use OCP\Encryption\IManager; use OCP\IConfig; use Symfony\Component\Console\Helper\QuestionHelper; - class Application extends \OCP\AppFramework\App { /** @var IManager */ diff --git a/apps/encryption/lib/Command/DisableMasterKey.php b/apps/encryption/lib/Command/DisableMasterKey.php index 230de754bfc4e2cc053a4b7ab3600677156c7ac8..34d29d2f5fa2845b21bfb5534e751e5e41d24030 100644 --- a/apps/encryption/lib/Command/DisableMasterKey.php +++ b/apps/encryption/lib/Command/DisableMasterKey.php @@ -21,7 +21,6 @@ * */ - namespace OCA\Encryption\Command; diff --git a/apps/encryption/lib/Command/EnableMasterKey.php b/apps/encryption/lib/Command/EnableMasterKey.php index 6f0800c9340ef677ad36726099815d9060119aaa..10fb65f9b58aef786109c8413fade60804957f92 100644 --- a/apps/encryption/lib/Command/EnableMasterKey.php +++ b/apps/encryption/lib/Command/EnableMasterKey.php @@ -20,7 +20,6 @@ * */ - namespace OCA\Encryption\Command; diff --git a/apps/encryption/lib/Controller/RecoveryController.php b/apps/encryption/lib/Controller/RecoveryController.php index 58ea4e4ece73e4a4c14c541d90fe4f6c15bd3c93..4cf85c6886e1d6e45ad5c392df51fa88bc4dce18 100644 --- a/apps/encryption/lib/Controller/RecoveryController.php +++ b/apps/encryption/lib/Controller/RecoveryController.php @@ -28,10 +28,10 @@ namespace OCA\Encryption\Controller; use OCA\Encryption\Recovery; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; +use OCP\AppFramework\Http\DataResponse; use OCP\IConfig; use OCP\IL10N; use OCP\IRequest; -use OCP\AppFramework\Http\DataResponse; class RecoveryController extends Controller { /** diff --git a/apps/encryption/lib/Controller/StatusController.php b/apps/encryption/lib/Controller/StatusController.php index fa88a35453e8913fef7d14310ebf15a4a0b30db8..3a2351db4332f8f63c1141ca8e6810cc6e62b0ce 100644 --- a/apps/encryption/lib/Controller/StatusController.php +++ b/apps/encryption/lib/Controller/StatusController.php @@ -23,7 +23,6 @@ * */ - namespace OCA\Encryption\Controller; diff --git a/apps/encryption/lib/Crypto/Crypt.php b/apps/encryption/lib/Crypto/Crypt.php index b2fdec513d2275070c87f4ecb2ef3b2513b242f5..c28623879490fdeaf5ae22cb0bb806549e604567 100644 --- a/apps/encryption/lib/Crypto/Crypt.php +++ b/apps/encryption/lib/Crypto/Crypt.php @@ -701,4 +701,3 @@ class Crypt { } } } - diff --git a/apps/encryption/lib/Crypto/DecryptAll.php b/apps/encryption/lib/Crypto/DecryptAll.php index 195dc7891fc306c2d29de59c706fb98749a3edb4..94db0a543d916600a22c04cf10b9d2c93be4e93f 100644 --- a/apps/encryption/lib/Crypto/DecryptAll.php +++ b/apps/encryption/lib/Crypto/DecryptAll.php @@ -20,7 +20,6 @@ * */ - namespace OCA\Encryption\Crypto; diff --git a/apps/encryption/lib/Crypto/EncryptAll.php b/apps/encryption/lib/Crypto/EncryptAll.php index ee13fee9eef73171f6a7e3749d436d2afc39d7b7..586397b82ae185957f42cef327085107e04e54b1 100644 --- a/apps/encryption/lib/Crypto/EncryptAll.php +++ b/apps/encryption/lib/Crypto/EncryptAll.php @@ -24,7 +24,6 @@ * */ - namespace OCA\Encryption\Crypto; use OC\Encryption\Exceptions\DecryptionFailedException; diff --git a/apps/encryption/lib/Crypto/Encryption.php b/apps/encryption/lib/Crypto/Encryption.php index 3f6001cab7423aeb05a1dc70436dc84515d30c49..f58718dc401ed7de9c28cdde4a618445c8bfd26d 100644 --- a/apps/encryption/lib/Crypto/Encryption.php +++ b/apps/encryption/lib/Crypto/Encryption.php @@ -34,10 +34,10 @@ use OC\Encryption\Exceptions\DecryptionFailedException; use OC\Files\Cache\Scanner; use OC\Files\View; use OCA\Encryption\Exceptions\PublicKeyMissingException; +use OCA\Encryption\KeyManager; use OCA\Encryption\Session; use OCA\Encryption\Util; use OCP\Encryption\IEncryptionModule; -use OCA\Encryption\KeyManager; use OCP\IL10N; use OCP\ILogger; use Symfony\Component\Console\Input\InputInterface; diff --git a/apps/encryption/lib/Exceptions/MultiKeyDecryptException.php b/apps/encryption/lib/Exceptions/MultiKeyDecryptException.php index ec1770cc0198b91807187131d5d963eac5760c4e..0a2fbe2873d24c810228cd61a19488c8c3f93c43 100644 --- a/apps/encryption/lib/Exceptions/MultiKeyDecryptException.php +++ b/apps/encryption/lib/Exceptions/MultiKeyDecryptException.php @@ -19,6 +19,7 @@ * along with this program. If not, see * */ + namespace OCA\Encryption\Exceptions; use OCP\Encryption\Exceptions\GenericEncryptionException; diff --git a/apps/encryption/lib/Exceptions/MultiKeyEncryptException.php b/apps/encryption/lib/Exceptions/MultiKeyEncryptException.php index 6b7c360b9047caa89210afafcee8e79e81cccf15..6cca838ad0dfba4ded1d866b10cb93668e16ea87 100644 --- a/apps/encryption/lib/Exceptions/MultiKeyEncryptException.php +++ b/apps/encryption/lib/Exceptions/MultiKeyEncryptException.php @@ -19,6 +19,7 @@ * along with this program. If not, see * */ + namespace OCA\Encryption\Exceptions; use OCP\Encryption\Exceptions\GenericEncryptionException; diff --git a/apps/encryption/lib/Exceptions/PublicKeyMissingException.php b/apps/encryption/lib/Exceptions/PublicKeyMissingException.php index 463d7db7d93fc806209e2e1fd3d01bd8fca0fd2c..9819b872527ef7520aa8c874c0ce43929eb52229 100644 --- a/apps/encryption/lib/Exceptions/PublicKeyMissingException.php +++ b/apps/encryption/lib/Exceptions/PublicKeyMissingException.php @@ -19,6 +19,7 @@ * along with this program. If not, see * */ + namespace OCA\Encryption\Exceptions; use OCP\Encryption\Exceptions\GenericEncryptionException; diff --git a/apps/encryption/lib/Hooks/UserHooks.php b/apps/encryption/lib/Hooks/UserHooks.php index bf3f3f42b47b0aef1e86ecf6418225b9a8318e08..f3ef96a61b2b6d02313515e199d6fd4a9010079e 100644 --- a/apps/encryption/lib/Hooks/UserHooks.php +++ b/apps/encryption/lib/Hooks/UserHooks.php @@ -28,18 +28,18 @@ namespace OCA\Encryption\Hooks; use OC\Files\Filesystem; -use OCP\Encryption\Exceptions\GenericEncryptionException; -use OCP\IUserManager; -use OCP\Util as OCUtil; +use OCA\Encryption\Crypto\Crypt; use OCA\Encryption\Hooks\Contracts\IHook; use OCA\Encryption\KeyManager; -use OCA\Encryption\Crypto\Crypt; +use OCA\Encryption\Recovery; +use OCA\Encryption\Session; use OCA\Encryption\Users\Setup; +use OCA\Encryption\Util; +use OCP\Encryption\Exceptions\GenericEncryptionException; use OCP\ILogger; +use OCP\IUserManager; use OCP\IUserSession; -use OCA\Encryption\Util; -use OCA\Encryption\Session; -use OCA\Encryption\Recovery; +use OCP\Util as OCUtil; class UserHooks implements IHook { diff --git a/apps/encryption/lib/KeyManager.php b/apps/encryption/lib/KeyManager.php index c66afc1ffc5d5f7a90fafda9f2f692db092c3daf..dd0ecbba448408c1c15714d123d82416c1cfd398 100644 --- a/apps/encryption/lib/KeyManager.php +++ b/apps/encryption/lib/KeyManager.php @@ -25,14 +25,15 @@ * along with this program. If not, see * */ + namespace OCA\Encryption; use OC\Encryption\Exceptions\DecryptionFailedException; use OC\Files\View; +use OCA\Encryption\Crypto\Crypt; use OCA\Encryption\Crypto\Encryption; use OCA\Encryption\Exceptions\PrivateKeyMissingException; use OCA\Encryption\Exceptions\PublicKeyMissingException; -use OCA\Encryption\Crypto\Crypt; use OCP\Encryption\Keys\IStorage; use OCP\IConfig; use OCP\ILogger; diff --git a/apps/encryption/lib/Migration/SetMasterKeyStatus.php b/apps/encryption/lib/Migration/SetMasterKeyStatus.php index 2c515fd5f72bfe7c9391723baf5145e8f638a281..e53315082b9320c64d4a75121ad57c10bd844f7e 100644 --- a/apps/encryption/lib/Migration/SetMasterKeyStatus.php +++ b/apps/encryption/lib/Migration/SetMasterKeyStatus.php @@ -21,7 +21,6 @@ * */ - namespace OCA\Encryption\Migration; diff --git a/apps/encryption/lib/Recovery.php b/apps/encryption/lib/Recovery.php index f9cdef53f130984fa416689dc957f1acfacf4335..2e4bddc8e5ba1d0fa58f89b1d1bd690e224ea162 100644 --- a/apps/encryption/lib/Recovery.php +++ b/apps/encryption/lib/Recovery.php @@ -25,15 +25,15 @@ namespace OCA\Encryption; +use OC\Files\View; use OCA\Encryption\Crypto\Crypt; +use OCP\Encryption\IFile; use OCP\Encryption\Keys\IStorage; use OCP\IConfig; use OCP\IUser; use OCP\IUserSession; use OCP\PreConditionNotMetException; use OCP\Security\ISecureRandom; -use OC\Files\View; -use OCP\Encryption\IFile; class Recovery { diff --git a/apps/encryption/lib/Session.php b/apps/encryption/lib/Session.php index 778d1f224adcb72db34f3c298e7a357da8bb83fa..016b266f052b98f65b72cd9d33c05340b2ea60a0 100644 --- a/apps/encryption/lib/Session.php +++ b/apps/encryption/lib/Session.php @@ -26,7 +26,7 @@ namespace OCA\Encryption; use OCA\Encryption\Exceptions\PrivateKeyMissingException; -use \OCP\ISession; +use OCP\ISession; class Session { diff --git a/apps/encryption/lib/Settings/Admin.php b/apps/encryption/lib/Settings/Admin.php index 7ada315e233b2752a1ffa7eefec3ceae0792feec..e98aa129ab62817be3dcf2f19653d943bb6c1561 100644 --- a/apps/encryption/lib/Settings/Admin.php +++ b/apps/encryption/lib/Settings/Admin.php @@ -28,13 +28,13 @@ use OCA\Encryption\Crypto\Crypt; use OCA\Encryption\Session; use OCA\Encryption\Util; use OCP\AppFramework\Http\TemplateResponse; +use OCP\IConfig; use OCP\IL10N; use OCP\ILogger; use OCP\ISession; use OCP\IUserManager; use OCP\IUserSession; use OCP\Settings\ISettings; -use OCP\IConfig; class Admin implements ISettings { diff --git a/apps/encryption/lib/Util.php b/apps/encryption/lib/Util.php index eb2357bd10f6d294ed77096d1035c3bfbb38d140..12087e1cce85f7d8ebe5e9f20dbb503a7a5781a6 100644 --- a/apps/encryption/lib/Util.php +++ b/apps/encryption/lib/Util.php @@ -23,7 +23,6 @@ * */ - namespace OCA\Encryption; diff --git a/apps/encryption/tests/Command/TestEnableMasterKey.php b/apps/encryption/tests/Command/TestEnableMasterKey.php index 3b58148f376bf967293865172eb1dd9499f367cf..ea59107647017e35acd94d10c8fb8f4f6317e2df 100644 --- a/apps/encryption/tests/Command/TestEnableMasterKey.php +++ b/apps/encryption/tests/Command/TestEnableMasterKey.php @@ -22,7 +22,6 @@ * */ - namespace OCA\Encryption\Tests\Command; diff --git a/apps/encryption/tests/Controller/RecoveryControllerTest.php b/apps/encryption/tests/Controller/RecoveryControllerTest.php index c38436e68e28605632a60f9a498a0005cd14c7c8..79f03f214eab86bfb8b4a503b085cdebf3b9443a 100644 --- a/apps/encryption/tests/Controller/RecoveryControllerTest.php +++ b/apps/encryption/tests/Controller/RecoveryControllerTest.php @@ -22,7 +22,6 @@ * */ - namespace OCA\Encryption\Tests\Controller; diff --git a/apps/encryption/tests/Controller/StatusControllerTest.php b/apps/encryption/tests/Controller/StatusControllerTest.php index 8e3b71e4d52c6513a98c562c2dab7afa772cbaca..ffd12bd20b94576c63af490ad50f21b8854cfe04 100644 --- a/apps/encryption/tests/Controller/StatusControllerTest.php +++ b/apps/encryption/tests/Controller/StatusControllerTest.php @@ -24,7 +24,6 @@ * */ - namespace OCA\Encryption\Tests\Controller; diff --git a/apps/encryption/tests/Crypto/CryptTest.php b/apps/encryption/tests/Crypto/CryptTest.php index 9645dc3cce0aefce4be11753b4a44e6aeb94975f..7ecb017b85553af8a90cbfb5769b67f9a945651f 100644 --- a/apps/encryption/tests/Crypto/CryptTest.php +++ b/apps/encryption/tests/Crypto/CryptTest.php @@ -25,7 +25,6 @@ * */ - namespace OCA\Encryption\Tests\Crypto; diff --git a/apps/encryption/tests/Crypto/DecryptAllTest.php b/apps/encryption/tests/Crypto/DecryptAllTest.php index c14549bb96ad58200f1a5c744597a15ca6b88a9e..64e29241a079c69344ffcb307f6f3923f1838ea4 100644 --- a/apps/encryption/tests/Crypto/DecryptAllTest.php +++ b/apps/encryption/tests/Crypto/DecryptAllTest.php @@ -22,7 +22,6 @@ * */ - namespace OCA\Encryption\Tests\Crypto; diff --git a/apps/encryption/tests/Crypto/EncryptAllTest.php b/apps/encryption/tests/Crypto/EncryptAllTest.php index af9b2eae3074d76d55a8b71b70a9b3744cdc962d..80ff97f17ee3e25a339152739d3377a1ff1fd613 100644 --- a/apps/encryption/tests/Crypto/EncryptAllTest.php +++ b/apps/encryption/tests/Crypto/EncryptAllTest.php @@ -24,7 +24,6 @@ * */ - namespace OCA\Encryption\Tests\Crypto; diff --git a/apps/encryption/tests/Crypto/EncryptionTest.php b/apps/encryption/tests/Crypto/EncryptionTest.php index 3e47b4b07502e9c8724593fe97594e587a4265b5..1f628ff19c9d57fcd4facb9ea0147b884f1bc12d 100644 --- a/apps/encryption/tests/Crypto/EncryptionTest.php +++ b/apps/encryption/tests/Crypto/EncryptionTest.php @@ -29,6 +29,7 @@ namespace OCA\Encryption\Tests\Crypto; use OCA\Encryption\Crypto\Crypt; use OCA\Encryption\Crypto\DecryptAll; use OCA\Encryption\Crypto\EncryptAll; +use OCA\Encryption\Crypto\Encryption; use OCA\Encryption\Exceptions\PublicKeyMissingException; use OCA\Encryption\KeyManager; use OCA\Encryption\Session; @@ -39,7 +40,6 @@ use OCP\ILogger; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; -use OCA\Encryption\Crypto\Encryption; class EncryptionTest extends TestCase { diff --git a/apps/encryption/tests/HookManagerTest.php b/apps/encryption/tests/HookManagerTest.php index 0b0c09bbf799e352e125d53608bcafbe9855dee3..5db3d10cc8f5ee84b549ff3632de8923366dc7c9 100644 --- a/apps/encryption/tests/HookManagerTest.php +++ b/apps/encryption/tests/HookManagerTest.php @@ -23,7 +23,6 @@ * */ - namespace OCA\Encryption\Tests; diff --git a/apps/encryption/tests/Hooks/UserHooksTest.php b/apps/encryption/tests/Hooks/UserHooksTest.php index 2295b90625dd8f4b714c57c133658d4b980d9aa1..c59343a7c9bfe6621510355d2452d24b56138de7 100644 --- a/apps/encryption/tests/Hooks/UserHooksTest.php +++ b/apps/encryption/tests/Hooks/UserHooksTest.php @@ -25,8 +25,6 @@ * */ - - namespace OCA\Encryption\Tests\Hooks; diff --git a/apps/encryption/tests/RecoveryTest.php b/apps/encryption/tests/RecoveryTest.php index 9b737cdb82f5109317e6db5bff49fb47cf5f74bc..942c3469c958670440a7cec53b62a7d29a6bade2 100644 --- a/apps/encryption/tests/RecoveryTest.php +++ b/apps/encryption/tests/RecoveryTest.php @@ -25,7 +25,6 @@ * */ - namespace OCA\Encryption\Tests; diff --git a/apps/encryption/tests/SessionTest.php b/apps/encryption/tests/SessionTest.php index 7bced196793c1e3162c7f80d2bc2c1defc7e04fc..a11aca2f75b33971ba62273d233212e72d2bbdbe 100644 --- a/apps/encryption/tests/SessionTest.php +++ b/apps/encryption/tests/SessionTest.php @@ -25,7 +25,6 @@ * */ - namespace OCA\Encryption\Tests; diff --git a/apps/encryption/tests/Settings/AdminTest.php b/apps/encryption/tests/Settings/AdminTest.php index 54b3187a97e246a74ed60192ec6a1d5a498940a3..728ffe1d932f4241bde8adf30698fbe1769298de 100644 --- a/apps/encryption/tests/Settings/AdminTest.php +++ b/apps/encryption/tests/Settings/AdminTest.php @@ -27,11 +27,11 @@ namespace OCA\Encryption\Tests\Settings; use OCA\Encryption\Settings\Admin; use OCP\AppFramework\Http\TemplateResponse; use OCP\IConfig; +use OCP\IL10N; +use OCP\ILogger; use OCP\ISession; use OCP\IUserManager; use OCP\IUserSession; -use OCP\IL10N; -use OCP\ILogger; use Test\TestCase; class AdminTest extends TestCase { diff --git a/apps/encryption/tests/Users/SetupTest.php b/apps/encryption/tests/Users/SetupTest.php index f61969039a8f4b7a50b9a90c500ef7e0d77c3bd1..141120671f2396fdc5369a9ef9e82444a97d3dc2 100644 --- a/apps/encryption/tests/Users/SetupTest.php +++ b/apps/encryption/tests/Users/SetupTest.php @@ -24,7 +24,6 @@ * */ - namespace OCA\Encryption\Tests\Users; diff --git a/apps/encryption/tests/UtilTest.php b/apps/encryption/tests/UtilTest.php index 17721d81eafba1e33530d9d87649e54b50aa359b..477501be1a8fcd8518622586364f2e55b9a617a7 100644 --- a/apps/encryption/tests/UtilTest.php +++ b/apps/encryption/tests/UtilTest.php @@ -25,7 +25,6 @@ * */ - namespace OCA\Encryption\Tests; diff --git a/apps/federatedfilesharing/lib/AppInfo/Application.php b/apps/federatedfilesharing/lib/AppInfo/Application.php index 73ac062be095cdd7079e7c91d4ac7c6251d8d435..158ef1f4c18c0209a4a624085c42fbb697b08768 100644 --- a/apps/federatedfilesharing/lib/AppInfo/Application.php +++ b/apps/federatedfilesharing/lib/AppInfo/Application.php @@ -23,7 +23,6 @@ * */ - namespace OCA\FederatedFileSharing\AppInfo; diff --git a/apps/federatedfilesharing/lib/BackgroundJob/RetryJob.php b/apps/federatedfilesharing/lib/BackgroundJob/RetryJob.php index e3d7028ef650744814d33b613960b55a9495ca4a..02c21020b708a9e458dd19f31b248a9d2e0570af 100644 --- a/apps/federatedfilesharing/lib/BackgroundJob/RetryJob.php +++ b/apps/federatedfilesharing/lib/BackgroundJob/RetryJob.php @@ -24,7 +24,6 @@ * */ - namespace OCA\FederatedFileSharing\BackgroundJob; diff --git a/apps/federatedfilesharing/lib/Controller/MountPublicLinkController.php b/apps/federatedfilesharing/lib/Controller/MountPublicLinkController.php index d54f24d97fe8c60cb1ee795fa814ab7ade9557c4..febd43c554c643270e7e698e8d6fd159ab07c70f 100644 --- a/apps/federatedfilesharing/lib/Controller/MountPublicLinkController.php +++ b/apps/federatedfilesharing/lib/Controller/MountPublicLinkController.php @@ -26,7 +26,6 @@ * */ - namespace OCA\FederatedFileSharing\Controller; use OC\Files\Filesystem; diff --git a/apps/federatedfilesharing/lib/FederatedShareProvider.php b/apps/federatedfilesharing/lib/FederatedShareProvider.php index 4d93dec18f7f307eb5c59a0e3fd8c5a23c3cce23..a95320daf48e2fb1a019f4b25e5fcdb85fe2d36c 100644 --- a/apps/federatedfilesharing/lib/FederatedShareProvider.php +++ b/apps/federatedfilesharing/lib/FederatedShareProvider.php @@ -29,24 +29,24 @@ namespace OCA\FederatedFileSharing; +use OC\Share20\Exception\InvalidShare; use OC\Share20\Share; +use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\Federation\ICloudFederationProviderManager; use OCP\Federation\ICloudIdManager; -use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\Files\Folder; use OCP\Files\IRootFolder; +use OCP\Files\Node; +use OCP\Files\NotFoundException; use OCP\IConfig; +use OCP\IDBConnection; use OCP\IL10N; use OCP\ILogger; use OCP\IUserManager; use OCP\Share\Exceptions\GenericShareException; +use OCP\Share\Exceptions\ShareNotFound; use OCP\Share\IShare; use OCP\Share\IShareProvider; -use OC\Share20\Exception\InvalidShare; -use OCP\Share\Exceptions\ShareNotFound; -use OCP\Files\NotFoundException; -use OCP\IDBConnection; -use OCP\Files\Node; /** * Class FederatedShareProvider diff --git a/apps/federatedfilesharing/lib/Notifications.php b/apps/federatedfilesharing/lib/Notifications.php index 70733bc9e2ccb0d1bd59e724f853df9dd5ca3bc7..fc820abb584887a3812221be17d9a55545584286 100644 --- a/apps/federatedfilesharing/lib/Notifications.php +++ b/apps/federatedfilesharing/lib/Notifications.php @@ -22,7 +22,6 @@ * */ - namespace OCA\FederatedFileSharing; use OCP\AppFramework\Http; diff --git a/apps/federatedfilesharing/lib/TokenHandler.php b/apps/federatedfilesharing/lib/TokenHandler.php index bfe02169fbd41c49221c27271cdcd825f1872ccb..85a65fae1d944ef32001b7f1a3991318d8f51020 100644 --- a/apps/federatedfilesharing/lib/TokenHandler.php +++ b/apps/federatedfilesharing/lib/TokenHandler.php @@ -20,7 +20,6 @@ * */ - namespace OCA\FederatedFileSharing; diff --git a/apps/federatedfilesharing/lib/ocm/CloudFederationProviderFiles.php b/apps/federatedfilesharing/lib/ocm/CloudFederationProviderFiles.php index 062c79ad97d2150b8bddb86b27a2e9116295eb79..fa3e17271cf334f12b099c498202593381e94f8d 100644 --- a/apps/federatedfilesharing/lib/ocm/CloudFederationProviderFiles.php +++ b/apps/federatedfilesharing/lib/ocm/CloudFederationProviderFiles.php @@ -23,9 +23,9 @@ namespace OCA\FederatedFileSharing\OCM; use OC\AppFramework\Http; use OC\Files\Filesystem; -use OCA\Files_Sharing\Activity\Providers\RemoteShares; use OCA\FederatedFileSharing\AddressHandler; use OCA\FederatedFileSharing\FederatedShareProvider; +use OCA\Files_Sharing\Activity\Providers\RemoteShares; use OCP\Activity\IManager as IActivityManager; use OCP\App\IAppManager; use OCP\Constants; diff --git a/apps/federatedfilesharing/tests/AddressHandlerTest.php b/apps/federatedfilesharing/tests/AddressHandlerTest.php index 358bef428bc27338a0a102987dbbf3ea29757b7f..63691f6162413dfa01f08b06b0ed0f88188f52ee 100644 --- a/apps/federatedfilesharing/tests/AddressHandlerTest.php +++ b/apps/federatedfilesharing/tests/AddressHandlerTest.php @@ -24,7 +24,6 @@ * */ - namespace OCA\FederatedFileSharing\Tests; diff --git a/apps/federatedfilesharing/tests/Controller/MountPublicLinkControllerTest.php b/apps/federatedfilesharing/tests/Controller/MountPublicLinkControllerTest.php index e4556972b10a95809e0713e3b4419dd453a8f243..db4c3914115091d7425f05950b33e9642441d751 100644 --- a/apps/federatedfilesharing/tests/Controller/MountPublicLinkControllerTest.php +++ b/apps/federatedfilesharing/tests/Controller/MountPublicLinkControllerTest.php @@ -24,7 +24,6 @@ * */ - namespace OCA\FederatedFileSharing\Tests\Controller; use OC\Federation\CloudIdManager; diff --git a/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php b/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php index 7edcb56d0c698fa53ec36c51429749974fc6179c..57d82f63e16b5d5b6fb540128e0211b57f6fc626 100644 --- a/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php +++ b/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php @@ -32,8 +32,8 @@ namespace OCA\FederatedFileSharing\Tests; use OC\AppFramework\Http; use OC\Federation\CloudIdManager; use OC\Files\Filesystem; -use OCA\FederatedFileSharing\FederatedShareProvider; use OCA\FederatedFileSharing\Controller\RequestHandlerController; +use OCA\FederatedFileSharing\FederatedShareProvider; use OCP\AppFramework\Http\DataResponse; use OCP\Federation\ICloudFederationFactory; use OCP\Federation\ICloudFederationProvider; diff --git a/apps/federatedfilesharing/tests/FederatedShareProviderTest.php b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php index 98ad8832fa164dd2c2da1fba6e8e1a02165ac122..ae233e565d12faff7f3b23abccf41f6e58edd23b 100644 --- a/apps/federatedfilesharing/tests/FederatedShareProviderTest.php +++ b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php @@ -25,6 +25,7 @@ * along with this program. If not, see * */ + namespace OCA\FederatedFileSharing\Tests; diff --git a/apps/federatedfilesharing/tests/NotificationsTest.php b/apps/federatedfilesharing/tests/NotificationsTest.php index 4c491ba2f9afdd4ef89fe5f025d31efc88535622..d93b9d608c34eb7ec038e3daeadb8d22b43472fe 100644 --- a/apps/federatedfilesharing/tests/NotificationsTest.php +++ b/apps/federatedfilesharing/tests/NotificationsTest.php @@ -22,7 +22,6 @@ * */ - namespace OCA\FederatedFileSharing\Tests; diff --git a/apps/federatedfilesharing/tests/TokenHandlerTest.php b/apps/federatedfilesharing/tests/TokenHandlerTest.php index d6f3f8fe5da2fd38b7c0b7a05230f3b6f2c6b634..37798269a387760a08ab3657a6bbde55cbce0cdb 100644 --- a/apps/federatedfilesharing/tests/TokenHandlerTest.php +++ b/apps/federatedfilesharing/tests/TokenHandlerTest.php @@ -22,7 +22,6 @@ * */ - namespace OCA\FederatedFileSharing\Tests; diff --git a/apps/federation/lib/AppInfo/Application.php b/apps/federation/lib/AppInfo/Application.php index 3798a03cb540edc41d9d9053834fcd90a45f7436..76d4bd3596fd74ce0f42caa9c96ea86ff0636ffd 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 30b04c5b123e18f28ec5e4042da87d5d440a633e..d4e403ae45e8b76b3e5f0f780dc5bd0ef0b88484 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 fb9fd25888f598fa094c5ea4e555652178da9304..863c893e51c7bf2a40f1426e74ed99e9644ebfc0 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 3b1f95b0502943a3f38097e984b9841169930019..ebfcb4dd9498d3ce38f60d97ec75565e327c0b51 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 * */ + 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 0433cd04b1b140a6eb789566df18b985ffc31454..8a21603bb9631b2872d678f2864e616d2ad2327f 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 6e64200dc8c96e67c5cb5f34b37a6e6fe3c39f06..97aff93491e1bb2fb834c1a2e5fa99d7c56badc9 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 511888f768359022c4046bff38980e2c5ae80efa..eb96fa75d764d2412af83e223465cb38d23bb3d5 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 * */ + namespace OCA\Federation\DAV; use OCA\Federation\DbHandler; diff --git a/apps/federation/lib/DbHandler.php b/apps/federation/lib/DbHandler.php index abfb4c2f1b9563b8c65ffbac079d952fb01ee07a..60142a8f0a7984ccdc3b952e4a59fab5b1d2c139 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 6601b9c0eb7a424d6b064d248a3e63b745cb8b6c..48ef0f3c0b7a1a65a3f8aac16beae13b182b7579 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 b5cd9a574c42ac83e2725b75e720f7ab8475bbb5..cb485ccfc63d6f4c8b77cae7cc78cc6b7e88d1c8 100644 --- a/apps/federation/lib/SyncFederationAddressBooks.php +++ b/apps/federation/lib/SyncFederationAddressBooks.php @@ -22,6 +22,7 @@ * along with this program. If not, see * */ + namespace OCA\Federation; use OC\OCS\DiscoveryService; diff --git a/apps/federation/lib/TrustedServers.php b/apps/federation/lib/TrustedServers.php index 092279eb2b9575623573bb6cd288a4ceea282bc5..391ba76c9983426b5b71c2d38c3c87b895eabb1f 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 d195c81de31b25c20f7c5d619ea0de78a9273fc6..adc621650afaefe8bc6a93bf830d6df56485a23e 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 45bed657ef83a4f14c7bd8b6fe02a864b5403b8e..e8f63fb30d3bd25c5412936a46feb5b4d4417930 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 26c0235fa7064af477e59fabcb083bb6cce22d8c..df9f284d2c9f09e97f5bc6b9b1373b0a52804e05 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 f023274e3e401797e02be655759ed48f40ade6bf..41312b8ef2c2d5cda3fa83b062786aef93bf6638 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 10c5e165eefffd9de65f335c3ab9aefa36a528e0..1140df334c8095f4941891f78c9928d04665b0fd 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 8a1b9e32755a49cecdb7d5a03137832d41e34ac3..bad026855344c91d3a7aaaf43f8f9539ef74ba74 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 e60c244d08c9290a342df640a0dd36337dcc251a..34ac8dfd53961b30ae2df2a90ae3621fc98dd14a 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 7bae5e566fc010ab23d571a3a78cf779fa341a97..eb063019424f7423490dda5cba945854948734f3 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 3ee12c8830c3f86088e93790dc310b6c87729a1d..2148b4b3c00cdcf807529c8ca75cca25e30a5dbb 100644 --- a/apps/federation/tests/SyncFederationAddressbooksTest.php +++ b/apps/federation/tests/SyncFederationAddressbooksTest.php @@ -23,6 +23,7 @@ * along with this program. If not, see * */ + namespace OCA\Federation\Tests; use OC\OCS\DiscoveryService; diff --git a/apps/federation/tests/TrustedServersTest.php b/apps/federation/tests/TrustedServersTest.php index c350796a01af73d43aa2aaab79bfea5c5f8dca14..209f41322c4ca205e530738ec8062de2794b85a5 100644 --- a/apps/federation/tests/TrustedServersTest.php +++ b/apps/federation/tests/TrustedServersTest.php @@ -25,7 +25,6 @@ * */ - namespace OCA\Federation\Tests; diff --git a/apps/files/lib/Activity/Settings/FavoriteAction.php b/apps/files/lib/Activity/Settings/FavoriteAction.php index 8f798d6e5d3ff6cdeb191f72669010bf5fa9c3d8..e352172e4fa513713e17f664df7e30c1be964225 100644 --- a/apps/files/lib/Activity/Settings/FavoriteAction.php +++ b/apps/files/lib/Activity/Settings/FavoriteAction.php @@ -97,4 +97,3 @@ class FavoriteAction implements ISetting { return false; } } - diff --git a/apps/files/lib/Activity/Settings/FileChanged.php b/apps/files/lib/Activity/Settings/FileChanged.php index f89c088e1bdb1abab89e4d1e8264666b4c4bd10d..c1a5140ff107d775efe42128d0d75f698e8e4c86 100644 --- a/apps/files/lib/Activity/Settings/FileChanged.php +++ b/apps/files/lib/Activity/Settings/FileChanged.php @@ -97,4 +97,3 @@ class FileChanged implements ISetting { return false; } } - diff --git a/apps/files/lib/Activity/Settings/FileCreated.php b/apps/files/lib/Activity/Settings/FileCreated.php index 945d25806a7dbf14d49d04dc09673ff3a6ed8c01..c655435c6eb454cfbbf92de3e454e788efb834f4 100644 --- a/apps/files/lib/Activity/Settings/FileCreated.php +++ b/apps/files/lib/Activity/Settings/FileCreated.php @@ -97,4 +97,3 @@ class FileCreated implements ISetting { return false; } } - diff --git a/apps/files/lib/Activity/Settings/FileDeleted.php b/apps/files/lib/Activity/Settings/FileDeleted.php index 34ecc7cb2d7ccc2164d5621b56f7818335c64131..bf2c84a0da0206dd5fc21f5e022ada391427c20f 100644 --- a/apps/files/lib/Activity/Settings/FileDeleted.php +++ b/apps/files/lib/Activity/Settings/FileDeleted.php @@ -97,4 +97,3 @@ class FileDeleted implements ISetting { return false; } } - diff --git a/apps/files/lib/Activity/Settings/FileFavorite.php b/apps/files/lib/Activity/Settings/FileFavorite.php index ae0a4cae674ca0c1c3b09752be506fff61eb2738..8ef838bc265f6057992433ce8c71df40b9d0da89 100644 --- a/apps/files/lib/Activity/Settings/FileFavorite.php +++ b/apps/files/lib/Activity/Settings/FileFavorite.php @@ -97,4 +97,3 @@ class FileFavorite implements ISetting { return false; } } - diff --git a/apps/files/lib/Activity/Settings/FileRestored.php b/apps/files/lib/Activity/Settings/FileRestored.php index 76f2cca588864efdb1a04b22749256dbc8c4b648..1e7c6174582920313517bd8e4caa346c814923e9 100644 --- a/apps/files/lib/Activity/Settings/FileRestored.php +++ b/apps/files/lib/Activity/Settings/FileRestored.php @@ -97,4 +97,3 @@ class FileRestored implements ISetting { return false; } } - diff --git a/apps/files/lib/App.php b/apps/files/lib/App.php index 0bf9ae205255eb66b5c5e205e964bed511a92d56..8f355fa62555612df6cc9207a0c821f52d7c9d84 100644 --- a/apps/files/lib/App.php +++ b/apps/files/lib/App.php @@ -24,7 +24,6 @@ * */ - namespace OCA\Files; class App { diff --git a/apps/files/lib/AppInfo/Application.php b/apps/files/lib/AppInfo/Application.php index 6f06faa3cae8657a58b14fbf5676056d4f1af13c..1ffd5e964718c6cfc9fe8d4cd6b436aafe1ba51e 100644 --- a/apps/files/lib/AppInfo/Application.php +++ b/apps/files/lib/AppInfo/Application.php @@ -24,21 +24,22 @@ * along with this program. If not, see * */ + namespace OCA\Files\AppInfo; use OCA\Files\Activity\Helper; +use OCA\Files\Capabilities; use OCA\Files\Collaboration\Resources\Listener; use OCA\Files\Collaboration\Resources\ResourceProvider; use OCA\Files\Controller\ApiController; +use OCA\Files\Controller\ViewController; use OCA\Files\Event\LoadAdditionalScriptsEvent; use OCA\Files\Listener\LegacyLoadAdditionalScriptsAdapter; +use OCA\Files\Service\TagService; use OCP\AppFramework\App; -use \OCA\Files\Service\TagService; use OCP\Collaboration\Resources\IManager; use OCP\EventDispatcher\IEventDispatcher; -use \OCP\IContainer; -use OCA\Files\Controller\ViewController; -use OCA\Files\Capabilities; +use OCP\IContainer; class Application extends App { public function __construct(array $urlParams=array()) { diff --git a/apps/files/lib/Command/Scan.php b/apps/files/lib/Command/Scan.php index 6950afd1f004b79a4d4273d98faf36ccd3afc9bf..734692d9c6c4836bfdd2bac303af828e1b5421ce 100644 --- a/apps/files/lib/Command/Scan.php +++ b/apps/files/lib/Command/Scan.php @@ -37,11 +37,11 @@ use OCP\Files\NotFoundException; use OCP\Files\StorageNotAvailableException; use OCP\IDBConnection; use OCP\IUserManager; +use Symfony\Component\Console\Helper\Table; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Helper\Table; class Scan extends Base { diff --git a/apps/files/lib/Command/ScanAppData.php b/apps/files/lib/Command/ScanAppData.php index 244293ae70dbfdd7e018c75461ec25c7d0c9df8c..7ac42e7c6dfb8413dbf23f8343b510a2aae4673b 100644 --- a/apps/files/lib/Command/ScanAppData.php +++ b/apps/files/lib/Command/ScanAppData.php @@ -21,6 +21,7 @@ * along with this program. If not, see . * */ + namespace OCA\Files\Command; use Doctrine\DBAL\Connection; @@ -32,9 +33,9 @@ use OCP\Files\NotFoundException; use OCP\Files\StorageNotAvailableException; use OCP\IConfig; use OCP\IDBConnection; +use Symfony\Component\Console\Helper\Table; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Helper\Table; class ScanAppData extends Base { diff --git a/apps/files/lib/Command/TransferOwnership.php b/apps/files/lib/Command/TransferOwnership.php index a77a02a49475f20f0a6d7f1e6b760bbc22230ca2..5f51a80d998caea79684c3e7d934c5d10d8c14ef 100644 --- a/apps/files/lib/Command/TransferOwnership.php +++ b/apps/files/lib/Command/TransferOwnership.php @@ -39,10 +39,10 @@ use OCP\IUserManager; use OCP\Share\IManager; use OCP\Share\IShare; use Symfony\Component\Console\Command\Command; -use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Helper\ProgressBar; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; class TransferOwnership extends Command { diff --git a/apps/files/lib/Controller/ApiController.php b/apps/files/lib/Controller/ApiController.php index 38c378d480df1fbea211bab3806f764aa2f9298f..77db0dbe56aa95e1a4e6375521943d100b6d0887 100644 --- a/apps/files/lib/Controller/ApiController.php +++ b/apps/files/lib/Controller/ApiController.php @@ -30,22 +30,22 @@ namespace OCA\Files\Controller; -use OCP\AppFramework\Http; +use OC\Files\Node\Node; +use OCA\Files\Service\TagService; use OCP\AppFramework\Controller; +use OCP\AppFramework\Http; +use OCP\AppFramework\Http\DataResponse; +use OCP\AppFramework\Http\FileDisplayResponse; +use OCP\AppFramework\Http\JSONResponse; +use OCP\AppFramework\Http\Response; use OCP\Files\File; use OCP\Files\Folder; use OCP\Files\NotFoundException; use OCP\IConfig; -use OCP\IRequest; -use OCP\AppFramework\Http\DataResponse; -use OCP\AppFramework\Http\JSONResponse; -use OCP\AppFramework\Http\FileDisplayResponse; -use OCP\AppFramework\Http\Response; -use OCA\Files\Service\TagService; use OCP\IPreview; -use OCP\Share\IManager; -use OC\Files\Node\Node; +use OCP\IRequest; use OCP\IUserSession; +use OCP\Share\IManager; use Sabre\VObject\Property\Boolean; /** diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php index 17caf06b480a48c408496080cc4cbec037c6cec0..a1c1e5e35308a087edf3307530d4abaf9a3379fc 100644 --- a/apps/files/lib/Controller/ViewController.php +++ b/apps/files/lib/Controller/ViewController.php @@ -32,12 +32,12 @@ namespace OCA\Files\Controller; use OCA\Files\Activity\Helper; use OCA\Files\Event\LoadAdditionalScriptsEvent; use OCA\Files\Event\LoadSidebar; +use OCP\App\IAppManager; use OCP\AppFramework\Controller; use OCP\AppFramework\Http\ContentSecurityPolicy; use OCP\AppFramework\Http\RedirectResponse; use OCP\AppFramework\Http\Response; use OCP\AppFramework\Http\TemplateResponse; -use OCP\App\IAppManager; use OCP\EventDispatcher\IEventDispatcher; use OCP\Files\Folder; use OCP\Files\IRootFolder; diff --git a/apps/files/lib/Service/TagService.php b/apps/files/lib/Service/TagService.php index 7437f0c31ad706fa1e797f4a75d86a2acd2a4c20..0a31be7a5581e3a145a574c5986137b48cfef737 100644 --- a/apps/files/lib/Service/TagService.php +++ b/apps/files/lib/Service/TagService.php @@ -146,4 +146,3 @@ class TagService { } } } - diff --git a/apps/files/tests/BackgroundJob/ScanFilesTest.php b/apps/files/tests/BackgroundJob/ScanFilesTest.php index e558800b9de59eb75e09db625e438843cfa2feb3..a75e54edfee9685a74b0977b136cd24b27289685 100644 --- a/apps/files/tests/BackgroundJob/ScanFilesTest.php +++ b/apps/files/tests/BackgroundJob/ScanFilesTest.php @@ -20,13 +20,14 @@ * along with this program. If not, see * */ + namespace OCA\Files\Tests\BackgroundJob; -use OCP\IUser; -use Test\TestCase; +use OCA\Files\BackgroundJob\ScanFiles; use OCP\IConfig; +use OCP\IUser; use OCP\IUserManager; -use OCA\Files\BackgroundJob\ScanFiles; +use Test\TestCase; /** * Class ScanFilesTest diff --git a/apps/files/tests/Command/DeleteOrphanedFilesTest.php b/apps/files/tests/Command/DeleteOrphanedFilesTest.php index 8c48b9feca755aa333e573434860d19ceafec9b8..684192858e7423f4ec08ec5a8f29cb9af69533cf 100644 --- a/apps/files/tests/Command/DeleteOrphanedFilesTest.php +++ b/apps/files/tests/Command/DeleteOrphanedFilesTest.php @@ -132,4 +132,3 @@ class DeleteOrphanedFilesTest extends TestCase { } } } - diff --git a/apps/files/tests/Controller/ApiControllerTest.php b/apps/files/tests/Controller/ApiControllerTest.php index 3beabf73ada157b8feace6693038f969240f4256..22daf7c23b4a0d41b40410ab2270bff200ede647 100644 --- a/apps/files/tests/Controller/ApiControllerTest.php +++ b/apps/files/tests/Controller/ApiControllerTest.php @@ -27,21 +27,21 @@ namespace OCA\Files\Controller; +use OCA\Files\Service\TagService; use OCP\AppFramework\Http; +use OCP\AppFramework\Http\DataResponse; use OCP\Files\File; use OCP\Files\Folder; use OCP\Files\NotFoundException; use OCP\Files\SimpleFS\ISimpleFile; use OCP\Files\StorageNotAvailableException; use OCP\IConfig; +use OCP\IPreview; +use OCP\IRequest; use OCP\IUser; use OCP\IUserSession; use OCP\Share\IManager; use Test\TestCase; -use OCP\IRequest; -use OCA\Files\Service\TagService; -use OCP\AppFramework\Http\DataResponse; -use OCP\IPreview; /** * Class ApiController diff --git a/apps/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php index eb4e4f6ca2c8ea90008deefbc7d437301260e460..4de56082e98b34050dc6a02f1425efbadc5780a6 100644 --- a/apps/files/tests/Controller/ViewControllerTest.php +++ b/apps/files/tests/Controller/ViewControllerTest.php @@ -31,21 +31,21 @@ namespace OCA\Files\Tests\Controller; use OCA\Files\Activity\Helper; use OCA\Files\Controller\ViewController; +use OCP\App\IAppManager; use OCP\AppFramework\Http; use OCP\EventDispatcher\IEventDispatcher; use OCP\Files\File; use OCP\Files\Folder; use OCP\Files\IRootFolder; -use OCP\IUser; -use OCP\Template; -use Test\TestCase; +use OCP\IConfig; +use OCP\IL10N; use OCP\IRequest; use OCP\IURLGenerator; -use OCP\IL10N; -use OCP\IConfig; +use OCP\IUser; use OCP\IUserSession; +use OCP\Template; use Symfony\Component\EventDispatcher\EventDispatcherInterface; -use OCP\App\IAppManager; +use Test\TestCase; /** * Class ViewControllerTest diff --git a/apps/files/tests/Service/TagServiceTest.php b/apps/files/tests/Service/TagServiceTest.php index e4a41bd5d2e638acea14664e1fd0fc0f399a6910..709ba3b9c9886cc7792473434441adc699e71240 100644 --- a/apps/files/tests/Service/TagServiceTest.php +++ b/apps/files/tests/Service/TagServiceTest.php @@ -22,6 +22,7 @@ * along with this program. If not, see * */ + namespace OCA\Files\Tests\Service; use OC\Tags; @@ -180,4 +181,3 @@ class TagServiceTest extends \Test\TestCase { $subdir->delete(); } } - diff --git a/apps/files_external/lib/AppInfo/Application.php b/apps/files_external/lib/AppInfo/Application.php index 57ef28f2ae07b468652a1fcd5655acac73d3f7ab..1ee7cb08ccf8e123be203abc492cce30f642be22 100644 --- a/apps/files_external/lib/AppInfo/Application.php +++ b/apps/files_external/lib/AppInfo/Application.php @@ -30,38 +30,38 @@ namespace OCA\Files_External\AppInfo; use OCA\Files_External\Config\UserPlaceholderHandler; -use OCA\Files_External\Lib\Auth\PublicKey\RSAPrivateKey; -use OCA\Files_External\Lib\Auth\SMB\KerberosAuth; -use \OCP\AppFramework\App; -use OCP\AppFramework\IAppContainer; -use \OCA\Files_External\Service\BackendService; -use \OCA\Files_External\Lib\Config\IBackendProvider; -use \OCA\Files_External\Lib\Config\IAuthMechanismProvider; use OCA\Files_External\Lib\Auth\AmazonS3\AccessKey; -use OCA\Files_External\Lib\Auth\OpenStack\Rackspace; +use OCA\Files_External\Lib\Auth\Builtin; +use OCA\Files_External\Lib\Auth\NullMechanism; +use OCA\Files_External\Lib\Auth\OAuth1\OAuth1; +use OCA\Files_External\Lib\Auth\OAuth2\OAuth2; use OCA\Files_External\Lib\Auth\OpenStack\OpenStackV2; use OCA\Files_External\Lib\Auth\OpenStack\OpenStackV3; -use OCA\Files_External\Lib\Auth\PublicKey\RSA; -use OCA\Files_External\Lib\Auth\OAuth2\OAuth2; -use OCA\Files_External\Lib\Auth\OAuth1\OAuth1; +use OCA\Files_External\Lib\Auth\OpenStack\Rackspace; use OCA\Files_External\Lib\Auth\Password\GlobalAuth; -use OCA\Files_External\Lib\Auth\Password\UserGlobalAuth; -use OCA\Files_External\Lib\Auth\Password\UserProvided; use OCA\Files_External\Lib\Auth\Password\LoginCredentials; -use OCA\Files_External\Lib\Auth\Password\SessionCredentials; use OCA\Files_External\Lib\Auth\Password\Password; -use OCA\Files_External\Lib\Auth\Builtin; -use OCA\Files_External\Lib\Auth\NullMechanism; -use OCA\Files_External\Lib\Backend\SMB_OC; -use OCA\Files_External\Lib\Backend\SMB; -use OCA\Files_External\Lib\Backend\SFTP_Key; -use OCA\Files_External\Lib\Backend\Swift; +use OCA\Files_External\Lib\Auth\Password\SessionCredentials; +use OCA\Files_External\Lib\Auth\Password\UserGlobalAuth; +use OCA\Files_External\Lib\Auth\Password\UserProvided; +use OCA\Files_External\Lib\Auth\PublicKey\RSA; +use OCA\Files_External\Lib\Auth\PublicKey\RSAPrivateKey; +use OCA\Files_External\Lib\Auth\SMB\KerberosAuth; use OCA\Files_External\Lib\Backend\AmazonS3; -use OCA\Files_External\Lib\Backend\SFTP; -use OCA\Files_External\Lib\Backend\OwnCloud; use OCA\Files_External\Lib\Backend\DAV; use OCA\Files_External\Lib\Backend\FTP; use OCA\Files_External\Lib\Backend\Local; +use OCA\Files_External\Lib\Backend\OwnCloud; +use OCA\Files_External\Lib\Backend\SFTP; +use OCA\Files_External\Lib\Backend\SFTP_Key; +use OCA\Files_External\Lib\Backend\SMB; +use OCA\Files_External\Lib\Backend\SMB_OC; +use OCA\Files_External\Lib\Backend\Swift; +use OCA\Files_External\Lib\Config\IAuthMechanismProvider; +use OCA\Files_External\Lib\Config\IBackendProvider; +use OCA\Files_External\Service\BackendService; +use OCP\AppFramework\App; +use OCP\AppFramework\IAppContainer; use OCP\Files\Config\IUserMountCache; /** diff --git a/apps/files_external/lib/Config/ConfigAdapter.php b/apps/files_external/lib/Config/ConfigAdapter.php index c9586635baf06f2adcef0482594a982ee836ba1d..abed11172794b47483dbf7778c57598a01f8678f 100644 --- a/apps/files_external/lib/Config/ConfigAdapter.php +++ b/apps/files_external/lib/Config/ConfigAdapter.php @@ -26,18 +26,18 @@ namespace OCA\Files_External\Config; +use OC\Files\Storage\FailedStorage; use OC\Files\Storage\Wrapper\Availability; +use OCA\Files_External\Lib\PersonalMount; +use OCA\Files_External\Lib\StorageConfig; use OCA\Files_External\Migration\StorageMigrator; +use OCA\Files_External\Service\UserGlobalStoragesService; +use OCA\Files_External\Service\UserStoragesService; +use OCP\Files\Config\IMountProvider; use OCP\Files\Storage; use OCP\Files\Storage\IStorageFactory; -use OCA\Files_External\Lib\PersonalMount; -use OCP\Files\Config\IMountProvider; -use OCP\IUser; -use OCA\Files_External\Service\UserStoragesService; -use OCA\Files_External\Service\UserGlobalStoragesService; -use OCA\Files_External\Lib\StorageConfig; -use OC\Files\Storage\FailedStorage; use OCP\Files\StorageNotAvailableException; +use OCP\IUser; /** * Make the old files_external config work with the new public mount config api diff --git a/apps/files_external/lib/Controller/AjaxController.php b/apps/files_external/lib/Controller/AjaxController.php index 6404fb9de51d271d3068663392dc1736dc801bf7..519018662a2087939f6099cc83313afb900867bf 100644 --- a/apps/files_external/lib/Controller/AjaxController.php +++ b/apps/files_external/lib/Controller/AjaxController.php @@ -29,11 +29,11 @@ namespace OCA\Files_External\Controller; use OCA\Files_External\Lib\Auth\Password\GlobalAuth; +use OCA\Files_External\Lib\Auth\PublicKey\RSA; use OCP\AppFramework\Controller; +use OCP\AppFramework\Http\JSONResponse; use OCP\IGroupManager; use OCP\IRequest; -use OCP\AppFramework\Http\JSONResponse; -use OCA\Files_External\Lib\Auth\PublicKey\RSA; use OCP\IUserSession; class AjaxController extends Controller { diff --git a/apps/files_external/lib/Controller/GlobalStoragesController.php b/apps/files_external/lib/Controller/GlobalStoragesController.php index 69056225f8aa4d971f7072de686dac12738c4a2f..a86cd8bd1447e7908918dbbd33ead175b6bb2e42 100644 --- a/apps/files_external/lib/Controller/GlobalStoragesController.php +++ b/apps/files_external/lib/Controller/GlobalStoragesController.php @@ -27,13 +27,13 @@ namespace OCA\Files_External\Controller; -use OCP\ILogger; -use \OCP\IRequest; -use \OCP\IL10N; -use \OCP\AppFramework\Http\DataResponse; -use \OCP\AppFramework\Http; -use OCA\Files_External\Service\GlobalStoragesService; use OCA\Files_External\NotFoundException; +use OCA\Files_External\Service\GlobalStoragesService; +use OCP\AppFramework\Http; +use OCP\AppFramework\Http\DataResponse; +use OCP\IL10N; +use OCP\ILogger; +use OCP\IRequest; /** * Global storages controller diff --git a/apps/files_external/lib/Controller/StoragesController.php b/apps/files_external/lib/Controller/StoragesController.php index dd2bf69a0a6352badb424b003dbf0b4846662490..d0efee750eab49a8e209744234a30490ff37ed1a 100644 --- a/apps/files_external/lib/Controller/StoragesController.php +++ b/apps/files_external/lib/Controller/StoragesController.php @@ -28,19 +28,19 @@ namespace OCA\Files_External\Controller; -use OCP\ILogger; -use \OCP\IRequest; -use \OCP\IL10N; -use \OCP\AppFramework\Http\DataResponse; -use \OCP\AppFramework\Controller; -use \OCP\AppFramework\Http; -use OCA\Files_External\Service\StoragesService; -use OCA\Files_External\NotFoundException; +use OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\Backend\Backend; +use OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException; use OCA\Files_External\Lib\StorageConfig; -use \OCA\Files_External\Lib\Backend\Backend; -use \OCA\Files_External\Lib\Auth\AuthMechanism; -use \OCP\Files\StorageNotAvailableException; -use \OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException; +use OCA\Files_External\NotFoundException; +use OCA\Files_External\Service\StoragesService; +use OCP\AppFramework\Controller; +use OCP\AppFramework\Http; +use OCP\AppFramework\Http\DataResponse; +use OCP\Files\StorageNotAvailableException; +use OCP\IL10N; +use OCP\ILogger; +use OCP\IRequest; /** * Base class for storages controllers @@ -341,4 +341,3 @@ abstract class StoragesController extends Controller { } } - diff --git a/apps/files_external/lib/Controller/UserGlobalStoragesController.php b/apps/files_external/lib/Controller/UserGlobalStoragesController.php index 55d079e9c6910b3650d4f6f831ccd23bc1462c96..4b1146ecb7ab5f7cbb271ed4e52aeac595bfb012 100644 --- a/apps/files_external/lib/Controller/UserGlobalStoragesController.php +++ b/apps/files_external/lib/Controller/UserGlobalStoragesController.php @@ -28,16 +28,16 @@ namespace OCA\Files_External\Controller; use OCA\Files_External\Lib\Auth\AuthMechanism; use OCA\Files_External\Lib\Auth\IUserProvided; use OCA\Files_External\Lib\Auth\Password\UserGlobalAuth; +use OCA\Files_External\Lib\Backend\Backend; use OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException; -use OCP\ILogger; -use \OCP\IRequest; -use \OCP\IL10N; -use \OCP\AppFramework\Http\DataResponse; -use \OCP\AppFramework\Http; -use OCA\Files_External\Service\UserGlobalStoragesService; -use OCA\Files_External\NotFoundException; use OCA\Files_External\Lib\StorageConfig; -use \OCA\Files_External\Lib\Backend\Backend; +use OCA\Files_External\NotFoundException; +use OCA\Files_External\Service\UserGlobalStoragesService; +use OCP\AppFramework\Http; +use OCP\AppFramework\Http\DataResponse; +use OCP\IL10N; +use OCP\ILogger; +use OCP\IRequest; use OCP\IUserSession; /** diff --git a/apps/files_external/lib/Controller/UserStoragesController.php b/apps/files_external/lib/Controller/UserStoragesController.php index 724bdd01463c29b008e1538c986b9e69aa66af41..c02264976818c303e0210c405908eccd104272ae 100644 --- a/apps/files_external/lib/Controller/UserStoragesController.php +++ b/apps/files_external/lib/Controller/UserStoragesController.php @@ -28,16 +28,16 @@ namespace OCA\Files_External\Controller; use OCA\Files_External\Lib\Auth\AuthMechanism; -use OCP\ILogger; -use \OCP\IUserSession; -use \OCP\IRequest; -use \OCP\IL10N; -use \OCP\AppFramework\Http\DataResponse; -use \OCP\AppFramework\Http; -use OCA\Files_External\Service\UserStoragesService; -use OCA\Files_External\NotFoundException; +use OCA\Files_External\Lib\Backend\Backend; use OCA\Files_External\Lib\StorageConfig; -use \OCA\Files_External\Lib\Backend\Backend; +use OCA\Files_External\NotFoundException; +use OCA\Files_External\Service\UserStoragesService; +use OCP\AppFramework\Http; +use OCP\AppFramework\Http\DataResponse; +use OCP\IL10N; +use OCP\ILogger; +use OCP\IRequest; +use OCP\IUserSession; /** * User storages controller diff --git a/apps/files_external/lib/Lib/Auth/AmazonS3/AccessKey.php b/apps/files_external/lib/Lib/Auth/AmazonS3/AccessKey.php index 7da3458e54d38e55666cd62e065b29fc7db66b6d..8f64fa1f2888378243d838ca19b50ce85b7b2b2d 100644 --- a/apps/files_external/lib/Lib/Auth/AmazonS3/AccessKey.php +++ b/apps/files_external/lib/Lib/Auth/AmazonS3/AccessKey.php @@ -22,9 +22,9 @@ namespace OCA\Files_External\Lib\Auth\AmazonS3; -use \OCP\IL10N; -use \OCA\Files_External\Lib\DefinitionParameter; -use \OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\DefinitionParameter; +use OCP\IL10N; /** * Amazon S3 access key authentication diff --git a/apps/files_external/lib/Lib/Auth/AuthMechanism.php b/apps/files_external/lib/Lib/Auth/AuthMechanism.php index 6b583e6daa01fa74da895227358e407b6cd06fee..3b8870033318b887f167ba6269a26c04118ea99e 100644 --- a/apps/files_external/lib/Lib/Auth/AuthMechanism.php +++ b/apps/files_external/lib/Lib/Auth/AuthMechanism.php @@ -24,11 +24,11 @@ namespace OCA\Files_External\Lib\Auth; -use \OCA\Files_External\Lib\StorageConfig; -use \OCA\Files_External\Lib\VisibilityTrait; -use \OCA\Files_External\Lib\IdentifierTrait; -use \OCA\Files_External\Lib\FrontendDefinitionTrait; -use \OCA\Files_External\Lib\StorageModifierTrait; +use OCA\Files_External\Lib\FrontendDefinitionTrait; +use OCA\Files_External\Lib\IdentifierTrait; +use OCA\Files_External\Lib\StorageConfig; +use OCA\Files_External\Lib\StorageModifierTrait; +use OCA\Files_External\Lib\VisibilityTrait; /** * Authentication mechanism diff --git a/apps/files_external/lib/Lib/Auth/Builtin.php b/apps/files_external/lib/Lib/Auth/Builtin.php index d39f459c6603499b4bf085bc6c22707c6bec5613..89f4a10d06c804922a833e0008fce412130e1cc5 100644 --- a/apps/files_external/lib/Lib/Auth/Builtin.php +++ b/apps/files_external/lib/Lib/Auth/Builtin.php @@ -22,7 +22,7 @@ namespace OCA\Files_External\Lib\Auth; -use \OCP\IL10N; +use OCP\IL10N; /** * Builtin authentication mechanism, for legacy backends diff --git a/apps/files_external/lib/Lib/Auth/NullMechanism.php b/apps/files_external/lib/Lib/Auth/NullMechanism.php index f0d741e01248f3bca5a057b7521705b1cbd4a69c..ff90481958aa86baa8e5704ab74d13def656d37f 100644 --- a/apps/files_external/lib/Lib/Auth/NullMechanism.php +++ b/apps/files_external/lib/Lib/Auth/NullMechanism.php @@ -22,7 +22,7 @@ namespace OCA\Files_External\Lib\Auth; -use \OCP\IL10N; +use OCP\IL10N; /** * Null authentication mechanism diff --git a/apps/files_external/lib/Lib/Auth/OAuth1/OAuth1.php b/apps/files_external/lib/Lib/Auth/OAuth1/OAuth1.php index 6a95710b3ef995d2cb95116c9c06e04a3393de8d..4f94192913cc7ffed2b9b6b7540eafac72a9fa42 100644 --- a/apps/files_external/lib/Lib/Auth/OAuth1/OAuth1.php +++ b/apps/files_external/lib/Lib/Auth/OAuth1/OAuth1.php @@ -22,9 +22,9 @@ namespace OCA\Files_External\Lib\Auth\OAuth1; -use \OCP\IL10N; -use \OCA\Files_External\Lib\DefinitionParameter; -use \OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\DefinitionParameter; +use OCP\IL10N; /** * OAuth1 authentication diff --git a/apps/files_external/lib/Lib/Auth/OAuth2/OAuth2.php b/apps/files_external/lib/Lib/Auth/OAuth2/OAuth2.php index a5317ae9fa6f725fbe7f465599f3acd6c571bf92..15b046b27655681c5ba38a352726f8a79400551e 100644 --- a/apps/files_external/lib/Lib/Auth/OAuth2/OAuth2.php +++ b/apps/files_external/lib/Lib/Auth/OAuth2/OAuth2.php @@ -22,9 +22,9 @@ namespace OCA\Files_External\Lib\Auth\OAuth2; -use \OCP\IL10N; -use \OCA\Files_External\Lib\DefinitionParameter; -use \OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\DefinitionParameter; +use OCP\IL10N; /** * OAuth2 authentication diff --git a/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV2.php b/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV2.php index f25918561f8de6ad428442268ca7dc5196c1bb1b..27ddb56086c0a4acd8cf02effae5c0733b48ffb2 100644 --- a/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV2.php +++ b/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV2.php @@ -22,9 +22,9 @@ namespace OCA\Files_External\Lib\Auth\OpenStack; -use \OCP\IL10N; -use \OCA\Files_External\Lib\DefinitionParameter; -use \OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\DefinitionParameter; +use OCP\IL10N; /** * OpenStack Keystone authentication diff --git a/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV3.php b/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV3.php index ead790e0ab5565ef152a5b954dd8f3a7b0fe0226..0206185fe36c43f23e5ba394be226a1d87c717be 100644 --- a/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV3.php +++ b/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV3.php @@ -22,9 +22,9 @@ declare(strict_types=1); namespace OCA\Files_External\Lib\Auth\OpenStack; -use \OCP\IL10N; -use \OCA\Files_External\Lib\DefinitionParameter; -use \OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\DefinitionParameter; +use OCP\IL10N; /** * OpenStack Keystone authentication diff --git a/apps/files_external/lib/Lib/Auth/OpenStack/Rackspace.php b/apps/files_external/lib/Lib/Auth/OpenStack/Rackspace.php index 14398c1ad820b7a3663501b93e695de79efaabba..25b6ad80bbe6b632699d221d96559ce8cb3a200f 100644 --- a/apps/files_external/lib/Lib/Auth/OpenStack/Rackspace.php +++ b/apps/files_external/lib/Lib/Auth/OpenStack/Rackspace.php @@ -22,9 +22,9 @@ namespace OCA\Files_External\Lib\Auth\OpenStack; -use \OCP\IL10N; -use \OCA\Files_External\Lib\DefinitionParameter; -use \OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\DefinitionParameter; +use OCP\IL10N; /** * Rackspace authentication diff --git a/apps/files_external/lib/Lib/Auth/Password/GlobalAuth.php b/apps/files_external/lib/Lib/Auth/Password/GlobalAuth.php index c1397ae8f8c3468c8c5365357312398f0c79fa0b..abdc5a12a60c1c181f009a1c876449b4dfaf3410 100644 --- a/apps/files_external/lib/Lib/Auth/Password/GlobalAuth.php +++ b/apps/files_external/lib/Lib/Auth/Password/GlobalAuth.php @@ -23,13 +23,13 @@ namespace OCA\Files_External\Lib\Auth\Password; +use OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException; +use OCA\Files_External\Lib\StorageConfig; use OCA\Files_External\Service\BackendService; use OCP\IL10N; use OCP\IUser; -use OCA\Files_External\Lib\Auth\AuthMechanism; -use OCA\Files_External\Lib\StorageConfig; use OCP\Security\ICredentialsManager; -use OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException; /** * Global Username and Password diff --git a/apps/files_external/lib/Lib/Auth/Password/LoginCredentials.php b/apps/files_external/lib/Lib/Auth/Password/LoginCredentials.php index dfdfd07298088b388ed9f6fd53dffde717e960e0..a8846f814d27606fcd2dab1d27e3b18846a7e9c2 100644 --- a/apps/files_external/lib/Lib/Auth/Password/LoginCredentials.php +++ b/apps/files_external/lib/Lib/Auth/Password/LoginCredentials.php @@ -22,13 +22,13 @@ namespace OCA\Files_External\Lib\Auth\Password; -use \OCP\IL10N; -use \OCP\IUser; -use \OCA\Files_External\Lib\Auth\AuthMechanism; -use \OCA\Files_External\Lib\StorageConfig; -use \OCP\ISession; -use \OCP\Security\ICredentialsManager; -use \OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException; +use OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException; +use OCA\Files_External\Lib\StorageConfig; +use OCP\IL10N; +use OCP\ISession; +use OCP\IUser; +use OCP\Security\ICredentialsManager; /** * Username and password from login credentials, saved in DB diff --git a/apps/files_external/lib/Lib/Auth/Password/Password.php b/apps/files_external/lib/Lib/Auth/Password/Password.php index 95a10ebb1d9830c57bc1488d1023f79a4485d9d9..ca1dfc2cb82441161722d7ddab01e35fbf633716 100644 --- a/apps/files_external/lib/Lib/Auth/Password/Password.php +++ b/apps/files_external/lib/Lib/Auth/Password/Password.php @@ -22,9 +22,9 @@ namespace OCA\Files_External\Lib\Auth\Password; -use \OCP\IL10N; -use \OCA\Files_External\Lib\DefinitionParameter; -use \OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\DefinitionParameter; +use OCP\IL10N; /** * Basic password authentication mechanism diff --git a/apps/files_external/lib/Lib/Auth/Password/UserGlobalAuth.php b/apps/files_external/lib/Lib/Auth/Password/UserGlobalAuth.php index 8ea9ad0f785ad34a8bfada86eb6fa266da1ca26c..aea2a44baa9b77f3cea879cb3931a12f7a749e58 100644 --- a/apps/files_external/lib/Lib/Auth/Password/UserGlobalAuth.php +++ b/apps/files_external/lib/Lib/Auth/Password/UserGlobalAuth.php @@ -21,13 +21,13 @@ namespace OCA\Files_External\Lib\Auth\Password; +use OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException; +use OCA\Files_External\Lib\StorageConfig; use OCA\Files_External\Service\BackendService; use OCP\IL10N; use OCP\IUser; -use OCA\Files_External\Lib\Auth\AuthMechanism; -use OCA\Files_External\Lib\StorageConfig; use OCP\Security\ICredentialsManager; -use OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException; /** * User provided Global Username and Password diff --git a/apps/files_external/lib/Lib/Auth/Password/UserProvided.php b/apps/files_external/lib/Lib/Auth/Password/UserProvided.php index 6bac2bd9c18f7fe7020faba13395a69b7a39c2dd..271f55d2c1cf05dd452354f84272ee1beb07658a 100644 --- a/apps/files_external/lib/Lib/Auth/Password/UserProvided.php +++ b/apps/files_external/lib/Lib/Auth/Password/UserProvided.php @@ -22,15 +22,15 @@ namespace OCA\Files_External\Lib\Auth\Password; +use OCA\Files_External\Lib\Auth\AuthMechanism; use OCA\Files_External\Lib\Auth\IUserProvided; use OCA\Files_External\Lib\DefinitionParameter; +use OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException; +use OCA\Files_External\Lib\StorageConfig; use OCA\Files_External\Service\BackendService; use OCP\IL10N; use OCP\IUser; -use OCA\Files_External\Lib\Auth\AuthMechanism; -use OCA\Files_External\Lib\StorageConfig; use OCP\Security\ICredentialsManager; -use OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException; /** * User provided Username and Password diff --git a/apps/files_external/lib/Lib/Auth/PublicKey/RSA.php b/apps/files_external/lib/Lib/Auth/PublicKey/RSA.php index 25c4a1767e9ec8c03b007e799e5cc8302850caf5..3f7168fea11976162adae1272cb90ab569bc2532 100644 --- a/apps/files_external/lib/Lib/Auth/PublicKey/RSA.php +++ b/apps/files_external/lib/Lib/Auth/PublicKey/RSA.php @@ -23,13 +23,13 @@ namespace OCA\Files_External\Lib\Auth\PublicKey; -use \OCP\IL10N; -use \OCA\Files_External\Lib\DefinitionParameter; -use \OCA\Files_External\Lib\Auth\AuthMechanism; -use \OCA\Files_External\Lib\StorageConfig; -use \OCP\IConfig; +use OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\DefinitionParameter; +use OCA\Files_External\Lib\StorageConfig; +use OCP\IConfig; +use OCP\IL10N; use OCP\IUser; -use \phpseclib\Crypt\RSA as RSACrypt; +use phpseclib\Crypt\RSA as RSACrypt; /** * RSA public key authentication diff --git a/apps/files_external/lib/Lib/Auth/PublicKey/RSAPrivateKey.php b/apps/files_external/lib/Lib/Auth/PublicKey/RSAPrivateKey.php index fecdbae9e4edeb4a96e0ddbe5e0e37582c1c9aad..91ef66d12a01b9e55a3e42aff7539a4aef59a000 100644 --- a/apps/files_external/lib/Lib/Auth/PublicKey/RSAPrivateKey.php +++ b/apps/files_external/lib/Lib/Auth/PublicKey/RSAPrivateKey.php @@ -20,15 +20,16 @@ * along with this program. If not, see . * */ + namespace OCA\Files_External\Lib\Auth\PublicKey; -use \OCP\IL10N; -use \OCA\Files_External\Lib\DefinitionParameter; -use \OCA\Files_External\Lib\Auth\AuthMechanism; -use \OCA\Files_External\Lib\StorageConfig; -use \OCP\IConfig; +use OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\DefinitionParameter; +use OCA\Files_External\Lib\StorageConfig; +use OCP\IConfig; +use OCP\IL10N; use OCP\IUser; -use \phpseclib\Crypt\RSA as RSACrypt; +use phpseclib\Crypt\RSA as RSACrypt; /** * RSA public key authentication diff --git a/apps/files_external/lib/Lib/Backend/AmazonS3.php b/apps/files_external/lib/Lib/Backend/AmazonS3.php index 509c6453dc9a29c60dea18d7384998d7192760cc..56c549c7dcba5fa43a4470058fc65d5910f0de34 100644 --- a/apps/files_external/lib/Lib/Backend/AmazonS3.php +++ b/apps/files_external/lib/Lib/Backend/AmazonS3.php @@ -22,10 +22,10 @@ namespace OCA\Files_External\Lib\Backend; -use \OCP\IL10N; -use \OCA\Files_External\Lib\DefinitionParameter; -use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill; -use \OCA\Files_External\Lib\Auth\AmazonS3\AccessKey; +use OCA\Files_External\Lib\Auth\AmazonS3\AccessKey; +use OCA\Files_External\Lib\DefinitionParameter; +use OCA\Files_External\Lib\LegacyDependencyCheckPolyfill; +use OCP\IL10N; class AmazonS3 extends Backend { diff --git a/apps/files_external/lib/Lib/Backend/Backend.php b/apps/files_external/lib/Lib/Backend/Backend.php index d00c1802b4b26d13809668162bb4693803b14f03..53e2e8558ab2be083c7ad5043a73a8c1e6f2b455 100644 --- a/apps/files_external/lib/Lib/Backend/Backend.php +++ b/apps/files_external/lib/Lib/Backend/Backend.php @@ -23,14 +23,14 @@ namespace OCA\Files_External\Lib\Backend; -use \OCA\Files_External\Lib\StorageConfig; -use \OCA\Files_External\Lib\VisibilityTrait; -use \OCA\Files_External\Lib\FrontendDefinitionTrait; -use \OCA\Files_External\Lib\PriorityTrait; -use \OCA\Files_External\Lib\DependencyTrait; -use \OCA\Files_External\Lib\StorageModifierTrait; -use \OCA\Files_External\Lib\IdentifierTrait; -use \OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\DependencyTrait; +use OCA\Files_External\Lib\FrontendDefinitionTrait; +use OCA\Files_External\Lib\IdentifierTrait; +use OCA\Files_External\Lib\PriorityTrait; +use OCA\Files_External\Lib\StorageConfig; +use OCA\Files_External\Lib\StorageModifierTrait; +use OCA\Files_External\Lib\VisibilityTrait; /** * Storage backend @@ -164,4 +164,3 @@ class Backend implements \JsonSerializable { } } - diff --git a/apps/files_external/lib/Lib/Backend/DAV.php b/apps/files_external/lib/Lib/Backend/DAV.php index 2863a33c2c0645a67fcfd519d1caf20b4a4f0b0d..34f1a91e0ea0e5c61eef75186cf7fbfcd37034f0 100644 --- a/apps/files_external/lib/Lib/Backend/DAV.php +++ b/apps/files_external/lib/Lib/Backend/DAV.php @@ -22,11 +22,11 @@ namespace OCA\Files_External\Lib\Backend; -use \OCP\IL10N; -use \OCA\Files_External\Lib\DefinitionParameter; -use \OCA\Files_External\Lib\Auth\AuthMechanism; -use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill; -use \OCA\Files_External\Lib\Auth\Password\Password; +use OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\Auth\Password\Password; +use OCA\Files_External\Lib\DefinitionParameter; +use OCA\Files_External\Lib\LegacyDependencyCheckPolyfill; +use OCP\IL10N; class DAV extends Backend { diff --git a/apps/files_external/lib/Lib/Backend/FTP.php b/apps/files_external/lib/Lib/Backend/FTP.php index d224d23128166203f69db7b445604a799e3fa1c8..3798deddf6e9a2d21fbe624a931e7be41a9542e7 100644 --- a/apps/files_external/lib/Lib/Backend/FTP.php +++ b/apps/files_external/lib/Lib/Backend/FTP.php @@ -22,11 +22,11 @@ namespace OCA\Files_External\Lib\Backend; -use \OCP\IL10N; -use \OCA\Files_External\Lib\DefinitionParameter; -use \OCA\Files_External\Lib\Auth\AuthMechanism; -use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill; -use \OCA\Files_External\Lib\Auth\Password\Password; +use OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\Auth\Password\Password; +use OCA\Files_External\Lib\DefinitionParameter; +use OCA\Files_External\Lib\LegacyDependencyCheckPolyfill; +use OCP\IL10N; class FTP extends Backend { diff --git a/apps/files_external/lib/Lib/Backend/InvalidBackend.php b/apps/files_external/lib/Lib/Backend/InvalidBackend.php index 7b3eb26aec9dc51c237e0cb3cdd7c22f638632a3..b8a14281544e796653ba106efacc0e2363aebe94 100644 --- a/apps/files_external/lib/Lib/Backend/InvalidBackend.php +++ b/apps/files_external/lib/Lib/Backend/InvalidBackend.php @@ -65,4 +65,3 @@ class InvalidBackend extends Backend { $storage->setBackendOption('exception', new \Exception('Unknown storage backend "' . $this->invalidId . '"', StorageNotAvailableException::STATUS_ERROR)); } } - diff --git a/apps/files_external/lib/Lib/Backend/LegacyBackend.php b/apps/files_external/lib/Lib/Backend/LegacyBackend.php index 3fc073b842d9907cd7247078bd98b1f6932933c1..4742108aced69e76b39c47ea402ecc0385474d49 100644 --- a/apps/files_external/lib/Lib/Backend/LegacyBackend.php +++ b/apps/files_external/lib/Lib/Backend/LegacyBackend.php @@ -22,10 +22,10 @@ namespace OCA\Files_External\Lib\Backend; -use \OCA\Files_External\Lib\DefinitionParameter; -use \OCA\Files_External\Lib\Auth\Builtin; -use \OCA\Files_External\Lib\MissingDependency; -use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill; +use OCA\Files_External\Lib\Auth\Builtin; +use OCA\Files_External\Lib\DefinitionParameter; +use OCA\Files_External\Lib\LegacyDependencyCheckPolyfill; +use OCA\Files_External\Lib\MissingDependency; /** * Legacy compatibility for OC_Mount_Config::registerBackend() diff --git a/apps/files_external/lib/Lib/Backend/Local.php b/apps/files_external/lib/Lib/Backend/Local.php index e0a2734d7ba3d56d1277bbb348daa96421729993..1a406645a2ad8c17c4cd6bcbbf03d5fe5483b028 100644 --- a/apps/files_external/lib/Lib/Backend/Local.php +++ b/apps/files_external/lib/Lib/Backend/Local.php @@ -22,11 +22,11 @@ namespace OCA\Files_External\Lib\Backend; -use \OCP\IL10N; -use \OCA\Files_External\Lib\DefinitionParameter; -use \OCA\Files_External\Lib\Auth\AuthMechanism; -use \OCA\Files_External\Service\BackendService; -use \OCA\Files_External\Lib\Auth\NullMechanism; +use OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\Auth\NullMechanism; +use OCA\Files_External\Lib\DefinitionParameter; +use OCA\Files_External\Service\BackendService; +use OCP\IL10N; class Local extends Backend { diff --git a/apps/files_external/lib/Lib/Backend/OwnCloud.php b/apps/files_external/lib/Lib/Backend/OwnCloud.php index cbf28be2bf223441f3c9bc00bfdf45f852be062d..8ca176db502882dc6bcbe0fbbe468b1a68942fd2 100644 --- a/apps/files_external/lib/Lib/Backend/OwnCloud.php +++ b/apps/files_external/lib/Lib/Backend/OwnCloud.php @@ -23,10 +23,10 @@ namespace OCA\Files_External\Lib\Backend; -use \OCP\IL10N; -use \OCA\Files_External\Lib\DefinitionParameter; -use \OCA\Files_External\Lib\Auth\AuthMechanism; -use \OCA\Files_External\Lib\Auth\Password\Password; +use OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\Auth\Password\Password; +use OCA\Files_External\Lib\DefinitionParameter; +use OCP\IL10N; class OwnCloud extends Backend { diff --git a/apps/files_external/lib/Lib/Backend/SFTP.php b/apps/files_external/lib/Lib/Backend/SFTP.php index 561e0496083e6ecf95d7b68137317772f9b13df3..e15b3c26948fb253887ec2030dbb35224c24387f 100644 --- a/apps/files_external/lib/Lib/Backend/SFTP.php +++ b/apps/files_external/lib/Lib/Backend/SFTP.php @@ -22,10 +22,10 @@ namespace OCA\Files_External\Lib\Backend; -use \OCP\IL10N; -use \OCA\Files_External\Lib\DefinitionParameter; -use \OCA\Files_External\Lib\Auth\AuthMechanism; -use \OCA\Files_External\Lib\Auth\Password\Password; +use OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\Auth\Password\Password; +use OCA\Files_External\Lib\DefinitionParameter; +use OCP\IL10N; class SFTP extends Backend { diff --git a/apps/files_external/lib/Lib/Backend/SFTP_Key.php b/apps/files_external/lib/Lib/Backend/SFTP_Key.php index 73d3acd3565a02339aca7e35e2c73675aad787cd..e7f386b4b7f530d4a25308d18f3500982a28efcd 100644 --- a/apps/files_external/lib/Lib/Backend/SFTP_Key.php +++ b/apps/files_external/lib/Lib/Backend/SFTP_Key.php @@ -22,10 +22,10 @@ namespace OCA\Files_External\Lib\Backend; -use \OCP\IL10N; -use \OCA\Files_External\Lib\DefinitionParameter; -use \OCA\Files_External\Lib\Auth\AuthMechanism; -use \OCA\Files_External\Lib\Auth\PublicKey\RSA; +use OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\Auth\PublicKey\RSA; +use OCA\Files_External\Lib\DefinitionParameter; +use OCP\IL10N; class SFTP_Key extends Backend { diff --git a/apps/files_external/lib/Lib/Backend/SMB.php b/apps/files_external/lib/Lib/Backend/SMB.php index e9bb5665606e0d259e2db2d7ad354d0911d36050..83835ff5f613c16fd2c39bbd14eb4614242cb66f 100644 --- a/apps/files_external/lib/Lib/Backend/SMB.php +++ b/apps/files_external/lib/Lib/Backend/SMB.php @@ -24,13 +24,13 @@ namespace OCA\Files_External\Lib\Backend; use Icewind\SMB\BasicAuth; use Icewind\SMB\KerberosAuth; -use \OCP\IL10N; -use \OCA\Files_External\Lib\DefinitionParameter; -use \OCA\Files_External\Lib\Auth\AuthMechanism; -use \OCA\Files_External\Lib\StorageConfig; -use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill; +use OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\Auth\Password\Password; +use OCA\Files_External\Lib\DefinitionParameter; +use OCA\Files_External\Lib\LegacyDependencyCheckPolyfill; +use OCA\Files_External\Lib\StorageConfig; -use \OCA\Files_External\Lib\Auth\Password\Password; +use OCP\IL10N; use OCP\IUser; class SMB extends Backend { diff --git a/apps/files_external/lib/Lib/Backend/SMB_OC.php b/apps/files_external/lib/Lib/Backend/SMB_OC.php index 074c729b42968dfab1a30b43d26da3df7fe8d1a6..872377ab39690f7086b3aa806a9f0c0c6dbf2542 100644 --- a/apps/files_external/lib/Lib/Backend/SMB_OC.php +++ b/apps/files_external/lib/Lib/Backend/SMB_OC.php @@ -22,13 +22,13 @@ namespace OCA\Files_External\Lib\Backend; -use \OCP\IL10N; -use \OCA\Files_External\Lib\DefinitionParameter; -use \OCA\Files_External\Lib\Auth\AuthMechanism; -use \OCA\Files_External\Service\BackendService; -use \OCA\Files_External\Lib\Auth\Password\SessionCredentials; -use \OCA\Files_External\Lib\StorageConfig; -use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill; +use OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\Auth\Password\SessionCredentials; +use OCA\Files_External\Lib\DefinitionParameter; +use OCA\Files_External\Lib\LegacyDependencyCheckPolyfill; +use OCA\Files_External\Lib\StorageConfig; +use OCA\Files_External\Service\BackendService; +use OCP\IL10N; use OCP\IUser; /** diff --git a/apps/files_external/lib/Lib/Backend/Swift.php b/apps/files_external/lib/Lib/Backend/Swift.php index 72fc236bcdc3623310a50aa68bb947b7b70147fa..ce38ebde9fb1e76a93adc4a6ad21b7ee88c8f6fc 100644 --- a/apps/files_external/lib/Lib/Backend/Swift.php +++ b/apps/files_external/lib/Lib/Backend/Swift.php @@ -22,13 +22,13 @@ namespace OCA\Files_External\Lib\Backend; -use \OCP\IL10N; -use \OCA\Files_External\Lib\DefinitionParameter; -use \OCA\Files_External\Lib\Auth\AuthMechanism; -use \OCA\Files_External\Service\BackendService; -use \OCA\Files_External\Lib\Auth\OpenStack\OpenStackV2; -use \OCA\Files_External\Lib\Auth\OpenStack\Rackspace; -use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill; +use OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\Auth\OpenStack\OpenStackV2; +use OCA\Files_External\Lib\Auth\OpenStack\Rackspace; +use OCA\Files_External\Lib\DefinitionParameter; +use OCA\Files_External\Lib\LegacyDependencyCheckPolyfill; +use OCA\Files_External\Service\BackendService; +use OCP\IL10N; class Swift extends Backend { diff --git a/apps/files_external/lib/Lib/Config/IAuthMechanismProvider.php b/apps/files_external/lib/Lib/Config/IAuthMechanismProvider.php index 251b04eada025e558ca1d7b7761ba8bad49e93ea..bc6973353b1bf9113672ad62a3939e9c7189e79b 100644 --- a/apps/files_external/lib/Lib/Config/IAuthMechanismProvider.php +++ b/apps/files_external/lib/Lib/Config/IAuthMechanismProvider.php @@ -22,7 +22,7 @@ namespace OCA\Files_External\Lib\Config; -use \OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\Auth\AuthMechanism; /** * Provider of external storage auth mechanisms diff --git a/apps/files_external/lib/Lib/Config/IBackendProvider.php b/apps/files_external/lib/Lib/Config/IBackendProvider.php index 178e5e5d2b64ad8d9ec9867e4586ca3fe24748dc..2f20de2e6fd52852332b8c939c3fed36e7c82bde 100644 --- a/apps/files_external/lib/Lib/Config/IBackendProvider.php +++ b/apps/files_external/lib/Lib/Config/IBackendProvider.php @@ -22,7 +22,7 @@ namespace OCA\Files_External\Lib\Config; -use \OCA\Files_External\Lib\Backend\Backend; +use OCA\Files_External\Lib\Backend\Backend; /** * Provider of external storage backends diff --git a/apps/files_external/lib/Lib/DependencyTrait.php b/apps/files_external/lib/Lib/DependencyTrait.php index 1d99fa9c1626b76372bb51872be44e21f6ab0651..6b31b66027ce04b8da85069b8740163f949abf93 100644 --- a/apps/files_external/lib/Lib/DependencyTrait.php +++ b/apps/files_external/lib/Lib/DependencyTrait.php @@ -37,4 +37,3 @@ trait DependencyTrait { } } - diff --git a/apps/files_external/lib/Lib/InsufficientDataForMeaningfulAnswerException.php b/apps/files_external/lib/Lib/InsufficientDataForMeaningfulAnswerException.php index dc0799042e5f7420797b8433d2921814620cc803..76fb480dd14ee14a823b6a08298faed5f97a8cdc 100644 --- a/apps/files_external/lib/Lib/InsufficientDataForMeaningfulAnswerException.php +++ b/apps/files_external/lib/Lib/InsufficientDataForMeaningfulAnswerException.php @@ -24,7 +24,7 @@ namespace OCA\Files_External\Lib; -use \OCP\Files\StorageNotAvailableException; +use OCP\Files\StorageNotAvailableException; /** * Authentication mechanism or backend has insufficient data diff --git a/apps/files_external/lib/Lib/LegacyDependencyCheckPolyfill.php b/apps/files_external/lib/Lib/LegacyDependencyCheckPolyfill.php index 07fe99f94061c0e9ddcb70fe4181c46b9c00dd85..6a29f3b605aa7b2230869cf9e03fdc5fc9898a17 100644 --- a/apps/files_external/lib/Lib/LegacyDependencyCheckPolyfill.php +++ b/apps/files_external/lib/Lib/LegacyDependencyCheckPolyfill.php @@ -67,4 +67,3 @@ trait LegacyDependencyCheckPolyfill { } } - diff --git a/apps/files_external/lib/Lib/PriorityTrait.php b/apps/files_external/lib/Lib/PriorityTrait.php index d060dbe2f9da0d329c49f8fb6861894335bbd18a..156d455a2deb90879ca3cc04fe7b45a4c9b5cd98 100644 --- a/apps/files_external/lib/Lib/PriorityTrait.php +++ b/apps/files_external/lib/Lib/PriorityTrait.php @@ -22,7 +22,7 @@ namespace OCA\Files_External\Lib; -use \OCA\Files_External\Service\BackendService; +use OCA\Files_External\Service\BackendService; /** * Trait to implement priority mechanics for a configuration class @@ -58,4 +58,3 @@ trait PriorityTrait { } } - diff --git a/apps/files_external/lib/Lib/SessionStorageWrapper.php b/apps/files_external/lib/Lib/SessionStorageWrapper.php index 37cd0eae9ea6d5ac16a4f2c3abdcb4aed8f83747..5c66e3cf9782f74571afa3db94ffe6e2e3b65ebc 100644 --- a/apps/files_external/lib/Lib/SessionStorageWrapper.php +++ b/apps/files_external/lib/Lib/SessionStorageWrapper.php @@ -22,8 +22,8 @@ namespace OCA\Files_External\Lib; -use \OC\Files\Storage\Wrapper\PermissionsMask; -use \OCP\Constants; +use OC\Files\Storage\Wrapper\PermissionsMask; +use OCP\Constants; /** * Wrap Storage in PermissionsMask for session ephemeral use @@ -40,4 +40,3 @@ class SessionStorageWrapper extends PermissionsMask { } } - diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php index b5e5d12472d612567d6a55387d3f72cf75cb05fe..a707031121ea6109881478d96065089d53831c22 100644 --- a/apps/files_external/lib/Lib/Storage/AmazonS3.php +++ b/apps/files_external/lib/Lib/Storage/AmazonS3.php @@ -36,8 +36,8 @@ namespace OCA\Files_External\Lib\Storage; use Aws\Result; -use Aws\S3\S3Client; use Aws\S3\Exception\S3Exception; +use Aws\S3\S3Client; use Icewind\Streams\CallbackWrapper; use Icewind\Streams\IteratorDirectory; use OC\Cache\CappedMemoryCache; diff --git a/apps/files_external/lib/Lib/Storage/SFTP.php b/apps/files_external/lib/Lib/Storage/SFTP.php index 9340b08fefcab706c89c4e3e3616b60b698161e5..37b86395e234c59fdf3cc975e68484aa85c6032e 100644 --- a/apps/files_external/lib/Lib/Storage/SFTP.php +++ b/apps/files_external/lib/Lib/Storage/SFTP.php @@ -32,6 +32,7 @@ * along with this program. If not, see * */ + namespace OCA\Files_External\Lib\Storage; use Icewind\Streams\IteratorDirectory; use Icewind\Streams\RetryWrapper; diff --git a/apps/files_external/lib/Lib/StorageConfig.php b/apps/files_external/lib/Lib/StorageConfig.php index 093e6840a1918d2ab16e94fa1ec965bcd68dda50..fc2d6f9faa30729f423bed41751f8330b0ee0198 100644 --- a/apps/files_external/lib/Lib/StorageConfig.php +++ b/apps/files_external/lib/Lib/StorageConfig.php @@ -27,9 +27,9 @@ namespace OCA\Files_External\Lib; +use OCA\Files_External\Lib\Auth\AuthMechanism; use OCA\Files_External\Lib\Auth\IUserProvided; -use \OCA\Files_External\Lib\Backend\Backend; -use \OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\Backend\Backend; /** * External storage configuration diff --git a/apps/files_external/lib/Lib/StorageModifierTrait.php b/apps/files_external/lib/Lib/StorageModifierTrait.php index a0f5c53382e965944440edd204b1250540d85e11..00430fae076f959bdb6ff44fac9e03bdca0d90af 100644 --- a/apps/files_external/lib/Lib/StorageModifierTrait.php +++ b/apps/files_external/lib/Lib/StorageModifierTrait.php @@ -22,9 +22,9 @@ namespace OCA\Files_External\Lib; -use \OCP\IUser; -use \OCP\Files\Storage; -use \OCP\Files\StorageNotAvailableException; +use OCP\Files\Storage; +use OCP\Files\StorageNotAvailableException; +use OCP\IUser; /** * Trait for objects that can modify StorageConfigs and wrap Storages @@ -65,4 +65,3 @@ trait StorageModifierTrait { } } - diff --git a/apps/files_external/lib/Lib/VisibilityTrait.php b/apps/files_external/lib/Lib/VisibilityTrait.php index 7d886de04ddad9adefd9ef195a3e8ab9238e9cfe..1442d85b2d31ec80bdbc4671b1177d4bea5f7ca2 100644 --- a/apps/files_external/lib/Lib/VisibilityTrait.php +++ b/apps/files_external/lib/Lib/VisibilityTrait.php @@ -22,7 +22,7 @@ namespace OCA\Files_External\Lib; -use \OCA\Files_External\Service\BackendService; +use OCA\Files_External\Service\BackendService; /** * Trait to implement visibility mechanics for a configuration class diff --git a/apps/files_external/lib/Service/BackendService.php b/apps/files_external/lib/Service/BackendService.php index 59af54f79e433a2984785171b1a7497da61a5724..167b1017b02e1a5db4f873fe9b2f3d2369a410ea 100644 --- a/apps/files_external/lib/Service/BackendService.php +++ b/apps/files_external/lib/Service/BackendService.php @@ -25,12 +25,12 @@ namespace OCA\Files_External\Service; use OCA\Files_External\Config\IConfigHandler; -use \OCP\IConfig; +use OCA\Files_External\Lib\Auth\AuthMechanism; -use \OCA\Files_External\Lib\Backend\Backend; -use \OCA\Files_External\Lib\Auth\AuthMechanism; -use \OCA\Files_External\Lib\Config\IBackendProvider; -use \OCA\Files_External\Lib\Config\IAuthMechanismProvider; +use OCA\Files_External\Lib\Backend\Backend; +use OCA\Files_External\Lib\Config\IAuthMechanismProvider; +use OCA\Files_External\Lib\Config\IBackendProvider; +use OCP\IConfig; /** * Service class to manage backend definitions diff --git a/apps/files_external/lib/Service/GlobalStoragesService.php b/apps/files_external/lib/Service/GlobalStoragesService.php index d0431ed11a6504aaf6661dc0b6235b1a2ac491eb..3d1e717d84fb9cb8b9c52dab8caa1e40bd6bdba2 100644 --- a/apps/files_external/lib/Service/GlobalStoragesService.php +++ b/apps/files_external/lib/Service/GlobalStoragesService.php @@ -28,7 +28,7 @@ namespace OCA\Files_External\Service; -use \OC\Files\Filesystem; +use OC\Files\Filesystem; use OCA\Files_External\Lib\StorageConfig; /** diff --git a/apps/files_external/lib/Service/StoragesService.php b/apps/files_external/lib/Service/StoragesService.php index 79eb03cea2197b75e42373b38545921d3d6a73ad..9656e99c5cb1dbf4bf8c31ca6f593771cdc0c7cd 100644 --- a/apps/files_external/lib/Service/StoragesService.php +++ b/apps/files_external/lib/Service/StoragesService.php @@ -28,15 +28,15 @@ namespace OCA\Files_External\Service; -use \OC\Files\Filesystem; +use OC\Files\Filesystem; +use OCA\Files_External\Lib\Auth\AuthMechanism; use OCA\Files_External\Lib\Auth\InvalidAuth; +use OCA\Files_External\Lib\Backend\Backend; use OCA\Files_External\Lib\Backend\InvalidBackend; use OCA\Files_External\Lib\StorageConfig; use OCA\Files_External\NotFoundException; -use \OCA\Files_External\Lib\Backend\Backend; -use \OCA\Files_External\Lib\Auth\AuthMechanism; use OCP\Files\Config\IUserMountCache; -use \OCP\Files\StorageNotAvailableException; +use OCP\Files\StorageNotAvailableException; use OCP\ILogger; /** diff --git a/apps/files_external/lib/Service/UserGlobalStoragesService.php b/apps/files_external/lib/Service/UserGlobalStoragesService.php index 355401bb84fc2f92d303da0c6fd7fffbd10ceb3d..0a34d6c3485de6f9ea03921c8db5cfbda93c50db 100644 --- a/apps/files_external/lib/Service/UserGlobalStoragesService.php +++ b/apps/files_external/lib/Service/UserGlobalStoragesService.php @@ -23,10 +23,10 @@ namespace OCA\Files_External\Service; +use OCA\Files_External\Lib\StorageConfig; use OCP\Files\Config\IUserMountCache; -use \OCP\IUserSession; -use \OCP\IGroupManager; -use \OCA\Files_External\Lib\StorageConfig; +use OCP\IGroupManager; +use OCP\IUserSession; /** * Service class to read global storages applicable to the user diff --git a/apps/files_external/lib/Service/UserStoragesService.php b/apps/files_external/lib/Service/UserStoragesService.php index 0c422b2b85e89d5ed899bec349c68fc339ac2a23..4d9541cb4165505cb589b46256dde8df2c1654c8 100644 --- a/apps/files_external/lib/Service/UserStoragesService.php +++ b/apps/files_external/lib/Service/UserStoragesService.php @@ -26,13 +26,13 @@ namespace OCA\Files_External\Service; -use OCP\Files\Config\IUserMountCache; -use \OCP\IUserSession; -use \OC\Files\Filesystem; - +use OC\Files\Filesystem; use OCA\Files_External\Lib\StorageConfig; use OCA\Files_External\NotFoundException; +use OCP\Files\Config\IUserMountCache; +use OCP\IUserSession; + /** * Service class to manage user external storages * (aka personal storages) diff --git a/apps/files_external/lib/Service/UserTrait.php b/apps/files_external/lib/Service/UserTrait.php index 5c6464cf7199bf16bdeaf46d797637a885556509..5bf7b82d4dd32991e5700a5aff8d679c403a51b4 100644 --- a/apps/files_external/lib/Service/UserTrait.php +++ b/apps/files_external/lib/Service/UserTrait.php @@ -22,8 +22,8 @@ namespace OCA\Files_External\Service; -use \OCP\IUserSession; -use \OCP\IUser; +use OCP\IUser; +use OCP\IUserSession; /** * Trait for getting user information in a service @@ -72,4 +72,3 @@ trait UserTrait { return $this; } } - diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 85bbbeb57d9a6b5af5503db7c4063e1007e8cc52..1162b50929f5f2410c7e6a6a6fadc1eee33031ef 100644 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -36,21 +36,21 @@ * */ +use OCA\Files_External\AppInfo\Application; use OCA\Files_External\Config\IConfigHandler; +use OCA\Files_External\Config\UserContext; use OCA\Files_External\Config\UserPlaceholderHandler; -use phpseclib\Crypt\AES; -use \OCA\Files_External\AppInfo\Application; -use \OCA\Files_External\Lib\Backend\LegacyBackend; -use \OCA\Files_External\Lib\StorageConfig; -use \OCA\Files_External\Lib\Backend\Backend; -use \OCP\Files\StorageNotAvailableException; -use OCA\Files_External\Service\BackendService; use OCA\Files_External\Lib\Auth\Builtin; -use OCA\Files_External\Service\UserGlobalStoragesService; -use OCP\IUserManager; +use OCA\Files_External\Lib\Backend\Backend; +use OCA\Files_External\Lib\Backend\LegacyBackend; +use OCA\Files_External\Lib\StorageConfig; +use OCA\Files_External\Service\BackendService; use OCA\Files_External\Service\GlobalStoragesService; +use OCA\Files_External\Service\UserGlobalStoragesService; use OCA\Files_External\Service\UserStoragesService; -use OCA\Files_External\Config\UserContext; +use OCP\Files\StorageNotAvailableException; +use OCP\IUserManager; +use phpseclib\Crypt\AES; /** * Class to configure mount.json globally and for users diff --git a/apps/files_external/tests/Backend/BackendTest.php b/apps/files_external/tests/Backend/BackendTest.php index bc8aa6a0aee14a1ff5e18b18f8e111b81ba34912..fc109722b74d8316b03a3959012d1fcc0db9cef6 100644 --- a/apps/files_external/tests/Backend/BackendTest.php +++ b/apps/files_external/tests/Backend/BackendTest.php @@ -23,7 +23,7 @@ namespace OCA\Files_External\Tests\Backend; -use \OCA\Files_External\Lib\Backend\Backend; +use OCA\Files_External\Lib\Backend\Backend; use OCA\Files_External\Lib\StorageConfig; class BackendTest extends \Test\TestCase { diff --git a/apps/files_external/tests/Backend/LegacyBackendTest.php b/apps/files_external/tests/Backend/LegacyBackendTest.php index c1d54d1ca34c1db80a5b9839fa11fc62b293eaf8..8a53de43e64f37b948473c0ffdcdcb0f4d2ad4c5 100644 --- a/apps/files_external/tests/Backend/LegacyBackendTest.php +++ b/apps/files_external/tests/Backend/LegacyBackendTest.php @@ -22,9 +22,9 @@ namespace OCA\Files_External\Tests\Backend; -use \OCA\Files_External\Lib\Backend\LegacyBackend; -use \OCA\Files_External\Lib\DefinitionParameter; -use \OCA\Files_External\Lib\MissingDependency; +use OCA\Files_External\Lib\Backend\LegacyBackend; +use OCA\Files_External\Lib\DefinitionParameter; +use OCA\Files_External\Lib\MissingDependency; class LegacyBackendTest extends \Test\TestCase { diff --git a/apps/files_external/tests/Controller/AjaxControllerTest.php b/apps/files_external/tests/Controller/AjaxControllerTest.php index 1153036c41414d0bd545614465af8cded5d58b13..f18ee8323b3bfd05b5f9764b3f71cbdc2f162c1f 100644 --- a/apps/files_external/tests/Controller/AjaxControllerTest.php +++ b/apps/files_external/tests/Controller/AjaxControllerTest.php @@ -21,6 +21,7 @@ * along with this program. If not, see . * */ + namespace OCA\Files_External\Tests\Controller; use OCA\Files_External\Controller\AjaxController; diff --git a/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php b/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php index 2e0245e76fa5f30f99b0c4502aa87dfcc092e82b..c3a684f2e98c241b8e2f7c8146e0a8bfe8794f3d 100644 --- a/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php +++ b/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php @@ -23,11 +23,12 @@ * along with this program. If not, see * */ + namespace OCA\Files_External\Tests\Controller; use OCA\Files_External\Controller\GlobalStoragesController; -use \OCP\AppFramework\Http; -use \OCA\Files_External\Service\BackendService; +use OCA\Files_External\Service\BackendService; +use OCP\AppFramework\Http; use OCP\IL10N; use OCP\ILogger; use OCP\IRequest; diff --git a/apps/files_external/tests/Controller/StoragesControllerTest.php b/apps/files_external/tests/Controller/StoragesControllerTest.php index ad0a34014129034e339f77aa3930d510ba6107d5..0340057809dc962c0f21440b708b0d202c8dfe04 100644 --- a/apps/files_external/tests/Controller/StoragesControllerTest.php +++ b/apps/files_external/tests/Controller/StoragesControllerTest.php @@ -22,16 +22,17 @@ * along with this program. If not, see * */ + namespace OCA\Files_External\Tests\Controller; +use OCA\Files_External\Controller\GlobalStoragesController; use OCA\Files_External\Lib\Auth\AuthMechanism; use OCA\Files_External\Lib\Backend\Backend; -use \OCP\AppFramework\Http; -use \OCA\Files_External\Controller\GlobalStoragesController; -use \OCA\Files_External\Service\GlobalStoragesService; use OCA\Files_External\Lib\StorageConfig; use OCA\Files_External\NotFoundException; +use OCA\Files_External\Service\GlobalStoragesService; +use OCP\AppFramework\Http; abstract class StoragesControllerTest extends \Test\TestCase { diff --git a/apps/files_external/tests/Controller/UserStoragesControllerTest.php b/apps/files_external/tests/Controller/UserStoragesControllerTest.php index 817c5b4e5c39f4bffb6b82b6976e3ccdd76d8279..067fd45972cf6e58215168b430fba140888ba8f0 100644 --- a/apps/files_external/tests/Controller/UserStoragesControllerTest.php +++ b/apps/files_external/tests/Controller/UserStoragesControllerTest.php @@ -23,12 +23,13 @@ * along with this program. If not, see * */ + namespace OCA\Files_External\Tests\Controller; -use \OCA\Files_External\Controller\UserStoragesController; +use OCA\Files_External\Controller\UserStoragesController; use OCA\Files_External\Lib\StorageConfig; -use \OCP\AppFramework\Http; -use \OCA\Files_External\Service\BackendService; +use OCA\Files_External\Service\BackendService; +use OCP\AppFramework\Http; use OCP\IL10N; use OCP\ILogger; use OCP\IRequest; diff --git a/apps/files_external/tests/DefinitionParameterTest.php b/apps/files_external/tests/DefinitionParameterTest.php index d60d9677dbe96d223a7d067f9269bc7922183742..0d30359ff7d9c388957bca9d964dddbfbb7c291c 100644 --- a/apps/files_external/tests/DefinitionParameterTest.php +++ b/apps/files_external/tests/DefinitionParameterTest.php @@ -23,7 +23,7 @@ namespace OCA\Files_External\Tests; -use \OCA\Files_External\Lib\DefinitionParameter as Param; +use OCA\Files_External\Lib\DefinitionParameter as Param; class DefinitionParameterTest extends \Test\TestCase { diff --git a/apps/files_external/tests/LegacyDependencyCheckPolyfillTest.php b/apps/files_external/tests/LegacyDependencyCheckPolyfillTest.php index 89c9fc76faeada2c4690dce91af60d9504d7574b..0fa9541895841cf30d0329cf58845b86ae930061 100644 --- a/apps/files_external/tests/LegacyDependencyCheckPolyfillTest.php +++ b/apps/files_external/tests/LegacyDependencyCheckPolyfillTest.php @@ -22,7 +22,7 @@ namespace OCA\Files_External\Tests; -use \OCA\Files_External\Lib\MissingDependency; +use OCA\Files_External\Lib\MissingDependency; class LegacyDependencyCheckPolyfillTest extends \Test\TestCase { diff --git a/apps/files_external/tests/Service/BackendServiceTest.php b/apps/files_external/tests/Service/BackendServiceTest.php index 71990553e8dd5041b1ddb3bb8f61e019177bcfa7..707ee899419c0d8c9ec95291383262f7c5d49332 100644 --- a/apps/files_external/tests/Service/BackendServiceTest.php +++ b/apps/files_external/tests/Service/BackendServiceTest.php @@ -21,6 +21,7 @@ * along with this program. If not, see * */ + namespace OCA\Files_External\Tests\Service; use OCA\Files_External\Config\IConfigHandler; @@ -263,4 +264,3 @@ class BackendServiceTest extends \Test\TestCase { } } - diff --git a/apps/files_external/tests/Service/GlobalStoragesServiceTest.php b/apps/files_external/tests/Service/GlobalStoragesServiceTest.php index ba62feb7f96b6cd0025a12c64787761b12514d88..2760374e59d809c783d223c0b838f9a9fd899ce2 100644 --- a/apps/files_external/tests/Service/GlobalStoragesServiceTest.php +++ b/apps/files_external/tests/Service/GlobalStoragesServiceTest.php @@ -22,11 +22,12 @@ * along with this program. If not, see * */ + namespace OCA\Files_External\Tests\Service; -use \OC\Files\Filesystem; +use OC\Files\Filesystem; -use \OCA\Files_External\Service\GlobalStoragesService; +use OCA\Files_External\Service\GlobalStoragesService; /** * @group DB diff --git a/apps/files_external/tests/Service/StoragesServiceTest.php b/apps/files_external/tests/Service/StoragesServiceTest.php index 44fa6c31b7dee99370b2d8b5a16cad22ef70d372..ef0f1852d91eb5fda2d796b67982b7fd46d83264 100644 --- a/apps/files_external/tests/Service/StoragesServiceTest.php +++ b/apps/files_external/tests/Service/StoragesServiceTest.php @@ -27,14 +27,14 @@ namespace OCA\Files_External\Tests\Service; -use \OC\Files\Filesystem; +use OC\Files\Filesystem; use OCA\Files_External\Lib\Auth\AuthMechanism; use OCA\Files_External\Lib\Auth\InvalidAuth; use OCA\Files_External\Lib\Backend\Backend; use OCA\Files_External\Lib\Backend\InvalidBackend; -use OCA\Files_External\NotFoundException; use OCA\Files_External\Lib\StorageConfig; +use OCA\Files_External\NotFoundException; use OCA\Files_External\Service\BackendService; use OCA\Files_External\Service\DBConfigService; use OCA\Files_External\Service\StoragesService; diff --git a/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php b/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php index 88928d1a21737917abf97a241059b8d90273b36c..3a6d22f2ad41e1c6ab85de929f0ba08e276473c2 100644 --- a/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php +++ b/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php @@ -23,6 +23,7 @@ * along with this program. If not, see * */ + namespace OCA\Files_External\Tests\Service; use OCA\Files_External\Lib\StorageConfig; diff --git a/apps/files_external/tests/Service/UserStoragesServiceTest.php b/apps/files_external/tests/Service/UserStoragesServiceTest.php index 2d90ec3a488f94367b3ef98edbc8c42dd5928e52..ea6346151bfa2d116c96eef32e8b3f76f8259579 100644 --- a/apps/files_external/tests/Service/UserStoragesServiceTest.php +++ b/apps/files_external/tests/Service/UserStoragesServiceTest.php @@ -23,14 +23,15 @@ * along with this program. If not, see * */ + namespace OCA\Files_External\Tests\Service; -use \OC\Files\Filesystem; +use OC\Files\Filesystem; +use OCA\Files_External\Lib\StorageConfig; use OCA\Files_External\Service\GlobalStoragesService; use OCA\Files_External\Service\StoragesService; use OCA\Files_External\Service\UserStoragesService; -use OCA\Files_External\Lib\StorageConfig; use OCP\IUserSession; use Test\Traits\UserTrait; diff --git a/apps/files_external/tests/Storage/Amazons3Test.php b/apps/files_external/tests/Storage/Amazons3Test.php index ce616ca175f644879f6eaae2024ee5b9cfb8d7f3..83552ca21a37fbe195ce0790c7badd48c7b6ea28 100644 --- a/apps/files_external/tests/Storage/Amazons3Test.php +++ b/apps/files_external/tests/Storage/Amazons3Test.php @@ -27,7 +27,7 @@ namespace OCA\Files_External\Tests\Storage; -use \OCA\Files_External\Lib\Storage\AmazonS3; +use OCA\Files_External\Lib\Storage\AmazonS3; /** * Class Amazons3Test diff --git a/apps/files_external/tests/Storage/FtpTest.php b/apps/files_external/tests/Storage/FtpTest.php index 5b56becb4adf4e7d8f4255f356569406295ef53c..0e12a5f4afaa988f766f11e2d2f7efb5710d50a6 100644 --- a/apps/files_external/tests/Storage/FtpTest.php +++ b/apps/files_external/tests/Storage/FtpTest.php @@ -28,7 +28,7 @@ namespace OCA\Files_External\Tests\Storage; -use \OCA\Files_External\Lib\Storage\FTP; +use OCA\Files_External\Lib\Storage\FTP; /** * Class FtpTest diff --git a/apps/files_external/tests/Storage/OwncloudTest.php b/apps/files_external/tests/Storage/OwncloudTest.php index f1564304e2f5ccbc7b64da264a02a6ea7e2ba0b4..3853d0e6ce1b52a544fd3adb61187dc740bd81e5 100644 --- a/apps/files_external/tests/Storage/OwncloudTest.php +++ b/apps/files_external/tests/Storage/OwncloudTest.php @@ -26,7 +26,7 @@ namespace OCA\Files_External\Tests\Storage; -use \OCA\Files_External\Lib\Storage\OwnCloud; +use OCA\Files_External\Lib\Storage\OwnCloud; /** * Class OwnCloudTest diff --git a/apps/files_external/tests/Storage/SFTP_KeyTest.php b/apps/files_external/tests/Storage/SFTP_KeyTest.php index 6cd62309e68059dc6ba1f382a675d51bc5c80800..c67d418f67410724c95f9c7c82112718e0210766 100644 --- a/apps/files_external/tests/Storage/SFTP_KeyTest.php +++ b/apps/files_external/tests/Storage/SFTP_KeyTest.php @@ -26,7 +26,7 @@ namespace OCA\Files_External\Tests\Storage; -use \OCA\Files_External\Lib\Storage\SFTP_Key; +use OCA\Files_External\Lib\Storage\SFTP_Key; /** * Class SFTP_KeyTest diff --git a/apps/files_external/tests/Storage/SftpTest.php b/apps/files_external/tests/Storage/SftpTest.php index 85b2eec057fb9f28b8bff6a7bcb16455528c2da3..9ad7cfd56a8b5aeee0b36cb82bf96815e24bcc08 100644 --- a/apps/files_external/tests/Storage/SftpTest.php +++ b/apps/files_external/tests/Storage/SftpTest.php @@ -28,7 +28,7 @@ namespace OCA\Files_External\Tests\Storage; -use \OCA\Files_External\Lib\Storage\SFTP; +use OCA\Files_External\Lib\Storage\SFTP; /** * Class SftpTest diff --git a/apps/files_external/tests/Storage/SmbTest.php b/apps/files_external/tests/Storage/SmbTest.php index 609b362d60d3f72fa257a31579bff5c8fa34d2f5..fc59f0ed38b8bb1cc50c261697185901a6f404e5 100644 --- a/apps/files_external/tests/Storage/SmbTest.php +++ b/apps/files_external/tests/Storage/SmbTest.php @@ -30,7 +30,7 @@ namespace OCA\Files_External\Tests\Storage; use OC\Files\Notify\Change; use OC\Files\Notify\RenameChange; -use \OCA\Files_External\Lib\Storage\SMB; +use OCA\Files_External\Lib\Storage\SMB; use OCP\Files\Notify\IChange; /** diff --git a/apps/files_external/tests/Storage/SwiftTest.php b/apps/files_external/tests/Storage/SwiftTest.php index fdda8baace8869652e8afc6229d986ea94d35ddf..6517be493d7b9d071675b2e79c9ce0c066c013f4 100644 --- a/apps/files_external/tests/Storage/SwiftTest.php +++ b/apps/files_external/tests/Storage/SwiftTest.php @@ -28,7 +28,7 @@ namespace OCA\Files_External\Tests\Storage; use GuzzleHttp\Exception\ClientException; -use \OCA\Files_External\Lib\Storage\Swift; +use OCA\Files_External\Lib\Storage\Swift; /** * Class SwiftTest diff --git a/apps/files_external/tests/Storage/WebdavTest.php b/apps/files_external/tests/Storage/WebdavTest.php index b007ded2662612d702c70f17ba1792ecd3b2ebf3..c0d69592c2adf06c2ac243c069705831a099452f 100644 --- a/apps/files_external/tests/Storage/WebdavTest.php +++ b/apps/files_external/tests/Storage/WebdavTest.php @@ -27,7 +27,7 @@ namespace OCA\Files_External\Tests\Storage; -use \OC\Files\Storage\DAV; +use OC\Files\Storage\DAV; use OC\Files\Type\Detection; /** diff --git a/apps/files_sharing/lib/Activity/Settings/PublicLinks.php b/apps/files_sharing/lib/Activity/Settings/PublicLinks.php index 081081b9adf5532238f6fb9ca529e12331caf8a6..1959bf97f0eca929ef6f95f2459825f80682dac8 100644 --- a/apps/files_sharing/lib/Activity/Settings/PublicLinks.php +++ b/apps/files_sharing/lib/Activity/Settings/PublicLinks.php @@ -97,4 +97,3 @@ class PublicLinks implements ISetting { return false; } } - diff --git a/apps/files_sharing/lib/Activity/Settings/RemoteShare.php b/apps/files_sharing/lib/Activity/Settings/RemoteShare.php index a208ead7ba50e39321285fac93bd3a3673a34543..98b2eeb98900bb3108f976f1adf374f362d05b44 100644 --- a/apps/files_sharing/lib/Activity/Settings/RemoteShare.php +++ b/apps/files_sharing/lib/Activity/Settings/RemoteShare.php @@ -98,4 +98,3 @@ class RemoteShare implements ISetting { return false; } } - diff --git a/apps/files_sharing/lib/Activity/Settings/Shared.php b/apps/files_sharing/lib/Activity/Settings/Shared.php index b07872ded99554c7398af3bf7faa2c8453acffe6..9b2d9098ff87b46b70f9870f08c0e3457230be53 100644 --- a/apps/files_sharing/lib/Activity/Settings/Shared.php +++ b/apps/files_sharing/lib/Activity/Settings/Shared.php @@ -98,4 +98,3 @@ class Shared implements ISetting { return false; } } - diff --git a/apps/files_sharing/lib/AppInfo/Application.php b/apps/files_sharing/lib/AppInfo/Application.php index 5f48088d7197e323be2956cf50e78aae95c08838..a9060763a2b14ae68e2d73e1c33fb587edebd576 100644 --- a/apps/files_sharing/lib/AppInfo/Application.php +++ b/apps/files_sharing/lib/AppInfo/Application.php @@ -29,24 +29,24 @@ namespace OCA\Files_Sharing\AppInfo; +use OC\AppFramework\Utility\SimpleContainer; +use OCA\Files_Sharing\Capabilities; +use OCA\Files_Sharing\Controller\ExternalSharesController; +use OCA\Files_Sharing\Controller\ShareController; +use OCA\Files_Sharing\External\Manager; use OCA\Files_Sharing\Middleware\OCSShareAPIMiddleware; use OCA\Files_Sharing\Middleware\ShareInfoMiddleware; +use OCA\Files_Sharing\Middleware\SharingCheckMiddleware; use OCA\Files_Sharing\MountProvider; use OCA\Files_Sharing\Notification\Listener; use OCA\Files_Sharing\Notification\Notifier; use OCP\AppFramework\App; -use OC\AppFramework\Utility\SimpleContainer; -use OCA\Files_Sharing\Controller\ExternalSharesController; -use OCA\Files_Sharing\Controller\ShareController; -use OCA\Files_Sharing\Middleware\SharingCheckMiddleware; use OCP\AppFramework\Utility\IControllerMethodReflector; use OCP\Defaults; use OCP\Federation\ICloudIdManager; -use \OCP\IContainer; +use OCP\IContainer; use OCP\IGroup; use OCP\IServerContainer; -use OCA\Files_Sharing\Capabilities; -use OCA\Files_Sharing\External\Manager; use Symfony\Component\EventDispatcher\GenericEvent; class Application extends App { diff --git a/apps/files_sharing/lib/BackgroundJob/FederatedSharesDiscoverJob.php b/apps/files_sharing/lib/BackgroundJob/FederatedSharesDiscoverJob.php index 6249eaca5026443a8e5a57b9dee97c13a4da7e68..793ee632d4947eb94e1a49136772222027914cc7 100644 --- a/apps/files_sharing/lib/BackgroundJob/FederatedSharesDiscoverJob.php +++ b/apps/files_sharing/lib/BackgroundJob/FederatedSharesDiscoverJob.php @@ -21,6 +21,7 @@ declare(strict_types=1); * along with this program. If not, see . * */ + namespace OCA\Files_Sharing\BackgroundJob; use OC\BackgroundJob\TimedJob; diff --git a/apps/files_sharing/lib/Capabilities.php b/apps/files_sharing/lib/Capabilities.php index 7c0478fa7c18aa1b52fd1876b2250820574ed20f..6a16da0231cd5deca3874c126c1326aa50e55789 100644 --- a/apps/files_sharing/lib/Capabilities.php +++ b/apps/files_sharing/lib/Capabilities.php @@ -20,11 +20,12 @@ * along with this program. If not, see * */ + namespace OCA\Files_Sharing; use OCP\Capabilities\ICapability; use OCP\Constants; -use \OCP\IConfig; +use OCP\IConfig; /** * Class Capabilities diff --git a/apps/files_sharing/lib/Controller/ExternalSharesController.php b/apps/files_sharing/lib/Controller/ExternalSharesController.php index fe4c09dd19591af327e6a5e66f7e2d6c497fa328..3cba441680097cf1ef4e8b35e4f9c0a67fa105d5 100644 --- a/apps/files_sharing/lib/Controller/ExternalSharesController.php +++ b/apps/files_sharing/lib/Controller/ExternalSharesController.php @@ -27,10 +27,10 @@ namespace OCA\Files_Sharing\Controller; use OCP\AppFramework\Controller; -use OCP\IRequest; +use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http\JSONResponse; use OCP\Http\Client\IClientService; -use OCP\AppFramework\Http\DataResponse; +use OCP\IRequest; /** * Class ExternalSharesController diff --git a/apps/files_sharing/lib/Controller/PublicPreviewController.php b/apps/files_sharing/lib/Controller/PublicPreviewController.php index 33990727ffd99c4cfec0ba4cf155ab8126ee3c53..d9ec459d1ae90c29b05b180343c29cf3937d7281 100644 --- a/apps/files_sharing/lib/Controller/PublicPreviewController.php +++ b/apps/files_sharing/lib/Controller/PublicPreviewController.php @@ -21,6 +21,7 @@ * along with this program. If not, see . * */ + namespace OCA\Files_Sharing\Controller; use OCP\AppFramework\Controller; diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php index e7b9f5e6044154f95cebf102c30cac1eec4801e8..db92b8f3818a9227ab4fa904de96af9f9abdcd38 100644 --- a/apps/files_sharing/lib/Controller/ShareAPIController.php +++ b/apps/files_sharing/lib/Controller/ShareAPIController.php @@ -32,6 +32,7 @@ declare(strict_types=1); namespace OCA\Files_Sharing\Controller; use OCA\Files\Helper; +use OCA\Files_Sharing\External\Storage; use OCP\App\IAppManager; use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\OCS\OCSBadRequestException; @@ -41,24 +42,23 @@ use OCP\AppFramework\OCS\OCSNotFoundException; use OCP\AppFramework\OCSController; use OCP\AppFramework\QueryException; use OCP\Constants; +use OCP\Files\IRootFolder; use OCP\Files\Node; use OCP\Files\NotFoundException; use OCP\IConfig; use OCP\IGroupManager; use OCP\IL10N; -use OCP\IUserManager; use OCP\IRequest; use OCP\IServerContainer; use OCP\IURLGenerator; -use OCP\Files\IRootFolder; +use OCP\IUserManager; +use OCP\Lock\ILockingProvider; use OCP\Lock\LockedException; use OCP\Share; -use OCP\Share\IManager; -use OCP\Share\Exceptions\ShareNotFound; use OCP\Share\Exceptions\GenericShareException; -use OCP\Lock\ILockingProvider; +use OCP\Share\Exceptions\ShareNotFound; +use OCP\Share\IManager; use OCP\Share\IShare; -use OCA\Files_Sharing\External\Storage; /** * Class Share20OCS diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php index f5cbb63e08315780ee584f73fb616e617fd82834..aca93197674eeeef412cc58ea4bc73e03d1579b9 100644 --- a/apps/files_sharing/lib/Controller/ShareController.php +++ b/apps/files_sharing/lib/Controller/ShareController.php @@ -40,31 +40,31 @@ use OC\Security\CSP\ContentSecurityPolicy; use OC_Files; use OC_Util; use OCA\FederatedFileSharing\FederatedShareProvider; +use OCA\Files_Sharing\Activity\Providers\Downloads; use OCP\AppFramework\AuthPublicShareController; -use OCP\AppFramework\Http\Template\SimpleMenuAction; +use OCP\AppFramework\Http\NotFoundResponse; use OCP\AppFramework\Http\Template\ExternalShareMenuAction; use OCP\AppFramework\Http\Template\LinkMenuAction; use OCP\AppFramework\Http\Template\PublicTemplateResponse; +use OCP\AppFramework\Http\Template\SimpleMenuAction; +use OCP\AppFramework\Http\TemplateResponse; use OCP\Defaults; +use OCP\Files\IRootFolder; +use OCP\Files\NotFoundException; +use OCP\IConfig; use OCP\IL10N; -use OCP\Template; -use OCP\Share; +use OCP\ILogger; +use OCP\IPreview; use OCP\IRequest; -use OCP\AppFramework\Http\TemplateResponse; -use OCP\AppFramework\Http\NotFoundResponse; +use OCP\ISession; use OCP\IURLGenerator; -use OCP\IConfig; -use OCP\ILogger; use OCP\IUserManager; -use OCP\ISession; -use OCP\IPreview; -use OCA\Files_Sharing\Activity\Providers\Downloads; -use OCP\Files\NotFoundException; -use OCP\Files\IRootFolder; +use OCP\Share; use OCP\Share\Exceptions\ShareNotFound; +use OCP\Share\IManager as ShareManager; +use OCP\Template; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\GenericEvent; -use OCP\Share\IManager as ShareManager; /** * Class ShareController diff --git a/apps/files_sharing/lib/Controller/ShareInfoController.php b/apps/files_sharing/lib/Controller/ShareInfoController.php index 14b56d28954c4c005c930c4094ee0795ea514c2d..5ecf00321fcfd1d25092ea779b3963e8532dcffa 100644 --- a/apps/files_sharing/lib/Controller/ShareInfoController.php +++ b/apps/files_sharing/lib/Controller/ShareInfoController.php @@ -21,6 +21,7 @@ * along with this program. If not, see . * */ + namespace OCA\Files_Sharing\Controller; use OCA\Files_External\NotFoundException; diff --git a/apps/files_sharing/lib/Controller/ShareesAPIController.php b/apps/files_sharing/lib/Controller/ShareesAPIController.php index e1546e115ecb248d3f40be96b9a8d0331670cf4e..e750235470d400c67e95638c020bb2565e0001f4 100644 --- a/apps/files_sharing/lib/Controller/ShareesAPIController.php +++ b/apps/files_sharing/lib/Controller/ShareesAPIController.php @@ -27,6 +27,7 @@ declare(strict_types=1); * along with this program. If not, see * */ + namespace OCA\Files_Sharing\Controller; use function array_filter; @@ -40,8 +41,8 @@ use OCP\AppFramework\OCSController; use OCP\Collaboration\Collaborators\ISearch; use OCP\Collaboration\Collaborators\ISearchResult; use OCP\Collaboration\Collaborators\SearchResultType; -use OCP\IRequest; use OCP\IConfig; +use OCP\IRequest; use OCP\IURLGenerator; use OCP\Share; use OCP\Share\IManager; diff --git a/apps/files_sharing/lib/Helper.php b/apps/files_sharing/lib/Helper.php index 72dea4b7dcb2c9f162ddd3d8c2a5c521da962cc4..ad33ec1dd7c04a96e6eea0b3f806cfad24d77b72 100644 --- a/apps/files_sharing/lib/Helper.php +++ b/apps/files_sharing/lib/Helper.php @@ -26,6 +26,7 @@ * along with this program. If not, see * */ + namespace OCA\Files_Sharing; use OC\Files\Filesystem; diff --git a/apps/files_sharing/lib/Middleware/OCSShareAPIMiddleware.php b/apps/files_sharing/lib/Middleware/OCSShareAPIMiddleware.php index faf9ef4756d7f0dbd6368442a7f501ca306ca346..4bc6d2499cc55037677f2e8be7206039af2ddd7a 100644 --- a/apps/files_sharing/lib/Middleware/OCSShareAPIMiddleware.php +++ b/apps/files_sharing/lib/Middleware/OCSShareAPIMiddleware.php @@ -22,6 +22,7 @@ * along with this program. If not, see . * */ + namespace OCA\Files_Sharing\Middleware; use OCA\Files_Sharing\Controller\ShareAPIController; diff --git a/apps/files_sharing/lib/Middleware/ShareInfoMiddleware.php b/apps/files_sharing/lib/Middleware/ShareInfoMiddleware.php index 7a6ecc483e82686a427626c5386c2cbf025f33cd..489a67aec9113b23750d65a8d615f91f71aea61c 100644 --- a/apps/files_sharing/lib/Middleware/ShareInfoMiddleware.php +++ b/apps/files_sharing/lib/Middleware/ShareInfoMiddleware.php @@ -21,6 +21,7 @@ * along with this program. If not, see . * */ + namespace OCA\Files_Sharing\Middleware; use OCA\Files_Sharing\Controller\ShareInfoController; diff --git a/apps/files_sharing/lib/Middleware/SharingCheckMiddleware.php b/apps/files_sharing/lib/Middleware/SharingCheckMiddleware.php index b5f1178b7f08aa923de426d05adc280f3bb9cb37..f3546514c408c3b5ed5932d8de93f55841a6089b 100644 --- a/apps/files_sharing/lib/Middleware/SharingCheckMiddleware.php +++ b/apps/files_sharing/lib/Middleware/SharingCheckMiddleware.php @@ -28,18 +28,18 @@ namespace OCA\Files_Sharing\Middleware; use OCA\Files_Sharing\Controller\ExternalSharesController; use OCA\Files_Sharing\Controller\ShareController; +use OCA\Files_Sharing\Exceptions\S2SException; use OCP\App\IAppManager; use OCP\AppFramework\Controller; +use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\NotFoundResponse; use OCP\AppFramework\Middleware; +use OCP\AppFramework\Utility\IControllerMethodReflector; use OCP\Files\NotFoundException; use OCP\IConfig; -use OCP\AppFramework\Utility\IControllerMethodReflector; -use OCA\Files_Sharing\Exceptions\S2SException; -use OCP\AppFramework\Http\JSONResponse; use OCP\IRequest; -use OCP\Share\IManager; use OCP\Share\Exceptions\ShareNotFound; +use OCP\Share\IManager; /** * Checks whether the "sharing check" is enabled diff --git a/apps/files_sharing/lib/Notification/Notifier.php b/apps/files_sharing/lib/Notification/Notifier.php index 52bb0eb823603fb224ecd7b901508b88454e4e4b..21ee7e08802f35e86bc134b5dca7b34334c54277 100644 --- a/apps/files_sharing/lib/Notification/Notifier.php +++ b/apps/files_sharing/lib/Notification/Notifier.php @@ -27,8 +27,8 @@ declare(strict_types=1); namespace OCA\Files_Sharing\Notification; use OCP\Files\IRootFolder; -use OCP\IL10N; use OCP\IGroupManager; +use OCP\IL10N; use OCP\IURLGenerator; use OCP\IUser; use OCP\IUserManager; diff --git a/apps/files_sharing/lib/Scanner.php b/apps/files_sharing/lib/Scanner.php index 18ea879d5d8cca248af8dc9d80e4480b74c315d4..20499b47154ece664de4af147280a3c2f5530a86 100644 --- a/apps/files_sharing/lib/Scanner.php +++ b/apps/files_sharing/lib/Scanner.php @@ -80,4 +80,3 @@ class Scanner extends \OC\Files\Cache\Scanner { } } } - diff --git a/apps/files_sharing/lib/SharedStorage.php b/apps/files_sharing/lib/SharedStorage.php index 67868b512c3e13fd566fac6a1eacf3bc94e8e90c..5f02c2fe5c40762178f08129164e672a89c880e2 100644 --- a/apps/files_sharing/lib/SharedStorage.php +++ b/apps/files_sharing/lib/SharedStorage.php @@ -34,15 +34,15 @@ namespace OCA\Files_Sharing; use OC\Files\Cache\FailedCache; use OC\Files\Filesystem; -use OC\Files\Storage\Wrapper\PermissionsMask; use OC\Files\Storage\FailedStorage; +use OC\Files\Storage\Wrapper\PermissionsMask; +use OC\User\NoUserException; use OCP\Constants; use OCP\Files\Cache\ICacheEntry; use OCP\Files\NotFoundException; use OCP\Files\Storage\IDisableEncryptionStorage; use OCP\Files\Storage\IStorage; use OCP\Lock\ILockingProvider; -use OC\User\NoUserException; /** * Convert target path to source path and pass the function call to the correct storage provider diff --git a/apps/files_sharing/tests/CapabilitiesTest.php b/apps/files_sharing/tests/CapabilitiesTest.php index 077f2cdbe71ecbf3bc165d0ae8c302df6cdfee28..493f607dba2e3a9389e0894b8b04ad49fee107dd 100644 --- a/apps/files_sharing/tests/CapabilitiesTest.php +++ b/apps/files_sharing/tests/CapabilitiesTest.php @@ -23,12 +23,12 @@ * along with this program. If not, see * */ + namespace OCA\Files_Sharing\Tests; use OCA\Files_Sharing\Capabilities; use OCP\IConfig; - /** * Class CapabilitiesTest * diff --git a/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php b/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php index 7380f39dfba44c8274aab229fd42138449d323b6..257d9c35dff06bbc6aa25fd644f617e0b6b1f5ee 100644 --- a/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php +++ b/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php @@ -193,4 +193,3 @@ class CleanupRemoteStoragesTest extends TestCase { } } - diff --git a/apps/files_sharing/tests/Controller/PublicPreviewControllerTest.php b/apps/files_sharing/tests/Controller/PublicPreviewControllerTest.php index 175f05fb1daf1db4233efd86d5fb1a24eaae7f33..ed556172a2724895cb94f729f0f889c6ff144cef 100644 --- a/apps/files_sharing/tests/Controller/PublicPreviewControllerTest.php +++ b/apps/files_sharing/tests/Controller/PublicPreviewControllerTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OCA\Files_Sharing\Tests\Controller; use OCA\Files_Sharing\Controller\PublicPreviewController; diff --git a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php index c741159cdb477d05e3c4df92901c40d260c4f0ef..6452ad5001906a0c68504d5fe8124f5646155ed4 100644 --- a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php +++ b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php @@ -24,33 +24,34 @@ * along with this program. If not, see * */ + namespace OCA\Files_Sharing\Tests\Controller; +use OCA\Files_Sharing\Controller\ShareAPIController; use OCP\App\IAppManager; use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\OCS\OCSException; use OCP\AppFramework\OCS\OCSNotFoundException; use OCP\Files\File; use OCP\Files\Folder; +use OCP\Files\IRootFolder; use OCP\Files\Mount\IMountPoint; +use OCP\Files\NotFoundException; use OCP\Files\Storage; use OCP\IConfig; -use OCP\IL10N; -use OCA\Files_Sharing\Controller\ShareAPIController; -use OCP\Files\NotFoundException; use OCP\IGroupManager; -use OCP\IUserManager; -use OCP\IServerContainer; +use OCP\IL10N; use OCP\IRequest; +use OCP\IServerContainer; use OCP\IURLGenerator; use OCP\IUser; -use OCP\Files\IRootFolder; +use OCP\IUserManager; use OCP\Lock\LockedException; +use OCP\Share; use OCP\Share\Exceptions\GenericShareException; use OCP\Share\IManager; -use OCP\Share; -use Test\TestCase; use OCP\Share\IShare; +use Test\TestCase; /** * Class ShareAPIControllerTest diff --git a/apps/files_sharing/tests/Controller/ShareControllerTest.php b/apps/files_sharing/tests/Controller/ShareControllerTest.php index 97e234ca22c30cafebcdeef8a9a0574a789733a9..01b20e5857264e18e8ea378dae527995db02af0f 100644 --- a/apps/files_sharing/tests/Controller/ShareControllerTest.php +++ b/apps/files_sharing/tests/Controller/ShareControllerTest.php @@ -48,12 +48,12 @@ use OCP\IL10N; use OCP\ILogger; use OCP\IPreview; use OCP\IRequest; -use OCP\IUser; -use OCP\Share\Exceptions\ShareNotFound; use OCP\ISession; +use OCP\IURLGenerator; +use OCP\IUser; use OCP\IUserManager; use OCP\Security\ISecureRandom; -use OCP\IURLGenerator; +use OCP\Share\Exceptions\ShareNotFound; use OCP\Share\IShare; use PHPUnit\Framework\MockObject\MockObject; use Symfony\Component\EventDispatcher\EventDispatcherInterface; diff --git a/apps/files_sharing/tests/Controller/ShareInfoControllerTest.php b/apps/files_sharing/tests/Controller/ShareInfoControllerTest.php index 882e858217ee40475a0535360cea5d3c76e5b539..cd548ecfa21580e6f8838bc75abf0a54c2c9009c 100644 --- a/apps/files_sharing/tests/Controller/ShareInfoControllerTest.php +++ b/apps/files_sharing/tests/Controller/ShareInfoControllerTest.php @@ -21,6 +21,7 @@ * along with this program. If not, see . * */ + namespace OCA\Files_Sharing\Tests\Controller; use OCA\Files_Sharing\Controller\ShareInfoController; diff --git a/apps/files_sharing/tests/DeleteOrphanedSharesJobTest.php b/apps/files_sharing/tests/DeleteOrphanedSharesJobTest.php index a20c66a39bd7bee050d0218e8de10bd35b0acbd4..03f19525e0dfa940a4b4cae7bbc34a2963d0f728 100644 --- a/apps/files_sharing/tests/DeleteOrphanedSharesJobTest.php +++ b/apps/files_sharing/tests/DeleteOrphanedSharesJobTest.php @@ -157,4 +157,3 @@ class DeleteOrphanedSharesJobTest extends \Test\TestCase { $this->assertCount(0, $this->getShares(), 'Orphaned shares deleted'); } } - diff --git a/apps/files_sharing/tests/ExpireSharesJobTest.php b/apps/files_sharing/tests/ExpireSharesJobTest.php index 84449048ef3a76db574eb40b67a5de24162603d4..e255f08ccf17367f9ed6f85614de9d91e1d52787 100644 --- a/apps/files_sharing/tests/ExpireSharesJobTest.php +++ b/apps/files_sharing/tests/ExpireSharesJobTest.php @@ -216,4 +216,3 @@ class ExpireSharesJobTest extends \Test\TestCase { } } - diff --git a/apps/files_sharing/tests/External/CacheTest.php b/apps/files_sharing/tests/External/CacheTest.php index 0129e7606488dfddd09ef58e190e34083e3895d8..02109e35db1f8d40a546b6154a66011afe2fabef 100644 --- a/apps/files_sharing/tests/External/CacheTest.php +++ b/apps/files_sharing/tests/External/CacheTest.php @@ -22,6 +22,7 @@ * along with this program. If not, see * */ + namespace OCA\Files_Sharing\Tests\External; use OC\Federation\CloudIdManager; diff --git a/apps/files_sharing/tests/Middleware/OCSShareAPIMiddlewareTest.php b/apps/files_sharing/tests/Middleware/OCSShareAPIMiddlewareTest.php index 8cbf03b8b61c79f162e8f6f6faeefccc10f7b1b8..a1d1f1bf55159fb776ab0600b3b366b42f1d05fc 100644 --- a/apps/files_sharing/tests/Middleware/OCSShareAPIMiddlewareTest.php +++ b/apps/files_sharing/tests/Middleware/OCSShareAPIMiddlewareTest.php @@ -21,6 +21,7 @@ * along with this program. If not, see . * */ + namespace OCA\Files_Sharing\Tests\Middleware; use OCA\Files_Sharing\Controller\ShareAPIController; diff --git a/apps/files_sharing/tests/Middleware/ShareInfoMiddlewareTest.php b/apps/files_sharing/tests/Middleware/ShareInfoMiddlewareTest.php index cbac5c7bef58291b396adc1c9c17423be95d0d24..781861aa3928bdee862ccb6a32ec1902081b9ddd 100644 --- a/apps/files_sharing/tests/Middleware/ShareInfoMiddlewareTest.php +++ b/apps/files_sharing/tests/Middleware/ShareInfoMiddlewareTest.php @@ -21,6 +21,7 @@ * along with this program. If not, see . * */ + namespace OCA\Files_Sharing\Tests\Middleware; use OCA\Files_Sharing\Controller\ShareInfoController; diff --git a/apps/files_sharing/tests/Middleware/SharingCheckMiddlewareTest.php b/apps/files_sharing/tests/Middleware/SharingCheckMiddlewareTest.php index 1fea73e6b47f6a1ee473e33f6b930cf4c8abc6d4..f49b472a35c52be27e2303af9d7fe61cfcaa20c9 100644 --- a/apps/files_sharing/tests/Middleware/SharingCheckMiddlewareTest.php +++ b/apps/files_sharing/tests/Middleware/SharingCheckMiddlewareTest.php @@ -27,13 +27,13 @@ namespace OCA\Files_Sharing\Middleware; use OCA\Files_Sharing\Controller\ExternalSharesController; use OCA\Files_Sharing\Controller\ShareController; +use OCA\Files_Sharing\Exceptions\S2SException; use OCP\App\IAppManager; use OCP\AppFramework\Controller; +use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\NotFoundResponse; -use OCP\Files\NotFoundException; use OCP\AppFramework\Utility\IControllerMethodReflector; -use OCA\Files_Sharing\Exceptions\S2SException; -use OCP\AppFramework\Http\JSONResponse; +use OCP\Files\NotFoundException; use OCP\IConfig; use OCP\IRequest; use OCP\Share\IManager; diff --git a/apps/files_sharing/tests/MountProviderTest.php b/apps/files_sharing/tests/MountProviderTest.php index 7b533bf8106defd38cd3ccfda429841e2325a170..f4acfdfafe79093e69212b651ef543af313f5f43 100644 --- a/apps/files_sharing/tests/MountProviderTest.php +++ b/apps/files_sharing/tests/MountProviderTest.php @@ -33,8 +33,8 @@ use OCP\IConfig; use OCP\ILogger; use OCP\IUser; use OCP\IUserManager; -use OCP\Share\IShare; use OCP\Share\IManager; +use OCP\Share\IShare; /** * @group DB @@ -381,4 +381,3 @@ class MountProviderTest extends \Test\TestCase { } } } - diff --git a/apps/files_sharing/tests/PermissionsTest.php b/apps/files_sharing/tests/PermissionsTest.php index 05a833025669700ee637b89aee50f4e7e4e9ea2e..a64d0b25e177295979b3158659b81a1e400fcac6 100644 --- a/apps/files_sharing/tests/PermissionsTest.php +++ b/apps/files_sharing/tests/PermissionsTest.php @@ -25,7 +25,6 @@ * */ - namespace OCA\Files_Sharing\Tests; use OC\Files\Cache\Cache; diff --git a/apps/files_sharing/tests/SharedStorageTest.php b/apps/files_sharing/tests/SharedStorageTest.php index b26af57fc11ebf114184c0fcc832ef4400b15e46..e2cb65d9acca2c33f3b2dbab8c6db14183c8ea3e 100644 --- a/apps/files_sharing/tests/SharedStorageTest.php +++ b/apps/files_sharing/tests/SharedStorageTest.php @@ -28,10 +28,10 @@ namespace OCA\Files_Sharing\Tests; -use OCA\Files_Sharing\SharedStorage; -use OCP\Share\IShare; use OC\Files\View; +use OCA\Files_Sharing\SharedStorage; use OCP\Files\NotFoundException; +use OCP\Share\IShare; /** * Class SharedStorageTest diff --git a/apps/files_trashbin/lib/AppInfo/Application.php b/apps/files_trashbin/lib/AppInfo/Application.php index a2613a13b410109433802832c33f11f44cccd701..08fdae18d9dd2742f255aa982adb6816d4112c4c 100644 --- a/apps/files_trashbin/lib/AppInfo/Application.php +++ b/apps/files_trashbin/lib/AppInfo/Application.php @@ -25,13 +25,13 @@ namespace OCA\Files_Trashbin\AppInfo; use OCA\DAV\CalDAV\Proxy\ProxyMapper; use OCA\DAV\Connector\Sabre\Principal; +use OCA\Files_Trashbin\Capabilities; +use OCA\Files_Trashbin\Expiration; use OCA\Files_Trashbin\Trash\ITrashManager; use OCA\Files_Trashbin\Trash\TrashManager; use OCP\AppFramework\App; -use OCA\Files_Trashbin\Expiration; use OCP\AppFramework\IAppContainer; use OCP\AppFramework\Utility\ITimeFactory; -use OCA\Files_Trashbin\Capabilities; class Application extends App { public function __construct (array $urlParams = []) { diff --git a/apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php b/apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php index 919317a7b7aa0d11ed51c7be340b2c9670728eae..225c751cc4b684f71d3c31887d5a018cdbadab06 100644 --- a/apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php +++ b/apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php @@ -25,12 +25,12 @@ namespace OCA\Files_Trashbin\BackgroundJob; -use OCP\IUser; -use OCP\IUserManager; use OCA\Files_Trashbin\AppInfo\Application; use OCA\Files_Trashbin\Expiration; use OCA\Files_Trashbin\Helper; use OCA\Files_Trashbin\Trashbin; +use OCP\IUser; +use OCP\IUserManager; class ExpireTrash extends \OC\BackgroundJob\TimedJob { diff --git a/apps/files_trashbin/lib/Command/CleanUp.php b/apps/files_trashbin/lib/Command/CleanUp.php index d2f8f72be8b9d1f127ce5c772519ae5e2d707ead..af024d0e8235f2de524b98f48745bf8b817858b6 100644 --- a/apps/files_trashbin/lib/Command/CleanUp.php +++ b/apps/files_trashbin/lib/Command/CleanUp.php @@ -28,11 +28,11 @@ use OCP\IDBConnection; use OCP\IUserBackend; use OCP\IUserManager; use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Exception\InvalidOptionException; use Symfony\Component\Console\Input\InputArgument; -use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Exception\InvalidOptionException; class CleanUp extends Command { diff --git a/apps/files_trashbin/lib/Command/ExpireTrash.php b/apps/files_trashbin/lib/Command/ExpireTrash.php index 6b46fd9e62652f5e58fd5cf38ba1617f5798ee72..72520b9e9ba60bc2399f9960556ee023fe3b61aa 100644 --- a/apps/files_trashbin/lib/Command/ExpireTrash.php +++ b/apps/files_trashbin/lib/Command/ExpireTrash.php @@ -23,11 +23,11 @@ namespace OCA\Files_Trashbin\Command; -use OCP\IUser; -use OCP\IUserManager; use OCA\Files_Trashbin\Expiration; use OCA\Files_Trashbin\Helper; use OCA\Files_Trashbin\Trashbin; +use OCP\IUser; +use OCP\IUserManager; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Helper\ProgressBar; use Symfony\Component\Console\Input\InputArgument; diff --git a/apps/files_trashbin/lib/Events/MoveToTrashEvent.php b/apps/files_trashbin/lib/Events/MoveToTrashEvent.php index e62d875c59d44f7f43319fd08884d55e07108feb..65c35e8eb1187d235323228223603b70621f6751 100644 --- a/apps/files_trashbin/lib/Events/MoveToTrashEvent.php +++ b/apps/files_trashbin/lib/Events/MoveToTrashEvent.php @@ -21,12 +21,11 @@ * */ - namespace OCA\Files_Trashbin\Events; -use OCP\Files\Node; use OCP\EventDispatcher\Event; +use OCP\Files\Node; /** * Class MoveToTrashEvent diff --git a/apps/files_trashbin/lib/Expiration.php b/apps/files_trashbin/lib/Expiration.php index 933375c953727a62eae2c0a01b6e76291e2094a7..be1e18712209ddb9448f021661a7c693533ecdd8 100644 --- a/apps/files_trashbin/lib/Expiration.php +++ b/apps/files_trashbin/lib/Expiration.php @@ -23,8 +23,8 @@ namespace OCA\Files_Trashbin; -use \OCP\IConfig; -use \OCP\AppFramework\Utility\ITimeFactory; +use OCP\AppFramework\Utility\ITimeFactory; +use OCP\IConfig; class Expiration { diff --git a/apps/files_trashbin/lib/Helper.php b/apps/files_trashbin/lib/Helper.php index 071a1a7766af3844b96cd078d48581ac937fef88..e19a5cfa480ae862285a76286dc3317029755530 100644 --- a/apps/files_trashbin/lib/Helper.php +++ b/apps/files_trashbin/lib/Helper.php @@ -26,6 +26,7 @@ * along with this program. If not, see * */ + namespace OCA\Files_Trashbin; use OC\Files\FileInfo; diff --git a/apps/files_trashbin/lib/Sabre/ITrash.php b/apps/files_trashbin/lib/Sabre/ITrash.php index 7a05fbe9507790f323f222c211cd5a0f20b985d6..4bb74161c12557e0759af22ebca063e927a1c336 100644 --- a/apps/files_trashbin/lib/Sabre/ITrash.php +++ b/apps/files_trashbin/lib/Sabre/ITrash.php @@ -21,6 +21,7 @@ declare(strict_types=1); * along with this program. If not, see . * */ + namespace OCA\Files_Trashbin\Sabre; use OCP\Files\FileInfo; diff --git a/apps/files_trashbin/lib/Sabre/RestoreFolder.php b/apps/files_trashbin/lib/Sabre/RestoreFolder.php index 177064dbb48f6d05fca95e263a10b048db6bae6e..83c53d045583d00e06ac6087513cffc19710a603 100644 --- a/apps/files_trashbin/lib/Sabre/RestoreFolder.php +++ b/apps/files_trashbin/lib/Sabre/RestoreFolder.php @@ -29,7 +29,6 @@ use Sabre\DAV\ICollection; use Sabre\DAV\IMoveTarget; use Sabre\DAV\INode; - class RestoreFolder implements ICollection, IMoveTarget { public function createFile($name, $data = null) { throw new Forbidden(); diff --git a/apps/files_trashbin/lib/Sabre/TrashFolder.php b/apps/files_trashbin/lib/Sabre/TrashFolder.php index 108aaf4f31296d53b4152a5b19aaf6277b4c74a9..fa927632defbf16b4d3d5f7ca9a3794ab5c1bf42 100644 --- a/apps/files_trashbin/lib/Sabre/TrashFolder.php +++ b/apps/files_trashbin/lib/Sabre/TrashFolder.php @@ -21,6 +21,7 @@ declare(strict_types=1); * along with this program. If not, see . * */ + namespace OCA\Files_Trashbin\Sabre; diff --git a/apps/files_trashbin/lib/Sabre/TrashFolderFile.php b/apps/files_trashbin/lib/Sabre/TrashFolderFile.php index 31ee9535b72a5b971f2fccbd396f4e85703738a3..553e6ca0ac4b1b5267a403ca3f3ad9a23461a2af 100644 --- a/apps/files_trashbin/lib/Sabre/TrashFolderFile.php +++ b/apps/files_trashbin/lib/Sabre/TrashFolderFile.php @@ -21,6 +21,7 @@ declare(strict_types=1); * along with this program. If not, see . * */ + namespace OCA\Files_Trashbin\Sabre; diff --git a/apps/files_trashbin/lib/Sabre/TrashRoot.php b/apps/files_trashbin/lib/Sabre/TrashRoot.php index 45f27f48b175f509ea8e687458a3144fabcdd196..78e1e0303d69ee01ceb29d6f8c5528041b2acf54 100644 --- a/apps/files_trashbin/lib/Sabre/TrashRoot.php +++ b/apps/files_trashbin/lib/Sabre/TrashRoot.php @@ -21,6 +21,7 @@ declare(strict_types=1); * along with this program. If not, see . * */ + namespace OCA\Files_Trashbin\Sabre; use OCA\Files_Trashbin\Trash\ITrashItem; diff --git a/apps/files_trashbin/tests/BackgroundJob/ExpireTrashTest.php b/apps/files_trashbin/tests/BackgroundJob/ExpireTrashTest.php index 5339d600722d3af4e970e152431be809f220bf2e..894030792e3df3ee38f433bd86d75fe869e8805e 100644 --- a/apps/files_trashbin/tests/BackgroundJob/ExpireTrashTest.php +++ b/apps/files_trashbin/tests/BackgroundJob/ExpireTrashTest.php @@ -24,7 +24,7 @@ namespace OCA\Files_Trashbin\Tests\BackgroundJob; -use \OCA\Files_Trashbin\BackgroundJob\ExpireTrash; +use OCA\Files_Trashbin\BackgroundJob\ExpireTrash; use OCP\BackgroundJob\IJobList; use OCP\IUserManager; diff --git a/apps/files_trashbin/tests/CapabilitiesTest.php b/apps/files_trashbin/tests/CapabilitiesTest.php index 2a3e89bf414302633b7cbcb7016ce66c77da9ca9..c4729d7a7c72ff93d8b099aafd494d7fc3f53659 100644 --- a/apps/files_trashbin/tests/CapabilitiesTest.php +++ b/apps/files_trashbin/tests/CapabilitiesTest.php @@ -41,4 +41,4 @@ class CapabilitiesTest extends TestCase { $this->assertSame($capabilities, $this->capabilities->getCapabilities()); } -} \ No newline at end of file +} diff --git a/apps/files_trashbin/tests/Command/CleanUpTest.php b/apps/files_trashbin/tests/Command/CleanUpTest.php index 1ea3fc19c05030987663b891f5daccd59f8d2686..9a517df1a543730a968bf22b35b57a5f062b2457 100644 --- a/apps/files_trashbin/tests/Command/CleanUpTest.php +++ b/apps/files_trashbin/tests/Command/CleanUpTest.php @@ -23,17 +23,16 @@ * */ - namespace OCA\Files_Trashbin\Tests\Command; +use OC\User\Manager; use OCA\Files_Trashbin\Command\CleanUp; +use OCP\Files\IRootFolder; use Symfony\Component\Console\Exception\InvalidOptionException; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; -use OC\User\Manager; -use OCP\Files\IRootFolder; /** * Class CleanUpTest diff --git a/apps/files_trashbin/tests/Controller/PreviewControllerTest.php b/apps/files_trashbin/tests/Controller/PreviewControllerTest.php index 02bb63fa17aeda8caddcce6f0affd33f47ac49e1..fd562b5cd046c2afb95a98d6704f64d5ebad0c66 100644 --- a/apps/files_trashbin/tests/Controller/PreviewControllerTest.php +++ b/apps/files_trashbin/tests/Controller/PreviewControllerTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OCA\Files_Trashbin\Tests\Controller; use OCA\Files_Trashbin\Controller\PreviewController; diff --git a/apps/files_trashbin/tests/StorageTest.php b/apps/files_trashbin/tests/StorageTest.php index 7632915e002ee94cc9267a276ca73c16763327cc..c98f5fd2b1e794fe2ba10b34299dad83f04e3b91 100644 --- a/apps/files_trashbin/tests/StorageTest.php +++ b/apps/files_trashbin/tests/StorageTest.php @@ -30,8 +30,8 @@ namespace OCA\Files_Trashbin\Tests; -use OC\Files\Storage\Temporary; use OC\Files\Filesystem; +use OC\Files\Storage\Temporary; use OCA\Files_Trashbin\Events\MoveToTrashEvent; use OCA\Files_Trashbin\Storage; use OCA\Files_Trashbin\Trash\ITrashManager; diff --git a/apps/files_versions/lib/AppInfo/Application.php b/apps/files_versions/lib/AppInfo/Application.php index c5791f33d3ab7d140b1d52c7a763482fe1035be7..25dc7fe5973afb6eda179632f2a9437acd878339 100644 --- a/apps/files_versions/lib/AppInfo/Application.php +++ b/apps/files_versions/lib/AppInfo/Application.php @@ -25,14 +25,14 @@ namespace OCA\Files_Versions\AppInfo; use OCA\DAV\CalDAV\Proxy\ProxyMapper; use OCA\DAV\Connector\Sabre\Principal; +use OCA\Files\Event\LoadAdditionalScriptsEvent; +use OCA\Files\Event\LoadSidebar; use OCA\Files_Versions\Capabilities; +use OCA\Files_Versions\Hooks; use OCA\Files_Versions\Listener\LoadAdditionalListener; use OCA\Files_Versions\Listener\LoadSidebarListener; use OCA\Files_Versions\Versions\IVersionManager; use OCA\Files_Versions\Versions\VersionManager; -use OCA\Files_Versions\Hooks; -use OCA\Files\Event\LoadAdditionalScriptsEvent; -use OCA\Files\Event\LoadSidebar; use OCP\AppFramework\App; use OCP\AppFramework\IAppContainer; use OCP\EventDispatcher\IEventDispatcher; diff --git a/apps/files_versions/lib/BackgroundJob/ExpireVersions.php b/apps/files_versions/lib/BackgroundJob/ExpireVersions.php index 47a1903a535991124fe1aa5f747314264b93d634..71ddaaac6debe8eca1e9a2d44e5fcd2f491be38c 100644 --- a/apps/files_versions/lib/BackgroundJob/ExpireVersions.php +++ b/apps/files_versions/lib/BackgroundJob/ExpireVersions.php @@ -24,11 +24,11 @@ namespace OCA\Files_Versions\BackgroundJob; -use OCP\IUser; -use OCP\IUserManager; use OCA\Files_Versions\AppInfo\Application; -use OCA\Files_Versions\Storage; use OCA\Files_Versions\Expiration; +use OCA\Files_Versions\Storage; +use OCP\IUser; +use OCP\IUserManager; class ExpireVersions extends \OC\BackgroundJob\TimedJob { diff --git a/apps/files_versions/lib/Events/CreateVersionEvent.php b/apps/files_versions/lib/Events/CreateVersionEvent.php index 0669034431bbb413e97a1a48dc167858f7d4d190..8df0c8144df14a26f78faaf66227e887c4a8c71f 100644 --- a/apps/files_versions/lib/Events/CreateVersionEvent.php +++ b/apps/files_versions/lib/Events/CreateVersionEvent.php @@ -21,11 +21,10 @@ * */ - namespace OCA\Files_Versions\Events; -use OCP\Files\Node; use OCP\EventDispatcher\Event; +use OCP\Files\Node; /** * Class CreateVersionEvent diff --git a/apps/files_versions/lib/Expiration.php b/apps/files_versions/lib/Expiration.php index 83195d10a30728c1f962986c5beff8599c94b3b9..23df07b0a7eabc115eaaf292069e29a0d15591a4 100644 --- a/apps/files_versions/lib/Expiration.php +++ b/apps/files_versions/lib/Expiration.php @@ -22,8 +22,8 @@ namespace OCA\Files_Versions; -use \OCP\IConfig; -use \OCP\AppFramework\Utility\ITimeFactory; +use OCP\AppFramework\Utility\ITimeFactory; +use OCP\IConfig; class Expiration { diff --git a/apps/files_versions/lib/Listener/LoadAdditionalListener.php b/apps/files_versions/lib/Listener/LoadAdditionalListener.php index ad08f10e46c3a926bab8e3e62e652027b847576f..aeea35e80cdddce6563253bd144daff5bd04cd48 100644 --- a/apps/files_versions/lib/Listener/LoadAdditionalListener.php +++ b/apps/files_versions/lib/Listener/LoadAdditionalListener.php @@ -25,8 +25,8 @@ declare(strict_types=1); namespace OCA\Files_Versions\Listener; -use OCA\Files_Versions\AppInfo\Application; use OCA\Files\Event\LoadAdditionalScriptsEvent; +use OCA\Files_Versions\AppInfo\Application; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventListener; use OCP\Util; diff --git a/apps/files_versions/lib/Listener/LoadSidebarListener.php b/apps/files_versions/lib/Listener/LoadSidebarListener.php index 37125064caf00775ed8fc8d18f9a93c4fb6b879d..481f245b610c59d1738a69883afcb984f6caab61 100644 --- a/apps/files_versions/lib/Listener/LoadSidebarListener.php +++ b/apps/files_versions/lib/Listener/LoadSidebarListener.php @@ -25,8 +25,8 @@ declare(strict_types=1); namespace OCA\Files_Versions\Listener; -use OCA\Files_Versions\AppInfo\Application; use OCA\Files\Event\LoadSidebar; +use OCA\Files_Versions\AppInfo\Application; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventListener; use OCP\Util; diff --git a/apps/files_versions/lib/Sabre/RestoreFolder.php b/apps/files_versions/lib/Sabre/RestoreFolder.php index c8504646bad5dd6ce585426d23f0b3b2bd955b81..880d501b408f65e84a0a679976d61bc266816667 100644 --- a/apps/files_versions/lib/Sabre/RestoreFolder.php +++ b/apps/files_versions/lib/Sabre/RestoreFolder.php @@ -30,7 +30,6 @@ use Sabre\DAV\ICollection; use Sabre\DAV\IMoveTarget; use Sabre\DAV\INode; - class RestoreFolder implements ICollection, IMoveTarget { public function createFile($name, $data = null) { throw new Forbidden(); diff --git a/apps/files_versions/lib/Sabre/VersionRoot.php b/apps/files_versions/lib/Sabre/VersionRoot.php index 1c689a4d87bcabe00e7531a4903949e09b939538..68b256d4771bffcc9242155d9dfd0f62296a60cd 100644 --- a/apps/files_versions/lib/Sabre/VersionRoot.php +++ b/apps/files_versions/lib/Sabre/VersionRoot.php @@ -21,6 +21,7 @@ declare(strict_types=1); * along with this program. If not, see . * */ + namespace OCA\Files_Versions\Sabre; use OCA\Files_Versions\Versions\IVersionManager; diff --git a/apps/files_versions/tests/Command/CleanupTest.php b/apps/files_versions/tests/Command/CleanupTest.php index 289c7123c24cdfbd0df2ec799becac5ee2302886..48720d2fbcc2018a5891d3eedd087f5972cb0846 100644 --- a/apps/files_versions/tests/Command/CleanupTest.php +++ b/apps/files_versions/tests/Command/CleanupTest.php @@ -22,14 +22,13 @@ * */ - namespace OCA\Files_Versions\Tests\Command; -use OCA\Files_Versions\Command\CleanUp; -use Test\TestCase; use OC\User\Manager; +use OCA\Files_Versions\Command\CleanUp; use OCP\Files\IRootFolder; +use Test\TestCase; /** * Class CleanupTest diff --git a/apps/files_versions/tests/ExpirationTest.php b/apps/files_versions/tests/ExpirationTest.php index a7c34b7ac7023541af4eee1e51a15a455f740466..3502132b2f2fe92df9300bbd14456c830749e00c 100644 --- a/apps/files_versions/tests/ExpirationTest.php +++ b/apps/files_versions/tests/ExpirationTest.php @@ -24,7 +24,7 @@ namespace OCA\Files_Versions\Tests; -use \OCA\Files_Versions\Expiration; +use OCA\Files_Versions\Expiration; use OCP\AppFramework\Utility\ITimeFactory; use OCP\IConfig; use PHPUnit\Framework\MockObject\MockObject; diff --git a/apps/lookup_server_connector/lib/AppInfo/Application.php b/apps/lookup_server_connector/lib/AppInfo/Application.php index 66bd2dd062c596cf8421318695e47313c2d3104e..4e91972832879e6b68a9819a79b2cb9353e96c5e 100644 --- a/apps/lookup_server_connector/lib/AppInfo/Application.php +++ b/apps/lookup_server_connector/lib/AppInfo/Application.php @@ -19,6 +19,7 @@ declare(strict_types=1); * along with this program. If not, see . * */ + namespace OCA\LookupServerConnector\AppInfo; use OCA\LookupServerConnector\UpdateLookupServer; diff --git a/apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php b/apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php index 0a7e3cd5b9bc228e71502310fa42b6e21f651d85..2421dda5d43dc0bb700b1f747b217af97053201f 100644 --- a/apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php +++ b/apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php @@ -27,8 +27,8 @@ namespace OCA\LookupServerConnector\BackgroundJobs; use OC\Security\IdentityProof\Signer; use OCP\Accounts\IAccountManager; use OCP\AppFramework\Utility\ITimeFactory; -use OCP\BackgroundJob\Job; use OCP\BackgroundJob\IJobList; +use OCP\BackgroundJob\Job; use OCP\Http\Client\IClientService; use OCP\IConfig; use OCP\ILogger; diff --git a/apps/oauth2/lib/Controller/OauthApiController.php b/apps/oauth2/lib/Controller/OauthApiController.php index b05d3781e5c1646ec458f4f51826a25d4944d621..82806e228d08cb9c5b05d66c3c56ed1014b9ee2d 100644 --- a/apps/oauth2/lib/Controller/OauthApiController.php +++ b/apps/oauth2/lib/Controller/OauthApiController.php @@ -22,8 +22,8 @@ declare(strict_types=1); namespace OCA\OAuth2\Controller; -use OC\Authentication\Exceptions\InvalidTokenException; use OC\Authentication\Exceptions\ExpiredTokenException; +use OC\Authentication\Exceptions\InvalidTokenException; use OC\Authentication\Token\IProvider as TokenProvider; use OC\Security\Bruteforce\Throttler; use OCA\OAuth2\Db\AccessTokenMapper; diff --git a/apps/oauth2/lib/Migration/Version010401Date20181207190718.php b/apps/oauth2/lib/Migration/Version010401Date20181207190718.php index 14d925d3b6f5fd23198f03d1c06bb8eafc782b07..aa0dbc1a53c7dce67f7d06ed6f6e50a164d75005 100644 --- a/apps/oauth2/lib/Migration/Version010401Date20181207190718.php +++ b/apps/oauth2/lib/Migration/Version010401Date20181207190718.php @@ -26,8 +26,8 @@ namespace OCA\OAuth2\Migration; use Closure; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version010401Date20181207190718 extends SimpleMigrationStep { diff --git a/apps/oauth2/lib/Migration/Version010402Date20190107124745.php b/apps/oauth2/lib/Migration/Version010402Date20190107124745.php index 487eee49c4497b4b89dc61a79ef5987531d513b9..b47ddff237bb5d95db495272d40703412ef02f3c 100644 --- a/apps/oauth2/lib/Migration/Version010402Date20190107124745.php +++ b/apps/oauth2/lib/Migration/Version010402Date20190107124745.php @@ -26,8 +26,8 @@ namespace OCA\OAuth2\Migration; use Closure; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version010402Date20190107124745 extends SimpleMigrationStep { diff --git a/apps/oauth2/tests/Controller/OauthApiControllerTest.php b/apps/oauth2/tests/Controller/OauthApiControllerTest.php index f5a8138fa2d2e60b8c72f8e73dcca526adb882f7..04fd3d6ecd97b39d67352c85c20ba0620928fc94 100644 --- a/apps/oauth2/tests/Controller/OauthApiControllerTest.php +++ b/apps/oauth2/tests/Controller/OauthApiControllerTest.php @@ -21,8 +21,8 @@ namespace OCA\OAuth2\Tests\Controller; -use OC\Authentication\Exceptions\InvalidTokenException; use OC\Authentication\Exceptions\ExpiredTokenException; +use OC\Authentication\Exceptions\InvalidTokenException; use OC\Authentication\Token\DefaultToken; use OC\Authentication\Token\IProvider as TokenProvider; use OC\Security\Bruteforce\Throttler; diff --git a/apps/oauth2/tests/Settings/AdminTest.php b/apps/oauth2/tests/Settings/AdminTest.php index c09a7b3420c11d4c362652c060ec469fee68049a..c6f7ab2a0e88d0b178ceb1fc71af778a328ac473 100644 --- a/apps/oauth2/tests/Settings/AdminTest.php +++ b/apps/oauth2/tests/Settings/AdminTest.php @@ -26,8 +26,8 @@ use OCA\OAuth2\Db\ClientMapper; use OCA\OAuth2\Settings\Admin; use OCP\AppFramework\Http\TemplateResponse; use OCP\IInitialStateService; -use Test\TestCase; use PHPUnit\Framework\MockObject\MockObject; +use Test\TestCase; class AdminTest extends TestCase { diff --git a/apps/provisioning_api/lib/AppInfo/Application.php b/apps/provisioning_api/lib/AppInfo/Application.php index d642d095d5df9876ae816ca10f6e147fcdfd46aa..317be717fce0f1d8b9fd33f170b02900d5878539 100644 --- a/apps/provisioning_api/lib/AppInfo/Application.php +++ b/apps/provisioning_api/lib/AppInfo/Application.php @@ -22,12 +22,13 @@ * along with this program. If not, see . * */ + namespace OCA\Provisioning_API\AppInfo; use OC\AppFramework\Utility\SimpleContainer; use OC\AppFramework\Utility\TimeFactory; -use OCA\Settings\Mailer\NewUserMailHelper; use OCA\Provisioning_API\Middleware\ProvisioningApiMiddleware; +use OCA\Settings\Mailer\NewUserMailHelper; use OCP\AppFramework\App; use OCP\AppFramework\Utility\IControllerMethodReflector; use OCP\Defaults; diff --git a/apps/provisioning_api/lib/Controller/AUserData.php b/apps/provisioning_api/lib/Controller/AUserData.php index 780d4f7a761bdb7a28d19ae35f7d23de2a65be67..8804dc21031f2fcd90f65a9286b804163a165724 100644 --- a/apps/provisioning_api/lib/Controller/AUserData.php +++ b/apps/provisioning_api/lib/Controller/AUserData.php @@ -24,11 +24,11 @@ namespace OCA\Provisioning_API\Controller; use OC\Accounts\AccountManager; use OC\User\Backend; use OC\User\NoUserException; +use OC_Helper; use OCP\AppFramework\OCS\OCSException; use OCP\AppFramework\OCS\OCSNotFoundException; use OCP\AppFramework\OCSController; use OCP\Files\NotFoundException; -use OC_Helper; use OCP\IConfig; use OCP\IGroupManager; use OCP\IRequest; diff --git a/apps/provisioning_api/lib/Controller/AppsController.php b/apps/provisioning_api/lib/Controller/AppsController.php index 3ceb16c1b0d694803c26b3d2c81dedac9a0f77e8..63d08ebf57d4998bd785a6881115e71d49c7742d 100644 --- a/apps/provisioning_api/lib/Controller/AppsController.php +++ b/apps/provisioning_api/lib/Controller/AppsController.php @@ -27,7 +27,7 @@ declare(strict_types=1); namespace OCA\Provisioning_API\Controller; -use \OC_App; +use OC_App; use OCP\App\AppPathNotFoundException; use OCP\App\IAppManager; use OCP\AppFramework\Http\DataResponse; diff --git a/apps/provisioning_api/lib/Controller/GroupsController.php b/apps/provisioning_api/lib/Controller/GroupsController.php index 72285f55192b62cca6d118890b1be0af0cd5eabf..b758c75ca21bbbc8e596d551a09144abec43f68d 100644 --- a/apps/provisioning_api/lib/Controller/GroupsController.php +++ b/apps/provisioning_api/lib/Controller/GroupsController.php @@ -31,16 +31,16 @@ namespace OCA\Provisioning_API\Controller; use OC\Accounts\AccountManager; use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\OCS\OCSException; -use OCP\AppFramework\OCS\OCSNotFoundException; use OCP\AppFramework\OCS\OCSForbiddenException; +use OCP\AppFramework\OCS\OCSNotFoundException; use OCP\IConfig; use OCP\IGroup; use OCP\IGroupManager; use OCP\ILogger; use OCP\IRequest; +use OCP\IUser; use OCP\IUserManager; use OCP\IUserSession; -use OCP\IUser; class GroupsController extends AUserData { diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php index c69c7d62605705eedbd972391dab40e6f8ddc996..ced4f72178c9f568547f43949ff8f2074927423b 100644 --- a/apps/provisioning_api/lib/Controller/UsersController.php +++ b/apps/provisioning_api/lib/Controller/UsersController.php @@ -36,8 +36,8 @@ namespace OCA\Provisioning_API\Controller; use OC\Accounts\AccountManager; use OC\Authentication\Token\RemoteWipe; use OC\HintException; -use OCA\Settings\Mailer\NewUserMailHelper; use OCA\Provisioning_API\FederatedFileSharingFactory; +use OCA\Settings\Mailer\NewUserMailHelper; use OCP\App\IAppManager; use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\OCS\OCSException; diff --git a/apps/provisioning_api/lib/Middleware/Exceptions/NotSubAdminException.php b/apps/provisioning_api/lib/Middleware/Exceptions/NotSubAdminException.php index 11ffb8b0903fec1e109488e7d04c8a5f9a81ea3b..f9f063b8834f8322f3318cd54e1ccbbb38474620 100644 --- a/apps/provisioning_api/lib/Middleware/Exceptions/NotSubAdminException.php +++ b/apps/provisioning_api/lib/Middleware/Exceptions/NotSubAdminException.php @@ -21,6 +21,7 @@ * along with this program. If not, see . * */ + namespace OCA\Provisioning_API\Middleware\Exceptions; use OCP\AppFramework\Http; @@ -29,4 +30,4 @@ class NotSubAdminException extends \Exception { public function __construct() { parent::__construct('Logged in user must be at least a sub admin', Http::STATUS_FORBIDDEN); } -} \ No newline at end of file +} diff --git a/apps/provisioning_api/lib/Middleware/ProvisioningApiMiddleware.php b/apps/provisioning_api/lib/Middleware/ProvisioningApiMiddleware.php index c882ec1027957ebdec61a0c0c54fd28f836adf93..780f541184f6f8750618108116f8582a50ae642b 100644 --- a/apps/provisioning_api/lib/Middleware/ProvisioningApiMiddleware.php +++ b/apps/provisioning_api/lib/Middleware/ProvisioningApiMiddleware.php @@ -23,6 +23,7 @@ declare(strict_types=1); * along with this program. If not, see . * */ + namespace OCA\Provisioning_API\Middleware; use OCA\Provisioning_API\Middleware\Exceptions\NotSubAdminException; diff --git a/apps/provisioning_api/tests/Controller/UsersControllerTest.php b/apps/provisioning_api/tests/Controller/UsersControllerTest.php index d1b0754633d20fd9362833191fbd5134547c4412..e47db4fd51dc1e61a0d2deb6f4947b73b548178a 100644 --- a/apps/provisioning_api/tests/Controller/UsersControllerTest.php +++ b/apps/provisioning_api/tests/Controller/UsersControllerTest.php @@ -35,24 +35,24 @@ use Exception; use OC\Accounts\AccountManager; use OC\Authentication\Token\RemoteWipe; use OC\Group\Manager; +use OC\SubAdmin; use OCA\FederatedFileSharing\AppInfo\Application; use OCA\FederatedFileSharing\FederatedShareProvider; +use OCA\Provisioning_API\Controller\UsersController; use OCA\Provisioning_API\FederatedFileSharingFactory; -use OCP\App\IAppManager; -use OCP\Mail\IEMailTemplate; use OCA\Settings\Mailer\NewUserMailHelper; -use OC\SubAdmin; -use OCA\Provisioning_API\Controller\UsersController; +use OCP\App\IAppManager; use OCP\AppFramework\Http\DataResponse; use OCP\IConfig; use OCP\IGroup; -use OCP\ILogger; use OCP\IL10N; +use OCP\ILogger; use OCP\IRequest; use OCP\IUser; use OCP\IUserManager; use OCP\IUserSession; use OCP\L10N\IFactory; +use OCP\Mail\IEMailTemplate; use OCP\Security\ISecureRandom; use OCP\UserInterface; use PHPUnit\Framework\MockObject\MockObject; diff --git a/apps/provisioning_api/tests/Middleware/ProvisioningApiMiddlewareTest.php b/apps/provisioning_api/tests/Middleware/ProvisioningApiMiddlewareTest.php index 2d8b79842f288020490b19bea6e32e661d7c957b..5ebc43d2b1d60ac0cebc3ae12ca7142b79e82e4b 100644 --- a/apps/provisioning_api/tests/Middleware/ProvisioningApiMiddlewareTest.php +++ b/apps/provisioning_api/tests/Middleware/ProvisioningApiMiddlewareTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OCA\Provisioning_API\Tests\Middleware; use OCA\Provisioning_API\Middleware\Exceptions\NotSubAdminException; diff --git a/apps/provisioning_api/tests/TestCase.php b/apps/provisioning_api/tests/TestCase.php index 1ff2c82a3bed4524884280e6474bd0b9c0c72437..7d65c5bc1bc65d3b4c3528aef04894abf82a4191 100644 --- a/apps/provisioning_api/tests/TestCase.php +++ b/apps/provisioning_api/tests/TestCase.php @@ -25,9 +25,9 @@ namespace OCA\Provisioning_API\Tests; +use OCP\IGroupManager; use OCP\IUser; use OCP\IUserManager; -use OCP\IGroupManager; abstract class TestCase extends \Test\TestCase { diff --git a/apps/settings/lib/BackgroundJobs/VerifyUserData.php b/apps/settings/lib/BackgroundJobs/VerifyUserData.php index caac35f2de4d03b9962ee452f64751bea8ccaa3c..b4bc80b4ab500b0e2931715c3a7196e0b94c308e 100644 --- a/apps/settings/lib/BackgroundJobs/VerifyUserData.php +++ b/apps/settings/lib/BackgroundJobs/VerifyUserData.php @@ -23,7 +23,6 @@ * */ - namespace OCA\Settings\BackgroundJobs; diff --git a/apps/settings/lib/Controller/AppSettingsController.php b/apps/settings/lib/Controller/AppSettingsController.php index 93bb2cbb423e638d647fbb7dc073ea557cf59a49..e0dddb68b4e9bdd42cea6c85d48c38f4524f02dd 100644 --- a/apps/settings/lib/Controller/AppSettingsController.php +++ b/apps/settings/lib/Controller/AppSettingsController.php @@ -40,16 +40,16 @@ use OC\App\Platform; use OC\Installer; use OC_App; use OCP\App\IAppManager; -use \OCP\AppFramework\Controller; +use OCP\AppFramework\Controller; use OCP\AppFramework\Http; use OCP\AppFramework\Http\ContentSecurityPolicy; use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\TemplateResponse; +use OCP\IConfig; +use OCP\IL10N; use OCP\ILogger; use OCP\INavigationManager; use OCP\IRequest; -use OCP\IL10N; -use OCP\IConfig; use OCP\IURLGenerator; use OCP\L10N\IFactory; diff --git a/apps/settings/lib/Controller/AuthSettingsController.php b/apps/settings/lib/Controller/AuthSettingsController.php index 8325c9112831e02774a30bad830c96979d18d833..cb2abc2a52d2adffb57a7af7c23f457adae69566 100644 --- a/apps/settings/lib/Controller/AuthSettingsController.php +++ b/apps/settings/lib/Controller/AuthSettingsController.php @@ -28,8 +28,8 @@ namespace OCA\Settings\Controller; use BadMethodCallException; -use OC\Authentication\Exceptions\InvalidTokenException; use OC\Authentication\Exceptions\ExpiredTokenException; +use OC\Authentication\Exceptions\InvalidTokenException; use OC\Authentication\Exceptions\PasswordlessTokenException; use OC\Authentication\Exceptions\WipeTokenException; use OC\Authentication\Token\INamedToken; diff --git a/apps/settings/lib/Controller/ChangePasswordController.php b/apps/settings/lib/Controller/ChangePasswordController.php index 96b8867fff8265bbe33c0e59fbb77bad3ba8392e..cabbfdf4387210cb78264c77aacb1092c4c4f573 100644 --- a/apps/settings/lib/Controller/ChangePasswordController.php +++ b/apps/settings/lib/Controller/ChangePasswordController.php @@ -27,6 +27,7 @@ * along with this program. If not, see . * */ + namespace OCA\Settings\Controller; use OC\HintException; diff --git a/apps/settings/lib/Controller/CommonSettingsTrait.php b/apps/settings/lib/Controller/CommonSettingsTrait.php index 69fe28d6fe5fe571e3c8c0cdaa6e2d6f579df8fa..c43587cb4101db2c88c9c1d7e8cb67e507ab10c0 100644 --- a/apps/settings/lib/Controller/CommonSettingsTrait.php +++ b/apps/settings/lib/Controller/CommonSettingsTrait.php @@ -30,8 +30,8 @@ use OCP\IGroupManager; use OCP\INavigationManager; use OCP\IUser; use OCP\IUserSession; -use OCP\Settings\IManager as ISettingsManager; use OCP\Settings\IIconSection; +use OCP\Settings\IManager as ISettingsManager; use OCP\Settings\ISettings; trait CommonSettingsTrait { diff --git a/apps/settings/lib/Controller/MailSettingsController.php b/apps/settings/lib/Controller/MailSettingsController.php index 3f91586b98e13dd20736606ac494efd36214d2a2..cb77d9c4052cccb6b9000a3b0f9eedcbcaf3f06a 100644 --- a/apps/settings/lib/Controller/MailSettingsController.php +++ b/apps/settings/lib/Controller/MailSettingsController.php @@ -28,9 +28,9 @@ namespace OCA\Settings\Controller; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; use OCP\AppFramework\Http\DataResponse; -use OCP\IRequest; -use OCP\IL10N; use OCP\IConfig; +use OCP\IL10N; +use OCP\IRequest; use OCP\IUserSession; use OCP\Mail\IMailer; diff --git a/apps/settings/lib/Controller/UsersController.php b/apps/settings/lib/Controller/UsersController.php index cb99d1bd74b6771f1a1d8c136f383c80fa409f65..2c73ff50871eb4620b969f058c7f066c2524c1ad 100644 --- a/apps/settings/lib/Controller/UsersController.php +++ b/apps/settings/lib/Controller/UsersController.php @@ -44,6 +44,7 @@ use OC\AppFramework\Http; use OC\Encryption\Exceptions\ModuleDoesNotExistsException; use OC\ForbiddenException; use OC\Security\IdentityProof\Manager; +use OCA\Settings\BackgroundJobs\VerifyUserData; use OCA\User_LDAP\User_Proxy; use OCP\App\IAppManager; use OCP\AppFramework\Controller; @@ -60,7 +61,6 @@ use OCP\IUserManager; use OCP\IUserSession; use OCP\L10N\IFactory; use OCP\Mail\IMailer; -use OCA\Settings\BackgroundJobs\VerifyUserData; class UsersController extends Controller { /** @var IUserManager */ diff --git a/apps/settings/lib/Mailer/NewUserMailHelper.php b/apps/settings/lib/Mailer/NewUserMailHelper.php index a927080df926c1331d0dd094017fb251dc022d8b..56d3bcb8cb74a4d52b7f281c2e0c5efc42c5b1d7 100644 --- a/apps/settings/lib/Mailer/NewUserMailHelper.php +++ b/apps/settings/lib/Mailer/NewUserMailHelper.php @@ -26,14 +26,14 @@ namespace OCA\Settings\Mailer; -use OCP\L10N\IFactory; -use OCP\Mail\IEMailTemplate; use OCP\AppFramework\Utility\ITimeFactory; use OCP\Defaults; use OCP\IConfig; use OCP\IL10N; use OCP\IURLGenerator; use OCP\IUser; +use OCP\L10N\IFactory; +use OCP\Mail\IEMailTemplate; use OCP\Mail\IMailer; use OCP\Security\ICrypto; use OCP\Security\ISecureRandom; diff --git a/apps/settings/lib/Settings/Personal/Security.php b/apps/settings/lib/Settings/Personal/Security.php index c4c4cd0375c4c0bf12cc1306fdb8fb67e9b3d4c0..7c0f196a856d9a0a3ec759bd06835df5443c1b3b 100644 --- a/apps/settings/lib/Settings/Personal/Security.php +++ b/apps/settings/lib/Settings/Personal/Security.php @@ -36,13 +36,13 @@ use OC\Authentication\TwoFactorAuth\ProviderLoader; use OCP\AppFramework\Http\TemplateResponse; use OCP\Authentication\TwoFactorAuth\IProvider; use OCP\Authentication\TwoFactorAuth\IProvidesPersonalSettings; +use OCP\IConfig; use OCP\IInitialStateService; use OCP\ISession; use OCP\IUserManager; use OCP\IUserSession; use OCP\Session\Exceptions\SessionNotAvailableException; use OCP\Settings\ISettings; -use OCP\IConfig; class Security implements ISettings { diff --git a/apps/settings/lib/Settings/Personal/ServerDevNotice.php b/apps/settings/lib/Settings/Personal/ServerDevNotice.php index 800bec992a276c621afceb8797a433a172a7c573..9019a63f4734ba9dabe801e837b608ef9e92ec43 100644 --- a/apps/settings/lib/Settings/Personal/ServerDevNotice.php +++ b/apps/settings/lib/Settings/Personal/ServerDevNotice.php @@ -21,6 +21,7 @@ * along with this program. If not, see . * */ + namespace OCA\Settings\Personal; use OCP\AppFramework\Http\TemplateResponse; diff --git a/apps/settings/tests/Controller/AdminSettingsControllerTest.php b/apps/settings/tests/Controller/AdminSettingsControllerTest.php index f1f81c7c75b5fd1f570fb5c127796df8fb40f195..2789fe009741d6bad6267dab4b2a6aa5a23f78cd 100644 --- a/apps/settings/tests/Controller/AdminSettingsControllerTest.php +++ b/apps/settings/tests/Controller/AdminSettingsControllerTest.php @@ -20,10 +20,11 @@ * along with this program. If not, see . * */ + namespace OCA\Settings\Tests\Controller; -use OCA\Settings\Personal\ServerDevNotice; use OCA\Settings\Controller\AdminSettingsController; +use OCA\Settings\Personal\ServerDevNotice; use OCP\AppFramework\Http\TemplateResponse; use OCP\Group\ISubAdmin; use OCP\IGroupManager; diff --git a/apps/settings/tests/Controller/AppSettingsControllerTest.php b/apps/settings/tests/Controller/AppSettingsControllerTest.php index 449f158ec4a073ba3c1b9ecfb3cd0cba68066403..9b09631226fa91da62072f179884623d3e236e2e 100644 --- a/apps/settings/tests/Controller/AppSettingsControllerTest.php +++ b/apps/settings/tests/Controller/AppSettingsControllerTest.php @@ -27,19 +27,19 @@ use OC\App\AppStore\Fetcher\AppFetcher; use OC\App\AppStore\Fetcher\CategoryFetcher; use OC\Installer; use OCA\Settings\Controller\AppSettingsController; +use OCP\App\IAppManager; use OCP\AppFramework\Http\ContentSecurityPolicy; use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\TemplateResponse; +use OCP\IConfig; +use OCP\IL10N; use OCP\ILogger; +use OCP\INavigationManager; +use OCP\IRequest; use OCP\IURLGenerator; use OCP\L10N\IFactory; use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; -use OCP\IRequest; -use OCP\IL10N; -use OCP\IConfig; -use OCP\INavigationManager; -use OCP\App\IAppManager; /** * Class AppSettingsControllerTest diff --git a/apps/settings/tests/Controller/AuthSettingsControllerTest.php b/apps/settings/tests/Controller/AuthSettingsControllerTest.php index 40000e191717ffb7c5d389fac99fd4308c984a28..ff698ffe225b049ced4f18d9a209ddbf669ad30c 100644 --- a/apps/settings/tests/Controller/AuthSettingsControllerTest.php +++ b/apps/settings/tests/Controller/AuthSettingsControllerTest.php @@ -22,8 +22,8 @@ namespace Test\Settings\Controller; use OC\AppFramework\Http; -use OC\Authentication\Exceptions\InvalidTokenException; use OC\Authentication\Exceptions\ExpiredTokenException; +use OC\Authentication\Exceptions\InvalidTokenException; use OC\Authentication\Token\DefaultToken; use OC\Authentication\Token\IProvider; use OC\Authentication\Token\IToken; diff --git a/apps/settings/tests/Controller/CertificateControllerTest.php b/apps/settings/tests/Controller/CertificateControllerTest.php index a36cc20177975d6442f0fa9892cf546ae5caa73d..ed0e7775dc10ab98ca547eb6039531cd9457272d 100644 --- a/apps/settings/tests/Controller/CertificateControllerTest.php +++ b/apps/settings/tests/Controller/CertificateControllerTest.php @@ -25,9 +25,9 @@ use OCA\Settings\Controller\CertificateController; use OCP\App\IAppManager; use OCP\AppFramework\Http; use OCP\AppFramework\Http\DataResponse; -use OCP\IRequest; -use OCP\IL10N; use OCP\ICertificateManager; +use OCP\IL10N; +use OCP\IRequest; /** * Class CertificateControllerTest diff --git a/apps/settings/tests/Controller/CheckSetupControllerTest.php b/apps/settings/tests/Controller/CheckSetupControllerTest.php index 23e282b6eb4c2c509cdc67e73ac8479b35ced112..4d6a4c21f00056f2f1145f0048ca8e163c649b05 100644 --- a/apps/settings/tests/Controller/CheckSetupControllerTest.php +++ b/apps/settings/tests/Controller/CheckSetupControllerTest.php @@ -23,6 +23,7 @@ namespace OCA\Settings\Tests\Controller; use OC; use OC\DB\Connection; +use OC\IntegrityCheck\Checker; use OC\MemoryInfo; use OC\Security\SecureRandom; use OCA\Settings\Controller\CheckSetupController; @@ -42,7 +43,6 @@ use PHPUnit\Framework\MockObject\MockObject; use Psr\Http\Message\ResponseInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Test\TestCase; -use OC\IntegrityCheck\Checker; /** * Class CheckSetupControllerTest diff --git a/apps/settings/tests/Controller/MailSettingsControllerTest.php b/apps/settings/tests/Controller/MailSettingsControllerTest.php index 7b12ca03e6c5bf8cccbd5b15e2a64d5dcf1c83d3..1607926219e8e48dd11eda6f660677e40a9f2824 100644 --- a/apps/settings/tests/Controller/MailSettingsControllerTest.php +++ b/apps/settings/tests/Controller/MailSettingsControllerTest.php @@ -14,6 +14,7 @@ namespace OCA\Settings\Tests\Controller; use OC\Mail\Message; +use OC\User\User; use OCA\Settings\Controller\MailSettingsController; use OCP\AppFramework\Http; use OCP\IConfig; @@ -22,7 +23,6 @@ use OCP\IRequest; use OCP\IUserSession; use OCP\Mail\IEMailTemplate; use OCP\Mail\IMailer; -use OC\User\User; /** * @package Tests\Settings\Controller diff --git a/apps/settings/tests/Mailer/NewUserMailHelperTest.php b/apps/settings/tests/Mailer/NewUserMailHelperTest.php index 20e6612f94e49e805f0959c6b4c90838873fbac0..f99af1e2f91e5cee7996668fc1fd5157f34db94c 100644 --- a/apps/settings/tests/Mailer/NewUserMailHelperTest.php +++ b/apps/settings/tests/Mailer/NewUserMailHelperTest.php @@ -22,8 +22,6 @@ namespace OCA\Settings\Tests\Mailer; use OC\Mail\EMailTemplate; -use OCP\L10N\IFactory; -use OCP\Mail\IEMailTemplate; use OC\Mail\Message; use OCA\Settings\Mailer\NewUserMailHelper; use OCP\AppFramework\Utility\ITimeFactory; @@ -32,6 +30,8 @@ use OCP\IConfig; use OCP\IL10N; use OCP\IURLGenerator; use OCP\IUser; +use OCP\L10N\IFactory; +use OCP\Mail\IEMailTemplate; use OCP\Mail\IMailer; use OCP\Security\ICrypto; use OCP\Security\ISecureRandom; diff --git a/apps/settings/tests/Settings/Personal/SecurityTest.php b/apps/settings/tests/Settings/Personal/SecurityTest.php index ee72ca003842da8f9a4467f13f9ad8320538c2da..a55469c21e55aa54a98ae7fa8f446b4cc45d04b5 100644 --- a/apps/settings/tests/Settings/Personal/SecurityTest.php +++ b/apps/settings/tests/Settings/Personal/SecurityTest.php @@ -25,10 +25,10 @@ declare(strict_types=1); namespace OCA\Settings\Tests\Settings\Personal; use OC\Authentication\TwoFactorAuth\ProviderLoader; -use OCP\IInitialStateService; use OCA\Settings\Personal\Security; use OCP\AppFramework\Http\TemplateResponse; use OCP\IConfig; +use OCP\IInitialStateService; use OCP\IUser; use OCP\IUserManager; use OCP\IUserSession; diff --git a/apps/sharebymail/lib/AppInfo/Application.php b/apps/sharebymail/lib/AppInfo/Application.php index 3eabc9ec89f60e95de2dc236e8bc3abf694b5b97..e6f9b060337797770d9c01ec965308f7b7983e18 100644 --- a/apps/sharebymail/lib/AppInfo/Application.php +++ b/apps/sharebymail/lib/AppInfo/Application.php @@ -19,14 +19,13 @@ * */ - namespace OCA\ShareByMail\AppInfo; +use OCA\ShareByMail\Capabilities; use OCA\ShareByMail\Settings; use OCP\AppFramework\App; use OCP\Util; -use OCA\ShareByMail\Capabilities; class Application extends App { diff --git a/apps/sharebymail/lib/Capabilities.php b/apps/sharebymail/lib/Capabilities.php index de57cd132119821260a2efdf7485d5b0e935b818..020ed41364eeb6168318d11a24cf3901db47f245 100644 --- a/apps/sharebymail/lib/Capabilities.php +++ b/apps/sharebymail/lib/Capabilities.php @@ -19,7 +19,6 @@ * */ - namespace OCA\ShareByMail; diff --git a/apps/sharebymail/lib/Settings.php b/apps/sharebymail/lib/Settings.php index e032bc43ff109dd7e638493742946883a18ec53f..6d8ca66b763e47aa15d01ca37d5d4e32ba3755ca 100644 --- a/apps/sharebymail/lib/Settings.php +++ b/apps/sharebymail/lib/Settings.php @@ -19,7 +19,6 @@ * */ - namespace OCA\ShareByMail; diff --git a/apps/sharebymail/lib/Settings/Admin.php b/apps/sharebymail/lib/Settings/Admin.php index 93a8d3aafa4a27b7c463746dfc0d92fe8a0a3559..e3d40c8d873ae8926420bb3d204ba1c39826630d 100644 --- a/apps/sharebymail/lib/Settings/Admin.php +++ b/apps/sharebymail/lib/Settings/Admin.php @@ -19,7 +19,6 @@ * */ - namespace OCA\ShareByMail\Settings; use OCP\AppFramework\Http\TemplateResponse; diff --git a/apps/sharebymail/lib/Settings/SettingsManager.php b/apps/sharebymail/lib/Settings/SettingsManager.php index 2b35e5833a7edce6b229491d4f0060043a5004e5..e041d75656decebece1d5aed4f2b347fa8311ff1 100644 --- a/apps/sharebymail/lib/Settings/SettingsManager.php +++ b/apps/sharebymail/lib/Settings/SettingsManager.php @@ -19,7 +19,6 @@ * */ - namespace OCA\ShareByMail\Settings; diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php index 903df175e9cc63c3719867b0c6174a1dc9cf6fac..f77155af0b97f828d8540671102c8d43ee9e40d4 100644 --- a/apps/sharebymail/lib/ShareByMailProvider.php +++ b/apps/sharebymail/lib/ShareByMailProvider.php @@ -24,6 +24,7 @@ namespace OCA\ShareByMail; use OC\CapabilitiesManager; use OC\HintException; use OC\Share20\Exception\InvalidShare; +use OC\Share20\Share; use OC\User\NoUserException; use OCA\ShareByMail\Settings\SettingsManager; use OCP\Activity\IManager; @@ -41,7 +42,6 @@ use OCP\IUserManager; use OCP\Mail\IMailer; use OCP\Security\IHasher; use OCP\Security\ISecureRandom; -use OC\Share20\Share; use OCP\Share\Exceptions\GenericShareException; use OCP\Share\Exceptions\ShareNotFound; use OCP\Share\IShare; diff --git a/apps/sharebymail/tests/SettingsTest.php b/apps/sharebymail/tests/SettingsTest.php index 8b2fc200d57b3ecfb3d06f9786f826561e6fa339..b7150e6c6dcdfb006ffca4cc7a59bf31ed7e2491 100644 --- a/apps/sharebymail/tests/SettingsTest.php +++ b/apps/sharebymail/tests/SettingsTest.php @@ -19,7 +19,6 @@ * */ - namespace OCA\ShareByMail\Tests; diff --git a/apps/sharebymail/tests/ShareByMailProviderTest.php b/apps/sharebymail/tests/ShareByMailProviderTest.php index 090e6e92848555daa416cff1f301adfff6c4ffe4..744c2d6f3ee1015124a69bf31deb7faaee68e582 100644 --- a/apps/sharebymail/tests/ShareByMailProviderTest.php +++ b/apps/sharebymail/tests/ShareByMailProviderTest.php @@ -19,7 +19,6 @@ * */ - namespace OCA\ShareByMail\Tests; diff --git a/apps/systemtags/lib/Activity/Setting.php b/apps/systemtags/lib/Activity/Setting.php index febb2c344320208557b501bc4530d5366142102c..7551d6c3a7a01b24f55828db26c1a748198c1d07 100644 --- a/apps/systemtags/lib/Activity/Setting.php +++ b/apps/systemtags/lib/Activity/Setting.php @@ -97,4 +97,3 @@ class Setting implements ISetting { return false; } } - diff --git a/apps/testing/lib/AppInfo/Application.php b/apps/testing/lib/AppInfo/Application.php index 233af80d9fb7d20505287d47ce1dd54656da4e39..76361678defb5ee287b23f06375d2959253e9e63 100644 --- a/apps/testing/lib/AppInfo/Application.php +++ b/apps/testing/lib/AppInfo/Application.php @@ -23,8 +23,8 @@ namespace OCA\Testing\AppInfo; -use OCP\AppFramework\App; use OCA\Testing\AlternativeHomeUserBackend; +use OCP\AppFramework\App; class Application extends App { public function __construct (array $urlParams = array()) { diff --git a/apps/theming/lib/AppInfo/Application.php b/apps/theming/lib/AppInfo/Application.php index 519e49077f8488a3d3b2e3999d3bcfb977fe56bc..0942ca22311a8fb54c152d39e75cdfcc41f9e340 100644 --- a/apps/theming/lib/AppInfo/Application.php +++ b/apps/theming/lib/AppInfo/Application.php @@ -25,4 +25,4 @@ class Application extends \OCP\AppFramework\App { public function __construct() { parent::__construct('theming', []); } -} \ No newline at end of file +} diff --git a/apps/theming/lib/Controller/IconController.php b/apps/theming/lib/Controller/IconController.php index bffabf43dd7e435af271c30e5419b4b54270e169..68a309a473830899f06ef6dc324377aa76b3d9f0 100644 --- a/apps/theming/lib/Controller/IconController.php +++ b/apps/theming/lib/Controller/IconController.php @@ -22,6 +22,7 @@ * along with this program. If not, see . * */ + namespace OCA\Theming\Controller; use OC\IntegrityCheck\Helpers\FileAccessHelper; @@ -30,9 +31,9 @@ use OCA\Theming\ImageManager; use OCA\Theming\ThemingDefaults; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; -use OCP\AppFramework\Http\NotFoundResponse; -use OCP\AppFramework\Http\FileDisplayResponse; use OCP\AppFramework\Http\DataDisplayResponse; +use OCP\AppFramework\Http\FileDisplayResponse; +use OCP\AppFramework\Http\NotFoundResponse; use OCP\AppFramework\Http\Response; use OCP\Files\NotFoundException; use OCP\IRequest; diff --git a/apps/theming/lib/Controller/ThemingController.php b/apps/theming/lib/Controller/ThemingController.php index 4789533564001d2089c0bba93fa641cfde2ec421..25c2273279eb2c01ffe515148d014fbd8a4d6294 100644 --- a/apps/theming/lib/Controller/ThemingController.php +++ b/apps/theming/lib/Controller/ThemingController.php @@ -35,11 +35,13 @@ namespace OCA\Theming\Controller; use OC\Template\SCSSCacher; use OCA\Theming\ImageManager; use OCA\Theming\ThemingDefaults; +use OCA\Theming\Util; +use OCP\App\IAppManager; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; use OCP\AppFramework\Http\DataDownloadResponse; -use OCP\AppFramework\Http\FileDisplayResponse; use OCP\AppFramework\Http\DataResponse; +use OCP\AppFramework\Http\FileDisplayResponse; use OCP\AppFramework\Http\NotFoundResponse; use OCP\AppFramework\Utility\ITimeFactory; use OCP\Files\File; @@ -49,10 +51,8 @@ use OCP\Files\NotPermittedException; use OCP\IConfig; use OCP\IL10N; use OCP\IRequest; -use OCA\Theming\Util; use OCP\ITempManager; use OCP\IURLGenerator; -use OCP\App\IAppManager; /** * Class ThemingController diff --git a/apps/theming/lib/ImageManager.php b/apps/theming/lib/ImageManager.php index d377aa4f2229378cbf9c7bc3ba8d0d0cf86338ec..217d896adcb6fa162332ed77f48b5050a7eed51f 100644 --- a/apps/theming/lib/ImageManager.php +++ b/apps/theming/lib/ImageManager.php @@ -21,16 +21,15 @@ * */ - namespace OCA\Theming; +use OCP\Files\IAppData; +use OCP\Files\NotFoundException; +use OCP\Files\NotPermittedException; use OCP\Files\SimpleFS\ISimpleFile; use OCP\Files\SimpleFS\ISimpleFolder; use OCP\ICacheFactory; use OCP\IConfig; -use OCP\Files\IAppData; -use OCP\Files\NotFoundException; -use OCP\Files\NotPermittedException; use OCP\ILogger; use OCP\IURLGenerator; diff --git a/apps/theming/lib/Util.php b/apps/theming/lib/Util.php index dbcabfb86524ae95bf363bc02da6d975d13f6fdb..f7faf442a16003da3d8725195b367efb89b7f90b 100644 --- a/apps/theming/lib/Util.php +++ b/apps/theming/lib/Util.php @@ -25,13 +25,13 @@ namespace OCA\Theming; +use Leafo\ScssPhp\Compiler; use OCP\App\AppPathNotFoundException; use OCP\App\IAppManager; use OCP\Files\IAppData; use OCP\Files\NotFoundException; use OCP\Files\SimpleFS\ISimpleFile; use OCP\IConfig; -use Leafo\ScssPhp\Compiler; class Util { diff --git a/apps/theming/tests/Controller/IconControllerTest.php b/apps/theming/tests/Controller/IconControllerTest.php index e749a1dbd44ff0d7ca2d6ab689c0b7c1cb69478e..85259b9abe714c6c1254540673c1d6a2c3d39896 100644 --- a/apps/theming/tests/Controller/IconControllerTest.php +++ b/apps/theming/tests/Controller/IconControllerTest.php @@ -23,25 +23,25 @@ * along with this program. If not, see . * */ + namespace OCA\Theming\Tests\Controller; use OC\Files\SimpleFS\SimpleFile; use OC\IntegrityCheck\Helpers\FileAccessHelper; +use OCA\Theming\Controller\IconController; use OCA\Theming\IconBuilder; use OCA\Theming\ImageManager; use OCA\Theming\ThemingDefaults; +use OCA\Theming\Util; use OCP\AppFramework\Http; use OCP\AppFramework\Http\DataDisplayResponse; +use OCP\AppFramework\Http\FileDisplayResponse; +use OCP\AppFramework\Utility\ITimeFactory; use OCP\Files\NotFoundException; use OCP\IConfig; use OCP\IRequest; use Test\TestCase; -use OCA\Theming\Util; -use OCA\Theming\Controller\IconController; -use OCP\AppFramework\Http\FileDisplayResponse; -use OCP\AppFramework\Utility\ITimeFactory; - class IconControllerTest extends TestCase { /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ diff --git a/apps/theming/tests/Controller/ThemingControllerTest.php b/apps/theming/tests/Controller/ThemingControllerTest.php index 93a1e040b4ba5a891b557213ca6c02eb5c166efe..63e5d1e285adf91da68c037f60efb106d02e5ca1 100644 --- a/apps/theming/tests/Controller/ThemingControllerTest.php +++ b/apps/theming/tests/Controller/ThemingControllerTest.php @@ -28,6 +28,7 @@ * along with this program. If not, see . * */ + namespace OCA\Theming\Tests\Controller; use OC\Files\AppData\Factory; @@ -35,6 +36,7 @@ use OC\L10N\L10N; use OC\Template\SCSSCacher; use OCA\Theming\Controller\ThemingController; use OCA\Theming\ImageManager; +use OCA\Theming\ThemingDefaults; use OCA\Theming\Util; use OCP\App\IAppManager; use OCP\AppFramework\Http; @@ -52,7 +54,6 @@ use OCP\IRequest; use OCP\ITempManager; use OCP\IURLGenerator; use Test\TestCase; -use OCA\Theming\ThemingDefaults; class ThemingControllerTest extends TestCase { /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ diff --git a/apps/theming/tests/IconBuilderTest.php b/apps/theming/tests/IconBuilderTest.php index 994e0e4a045c83bda01ea0559ffa3f7fe59a7cc2..69ec6495605e716922945e3fec1f83e40fc0e50b 100644 --- a/apps/theming/tests/IconBuilderTest.php +++ b/apps/theming/tests/IconBuilderTest.php @@ -23,6 +23,7 @@ * along with this program. If not, see . * */ + namespace OCA\Theming\Tests; use OC\Files\AppData\AppData; diff --git a/apps/theming/tests/ImageManagerTest.php b/apps/theming/tests/ImageManagerTest.php index fc9eac7f143f31e5fbf1f36b5c1ba6990c8691c2..0f03c565e917af181c1aa5acc95052eb17df0aae 100644 --- a/apps/theming/tests/ImageManagerTest.php +++ b/apps/theming/tests/ImageManagerTest.php @@ -21,19 +21,20 @@ * along with this program. If not, see . * */ + namespace OCA\Theming\Tests; use OCA\Theming\ImageManager; use OCA\Theming\ThemingDefaults; +use OCP\Files\IAppData; +use OCP\Files\NotFoundException; use OCP\Files\SimpleFS\ISimpleFile; +use OCP\Files\SimpleFS\ISimpleFolder; use OCP\ICacheFactory; use OCP\IConfig; use OCP\ILogger; use OCP\IURLGenerator; use Test\TestCase; -use OCP\Files\SimpleFS\ISimpleFolder; -use OCP\Files\IAppData; -use OCP\Files\NotFoundException; class ImageManagerTest extends TestCase { diff --git a/apps/theming/tests/ThemingDefaultsTest.php b/apps/theming/tests/ThemingDefaultsTest.php index ea8ab6975ef6d76dc3fe92df4a3d89a7308aea82..3c69490bef5f66056a720a2c7b0b51dcceea3e62 100644 --- a/apps/theming/tests/ThemingDefaultsTest.php +++ b/apps/theming/tests/ThemingDefaultsTest.php @@ -27,13 +27,14 @@ * along with this program. If not, see . * */ + namespace OCA\Theming\Tests; use OCA\Theming\ImageManager; use OCA\Theming\ThemingDefaults; +use OCA\Theming\Util; use OCP\App\IAppManager; use OCP\Files\IAppData; -use OCA\Theming\Util; use OCP\Files\NotFoundException; use OCP\Files\SimpleFS\ISimpleFile; use OCP\Files\SimpleFS\ISimpleFolder; diff --git a/apps/theming/tests/UtilTest.php b/apps/theming/tests/UtilTest.php index a36c7330681fb07505a463880031580a9e8246ef..9fa5dd91da82825a76ba44b590f4825edee7fc4b 100644 --- a/apps/theming/tests/UtilTest.php +++ b/apps/theming/tests/UtilTest.php @@ -22,16 +22,17 @@ * along with this program. If not, see . * */ + namespace OCA\Theming\Tests; use OCA\Theming\Util; use OCP\App\IAppManager; use OCP\Files\IAppData; +use OCP\Files\IRootFolder; use OCP\Files\NotFoundException; use OCP\Files\SimpleFS\ISimpleFile; use OCP\Files\SimpleFS\ISimpleFolder; use OCP\IConfig; -use OCP\Files\IRootFolder; use Test\TestCase; class UtilTest extends TestCase { diff --git a/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170607104347.php b/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170607104347.php index 9d369ae3a8d77cb9f947a2a9f780d4e3875cf369..fa5239069730c12b4063455e60c64bd32bbc1bdd 100644 --- a/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170607104347.php +++ b/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170607104347.php @@ -23,10 +23,10 @@ namespace OCA\TwoFactorBackupCodes\Migration; -use OCP\DB\ISchemaWrapper; use Doctrine\DBAL\Types\Type; -use OCP\Migration\SimpleMigrationStep; +use OCP\DB\ISchemaWrapper; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version1002Date20170607104347 extends SimpleMigrationStep { /** diff --git a/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170607113030.php b/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170607113030.php index 6895aa44a51541c1a833554c54233b791607e03e..a6dd8bca4cf7b030ad5816af2659ed4c1b75cbfd 100644 --- a/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170607113030.php +++ b/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170607113030.php @@ -26,8 +26,8 @@ namespace OCA\TwoFactorBackupCodes\Migration; use OCP\DB\ISchemaWrapper; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version1002Date20170607113030 extends SimpleMigrationStep { diff --git a/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170919123342.php b/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170919123342.php index 5cbbcb2eccaa9367691d8af5ccd861b78a8121cb..6eddf1f0ddfc450e8139ac518c636e76c946a118 100644 --- a/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170919123342.php +++ b/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170919123342.php @@ -25,8 +25,8 @@ namespace OCA\TwoFactorBackupCodes\Migration; use Doctrine\DBAL\Types\Type; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version1002Date20170919123342 extends SimpleMigrationStep { diff --git a/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170926101419.php b/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170926101419.php index 0e19fe2a35ec3871fa365387bd197d5c6d76aa8d..52e1ee4e46d4856cef9a2e75cf59c72e0d4648f8 100644 --- a/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170926101419.php +++ b/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170926101419.php @@ -1,4 +1,5 @@ . * */ + namespace OCA\User_LDAP\Tests; diff --git a/apps/user_ldap/tests/Integration/AbstractIntegrationTest.php b/apps/user_ldap/tests/Integration/AbstractIntegrationTest.php index 8d29df6ede6230626bcc7e6315a62111f018e5f1..2aa10c75bea35ab7723a55142b842e6f5b3324be 100644 --- a/apps/user_ldap/tests/Integration/AbstractIntegrationTest.php +++ b/apps/user_ldap/tests/Integration/AbstractIntegrationTest.php @@ -29,8 +29,8 @@ namespace OCA\User_LDAP\Tests\Integration; use OCA\User_LDAP\Access; use OCA\User_LDAP\Connection; use OCA\User_LDAP\FilesystemHelper; -use OCA\User_LDAP\LDAP; use OCA\User_LDAP\Helper; +use OCA\User_LDAP\LDAP; use OCA\User_LDAP\LogWrapper; use OCA\User_LDAP\User\Manager; diff --git a/apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php b/apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php index 764c14bafe748b7e8fdd2ce8c1de930cdd06522e..38f575db75b1d7bb479c8c451e6361827195ecd8 100644 --- a/apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php +++ b/apps/user_ldap/tests/Integration/ExceptionOnLostConnection.php @@ -195,4 +195,3 @@ class ExceptionOnLostConnection { $test = new ExceptionOnLostConnection('http://localhost:8474', 'ldap', 'dc=owncloud,dc=bzoc'); $test->run(); - diff --git a/apps/user_ldap/tests/Integration/Lib/IntegrationTestFetchUsersByLoginName.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestFetchUsersByLoginName.php index cab5f6196fd0a3b5c47b5edf5189560e0fcbd60b..e2557aac4a086af867beb57ea4553c3e5f7f5648 100644 --- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestFetchUsersByLoginName.php +++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestFetchUsersByLoginName.php @@ -24,8 +24,8 @@ namespace OCA\User_LDAP\Tests\Integration\Lib; -use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest; use OCA\User_LDAP\Mapping\UserMapping; +use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest; use OCA\User_LDAP\User_LDAP; require_once __DIR__ . '/../Bootstrap.php'; diff --git a/apps/user_ldap/tests/Integration/Lib/IntegrationTestPaging.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestPaging.php index fcb2e59b4a9c6ef0e7f9bae8f20119ec818d6832..481ffaed61a57ace7284b2a8ade2737aafa7ee4c 100644 --- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestPaging.php +++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestPaging.php @@ -24,8 +24,8 @@ namespace OCA\User_LDAP\Tests\Integration\Lib; -use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest; use OCA\User_LDAP\Mapping\UserMapping; +use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest; use OCA\User_LDAP\User_LDAP; require_once __DIR__ . '/../Bootstrap.php'; diff --git a/apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserAvatar.php b/apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserAvatar.php index 599458a9721ecb2dcbe5b4627a1fe951a948f7c4..bddd3af0e46da620ae1e72566e0c58428386c637 100644 --- a/apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserAvatar.php +++ b/apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserAvatar.php @@ -29,10 +29,10 @@ namespace OCA\User_LDAP\Tests\Integration\Lib\User; use OCA\User_LDAP\FilesystemHelper; use OCA\User_LDAP\LogWrapper; -use OCA\User_LDAP\User\Manager; -use OCA\User_LDAP\User\User; use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest; +use OCA\User_LDAP\User\Manager; +use OCA\User_LDAP\User\User; use OCA\User_LDAP\User_LDAP; use OCP\Image; diff --git a/apps/user_ldap/tests/Jobs/CleanUpTest.php b/apps/user_ldap/tests/Jobs/CleanUpTest.php index 1f30af3a58a5d61f59702faea34fcc5f2cd35092..cef753ad1188e8eb9d77191b638dc1c031bf2070 100644 --- a/apps/user_ldap/tests/Jobs/CleanUpTest.php +++ b/apps/user_ldap/tests/Jobs/CleanUpTest.php @@ -153,4 +153,3 @@ class CleanUpTest extends \Test\TestCase { } } - diff --git a/apps/user_ldap/tests/LDAPProviderTest.php b/apps/user_ldap/tests/LDAPProviderTest.php index 054a3adf787988e2e1d5f1f6bc9113310f05b076..deaa368806c1dac065610c246829484a92edce99 100644 --- a/apps/user_ldap/tests/LDAPProviderTest.php +++ b/apps/user_ldap/tests/LDAPProviderTest.php @@ -29,9 +29,9 @@ use OC\User\Manager; use OCA\User_LDAP\Access; use OCA\User_LDAP\Connection; use OCA\User_LDAP\IGroupLDAP; +use OCA\User_LDAP\IUserLDAP; use OCP\IConfig; use OCP\IServerContainer; -use OCA\User_LDAP\IUserLDAP; use Symfony\Component\EventDispatcher\EventDispatcherInterface; /** diff --git a/apps/user_ldap/tests/Migration/AbstractUUIDFixTest.php b/apps/user_ldap/tests/Migration/AbstractUUIDFixTest.php index 8921648da83aca6f380b039a6aa6dd20701f00c7..37502027df75d7fd203bbd04119fb60551657420 100644 --- a/apps/user_ldap/tests/Migration/AbstractUUIDFixTest.php +++ b/apps/user_ldap/tests/Migration/AbstractUUIDFixTest.php @@ -23,15 +23,15 @@ namespace OCA\User_LDAP\Tests\Migration; -use OCA\User_LDAP\LDAP; -use Test\TestCase; use OCA\User_LDAP\Access; use OCA\User_LDAP\Helper; -use OCA\User_LDAP\Migration\UUIDFixUser; -use OCA\User_LDAP\Mapping\UserMapping; +use OCA\User_LDAP\LDAP; use OCA\User_LDAP\Mapping\GroupMapping; +use OCA\User_LDAP\Mapping\UserMapping; +use OCA\User_LDAP\Migration\UUIDFixUser; use OCA\User_LDAP\User_Proxy; use OCP\IConfig; +use Test\TestCase; abstract class AbstractUUIDFixTest extends TestCase { /** @var Helper|\PHPUnit_Framework_MockObject_MockObject */ diff --git a/apps/user_ldap/tests/Migration/UUIDFixGroupTest.php b/apps/user_ldap/tests/Migration/UUIDFixGroupTest.php index b91f4af433fc62027e32a09ae2b645c608460635..a85c4a4dc5e2eb43d8e9f6fc2c622d0316c73a90 100644 --- a/apps/user_ldap/tests/Migration/UUIDFixGroupTest.php +++ b/apps/user_ldap/tests/Migration/UUIDFixGroupTest.php @@ -23,9 +23,9 @@ namespace OCA\Group_LDAP\Tests\Migration; -use OCA\User_LDAP\Migration\UUIDFixGroup; -use OCA\User_LDAP\Mapping\GroupMapping; use OCA\User_LDAP\Group_Proxy; +use OCA\User_LDAP\Mapping\GroupMapping; +use OCA\User_LDAP\Migration\UUIDFixGroup; use OCA\User_LDAP\Tests\Migration\AbstractUUIDFixTest; /** diff --git a/apps/user_ldap/tests/Migration/UUIDFixInsertTest.php b/apps/user_ldap/tests/Migration/UUIDFixInsertTest.php index a5f7ea50175cb26cfdbf7b9d94ff470fe2b67f98..0536d0b10af96cfcd352f206f41d636d4acddf93 100644 --- a/apps/user_ldap/tests/Migration/UUIDFixInsertTest.php +++ b/apps/user_ldap/tests/Migration/UUIDFixInsertTest.php @@ -23,9 +23,9 @@ namespace OCA\User_LDAP\Tests\Migration; -use OCA\User_LDAP\Migration\UUIDFixInsert; -use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\Mapping\GroupMapping; +use OCA\User_LDAP\Mapping\UserMapping; +use OCA\User_LDAP\Migration\UUIDFixInsert; use OCP\BackgroundJob\IJobList; use OCP\IConfig; use OCP\Migration\IOutput; diff --git a/apps/user_ldap/tests/Migration/UUIDFixUserTest.php b/apps/user_ldap/tests/Migration/UUIDFixUserTest.php index 28eca1608d282c7adc18d354528d275955328e88..193e460c3c7801630e611f665fe677353fcfff0f 100644 --- a/apps/user_ldap/tests/Migration/UUIDFixUserTest.php +++ b/apps/user_ldap/tests/Migration/UUIDFixUserTest.php @@ -23,8 +23,8 @@ namespace OCA\User_LDAP\Tests\Migration; -use OCA\User_LDAP\Migration\UUIDFixUser; use OCA\User_LDAP\Mapping\UserMapping; +use OCA\User_LDAP\Migration\UUIDFixUser; use OCA\User_LDAP\User_Proxy; /** diff --git a/apps/user_ldap/tests/User_LDAPTest.php b/apps/user_ldap/tests/User_LDAPTest.php index 7517994b34add1421da6af22ec6cbc79588ab453..6671742c4284e79da340002b16772e93f6a33964 100644 --- a/apps/user_ldap/tests/User_LDAPTest.php +++ b/apps/user_ldap/tests/User_LDAPTest.php @@ -31,6 +31,7 @@ namespace OCA\User_LDAP\Tests; +use OC\HintException; use OC\User\Backend; use OC\User\Session; use OCA\User_LDAP\Access; @@ -39,15 +40,14 @@ use OCA\User_LDAP\Mapping\AbstractMapping; use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\User\Manager; use OCA\User_LDAP\User\OfflineUser; -use OC\HintException; use OCA\User_LDAP\User\User; -use OCA\User_LDAP\User_LDAP as UserLDAP; use OCA\User_LDAP\User_LDAP; +use OCA\User_LDAP\User_LDAP as UserLDAP; use OCA\User_LDAP\UserPluginManager; use OCP\IConfig; use OCP\IUser; -use Test\TestCase; use OCP\Notification\IManager as INotificationManager; +use Test\TestCase; /** * Class Test_User_Ldap_Direct diff --git a/apps/user_ldap/tests/WizardTest.php b/apps/user_ldap/tests/WizardTest.php index f11f7bec206227f34442dbe20e2a3e1df38d2231..1cae2f58e5f199df645b577c3914eedcff6bf4db 100644 --- a/apps/user_ldap/tests/WizardTest.php +++ b/apps/user_ldap/tests/WizardTest.php @@ -31,7 +31,7 @@ namespace OCA\User_LDAP\Tests; use OCA\User_LDAP\Access; use OCA\User_LDAP\Configuration; use OCA\User_LDAP\ILDAPWrapper; -use \OCA\User_LDAP\Wizard; +use OCA\User_LDAP\Wizard; use Test\TestCase; /** diff --git a/apps/workflowengine/lib/AppInfo/Application.php b/apps/workflowengine/lib/AppInfo/Application.php index 8ac291b9289c3ac1090005878c0c08117088d77a..a654c87d2e74660900728e5abb34368b3ceeae2a 100644 --- a/apps/workflowengine/lib/AppInfo/Application.php +++ b/apps/workflowengine/lib/AppInfo/Application.php @@ -21,11 +21,11 @@ namespace OCA\WorkflowEngine\AppInfo; +use OCA\WorkflowEngine\Controller\RequestTime; use OCA\WorkflowEngine\Manager; use OCP\AppFramework\QueryException; use OCP\EventDispatcher\Event; use OCP\Template; -use OCA\WorkflowEngine\Controller\RequestTime; use OCP\WorkflowEngine\IEntity; use OCP\WorkflowEngine\IEntityCompat; use OCP\WorkflowEngine\IOperation; diff --git a/apps/workflowengine/lib/Migration/Version2000Date20190808074233.php b/apps/workflowengine/lib/Migration/Version2000Date20190808074233.php index c048ffbb5be49f51c7abd52e8a3f4b703e071122..787cd06bfa16dad749d1ab4f27240570e6754a9b 100644 --- a/apps/workflowengine/lib/Migration/Version2000Date20190808074233.php +++ b/apps/workflowengine/lib/Migration/Version2000Date20190808074233.php @@ -8,8 +8,8 @@ use Closure; use Doctrine\DBAL\Schema\Table; use Doctrine\DBAL\Types\Type; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version2000Date20190808074233 extends SimpleMigrationStep { diff --git a/apps/workflowengine/lib/Settings/Admin.php b/apps/workflowengine/lib/Settings/Admin.php index 20ea8ad43c482b9d26f06d5bdfff046b8ce879e4..fa668231b41c64320dede2b080cf7829014be364 100644 --- a/apps/workflowengine/lib/Settings/Admin.php +++ b/apps/workflowengine/lib/Settings/Admin.php @@ -32,5 +32,3 @@ class Admin extends ASettings { return IManager::SCOPE_ADMIN; } } - - diff --git a/core/BackgroundJobs/BackgroundCleanupUpdaterBackupsJob.php b/core/BackgroundJobs/BackgroundCleanupUpdaterBackupsJob.php index 2b6298610884ce1a343d5e75f3697fc0c0e019ce..ad3c2355dc82596b0b840f692cf517aee2a165e8 100644 --- a/core/BackgroundJobs/BackgroundCleanupUpdaterBackupsJob.php +++ b/core/BackgroundJobs/BackgroundCleanupUpdaterBackupsJob.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OC\Core\BackgroundJobs; use OC\BackgroundJob\QueuedJob; diff --git a/core/Command/App/CheckCode.php b/core/Command/App/CheckCode.php index 530c1d30ec049e0f46a41c6bc0a8c3f6b0338658..82d15fae4fb724a75e2d1c035cfeff03066731c9 100644 --- a/core/Command/App/CheckCode.php +++ b/core/Command/App/CheckCode.php @@ -27,9 +27,12 @@ namespace OC\Core\Command\App; use OC\App\CodeChecker\CodeChecker; use OC\App\CodeChecker\DatabaseSchemaChecker; +use OC\App\CodeChecker\DeprecationCheck; use OC\App\CodeChecker\EmptyCheck; use OC\App\CodeChecker\InfoChecker; use OC\App\CodeChecker\LanguageParseChecker; +use OC\App\CodeChecker\PrivateCheck; +use OC\App\CodeChecker\StrongComparisonCheck; use OC\App\InfoParser; use Stecman\Component\Symfony\Console\BashCompletion\Completion\CompletionAwareInterface; use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext; @@ -38,9 +41,6 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use OC\App\CodeChecker\StrongComparisonCheck; -use OC\App\CodeChecker\DeprecationCheck; -use OC\App\CodeChecker\PrivateCheck; class CheckCode extends Command implements CompletionAwareInterface { diff --git a/core/Command/App/Install.php b/core/Command/App/Install.php index 525b0095f04a9e881a4ce91abe326a38ec2ad476..cfddaed34da83e85b9725c3c7dedf3c4815e881d 100644 --- a/core/Command/App/Install.php +++ b/core/Command/App/Install.php @@ -25,8 +25,8 @@ namespace OC\Core\Command\App; use OC\Installer; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; -use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; class Install extends Command { diff --git a/core/Command/App/Remove.php b/core/Command/App/Remove.php index 71d5cef229cd9e5c232f05c18780605261fd27b9..e3777c8be41d7df91eb7a2f0aaaa36a48ebd249d 100644 --- a/core/Command/App/Remove.php +++ b/core/Command/App/Remove.php @@ -22,7 +22,6 @@ namespace OC\Core\Command\App; -use Throwable; use OC\Installer; use OCP\App\IAppManager; use OCP\ILogger; @@ -30,9 +29,10 @@ use Stecman\Component\Symfony\Console\BashCompletion\Completion\CompletionAwareI use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; -use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; +use Throwable; class Remove extends Command implements CompletionAwareInterface { diff --git a/core/Command/App/Update.php b/core/Command/App/Update.php index c571a9a16241418ee65eb30a2794680f4184e965..881ad1fcf1e580dc526e2793ea572750c0e3f7be 100644 --- a/core/Command/App/Update.php +++ b/core/Command/App/Update.php @@ -21,13 +21,13 @@ namespace OC\Core\Command\App; -use OCP\App\IAppManager; use OC\Installer; +use OCP\App\IAppManager; use OCP\ILogger; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; -use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; class Update extends Command { @@ -122,4 +122,3 @@ class Update extends Command { return $return; } } - diff --git a/core/Command/Background/Base.php b/core/Command/Background/Base.php index 48fee818d0a60bd6cfadce5dfc18baf000396217..32d22d64cb9eb9511217d2102a5785ad68482c5a 100644 --- a/core/Command/Background/Base.php +++ b/core/Command/Background/Base.php @@ -25,7 +25,7 @@ namespace OC\Core\Command\Background; -use \OCP\IConfig; +use OCP\IConfig; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputInterface; diff --git a/core/Command/Check.php b/core/Command/Check.php index 16176a171a2fbb294692c1fb50ac3a33ee8432fb..e6274082ea0feb36cad0f7a059167963bce5bf32 100644 --- a/core/Command/Check.php +++ b/core/Command/Check.php @@ -21,6 +21,7 @@ * along with this program. If not, see * */ + namespace OC\Core\Command; use OC\SystemConfig; diff --git a/core/Command/Db/AddMissingIndices.php b/core/Command/Db/AddMissingIndices.php index 527a2cd7b19c910ca3674411b81a6f2c67dfb110..4de1d0f12f41dd80ea9890aa2277e129b1800373 100644 --- a/core/Command/Db/AddMissingIndices.php +++ b/core/Command/Db/AddMissingIndices.php @@ -20,7 +20,6 @@ declare(strict_types=1); * */ - namespace OC\Core\Command\Db; use OC\DB\SchemaWrapper; diff --git a/core/Command/Db/ConvertType.php b/core/Command/Db/ConvertType.php index 631972150eb7df793382c1aa568a8f8bd2530020..d4a4d406eeab70f666ae3e26afd4458c3ac2ed70 100644 --- a/core/Command/Db/ConvertType.php +++ b/core/Command/Db/ConvertType.php @@ -33,11 +33,11 @@ namespace OC\Core\Command\Db; use Doctrine\DBAL\DBALException; use Doctrine\DBAL\Schema\Table; use Doctrine\DBAL\Types\Type; -use OC\DB\MigrationService; -use OCP\DB\QueryBuilder\IQueryBuilder; -use \OCP\IConfig; use OC\DB\Connection; use OC\DB\ConnectionFactory; +use OC\DB\MigrationService; +use OCP\DB\QueryBuilder\IQueryBuilder; +use OCP\IConfig; use Stecman\Component\Symfony\Console\BashCompletion\Completion\CompletionAwareInterface; use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext; use Symfony\Component\Console\Command\Command; diff --git a/core/Command/Encryption/ChangeKeyStorageRoot.php b/core/Command/Encryption/ChangeKeyStorageRoot.php index 15e88326973629722c06e16c49ffc58eb68eab2c..f89a66873b01502b1c1905fb3a5500d46429215e 100644 --- a/core/Command/Encryption/ChangeKeyStorageRoot.php +++ b/core/Command/Encryption/ChangeKeyStorageRoot.php @@ -20,7 +20,6 @@ * */ - namespace OC\Core\Command\Encryption; use OC\Encryption\Keys\Storage; diff --git a/core/Command/Encryption/ShowKeyStorageRoot.php b/core/Command/Encryption/ShowKeyStorageRoot.php index 4270ee9f57fd5674ac871034e234ac63dc677d35..09331f04b6e697e9dc88f53b59423e5eab6ee512 100644 --- a/core/Command/Encryption/ShowKeyStorageRoot.php +++ b/core/Command/Encryption/ShowKeyStorageRoot.php @@ -20,7 +20,6 @@ * */ - namespace OC\Core\Command\Encryption; use OC\Encryption\Util; diff --git a/core/Command/Integrity/CheckApp.php b/core/Command/Integrity/CheckApp.php index 1c71286195a3bf1ac74d9f683f28042536ff3527..c19d03649b88b24bd60854b30d69d392a7de4acf 100644 --- a/core/Command/Integrity/CheckApp.php +++ b/core/Command/Integrity/CheckApp.php @@ -20,12 +20,13 @@ * along with this program. If not, see * */ + namespace OC\Core\Command\Integrity; -use OC\IntegrityCheck\Checker; use OC\Core\Command\Base; -use Symfony\Component\Console\Input\InputInterface; +use OC\IntegrityCheck\Checker; use Symfony\Component\Console\Input\InputArgument; +use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; diff --git a/core/Command/Integrity/CheckCore.php b/core/Command/Integrity/CheckCore.php index a3426ce9345c11d616622f45c31f87eed0cffd6f..3d087247aa7677005357275485a74e27d8d19ab6 100644 --- a/core/Command/Integrity/CheckCore.php +++ b/core/Command/Integrity/CheckCore.php @@ -23,8 +23,8 @@ namespace OC\Core\Command\Integrity; -use OC\IntegrityCheck\Checker; use OC\Core\Command\Base; +use OC\IntegrityCheck\Checker; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; diff --git a/core/Command/InterruptedException.php b/core/Command/InterruptedException.php index 4470ea82d2b9b068e987b71787b1cc5558a88d60..3747c4a7f17aea1c97b930433c8d046f384297e8 100644 --- a/core/Command/InterruptedException.php +++ b/core/Command/InterruptedException.php @@ -19,6 +19,7 @@ * along with this program. If not, see * */ + namespace OC\Core\Command; /** diff --git a/core/Command/Log/File.php b/core/Command/Log/File.php index 8be01d2b6ef292165e7d8780f61828fc458cb467..877e0a592e90c70e886ac023a53276a17f30ceeb 100644 --- a/core/Command/Log/File.php +++ b/core/Command/Log/File.php @@ -24,7 +24,7 @@ namespace OC\Core\Command\Log; -use \OCP\IConfig; +use OCP\IConfig; use Stecman\Component\Symfony\Console\BashCompletion\Completion; use Stecman\Component\Symfony\Console\BashCompletion\Completion\ShellPathCompletion; diff --git a/core/Command/Maintenance/DataFingerprint.php b/core/Command/Maintenance/DataFingerprint.php index 37e8de2455218d90112a74bc3d3b5f83030f5479..479e5f17536891b56c50bd2b5920056d407731bd 100644 --- a/core/Command/Maintenance/DataFingerprint.php +++ b/core/Command/Maintenance/DataFingerprint.php @@ -19,6 +19,7 @@ * along with this program. If not, see * */ + namespace OC\Core\Command\Maintenance; use OCP\AppFramework\Utility\ITimeFactory; @@ -27,7 +28,6 @@ use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; - class DataFingerprint extends Command { /** @var IConfig */ diff --git a/core/Command/Maintenance/Install.php b/core/Command/Maintenance/Install.php index 39692e036ba07f042f3976f9dd37534d7a0ba66b..4197234ae7e9d06b430634bfa529e519da9a15c0 100644 --- a/core/Command/Maintenance/Install.php +++ b/core/Command/Maintenance/Install.php @@ -27,6 +27,7 @@ * along with this program. If not, see * */ + namespace OC\Core\Command\Maintenance; use InvalidArgumentException; diff --git a/core/Command/Maintenance/Mimetype/GenerateMimetypeFileBuilder.php b/core/Command/Maintenance/Mimetype/GenerateMimetypeFileBuilder.php index 2eef5e9faaafcbceec5a504e032cb8be9f463770..302f6b91342055ee84d7c3e97a1970b0db0c3184 100644 --- a/core/Command/Maintenance/Mimetype/GenerateMimetypeFileBuilder.php +++ b/core/Command/Maintenance/Mimetype/GenerateMimetypeFileBuilder.php @@ -102,4 +102,4 @@ OC.MimeTypeList={ '; } -} \ No newline at end of file +} diff --git a/core/Command/Maintenance/Mimetype/UpdateDB.php b/core/Command/Maintenance/Mimetype/UpdateDB.php index 1c8d651b9c0d0ddf7ce519fb58964600791f744a..7a7d9c11e55cc03bdb236931902e0cb4d195735f 100644 --- a/core/Command/Maintenance/Mimetype/UpdateDB.php +++ b/core/Command/Maintenance/Mimetype/UpdateDB.php @@ -22,13 +22,13 @@ namespace OC\Core\Command\Maintenance\Mimetype; +use OCP\Files\IMimeTypeDetector; +use OCP\Files\IMimeTypeLoader; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputInterface; -use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Input\InputOption; -use OCP\Files\IMimeTypeDetector; -use OCP\Files\IMimeTypeLoader; +use Symfony\Component\Console\Input\InputOption; +use Symfony\Component\Console\Output\OutputInterface; class UpdateDB extends Command { diff --git a/core/Command/Maintenance/Mimetype/UpdateJS.php b/core/Command/Maintenance/Mimetype/UpdateJS.php index 0606e210c3fb57d5f0e0c6d553f905db2586d7a2..230d0fac6a68af1fbda6f1125e4c41539dbc52f8 100644 --- a/core/Command/Maintenance/Mimetype/UpdateJS.php +++ b/core/Command/Maintenance/Mimetype/UpdateJS.php @@ -25,11 +25,11 @@ namespace OC\Core\Command\Maintenance\Mimetype; +use OCP\Files\IMimeTypeDetector; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputInterface; -use Symfony\Component\Console\Output\OutputInterface; -use OCP\Files\IMimeTypeDetector; +use Symfony\Component\Console\Output\OutputInterface; class UpdateJS extends Command { diff --git a/core/Command/Maintenance/Mode.php b/core/Command/Maintenance/Mode.php index 1692eb08d87cfa39c6d9ce2668c884557ec26c6c..8b13175f0bbf2941b530108f807995cfacf8c881 100644 --- a/core/Command/Maintenance/Mode.php +++ b/core/Command/Maintenance/Mode.php @@ -23,7 +23,7 @@ namespace OC\Core\Command\Maintenance; -use \OCP\IConfig; +use OCP\IConfig; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputInterface; diff --git a/core/Command/Maintenance/UpdateHtaccess.php b/core/Command/Maintenance/UpdateHtaccess.php index 04c870f07a4bef15634c90f9db970cedc8523d57..d67d2d32edf2a35da1898532624fe1874d76aa13 100644 --- a/core/Command/Maintenance/UpdateHtaccess.php +++ b/core/Command/Maintenance/UpdateHtaccess.php @@ -20,6 +20,7 @@ * along with this program. If not, see * */ + namespace OC\Core\Command\Maintenance; use Symfony\Component\Console\Command\Command; diff --git a/core/Command/Maintenance/UpdateTheme.php b/core/Command/Maintenance/UpdateTheme.php index 2ab66a4ce75531e9f602b67e160aa2dda8b0097a..825cfc0da8897dceea55961f0aa7586429645cd6 100644 --- a/core/Command/Maintenance/UpdateTheme.php +++ b/core/Command/Maintenance/UpdateTheme.php @@ -24,11 +24,11 @@ namespace OC\Core\Command\Maintenance; use OC\Core\Command\Maintenance\Mimetype\UpdateJS; +use OCP\Files\IMimeTypeDetector; use OCP\ICacheFactory; use Symfony\Component\Console\Input\InputInterface; -use Symfony\Component\Console\Output\OutputInterface; -use OCP\Files\IMimeTypeDetector; +use Symfony\Component\Console\Output\OutputInterface; class UpdateTheme extends UpdateJS { diff --git a/core/Command/TwoFactorAuth/Base.php b/core/Command/TwoFactorAuth/Base.php index aa4f40fc771dc34f33493a7b98bf2c4d5c725f12..3a9b4224eb90d2ecd6e596e00c00781c8f4866f4 100644 --- a/core/Command/TwoFactorAuth/Base.php +++ b/core/Command/TwoFactorAuth/Base.php @@ -23,8 +23,8 @@ namespace OC\Core\Command\TwoFactorAuth; -use OCP\IUserManager; use OCP\IUser; +use OCP\IUserManager; use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext; class Base extends \OC\Core\Command\Base { diff --git a/core/Command/User/Add.php b/core/Command/User/Add.php index cc53f1c78c0c10a53e34104c9cb8d42e9c88d67e..047881fc37f56fa7cb74f92774f3e487969f995c 100644 --- a/core/Command/User/Add.php +++ b/core/Command/User/Add.php @@ -30,10 +30,10 @@ use OCP\IUser; use OCP\IUserManager; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Helper\QuestionHelper; +use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Question\Question; class Add extends Command { diff --git a/core/Command/User/Delete.php b/core/Command/User/Delete.php index 495c0903bba59d3e454292a5145acf156765d912..6406d4823ee889d92403a20af1c6b9012a4ad164 100644 --- a/core/Command/User/Delete.php +++ b/core/Command/User/Delete.php @@ -27,9 +27,9 @@ namespace OC\Core\Command\User; use OCP\IUserManager; use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Input\InputArgument; class Delete extends Command { /** @var IUserManager */ diff --git a/core/Command/User/Disable.php b/core/Command/User/Disable.php index 7c6e8315702d32fbb10eaf4c726bce32187376f8..63e23b05700755c4083dba153aeef29535c6de23 100644 --- a/core/Command/User/Disable.php +++ b/core/Command/User/Disable.php @@ -24,9 +24,9 @@ namespace OC\Core\Command\User; use OCP\IUserManager; use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Input\InputArgument; class Disable extends Command { /** @var IUserManager */ diff --git a/core/Command/User/Enable.php b/core/Command/User/Enable.php index 164027d809a728166195f4262aada502132bebe4..48bf4785164dd4ecee147e1067b01e95c7f620b3 100644 --- a/core/Command/User/Enable.php +++ b/core/Command/User/Enable.php @@ -24,9 +24,9 @@ namespace OC\Core\Command\User; use OCP\IUserManager; use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Input\InputArgument; class Enable extends Command { /** @var IUserManager */ diff --git a/core/Command/User/LastSeen.php b/core/Command/User/LastSeen.php index 58592e051508dc590041a6e8a6a124433d0abb9d..d2b168d63c922a5233d9db7098952574eb0a4674 100644 --- a/core/Command/User/LastSeen.php +++ b/core/Command/User/LastSeen.php @@ -27,9 +27,9 @@ namespace OC\Core\Command\User; use OCP\IUserManager; use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Input\InputArgument; class LastSeen extends Command { /** @var IUserManager */ diff --git a/core/Command/User/ResetPassword.php b/core/Command/User/ResetPassword.php index 9e69626c38df41fafe4eaae67ea53e643742a1c3..4f2173c155e51920a4a8575b6ae85f262c6b1e49 100644 --- a/core/Command/User/ResetPassword.php +++ b/core/Command/User/ResetPassword.php @@ -32,8 +32,8 @@ namespace OC\Core\Command\User; use OCP\IUserManager; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Helper\QuestionHelper; -use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputArgument; +use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Question\ConfirmationQuestion; diff --git a/core/Command/User/Setting.php b/core/Command/User/Setting.php index d7bb436783f52cdeff37beb714d915e0f6dac1d0..3883d57b04313989b1c193cc468bf990f2d81440 100644 --- a/core/Command/User/Setting.php +++ b/core/Command/User/Setting.php @@ -27,10 +27,10 @@ use OCP\IConfig; use OCP\IDBConnection; use OCP\IUser; use OCP\IUserManager; +use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Input\InputArgument; class Setting extends Base { /** @var IUserManager */ diff --git a/core/Controller/AutoCompleteController.php b/core/Controller/AutoCompleteController.php index 80f5d3c8630b37da416266d88a00dff8457a1013..df244df987cb2ceffc6af69c044c6e7e8a0fd1d4 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 9ee344f7ed800c8f77a5713832b7d9f404e2b560..cef68ec83486194f1d8b3596eb2a955916c75853 100644 --- a/core/Controller/AvatarController.php +++ b/core/Controller/AvatarController.php @@ -25,6 +25,7 @@ * along with this program. If not, see * */ + 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 46ec1136c94918b41d13a2a3ef3d8b8a836d90d6..caa1f1a16d0a644aa8aa8fe7f3d76334103c015d 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 901074d028598e1b1bc9988f362e8139801bd5eb..bb9b7a37d8f614e0667e58867eeda2d821bc08ed 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 cdf22eda5fa3e3692946349aa521e503c380a4b1..207b7113ab5bf8713903af41e0ba3bb54912041e 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 . * */ + 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 49f015d511db4332bbdf4260ba12cbc3c6df2c4f..1a3f86f95d31e892b75066549f6a21a4cfad1724 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 eb3b0968da3c5f73db80dd872cbab8fca0632b18..654cb6d253d9ae5a050ff6c44bb94d17a2fa8dc4 100644 --- a/core/Controller/NavigationController.php +++ b/core/Controller/NavigationController.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OC\Core\Controller; use OCP\AppFramework\Http; diff --git a/core/Controller/OCJSController.php b/core/Controller/OCJSController.php index 37fe17c8dd163c3d66bf785439b84764a88c3e78..8ffc6d99290d01cf916a7468f7ae31672c293188 100644 --- a/core/Controller/OCJSController.php +++ b/core/Controller/OCJSController.php @@ -23,6 +23,7 @@ * along with this program. If not, see . * */ + namespace OC\Core\Controller; use bantu\IniGetWrapper\IniGetWrapper; diff --git a/core/Controller/OCSController.php b/core/Controller/OCSController.php index 68861ce7e952fd21e84b18a7e0a99863ba3080c2..ce08fb657e2e89f12adfc04181d1d3ead4e6071b 100644 --- a/core/Controller/OCSController.php +++ b/core/Controller/OCSController.php @@ -23,6 +23,7 @@ * along with this program. If not, see . * */ + namespace OC\Core\Controller; use OC\CapabilitiesManager; diff --git a/core/Controller/PreviewController.php b/core/Controller/PreviewController.php index c25d91783108a6e3470babd18f549e2e7e7ca776..edda49d0dedde0bc0ced3a5a6ab4ce458abcd369 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 5ad6697eef33903ee5570244287276fa8cd7d8b9..a94394e6ffe010a7c68677fe6c0d8998e0d3f3e3 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 24746c65e5f361f356f954770fc88b59ed7b6e3f..a04e350b2b1a56c66b9ca80d6e8a4198bf81ce7c 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 737f53967792565a2ba9394aba851593700bb6e6..be34b25b904b39a1765a5a05cf54e6efac3b6797 100644 --- a/core/Controller/WalledGardenController.php +++ b/core/Controller/WalledGardenController.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OC\Core\Controller; use OCP\AppFramework\Controller; diff --git a/core/Migrations/Version13000Date20170705121758.php b/core/Migrations/Version13000Date20170705121758.php index 9d8b373b6b99472bad51f8b137a38fb2eb149bbb..344085aae24e9c1b8c4c10ee399785a1b68752ba 100644 --- a/core/Migrations/Version13000Date20170705121758.php +++ b/core/Migrations/Version13000Date20170705121758.php @@ -25,8 +25,8 @@ namespace OC\Core\Migrations; use Doctrine\DBAL\Types\Type; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version13000Date20170705121758 extends SimpleMigrationStep { /** diff --git a/core/Migrations/Version13000Date20170718121200.php b/core/Migrations/Version13000Date20170718121200.php index 4c5fb7b9b020fa6b3686ca5d5dd56ad3acebfebc..cecdbf907dab5293368bf297d29162d45655eb2a 100644 --- a/core/Migrations/Version13000Date20170718121200.php +++ b/core/Migrations/Version13000Date20170718121200.php @@ -25,8 +25,8 @@ namespace OC\Core\Migrations; use Doctrine\DBAL\Types\Type; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version13000Date20170718121200 extends SimpleMigrationStep { diff --git a/core/Migrations/Version13000Date20170814074715.php b/core/Migrations/Version13000Date20170814074715.php index 0eae4167fb6af298e31ee556297bcb88671f7a15..82f8b8a31579baef32fb9d0e0278d96036710fc6 100644 --- a/core/Migrations/Version13000Date20170814074715.php +++ b/core/Migrations/Version13000Date20170814074715.php @@ -24,8 +24,8 @@ namespace OC\Core\Migrations; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version13000Date20170814074715 extends SimpleMigrationStep { diff --git a/core/Migrations/Version13000Date20170919121250.php b/core/Migrations/Version13000Date20170919121250.php index 6bdd79cf6722bbfe2f6a0010f58a90fdc758fc2f..b700ebd747ae1d36046a62a84b5d64714a9b7b04 100644 --- a/core/Migrations/Version13000Date20170919121250.php +++ b/core/Migrations/Version13000Date20170919121250.php @@ -21,11 +21,12 @@ * along with this program. If not, see . * */ + namespace OC\Core\Migrations; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; /** * Auto-generated migration step: Please modify to your needs! diff --git a/core/Migrations/Version13000Date20170926101637.php b/core/Migrations/Version13000Date20170926101637.php index 088de9880209a44b4b77e21537479a1d707c4aeb..0e02ed492f3e4f78166247db3c3fd4a46a39596a 100644 --- a/core/Migrations/Version13000Date20170926101637.php +++ b/core/Migrations/Version13000Date20170926101637.php @@ -21,6 +21,7 @@ * along with this program. If not, see . * */ + namespace OC\Core\Migrations; use OCP\Migration\BigIntMigration; diff --git a/core/Migrations/Version14000Date20180129121024.php b/core/Migrations/Version14000Date20180129121024.php index 9512d4adafdd2492eed4d5fd21a90ef7a70b8837..8ae462a2f6ae266dbcd136dca353e2fe160beaa5 100644 --- a/core/Migrations/Version14000Date20180129121024.php +++ b/core/Migrations/Version14000Date20180129121024.php @@ -20,11 +20,12 @@ * along with this program. If not, see . * */ + namespace OC\Core\Migrations; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; /** * Delete the admin|personal sections and settings tables diff --git a/core/Migrations/Version14000Date20180404140050.php b/core/Migrations/Version14000Date20180404140050.php index 86705f21d538bc852502923c39a7252ff85e73b0..c8f1e16ea04df4fff7b7ffe711f7fb3841d7cb8e 100644 --- a/core/Migrations/Version14000Date20180404140050.php +++ b/core/Migrations/Version14000Date20180404140050.php @@ -26,8 +26,8 @@ namespace OC\Core\Migrations; use OCP\DB\ISchemaWrapper; use OCP\IDBConnection; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; /** * Auto-generated migration step: Please modify to your needs! diff --git a/core/Migrations/Version14000Date20180516101403.php b/core/Migrations/Version14000Date20180516101403.php index 9b56e0ab6012a677670cbdc7b02f26563563b256..75ab5af74e01eb042a8f480dbafbbda5432c726f 100644 --- a/core/Migrations/Version14000Date20180516101403.php +++ b/core/Migrations/Version14000Date20180516101403.php @@ -24,8 +24,8 @@ namespace OC\Core\Migrations; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version14000Date20180516101403 extends SimpleMigrationStep { diff --git a/core/Migrations/Version14000Date20180518120534.php b/core/Migrations/Version14000Date20180518120534.php index a738c6baa7e40d9c4ade65a2459a76bee75de6e8..9d1afb3867ec62d0fca39ffbf793ccaa42fee538 100644 --- a/core/Migrations/Version14000Date20180518120534.php +++ b/core/Migrations/Version14000Date20180518120534.php @@ -25,8 +25,8 @@ declare(strict_types=1); namespace OC\Core\Migrations; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version14000Date20180518120534 extends SimpleMigrationStep { diff --git a/core/Migrations/Version14000Date20180710092004.php b/core/Migrations/Version14000Date20180710092004.php index d2e364063ced372ac09dc5a016957d7f907c69cf..69fb142f80a58e3c70ab0ecd4b0bd0b9b326a0fb 100644 --- a/core/Migrations/Version14000Date20180710092004.php +++ b/core/Migrations/Version14000Date20180710092004.php @@ -26,8 +26,8 @@ namespace OC\Core\Migrations; use Doctrine\DBAL\Types\Type; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version14000Date20180710092004 extends SimpleMigrationStep { diff --git a/core/Migrations/Version15000Date20180926101451.php b/core/Migrations/Version15000Date20180926101451.php index 00a5545576444e6ea90530e0070e00cbbbdd7bfd..f0cf68c4219a755322ee330bc1d22ead35c986d1 100644 --- a/core/Migrations/Version15000Date20180926101451.php +++ b/core/Migrations/Version15000Date20180926101451.php @@ -26,8 +26,8 @@ namespace OC\Core\Migrations; use Closure; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version15000Date20180926101451 extends SimpleMigrationStep { diff --git a/core/Migrations/Version15000Date20181015062942.php b/core/Migrations/Version15000Date20181015062942.php index e73b663d2fd1323c0e54a36c9786fe6674439d0b..6c8b10e9f35b4f7599ff4f9470a6e119a26b2a4f 100644 --- a/core/Migrations/Version15000Date20181015062942.php +++ b/core/Migrations/Version15000Date20181015062942.php @@ -27,8 +27,8 @@ namespace OC\Core\Migrations; use Closure; use Doctrine\DBAL\Types\Type; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version15000Date20181015062942 extends SimpleMigrationStep { diff --git a/core/Migrations/Version15000Date20181029084625.php b/core/Migrations/Version15000Date20181029084625.php index f3e12ddbb9b9f618dbc1a54781c41d5c91f72e80..20b4efb2b6b37ba20f61f0ada6e665d19cde4bb7 100644 --- a/core/Migrations/Version15000Date20181029084625.php +++ b/core/Migrations/Version15000Date20181029084625.php @@ -26,8 +26,8 @@ namespace OC\Core\Migrations; use Closure; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version15000Date20181029084625 extends SimpleMigrationStep { diff --git a/core/Migrations/Version16000Date20190207141427.php b/core/Migrations/Version16000Date20190207141427.php index c74c3ee1c36b9906d1df065077212fde32896248..ebd6a9e8bca68a7b3d76b43e4ec35fc91f23c6fd 100644 --- a/core/Migrations/Version16000Date20190207141427.php +++ b/core/Migrations/Version16000Date20190207141427.php @@ -25,8 +25,8 @@ namespace OC\Core\Migrations; use Closure; use Doctrine\DBAL\Types\Type; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version16000Date20190207141427 extends SimpleMigrationStep { diff --git a/core/Migrations/Version16000Date20190212081545.php b/core/Migrations/Version16000Date20190212081545.php index dcb2722222a69113e35629f987c69686146ccf2a..2713772c0f57bfbab1f55b325db9fab9ec8256b1 100644 --- a/core/Migrations/Version16000Date20190212081545.php +++ b/core/Migrations/Version16000Date20190212081545.php @@ -27,8 +27,8 @@ namespace OC\Core\Migrations; use Closure; use Doctrine\DBAL\Types\Type; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version16000Date20190212081545 extends SimpleMigrationStep { /** diff --git a/core/Migrations/Version16000Date20190427105638.php b/core/Migrations/Version16000Date20190427105638.php index 6fa0292133bc96a076c5f9c2115cfeda3f3686c5..870ddbcedfb3a517b60507f07aa806996e62e038 100644 --- a/core/Migrations/Version16000Date20190427105638.php +++ b/core/Migrations/Version16000Date20190427105638.php @@ -25,9 +25,8 @@ namespace OC\Core\Migrations; use Closure; use OCP\DB\ISchemaWrapper; use OCP\IDBConnection; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; - +use OCP\Migration\SimpleMigrationStep; class Version16000Date20190427105638 extends SimpleMigrationStep { diff --git a/core/Migrations/Version16000Date20190428150708.php b/core/Migrations/Version16000Date20190428150708.php index cb42366fc092c8fcb9d935a97c4fca9a9ce92dd1..6f6b59aec777ced0ea621ae2477022c646f38ff3 100644 --- a/core/Migrations/Version16000Date20190428150708.php +++ b/core/Migrations/Version16000Date20190428150708.php @@ -25,8 +25,8 @@ namespace OC\Core\Migrations; use Closure; use Doctrine\DBAL\Types\Type; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version16000Date20190428150708 extends SimpleMigrationStep { diff --git a/core/Migrations/Version17000Date20190514105811.php b/core/Migrations/Version17000Date20190514105811.php index 1cf4c9f5a371f23b3c60e856bc3f83e3f7150fab..aeae2e6467ebd4e66f6bc1f139e0ead9ca2889a7 100644 --- a/core/Migrations/Version17000Date20190514105811.php +++ b/core/Migrations/Version17000Date20190514105811.php @@ -22,14 +22,13 @@ declare(strict_types=1); * */ - namespace OC\Core\Migrations; use Closure; use Doctrine\DBAL\Types\Type; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version17000Date20190514105811 extends SimpleMigrationStep { diff --git a/core/Migrations/Version18000Date20190920085628.php b/core/Migrations/Version18000Date20190920085628.php index e84c698bb7bdbbbc3ac97e8bd5994ef54a0494d8..a3f123c8d5aa1908dca369de6d56d8e14f256d0e 100644 --- a/core/Migrations/Version18000Date20190920085628.php +++ b/core/Migrations/Version18000Date20190920085628.php @@ -26,8 +26,8 @@ use Closure; use Doctrine\DBAL\Types\Type; use OCP\DB\ISchemaWrapper; use OCP\IDBConnection; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version18000Date20190920085628 extends SimpleMigrationStep { diff --git a/core/ajax/update.php b/core/ajax/update.php index 2cf4377e3e4b3257a8325c01befc41f2c27bbf63..4cff4569b46fba61cd66c7a3789b24315b0ac908 100644 --- a/core/ajax/update.php +++ b/core/ajax/update.php @@ -235,4 +235,3 @@ if (\OCP\Util::needUpgrade()) { $eventSource->send('done', ''); $eventSource->close(); - diff --git a/lib/private/Accounts/AccountManager.php b/lib/private/Accounts/AccountManager.php index 7a73ec455eb33af7cf54bf770d7e064abf738afa..ada1228954ce221d88e5c961259f44590afc440b 100644 --- a/lib/private/Accounts/AccountManager.php +++ b/lib/private/Accounts/AccountManager.php @@ -23,9 +23,9 @@ * */ - namespace OC\Accounts; +use OCA\Settings\BackgroundJobs\VerifyUserData; use OCP\Accounts\IAccount; use OCP\Accounts\IAccountManager; use OCP\BackgroundJob\IJobList; @@ -33,7 +33,6 @@ use OCP\IDBConnection; use OCP\IUser; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\GenericEvent; -use OCA\Settings\BackgroundJobs\VerifyUserData; /** * Class AccountManager diff --git a/lib/private/Accounts/Hooks.php b/lib/private/Accounts/Hooks.php index df0b80e82292cbd58f3620c6686e72a34daddeb1..2226b1e0b5500823d1f2a685aea58c14fb50e2bf 100644 --- a/lib/private/Accounts/Hooks.php +++ b/lib/private/Accounts/Hooks.php @@ -21,7 +21,6 @@ * */ - namespace OC\Accounts; use OCP\ILogger; diff --git a/lib/private/Activity/Manager.php b/lib/private/Activity/Manager.php index ba2d1147bc89d072040d23f4cf45c5fb3008bdfb..29c3c7bbc4deb86edde1772b9b893d30c62caa52 100644 --- a/lib/private/Activity/Manager.php +++ b/lib/private/Activity/Manager.php @@ -23,6 +23,7 @@ * along with this program. If not, see * */ + namespace OC\Activity; diff --git a/lib/private/App/AppStore/Fetcher/Fetcher.php b/lib/private/App/AppStore/Fetcher/Fetcher.php index db8c38ac686835bed1e4183958b5bf6a3eab8182..b7679685b400ce0e33ce8abfd5ca793aba063181 100644 --- a/lib/private/App/AppStore/Fetcher/Fetcher.php +++ b/lib/private/App/AppStore/Fetcher/Fetcher.php @@ -27,8 +27,8 @@ namespace OC\App\AppStore\Fetcher; -use OC\Files\AppData\Factory; use GuzzleHttp\Exception\ConnectException; +use OC\Files\AppData\Factory; use OCP\AppFramework\Http; use OCP\AppFramework\Utility\ITimeFactory; use OCP\Files\IAppData; diff --git a/lib/private/App/CodeChecker/EmptyCheck.php b/lib/private/App/CodeChecker/EmptyCheck.php index 02fbb46d7de2361436a36f4c8ddfbe80bd29c035..0a2217212a2ce5c55fa7b80ab4a14c443232a8a2 100644 --- a/lib/private/App/CodeChecker/EmptyCheck.php +++ b/lib/private/App/CodeChecker/EmptyCheck.php @@ -19,6 +19,7 @@ * along with this program. If not, see * */ + namespace OC\App\CodeChecker; class EmptyCheck implements ICheck { diff --git a/lib/private/App/CodeChecker/ICheck.php b/lib/private/App/CodeChecker/ICheck.php index 4dfaa23c5382d619cfe5801f3537c560322099a9..d34d01cd55d3b93ca14db8a7d9548c9ee403cdda 100644 --- a/lib/private/App/CodeChecker/ICheck.php +++ b/lib/private/App/CodeChecker/ICheck.php @@ -19,6 +19,7 @@ * along with this program. If not, see * */ + namespace OC\App\CodeChecker; interface ICheck { diff --git a/lib/private/App/PlatformRepository.php b/lib/private/App/PlatformRepository.php index f94fb3ad504f0c165fa0eedbe5f2e05ce0e31010..a264a4dd6c5e29fa6a93696c0ba43b52361d30a8 100644 --- a/lib/private/App/PlatformRepository.php +++ b/lib/private/App/PlatformRepository.php @@ -19,6 +19,7 @@ * along with this program. If not, see * */ + namespace OC\App; /** diff --git a/lib/private/AppFramework/App.php b/lib/private/AppFramework/App.php index 691c55148813d9155a97100ee593891be060a5f7..122f4684558da1f1d79152a030d3310fa7a6a328 100644 --- a/lib/private/AppFramework/App.php +++ b/lib/private/AppFramework/App.php @@ -26,16 +26,15 @@ declare(strict_types=1); * */ - namespace OC\AppFramework; -use OC\AppFramework\Http\Dispatcher; use OC\AppFramework\DependencyInjection\DIContainer; +use OC\AppFramework\Http\Dispatcher; use OC\HintException; use OCP\AppFramework\Http; -use OCP\AppFramework\QueryException; use OCP\AppFramework\Http\ICallbackResponse; use OCP\AppFramework\Http\IOutput; +use OCP\AppFramework\QueryException; use OCP\IRequest; /** diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php index 5f3fa1b6dc6387be8b12aa1c6eed5a594ebc8717..b41be947adb3879821e3c8d381b8ab01cfbb6ca9 100644 --- a/lib/private/AppFramework/DependencyInjection/DIContainer.php +++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php @@ -32,7 +32,6 @@ * */ - namespace OC\AppFramework\DependencyInjection; use OC; @@ -40,14 +39,15 @@ use OC\AppFramework\Http; use OC\AppFramework\Http\Dispatcher; use OC\AppFramework\Http\Output; use OC\AppFramework\Middleware\MiddlewareDispatcher; -use OC\AppFramework\Middleware\Security\CORSMiddleware; use OC\AppFramework\Middleware\OCSMiddleware; +use OC\AppFramework\Middleware\Security\CORSMiddleware; use OC\AppFramework\Middleware\Security\RateLimitingMiddleware; use OC\AppFramework\Middleware\Security\SecurityMiddleware; use OC\AppFramework\Middleware\SessionMiddleware; use OC\AppFramework\Utility\SimpleContainer; use OC\Core\Middleware\TwoFactorMiddleware; use OC\ServerContainer; +use OCA\WorkflowEngine\Manager; use OCP\AppFramework\Http\IOutput; use OCP\AppFramework\IAppContainer; use OCP\AppFramework\QueryException; @@ -65,7 +65,6 @@ use OCP\IServerContainer; use OCP\ISession; use OCP\IURLGenerator; use OCP\IUserSession; -use OCA\WorkflowEngine\Manager; class DIContainer extends SimpleContainer implements IAppContainer { diff --git a/lib/private/AppFramework/Http.php b/lib/private/AppFramework/Http.php index e126c8a1cf0aec525ab517a17489524fba7a98cd..0b3b31fe541d4b203146be3b74b9d9186908a105 100644 --- a/lib/private/AppFramework/Http.php +++ b/lib/private/AppFramework/Http.php @@ -27,7 +27,6 @@ * */ - namespace OC\AppFramework; use OCP\AppFramework\Http as BaseHttp; @@ -152,5 +151,3 @@ class Http extends BaseHttp { } - - diff --git a/lib/private/AppFramework/Http/Dispatcher.php b/lib/private/AppFramework/Http/Dispatcher.php index 0b9422f9fc9c9038780bc110f6aaad4eb9e84d2d..6a04de76adcecc152e5a8d2be5d55871070e0064 100644 --- a/lib/private/AppFramework/Http/Dispatcher.php +++ b/lib/private/AppFramework/Http/Dispatcher.php @@ -27,19 +27,17 @@ declare(strict_types=1); * */ - namespace OC\AppFramework\Http; -use \OC\AppFramework\Middleware\MiddlewareDispatcher; -use \OC\AppFramework\Http; -use \OC\AppFramework\Utility\ControllerMethodReflector; +use OC\AppFramework\Http; +use OC\AppFramework\Middleware\MiddlewareDispatcher; +use OC\AppFramework\Utility\ControllerMethodReflector; use OCP\AppFramework\Controller; -use OCP\AppFramework\Http\Response; use OCP\AppFramework\Http\DataResponse; +use OCP\AppFramework\Http\Response; use OCP\IRequest; - /** * Class to dispatch the request to the middleware dispatcher */ diff --git a/lib/private/AppFramework/Middleware/MiddlewareDispatcher.php b/lib/private/AppFramework/Middleware/MiddlewareDispatcher.php index e1262b6c7124272bab0cfdf0732a1b63db314f39..70440e9623f2d6061a9e24ca09ad353384d5cbf8 100644 --- a/lib/private/AppFramework/Middleware/MiddlewareDispatcher.php +++ b/lib/private/AppFramework/Middleware/MiddlewareDispatcher.php @@ -26,7 +26,6 @@ declare(strict_types=1); * */ - namespace OC\AppFramework\Middleware; use OCP\AppFramework\Controller; diff --git a/lib/private/AppFramework/Middleware/OCSMiddleware.php b/lib/private/AppFramework/Middleware/OCSMiddleware.php index ad1d953f37275dfc3e717c8335dfe3d270387c35..2174693a1d7b6e01b6443d85b20d957419195f73 100644 --- a/lib/private/AppFramework/Middleware/OCSMiddleware.php +++ b/lib/private/AppFramework/Middleware/OCSMiddleware.php @@ -21,6 +21,7 @@ * along with this program. If not, see . * */ + namespace OC\AppFramework\Middleware; use OC\AppFramework\Http; @@ -32,10 +33,10 @@ use OCP\AppFramework\Controller; use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\Response; +use OCP\AppFramework\Middleware; use OCP\AppFramework\OCS\OCSException; use OCP\AppFramework\OCSController; use OCP\IRequest; -use OCP\AppFramework\Middleware; class OCSMiddleware extends Middleware { diff --git a/lib/private/AppFramework/Middleware/Security/PasswordConfirmationMiddleware.php b/lib/private/AppFramework/Middleware/Security/PasswordConfirmationMiddleware.php index d752a68cf322a5cb89749ea7bb20d7d145b2c110..9f0054483873a5277c38569700d34cc7f9f25c1e 100644 --- a/lib/private/AppFramework/Middleware/Security/PasswordConfirmationMiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/PasswordConfirmationMiddleware.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OC\AppFramework\Middleware\Security; use OC\AppFramework\Middleware\Security\Exceptions\NotConfirmedException; diff --git a/lib/private/AppFramework/Middleware/Security/SameSiteCookieMiddleware.php b/lib/private/AppFramework/Middleware/Security/SameSiteCookieMiddleware.php index 22a9246d6617ac6c2677e44cf0c31ad7de834c40..3c011945477bb5abf74e44b9397f7735334d3772 100644 --- a/lib/private/AppFramework/Middleware/Security/SameSiteCookieMiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/SameSiteCookieMiddleware.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OC\AppFramework\Middleware\Security; use OC\AppFramework\Http\Request; diff --git a/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php index db3157bda644ff944ac32be2a0600a097f7a7ba3..16725b1f5d616dad4e39325f45846d94ba2db242 100644 --- a/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php @@ -28,31 +28,30 @@ declare(strict_types=1); * */ - namespace OC\AppFramework\Middleware\Security; use OC\AppFramework\Middleware\Security\Exceptions\AppNotEnabledException; use OC\AppFramework\Middleware\Security\Exceptions\CrossSiteRequestForgeryException; use OC\AppFramework\Middleware\Security\Exceptions\NotAdminException; use OC\AppFramework\Middleware\Security\Exceptions\NotLoggedInException; +use OC\AppFramework\Middleware\Security\Exceptions\SecurityException; use OC\AppFramework\Middleware\Security\Exceptions\StrictCookieMissingException; use OC\AppFramework\Utility\ControllerMethodReflector; use OCP\App\AppPathNotFoundException; use OCP\App\IAppManager; +use OCP\AppFramework\Controller; +use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\RedirectResponse; +use OCP\AppFramework\Http\Response; use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Middleware; -use OCP\AppFramework\Http\Response; -use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\OCSController; use OCP\IL10N; +use OCP\ILogger; use OCP\INavigationManager; -use OCP\IURLGenerator; use OCP\IRequest; -use OCP\ILogger; -use OCP\AppFramework\Controller; +use OCP\IURLGenerator; use OCP\Util; -use OC\AppFramework\Middleware\Security\Exceptions\SecurityException; /** * Used to do all the authentication and checking stuff for a controller method diff --git a/lib/private/AppFramework/Middleware/SessionMiddleware.php b/lib/private/AppFramework/Middleware/SessionMiddleware.php index 3cb60874b3829310dce9cd3b8711a3b79f3ed531..cc927e6875c7615797344813b1235bb18560c11d 100644 --- a/lib/private/AppFramework/Middleware/SessionMiddleware.php +++ b/lib/private/AppFramework/Middleware/SessionMiddleware.php @@ -27,9 +27,9 @@ namespace OC\AppFramework\Middleware; use OC\AppFramework\Utility\ControllerMethodReflector; use OCP\AppFramework\Controller; -use OCP\IRequest; use OCP\AppFramework\Http\Response; use OCP\AppFramework\Middleware; +use OCP\IRequest; use OCP\ISession; class SessionMiddleware extends Middleware { diff --git a/lib/private/AppFramework/OCS/BaseResponse.php b/lib/private/AppFramework/OCS/BaseResponse.php index 90ea084dd99f1b0553d08387769bfdfaf2b64bfe..19567f8fdaf775d9f50f9cfd1004b8e7f1557640 100644 --- a/lib/private/AppFramework/OCS/BaseResponse.php +++ b/lib/private/AppFramework/OCS/BaseResponse.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OC\AppFramework\OCS; use OCP\AppFramework\Http; diff --git a/lib/private/AppFramework/OCS/V1Response.php b/lib/private/AppFramework/OCS/V1Response.php index 08b1178811070acff7b56ef4b1465abbd568d5ea..02405b5edbef331e9860e3e6bc35719dcb08847f 100644 --- a/lib/private/AppFramework/OCS/V1Response.php +++ b/lib/private/AppFramework/OCS/V1Response.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OC\AppFramework\OCS; use OCP\API; diff --git a/lib/private/AppFramework/OCS/V2Response.php b/lib/private/AppFramework/OCS/V2Response.php index 7e98efe867d026d286fa9e676d6d063b4be5b833..54e9e8bd9a7fff2f5607b5030fc476387b3a5871 100644 --- a/lib/private/AppFramework/OCS/V2Response.php +++ b/lib/private/AppFramework/OCS/V2Response.php @@ -20,10 +20,11 @@ * along with this program. If not, see . * */ + namespace OC\AppFramework\OCS; -use OCP\AppFramework\Http; use OCP\API; +use OCP\AppFramework\Http; class V2Response extends BaseResponse { diff --git a/lib/private/AppFramework/Routing/RouteActionHandler.php b/lib/private/AppFramework/Routing/RouteActionHandler.php index bcbe2eb400b9b52fdb8f46fda6619c68a210a823..7e1c089d2a89e82ee125664812fa616c5ffbca58 100644 --- a/lib/private/AppFramework/Routing/RouteActionHandler.php +++ b/lib/private/AppFramework/Routing/RouteActionHandler.php @@ -25,8 +25,8 @@ namespace OC\AppFramework\Routing; -use \OC\AppFramework\App; -use \OC\AppFramework\DependencyInjection\DIContainer; +use OC\AppFramework\App; +use OC\AppFramework\DependencyInjection\DIContainer; class RouteActionHandler { private $controllerName; diff --git a/lib/private/AppFramework/Utility/ControllerMethodReflector.php b/lib/private/AppFramework/Utility/ControllerMethodReflector.php index fd42606cf54d99fdaf10397671946e0d92ce9427..187fb43a9fcf1a6cca27e61d6d359ccc130475d5 100644 --- a/lib/private/AppFramework/Utility/ControllerMethodReflector.php +++ b/lib/private/AppFramework/Utility/ControllerMethodReflector.php @@ -29,7 +29,7 @@ declare(strict_types=1); namespace OC\AppFramework\Utility; -use \OCP\AppFramework\Utility\IControllerMethodReflector; +use OCP\AppFramework\Utility\IControllerMethodReflector; /** * Reads and parses annotations from doc comments diff --git a/lib/private/AppFramework/Utility/SimpleContainer.php b/lib/private/AppFramework/Utility/SimpleContainer.php index 6f50523bbf60fccad7f23649e14b8abc06c38989..b8398623490e1aa244b50265934565a01ca69c74 100644 --- a/lib/private/AppFramework/Utility/SimpleContainer.php +++ b/lib/private/AppFramework/Utility/SimpleContainer.php @@ -28,12 +28,12 @@ namespace OC\AppFramework\Utility; -use ReflectionClass; -use ReflectionException; use Closure; -use Pimple\Container; use OCP\AppFramework\QueryException; use OCP\IContainer; +use Pimple\Container; +use ReflectionClass; +use ReflectionException; /** * Class SimpleContainer diff --git a/lib/private/AppFramework/Utility/TimeFactory.php b/lib/private/AppFramework/Utility/TimeFactory.php index 4526f9b1abb1791db4c1f4e4cd2c0629833b5641..841d1838354f15694c87473860e727b36c09ffd2 100644 --- a/lib/private/AppFramework/Utility/TimeFactory.php +++ b/lib/private/AppFramework/Utility/TimeFactory.php @@ -27,7 +27,6 @@ namespace OC\AppFramework\Utility; use OCP\AppFramework\Utility\ITimeFactory; - /** * Needed to mock calls to time() */ diff --git a/lib/private/Authentication/Exceptions/ExpiredTokenException.php b/lib/private/Authentication/Exceptions/ExpiredTokenException.php index d5b2e2cbca708386a66ec415813eda74e8025fb9..ddc611b5ce3fc3a4d1d708eac57290c4af894620 100644 --- a/lib/private/Authentication/Exceptions/ExpiredTokenException.php +++ b/lib/private/Authentication/Exceptions/ExpiredTokenException.php @@ -21,6 +21,7 @@ declare(strict_types=1); * along with this program. If not, see . * */ + namespace OC\Authentication\Exceptions; use OC\Authentication\Token\IToken; diff --git a/lib/private/Authentication/Exceptions/WipeTokenException.php b/lib/private/Authentication/Exceptions/WipeTokenException.php index c56059fd7b9677226c2628a0ac14503f789d9a26..03b679596e2c77d910c0261c0ec27c0b82e40f24 100644 --- a/lib/private/Authentication/Exceptions/WipeTokenException.php +++ b/lib/private/Authentication/Exceptions/WipeTokenException.php @@ -21,6 +21,7 @@ declare(strict_types=1); * along with this program. If not, see . * */ + namespace OC\Authentication\Exceptions; use OC\Authentication\Token\IToken; diff --git a/lib/private/Authentication/Login/PreLoginHookCommand.php b/lib/private/Authentication/Login/PreLoginHookCommand.php index 87c52c6fef1deb3a4833c920f8710a58a1eecaec..e8b5c0b6aaa676f9e9e6fa79ab5a1801dc5e6070 100644 --- a/lib/private/Authentication/Login/PreLoginHookCommand.php +++ b/lib/private/Authentication/Login/PreLoginHookCommand.php @@ -51,4 +51,4 @@ class PreLoginHookCommand extends ALoginCommand { return $this->processNextOrFinishSuccessfully($loginData); } -} \ No newline at end of file +} diff --git a/lib/private/Authentication/Token/INamedToken.php b/lib/private/Authentication/Token/INamedToken.php index ede075a21c07e5517a08e4c622ad35b13864054d..403116cb660da45cfe4e216f577d859a898db804 100644 --- a/lib/private/Authentication/Token/INamedToken.php +++ b/lib/private/Authentication/Token/INamedToken.php @@ -31,4 +31,4 @@ interface INamedToken extends IToken { * @return void */ public function setName(string $name): void; -} \ No newline at end of file +} diff --git a/lib/private/Avatar/Avatar.php b/lib/private/Avatar/Avatar.php index 172f47d12a80b7eaf463d1663861dbf7c89616e3..e7baa10fbb335ffa643cc3ece2120ab8a3e3137e 100644 --- a/lib/private/Avatar/Avatar.php +++ b/lib/private/Avatar/Avatar.php @@ -32,12 +32,12 @@ declare(strict_types=1); namespace OC\Avatar; +use Imagick; use OC\Color; +use OC_Image; use OCP\Files\NotFoundException; use OCP\IAvatar; use OCP\ILogger; -use OC_Image; -use Imagick; /** * This class gets and sets users avatars. diff --git a/lib/private/Avatar/AvatarManager.php b/lib/private/Avatar/AvatarManager.php index 567ed3aec1e17bffbde5844a8dff7cc552617598..b3f475ac698dba757d654a4996a7665c88d16747 100644 --- a/lib/private/Avatar/AvatarManager.php +++ b/lib/private/Avatar/AvatarManager.php @@ -34,8 +34,8 @@ use OCP\Files\NotFoundException; use OCP\IAvatar; use OCP\IAvatarManager; use OCP\IConfig; -use OCP\ILogger; use OCP\IL10N; +use OCP\ILogger; /** * This class implements methods to access Avatar functionality diff --git a/lib/private/BackgroundJob/JobList.php b/lib/private/BackgroundJob/JobList.php index 44b6786841f28b3d184e86a00070f2e8c2bec1ce..7b5469c48f4fbc2a02dd69b3044c4755c6184686 100644 --- a/lib/private/BackgroundJob/JobList.php +++ b/lib/private/BackgroundJob/JobList.php @@ -30,9 +30,9 @@ namespace OC\BackgroundJob; use OCP\AppFramework\QueryException; use OCP\AppFramework\Utility\ITimeFactory; +use OCP\AutoloadNotAllowedException; use OCP\BackgroundJob\IJob; use OCP\BackgroundJob\IJobList; -use OCP\AutoloadNotAllowedException; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IConfig; use OCP\IDBConnection; diff --git a/lib/private/CapabilitiesManager.php b/lib/private/CapabilitiesManager.php index ceb8205a7bb8e14459f478733bb27c1830d40873..b7ecce144c87b46a0dff43d442e9cc9839f08b1d 100644 --- a/lib/private/CapabilitiesManager.php +++ b/lib/private/CapabilitiesManager.php @@ -22,7 +22,6 @@ declare(strict_types=1); * */ - namespace OC; use OCP\AppFramework\QueryException; diff --git a/lib/private/Collaboration/Resources/Collection.php b/lib/private/Collaboration/Resources/Collection.php index 6d37cebdc2f20d982826a6b4cfac2df0575deca4..beef8ba9bd81152feb92a7a2a79c82a83f10e335 100644 --- a/lib/private/Collaboration/Resources/Collection.php +++ b/lib/private/Collaboration/Resources/Collection.php @@ -24,10 +24,10 @@ namespace OC\Collaboration\Resources; use Doctrine\DBAL\Exception\ConstraintViolationException; -use OCP\Collaboration\Resources\IManager; -use OCP\Collaboration\Resources\ResourceException; use OCP\Collaboration\Resources\ICollection; +use OCP\Collaboration\Resources\IManager; use OCP\Collaboration\Resources\IResource; +use OCP\Collaboration\Resources\ResourceException; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; use OCP\IUser; diff --git a/lib/private/Comments/Comment.php b/lib/private/Comments/Comment.php index 7c935930f284f308a2ff8c5c67dd78901ed7d3f3..ef7538d140d11251719a7abcf1e050e6f4c734bc 100644 --- a/lib/private/Comments/Comment.php +++ b/lib/private/Comments/Comment.php @@ -22,6 +22,7 @@ * along with this program. If not, see * */ + namespace OC\Comments; use OCP\Comments\IComment; diff --git a/lib/private/Comments/Manager.php b/lib/private/Comments/Manager.php index 024dd58b89ca4ccff6422b3a75090f83295d664d..5c36d5e2091564422e8e678d5e6069ac87d374fa 100644 --- a/lib/private/Comments/Manager.php +++ b/lib/private/Comments/Manager.php @@ -34,8 +34,8 @@ use OCP\Comments\ICommentsEventHandler; use OCP\Comments\ICommentsManager; use OCP\Comments\NotFoundException; use OCP\DB\QueryBuilder\IQueryBuilder; -use OCP\IDBConnection; use OCP\IConfig; +use OCP\IDBConnection; use OCP\ILogger; use OCP\IUser; diff --git a/lib/private/Comments/ManagerFactory.php b/lib/private/Comments/ManagerFactory.php index 21926912b10b65e5ec9e86bc08634041ca3cafdc..1fc5fb2730b70a37d9d5ef23620035240adfea34 100644 --- a/lib/private/Comments/ManagerFactory.php +++ b/lib/private/Comments/ManagerFactory.php @@ -21,6 +21,7 @@ * along with this program. If not, see * */ + namespace OC\Comments; use OCP\Comments\ICommentsManager; diff --git a/lib/private/Config.php b/lib/private/Config.php index f462bebaf5887a3ecc76e59d4a0c8d41e6ca4b9f..4d24643c22fe5421d98401c21ed77e1defb31823 100644 --- a/lib/private/Config.php +++ b/lib/private/Config.php @@ -270,4 +270,3 @@ class Config { } } } - diff --git a/lib/private/Console/Application.php b/lib/private/Console/Application.php index d7c047527f18b794bea4367fe1e4d101635e9ba4..0260d5f7a3c8e7e608579e4c2695ada52c0147d1 100644 --- a/lib/private/Console/Application.php +++ b/lib/private/Console/Application.php @@ -27,6 +27,7 @@ * along with this program. If not, see * */ + namespace OC\Console; use OC\MemoryInfo; diff --git a/lib/private/Contacts/ContactsMenu/ContactsStore.php b/lib/private/Contacts/ContactsMenu/ContactsStore.php index 05ef9cca53a9c58d1eb0584ae9a6be1a2e7817fe..b3843b17a9e7014c6b0e5e378c8293a5d256e363 100644 --- a/lib/private/Contacts/ContactsMenu/ContactsStore.php +++ b/lib/private/Contacts/ContactsMenu/ContactsStore.php @@ -27,13 +27,13 @@ namespace OC\Contacts\ContactsMenu; +use OCP\Contacts\ContactsMenu\IContactsStore; use OCP\Contacts\ContactsMenu\IEntry; use OCP\Contacts\IManager; use OCP\IConfig; use OCP\IGroupManager; use OCP\IUser; use OCP\IUserManager; -use OCP\Contacts\ContactsMenu\IContactsStore; class ContactsStore implements IContactsStore { diff --git a/lib/private/DB/AdapterMySQL.php b/lib/private/DB/AdapterMySQL.php index aa784bb83dc532c69af2332c82e1c13baf48b304..d9af077da7075e4dc420b3eba8e57fefb67ce30a 100644 --- a/lib/private/DB/AdapterMySQL.php +++ b/lib/private/DB/AdapterMySQL.php @@ -22,7 +22,6 @@ * */ - namespace OC\DB; class AdapterMySQL extends Adapter { diff --git a/lib/private/DB/AdapterOCI8.php b/lib/private/DB/AdapterOCI8.php index 359e4ba1b677290b9e729e661cfc24ebe1968925..68e73ac8c441aafd882f35f443c545cec45307bb 100644 --- a/lib/private/DB/AdapterOCI8.php +++ b/lib/private/DB/AdapterOCI8.php @@ -23,7 +23,6 @@ * */ - namespace OC\DB; class AdapterOCI8 extends Adapter { diff --git a/lib/private/DB/AdapterPgSql.php b/lib/private/DB/AdapterPgSql.php index 42e57cd45f7d1415139307fadd521ac7af05c567..840d270d25fd8e79da926880ee740a9523ed1575 100644 --- a/lib/private/DB/AdapterPgSql.php +++ b/lib/private/DB/AdapterPgSql.php @@ -21,7 +21,6 @@ * */ - namespace OC\DB; use Doctrine\DBAL\DBALException; diff --git a/lib/private/DB/AdapterSqlite.php b/lib/private/DB/AdapterSqlite.php index 0a482259b98b96d589a9bb09d2a879f0fca74a1f..caf6a70b097b7d7f7045cf0f06ee60bed0ea4dca 100644 --- a/lib/private/DB/AdapterSqlite.php +++ b/lib/private/DB/AdapterSqlite.php @@ -24,7 +24,6 @@ * */ - namespace OC\DB; use Doctrine\DBAL\Exception\UniqueConstraintViolationException; diff --git a/lib/private/DB/Connection.php b/lib/private/DB/Connection.php index 506f4bcd4c9d8af7cb0b459c52ae48375da11865..f9c6f4155a37243ddc562115e9711f387e2891a6 100644 --- a/lib/private/DB/Connection.php +++ b/lib/private/DB/Connection.php @@ -30,13 +30,13 @@ namespace OC\DB; +use Doctrine\Common\EventManager; +use Doctrine\DBAL\Cache\QueryCacheProfile; +use Doctrine\DBAL\Configuration; use Doctrine\DBAL\DBALException; use Doctrine\DBAL\Driver; -use Doctrine\DBAL\Configuration; -use Doctrine\DBAL\Cache\QueryCacheProfile; -use Doctrine\Common\EventManager; -use Doctrine\DBAL\Platforms\MySqlPlatform; use Doctrine\DBAL\Exception\ConstraintViolationException; +use Doctrine\DBAL\Platforms\MySqlPlatform; use Doctrine\DBAL\Schema\Schema; use OC\DB\QueryBuilder\QueryBuilder; use OCP\DB\QueryBuilder\IQueryBuilder; diff --git a/lib/private/DB/MigrationService.php b/lib/private/DB/MigrationService.php index 269400c3ba90df1ca607d7fdcc1c1b1c0f59551f..329500fa081833e3df4fd17e6dedeeb104676acb 100644 --- a/lib/private/DB/MigrationService.php +++ b/lib/private/DB/MigrationService.php @@ -30,6 +30,7 @@ use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\SchemaException; use Doctrine\DBAL\Schema\Sequence; use Doctrine\DBAL\Schema\Table; +use Doctrine\DBAL\Types\Type; use OC\App\InfoParser; use OC\IntegrityCheck\Helpers\AppLocator; use OC\Migration\SimpleOutput; @@ -38,7 +39,6 @@ use OCP\AppFramework\QueryException; use OCP\IDBConnection; use OCP\Migration\IMigrationStep; use OCP\Migration\IOutput; -use Doctrine\DBAL\Types\Type; class MigrationService { diff --git a/lib/private/DB/Migrator.php b/lib/private/DB/Migrator.php index a853ab1ea1b1096ded60c72b0062410626c569b5..7f1db4b15d20e6782abc0e484b043bf8eea3a151 100644 --- a/lib/private/DB/Migrator.php +++ b/lib/private/DB/Migrator.php @@ -29,12 +29,12 @@ namespace OC\DB; -use \Doctrine\DBAL\DBALException; -use \Doctrine\DBAL\Schema\Index; -use \Doctrine\DBAL\Schema\Table; -use \Doctrine\DBAL\Schema\Schema; -use \Doctrine\DBAL\Schema\SchemaConfig; -use \Doctrine\DBAL\Schema\Comparator; +use Doctrine\DBAL\DBALException; +use Doctrine\DBAL\Schema\Comparator; +use Doctrine\DBAL\Schema\Index; +use Doctrine\DBAL\Schema\Schema; +use Doctrine\DBAL\Schema\SchemaConfig; +use Doctrine\DBAL\Schema\Table; use Doctrine\DBAL\Types\StringType; use Doctrine\DBAL\Types\Type; use OCP\IConfig; diff --git a/lib/private/DB/MissingIndexInformation.php b/lib/private/DB/MissingIndexInformation.php index 0cb9852d0d4c3c6c97b233a34e924b99d2fb0c68..bcf8465d8aae9219c6f812be6bf6a83b4c8e7162 100644 --- a/lib/private/DB/MissingIndexInformation.php +++ b/lib/private/DB/MissingIndexInformation.php @@ -36,4 +36,4 @@ class MissingIndexInformation { public function getListOfMissingIndexes(): array { return $this->listOfMissingIndexes; } -} \ No newline at end of file +} diff --git a/lib/private/DB/OracleMigrator.php b/lib/private/DB/OracleMigrator.php index be90a4bb97fbea7b9911387ce1f68c0a5e5b042f..9c6c9fd156a7e6bbc0d616e26bed70171b15b24d 100644 --- a/lib/private/DB/OracleMigrator.php +++ b/lib/private/DB/OracleMigrator.php @@ -31,10 +31,10 @@ namespace OC\DB; use Doctrine\DBAL\DBALException; use Doctrine\DBAL\Schema\Column; use Doctrine\DBAL\Schema\ColumnDiff; +use Doctrine\DBAL\Schema\ForeignKeyConstraint; use Doctrine\DBAL\Schema\Index; use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Table; -use Doctrine\DBAL\Schema\ForeignKeyConstraint; class OracleMigrator extends Migrator { diff --git a/lib/private/DB/QueryBuilder/QueryBuilder.php b/lib/private/DB/QueryBuilder/QueryBuilder.php index bff38c0c8d6a892a03e559ba5ef32084a457f417..b9fada8c4f0d7c2e58ca52e43bf1d8f6e26dc8ee 100644 --- a/lib/private/DB/QueryBuilder/QueryBuilder.php +++ b/lib/private/DB/QueryBuilder/QueryBuilder.php @@ -39,9 +39,9 @@ use OC\DB\QueryBuilder\FunctionBuilder\OCIFunctionBuilder; use OC\DB\QueryBuilder\FunctionBuilder\PgSqlFunctionBuilder; use OC\DB\QueryBuilder\FunctionBuilder\SqliteFunctionBuilder; use OC\SystemConfig; +use OCP\DB\QueryBuilder\IParameter; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\DB\QueryBuilder\IQueryFunction; -use OCP\DB\QueryBuilder\IParameter; use OCP\IDBConnection; use OCP\ILogger; diff --git a/lib/private/DB/SQLiteSessionInit.php b/lib/private/DB/SQLiteSessionInit.php index 635a5d98a9e77ead872f84da0b5c4938acb1b75e..826bf8e1952e307be7d601c1ba7d24631c516c0b 100644 --- a/lib/private/DB/SQLiteSessionInit.php +++ b/lib/private/DB/SQLiteSessionInit.php @@ -24,9 +24,9 @@ namespace OC\DB; +use Doctrine\Common\EventSubscriber; use Doctrine\DBAL\Event\ConnectionEventArgs; use Doctrine\DBAL\Events; -use Doctrine\Common\EventSubscriber; class SQLiteSessionInit implements EventSubscriber { /** diff --git a/lib/private/Dashboard/DashboardManager.php b/lib/private/Dashboard/DashboardManager.php index 712d56641fae98012cbd6b857f5188777a2dcff9..c2ec8f252883b9ecccd8e38698a7c600e0afc188 100644 --- a/lib/private/Dashboard/DashboardManager.php +++ b/lib/private/Dashboard/DashboardManager.php @@ -27,7 +27,6 @@ declare(strict_types=1); * */ - namespace OC\Dashboard; @@ -37,7 +36,6 @@ use OCP\Dashboard\Model\IWidgetConfig; use OCP\Dashboard\Service\IEventsService; use OCP\Dashboard\Service\IWidgetsService; - /** * Class DashboardManager * @@ -145,4 +143,3 @@ class DashboardManager implements IDashboardManager { } } - diff --git a/lib/private/Encryption/DecryptAll.php b/lib/private/Encryption/DecryptAll.php index d95a8660762943d74928f1fa7543959724f10e0f..86164f072d29901a8c0329aef184a035e1771c3a 100644 --- a/lib/private/Encryption/DecryptAll.php +++ b/lib/private/Encryption/DecryptAll.php @@ -24,12 +24,11 @@ * */ - namespace OC\Encryption; use OC\Encryption\Exceptions\DecryptionFailedException; use OC\Files\View; -use \OCP\Encryption\IEncryptionModule; +use OCP\Encryption\IEncryptionModule; use OCP\IUserManager; use Symfony\Component\Console\Helper\ProgressBar; use Symfony\Component\Console\Input\InputInterface; diff --git a/lib/private/Encryption/EncryptionWrapper.php b/lib/private/Encryption/EncryptionWrapper.php index c4650d39ee3ca6dd317d2c20344bdc5a4db55b5a..30fee808097a8b352d90cdf8247ab3e34bdf23b5 100644 --- a/lib/private/Encryption/EncryptionWrapper.php +++ b/lib/private/Encryption/EncryptionWrapper.php @@ -21,15 +21,14 @@ * */ - namespace OC\Encryption; -use OC\Memcache\ArrayCache; use OC\Files\Filesystem; use OC\Files\Storage\Wrapper\Encryption; -use OCP\Files\Mount\IMountPoint; use OC\Files\View; +use OC\Memcache\ArrayCache; +use OCP\Files\Mount\IMountPoint; use OCP\Files\Storage; use OCP\ILogger; diff --git a/lib/private/Encryption/Exceptions/DecryptionFailedException.php b/lib/private/Encryption/Exceptions/DecryptionFailedException.php index de13536b0c5b72c347b5bbc9c40054f1c5974bd7..946bd47b2c455155d0afbb1e063eea609208d738 100644 --- a/lib/private/Encryption/Exceptions/DecryptionFailedException.php +++ b/lib/private/Encryption/Exceptions/DecryptionFailedException.php @@ -21,7 +21,6 @@ * */ - namespace OC\Encryption\Exceptions; use OCP\Encryption\Exceptions\GenericEncryptionException; diff --git a/lib/private/Encryption/Exceptions/EmptyEncryptionDataException.php b/lib/private/Encryption/Exceptions/EmptyEncryptionDataException.php index 3e93e633ce128accd217d2a1a0c3d290a5cf6702..73c02ac8d4c4533bd7c4f83a9eff16037e77ae94 100644 --- a/lib/private/Encryption/Exceptions/EmptyEncryptionDataException.php +++ b/lib/private/Encryption/Exceptions/EmptyEncryptionDataException.php @@ -21,7 +21,6 @@ * */ - namespace OC\Encryption\Exceptions; use OCP\Encryption\Exceptions\GenericEncryptionException; diff --git a/lib/private/Encryption/Exceptions/EncryptionFailedException.php b/lib/private/Encryption/Exceptions/EncryptionFailedException.php index fefd8d4f0ba8aa915c3642fecc165dc49d8fe124..d351476ffcd1990dd376e7478d8f16a84b087812 100644 --- a/lib/private/Encryption/Exceptions/EncryptionFailedException.php +++ b/lib/private/Encryption/Exceptions/EncryptionFailedException.php @@ -21,7 +21,6 @@ * */ - namespace OC\Encryption\Exceptions; use OCP\Encryption\Exceptions\GenericEncryptionException; diff --git a/lib/private/Encryption/Exceptions/EncryptionHeaderToLargeException.php b/lib/private/Encryption/Exceptions/EncryptionHeaderToLargeException.php index 00bb0cf4262b145c6f8e4b1398292c4b9e89890a..b06087f0829a4f4b9caee7d36491a1fc93fb06f6 100644 --- a/lib/private/Encryption/Exceptions/EncryptionHeaderToLargeException.php +++ b/lib/private/Encryption/Exceptions/EncryptionHeaderToLargeException.php @@ -21,7 +21,6 @@ * */ - namespace OC\Encryption\Exceptions; use OCP\Encryption\Exceptions\GenericEncryptionException; diff --git a/lib/private/Encryption/Exceptions/UnknownCipherException.php b/lib/private/Encryption/Exceptions/UnknownCipherException.php index d2c2eb6289c1d93a86e5d6972afa5064f1a7560d..21dc6639f0d5fd2b4c2748d1a95912003c21f3b6 100644 --- a/lib/private/Encryption/Exceptions/UnknownCipherException.php +++ b/lib/private/Encryption/Exceptions/UnknownCipherException.php @@ -21,7 +21,6 @@ * */ - namespace OC\Encryption\Exceptions; use OCP\Encryption\Exceptions\GenericEncryptionException; diff --git a/lib/private/Encryption/Keys/Storage.php b/lib/private/Encryption/Keys/Storage.php index 223b959e66194b8b14fbd75951c80f450cfe7102..77284be1b9dd6523dd2a6f1d86aea54e1971bd6b 100644 --- a/lib/private/Encryption/Keys/Storage.php +++ b/lib/private/Encryption/Keys/Storage.php @@ -29,8 +29,8 @@ namespace OC\Encryption\Keys; use OC\Encryption\Util; use OC\Files\Filesystem; use OC\Files\View; -use OCP\Encryption\Keys\IStorage; use OC\User\NoUserException; +use OCP\Encryption\Keys\IStorage; class Storage implements IStorage { diff --git a/lib/private/Encryption/Update.php b/lib/private/Encryption/Update.php index 9d9f5e4d9542c46a401fd6d3dfe851a397d8c2b6..65788424906356ae90bdc0c6d599853ce094daf4 100644 --- a/lib/private/Encryption/Update.php +++ b/lib/private/Encryption/Update.php @@ -25,8 +25,8 @@ namespace OC\Encryption; use OC\Files\Filesystem; -use \OC\Files\Mount; -use \OC\Files\View; +use OC\Files\Mount; +use OC\Files\View; /** * update encrypted files, e.g. because a file was shared diff --git a/lib/private/EventDispatcher/EventDispatcher.php b/lib/private/EventDispatcher/EventDispatcher.php index d9d7985f7cc0f5911437a36d385f8d3b60dc6397..1f4a1ba9ab439619421a069c9db274b32d6a292d 100644 --- a/lib/private/EventDispatcher/EventDispatcher.php +++ b/lib/private/EventDispatcher/EventDispatcher.php @@ -25,16 +25,16 @@ declare(strict_types=1); namespace OC\EventDispatcher; +use function get_class; use OC\Broadcast\Events\BroadcastEvent; use OCP\Broadcast\Events\IBroadcastEvent; -use OCP\EventDispatcher\Event; use OCP\EventDispatcher\ABroadcastedEvent; +use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventDispatcher; use OCP\IContainer; use OCP\ILogger; use OCP\IServerContainer; use Symfony\Component\EventDispatcher\EventDispatcher as SymfonyDispatcher; -use function get_class; class EventDispatcher implements IEventDispatcher { diff --git a/lib/private/EventDispatcher/SymfonyAdapter.php b/lib/private/EventDispatcher/SymfonyAdapter.php index f8f80b6c5f8e630c0f5651d1d9d1c803a3b174d1..70c03fcb1ff85605c5117dba057b72ab5446375b 100644 --- a/lib/private/EventDispatcher/SymfonyAdapter.php +++ b/lib/private/EventDispatcher/SymfonyAdapter.php @@ -25,9 +25,9 @@ declare(strict_types=1); namespace OC\EventDispatcher; -use OCP\ILogger; use function is_callable; use OCP\EventDispatcher\Event; +use OCP\ILogger; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; diff --git a/lib/private/Federation/CloudFederationProviderManager.php b/lib/private/Federation/CloudFederationProviderManager.php index c2944f410b3abfd6aa7945c6fd1d39c63f96359f..772bc0aeb0541069f676389d1206585f5e984403 100644 --- a/lib/private/Federation/CloudFederationProviderManager.php +++ b/lib/private/Federation/CloudFederationProviderManager.php @@ -19,7 +19,6 @@ * */ - namespace OC\Federation; use OC\AppFramework\Http; diff --git a/lib/private/Files/AppData/AppData.php b/lib/private/Files/AppData/AppData.php index 7ce29bd0e00fe6a3ffcf09c17acf9185033150d4..4f526bf04cfb3ec3885fe678445e4aae86e2c3a4 100644 --- a/lib/private/Files/AppData/AppData.php +++ b/lib/private/Files/AppData/AppData.php @@ -26,10 +26,10 @@ namespace OC\Files\AppData; use OC\Cache\CappedMemoryCache; use OC\Files\SimpleFS\SimpleFolder; +use OC\SystemConfig; +use OCP\Files\Folder; use OCP\Files\IAppData; use OCP\Files\IRootFolder; -use OCP\Files\Folder; -use OC\SystemConfig; use OCP\Files\Node; use OCP\Files\NotFoundException; use OCP\Files\NotPermittedException; diff --git a/lib/private/Files/AppData/Factory.php b/lib/private/Files/AppData/Factory.php index 5c7d554ba5b0040d040935a64b4aae5af2101345..3a880d5e29b4f737c1409ed9e183d52726ccf958 100644 --- a/lib/private/Files/AppData/Factory.php +++ b/lib/private/Files/AppData/Factory.php @@ -21,6 +21,7 @@ declare(strict_types=1); * along with this program. If not, see . * */ + namespace OC\Files\AppData; use OC\SystemConfig; diff --git a/lib/private/Files/Cache/AbstractCacheEvent.php b/lib/private/Files/Cache/AbstractCacheEvent.php index db1e7a1cf32495c01dceec27c3c1c32296f74ad3..d4990f17743d6d091c4e232f8d95658c85d3fd18 100644 --- a/lib/private/Files/Cache/AbstractCacheEvent.php +++ b/lib/private/Files/Cache/AbstractCacheEvent.php @@ -21,9 +21,9 @@ namespace OC\Files\Cache; +use OCP\EventDispatcher\Event; use OCP\Files\Cache\ICacheEvent; use OCP\Files\Storage\IStorage; -use OCP\EventDispatcher\Event; class AbstractCacheEvent extends Event implements ICacheEvent { protected $storage; diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php index f1d2c64e8fd6089d0747d5c76249bb515829da69..a90617f5c53f0524e05de8d60e5e8034fe0bef72 100644 --- a/lib/private/Files/Cache/Cache.php +++ b/lib/private/Files/Cache/Cache.php @@ -38,15 +38,15 @@ namespace OC\Files\Cache; +use Doctrine\DBAL\Driver\Statement; use Doctrine\DBAL\Exception\UniqueConstraintViolationException; use OCP\DB\QueryBuilder\IQueryBuilder; -use Doctrine\DBAL\Driver\Statement; use OCP\Files\Cache\CacheInsertEvent; use OCP\Files\Cache\CacheUpdateEvent; use OCP\Files\Cache\ICache; use OCP\Files\Cache\ICacheEntry; use OCP\Files\FileInfo; -use \OCP\Files\IMimeTypeLoader; +use OCP\Files\IMimeTypeLoader; use OCP\Files\Search\ISearchQuery; use OCP\Files\Storage\IStorage; use OCP\IDBConnection; diff --git a/lib/private/Files/Cache/Wrapper/CacheWrapper.php b/lib/private/Files/Cache/Wrapper/CacheWrapper.php index 6d7f1876e29a598d1ddb2da3a13c729a7126e8e9..157bb083b730cb1205633e296246e5909a868657 100644 --- a/lib/private/Files/Cache/Wrapper/CacheWrapper.php +++ b/lib/private/Files/Cache/Wrapper/CacheWrapper.php @@ -28,8 +28,8 @@ namespace OC\Files\Cache\Wrapper; use OC\Files\Cache\Cache; -use OCP\Files\Cache\ICacheEntry; use OCP\Files\Cache\ICache; +use OCP\Files\Cache\ICacheEntry; use OCP\Files\Search\ISearchQuery; class CacheWrapper extends Cache { diff --git a/lib/private/Files/Config/CachedMountFileInfo.php b/lib/private/Files/Config/CachedMountFileInfo.php index e315493a6936f6e09722b2c3df775edce50c0ef9..331e28d3d5ef96e47cf9010210cdebff92f2dd01 100644 --- a/lib/private/Files/Config/CachedMountFileInfo.php +++ b/lib/private/Files/Config/CachedMountFileInfo.php @@ -45,4 +45,4 @@ class CachedMountFileInfo extends CachedMountInfo implements ICachedMountFileInf public function getPath() { return $this->getMountPoint() . $this->getInternalPath(); } -} \ No newline at end of file +} diff --git a/lib/private/Files/Config/MountProviderCollection.php b/lib/private/Files/Config/MountProviderCollection.php index a3c88dd6b4b1a6b7916a0244f0b5fc47e712087f..fbb455c5063396fa18bc605326be6fd94c93626a 100644 --- a/lib/private/Files/Config/MountProviderCollection.php +++ b/lib/private/Files/Config/MountProviderCollection.php @@ -26,8 +26,8 @@ namespace OC\Files\Config; use OC\Hooks\Emitter; use OC\Hooks\EmitterTrait; use OCP\Files\Config\IHomeMountProvider; -use OCP\Files\Config\IMountProviderCollection; use OCP\Files\Config\IMountProvider; +use OCP\Files\Config\IMountProviderCollection; use OCP\Files\Config\IUserMountCache; use OCP\Files\Mount\IMountManager; use OCP\Files\Mount\IMountPoint; diff --git a/lib/private/Files/Config/UserMountCache.php b/lib/private/Files/Config/UserMountCache.php index 63abdf5fdeb83ebd3d1d76477a5bb89757c52620..53bd52a2e6c32af76003f36434f87f6faed347ba 100644 --- a/lib/private/Files/Config/UserMountCache.php +++ b/lib/private/Files/Config/UserMountCache.php @@ -25,6 +25,7 @@ namespace OC\Files\Config; +use OC\Cache\CappedMemoryCache; use OCA\Files_Sharing\SharedMount; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\Files\Config\ICachedMountFileInfo; @@ -37,7 +38,6 @@ use OCP\IDBConnection; use OCP\ILogger; use OCP\IUser; use OCP\IUserManager; -use OC\Cache\CappedMemoryCache; /** * Cache mounts points per user in the cache so we can easilly look them up diff --git a/lib/private/Files/Mount/MountPoint.php b/lib/private/Files/Mount/MountPoint.php index 36e10bfb45a2f5f79e725c254905d0c0c2c8603c..1e67eecb9dcf534d270d69ffd4b0a6fae7bdb0f9 100644 --- a/lib/private/Files/Mount/MountPoint.php +++ b/lib/private/Files/Mount/MountPoint.php @@ -29,9 +29,9 @@ namespace OC\Files\Mount; -use \OC\Files\Filesystem; -use OC\Files\Storage\StorageFactory; +use OC\Files\Filesystem; use OC\Files\Storage\Storage; +use OC\Files\Storage\StorageFactory; use OCP\Files\Mount\IMountPoint; use OCP\ILogger; diff --git a/lib/private/Files/Node/HookConnector.php b/lib/private/Files/Node/HookConnector.php index 4783a71b07b5241a172b1f6ebf83f4cc50482556..b792b58407780ab2210d4368bdab5d02c79d8a1b 100644 --- a/lib/private/Files/Node/HookConnector.php +++ b/lib/private/Files/Node/HookConnector.php @@ -22,9 +22,9 @@ namespace OC\Files\Node; -use OCP\Files\FileInfo; use OC\Files\Filesystem; use OC\Files\View; +use OCP\Files\FileInfo; use OCP\Util; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\GenericEvent; diff --git a/lib/private/Files/Node/LazyRoot.php b/lib/private/Files/Node/LazyRoot.php index f5d8cdc91a99cdda934ad808708f457d27613461..acf288860d9cf337c99b803e4feb9f0bbe8cb3dc 100644 --- a/lib/private/Files/Node/LazyRoot.php +++ b/lib/private/Files/Node/LazyRoot.php @@ -20,6 +20,7 @@ * along with this program. If not, see * */ + namespace OC\Files\Node; use OCP\Files\IRootFolder; diff --git a/lib/private/Files/Node/Root.php b/lib/private/Files/Node/Root.php index 390d29edb3134db67399322b91f9fd583234653a..ad0935ebaf79e4c55c2582556fc0731f46a0ba2e 100644 --- a/lib/private/Files/Node/Root.php +++ b/lib/private/Files/Node/Root.php @@ -33,11 +33,11 @@ namespace OC\Files\Node; use OC\Cache\CappedMemoryCache; use OC\Files\Mount\Manager; use OC\Files\Mount\MountPoint; +use OC\Hooks\PublicEmitter; use OCP\Files\Config\IUserMountCache; +use OCP\Files\IRootFolder; use OCP\Files\NotFoundException; use OCP\Files\NotPermittedException; -use OC\Hooks\PublicEmitter; -use OCP\Files\IRootFolder; use OCP\ILogger; use OCP\IUserManager; diff --git a/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php b/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php index fb5e8d83ab120d749e309181ea0e48664d3b2f0c..fd6c9a2ebc193cd0e8bf363fddd266c77587aa7f 100644 --- a/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php +++ b/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php @@ -66,4 +66,4 @@ class HomeObjectStoreStorage extends ObjectStoreStorage implements \OCP\Files\IH } -} \ No newline at end of file +} diff --git a/lib/private/Files/ObjectStore/Mapper.php b/lib/private/Files/ObjectStore/Mapper.php index 2b5cf6ea4ab2dd810f4b4b3311903abcf7bfa019..c4b5e5d77784ec51cfe81e1d93fe8c7fc6a55f50 100644 --- a/lib/private/Files/ObjectStore/Mapper.php +++ b/lib/private/Files/ObjectStore/Mapper.php @@ -20,6 +20,7 @@ * along with this program. If not, see * */ + namespace OC\Files\ObjectStore; use OCP\IUser; diff --git a/lib/private/Files/ObjectStore/NoopScanner.php b/lib/private/Files/ObjectStore/NoopScanner.php index a3a396651a2333926c24216070364a19a7683b0e..1ee868c49d4d60b1c72c80eb037490db711d495c 100644 --- a/lib/private/Files/ObjectStore/NoopScanner.php +++ b/lib/private/Files/ObjectStore/NoopScanner.php @@ -24,8 +24,8 @@ */ namespace OC\Files\ObjectStore; -use \OC\Files\Cache\Scanner; -use \OC\Files\Storage\Storage; +use OC\Files\Cache\Scanner; +use OC\Files\Storage\Storage; class NoopScanner extends Scanner { diff --git a/lib/private/Files/ObjectStore/SwiftFactory.php b/lib/private/Files/ObjectStore/SwiftFactory.php index f6270d36e7addcffe5c1fdd341c02a44dda56226..430d628d3ce945b058474792410622b42f65b7db 100644 --- a/lib/private/Files/ObjectStore/SwiftFactory.php +++ b/lib/private/Files/ObjectStore/SwiftFactory.php @@ -31,15 +31,15 @@ use OCP\Files\StorageAuthException; use OCP\Files\StorageNotAvailableException; use OCP\ICache; use OCP\ILogger; -use OpenStack\Common\Error\BadResponseError; use OpenStack\Common\Auth\Token; +use OpenStack\Common\Error\BadResponseError; +use OpenStack\Common\Transport\Utils as TransportUtils; use OpenStack\Identity\v2\Models\Catalog; use OpenStack\Identity\v2\Service as IdentityV2Service; use OpenStack\Identity\v3\Service as IdentityV3Service; +use OpenStack\ObjectStore\v1\Models\Container; use OpenStack\OpenStack; -use OpenStack\Common\Transport\Utils as TransportUtils; use Psr\Http\Message\RequestInterface; -use OpenStack\ObjectStore\v1\Models\Container; class SwiftFactory { private $cache; diff --git a/lib/private/Files/SimpleFS/SimpleFile.php b/lib/private/Files/SimpleFS/SimpleFile.php index 9c9ca10650caf7c9c81d4f8e98238285c59bbbf5..85a1a64a8540594a4bef0addcbf064dd5c23f030 100644 --- a/lib/private/Files/SimpleFS/SimpleFile.php +++ b/lib/private/Files/SimpleFS/SimpleFile.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OC\Files\SimpleFS; use OCP\Files\File; diff --git a/lib/private/Files/SimpleFS/SimpleFolder.php b/lib/private/Files/SimpleFS/SimpleFolder.php index 5b55fe0f157652ccfe27761e262278a1ea4512da..9375a3c5545b08c6be3e0474646062dc3af14a90 100644 --- a/lib/private/Files/SimpleFS/SimpleFolder.php +++ b/lib/private/Files/SimpleFS/SimpleFolder.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OC\Files\SimpleFS; use OCP\Files\File; diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php index 2dbaf619c05108d804f60e912b5632bf7a5a03a3..3bc14d35cd00bd0ac202c2660efc74d9bd0e66d8 100644 --- a/lib/private/Files/Storage/Common.php +++ b/lib/private/Files/Storage/Common.php @@ -44,8 +44,8 @@ use OC\Files\Cache\Cache; use OC\Files\Cache\Propagator; use OC\Files\Cache\Scanner; use OC\Files\Cache\Updater; -use OC\Files\Filesystem; use OC\Files\Cache\Watcher; +use OC\Files\Filesystem; use OC\Files\Storage\Wrapper\Jail; use OC\Files\Storage\Wrapper\Wrapper; use OCP\Files\EmptyFileNameException; diff --git a/lib/private/Files/Storage/DAV.php b/lib/private/Files/Storage/DAV.php index 2367c1aab3c2265f803f8a5694dea4a173f7dbcb..69e6f309c31edf405704413d80fba8acda40ba52 100644 --- a/lib/private/Files/Storage/DAV.php +++ b/lib/private/Files/Storage/DAV.php @@ -35,19 +35,19 @@ namespace OC\Files\Storage; use Exception; use GuzzleHttp\Exception\RequestException; -use OCP\Files\ForbiddenException; -use OCP\ILogger; -use Psr\Http\Message\ResponseInterface; use Icewind\Streams\CallbackWrapper; -use OC\Files\Filesystem; use Icewind\Streams\IteratorDirectory; +use OC\Files\Filesystem; use OC\MemCache\ArrayCache; use OCP\AppFramework\Http; use OCP\Constants; use OCP\Files\FileInfo; +use OCP\Files\ForbiddenException; use OCP\Files\StorageInvalidException; use OCP\Files\StorageNotAvailableException; +use OCP\ILogger; use OCP\Util; +use Psr\Http\Message\ResponseInterface; use Sabre\DAV\Client; use Sabre\DAV\Xml\Property\ResourceType; use Sabre\HTTP\ClientException; @@ -864,4 +864,3 @@ class DAV extends Common { // TODO: only log for now, but in the future need to wrap/rethrow exception } } - diff --git a/lib/private/Files/Storage/FailedStorage.php b/lib/private/Files/Storage/FailedStorage.php index 9ed09e82e7d4b7a1b7638da42b94844df0395cf3..4ee9b21694afb193122389c806a58cc0b124c88f 100644 --- a/lib/private/Files/Storage/FailedStorage.php +++ b/lib/private/Files/Storage/FailedStorage.php @@ -27,8 +27,8 @@ namespace OC\Files\Storage; use OC\Files\Cache\FailedCache; use OCP\Files\Storage\IStorage; -use \OCP\Lock\ILockingProvider; -use \OCP\Files\StorageNotAvailableException; +use OCP\Files\StorageNotAvailableException; +use OCP\Lock\ILockingProvider; /** * Storage placeholder to represent a missing precondition, storage unavailable diff --git a/lib/private/Files/Storage/Wrapper/Availability.php b/lib/private/Files/Storage/Wrapper/Availability.php index 77a23d26fb7b50d3988376ba35bb38b912750a89..0c01595d30641efa6170193a44a19a29062bf284 100644 --- a/lib/private/Files/Storage/Wrapper/Availability.php +++ b/lib/private/Files/Storage/Wrapper/Availability.php @@ -21,6 +21,7 @@ * along with this program. If not, see * */ + namespace OC\Files\Storage\Wrapper; use OCP\Files\Storage\IStorage; diff --git a/lib/private/Files/Storage/Wrapper/Encoding.php b/lib/private/Files/Storage/Wrapper/Encoding.php index bc8519bf42cae5c4b08c9fa8ef8b2ae0f2175fe7..f143c8b8c92dc1fb89aff87a0a602c764f6d90a2 100644 --- a/lib/private/Files/Storage/Wrapper/Encoding.php +++ b/lib/private/Files/Storage/Wrapper/Encoding.php @@ -23,9 +23,9 @@ namespace OC\Files\Storage\Wrapper; +use OC\Cache\CappedMemoryCache; use OCP\Files\Storage\IStorage; use OCP\ICache; -use OC\Cache\CappedMemoryCache; /** * Encoding wrapper that deals with file names that use unsupported encodings like NFD. diff --git a/lib/private/Files/Storage/Wrapper/Encryption.php b/lib/private/Files/Storage/Wrapper/Encryption.php index 5485b80985bdd6cb0a90c61cdf47df594f8192c1..7741f820c63a798810ebb68fac5385ef778bd3da 100644 --- a/lib/private/Files/Storage/Wrapper/Encryption.php +++ b/lib/private/Files/Storage/Wrapper/Encryption.php @@ -41,10 +41,10 @@ use OCP\Encryption\Exceptions\GenericEncryptionException; use OCP\Encryption\IFile; use OCP\Encryption\IManager; use OCP\Encryption\Keys\IStorage; +use OCP\Files\Cache\ICacheEntry; use OCP\Files\Mount\IMountPoint; use OCP\Files\Storage; use OCP\ILogger; -use OCP\Files\Cache\ICacheEntry; class Encryption extends Wrapper { diff --git a/lib/private/Files/Type/Loader.php b/lib/private/Files/Type/Loader.php index d1419dca4dc58ffcde669b78c03dae3416c46547..46588a74d0da100f1a654a5b722fff49a792cdd6 100644 --- a/lib/private/Files/Type/Loader.php +++ b/lib/private/Files/Type/Loader.php @@ -25,9 +25,9 @@ namespace OC\Files\Type; +use Doctrine\DBAL\Exception\UniqueConstraintViolationException; use OCP\Files\IMimeTypeLoader; use OCP\IDBConnection; -use Doctrine\DBAL\Exception\UniqueConstraintViolationException; /** * Mimetype database loader diff --git a/lib/private/Files/Utils/Scanner.php b/lib/private/Files/Utils/Scanner.php index 28921973fcf22497671441d78b224dac5fc53ee2..8dee7bf742308c190d9531b60d206a2bf0411b9b 100644 --- a/lib/private/Files/Utils/Scanner.php +++ b/lib/private/Files/Utils/Scanner.php @@ -30,6 +30,7 @@ namespace OC\Files\Utils; use OC\Files\Cache\Cache; use OC\Files\Filesystem; +use OC\Files\Storage\FailedStorage; use OC\ForbiddenException; use OC\Hooks\PublicEmitter; use OC\Lock\DBLockingProvider; @@ -38,7 +39,6 @@ use OCP\Files\NotFoundException; use OCP\Files\Storage\IStorage; use OCP\Files\StorageNotAvailableException; use OCP\ILogger; -use OC\Files\Storage\FailedStorage; /** * Class Scanner @@ -279,4 +279,3 @@ class Scanner extends PublicEmitter { } } } - diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php index 8322576c5c21b061be506ed838d15b5181dbb9ba..4f4c4b90f2c780bb4ce7cf87e9eb0f0bac0be96f 100644 --- a/lib/private/Files/View.php +++ b/lib/private/Files/View.php @@ -42,7 +42,6 @@ * */ - namespace OC\Files; use Icewind\Streams\CallbackWrapper; diff --git a/lib/private/FullTextSearch/FullTextSearchManager.php b/lib/private/FullTextSearch/FullTextSearchManager.php index 8ab1af05b0eb6ceb130f2139b7beb753900d1719..3aec4638a215c367be225885801ffe66709c6eac 100644 --- a/lib/private/FullTextSearch/FullTextSearchManager.php +++ b/lib/private/FullTextSearch/FullTextSearchManager.php @@ -27,7 +27,6 @@ declare(strict_types=1); * */ - namespace OC\FullTextSearch; @@ -39,7 +38,6 @@ use OCP\FullTextSearch\Service\IIndexService; use OCP\FullTextSearch\Service\IProviderService; use OCP\FullTextSearch\Service\ISearchService; - /** * Class FullTextSearchManager * @@ -239,4 +237,3 @@ class FullTextSearchManager implements IFullTextSearchManager { } - diff --git a/lib/private/FullTextSearch/Model/DocumentAccess.php b/lib/private/FullTextSearch/Model/DocumentAccess.php index 088bf075ae681e586f8640126c85861873f37d06..ce195eb8a2eb9824468447024bb59e488f7d59c6 100644 --- a/lib/private/FullTextSearch/Model/DocumentAccess.php +++ b/lib/private/FullTextSearch/Model/DocumentAccess.php @@ -27,14 +27,12 @@ declare(strict_types=1); * */ - namespace OC\FullTextSearch\Model; use JsonSerializable; use OCP\FullTextSearch\Model\IDocumentAccess; - /** * Class IDocumentAccess * @@ -362,4 +360,3 @@ final class DocumentAccess implements IDocumentAccess, JsonSerializable { ]; } } - diff --git a/lib/private/FullTextSearch/Model/IndexDocument.php b/lib/private/FullTextSearch/Model/IndexDocument.php index d5bef9060211059803c81f35d294896582ffebd0..1efa55b5ca171145b0bc1e47de5d9e95beb5d00e 100644 --- a/lib/private/FullTextSearch/Model/IndexDocument.php +++ b/lib/private/FullTextSearch/Model/IndexDocument.php @@ -27,7 +27,6 @@ declare(strict_types=1); * */ - namespace OC\FullTextSearch\Model; @@ -36,7 +35,6 @@ use OCP\FullTextSearch\Model\IDocumentAccess; use OCP\FullTextSearch\Model\IIndex; use OCP\FullTextSearch\Model\IIndexDocument; - /** * Class IndexDocument * @@ -997,4 +995,3 @@ class IndexDocument implements IIndexDocument, JsonSerializable { } } - diff --git a/lib/private/FullTextSearch/Model/SearchOption.php b/lib/private/FullTextSearch/Model/SearchOption.php index 6a67c9fe7df4c1ad95e51ad73c807ad872b699f8..d0eb0eab2edef4ade82697713d7829cce561b616 100644 --- a/lib/private/FullTextSearch/Model/SearchOption.php +++ b/lib/private/FullTextSearch/Model/SearchOption.php @@ -27,14 +27,12 @@ declare(strict_types=1); * */ - namespace OC\FullTextSearch\Model; use JsonSerializable; use OCP\FullTextSearch\Model\ISearchOption; - /** * @since 15.0.0 * diff --git a/lib/private/FullTextSearch/Model/SearchRequestSimpleQuery.php b/lib/private/FullTextSearch/Model/SearchRequestSimpleQuery.php index a01fb232916eafedd77c02fd9f18e4ae18522543..8796f28a249014c9717b1d81686efadefc1186cf 100644 --- a/lib/private/FullTextSearch/Model/SearchRequestSimpleQuery.php +++ b/lib/private/FullTextSearch/Model/SearchRequestSimpleQuery.php @@ -27,14 +27,12 @@ declare(strict_types=1); * */ - namespace OC\FullTextSearch\Model; use JsonSerializable; use OCP\FullTextSearch\Model\ISearchRequestSimpleQuery; - /** * @since 17.0.0 * diff --git a/lib/private/FullTextSearch/Model/SearchTemplate.php b/lib/private/FullTextSearch/Model/SearchTemplate.php index 22333e712ce186326a5f9c7db6271c1b01c6264e..a4c21d30bcc6e5b24614400518028b27c877004d 100644 --- a/lib/private/FullTextSearch/Model/SearchTemplate.php +++ b/lib/private/FullTextSearch/Model/SearchTemplate.php @@ -27,7 +27,6 @@ declare(strict_types=1); * */ - namespace OC\FullTextSearch\Model; @@ -36,7 +35,6 @@ use OCP\FullTextSearch\IFullTextSearchProvider; use OCP\FullTextSearch\Model\ISearchOption; use OCP\FullTextSearch\Model\ISearchTemplate; - /** * Class ISearchTemplate * @@ -257,4 +255,3 @@ final class SearchTemplate implements ISearchTemplate, JsonSerializable { ]; } } - diff --git a/lib/private/GlobalScale/Config.php b/lib/private/GlobalScale/Config.php index da7a459741b8ae235a21f82d69c0c27beffd9acb..2ab862a0e4e91545b9b48620d0e0cfff6b60bf5b 100644 --- a/lib/private/GlobalScale/Config.php +++ b/lib/private/GlobalScale/Config.php @@ -21,7 +21,6 @@ * */ - namespace OC\GlobalScale; diff --git a/lib/private/Group/Group.php b/lib/private/Group/Group.php index 8d86425c8e57fab0e3328e38f312d26175453db7..fa14e4e99325e4e4d67d657d9b3af7caebd20898 100644 --- a/lib/private/Group/Group.php +++ b/lib/private/Group/Group.php @@ -30,14 +30,14 @@ namespace OC\Group; +use OC\Hooks\PublicEmitter; +use OCP\Group\Backend\ICountDisabledInGroup; use OCP\Group\Backend\IGetDisplayNameBackend; use OCP\Group\Backend\IHideFromCollaborationBackend; -use OC\Hooks\PublicEmitter; use OCP\Group\Backend\ISetDisplayNameBackend; use OCP\GroupInterface; use OCP\IGroup; use OCP\IUser; -use OCP\Group\Backend\ICountDisabledInGroup; use OCP\IUserManager; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\GenericEvent; diff --git a/lib/private/Group/MetaData.php b/lib/private/Group/MetaData.php index f4877237ec798dee1f3ac47b50c98b96ebd84ae3..cda208f3f58a5c1dc9e88faf31f28370f5073306 100644 --- a/lib/private/Group/MetaData.php +++ b/lib/private/Group/MetaData.php @@ -28,8 +28,8 @@ namespace OC\Group; -use OCP\IUserSession; use OCP\IGroupManager; +use OCP\IUserSession; class MetaData { const SORT_NONE = 0; diff --git a/lib/private/L10N/LanguageNotFoundException.php b/lib/private/L10N/LanguageNotFoundException.php index 317e0629b60155425fed0253c482f98f43de1a70..0f3b8140e08b49c16a0af6fb616e5542a1eac70a 100644 --- a/lib/private/L10N/LanguageNotFoundException.php +++ b/lib/private/L10N/LanguageNotFoundException.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OC\L10N; class LanguageNotFoundException extends \Exception { diff --git a/lib/private/Lock/MemcacheLockingProvider.php b/lib/private/Lock/MemcacheLockingProvider.php index 4d1b3dc0bca1aa47d5ca78acf46e009659ccc12f..368c672dbb205de2e18773b9cb64a9d9a82621c8 100644 --- a/lib/private/Lock/MemcacheLockingProvider.php +++ b/lib/private/Lock/MemcacheLockingProvider.php @@ -23,9 +23,9 @@ declare(strict_types=1); namespace OC\Lock; +use OCP\IMemcache; use OCP\IMemcacheTTL; use OCP\Lock\LockedException; -use OCP\IMemcache; class MemcacheLockingProvider extends AbstractLockingProvider { /** diff --git a/lib/private/Log.php b/lib/private/Log.php index da29c351185709328185c8bf108992ffea199d49..22792fe4020e64ce5c7e756613c0f399ddd7c93d 100644 --- a/lib/private/Log.php +++ b/lib/private/Log.php @@ -39,9 +39,9 @@ use function array_merge; use InterfaSys\LogNormalizer\Normalizer; use OC\Log\ExceptionSerializer; +use OCP\ILogger; use OCP\Log\IFileBased; use OCP\Log\IWriter; -use OCP\ILogger; use OCP\Support\CrashReport\IRegistry; /** diff --git a/lib/private/Log/Errorlog.php b/lib/private/Log/Errorlog.php index 9dc8b2cc49c24bfceb26fad5bcb74699e03081e1..ebcb73be4ce2a830f8b81a0eed7cacf8858e50cd 100644 --- a/lib/private/Log/Errorlog.php +++ b/lib/private/Log/Errorlog.php @@ -39,4 +39,3 @@ class Errorlog implements IWriter { error_log('[owncloud]['.$app.']['.$level.'] '.$message); } } - diff --git a/lib/private/Log/File.php b/lib/private/Log/File.php index fe2bbf30a2616c718c31718a91d1c127d456a8cc..b982836b8efdc21e13dbc6ee5f4d2971f792c349 100644 --- a/lib/private/Log/File.php +++ b/lib/private/Log/File.php @@ -37,9 +37,9 @@ namespace OC\Log; use OC\SystemConfig; +use OCP\ILogger; use OCP\Log\IFileBased; use OCP\Log\IWriter; -use OCP\ILogger; /** * logging utilities diff --git a/lib/private/Log/Systemdlog.php b/lib/private/Log/Systemdlog.php index c40e4860f95c7f9e41e2974dd70f4d1cfca26a6e..1fd0a6a419be54e68ee0ccec701b628b0f38cb20 100644 --- a/lib/private/Log/Systemdlog.php +++ b/lib/private/Log/Systemdlog.php @@ -24,8 +24,8 @@ namespace OC\Log; use OC\HintException; use OC\SystemConfig; -use OCP\ILogger; use OCP\IConfig; +use OCP\ILogger; use OCP\Log\IWriter; // The following fields are understood by systemd/journald, see diff --git a/lib/private/Mail/Mailer.php b/lib/private/Mail/Mailer.php index d103e1380c53d767510e99c024ad046e49bf79f9..e3547c84da31b18880c3462c30dfd0041e70696f 100644 --- a/lib/private/Mail/Mailer.php +++ b/lib/private/Mail/Mailer.php @@ -31,11 +31,11 @@ use Egulias\EmailValidator\Validation\RFCValidation; use OCP\Defaults; use OCP\IConfig; use OCP\IL10N; +use OCP\ILogger; use OCP\IURLGenerator; use OCP\Mail\IAttachment; use OCP\Mail\IEMailTemplate; use OCP\Mail\IMailer; -use OCP\ILogger; use OCP\Mail\IMessage; /** diff --git a/lib/private/Memcache/Redis.php b/lib/private/Memcache/Redis.php index adf3c5050bd0a9209716f8e6b9a19ffcd4b81ca9..8d0d1679e809d289ad59a13d02a5ccf70cf92708 100644 --- a/lib/private/Memcache/Redis.php +++ b/lib/private/Memcache/Redis.php @@ -178,4 +178,3 @@ class Redis extends Cache implements IMemcacheTTL { return \OC::$server->getGetRedisFactory()->isAvailable(); } } - diff --git a/lib/private/Migration/BackgroundRepair.php b/lib/private/Migration/BackgroundRepair.php index 7ef90301cf3c7dbcafac3df2eabd638aac4ae25c..7cab14f5ccc711fede491e7023fba4a164cb3135 100644 --- a/lib/private/Migration/BackgroundRepair.php +++ b/lib/private/Migration/BackgroundRepair.php @@ -20,6 +20,7 @@ * along with this program. If not, see * */ + namespace OC\Migration; use OC\BackgroundJob\JobList; diff --git a/lib/private/Migration/ConsoleOutput.php b/lib/private/Migration/ConsoleOutput.php index 74c8c7340cc697f4f0bd1aa4a1e41b2ee87157c3..d3487a771ccd9991a11b9c1a35277de85c892519 100644 --- a/lib/private/Migration/ConsoleOutput.php +++ b/lib/private/Migration/ConsoleOutput.php @@ -20,7 +20,6 @@ * */ - namespace OC\Migration; diff --git a/lib/private/Migration/SimpleOutput.php b/lib/private/Migration/SimpleOutput.php index ea61c44fcac58df55c4e0e04cd96fd0e5b7bfc43..c3426a426f8fcc2568ef50c3c2aac148636428a0 100644 --- a/lib/private/Migration/SimpleOutput.php +++ b/lib/private/Migration/SimpleOutput.php @@ -20,7 +20,6 @@ * */ - namespace OC\Migration; diff --git a/lib/private/OCS/DiscoveryService.php b/lib/private/OCS/DiscoveryService.php index 6662263fb763abb53bb3d7c8c6ce494eb1c271c0..f084dae35edb8188a9451a28194152d2019669c8 100644 --- a/lib/private/OCS/DiscoveryService.php +++ b/lib/private/OCS/DiscoveryService.php @@ -22,7 +22,6 @@ declare(strict_types=1); * */ - namespace OC\OCS; use OCP\AppFramework\Http; diff --git a/lib/private/Preview/Bitmap.php b/lib/private/Preview/Bitmap.php index 000b1f8277f21a9a272a67dc4382298986ff1c3c..fe309376296e37a8441d53afdbe88d95e584839a 100644 --- a/lib/private/Preview/Bitmap.php +++ b/lib/private/Preview/Bitmap.php @@ -26,9 +26,9 @@ namespace OC\Preview; use Imagick; +use OCP\Files\File; use OCP\IImage; use OCP\ILogger; -use OCP\Files\File; /** * Creates a PNG preview using ImageMagick via the PECL extension diff --git a/lib/private/Preview/Generator.php b/lib/private/Preview/Generator.php index 79c512c84aac2930c53186d1f1d638943f89fc91..981c820ccf329b04994af278b1380be59feccf59 100644 --- a/lib/private/Preview/Generator.php +++ b/lib/private/Preview/Generator.php @@ -36,8 +36,8 @@ use OCP\IConfig; use OCP\IImage; use OCP\IPreview; use OCP\Preview\IProvider; -use OCP\Preview\IVersionedPreviewFile; use OCP\Preview\IProviderV2; +use OCP\Preview\IVersionedPreviewFile; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\GenericEvent; diff --git a/lib/private/Preview/GeneratorHelper.php b/lib/private/Preview/GeneratorHelper.php index 7e35b5360d44512395688d02adeb9e4a1d1e330e..4389e269c8b9f15173999ea34ac8b39206fbc7a3 100644 --- a/lib/private/Preview/GeneratorHelper.php +++ b/lib/private/Preview/GeneratorHelper.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OC\Preview; use OC\Files\View; diff --git a/lib/private/Preview/HEIC.php b/lib/private/Preview/HEIC.php index d23e6c6bd1f27e7e62889ef6a914c7dcfd175058..9f4f9be38dfaabfb425fe1b75caae6b5d9e6171f 100644 --- a/lib/private/Preview/HEIC.php +++ b/lib/private/Preview/HEIC.php @@ -23,9 +23,9 @@ declare(strict_types=1); namespace OC\Preview; +use OCP\Files\File; use OCP\IImage; use OCP\ILogger; -use OCP\Files\File; /** * Creates a JPG preview using ImageMagick via the PECL extension diff --git a/lib/private/Preview/Image.php b/lib/private/Preview/Image.php index 6f82904a6a778e61b3edcfd17d543ab0e2e0b254..b8767d3f6392b88047c6b45f1d70022a9ef8035c 100644 --- a/lib/private/Preview/Image.php +++ b/lib/private/Preview/Image.php @@ -25,6 +25,7 @@ * along with this program. If not, see * */ + namespace OC\Preview; use OCP\Files\File; diff --git a/lib/private/Preview/MP3.php b/lib/private/Preview/MP3.php index f560f10010996a2b03bf90fdf07e765dc0704682..6b19602b5c996e26c2395ea1a49ce89b4d24ea33 100644 --- a/lib/private/Preview/MP3.php +++ b/lib/private/Preview/MP3.php @@ -24,6 +24,7 @@ * along with this program. If not, see * */ + namespace OC\Preview; use ID3Parser\ID3Parser; diff --git a/lib/private/Preview/MSOffice2003.php b/lib/private/Preview/MSOffice2003.php index 5af66f727203740592dae1a4fcb182629b8be4f0..67559224528a08352d77bc02633f78667fe99b02 100644 --- a/lib/private/Preview/MSOffice2003.php +++ b/lib/private/Preview/MSOffice2003.php @@ -19,6 +19,7 @@ * along with this program. If not, see * */ + namespace OC\Preview; //.docm, .dotm, .xls(m), .xlt(m), .xla(m), .ppt(m), .pot(m), .pps(m), .ppa(m) diff --git a/lib/private/Preview/MSOffice2007.php b/lib/private/Preview/MSOffice2007.php index 0d1177d9de99ec41b838693d64d6f669a4193f2c..125e0ecfcad90b05e183dab6fc77f68788e41f44 100644 --- a/lib/private/Preview/MSOffice2007.php +++ b/lib/private/Preview/MSOffice2007.php @@ -19,6 +19,7 @@ * along with this program. If not, see * */ + namespace OC\Preview; //.docx, .dotx, .xlsx, .xltx, .pptx, .potx, .ppsx diff --git a/lib/private/Preview/MSOfficeDoc.php b/lib/private/Preview/MSOfficeDoc.php index 24d1a9d5b6a48b5f705cbbb4e929b8a9e2beaae2..e1359c6b90361f1869e1470a74de60f2f00aa82c 100644 --- a/lib/private/Preview/MSOfficeDoc.php +++ b/lib/private/Preview/MSOfficeDoc.php @@ -19,6 +19,7 @@ * along with this program. If not, see * */ + namespace OC\Preview; //.doc, .dot diff --git a/lib/private/Preview/MarkDown.php b/lib/private/Preview/MarkDown.php index ae24c4f4419f447673329e18c0c00207fbcc2cbc..bdf16ae2bc591f47e4337a7a7034f5e7c71f031a 100644 --- a/lib/private/Preview/MarkDown.php +++ b/lib/private/Preview/MarkDown.php @@ -19,6 +19,7 @@ * along with this program. If not, see * */ + namespace OC\Preview; class MarkDown extends TXT { diff --git a/lib/private/Preview/Movie.php b/lib/private/Preview/Movie.php index 60fe443804a7e2c80072c1a75da880ff04c65aad..17916896f9735370d107bacae48005c60c53425a 100644 --- a/lib/private/Preview/Movie.php +++ b/lib/private/Preview/Movie.php @@ -23,6 +23,7 @@ * along with this program. If not, see * */ + namespace OC\Preview; use OCP\Files\File; diff --git a/lib/private/Preview/Office.php b/lib/private/Preview/Office.php index f51023c5a833e5cb85842cd8f50f79e232b1caee..49437aec1867521f8fe5e6fc239288a99e9522a4 100644 --- a/lib/private/Preview/Office.php +++ b/lib/private/Preview/Office.php @@ -23,11 +23,12 @@ * along with this program. If not, see * */ + namespace OC\Preview; +use OCP\Files\File; use OCP\IImage; use OCP\ILogger; -use OCP\Files\File; abstract class Office extends ProviderV2 { private $cmd; diff --git a/lib/private/Preview/OpenDocument.php b/lib/private/Preview/OpenDocument.php index 929fecffb214a1c75a4776c0cd4300b42c96d105..ab3394ffea0662790fe05ebcec9f04202a76eb7c 100644 --- a/lib/private/Preview/OpenDocument.php +++ b/lib/private/Preview/OpenDocument.php @@ -19,6 +19,7 @@ * along with this program. If not, see * */ + namespace OC\Preview; //.odt, .ott, .oth, .odm, .odg, .otg, .odp, .otp, .ods, .ots, .odc, .odf, .odb, .odi, .oxt diff --git a/lib/private/Preview/Provider.php b/lib/private/Preview/Provider.php index d0dd259891f84c065aaecd1d4a2206425c2436d0..ed128638e4b8226158ae054bead6bfe8dea5afe9 100644 --- a/lib/private/Preview/Provider.php +++ b/lib/private/Preview/Provider.php @@ -23,6 +23,7 @@ * along with this program. If not, see * */ + namespace OC\Preview; use OCP\Preview\IProvider; diff --git a/lib/private/Preview/SVG.php b/lib/private/Preview/SVG.php index 3f313f4bb9b4ca7d26cb4f6c79ff8276283a0499..2fe4c4645753a9a22e62e50283fa650d1f49fe68 100644 --- a/lib/private/Preview/SVG.php +++ b/lib/private/Preview/SVG.php @@ -22,11 +22,12 @@ * along with this program. If not, see * */ + namespace OC\Preview; +use OCP\Files\File; use OCP\IImage; use OCP\ILogger; -use OCP\Files\File; class SVG extends ProviderV2 { /** diff --git a/lib/private/Preview/StarOffice.php b/lib/private/Preview/StarOffice.php index 2c9542b22e677a476153ac238a0c6176198b3f35..1300bdc7b41cff6ed674ffb86ca39b2096ba9514 100644 --- a/lib/private/Preview/StarOffice.php +++ b/lib/private/Preview/StarOffice.php @@ -19,6 +19,7 @@ * along with this program. If not, see * */ + namespace OC\Preview; //.sxw, .stw, .sxc, .stc, .sxd, .std, .sxi, .sti, .sxg, .sxm diff --git a/lib/private/Preview/TXT.php b/lib/private/Preview/TXT.php index 3e2032df2de732e725679357d9e9a16ebee4d1d1..d1ee1c025eabfadc81b4c4c9746c9733b02fa4ac 100644 --- a/lib/private/Preview/TXT.php +++ b/lib/private/Preview/TXT.php @@ -24,6 +24,7 @@ * along with this program. If not, see * */ + namespace OC\Preview; use OCP\Files\File; diff --git a/lib/private/Preview/Watcher.php b/lib/private/Preview/Watcher.php index 0c0531dff94664dc7c22e58b7b2a6e6584f54d83..30708445c76846f956fe9242900385a6ed20f4bc 100644 --- a/lib/private/Preview/Watcher.php +++ b/lib/private/Preview/Watcher.php @@ -21,11 +21,12 @@ declare(strict_types=1); * along with this program. If not, see . * */ + namespace OC\Preview; -use OCP\Files\Node; use OCP\Files\Folder; use OCP\Files\IAppData; +use OCP\Files\Node; use OCP\Files\NotFoundException; /** diff --git a/lib/private/Preview/WatcherConnector.php b/lib/private/Preview/WatcherConnector.php index f374b909d8f2c7d82333a6ce33d6fb2edc65e063..346634ccf3a5225253378265fb50d6b9cd96871d 100644 --- a/lib/private/Preview/WatcherConnector.php +++ b/lib/private/Preview/WatcherConnector.php @@ -21,11 +21,12 @@ declare(strict_types=1); * along with this program. If not, see . * */ + namespace OC\Preview; use OC\SystemConfig; -use OCP\Files\Node; use OCP\Files\IRootFolder; +use OCP\Files\Node; class WatcherConnector { diff --git a/lib/private/PreviewManager.php b/lib/private/PreviewManager.php index b0858643d534f52f6d07222f542127076e50c3e0..45b1529648be3f01126e45808407fc0ba4cb9293 100644 --- a/lib/private/PreviewManager.php +++ b/lib/private/PreviewManager.php @@ -24,6 +24,7 @@ * along with this program. If not, see * */ + namespace OC; use OC\Preview\Generator; diff --git a/lib/private/Repair/AddCleanupUpdaterBackupsJob.php b/lib/private/Repair/AddCleanupUpdaterBackupsJob.php index 1574e665fb60f96cf096b73c5d2666489a0034a7..cf35bc1fda5d1504852e668bd4bd714255683fad 100644 --- a/lib/private/Repair/AddCleanupUpdaterBackupsJob.php +++ b/lib/private/Repair/AddCleanupUpdaterBackupsJob.php @@ -45,4 +45,3 @@ class AddCleanupUpdaterBackupsJob implements IRepairStep { $this->jobList->add(BackgroundCleanupUpdaterBackupsJob::class); } } - diff --git a/lib/private/Repair/ClearFrontendCaches.php b/lib/private/Repair/ClearFrontendCaches.php index 22add525adb99ffe5a5f0a4f3c8d1dd74e80a636..90fdaf6b70fb837d314fa4a3b09e34c688201607 100644 --- a/lib/private/Repair/ClearFrontendCaches.php +++ b/lib/private/Repair/ClearFrontendCaches.php @@ -23,11 +23,11 @@ namespace OC\Repair; +use OC\Template\JSCombiner; +use OC\Template\SCSSCacher; use OCP\ICacheFactory; use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; -use OC\Template\JSCombiner; -use OC\Template\SCSSCacher; class ClearFrontendCaches implements IRepairStep { diff --git a/lib/private/Repair/Collation.php b/lib/private/Repair/Collation.php index f2cc9373176bdf0c831d3b98199d27424040b1dc..a7a53720db558709f27f78a9fb0b77047f75197c 100644 --- a/lib/private/Repair/Collation.php +++ b/lib/private/Repair/Collation.php @@ -151,4 +151,3 @@ class Collation implements IRepairStep { return array_keys($result); } } - diff --git a/lib/private/Repair/MoveUpdaterStepFile.php b/lib/private/Repair/MoveUpdaterStepFile.php index feb8a291282965ee7a485534f85b9f426c10ae17..adeabea9672e5fe0379a34cc4f25524cdf9b148e 100644 --- a/lib/private/Repair/MoveUpdaterStepFile.php +++ b/lib/private/Repair/MoveUpdaterStepFile.php @@ -77,4 +77,3 @@ class MoveUpdaterStepFile implements IRepairStep { } } } - diff --git a/lib/private/Repair/NC11/FixMountStorages.php b/lib/private/Repair/NC11/FixMountStorages.php index d57a356dff9e5d9ef7260ed8c3ef39908c8e0923..c3c239d11ba7eea0c5c23963c1be4a118a43aaf8 100644 --- a/lib/private/Repair/NC11/FixMountStorages.php +++ b/lib/private/Repair/NC11/FixMountStorages.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OC\Repair\NC11; use OCP\DB\QueryBuilder\IQueryBuilder; diff --git a/lib/private/Repair/NC13/AddLogRotateJob.php b/lib/private/Repair/NC13/AddLogRotateJob.php index c65ea47f02bfe5a9c35ba48992251e59bae5df70..0d258aa3779b62ee74c504f0a86099470fc46ea3 100644 --- a/lib/private/Repair/NC13/AddLogRotateJob.php +++ b/lib/private/Repair/NC13/AddLogRotateJob.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OC\Repair\NC13; use OC\Log\Rotate; diff --git a/lib/private/Repair/NC14/AddPreviewBackgroundCleanupJob.php b/lib/private/Repair/NC14/AddPreviewBackgroundCleanupJob.php index b58fabcba50598be4f90d54de735fdb9db45bf78..7bef59a9d3783ed1281ca9e75ec0066baef1b14f 100644 --- a/lib/private/Repair/NC14/AddPreviewBackgroundCleanupJob.php +++ b/lib/private/Repair/NC14/AddPreviewBackgroundCleanupJob.php @@ -21,6 +21,7 @@ declare(strict_types=1); * along with this program. If not, see . * */ + namespace OC\Repair\NC14; use OC\Preview\BackgroundCleanupJob; diff --git a/lib/private/Repair/NC17/SwitchUpdateChannel.php b/lib/private/Repair/NC17/SwitchUpdateChannel.php index cfa72d86b1e6c486f978b2e8ed3856e1d5de7716..8a2850080a6d4d63e50356934ea4bc09d3084032 100644 --- a/lib/private/Repair/NC17/SwitchUpdateChannel.php +++ b/lib/private/Repair/NC17/SwitchUpdateChannel.php @@ -26,6 +26,7 @@ use OCP\IConfig; use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; use OCP\Support\Subscription\IRegistry; + /** * @deprecated - can be removed in 18 */ diff --git a/lib/private/Repair/Owncloud/DropAccountTermsTable.php b/lib/private/Repair/Owncloud/DropAccountTermsTable.php index 0b1b64c3a3a4b5b1eb12916d9e5e24fac1fa6f02..9c18ff809ae9aefd2e5fd5fa32f50cf5fd39a661 100644 --- a/lib/private/Repair/Owncloud/DropAccountTermsTable.php +++ b/lib/private/Repair/Owncloud/DropAccountTermsTable.php @@ -57,4 +57,3 @@ class DropAccountTermsTable implements IRepairStep { $this->db->dropTable('account_terms'); } } - diff --git a/lib/private/Repair/Owncloud/SaveAccountsTableData.php b/lib/private/Repair/Owncloud/SaveAccountsTableData.php index f62f8b56b2638df304d827de0e9fc85e8353bc09..13f618b6747e2ded31ef938ecc3c7fd7e8140f9b 100644 --- a/lib/private/Repair/Owncloud/SaveAccountsTableData.php +++ b/lib/private/Repair/Owncloud/SaveAccountsTableData.php @@ -189,4 +189,3 @@ class SaveAccountsTableData implements IRepairStep { } } - diff --git a/lib/private/Repair/SqliteAutoincrement.php b/lib/private/Repair/SqliteAutoincrement.php index 814f955dc700d8ec3f53e7e0c3174d8fd438234b..93f9961d56596163935ddcf47fb09c65ac6e050c 100644 --- a/lib/private/Repair/SqliteAutoincrement.php +++ b/lib/private/Repair/SqliteAutoincrement.php @@ -24,10 +24,10 @@ namespace OC\Repair; use Doctrine\DBAL\Platforms\SqlitePlatform; -use Doctrine\DBAL\Schema\SchemaException; +use Doctrine\DBAL\Schema\ColumnDiff; use Doctrine\DBAL\Schema\SchemaDiff; +use Doctrine\DBAL\Schema\SchemaException; use Doctrine\DBAL\Schema\TableDiff; -use Doctrine\DBAL\Schema\ColumnDiff; use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; @@ -98,4 +98,3 @@ class SqliteAutoincrement implements IRepairStep { $this->connection->commit(); } } - diff --git a/lib/private/Route/Router.php b/lib/private/Route/Router.php index 4c83f251012cb977f27e39d3966466967ad20c2d..125c5ff27425b6c1c0f276711772df3f07ed78a4 100644 --- a/lib/private/Route/Router.php +++ b/lib/private/Route/Router.php @@ -33,16 +33,16 @@ namespace OC\Route; +use OCP\AppFramework\App; use OCP\ILogger; use OCP\Route\IRouter; -use OCP\AppFramework\App; use OCP\Util; +use Symfony\Component\Routing\Exception\ResourceNotFoundException; use Symfony\Component\Routing\Exception\RouteNotFoundException; -use Symfony\Component\Routing\Matcher\UrlMatcher; use Symfony\Component\Routing\Generator\UrlGenerator; +use Symfony\Component\Routing\Matcher\UrlMatcher; use Symfony\Component\Routing\RequestContext; use Symfony\Component\Routing\RouteCollection; -use Symfony\Component\Routing\Exception\ResourceNotFoundException; class Router implements IRouter { /** @var RouteCollection[] */ diff --git a/lib/private/Search.php b/lib/private/Search.php index 0cfdf24ac97001e269cea7e728ffc7be7811a31b..2ef7eeda4ad179b7d1057f183940b7ab280d5ef9 100644 --- a/lib/private/Search.php +++ b/lib/private/Search.php @@ -25,9 +25,9 @@ */ namespace OC; +use OCP\ISearch; use OCP\Search\PagedProvider; use OCP\Search\Provider; -use OCP\ISearch; /** * Provide an interface to all search providers diff --git a/lib/private/Security/Bruteforce/Capabilities.php b/lib/private/Security/Bruteforce/Capabilities.php index 3df0458c6942dbc3b30dfce90e3d50a5aea46413..d6e08c399edf096ea54dc01a051d287fa0801fdd 100644 --- a/lib/private/Security/Bruteforce/Capabilities.php +++ b/lib/private/Security/Bruteforce/Capabilities.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OC\Security\Bruteforce; use OCP\Capabilities\IPublicCapability; diff --git a/lib/private/Security/CSP/ContentSecurityPolicy.php b/lib/private/Security/CSP/ContentSecurityPolicy.php index 9d1d043a1658ef262a8714efcac107572a10ae8f..c912b820ebafd81ed871a03da66847cf69fd6c55 100644 --- a/lib/private/Security/CSP/ContentSecurityPolicy.php +++ b/lib/private/Security/CSP/ContentSecurityPolicy.php @@ -21,6 +21,7 @@ declare(strict_types=1); * along with this program. If not, see * */ + namespace OC\Security\CSP; /** diff --git a/lib/private/Security/CredentialsManager.php b/lib/private/Security/CredentialsManager.php index 0ac9b30c6cee0f7a1d1427692c1e389112b387eb..7c58cb3b1c961ceffccd284f7fab9c9ba97b45b1 100644 --- a/lib/private/Security/CredentialsManager.php +++ b/lib/private/Security/CredentialsManager.php @@ -22,9 +22,9 @@ namespace OC\Security; -use OCP\Security\ICrypto; use OCP\IDBConnection; use OCP\Security\ICredentialsManager; +use OCP\Security\ICrypto; /** * Store and retrieve credentials for external services diff --git a/lib/private/Security/Crypto.php b/lib/private/Security/Crypto.php index 876f159950c9c55f35eb9921f3ff48ca033a20a2..2eb20d414564556bee3ee491233faddf50413e96 100644 --- a/lib/private/Security/Crypto.php +++ b/lib/private/Security/Crypto.php @@ -24,14 +24,13 @@ declare(strict_types=1); * */ - namespace OC\Security; -use phpseclib\Crypt\AES; -use phpseclib\Crypt\Hash; +use OCP\IConfig; use OCP\Security\ICrypto; use OCP\Security\ISecureRandom; -use OCP\IConfig; +use phpseclib\Crypt\AES; +use phpseclib\Crypt\Hash; /** * Class Crypto provides a high-level encryption layer using AES-CBC. If no key has been provided diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php index 48e2d34a5dd7fe8277ef8a6fd121e9f44bd0ae04..a5ffa9e0f1ebd83bce1b7f146518c2d25d357f24 100644 --- a/lib/private/Settings/Manager.php +++ b/lib/private/Settings/Manager.php @@ -37,9 +37,9 @@ use OCP\ILogger; use OCP\IServerContainer; use OCP\IURLGenerator; use OCP\L10N\IFactory; -use OCP\Settings\ISettings; use OCP\Settings\IManager; use OCP\Settings\ISection; +use OCP\Settings\ISettings; use OCP\Settings\ISubAdminSettings; class Manager implements IManager { diff --git a/lib/private/Setup/AbstractDatabase.php b/lib/private/Setup/AbstractDatabase.php index 903f8b6e38691e9d8858ecf948c62332c1abdcba..459848d1c792dae532566c47be1847a9f0865c0d 100644 --- a/lib/private/Setup/AbstractDatabase.php +++ b/lib/private/Setup/AbstractDatabase.php @@ -26,6 +26,7 @@ * along with this program. If not, see * */ + namespace OC\Setup; use OC\DB\ConnectionFactory; diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php index 3bb940186f8a9c6557d46e5b2008c684eb9c1016..8a38f889c74a43f95790f18f337785eaef2c34b3 100644 --- a/lib/private/Setup/MySQL.php +++ b/lib/private/Setup/MySQL.php @@ -27,6 +27,7 @@ * along with this program. If not, see * */ + namespace OC\Setup; use OC\DB\MySqlTools; diff --git a/lib/private/Setup/PostgreSQL.php b/lib/private/Setup/PostgreSQL.php index 6d1b5ca2927e87886ac3edf5cb604980db56d8fd..020c2e555d9f51a1b00e97ad72aeb7eeff541cee 100644 --- a/lib/private/Setup/PostgreSQL.php +++ b/lib/private/Setup/PostgreSQL.php @@ -24,6 +24,7 @@ * along with this program. If not, see * */ + namespace OC\Setup; use OC\DatabaseException; diff --git a/lib/private/Share/SearchResultSorter.php b/lib/private/Share/SearchResultSorter.php index da63dd33b8ec9d2a8d330b6250f1a0f652b8cc7b..8418a1e411979f7c78d34dc0332fd10032461e4e 100644 --- a/lib/private/Share/SearchResultSorter.php +++ b/lib/private/Share/SearchResultSorter.php @@ -21,6 +21,7 @@ * along with this program. If not, see * */ + namespace OC\Share; use OCP\ILogger; @@ -73,4 +74,3 @@ class SearchResultSorter { } } } - diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php index 7a146bf78907e31ed603fee10c775e6f5926eabf..c25a7b03d5c1882b674ec53baf0547c0a262fc15 100644 --- a/lib/private/Share20/DefaultShareProvider.php +++ b/lib/private/Share20/DefaultShareProvider.php @@ -27,29 +27,30 @@ * along with this program. If not, see * */ + namespace OC\Share20; use OC\Files\Cache\Cache; +use OC\Share20\Exception\BackendError; +use OC\Share20\Exception\InvalidShare; +use OC\Share20\Exception\ProviderException; +use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\Defaults; use OCP\Files\Folder; +use OCP\Files\IRootFolder; +use OCP\Files\Node; +use OCP\IDBConnection; +use OCP\IGroup; +use OCP\IGroupManager; use OCP\IL10N; use OCP\IURLGenerator; use OCP\IUser; +use OCP\IUserManager; use OCP\Mail\IMailer; +use OCP\Share\Exceptions\ShareNotFound; use OCP\Share\IShare; use OCP\Share\IShareHelper; use OCP\Share\IShareProvider; -use OC\Share20\Exception\InvalidShare; -use OC\Share20\Exception\ProviderException; -use OCP\Share\Exceptions\ShareNotFound; -use OC\Share20\Exception\BackendError; -use OCP\DB\QueryBuilder\IQueryBuilder; -use OCP\IGroup; -use OCP\IGroupManager; -use OCP\IUserManager; -use OCP\Files\IRootFolder; -use OCP\IDBConnection; -use OCP\Files\Node; /** * Class DefaultShareProvider diff --git a/lib/private/Share20/Exception/BackendError.php b/lib/private/Share20/Exception/BackendError.php index 10dae34cc34342ac7d3923a12d9f23a930b91658..f270dd5314753b88b2c6aebc3e160856fc35151e 100644 --- a/lib/private/Share20/Exception/BackendError.php +++ b/lib/private/Share20/Exception/BackendError.php @@ -19,6 +19,7 @@ * along with this program. If not, see * */ + namespace OC\Share20\Exception; class BackendError extends \Exception { diff --git a/lib/private/Share20/Exception/InvalidShare.php b/lib/private/Share20/Exception/InvalidShare.php index 1e7337b041813ee04c85ef014182e76ed7f8381e..f4a88ebc188550df56c6f1e58db0c25bf7f8e28a 100644 --- a/lib/private/Share20/Exception/InvalidShare.php +++ b/lib/private/Share20/Exception/InvalidShare.php @@ -19,6 +19,7 @@ * along with this program. If not, see * */ + namespace OC\Share20\Exception; class InvalidShare extends \Exception { diff --git a/lib/private/Share20/Exception/ProviderException.php b/lib/private/Share20/Exception/ProviderException.php index f7ada6d48fdfc7f74baf663d94ccd4a8cedac28e..89bd28a60eb9d1df3be877afea5ebcfca4178e48 100644 --- a/lib/private/Share20/Exception/ProviderException.php +++ b/lib/private/Share20/Exception/ProviderException.php @@ -19,10 +19,10 @@ * along with this program. If not, see * */ + namespace OC\Share20\Exception; class ProviderException extends \Exception { } - diff --git a/lib/private/Share20/Hooks.php b/lib/private/Share20/Hooks.php index 4519b709a8c876196064d8cae854a57e671f1652..4318fd57cf13be25fdac2f381db12a4eb1c532ed 100644 --- a/lib/private/Share20/Hooks.php +++ b/lib/private/Share20/Hooks.php @@ -19,6 +19,7 @@ * along with this program. If not, see * */ + namespace OC\Share20; class Hooks { diff --git a/lib/private/Share20/LegacyHooks.php b/lib/private/Share20/LegacyHooks.php index 4cc748aa418887ea2e7f4c55ca79d298b385e263..4554ab64a14d6004d58bdc55660d8c5622b81486 100644 --- a/lib/private/Share20/LegacyHooks.php +++ b/lib/private/Share20/LegacyHooks.php @@ -26,10 +26,10 @@ namespace OC\Share20; use OCP\Files\File; +use OCP\Share; use OCP\Share\IShare; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\GenericEvent; -use OCP\Share; class LegacyHooks { diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php index 298aa6f0f5762beb8643f97f3292638898ad1eb9..d9809fd128a5005c9609be050d2265ad68a985e8 100644 --- a/lib/private/Share20/Manager.php +++ b/lib/private/Share20/Manager.php @@ -57,15 +57,15 @@ use OCP\L10N\IFactory; use OCP\Mail\IMailer; use OCP\Security\IHasher; use OCP\Security\ISecureRandom; +use OCP\Share; use OCP\Share\Exceptions\GenericShareException; use OCP\Share\Exceptions\ShareNotFound; use OCP\Share\IManager; use OCP\Share\IProviderFactory; use OCP\Share\IShare; +use OCP\Share\IShareProvider; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\GenericEvent; -use OCP\Share\IShareProvider; -use OCP\Share; /** * This class is the communication hub for all sharing related operations. diff --git a/lib/private/Share20/ProviderFactory.php b/lib/private/Share20/ProviderFactory.php index da1905bf98601ac37adcb02d811576ad6000714b..dc77a9fbcbb764664b45268c64edee64829dc439 100644 --- a/lib/private/Share20/ProviderFactory.php +++ b/lib/private/Share20/ProviderFactory.php @@ -26,9 +26,11 @@ * along with this program. If not, see * */ + namespace OC\Share20; use OC\CapabilitiesManager; +use OC\Share20\Exception\ProviderException; use OCA\FederatedFileSharing\AddressHandler; use OCA\FederatedFileSharing\FederatedShareProvider; use OCA\FederatedFileSharing\Notifications; @@ -37,9 +39,8 @@ use OCA\FederatedFileSharing\TokenHandler; use OCA\ShareByMail\Settings\SettingsManager; use OCA\ShareByMail\ShareByMailProvider; use OCP\Defaults; -use OCP\Share\IProviderFactory; -use OC\Share20\Exception\ProviderException; use OCP\IServerContainer; +use OCP\Share\IProviderFactory; /** * Class ProviderFactory diff --git a/lib/private/Share20/Share.php b/lib/private/Share20/Share.php index 57b5304b102c77a6a44b79e40aa4fc067b19087e..3ac324b40ce27113d9f966af66135264a7319e85 100644 --- a/lib/private/Share20/Share.php +++ b/lib/private/Share20/Share.php @@ -21,6 +21,7 @@ * along with this program. If not, see * */ + namespace OC\Share20; use OCP\Files\Cache\ICacheEntry; diff --git a/lib/private/Share20/ShareHelper.php b/lib/private/Share20/ShareHelper.php index 5f692c6a62b7b284a562ab919ad53ad6d3b5acae..f94546d19edeee473566123ed9c0a4ca6152043c 100644 --- a/lib/private/Share20/ShareHelper.php +++ b/lib/private/Share20/ShareHelper.php @@ -21,6 +21,7 @@ * along with this program. If not, see . * */ + namespace OC\Share20; use OCP\Files\InvalidPathException; diff --git a/lib/private/SubAdmin.php b/lib/private/SubAdmin.php index f79a0b1ae5adbff7d1a79ce2de77b00aaf2f8dca..ec959e0e4ea5833d5c48aaf5f79ef695ab7cf7ad 100644 --- a/lib/private/SubAdmin.php +++ b/lib/private/SubAdmin.php @@ -30,11 +30,11 @@ namespace OC; use OC\Hooks\PublicEmitter; use OCP\Group\ISubAdmin; -use OCP\IUser; -use OCP\IUserManager; +use OCP\IDBConnection; use OCP\IGroup; use OCP\IGroupManager; -use OCP\IDBConnection; +use OCP\IUser; +use OCP\IUserManager; class SubAdmin extends PublicEmitter implements ISubAdmin { diff --git a/lib/private/SystemTag/ManagerFactory.php b/lib/private/SystemTag/ManagerFactory.php index 839a819a04ac64c5c1a71f4f5b447a3e2f3f063b..ab17ae69ac8f4225b8436b7b3c4337cadcddb774 100644 --- a/lib/private/SystemTag/ManagerFactory.php +++ b/lib/private/SystemTag/ManagerFactory.php @@ -21,6 +21,7 @@ declare(strict_types=1); * along with this program. If not, see * */ + namespace OC\SystemTag; use OCP\IServerContainer; diff --git a/lib/private/SystemTag/SystemTagManager.php b/lib/private/SystemTag/SystemTagManager.php index 055b744e5c386f85f1b76089d3a703a2792c8a2e..85a12da67f2f46fe82b2162a33d05fc1a176a625 100644 --- a/lib/private/SystemTag/SystemTagManager.php +++ b/lib/private/SystemTag/SystemTagManager.php @@ -29,14 +29,14 @@ namespace OC\SystemTag; use Doctrine\DBAL\Exception\UniqueConstraintViolationException; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; +use OCP\IGroupManager; +use OCP\IUser; +use OCP\SystemTag\ISystemTag; use OCP\SystemTag\ISystemTagManager; use OCP\SystemTag\ManagerEvent; use OCP\SystemTag\TagAlreadyExistsException; use OCP\SystemTag\TagNotFoundException; use Symfony\Component\EventDispatcher\EventDispatcherInterface; -use OCP\IGroupManager; -use OCP\SystemTag\ISystemTag; -use OCP\IUser; /** * Manager class for system tags diff --git a/lib/private/Tagging/Tag.php b/lib/private/Tagging/Tag.php index de5ab0a485c9fa05418c0dd8f480d95ae5c10bbc..f20f22955a3a45f59c196367ef1983183c9ab0ab 100644 --- a/lib/private/Tagging/Tag.php +++ b/lib/private/Tagging/Tag.php @@ -23,7 +23,7 @@ namespace OC\Tagging; -use \OCP\AppFramework\Db\Entity; +use OCP\AppFramework\Db\Entity; /** * Class to represent a tag. diff --git a/lib/private/Tagging/TagMapper.php b/lib/private/Tagging/TagMapper.php index e5ca41f69e33636a12b0d9befc0114cf174a3692..49361ff181abf9dc9b53d64820459f345b06e4e7 100644 --- a/lib/private/Tagging/TagMapper.php +++ b/lib/private/Tagging/TagMapper.php @@ -24,9 +24,9 @@ namespace OC\Tagging; -use \OCP\AppFramework\Db\Mapper, - \OCP\AppFramework\Db\DoesNotExistException, - \OCP\IDBConnection; +use OCP\AppFramework\Db\DoesNotExistException; +use OCP\AppFramework\Db\Mapper; +use OCP\IDBConnection; /** * Mapper for Tag entity @@ -76,4 +76,3 @@ class TagMapper extends Mapper { return true; } } - diff --git a/lib/private/TempManager.php b/lib/private/TempManager.php index 6e8683d2f7c0fe3a66a0107b774ef745200ff999..479c41ff7fdb751d15b5750fb5004aa011c3adc5 100644 --- a/lib/private/TempManager.php +++ b/lib/private/TempManager.php @@ -30,8 +30,8 @@ namespace OC; -use OCP\ILogger; use OCP\IConfig; +use OCP\ILogger; use OCP\ITempManager; class TempManager implements ITempManager { diff --git a/lib/private/Template/IconsCacher.php b/lib/private/Template/IconsCacher.php index 3c0a270d3f27a8aec0d9ea983a1db8b079cc4412..75175ad63732bee731445cc4297177ada9238a96 100644 --- a/lib/private/Template/IconsCacher.php +++ b/lib/private/Template/IconsCacher.php @@ -24,14 +24,14 @@ declare (strict_types = 1); namespace OC\Template; +use OC\Files\AppData\Factory; use OCP\AppFramework\Utility\ITimeFactory; use OCP\Files\IAppData; use OCP\Files\NotFoundException; -use OCP\Files\SimpleFS\ISimpleFolder; use OCP\Files\SimpleFS\ISimpleFile; +use OCP\Files\SimpleFS\ISimpleFolder; use OCP\ILogger; use OCP\IURLGenerator; -use OC\Files\AppData\Factory; class IconsCacher { diff --git a/lib/private/Template/JSCombiner.php b/lib/private/Template/JSCombiner.php index 93683753899e29d23919126927ee9d2fb3a5ea7b..224a7a9b21345ebaa464a6f8576c0f8833456d60 100644 --- a/lib/private/Template/JSCombiner.php +++ b/lib/private/Template/JSCombiner.php @@ -22,14 +22,15 @@ * along with this program. If not, see . * */ + namespace OC\Template; use OC\SystemConfig; -use OCP\ICache; use OCP\Files\IAppData; use OCP\Files\NotFoundException; use OCP\Files\NotPermittedException; use OCP\Files\SimpleFS\ISimpleFolder; +use OCP\ICache; use OCP\ICacheFactory; use OCP\ILogger; use OCP\IURLGenerator; diff --git a/lib/private/Template/JSConfigHelper.php b/lib/private/Template/JSConfigHelper.php index 15e2fd76c488f2afd94be03084eca507f6831a6d..df5eda9121bac324671ec4dc30efa9bd6215eba8 100644 --- a/lib/private/Template/JSConfigHelper.php +++ b/lib/private/Template/JSConfigHelper.php @@ -25,6 +25,7 @@ * along with this program. If not, see . * */ + namespace OC\Template; use bantu\IniGetWrapper\IniGetWrapper; diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php index c6d5fc8ef7149e920bfc5f622bfcbbc18c1dd7bd..df90fca9817da8251b7eb17a7aecd74c37722bab 100644 --- a/lib/private/Template/SCSSCacher.php +++ b/lib/private/Template/SCSSCacher.php @@ -32,7 +32,9 @@ use Leafo\ScssPhp\Compiler; use Leafo\ScssPhp\Exception\ParserException; use Leafo\ScssPhp\Formatter\Crunched; use Leafo\ScssPhp\Formatter\Expanded; +use OC\Files\AppData\Factory; use OC\Memcache\NullCache; +use OC\Template\IconsCacher; use OCP\AppFramework\Utility\ITimeFactory; use OCP\Files\IAppData; use OCP\Files\NotFoundException; @@ -45,8 +47,6 @@ use OCP\IConfig; use OCP\ILogger; use OCP\IMemcache; use OCP\IURLGenerator; -use OC\Files\AppData\Factory; -use OC\Template\IconsCacher; class SCSSCacher { diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php index 6de6b33172cec68492e3ca97032c566c47500da9..e476ddd275dec26ae619d14d5037059680508f12 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -36,13 +36,14 @@ * along with this program. If not, see * */ + namespace OC; +use OC\AppFramework\Http\Request; use OC\Template\JSCombiner; use OC\Template\JSConfigHelper; use OC\Template\SCSSCacher; use OCP\Defaults; -use OC\AppFramework\Http\Request; use OCP\Support\Subscription\IRegistry; class TemplateLayout extends \OC_Template { diff --git a/lib/private/Updater/VersionCheck.php b/lib/private/Updater/VersionCheck.php index 446e04dc5ed9c98600bd02cb3592ef008f8eba9c..079ffe7ff44372cdeca82b0cd0bb19a75745e45f 100644 --- a/lib/private/Updater/VersionCheck.php +++ b/lib/private/Updater/VersionCheck.php @@ -127,4 +127,3 @@ class VersionCheck { return $response->getBody(); } } - diff --git a/lib/private/User/Backend.php b/lib/private/User/Backend.php index 30ed962555d4c903dcd1f437913f501e7f1b2f3e..2b9b4d27ea3b6442f662d81ab12e2730442bc97a 100644 --- a/lib/private/User/Backend.php +++ b/lib/private/User/Backend.php @@ -23,7 +23,7 @@ namespace OC\User; -use \OCP\UserInterface; +use OCP\UserInterface; /** * Abstract base class for user management. Provides methods for querying backend diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php index 7f9691073c9da0de2ef140d47ba0cba21b171d49..da2d354b7ef5808adcd6c0764a8784f0f924da25 100644 --- a/lib/private/User/Manager.php +++ b/lib/private/User/Manager.php @@ -33,11 +33,11 @@ namespace OC\User; use OC\Hooks\PublicEmitter; use OCP\DB\QueryBuilder\IQueryBuilder; -use OCP\IUser; +use OCP\IConfig; use OCP\IGroup; +use OCP\IUser; use OCP\IUserBackend; use OCP\IUserManager; -use OCP\IConfig; use OCP\User\Backend\IGetRealUIDBackend; use OCP\UserInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; diff --git a/lib/private/User/NoUserException.php b/lib/private/User/NoUserException.php index a80bf7dc54b565a80dd23fbff39aa86f2835ea41..b72fb6a9e250bf8b989de5df9b37553c693688be 100644 --- a/lib/private/User/NoUserException.php +++ b/lib/private/User/NoUserException.php @@ -22,4 +22,4 @@ namespace OC\User; -class NoUserException extends \Exception {} \ No newline at end of file +class NoUserException extends \Exception {} diff --git a/lib/private/User/User.php b/lib/private/User/User.php index 12af787a5a6e6b128d635f0bedb97ba9f50ad5a5..96f0f38b82a850faed09a0d9ddf5a981a6ec58a6 100644 --- a/lib/private/User/User.php +++ b/lib/private/User/User.php @@ -36,12 +36,12 @@ use OC\Files\Cache\Storage; use OC\Hooks\Emitter; use OC_Helper; use OCP\IAvatarManager; +use OCP\IConfig; use OCP\IImage; use OCP\IURLGenerator; use OCP\IUser; -use OCP\IConfig; +use OCP\IUserBackend; use OCP\UserInterface; -use \OCP\IUserBackend; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\GenericEvent; diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php index eed49aff3132b6cb5767d4f4e4f777b401f94ca6..f73756dd24007b15668afd2a8fe1089cb9e205f2 100644 --- a/lib/private/legacy/util.php +++ b/lib/private/legacy/util.php @@ -61,11 +61,11 @@ * */ +use OC\AppFramework\Http\Request; use OCP\IConfig; use OCP\IGroupManager; use OCP\ILogger; use OCP\IUser; -use OC\AppFramework\Http\Request; class OC_Util { public static $scripts = array(); diff --git a/lib/public/API.php b/lib/public/API.php index d3c528ee4f9090e8e8e19bcdb9ef1e822c4d740d..5a41dfc7acb1842fd617a870b4d4a3105a97a944 100644 --- a/lib/public/API.php +++ b/lib/public/API.php @@ -32,6 +32,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP; /** diff --git a/lib/public/Accounts/IAccountProperty.php b/lib/public/Accounts/IAccountProperty.php index 1f85ac3ca862906e0d0132c6b1e29eea05e97be2..c7213e278a6d0acd62a75458fd5c17899fba59d2 100644 --- a/lib/public/Accounts/IAccountProperty.php +++ b/lib/public/Accounts/IAccountProperty.php @@ -101,5 +101,3 @@ interface IAccountProperty extends \JsonSerializable { public function getVerified(): string; } - - diff --git a/lib/public/Activity/IConsumer.php b/lib/public/Activity/IConsumer.php index d56719c4de3397178ae1e5f38e105b7b039a4585..56dbc840344c28ef92eac5f6ba1585fe1fa288f6 100644 --- a/lib/public/Activity/IConsumer.php +++ b/lib/public/Activity/IConsumer.php @@ -29,6 +29,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP\Activity; /** @@ -46,4 +47,3 @@ interface IConsumer { */ public function receive(IEvent $event); } - diff --git a/lib/public/Activity/IEvent.php b/lib/public/Activity/IEvent.php index e380eca5c242ef34326fd51a9fb9f49ad0dda10c..767d10f965a10b5e68842640be54dd61cfab6308 100644 --- a/lib/public/Activity/IEvent.php +++ b/lib/public/Activity/IEvent.php @@ -29,6 +29,7 @@ declare(strict_types=1); // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP\Activity; /** diff --git a/lib/public/Activity/IFilter.php b/lib/public/Activity/IFilter.php index b6e2025d2cd5fbd8b86aa5bb794421a6834cabcc..ae5e65c605c29a076c3596f2ffe3eb6d226d90de 100644 --- a/lib/public/Activity/IFilter.php +++ b/lib/public/Activity/IFilter.php @@ -70,4 +70,3 @@ interface IFilter { */ public function allowedApps(); } - diff --git a/lib/public/Activity/ISetting.php b/lib/public/Activity/ISetting.php index f3b953e95e087fa86c63df69ba695a1a8d9808da..4aedc03dd22df5059abac18ee6d6b5e250561d62 100644 --- a/lib/public/Activity/ISetting.php +++ b/lib/public/Activity/ISetting.php @@ -75,4 +75,3 @@ interface ISetting { */ public function isDefaultEnabledMail(); } - diff --git a/lib/public/App.php b/lib/public/App.php index c731a5085f716cde7a0e6188d45878a7174fb835..ff494e7b2fc357c32267d981d3c8cbd342a2933b 100644 --- a/lib/public/App.php +++ b/lib/public/App.php @@ -35,6 +35,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP; /** diff --git a/lib/public/App/AppPathNotFoundException.php b/lib/public/App/AppPathNotFoundException.php index db5a1803c83753488d60d839799b152ffd6b88dc..fbca8899d3afa047cd88d1c1b20b6cf365346f6d 100644 --- a/lib/public/App/AppPathNotFoundException.php +++ b/lib/public/App/AppPathNotFoundException.php @@ -29,4 +29,4 @@ namespace OCP\App; * @package OCP\App * @since 11.0.0 */ -class AppPathNotFoundException extends \Exception {} \ No newline at end of file +class AppPathNotFoundException extends \Exception {} diff --git a/lib/public/App/IAppManager.php b/lib/public/App/IAppManager.php index 391e3f0dd641188a8eb3ad9ff8dc1a3c3abd28bd..46025d9831bd09fada98359cfad13990a7fafa5d 100644 --- a/lib/public/App/IAppManager.php +++ b/lib/public/App/IAppManager.php @@ -28,8 +28,8 @@ namespace OCP\App; -use OCP\IUser; use OCP\IGroup; +use OCP\IUser; /** * Interface IAppManager diff --git a/lib/public/AppFramework/ApiController.php b/lib/public/AppFramework/ApiController.php index 5c99e170e00a2495cc2aa9170bd5214617f4bfeb..bb17a34e8ba8907fe61888da8b9f884a7de4ad2b 100644 --- a/lib/public/AppFramework/ApiController.php +++ b/lib/public/AppFramework/ApiController.php @@ -33,7 +33,6 @@ namespace OCP\AppFramework; use OCP\AppFramework\Http\Response; use OCP\IRequest; - /** * Base class to inherit your controllers from that are used for RESTful APIs * @since 7.0.0 diff --git a/lib/public/AppFramework/App.php b/lib/public/AppFramework/App.php index f327e6ca0221482becddd8bf7b426da63af762a5..6fd1646f3f9b34480e49c5bafa97f34dbae37140 100644 --- a/lib/public/AppFramework/App.php +++ b/lib/public/AppFramework/App.php @@ -37,7 +37,6 @@ use OC\AppFramework\Routing\RouteConfig; use OC\ServerContainer; use OCP\Route\IRouter; - /** * Class App * @package OCP\AppFramework diff --git a/lib/public/AppFramework/Controller.php b/lib/public/AppFramework/Controller.php index 64be033d1d93b64cb40c05a2a220722ca65d67d1..76390d09b4a72a51af914948d02ed38cecbb9124 100644 --- a/lib/public/AppFramework/Controller.php +++ b/lib/public/AppFramework/Controller.php @@ -34,12 +34,11 @@ namespace OCP\AppFramework; -use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\DataResponse; +use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\Response; use OCP\IRequest; - /** * Base class to inherit your controllers from * @since 6.0.0 diff --git a/lib/public/AppFramework/Db/DoesNotExistException.php b/lib/public/AppFramework/Db/DoesNotExistException.php index 9823a0a1fa89904a7f7082a1c0ea6933722aa284..563d7d22aa857d4b10f4af558b002ef0b93ee9b9 100644 --- a/lib/public/AppFramework/Db/DoesNotExistException.php +++ b/lib/public/AppFramework/Db/DoesNotExistException.php @@ -22,7 +22,6 @@ declare(strict_types=1); * */ - namespace OCP\AppFramework\Db; diff --git a/lib/public/AppFramework/Db/Mapper.php b/lib/public/AppFramework/Db/Mapper.php index 6910757add0daf271df74f8e04343cc192d05bf5..d8de9e23aa78f47dfda95542f5d50a0c1bf4cf86 100644 --- a/lib/public/AppFramework/Db/Mapper.php +++ b/lib/public/AppFramework/Db/Mapper.php @@ -24,12 +24,10 @@ * */ - namespace OCP\AppFramework\Db; use OCP\IDBConnection; - /** * Simple parent class for inheriting your data access layer from. This class * may be subject to change in the future diff --git a/lib/public/AppFramework/Db/MultipleObjectsReturnedException.php b/lib/public/AppFramework/Db/MultipleObjectsReturnedException.php index 3955c417d57559629e1a94af902ab45c3e36dc3c..465c76c4dcbe9e7439bc45dbdf2b157f5f679bda 100644 --- a/lib/public/AppFramework/Db/MultipleObjectsReturnedException.php +++ b/lib/public/AppFramework/Db/MultipleObjectsReturnedException.php @@ -22,7 +22,6 @@ declare(strict_types=1); * */ - namespace OCP\AppFramework\Db; diff --git a/lib/public/AppFramework/Http/DataDownloadResponse.php b/lib/public/AppFramework/Http/DataDownloadResponse.php index e9fcba8148d362855cbe0d2499438b31ac065ab7..78cf01f1ac7f16778554e6f192192eb7e18e2174 100644 --- a/lib/public/AppFramework/Http/DataDownloadResponse.php +++ b/lib/public/AppFramework/Http/DataDownloadResponse.php @@ -20,6 +20,7 @@ * along with this program. If not, see * */ + namespace OCP\AppFramework\Http; /** diff --git a/lib/public/AppFramework/Http/DownloadResponse.php b/lib/public/AppFramework/Http/DownloadResponse.php index 774a6287cb2a483304175609945c0de2fcc4c353..4061dc42ad758e9731c157df25aaacddca28b2ec 100644 --- a/lib/public/AppFramework/Http/DownloadResponse.php +++ b/lib/public/AppFramework/Http/DownloadResponse.php @@ -22,7 +22,6 @@ * */ - namespace OCP\AppFramework\Http; diff --git a/lib/public/AppFramework/Http/FileDisplayResponse.php b/lib/public/AppFramework/Http/FileDisplayResponse.php index 2d2dd29e6a1b3f66c350ee5c9cf7415a2dfd6086..a63a77ef4ef060f960b2d2f5fcd77a93eeb4556f 100644 --- a/lib/public/AppFramework/Http/FileDisplayResponse.php +++ b/lib/public/AppFramework/Http/FileDisplayResponse.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OCP\AppFramework\Http; use OCP\AppFramework\Http; diff --git a/lib/public/AppFramework/Http/RedirectResponse.php b/lib/public/AppFramework/Http/RedirectResponse.php index dc44bbe999c9fd11917df43ccfcd70a76e0c34ae..84f53936fe8260e77ba9f9318b9b3ec63982af47 100644 --- a/lib/public/AppFramework/Http/RedirectResponse.php +++ b/lib/public/AppFramework/Http/RedirectResponse.php @@ -23,12 +23,10 @@ * */ - namespace OCP\AppFramework\Http; use OCP\AppFramework\Http; - /** * Redirects to a different URL * @since 7.0.0 diff --git a/lib/public/AppFramework/Http/RedirectToDefaultAppResponse.php b/lib/public/AppFramework/Http/RedirectToDefaultAppResponse.php index 2ec50137ef9670ae03ff9923c236718c912c697f..0a2f4c9d9ee34035c30b4839e2a5f8d38f729f57 100644 --- a/lib/public/AppFramework/Http/RedirectToDefaultAppResponse.php +++ b/lib/public/AppFramework/Http/RedirectToDefaultAppResponse.php @@ -19,6 +19,7 @@ declare(strict_types=1); * along with this program. If not, see . * */ + namespace OCP\AppFramework\Http; diff --git a/lib/public/AppFramework/Http/Template/ExternalShareMenuAction.php b/lib/public/AppFramework/Http/Template/ExternalShareMenuAction.php index 4d455a9a755a02836e81085ecb26cc9ace9a62e1..84eb48b954cd0bfb3542a1a106886aaf7afb3182 100644 --- a/lib/public/AppFramework/Http/Template/ExternalShareMenuAction.php +++ b/lib/public/AppFramework/Http/Template/ExternalShareMenuAction.php @@ -25,6 +25,7 @@ namespace OCP\AppFramework\Http\Template; use OCP\AppFramework\Http\Template\SimpleMenuAction; use OCP\Util; + /** * Class LinkMenuAction * diff --git a/lib/public/AppFramework/Http/Template/IMenuAction.php b/lib/public/AppFramework/Http/Template/IMenuAction.php index e42d20579817beb39d8d7f143d8e55c204a4649b..8a037b62e4b801c1c6f74738a825842c1accd920 100644 --- a/lib/public/AppFramework/Http/Template/IMenuAction.php +++ b/lib/public/AppFramework/Http/Template/IMenuAction.php @@ -61,4 +61,4 @@ interface IMenuAction { */ public function render(): string; -} \ No newline at end of file +} diff --git a/lib/public/AppFramework/Http/Template/PublicTemplateResponse.php b/lib/public/AppFramework/Http/Template/PublicTemplateResponse.php index a520748a9ea0b51a95130fa3927ae851bfe63567..adffdd9ecdce026d95899dde7587e8768b52c307 100644 --- a/lib/public/AppFramework/Http/Template/PublicTemplateResponse.php +++ b/lib/public/AppFramework/Http/Template/PublicTemplateResponse.php @@ -155,4 +155,4 @@ class PublicTemplateResponse extends TemplateResponse { return parent::render(); } -} \ No newline at end of file +} diff --git a/lib/public/AppFramework/Http/Template/SimpleMenuAction.php b/lib/public/AppFramework/Http/Template/SimpleMenuAction.php index 60bb268661cd9b46f22b645b341da45e9efa9b9f..2a09d89d31af6694c245863a7158c95ae41f0202 100644 --- a/lib/public/AppFramework/Http/Template/SimpleMenuAction.php +++ b/lib/public/AppFramework/Http/Template/SimpleMenuAction.php @@ -123,4 +123,4 @@ class SimpleMenuAction implements IMenuAction { ); } -} \ No newline at end of file +} diff --git a/lib/public/AppFramework/Http/ZipResponse.php b/lib/public/AppFramework/Http/ZipResponse.php index bec0812ab0cd46e13c81bd87d3b2f83d1cc424dd..4223912488ba6f41e5941ca2acf27b00c31efe58 100644 --- a/lib/public/AppFramework/Http/ZipResponse.php +++ b/lib/public/AppFramework/Http/ZipResponse.php @@ -25,8 +25,8 @@ declare(strict_types=1); namespace OCP\AppFramework\Http; -use OCP\IRequest; use OC\Streamer; +use OCP\IRequest; /** * Public library to send several files in one zip archive. diff --git a/lib/public/AppFramework/Middleware.php b/lib/public/AppFramework/Middleware.php index 4c9051a0b3479e911cc30d89144fa8296ec2052b..663e8e054520d739e7f7312e7c6e3fc0be162360 100644 --- a/lib/public/AppFramework/Middleware.php +++ b/lib/public/AppFramework/Middleware.php @@ -33,7 +33,6 @@ namespace OCP\AppFramework; use OCP\AppFramework\Http\Response; - /** * Middleware is used to provide hooks before or after controller methods and * deal with possible exceptions raised in the controller methods. diff --git a/lib/public/AppFramework/OCS/OCSBadRequestException.php b/lib/public/AppFramework/OCS/OCSBadRequestException.php index 843f8a5e0a4aa799c0f16ddcc924b66bc28f45b3..7e7c775c36805d4f02302cab595c3ac7f50ac6db 100644 --- a/lib/public/AppFramework/OCS/OCSBadRequestException.php +++ b/lib/public/AppFramework/OCS/OCSBadRequestException.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OCP\AppFramework\OCS; use Exception; diff --git a/lib/public/AppFramework/OCS/OCSException.php b/lib/public/AppFramework/OCS/OCSException.php index 3ef6f3393ab673e65c85b89ae097725570fcaad9..e6c506aef5c793ef26d8a4e08dd313ea2ca211b0 100644 --- a/lib/public/AppFramework/OCS/OCSException.php +++ b/lib/public/AppFramework/OCS/OCSException.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OCP\AppFramework\OCS; use Exception; diff --git a/lib/public/AppFramework/OCS/OCSForbiddenException.php b/lib/public/AppFramework/OCS/OCSForbiddenException.php index 7545d87c0bf76fb5cbd948f7ad621439596dce90..a163ca5f17512106cf541febc1f0474c8ce14972 100644 --- a/lib/public/AppFramework/OCS/OCSForbiddenException.php +++ b/lib/public/AppFramework/OCS/OCSForbiddenException.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OCP\AppFramework\OCS; use Exception; diff --git a/lib/public/AppFramework/OCS/OCSNotFoundException.php b/lib/public/AppFramework/OCS/OCSNotFoundException.php index 87a5ce200985c18cedab5619c52584a3f86657dc..12e135251b49c0fb9b59161a2673a57d15609581 100644 --- a/lib/public/AppFramework/OCS/OCSNotFoundException.php +++ b/lib/public/AppFramework/OCS/OCSNotFoundException.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OCP\AppFramework\OCS; use Exception; diff --git a/lib/public/AppFramework/OCSController.php b/lib/public/AppFramework/OCSController.php index 29f26bf7e71224d78ff31d075a93c0a291513d64..e1273a0ca3ea166ff8b95afdd1ef6e82a4a6fb04 100644 --- a/lib/public/AppFramework/OCSController.php +++ b/lib/public/AppFramework/OCSController.php @@ -36,7 +36,6 @@ use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http\Response; use OCP\IRequest; - /** * Base class to inherit your controllers from that are used for RESTful APIs * @since 8.1.0 diff --git a/lib/public/Authentication/IApacheBackend.php b/lib/public/Authentication/IApacheBackend.php index fcc1c1a9b878c301943edce4f9ff7e0584a669d8..3569c50a0345a5d5f15f30b14dddd6b2bbdd25b4 100644 --- a/lib/public/Authentication/IApacheBackend.php +++ b/lib/public/Authentication/IApacheBackend.php @@ -29,6 +29,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP\Authentication; /** diff --git a/lib/public/AutoloadNotAllowedException.php b/lib/public/AutoloadNotAllowedException.php index 6c7b979f2d65ff67de673ea5f0c42ae8b971506e..563dbdcfe0fb0d8aab21709f8983455161937a04 100644 --- a/lib/public/AutoloadNotAllowedException.php +++ b/lib/public/AutoloadNotAllowedException.php @@ -35,4 +35,3 @@ class AutoloadNotAllowedException extends \DomainException { parent::__construct('Autoload path not allowed: '.$path); } } - diff --git a/lib/public/Capabilities/ICapability.php b/lib/public/Capabilities/ICapability.php index 2a59689665d54bed65e3affd2c3c61103a06e27e..918c97f8b685f250193db6e6ff825d7c8be9775c 100644 --- a/lib/public/Capabilities/ICapability.php +++ b/lib/public/Capabilities/ICapability.php @@ -44,4 +44,3 @@ interface ICapability { */ public function getCapabilities(); } - diff --git a/lib/public/Capabilities/IPublicCapability.php b/lib/public/Capabilities/IPublicCapability.php index c882a24d56fec6e84bf54c1b6bf900a88c580ebe..7f5d39f0ae31a6b07c09e763eaaafd6bf55a108e 100644 --- a/lib/public/Capabilities/IPublicCapability.php +++ b/lib/public/Capabilities/IPublicCapability.php @@ -29,4 +29,3 @@ namespace OCP\Capabilities; * @since 13.0.0 */ interface IPublicCapability extends ICapability {} - diff --git a/lib/public/Comments/IComment.php b/lib/public/Comments/IComment.php index c7c846bbe9d3361f4073f7555ec91595381401b8..3249d70f49629cd986751c27bcdcd95736548d9e 100644 --- a/lib/public/Comments/IComment.php +++ b/lib/public/Comments/IComment.php @@ -21,6 +21,7 @@ * along with this program. If not, see * */ + namespace OCP\Comments; /** @@ -262,4 +263,3 @@ interface IComment { public function setObject($objectType, $objectId); } - diff --git a/lib/public/Comments/ICommentsManager.php b/lib/public/Comments/ICommentsManager.php index 744263643ec00d2e8c9e2ce44ab3fec3ce1e5759..061dacba480b93f71b75e2efb396494fb6a286a7 100644 --- a/lib/public/Comments/ICommentsManager.php +++ b/lib/public/Comments/ICommentsManager.php @@ -24,6 +24,7 @@ * along with this program. If not, see * */ + namespace OCP\Comments; use OCP\IUser; diff --git a/lib/public/Comments/ICommentsManagerFactory.php b/lib/public/Comments/ICommentsManagerFactory.php index 4a38d992bc32e9cbd22d4437b6e390bcd9a42d13..bdd15c816cb252c56710835f9b5fdc8f6f3aee59 100644 --- a/lib/public/Comments/ICommentsManagerFactory.php +++ b/lib/public/Comments/ICommentsManagerFactory.php @@ -21,6 +21,7 @@ * along with this program. If not, see * */ + namespace OCP\Comments; use OCP\IServerContainer; diff --git a/lib/public/Comments/IllegalIDChangeException.php b/lib/public/Comments/IllegalIDChangeException.php index 97f18fee12ecbeeddd0a7cbfefc589a4eda9a80b..605f373acf20adcd3e05fc08dcec9ac0b28cd997 100644 --- a/lib/public/Comments/IllegalIDChangeException.php +++ b/lib/public/Comments/IllegalIDChangeException.php @@ -20,6 +20,7 @@ * along with this program. If not, see * */ + namespace OCP\Comments; /** diff --git a/lib/public/Comments/MessageTooLongException.php b/lib/public/Comments/MessageTooLongException.php index 4c46ed46524b6cdd7c06f4f22121543295eafb1b..19c93b8252e9d5e74bc15b29fc37ab7437638899 100644 --- a/lib/public/Comments/MessageTooLongException.php +++ b/lib/public/Comments/MessageTooLongException.php @@ -19,6 +19,7 @@ * along with this program. If not, see * */ + namespace OCP\Comments; /** diff --git a/lib/public/Comments/NotFoundException.php b/lib/public/Comments/NotFoundException.php index ab83e4095c26ea6e9ef2bec633f9ed803daecd6c..56b48efcff0db0a9fd338bbc485724969e29e959 100644 --- a/lib/public/Comments/NotFoundException.php +++ b/lib/public/Comments/NotFoundException.php @@ -20,6 +20,7 @@ * along with this program. If not, see * */ + namespace OCP\Comments; /** diff --git a/lib/public/Contacts/IManager.php b/lib/public/Contacts/IManager.php index 84948a929c0fd8df6302ec98a8cde1eb1a26b6ad..b3ada74ba2d0e6a392adf8ac998959a1a60c13b4 100644 --- a/lib/public/Contacts/IManager.php +++ b/lib/public/Contacts/IManager.php @@ -30,6 +30,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP\Contacts; /** diff --git a/lib/public/DB/QueryBuilder/ILiteral.php b/lib/public/DB/QueryBuilder/ILiteral.php index 99b45ee7c29add10abad9d8132a22749c79ca274..1debf81f2b876f382faa553fef5bdafb19149430 100644 --- a/lib/public/DB/QueryBuilder/ILiteral.php +++ b/lib/public/DB/QueryBuilder/ILiteral.php @@ -20,6 +20,7 @@ * along with this program. If not, see * */ + namespace OCP\DB\QueryBuilder; /** diff --git a/lib/public/DB/QueryBuilder/IParameter.php b/lib/public/DB/QueryBuilder/IParameter.php index c4e3fe29971d50186d967feff1419dee963c079a..9e50c0905ebca2ca0e15dcec24b003c4620faa4a 100644 --- a/lib/public/DB/QueryBuilder/IParameter.php +++ b/lib/public/DB/QueryBuilder/IParameter.php @@ -20,6 +20,7 @@ * along with this program. If not, see * */ + namespace OCP\DB\QueryBuilder; /** diff --git a/lib/public/DB/QueryBuilder/IQueryFunction.php b/lib/public/DB/QueryBuilder/IQueryFunction.php index 5c3191947395cccf8fbc07d4f885da1e3214a271..afb676db565fa859d7cf9cdfb9ac9b87c23f9072 100644 --- a/lib/public/DB/QueryBuilder/IQueryFunction.php +++ b/lib/public/DB/QueryBuilder/IQueryFunction.php @@ -20,6 +20,7 @@ * along with this program. If not, see * */ + namespace OCP\DB\QueryBuilder; /** diff --git a/lib/public/Dashboard/Exceptions/DashboardAppNotAvailableException.php b/lib/public/Dashboard/Exceptions/DashboardAppNotAvailableException.php index 4c3013000e831ad1b8bb6be379cb5f5c0f91b787..1e3d420e0bfe2b03bacc2153c453fa3b49d8c704 100644 --- a/lib/public/Dashboard/Exceptions/DashboardAppNotAvailableException.php +++ b/lib/public/Dashboard/Exceptions/DashboardAppNotAvailableException.php @@ -38,4 +38,3 @@ namespace OCP\Dashboard\Exceptions; */ class DashboardAppNotAvailableException extends \Exception { } - diff --git a/lib/public/Dashboard/IDashboardManager.php b/lib/public/Dashboard/IDashboardManager.php index ede47c4baaf958e8e53d8a819de35b82bfbd2080..93f96983583fd6fa15435ba2b3be3ba5e85f8f7b 100644 --- a/lib/public/Dashboard/IDashboardManager.php +++ b/lib/public/Dashboard/IDashboardManager.php @@ -27,7 +27,6 @@ declare(strict_types=1); * */ - namespace OCP\Dashboard; @@ -134,4 +133,3 @@ interface IDashboardManager { public function createGlobalEvent(string $widgetId, array $payload, string $uniqueId = ''); } - diff --git a/lib/public/Dashboard/IDashboardWidget.php b/lib/public/Dashboard/IDashboardWidget.php index bbbdf86da8f6b1cbab688174b8309b6e2e871270..b4bb3892911a4db24babf7d9c45e48b3ae2902b5 100644 --- a/lib/public/Dashboard/IDashboardWidget.php +++ b/lib/public/Dashboard/IDashboardWidget.php @@ -27,14 +27,13 @@ declare(strict_types=1); * */ - namespace OCP\Dashboard; -use OCP\Dashboard\Model\WidgetSetup; -use OCP\Dashboard\Model\WidgetTemplate; use OCP\Dashboard\Model\IWidgetConfig; use OCP\Dashboard\Model\IWidgetRequest; +use OCP\Dashboard\Model\WidgetSetup; +use OCP\Dashboard\Model\WidgetTemplate; /** * Interface IDashboardWidget @@ -144,4 +143,3 @@ interface IDashboardWidget { public function requestWidget(IWidgetRequest $request); } - diff --git a/lib/public/Dashboard/Model/IWidgetConfig.php b/lib/public/Dashboard/Model/IWidgetConfig.php index 0ae4cad50a9a6bf8d7a527f942777141ab635dfb..b06e97100b499fafb23597506377f33617019a9e 100644 --- a/lib/public/Dashboard/Model/IWidgetConfig.php +++ b/lib/public/Dashboard/Model/IWidgetConfig.php @@ -126,4 +126,3 @@ interface IWidgetConfig { } - diff --git a/lib/public/Dashboard/Model/IWidgetRequest.php b/lib/public/Dashboard/Model/IWidgetRequest.php index 3a3658b30b243567c6130fdafc9db0ff5d780a04..3df1e2d369353e9b39a3596573eed7de4866e6f3 100644 --- a/lib/public/Dashboard/Model/IWidgetRequest.php +++ b/lib/public/Dashboard/Model/IWidgetRequest.php @@ -32,7 +32,6 @@ namespace OCP\Dashboard\Model; use OCP\Dashboard\IDashboardWidget; - /** * Interface IWidgetRequest * @@ -134,4 +133,3 @@ interface IWidgetRequest { public function addResultArray(string $key, array $result): IWidgetRequest; } - diff --git a/lib/public/Dashboard/Model/WidgetSetting.php b/lib/public/Dashboard/Model/WidgetSetting.php index 616771f7bca3fa6b870adb09dde4cfd5644314f9..42d2f810bcd636aa1418795ba5f9d0eb2134c360 100644 --- a/lib/public/Dashboard/Model/WidgetSetting.php +++ b/lib/public/Dashboard/Model/WidgetSetting.php @@ -32,7 +32,6 @@ namespace OCP\Dashboard\Model; use JsonSerializable; - /** * Interface WidgetSetting * @@ -239,4 +238,3 @@ final class WidgetSetting implements JsonSerializable { } - diff --git a/lib/public/Dashboard/Model/WidgetSetup.php b/lib/public/Dashboard/Model/WidgetSetup.php index 8f0881a3a17b9aca4780b8ff8b8eb36753854922..7073bbc922dadcad5ba6354c8476c9720297127c 100644 --- a/lib/public/Dashboard/Model/WidgetSetup.php +++ b/lib/public/Dashboard/Model/WidgetSetup.php @@ -32,7 +32,6 @@ namespace OCP\Dashboard\Model; use JsonSerializable; - /** * Interface WidgetSetup * @@ -268,4 +267,3 @@ final class WidgetSetup implements JsonSerializable { ]; } } - diff --git a/lib/public/Dashboard/Model/WidgetTemplate.php b/lib/public/Dashboard/Model/WidgetTemplate.php index 485d629853955e679c686b9fa575f1bd4187dd37..c668cfb7e7caae090c2c204880715e8442ae5c35 100644 --- a/lib/public/Dashboard/Model/WidgetTemplate.php +++ b/lib/public/Dashboard/Model/WidgetTemplate.php @@ -32,7 +32,6 @@ namespace OCP\Dashboard\Model; use JsonSerializable; - /** * Interface WidgetTemplate * @@ -316,4 +315,3 @@ final class WidgetTemplate implements JsonSerializable { } - diff --git a/lib/public/Dashboard/Service/IEventsService.php b/lib/public/Dashboard/Service/IEventsService.php index 4262e235fd58aac5969b2437eaa11ac31f2fb5f8..6717b80429618c9afb554b5ddefa6944a9095649 100644 --- a/lib/public/Dashboard/Service/IEventsService.php +++ b/lib/public/Dashboard/Service/IEventsService.php @@ -27,7 +27,6 @@ declare(strict_types=1); * */ - namespace OCP\Dashboard\Service; @@ -91,4 +90,3 @@ interface IEventsService { } - diff --git a/lib/public/Dashboard/Service/IWidgetsService.php b/lib/public/Dashboard/Service/IWidgetsService.php index b9a4482b4fc75dd1ae3e904981371f29ab4c824f..e2869f7f70c430e7a2cb184709aa2ef30e8f3272 100644 --- a/lib/public/Dashboard/Service/IWidgetsService.php +++ b/lib/public/Dashboard/Service/IWidgetsService.php @@ -27,7 +27,6 @@ declare(strict_types=1); * */ - namespace OCP\Dashboard\Service; @@ -59,4 +58,3 @@ interface IWidgetsService { public function getWidgetConfig(string $widgetId, string $userId): IWidgetConfig; } - diff --git a/lib/public/Defaults.php b/lib/public/Defaults.php index bf790bb723957ae889331beccd4d1b5a24aa49e0..82bf5be38439dc2f081822fb2559f75db25e2d25 100644 --- a/lib/public/Defaults.php +++ b/lib/public/Defaults.php @@ -32,6 +32,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP; /** diff --git a/lib/public/Encryption/IManager.php b/lib/public/Encryption/IManager.php index b32ccf03eb68513a47724cdc32d179af79fa05a4..89e5525701bcba290163e5da1b0d414af2cc2492 100644 --- a/lib/public/Encryption/IManager.php +++ b/lib/public/Encryption/IManager.php @@ -24,8 +24,8 @@ namespace OCP\Encryption; -use OC\Encryption\Exceptions\ModuleDoesNotExistsException; use OC\Encryption\Exceptions\ModuleAlreadyExistsException; +use OC\Encryption\Exceptions\ModuleDoesNotExistsException; /** * This class provides access to files encryption apps. diff --git a/lib/public/Federation/ICloudFederationProvider.php b/lib/public/Federation/ICloudFederationProvider.php index b3574535cb08039c8f5b93f48cf024ed0efe0020..ef0c7c9bcc3f20562ae7d77ce2cb72d71fb7f870 100644 --- a/lib/public/Federation/ICloudFederationProvider.php +++ b/lib/public/Federation/ICloudFederationProvider.php @@ -25,7 +25,7 @@ use OCP\Federation\Exceptions\ActionNotSupportedException; use OCP\Federation\Exceptions\AuthenticationFailedException; use OCP\Federation\Exceptions\BadRequestException; use OCP\Federation\Exceptions\ProviderCouldNotAddShareException; -use \OCP\Share\Exceptions\ShareNotFound; +use OCP\Share\Exceptions\ShareNotFound; /** * Interface ICloudFederationProvider diff --git a/lib/public/Files.php b/lib/public/Files.php index 1cfd73fb288487b4f0bcf7bc6fde9731127a48c4..e2983a8151deca96bbb48b11370cfc4b4fc59997 100644 --- a/lib/public/Files.php +++ b/lib/public/Files.php @@ -38,6 +38,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP; /** diff --git a/lib/public/Files/AlreadyExistsException.php b/lib/public/Files/AlreadyExistsException.php index af801959247692fb6eb29bcea03a260990a864ae..51baf5f5d4ec1ae3f0a0de2e72fc93e881746025 100644 --- a/lib/public/Files/AlreadyExistsException.php +++ b/lib/public/Files/AlreadyExistsException.php @@ -28,6 +28,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP\Files; /** diff --git a/lib/public/Files/Cache/IScanner.php b/lib/public/Files/Cache/IScanner.php index 8aa4dc04aa90a4a6bc0a0ddb205ede5f4a6537e1..effd4a45667d133a3886943c20669d0fb26b57aa 100644 --- a/lib/public/Files/Cache/IScanner.php +++ b/lib/public/Files/Cache/IScanner.php @@ -81,4 +81,3 @@ interface IScanner { */ public function backgroundScan(); } - diff --git a/lib/public/Files/EntityTooLargeException.php b/lib/public/Files/EntityTooLargeException.php index 4a74403106ceadca61a80b66409ae56047be879e..0229f8357b0bb13b71c8fd945025ab34bda415be 100644 --- a/lib/public/Files/EntityTooLargeException.php +++ b/lib/public/Files/EntityTooLargeException.php @@ -28,6 +28,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP\Files; /** diff --git a/lib/public/Files/File.php b/lib/public/Files/File.php index 29a83b4df7d9e1d269e41e2e5ffc1689970870a8..1fe01cfb29a6c07d9276837bf755501d4de35313 100644 --- a/lib/public/Files/File.php +++ b/lib/public/Files/File.php @@ -30,6 +30,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP\Files; /** diff --git a/lib/public/Files/FileInfo.php b/lib/public/Files/FileInfo.php index 4d9e76b27f353c0293d3423e476d7457cf1d2cf7..f09896bf93adeabf1606c1b9b31bcf392f40678e 100644 --- a/lib/public/Files/FileInfo.php +++ b/lib/public/Files/FileInfo.php @@ -25,6 +25,7 @@ * along with this program. If not, see * */ + namespace OCP\Files; /** diff --git a/lib/public/Files/FileNameTooLongException.php b/lib/public/Files/FileNameTooLongException.php index 8c46b7f551969d7b17a865ba33f07bbff17946a7..d2302cd66f96dadaa374527361401e80591d2c2f 100644 --- a/lib/public/Files/FileNameTooLongException.php +++ b/lib/public/Files/FileNameTooLongException.php @@ -28,6 +28,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP\Files; /** diff --git a/lib/public/Files/Folder.php b/lib/public/Files/Folder.php index 425813c7e211a7854108e454ba3e3082c4b6c88f..8e45051a11850554ca75cdfc9b713c82b8060681 100644 --- a/lib/public/Files/Folder.php +++ b/lib/public/Files/Folder.php @@ -29,6 +29,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP\Files; use OCP\Files\Search\ISearchQuery; diff --git a/lib/public/Files/ForbiddenException.php b/lib/public/Files/ForbiddenException.php index 4432c0d4934cd80f8a37128f8b1927de850e9af9..03b0286695bcf813bbbf30273506a7bb3385e0ad 100644 --- a/lib/public/Files/ForbiddenException.php +++ b/lib/public/Files/ForbiddenException.php @@ -23,6 +23,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP\Files; /** diff --git a/lib/public/Files/GenericFileException.php b/lib/public/Files/GenericFileException.php index b5da4aabebdb964fb9fba192be3989f0aeaea1f6..dcbcd93bab84aafd8eea15a01227323aa201c797 100644 --- a/lib/public/Files/GenericFileException.php +++ b/lib/public/Files/GenericFileException.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OCP\Files; /** diff --git a/lib/public/Files/IAppData.php b/lib/public/Files/IAppData.php index fd0d0649810d6fba7356380614388fdeac1e7b87..875463c98bf01466148567e1942d0072ce208c9c 100644 --- a/lib/public/Files/IAppData.php +++ b/lib/public/Files/IAppData.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OCP\Files; use OCP\Files\SimpleFS\ISimpleRoot; diff --git a/lib/public/Files/IHomeStorage.php b/lib/public/Files/IHomeStorage.php index 3144dd8bc9478e5317305c93bea044ad3d93a271..0d5f351ebadfd53c4c4c51b1a083a01568da15fc 100644 --- a/lib/public/Files/IHomeStorage.php +++ b/lib/public/Files/IHomeStorage.php @@ -28,6 +28,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP\Files; /** diff --git a/lib/public/Files/IMimeTypeDetector.php b/lib/public/Files/IMimeTypeDetector.php index f66eb4e0b9f5d5d68a22b8b82f788c2fc6fd0fcb..318927f2ffa9b5590cebdcd7520308ee779cb52c 100644 --- a/lib/public/Files/IMimeTypeDetector.php +++ b/lib/public/Files/IMimeTypeDetector.php @@ -22,6 +22,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP\Files; diff --git a/lib/public/Files/IRootFolder.php b/lib/public/Files/IRootFolder.php index b041bcae301ea08e8ef0a3caebc4678168d6e192..aa5ca5b8dc9d4aef1d21bb5e00668e4863cf655f 100644 --- a/lib/public/Files/IRootFolder.php +++ b/lib/public/Files/IRootFolder.php @@ -21,7 +21,6 @@ * */ - namespace OCP\Files; use OC\Hooks\Emitter; @@ -43,4 +42,3 @@ interface IRootFolder extends Folder, Emitter { */ public function getUserFolder($userId); } - diff --git a/lib/public/Files/InvalidCharacterInPathException.php b/lib/public/Files/InvalidCharacterInPathException.php index 8e8f1a15e3a63e19363a393526b0af7a480a1150..40c51cb2544381a36d683621a811d892ee398246 100644 --- a/lib/public/Files/InvalidCharacterInPathException.php +++ b/lib/public/Files/InvalidCharacterInPathException.php @@ -28,6 +28,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP\Files; /** diff --git a/lib/public/Files/InvalidContentException.php b/lib/public/Files/InvalidContentException.php index bdde7909b5839489a9918f846b5efbde73ad885b..b8f449b646272bdc0404030e767d915672b0719b 100644 --- a/lib/public/Files/InvalidContentException.php +++ b/lib/public/Files/InvalidContentException.php @@ -28,6 +28,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP\Files; /** diff --git a/lib/public/Files/InvalidPathException.php b/lib/public/Files/InvalidPathException.php index bb8aff50913e03ee6d193711522b9c405288bf90..2f2caa95a62c98b3588c42f7e922532872301bf6 100644 --- a/lib/public/Files/InvalidPathException.php +++ b/lib/public/Files/InvalidPathException.php @@ -28,6 +28,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP\Files; /** diff --git a/lib/public/Files/LockNotAcquiredException.php b/lib/public/Files/LockNotAcquiredException.php index 1ef0e676b342b830fb2770ea453d9edea178f0da..ece55b6c375dc719dd7a8e7c17a294fbb5d5b99b 100644 --- a/lib/public/Files/LockNotAcquiredException.php +++ b/lib/public/Files/LockNotAcquiredException.php @@ -29,6 +29,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP\Files; /** diff --git a/lib/public/Files/Node.php b/lib/public/Files/Node.php index 016b217afc305fbeec901807b90943519c064e0c..4468b68001460ba9d853bef3db51a25183f5d14b 100644 --- a/lib/public/Files/Node.php +++ b/lib/public/Files/Node.php @@ -31,6 +31,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP\Files; /** diff --git a/lib/public/Files/NotEnoughSpaceException.php b/lib/public/Files/NotEnoughSpaceException.php index f4407a9578583f2380d12ce91fcf135f6e51c4f8..f7b4b6c59d469bc1811a3b0b0dc9fd76b65ae111 100644 --- a/lib/public/Files/NotEnoughSpaceException.php +++ b/lib/public/Files/NotEnoughSpaceException.php @@ -28,6 +28,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP\Files; /** diff --git a/lib/public/Files/NotFoundException.php b/lib/public/Files/NotFoundException.php index f0ccb90a52b45eb6c7f3e316c39cb737462de962..d285dafd32def703450962062d00a6c39f9fbfc2 100644 --- a/lib/public/Files/NotFoundException.php +++ b/lib/public/Files/NotFoundException.php @@ -28,6 +28,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP\Files; /** diff --git a/lib/public/Files/NotPermittedException.php b/lib/public/Files/NotPermittedException.php index 516c323181b0e40120e70b30d11929fa609bbe4c..75f34b787ce88e42b7d3ddb3d6f3fa5a87ad15a1 100644 --- a/lib/public/Files/NotPermittedException.php +++ b/lib/public/Files/NotPermittedException.php @@ -28,6 +28,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP\Files; /** diff --git a/lib/public/Files/ObjectStore/IObjectStore.php b/lib/public/Files/ObjectStore/IObjectStore.php index 83c4b1065d67cdad7b87335049087647366d19ad..580a92729d929b8afa57e68ee8c28c12f3a6a19a 100644 --- a/lib/public/Files/ObjectStore/IObjectStore.php +++ b/lib/public/Files/ObjectStore/IObjectStore.php @@ -21,6 +21,7 @@ * along with this program. If not, see * */ + namespace OCP\Files\ObjectStore; use OCP\Files\NotFoundException; diff --git a/lib/public/Files/ReservedWordException.php b/lib/public/Files/ReservedWordException.php index 67b205de57b3dcf1337f5bdd71f4526d1a1fd2c2..64f88ca518730c4aef4e6a6d23dc08f978058e3e 100644 --- a/lib/public/Files/ReservedWordException.php +++ b/lib/public/Files/ReservedWordException.php @@ -28,6 +28,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP\Files; /** diff --git a/lib/public/Files/SimpleFS/ISimpleFile.php b/lib/public/Files/SimpleFS/ISimpleFile.php index b00f5c482c641aab2314be001d82cd438cc6ae59..041e915643e26ceeaccc94916dfe4fd65ba67027 100644 --- a/lib/public/Files/SimpleFS/ISimpleFile.php +++ b/lib/public/Files/SimpleFS/ISimpleFile.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OCP\Files\SimpleFS; use OCP\Files\NotFoundException; diff --git a/lib/public/Files/SimpleFS/ISimpleFolder.php b/lib/public/Files/SimpleFS/ISimpleFolder.php index 54fbd466e469e0139f6bdc205c3eaad5814e9824..ab3db007c54a3861b200c5e481e3edd830b7c9eb 100644 --- a/lib/public/Files/SimpleFS/ISimpleFolder.php +++ b/lib/public/Files/SimpleFS/ISimpleFolder.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OCP\Files\SimpleFS; use OCP\Files\NotFoundException; diff --git a/lib/public/Files/SimpleFS/ISimpleRoot.php b/lib/public/Files/SimpleFS/ISimpleRoot.php index 054106fbaca32c54e95f35d3c260513ba27e28a0..649f0233b029bd475ae846dfb5feda8abfd13803 100644 --- a/lib/public/Files/SimpleFS/ISimpleRoot.php +++ b/lib/public/Files/SimpleFS/ISimpleRoot.php @@ -21,6 +21,7 @@ * along with this program. If not, see . * */ + namespace OCP\Files\SimpleFS; use OCP\Files\NotFoundException; diff --git a/lib/public/Files/Storage.php b/lib/public/Files/Storage.php index 1cbba104dee893d5615c1facf464dfd1e01e5c19..3fab087799086e69ee0586395f92afc478b4ff6b 100644 --- a/lib/public/Files/Storage.php +++ b/lib/public/Files/Storage.php @@ -35,6 +35,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP\Files; use OCP\Files\Storage\IStorage; diff --git a/lib/public/Files/Storage/IDisableEncryptionStorage.php b/lib/public/Files/Storage/IDisableEncryptionStorage.php index 5ec4a2be843b503beab04b737d26f72c69b65763..8b62491d39a4187130701d90e4835e433f6906a4 100644 --- a/lib/public/Files/Storage/IDisableEncryptionStorage.php +++ b/lib/public/Files/Storage/IDisableEncryptionStorage.php @@ -28,4 +28,4 @@ namespace OCP\Files\Storage; */ interface IDisableEncryptionStorage { -} \ No newline at end of file +} diff --git a/lib/public/Files/Storage/IStorage.php b/lib/public/Files/Storage/IStorage.php index 1fc45c041c3d750072069030c6e055655b0dd8b4..1d9fa5363dc853e44f8df63a43c66c3968f220cc 100644 --- a/lib/public/Files/Storage/IStorage.php +++ b/lib/public/Files/Storage/IStorage.php @@ -28,6 +28,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP\Files\Storage; use OCP\Files\Cache\ICache; diff --git a/lib/public/Files/StorageAuthException.php b/lib/public/Files/StorageAuthException.php index 4e216b0f01fde38e8ac6c5e0b6295052a8a61a12..526feebb463479642c6f5d820f98cdd4414665b9 100644 --- a/lib/public/Files/StorageAuthException.php +++ b/lib/public/Files/StorageAuthException.php @@ -20,6 +20,7 @@ * along with this program. If not, see * */ + namespace OCP\Files; /** diff --git a/lib/public/Files/StorageBadConfigException.php b/lib/public/Files/StorageBadConfigException.php index ea525b91f4551940f0ecc0fdf271c6b11de242da..6cd3ee06b24da6897082393124b916c49a4f0bd8 100644 --- a/lib/public/Files/StorageBadConfigException.php +++ b/lib/public/Files/StorageBadConfigException.php @@ -20,6 +20,7 @@ * along with this program. If not, see * */ + namespace OCP\Files; /** diff --git a/lib/public/Files/StorageConnectionException.php b/lib/public/Files/StorageConnectionException.php index 7702460a2f8b4b4d6d5b926c091bc1504f4d96fb..be901b60a049de2f7808abc23a52803acf97a42a 100644 --- a/lib/public/Files/StorageConnectionException.php +++ b/lib/public/Files/StorageConnectionException.php @@ -20,6 +20,7 @@ * along with this program. If not, see * */ + namespace OCP\Files; /** diff --git a/lib/public/Files/StorageInvalidException.php b/lib/public/Files/StorageInvalidException.php index c772a714fcdd09ee87ffb98232bbb198be2f9b3c..7f8d489304ea201c2bbd9a1c433f86b4318129be 100644 --- a/lib/public/Files/StorageInvalidException.php +++ b/lib/public/Files/StorageInvalidException.php @@ -28,6 +28,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP\Files; /** diff --git a/lib/public/Files/StorageNotAvailableException.php b/lib/public/Files/StorageNotAvailableException.php index 7a060417acb7b34fc3073d930fe19e9c957b3dbb..3cf8733199933ab331c247800e398c8e9b41b010 100644 --- a/lib/public/Files/StorageNotAvailableException.php +++ b/lib/public/Files/StorageNotAvailableException.php @@ -33,6 +33,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP\Files; use OC\HintException; diff --git a/lib/public/Files/StorageTimeoutException.php b/lib/public/Files/StorageTimeoutException.php index 90b5609507429802539767bca675fc6a38f7a8c4..614b04c33f8773c5268dbd500a0754e0b225517a 100644 --- a/lib/public/Files/StorageTimeoutException.php +++ b/lib/public/Files/StorageTimeoutException.php @@ -20,6 +20,7 @@ * along with this program. If not, see * */ + namespace OCP\Files; /** diff --git a/lib/public/Files/UnseekableException.php b/lib/public/Files/UnseekableException.php index 059a8d551266c9313870f5c038d6f2df5fcf7d55..5185f0c056fcad62e131f3dd324265528e63ca01 100644 --- a/lib/public/Files/UnseekableException.php +++ b/lib/public/Files/UnseekableException.php @@ -27,6 +27,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP\Files; /** diff --git a/lib/public/Files_FullTextSearch/Model/AFilesDocument.php b/lib/public/Files_FullTextSearch/Model/AFilesDocument.php index 143788f33ade2f9403caf07cb7533222717c6c06..d239521da445143bbe04360b79a35fc38c68b55e 100644 --- a/lib/public/Files_FullTextSearch/Model/AFilesDocument.php +++ b/lib/public/Files_FullTextSearch/Model/AFilesDocument.php @@ -27,14 +27,12 @@ declare(strict_types=1); * */ - namespace OCP\Files_FullTextSearch\Model; use OC\FullTextSearch\Model\IndexDocument; use OCP\FullTextSearch\Model\IIndexDocument; - /** * Abstract Class AFilesDocument * @@ -108,4 +106,3 @@ abstract class AFilesDocument extends IndexDocument { abstract public function getPath(): string; } - diff --git a/lib/public/FullTextSearch/Exceptions/FullTextSearchAppNotAvailableException.php b/lib/public/FullTextSearch/Exceptions/FullTextSearchAppNotAvailableException.php index 4363376f0f400677086e5773c315271eb5ae45f1..5d533ff467d2227887d16e7d6a65cccc52c04b7e 100644 --- a/lib/public/FullTextSearch/Exceptions/FullTextSearchAppNotAvailableException.php +++ b/lib/public/FullTextSearch/Exceptions/FullTextSearchAppNotAvailableException.php @@ -27,7 +27,6 @@ declare(strict_types=1); * */ - namespace OCP\FullTextSearch\Exceptions; /** @@ -39,4 +38,3 @@ namespace OCP\FullTextSearch\Exceptions; */ class FullTextSearchAppNotAvailableException extends \Exception { } - diff --git a/lib/public/FullTextSearch/IFullTextSearchManager.php b/lib/public/FullTextSearch/IFullTextSearchManager.php index 3c2aa6324d787c0ae364687273dd76106988b03a..1cc58a7890999a8e744252c012bf9dfc267bcefe 100644 --- a/lib/public/FullTextSearch/IFullTextSearchManager.php +++ b/lib/public/FullTextSearch/IFullTextSearchManager.php @@ -27,7 +27,6 @@ declare(strict_types=1); * */ - namespace OCP\FullTextSearch; @@ -37,7 +36,6 @@ use OCP\FullTextSearch\Service\IIndexService; use OCP\FullTextSearch\Service\IProviderService; use OCP\FullTextSearch\Service\ISearchService; - /** * Interface IFullTextSearchManager * @@ -193,4 +191,3 @@ interface IFullTextSearchManager { } - diff --git a/lib/public/FullTextSearch/IFullTextSearchPlatform.php b/lib/public/FullTextSearch/IFullTextSearchPlatform.php index 01016269f6b453eeabada5771b2b1918271a52ff..0ae355b0eefc37401144da76adba7c00bc5e010b 100644 --- a/lib/public/FullTextSearch/IFullTextSearchPlatform.php +++ b/lib/public/FullTextSearch/IFullTextSearchPlatform.php @@ -27,7 +27,6 @@ declare(strict_types=1); * */ - namespace OCP\FullTextSearch; @@ -37,7 +36,6 @@ use OCP\FullTextSearch\Model\IIndexDocument; use OCP\FullTextSearch\Model\IRunner; use OCP\FullTextSearch\Model\ISearchResult; - /** * Interface IFullTextSearchPlatform * @@ -224,4 +222,3 @@ interface IFullTextSearchPlatform { } - diff --git a/lib/public/FullTextSearch/IFullTextSearchProvider.php b/lib/public/FullTextSearch/IFullTextSearchProvider.php index b72c9e55435e29e06f49986fd4e9a06a721517d6..1405a04420d2786fa03068c75c0c4d25c4636c7a 100644 --- a/lib/public/FullTextSearch/IFullTextSearchProvider.php +++ b/lib/public/FullTextSearch/IFullTextSearchProvider.php @@ -27,19 +27,17 @@ declare(strict_types=1); * */ - namespace OCP\FullTextSearch; use OCP\FullTextSearch\Model\IIndex; -use OCP\FullTextSearch\Model\IIndexOptions; use OCP\FullTextSearch\Model\IIndexDocument; +use OCP\FullTextSearch\Model\IIndexOptions; use OCP\FullTextSearch\Model\IRunner; use OCP\FullTextSearch\Model\ISearchRequest; use OCP\FullTextSearch\Model\ISearchResult; use OCP\FullTextSearch\Model\ISearchTemplate; - /** * Interface IFullTextSearchProvider * diff --git a/lib/public/FullTextSearch/Model/IDocumentAccess.php b/lib/public/FullTextSearch/Model/IDocumentAccess.php index 848e2200f607b49e1c07351efdfe3578517f1d8a..bbd1e47411b598362a0f7c98c89542b2f737376d 100644 --- a/lib/public/FullTextSearch/Model/IDocumentAccess.php +++ b/lib/public/FullTextSearch/Model/IDocumentAccess.php @@ -27,7 +27,6 @@ declare(strict_types=1); * */ - namespace OCP\FullTextSearch\Model; @@ -261,4 +260,3 @@ interface IDocumentAccess { public function getLinks(): array; } - diff --git a/lib/public/FullTextSearch/Model/IIndex.php b/lib/public/FullTextSearch/Model/IIndex.php index c1c83db2d4b584f8e2a1451574e1424825175810..fd7a887ca46663757dfbe6e28d35f40bdf6b7012 100644 --- a/lib/public/FullTextSearch/Model/IIndex.php +++ b/lib/public/FullTextSearch/Model/IIndex.php @@ -27,7 +27,6 @@ declare(strict_types=1); * */ - namespace OCP\FullTextSearch\Model; @@ -289,4 +288,3 @@ interface IIndex { } - diff --git a/lib/public/FullTextSearch/Model/IIndexDocument.php b/lib/public/FullTextSearch/Model/IIndexDocument.php index d3184530a7f073194abff6405c9c01ba2ef385c2..3effb2c1afcabf74c3c5060bacc32b62a0849bbf 100644 --- a/lib/public/FullTextSearch/Model/IIndexDocument.php +++ b/lib/public/FullTextSearch/Model/IIndexDocument.php @@ -27,7 +27,6 @@ declare(strict_types=1); * */ - namespace OCP\FullTextSearch\Model; @@ -633,4 +632,3 @@ interface IIndexDocument { public function getInfoAll(): array; } - diff --git a/lib/public/FullTextSearch/Model/IIndexOptions.php b/lib/public/FullTextSearch/Model/IIndexOptions.php index 8cc5da13d4dc983d1e50de126f747bba1470947d..81087101544d240aec4cabc13a85eda689b24961 100644 --- a/lib/public/FullTextSearch/Model/IIndexOptions.php +++ b/lib/public/FullTextSearch/Model/IIndexOptions.php @@ -27,7 +27,6 @@ declare(strict_types=1); * */ - namespace OCP\FullTextSearch\Model; @@ -83,4 +82,3 @@ interface IIndexOptions { public function getOptionBool(string $option, bool $default): bool; } - diff --git a/lib/public/FullTextSearch/Model/IRunner.php b/lib/public/FullTextSearch/Model/IRunner.php index 0dff82bd5a0329ac0b1769d3cf08855752efb6ae..21867be4d59bd69a6d84a83e8f36bfdb0314754a 100644 --- a/lib/public/FullTextSearch/Model/IRunner.php +++ b/lib/public/FullTextSearch/Model/IRunner.php @@ -27,7 +27,6 @@ declare(strict_types=1); * */ - namespace OCP\FullTextSearch\Model; @@ -139,4 +138,3 @@ interface IRunner { } - diff --git a/lib/public/FullTextSearch/Model/ISearchOption.php b/lib/public/FullTextSearch/Model/ISearchOption.php index 4ac995ad75f3a8d3da993a27bc994c2f5f6a160e..e8f031e89cbd4932e5568b67c199d944e771f386 100644 --- a/lib/public/FullTextSearch/Model/ISearchOption.php +++ b/lib/public/FullTextSearch/Model/ISearchOption.php @@ -27,7 +27,6 @@ declare(strict_types=1); * */ - namespace OCP\FullTextSearch\Model; diff --git a/lib/public/FullTextSearch/Model/ISearchRequest.php b/lib/public/FullTextSearch/Model/ISearchRequest.php index 6874cf161b6385ca2fac9d8afc805babaa729746..a8117789154f412adfc9cb989a4a7920ebeccec0 100644 --- a/lib/public/FullTextSearch/Model/ISearchRequest.php +++ b/lib/public/FullTextSearch/Model/ISearchRequest.php @@ -27,7 +27,6 @@ declare(strict_types=1); * */ - namespace OCP\FullTextSearch\Model; @@ -365,4 +364,3 @@ interface ISearchRequest { public function getSimpleQueries(): array; } - diff --git a/lib/public/FullTextSearch/Model/ISearchRequestSimpleQuery.php b/lib/public/FullTextSearch/Model/ISearchRequestSimpleQuery.php index 08884e25c2b332b581f3611b7b68db98d63dd45a..e040d5c8d4a3453d9a01dffaca049dcf554267d5 100644 --- a/lib/public/FullTextSearch/Model/ISearchRequestSimpleQuery.php +++ b/lib/public/FullTextSearch/Model/ISearchRequestSimpleQuery.php @@ -27,7 +27,6 @@ declare(strict_types=1); * */ - namespace OCP\FullTextSearch\Model; @@ -136,4 +135,3 @@ interface ISearchRequestSimpleQuery { public function addValueBool(bool $value): ISearchRequestSimpleQuery; } - diff --git a/lib/public/FullTextSearch/Model/ISearchResult.php b/lib/public/FullTextSearch/Model/ISearchResult.php index 2ca61c2f37b3e0f61708e985a6e390a50371ca5d..53fbaf9bf74a651cd3cc0c64561aa61ba2a95977 100644 --- a/lib/public/FullTextSearch/Model/ISearchResult.php +++ b/lib/public/FullTextSearch/Model/ISearchResult.php @@ -27,13 +27,11 @@ declare(strict_types=1); * */ - namespace OCP\FullTextSearch\Model; use OCP\FullTextSearch\IFullTextSearchProvider; - /** * Interface ISearchResult * @@ -195,4 +193,3 @@ interface ISearchResult { public function setTimedOut(bool $timedOut): ISearchResult; } - diff --git a/lib/public/FullTextSearch/Model/ISearchTemplate.php b/lib/public/FullTextSearch/Model/ISearchTemplate.php index 9cd6753f2a78eaa1520162e7548cac02e9c662c9..6abeaca581b85003f385f0afd2f62ceab7e7967a 100644 --- a/lib/public/FullTextSearch/Model/ISearchTemplate.php +++ b/lib/public/FullTextSearch/Model/ISearchTemplate.php @@ -27,13 +27,11 @@ declare(strict_types=1); * */ - namespace OCP\FullTextSearch\Model; use OCP\FullTextSearch\IFullTextSearchProvider; - /** * Class ISearchTemplate * @@ -176,4 +174,3 @@ interface ISearchTemplate { public function getNavigationOptions(): array; } - diff --git a/lib/public/FullTextSearch/Service/IIndexService.php b/lib/public/FullTextSearch/Service/IIndexService.php index b70c7eb965f7312df8e2a59f188219c93e42ba59..abc0fcb6faa1d2ff51fe1d3b9f37556c01424d9b 100644 --- a/lib/public/FullTextSearch/Service/IIndexService.php +++ b/lib/public/FullTextSearch/Service/IIndexService.php @@ -27,13 +27,11 @@ declare(strict_types=1); * */ - namespace OCP\FullTextSearch\Service; use OCP\FullTextSearch\Model\IIndex; - /** * Interface IIndexService * @@ -110,4 +108,3 @@ interface IIndexService { public function updateIndexes(array $indexes); } - diff --git a/lib/public/FullTextSearch/Service/IProviderService.php b/lib/public/FullTextSearch/Service/IProviderService.php index 64153c13965c79fb4842ada43ad1ef71ff4c5129..26ce5d0c56faaf7a31f612294f5a5f1bafa74d2b 100644 --- a/lib/public/FullTextSearch/Service/IProviderService.php +++ b/lib/public/FullTextSearch/Service/IProviderService.php @@ -27,7 +27,6 @@ declare(strict_types=1); * */ - namespace OCP\FullTextSearch\Service; @@ -62,4 +61,3 @@ interface IProviderService { } - diff --git a/lib/public/FullTextSearch/Service/ISearchService.php b/lib/public/FullTextSearch/Service/ISearchService.php index 7da38e44f5c5147176bdd6f60f9e0271d180d729..ac0d252f4266f900998c13b7257b863ab5ac1206 100644 --- a/lib/public/FullTextSearch/Service/ISearchService.php +++ b/lib/public/FullTextSearch/Service/ISearchService.php @@ -27,14 +27,12 @@ declare(strict_types=1); * */ - namespace OCP\FullTextSearch\Service; use OCP\FullTextSearch\Model\ISearchRequest; use OCP\FullTextSearch\Model\ISearchResult; - /** * Interface ISearchService * @@ -86,4 +84,3 @@ interface ISearchService { public function search(string $userId, ISearchRequest $searchRequest): array; } - diff --git a/lib/public/GlobalScale/IConfig.php b/lib/public/GlobalScale/IConfig.php index e67470f2e1a3202aa7fedcfedc289000ff2cf114..ef6c22ebd8ec0a220d6712b14d3973604be543e4 100644 --- a/lib/public/GlobalScale/IConfig.php +++ b/lib/public/GlobalScale/IConfig.php @@ -21,7 +21,6 @@ * */ - namespace OCP\GlobalScale; /** diff --git a/lib/public/GroupInterface.php b/lib/public/GroupInterface.php index 35d11755fac005d884ccf094d523b8f63d315122..2c67aafdba50adc422f7a2115204f27539c91ae1 100644 --- a/lib/public/GroupInterface.php +++ b/lib/public/GroupInterface.php @@ -32,6 +32,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP; /** diff --git a/lib/public/IAddressBook.php b/lib/public/IAddressBook.php index 8d86773e771ab4a16373151872b70e9396cd665b..77fc7b6567bc008f34a83bcd4506f7c5994cb9ad 100644 --- a/lib/public/IAddressBook.php +++ b/lib/public/IAddressBook.php @@ -30,6 +30,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP { /** * Interface IAddressBook diff --git a/lib/public/IAppConfig.php b/lib/public/IAppConfig.php index 2f268185e620f07c1eefd7476f41396eaef24db9..aae8bce025c370cdb01989def19b59879b2b363c 100644 --- a/lib/public/IAppConfig.php +++ b/lib/public/IAppConfig.php @@ -23,6 +23,7 @@ * along with this program. If not, see * */ + namespace OCP; /** diff --git a/lib/public/ICache.php b/lib/public/ICache.php index ba61100925ba56d5b051075626f4b032a5a8213f..5aa6dc9fc87cee573a53b668606c7cc8a032f89f 100644 --- a/lib/public/ICache.php +++ b/lib/public/ICache.php @@ -31,6 +31,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP; /** diff --git a/lib/public/IConfig.php b/lib/public/IConfig.php index 878c0acf0c3f64bd7b819fa3890f7c58c889592d..95c72bb1fc8f597962c2b01ea35d988a6cabf8ff 100644 --- a/lib/public/IConfig.php +++ b/lib/public/IConfig.php @@ -34,6 +34,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP; /** diff --git a/lib/public/IContainer.php b/lib/public/IContainer.php index 558c72291c55929f838b97f2a7abdf11041f2444..b9afa2f1d874148edc83c9247f33664d5a24e8ef 100644 --- a/lib/public/IContainer.php +++ b/lib/public/IContainer.php @@ -31,12 +31,12 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP; use Closure; use OCP\AppFramework\QueryException; - /** * Class IContainer * diff --git a/lib/public/IDBConnection.php b/lib/public/IDBConnection.php index 4c66896a2fe89aab0ba48ab77499dc659cb5a754..da89d5bb842f83141e7e3dbf9d5c0a1c7e0d208e 100644 --- a/lib/public/IDBConnection.php +++ b/lib/public/IDBConnection.php @@ -34,6 +34,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP; use Doctrine\DBAL\Schema\Schema; use OCP\DB\QueryBuilder\IQueryBuilder; diff --git a/lib/public/IL10N.php b/lib/public/IL10N.php index 53decd7805156e3bfbf7feaddab44341a2fed63e..f7baa10b5e935a824df164f4ab5142569fc595c6 100644 --- a/lib/public/IL10N.php +++ b/lib/public/IL10N.php @@ -34,6 +34,7 @@ declare(strict_types=1); // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP; /** diff --git a/lib/public/IMemcache.php b/lib/public/IMemcache.php index 8f182553b676adaad43015a3609a7364abee5e4f..19d89b86832637b282110f1c59a8669234b083f5 100644 --- a/lib/public/IMemcache.php +++ b/lib/public/IMemcache.php @@ -29,6 +29,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP; /** diff --git a/lib/public/INavigationManager.php b/lib/public/INavigationManager.php index f840bc8c8a5010dd1f911b5a95c772cd592a244c..68969d0c3f720b8c06980adfab5cbbd8b576451a 100644 --- a/lib/public/INavigationManager.php +++ b/lib/public/INavigationManager.php @@ -32,6 +32,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP; /** diff --git a/lib/public/IPreview.php b/lib/public/IPreview.php index 6989871d29b349f1fff04611e470b5245298afbf..08a428ebeb1ecc8698af07728cc6b1c5e362a637 100644 --- a/lib/public/IPreview.php +++ b/lib/public/IPreview.php @@ -32,11 +32,12 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP; use OCP\Files\File; -use OCP\Files\SimpleFS\ISimpleFile; use OCP\Files\NotFoundException; +use OCP\Files\SimpleFS\ISimpleFile; /** * This class provides functions to render and show thumbnails and previews of files diff --git a/lib/public/IRequest.php b/lib/public/IRequest.php index 05948cd480f8e3ff15765d5e4003d9c5284ca7cb..f61c1da08855f412666cf0088bacda4310fe9298 100644 --- a/lib/public/IRequest.php +++ b/lib/public/IRequest.php @@ -36,6 +36,7 @@ declare(strict_types=1); // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP; /** diff --git a/lib/public/IServerContainer.php b/lib/public/IServerContainer.php index bcdb6e6c9f5f7290e0e29d8cd251aa96bca9fb59..79d4ed9f71bdf1dfe9b058fd784de705bcb5d9b9 100644 --- a/lib/public/IServerContainer.php +++ b/lib/public/IServerContainer.php @@ -43,14 +43,14 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP; -use OCP\Log\ILogFactory; use OCP\Federation\ICloudFederationFactory; use OCP\Federation\ICloudFederationProviderManager; +use OCP\Log\ILogFactory; use OCP\Security\IContentSecurityPolicyManager; use Symfony\Component\EventDispatcher\EventDispatcherInterface; - /** * Class IServerContainer * @package OCP diff --git a/lib/public/ISession.php b/lib/public/ISession.php index bbf36c8652091e5f2f76ed82f43c063331348ab8..3d2f32f7f75e3ea351e8ad19ec7a12c20d4ae8f4 100644 --- a/lib/public/ISession.php +++ b/lib/public/ISession.php @@ -33,6 +33,7 @@ declare(strict_types=1); // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP; use OCP\Session\Exceptions\SessionNotAvailableException; diff --git a/lib/public/ITagManager.php b/lib/public/ITagManager.php index 60d547e44ad5bf9652b4d15c257fc7adae6f5105..b0c9f0d7d900af86ffeef13aea90a36c413d18fe 100644 --- a/lib/public/ITagManager.php +++ b/lib/public/ITagManager.php @@ -31,6 +31,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP; /** diff --git a/lib/public/ITags.php b/lib/public/ITags.php index fce47bb5bc705dc6f24f6a0692523d6105965b3f..c39117e924f05d18973d0e2dabf0705126b0cde9 100644 --- a/lib/public/ITags.php +++ b/lib/public/ITags.php @@ -31,6 +31,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP; use OC\Tags; diff --git a/lib/public/IUserBackend.php b/lib/public/IUserBackend.php index 502856fc354adc6001bff3225a0283588da3daf6..41123e8b7aef450ed32f4f5a218db22213f813af 100644 --- a/lib/public/IUserBackend.php +++ b/lib/public/IUserBackend.php @@ -28,6 +28,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP; /** diff --git a/lib/public/IUserSession.php b/lib/public/IUserSession.php index b3c470e5be5d94537e8f8eeac22160d3b06e3a70..48fe135f28e156ba4b0194c7e19734776909bcea 100644 --- a/lib/public/IUserSession.php +++ b/lib/public/IUserSession.php @@ -33,6 +33,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP; /** diff --git a/lib/public/Image.php b/lib/public/Image.php index d583dffe91dd7f518e63696fd0a6692d61e76fe8..55060f3da488f03e3c6266ad499b881a8e3ec383 100644 --- a/lib/public/Image.php +++ b/lib/public/Image.php @@ -30,6 +30,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP; /** diff --git a/lib/public/L10N/IFactory.php b/lib/public/L10N/IFactory.php index de904d0eec1f00a16ecf17204d72fcbbe8c5491e..04548046f55f51567648d7b58eeb050bde636220 100644 --- a/lib/public/L10N/IFactory.php +++ b/lib/public/L10N/IFactory.php @@ -19,6 +19,7 @@ * along with this program. If not, see * */ + namespace OCP\L10N; use OCP\IUser; diff --git a/lib/public/Migration/IOutput.php b/lib/public/Migration/IOutput.php index 7c6b12ceaf4c5d3c3e4f2216d6cbcba0dc5313c5..8d3ea7cb6696cf19f383f67613f710621cec9ca6 100644 --- a/lib/public/Migration/IOutput.php +++ b/lib/public/Migration/IOutput.php @@ -20,6 +20,7 @@ * along with this program. If not, see * */ + namespace OCP\Migration; /** diff --git a/lib/public/Migration/IRepairStep.php b/lib/public/Migration/IRepairStep.php index 0ba834e2cbf11842de6ae1130a07dc06f06ecded..1a39531bcde8b387a83149a3d45df740fa95936d 100644 --- a/lib/public/Migration/IRepairStep.php +++ b/lib/public/Migration/IRepairStep.php @@ -20,6 +20,7 @@ * along with this program. If not, see * */ + namespace OCP\Migration; /** diff --git a/lib/public/OCS/IDiscoveryService.php b/lib/public/OCS/IDiscoveryService.php index ad1499e75fd7ab724b73533df5074de09a42f0de..f294cffe94f4798ad92c1c2576bb52083f3326ac 100644 --- a/lib/public/OCS/IDiscoveryService.php +++ b/lib/public/OCS/IDiscoveryService.php @@ -22,7 +22,6 @@ declare(strict_types=1); * */ - namespace OCP\OCS; /** diff --git a/lib/public/PreConditionNotMetException.php b/lib/public/PreConditionNotMetException.php index ea6350afb4da64f2bc2c0158f0d5d0b1468ecaf1..cbf0ec2f9b7b3fb3923e561cb7f120d66c5e0eed 100644 --- a/lib/public/PreConditionNotMetException.php +++ b/lib/public/PreConditionNotMetException.php @@ -22,6 +22,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP; /** diff --git a/lib/public/Preview/IProvider.php b/lib/public/Preview/IProvider.php index 5d62b3ce6d0265fdb443daa2f38963d2f9ff3716..6642b7e26c66ad21d0aed02f62ddc7cca6c98055 100644 --- a/lib/public/Preview/IProvider.php +++ b/lib/public/Preview/IProvider.php @@ -20,6 +20,7 @@ * along with this program. If not, see * */ + namespace OCP\Preview; /** diff --git a/lib/public/Route/IRoute.php b/lib/public/Route/IRoute.php index 9b8218085ad0641137d9d13906ffd25bc758f011..40566413508643780305e771281fb93d71b9856a 100644 --- a/lib/public/Route/IRoute.php +++ b/lib/public/Route/IRoute.php @@ -22,6 +22,7 @@ * along with this program. If not, see * */ + namespace OCP\Route; /** diff --git a/lib/public/SabrePluginEvent.php b/lib/public/SabrePluginEvent.php index 8f8d155ec10ca17b77aada368076447eb1870d5a..165cccc22d2187c1be4bdea4eed5e29143884c7f 100644 --- a/lib/public/SabrePluginEvent.php +++ b/lib/public/SabrePluginEvent.php @@ -25,8 +25,8 @@ namespace OCP; use OCP\AppFramework\Http; -use Sabre\DAV\Server; use OCP\EventDispatcher\Event; +use Sabre\DAV\Server; /** * @since 8.2.0 diff --git a/lib/public/Share.php b/lib/public/Share.php index f433a35f17a14a6ab7b49c610e2079fed67c9040..10c7324d903f60251ee18c4ffc107e9c6e0885f1 100644 --- a/lib/public/Share.php +++ b/lib/public/Share.php @@ -34,6 +34,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP; /** diff --git a/lib/public/Share/Exceptions/GenericShareException.php b/lib/public/Share/Exceptions/GenericShareException.php index ef5586a362fc9e14966f8cf077545b6134fc8245..7ccac2fb2dbf47f8a387909436c230027ad850ef 100644 --- a/lib/public/Share/Exceptions/GenericShareException.php +++ b/lib/public/Share/Exceptions/GenericShareException.php @@ -21,6 +21,7 @@ * along with this program. If not, see * */ + namespace OCP\Share\Exceptions; use OC\HintException; diff --git a/lib/public/Share/Exceptions/IllegalIDChangeException.php b/lib/public/Share/Exceptions/IllegalIDChangeException.php index 46cbe5fbf9fbd0f0e0b525bada9deb8e65195979..fd5ef0dc2cd6bce56b239796482dddc65aa39f5a 100644 --- a/lib/public/Share/Exceptions/IllegalIDChangeException.php +++ b/lib/public/Share/Exceptions/IllegalIDChangeException.php @@ -19,6 +19,7 @@ * along with this program. If not, see * */ + namespace OCP\Share\Exceptions; /** diff --git a/lib/public/Share/IShareHelper.php b/lib/public/Share/IShareHelper.php index c957a815e895ee00f560f1c760d074b30f12af61..db9f2adbacdb637e92dd51708ba1999e9351baf7 100644 --- a/lib/public/Share/IShareHelper.php +++ b/lib/public/Share/IShareHelper.php @@ -21,6 +21,7 @@ * along with this program. If not, see . * */ + namespace OCP\Share; use OCP\Files\Node; diff --git a/lib/public/Share/IShareProvider.php b/lib/public/Share/IShareProvider.php index 49ab4bef3e683300355b9abce3fdf656c3f435e7..891e8bf1bb89b7e0878755405d40e9df487dff10 100644 --- a/lib/public/Share/IShareProvider.php +++ b/lib/public/Share/IShareProvider.php @@ -25,9 +25,9 @@ namespace OCP\Share; use OCP\Files\Folder; +use OCP\Files\Node; use OCP\Share\Exceptions\GenericShareException; use OCP\Share\Exceptions\ShareNotFound; -use OCP\Files\Node; /** * Interface IShareProvider diff --git a/lib/public/Share_Backend.php b/lib/public/Share_Backend.php index 7ebad8b64d394c1e656215520b30ab4ff2ba3c0c..4aa55844027ed4c2d22877a080617ca0dcd56846 100644 --- a/lib/public/Share_Backend.php +++ b/lib/public/Share_Backend.php @@ -25,6 +25,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP; /** diff --git a/lib/public/Share_Backend_Collection.php b/lib/public/Share_Backend_Collection.php index 0c87a58ce954d669d9bb493322e8548f41eed8cf..d5bb97a1c0c95c31ffb73a7f0eed407c83037b8f 100644 --- a/lib/public/Share_Backend_Collection.php +++ b/lib/public/Share_Backend_Collection.php @@ -23,6 +23,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP; /** diff --git a/lib/public/Share_Backend_File_Dependent.php b/lib/public/Share_Backend_File_Dependent.php index a7f866dd7d0a5d2c995e64caaae5e74fafa5702b..3ff8c86a6c76136c7c490092a6c8563c0f7f958e 100644 --- a/lib/public/Share_Backend_File_Dependent.php +++ b/lib/public/Share_Backend_File_Dependent.php @@ -23,6 +23,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP; /** diff --git a/lib/public/SystemTag/ISystemTag.php b/lib/public/SystemTag/ISystemTag.php index da434e8b5a08bf14c37ebc4042c1800f85fd9a90..8fa959fcc4d868a74751a95288362f4ea2a68cd1 100644 --- a/lib/public/SystemTag/ISystemTag.php +++ b/lib/public/SystemTag/ISystemTag.php @@ -67,4 +67,3 @@ interface ISystemTag { public function isUserAssignable(): bool; } - diff --git a/lib/public/SystemTag/ISystemTagManagerFactory.php b/lib/public/SystemTag/ISystemTagManagerFactory.php index 25956b41df462dbc282ce7c250b2c05b7affb708..5458cab8340a14ed80d983d7f651970e02869001 100644 --- a/lib/public/SystemTag/ISystemTagManagerFactory.php +++ b/lib/public/SystemTag/ISystemTagManagerFactory.php @@ -20,6 +20,7 @@ declare(strict_types=1); * along with this program. If not, see * */ + namespace OCP\SystemTag; use OCP\IServerContainer; diff --git a/lib/public/User.php b/lib/public/User.php index a669a3a06fc77bbe222987c3e0e68cfe82f700b9..04254db08a1b77321c0e3f8ba680bad5e2c98a99 100644 --- a/lib/public/User.php +++ b/lib/public/User.php @@ -38,6 +38,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP; /** diff --git a/lib/public/UserInterface.php b/lib/public/UserInterface.php index b82fc6ba55046fef16c6d51628f017787da122ed..d880f2f5df530c33e4b3ffbb26c81c9e29827c32 100644 --- a/lib/public/UserInterface.php +++ b/lib/public/UserInterface.php @@ -30,6 +30,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP; /** diff --git a/lib/public/Util.php b/lib/public/Util.php index 7e9f6b2efbc60cd06167feb07e50576914524de2..a63e53b0720a010bfe07777da23bbb4c070eb27c 100644 --- a/lib/public/Util.php +++ b/lib/public/Util.php @@ -50,6 +50,7 @@ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes + namespace OCP; /** diff --git a/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php b/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php index 4ecea745cfaebf6c3e7b4f88991cd66b1f4afbeb..811b64029c660b7ee40ec798d0fcfa960e32841d 100644 --- a/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php +++ b/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php @@ -19,7 +19,6 @@ * */ - namespace Tests\Core\Command\Encryption; diff --git a/tests/Core/Command/Encryption/DecryptAllTest.php b/tests/Core/Command/Encryption/DecryptAllTest.php index af97a4b4a79a6a94500bb053211747812d39110f..508d5da95f74bbd93bb37cb290d9cc9d694d1a3c 100644 --- a/tests/Core/Command/Encryption/DecryptAllTest.php +++ b/tests/Core/Command/Encryption/DecryptAllTest.php @@ -19,7 +19,6 @@ * */ - namespace Tests\Core\Command\Encryption; diff --git a/tests/Core/Command/Encryption/EncryptAllTest.php b/tests/Core/Command/Encryption/EncryptAllTest.php index c6af7e387227d317cdfc5a57c93ae977a12d984c..7fa4b5e5bbe932db47ef5d9ad13b9497c9a9ce72 100644 --- a/tests/Core/Command/Encryption/EncryptAllTest.php +++ b/tests/Core/Command/Encryption/EncryptAllTest.php @@ -19,7 +19,6 @@ * */ - namespace Tests\Core\Command\Encryption; diff --git a/tests/Core/Command/Group/AddTest.php b/tests/Core/Command/Group/AddTest.php index 8aa2f040de11f43878474523ec9b998fd588c366..c7010e53e58de9d354f7b5ef60c95085a9b98385 100644 --- a/tests/Core/Command/Group/AddTest.php +++ b/tests/Core/Command/Group/AddTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Test\Core\Command\Group; use OC\Core\Command\Group\Add; diff --git a/tests/Core/Command/Group/AddUserTest.php b/tests/Core/Command/Group/AddUserTest.php index af860e244d6611ee74c6cf17430b2f7225e02e08..7660aad1192be23ffc48ee71bb3952faca16adf0 100644 --- a/tests/Core/Command/Group/AddUserTest.php +++ b/tests/Core/Command/Group/AddUserTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Test\Core\Command\Group; use OC\Core\Command\Group\AddUser; diff --git a/tests/Core/Command/Group/DeleteTest.php b/tests/Core/Command/Group/DeleteTest.php index 708e10b05817bab4283d1a7c33766c19d9bdea88..f9b1cbbe3a8193090c6acff4d671f3e4b1c5bd18 100644 --- a/tests/Core/Command/Group/DeleteTest.php +++ b/tests/Core/Command/Group/DeleteTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Test\Core\Command\Group; use OC\Core\Command\Group\Delete; diff --git a/tests/Core/Command/Group/ListCommandTest.php b/tests/Core/Command/Group/ListCommandTest.php index ac872e74ac85c248c9816dca0d669d2540fc841a..ab089c934225a42abab506e5a357b0aa240a1b96 100644 --- a/tests/Core/Command/Group/ListCommandTest.php +++ b/tests/Core/Command/Group/ListCommandTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Test\Core\Command\Group; use OC\Core\Command\Group\ListCommand; diff --git a/tests/Core/Command/Group/RemoveUserTest.php b/tests/Core/Command/Group/RemoveUserTest.php index ec7b0f2d714044c5cfd27259b7755af605bf8b8c..8a75571e3cbdae67563da460415568096448bbac 100644 --- a/tests/Core/Command/Group/RemoveUserTest.php +++ b/tests/Core/Command/Group/RemoveUserTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Test\Core\Command\Group; use OC\Core\Command\Group\RemoveUser; diff --git a/tests/Core/Command/Maintenance/Mimetype/UpdateDBTest.php b/tests/Core/Command/Maintenance/Mimetype/UpdateDBTest.php index 8c023274da57e20e3c833f66791ea2f3b1d6238e..777570086334513f99fdd1ef7e93bbe3c09ad0ac 100644 --- a/tests/Core/Command/Maintenance/Mimetype/UpdateDBTest.php +++ b/tests/Core/Command/Maintenance/Mimetype/UpdateDBTest.php @@ -24,11 +24,11 @@ namespace Tests\Core\Command\Maintenance\Mimetype; use OC\Core\Command\Maintenance\Mimetype\UpdateDB; use OC\Files\Type\Detection; use OC\Files\Type\Loader; +use OCP\Files\IMimeTypeDetector; +use OCP\Files\IMimeTypeLoader; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; -use OCP\Files\IMimeTypeDetector; -use OCP\Files\IMimeTypeLoader; class UpdateDBTest extends TestCase { /** @var IMimeTypeDetector */ diff --git a/tests/Core/Command/Maintenance/UpdateTheme.php b/tests/Core/Command/Maintenance/UpdateTheme.php index cbc417dbdbaa964725a3c1c7c6c493b938573bdd..73141cefcbdcffbb622eedafbd5922403b95a261 100644 --- a/tests/Core/Command/Maintenance/UpdateTheme.php +++ b/tests/Core/Command/Maintenance/UpdateTheme.php @@ -27,13 +27,13 @@ use OC\Core\Command\Maintenance\Mimetype\UpdateDB; use OC\Core\Command\Maintenance\UpdateTheme; use OC\Files\Type\Detection; use OC\Files\Type\Loader; +use OCP\Files\IMimeTypeDetector; +use OCP\Files\IMimeTypeLoader; use OCP\ICache; use OCP\ICacheFactory; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; -use OCP\Files\IMimeTypeDetector; -use OCP\Files\IMimeTypeLoader; class UpdateThemeTest extends TestCase { /** @var IMimeTypeDetector */ diff --git a/tests/Core/Command/User/DisableTest.php b/tests/Core/Command/User/DisableTest.php index 758020acc71a4a3f13a62d08b5eb15ead3542707..019fedc1da9ed696b269e460cdf4dc43dd3f19f9 100644 --- a/tests/Core/Command/User/DisableTest.php +++ b/tests/Core/Command/User/DisableTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Tests\Core\Command\User; diff --git a/tests/Core/Command/User/EnableTest.php b/tests/Core/Command/User/EnableTest.php index 60b415ae79db0f315cc97e577757a4bc3b640ad3..9a3df13efe032246caa7a2c8249298d86f45dcd2 100644 --- a/tests/Core/Command/User/EnableTest.php +++ b/tests/Core/Command/User/EnableTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Tests\Core\Command\User; diff --git a/tests/Core/Controller/AvatarControllerTest.php b/tests/Core/Controller/AvatarControllerTest.php index 5fce8fc6359f4d5eae3cbfedb23da0cd8a6e3289..6f82607dc028ee0d97cea499eaebb93bb47e2b58 100644 --- a/tests/Core/Controller/AvatarControllerTest.php +++ b/tests/Core/Controller/AvatarControllerTest.php @@ -34,13 +34,13 @@ namespace Tests\Core\Controller; use OC\AppFramework\Utility\TimeFactory; use OC\Core\Controller\AvatarController; use OCP\AppFramework\Http; -use OCP\ICache; use OCP\Files\File; use OCP\Files\IRootFolder; use OCP\Files\NotFoundException; use OCP\Files\NotPermittedException; use OCP\IAvatar; use OCP\IAvatarManager; +use OCP\ICache; use OCP\IL10N; use OCP\ILogger; use OCP\IRequest; diff --git a/tests/Core/Controller/ChangePasswordControllerTest.php b/tests/Core/Controller/ChangePasswordControllerTest.php index e171b46d86db2dddd3c1359d8f1f386ba51be31e..55f05c975edeb099428fb18a68828ec37c3e80a2 100644 --- a/tests/Core/Controller/ChangePasswordControllerTest.php +++ b/tests/Core/Controller/ChangePasswordControllerTest.php @@ -19,11 +19,12 @@ * along with this program. If not, see . * */ + namespace Tests\Core\Controller; use OC\HintException; -use OCA\Settings\Controller\ChangePasswordController; use OC\User\Session; +use OCA\Settings\Controller\ChangePasswordController; use OCP\App\IAppManager; use OCP\AppFramework\Http\JSONResponse; use OCP\IGroupManager; diff --git a/tests/Core/Controller/ClientFlowLoginV2ControllerTest.php b/tests/Core/Controller/ClientFlowLoginV2ControllerTest.php index 911a4923675c6c69900582a55b2fff49599ad122..c3ed740432c04f08806464d56fbd770dc2d9df05 100644 --- a/tests/Core/Controller/ClientFlowLoginV2ControllerTest.php +++ b/tests/Core/Controller/ClientFlowLoginV2ControllerTest.php @@ -318,4 +318,3 @@ class ClientFlowLoginV2ControllerTest extends TestCase { $this->assertTrue($clearedState); } } - diff --git a/tests/Core/Controller/CssControllerTest.php b/tests/Core/Controller/CssControllerTest.php index f4e6e83201eb63adfd143ffe88b85fd06df270e3..faab89db40cd31f159529a70abe25a2367b012a6 100644 --- a/tests/Core/Controller/CssControllerTest.php +++ b/tests/Core/Controller/CssControllerTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Tests\Core\Controller; use OC\Core\Controller\CssController; diff --git a/tests/Core/Controller/JsControllerTest.php b/tests/Core/Controller/JsControllerTest.php index 307ef8377862a50d6cf25b7dbd6398874ed7f7b8..e05f5bf5ded8b1cce37f412ffe4a372e7a6bc51e 100644 --- a/tests/Core/Controller/JsControllerTest.php +++ b/tests/Core/Controller/JsControllerTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Tests\Core\Controller; use OC\Core\Controller\JsController; diff --git a/tests/Core/Controller/NavigationControllerTest.php b/tests/Core/Controller/NavigationControllerTest.php index 4095526fc0b618d514c3ffd9b7d3fcc4adcbd222..71730a8f8b99c358525ee694b4f9af92140c7579 100644 --- a/tests/Core/Controller/NavigationControllerTest.php +++ b/tests/Core/Controller/NavigationControllerTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Tests\Core\Controller; use OC\Core\Controller\NavigationController; diff --git a/tests/Core/Controller/OCSControllerTest.php b/tests/Core/Controller/OCSControllerTest.php index a22c3bdc5e0a5d4a48d201b503030c3fb02b45ca..241c3b12477b22ab4fbab0c5377ec189f9aa1984 100644 --- a/tests/Core/Controller/OCSControllerTest.php +++ b/tests/Core/Controller/OCSControllerTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OC\Core\Controller; use OC\CapabilitiesManager; diff --git a/tests/Core/Controller/PreviewControllerTest.php b/tests/Core/Controller/PreviewControllerTest.php index df1af6a080280178653c2f75e3758b885ceb9c75..7b66d32f61e051896b11281191424c55be99255c 100644 --- a/tests/Core/Controller/PreviewControllerTest.php +++ b/tests/Core/Controller/PreviewControllerTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Tests\Core\Controller; use OC\Core\Controller\PreviewController; diff --git a/tests/Core/Controller/UserControllerTest.php b/tests/Core/Controller/UserControllerTest.php index d15bbf7f87182e16a646f7190d92c9d20f56da8c..7a089d5e57ed9bedb8310491d8d8e048005c4d0b 100644 --- a/tests/Core/Controller/UserControllerTest.php +++ b/tests/Core/Controller/UserControllerTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Test\Core\Controller; use OC\Core\Controller\UserController; diff --git a/tests/Core/Middleware/TwoFactorMiddlewareTest.php b/tests/Core/Middleware/TwoFactorMiddlewareTest.php index 06aea147a2348608c42e955d7d9a10af088c3545..994599212f9ef2476a5681eb5e19a1f1f0dab36b 100644 --- a/tests/Core/Middleware/TwoFactorMiddlewareTest.php +++ b/tests/Core/Middleware/TwoFactorMiddlewareTest.php @@ -22,13 +22,13 @@ namespace Test\Core\Middleware; +use OC\AppFramework\Http\Request; use OC\Authentication\Exceptions\TwoFactorAuthRequiredException; use OC\Authentication\Exceptions\UserAlreadyLoggedInException; use OC\Authentication\TwoFactorAuth\Manager; use OC\Authentication\TwoFactorAuth\ProviderSet; use OC\Core\Controller\TwoFactorChallengeController; use OC\Core\Middleware\TwoFactorMiddleware; -use OC\AppFramework\Http\Request; use OC\User\Session; use OCP\AppFramework\Controller; use OCP\AppFramework\Utility\IControllerMethodReflector; diff --git a/tests/lib/Accounts/AccountsManagerTest.php b/tests/lib/Accounts/AccountsManagerTest.php index bff3b353a1e0d751f9c5fc62701b15f0e1d9957e..9d9a0e015838285b19e01baebe2d3cc3eda09290 100644 --- a/tests/lib/Accounts/AccountsManagerTest.php +++ b/tests/lib/Accounts/AccountsManagerTest.php @@ -19,7 +19,6 @@ * */ - namespace Test\Accounts; diff --git a/tests/lib/Accounts/HooksTest.php b/tests/lib/Accounts/HooksTest.php index 071e78146ea459b3797e9701ee05d219858b8b30..0534f2dba6b8d319583f5e3128e71b115288cca7 100644 --- a/tests/lib/Accounts/HooksTest.php +++ b/tests/lib/Accounts/HooksTest.php @@ -19,7 +19,6 @@ * */ - namespace Test\Accounts; diff --git a/tests/lib/App/AppManagerTest.php b/tests/lib/App/AppManagerTest.php index 0e3410b8f200ed634bc210c09d1c8006ad8d68c5..66b210c4c1353f77ca244fea2173ce1fc4a4433d 100644 --- a/tests/lib/App/AppManagerTest.php +++ b/tests/lib/App/AppManagerTest.php @@ -15,16 +15,16 @@ use OC\Group\Group; use OC\User\User; use OCP\App\AppPathNotFoundException; use OCP\App\IAppManager; +use OCP\IAppConfig; use OCP\ICache; use OCP\ICacheFactory; +use OCP\IConfig; use OCP\IGroup; use OCP\IGroupManager; use OCP\ILogger; +use OCP\IURLGenerator; use OCP\IUser; use OCP\IUserSession; -use OCP\IAppConfig; -use OCP\IConfig; -use OCP\IURLGenerator; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Test\TestCase; diff --git a/tests/lib/AppFramework/AppTest.php b/tests/lib/AppFramework/AppTest.php index b9c0f47216af34ab0283581e56be1d5152a2ae1c..cd3e7c47ad6c2a7e0e1c7e3973d3d59eb3dcdcb1 100644 --- a/tests/lib/AppFramework/AppTest.php +++ b/tests/lib/AppFramework/AppTest.php @@ -21,7 +21,6 @@ * */ - namespace Test\AppFramework; use OC\AppFramework\App; @@ -30,7 +29,6 @@ use OCP\AppFramework\Controller; use OCP\AppFramework\Http; use OCP\AppFramework\Http\Response; - function rrmdir($directory) { $files = array_diff(scandir($directory), array('.','..')); foreach ($files as $file) { diff --git a/tests/lib/AppFramework/Controller/ApiControllerTest.php b/tests/lib/AppFramework/Controller/ApiControllerTest.php index b7172ab6a9ff3bf54ab6a471412b64a8a77a0082..ccc44b977645a02a59bee68c0c76bfa2ee752deb 100644 --- a/tests/lib/AppFramework/Controller/ApiControllerTest.php +++ b/tests/lib/AppFramework/Controller/ApiControllerTest.php @@ -21,14 +21,12 @@ * */ - namespace Test\AppFramework\Controller; use OC\AppFramework\Http\Request; use OCP\AppFramework\ApiController; use OCP\IConfig; - class ChildApiController extends ApiController {}; diff --git a/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php b/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php index 169ec82ce6d9fd42a9eebe85883d9c4e8a5cdcc9..30da40d36b49d41934f6a48a6ad60464dce99dbe 100644 --- a/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php +++ b/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Test\AppFramework\Controller; use OC\AppFramework\Middleware\PublicShare\Exceptions\NeedAuthenticationException; diff --git a/tests/lib/AppFramework/Controller/ControllerTest.php b/tests/lib/AppFramework/Controller/ControllerTest.php index 09d89aa70fd872d9193dde745ea7e45a3cf19556..7831b44b632c32c336980b97e1483efe3655a204 100644 --- a/tests/lib/AppFramework/Controller/ControllerTest.php +++ b/tests/lib/AppFramework/Controller/ControllerTest.php @@ -21,17 +21,15 @@ * */ - namespace Test\AppFramework\Controller; use OC\AppFramework\Http\Request; use OCP\AppFramework\Controller; -use OCP\AppFramework\Http\TemplateResponse; -use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\DataResponse; +use OCP\AppFramework\Http\JSONResponse; +use OCP\AppFramework\Http\TemplateResponse; use OCP\IConfig; - class ChildController extends Controller { public function __construct($appName, $request) { diff --git a/tests/lib/AppFramework/Controller/OCSControllerTest.php b/tests/lib/AppFramework/Controller/OCSControllerTest.php index 0d379a8822c891f96a6f4eeebdf157de1057c6fc..f5eb838b584508c0fb2155ee1bc5885939ea4044 100644 --- a/tests/lib/AppFramework/Controller/OCSControllerTest.php +++ b/tests/lib/AppFramework/Controller/OCSControllerTest.php @@ -21,7 +21,6 @@ * */ - namespace Test\AppFramework\Controller; use OC\AppFramework\Http\Request; @@ -31,7 +30,6 @@ use OCP\AppFramework\OCSController; use OCP\IConfig; use OCP\Security\ISecureRandom; - class ChildOCSController extends OCSController {} diff --git a/tests/lib/AppFramework/Controller/PublicShareControllerTest.php b/tests/lib/AppFramework/Controller/PublicShareControllerTest.php index eff7563cc4f35dc75b9982588f75452966aa22ee..f20f996d5a3746416626c061bd1d5999feea39da 100644 --- a/tests/lib/AppFramework/Controller/PublicShareControllerTest.php +++ b/tests/lib/AppFramework/Controller/PublicShareControllerTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Test\AppFramework\Controller; use OC\AppFramework\Middleware\PublicShare\Exceptions\NeedAuthenticationException; @@ -35,7 +36,6 @@ use OCP\IRequest; use OCP\ISession; use OCP\IURLGenerator; - class PublicShareControllerTest extends \Test\TestCase { /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ diff --git a/tests/lib/AppFramework/Db/EntityTest.php b/tests/lib/AppFramework/Db/EntityTest.php index c9a90da7c5934af9b3149131a59d6ba054d1f4c9..fd075a9300dfeb7605663510a8a3a4feda049cb2 100644 --- a/tests/lib/AppFramework/Db/EntityTest.php +++ b/tests/lib/AppFramework/Db/EntityTest.php @@ -26,7 +26,6 @@ namespace Test\AppFramework\Db; use OCP\AppFramework\Db\Entity; - /** * @method integer getId() * @method void setId(integer $id) diff --git a/tests/lib/AppFramework/Db/MapperTest.php b/tests/lib/AppFramework/Db/MapperTest.php index 990391a1de1fd0b6975f2776c2ff58241c045db3..8ca80fe11ca6f94c3fcd55e701b38096f89575aa 100644 --- a/tests/lib/AppFramework/Db/MapperTest.php +++ b/tests/lib/AppFramework/Db/MapperTest.php @@ -21,14 +21,13 @@ * */ - namespace Test\AppFramework\Db; use OCP\AppFramework\Db\DoesNotExistException; +use OCP\AppFramework\Db\Entity; +use OCP\AppFramework\Db\Mapper; use OCP\AppFramework\Db\MultipleObjectsReturnedException; -use \OCP\IDBConnection; -use \OCP\AppFramework\Db\Entity; -use \OCP\AppFramework\Db\Mapper; +use OCP\IDBConnection; /** * @method integer getId() diff --git a/tests/lib/AppFramework/Db/MapperTestUtility.php b/tests/lib/AppFramework/Db/MapperTestUtility.php index bbc9b56701e79017b9fa6643f0fca4394e8670c7..71c21a0663220c4a080c5b8797fe322ea89b507d 100644 --- a/tests/lib/AppFramework/Db/MapperTestUtility.php +++ b/tests/lib/AppFramework/Db/MapperTestUtility.php @@ -21,7 +21,6 @@ * */ - namespace Test\AppFramework\Db; @@ -206,4 +205,3 @@ class ArgumentIterator { } } } - diff --git a/tests/lib/AppFramework/Db/QBMapperTest.php b/tests/lib/AppFramework/Db/QBMapperTest.php index 673d8132836bda7167eda38753e5618b509571ab..279c95afaeb89d1592797b381bc48fd540c5c1ab 100644 --- a/tests/lib/AppFramework/Db/QBMapperTest.php +++ b/tests/lib/AppFramework/Db/QBMapperTest.php @@ -238,4 +238,4 @@ class QBMapperTest extends \Test\TestCase { $unknownType = $this->mapper->getParameterTypeForPropertyForTest($entity, 'someProp'); $this->assertEquals(IQueryBuilder::PARAM_STR, $unknownType, 'Unknown type property mapping incorrect'); } -} \ No newline at end of file +} diff --git a/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php b/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php index 29004b36b18e190e60d44a4fa204ad32715d2f0f..03c8265f2c97ac22bc294d4a4bbb9a2efd04116d 100644 --- a/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php +++ b/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php @@ -23,12 +23,11 @@ * */ - namespace Test\AppFramework\DependencyInjection; use OC\AppFramework\DependencyInjection\DIContainer; -use \OC\AppFramework\Http\Request; +use OC\AppFramework\Http\Request; use OC\AppFramework\Middleware\Security\SecurityMiddleware; use OCP\AppFramework\QueryException; use OCP\IConfig; diff --git a/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php b/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php index e77f2021d9ea640b5a4d94aa8d494538b9d46226..d3d3f73e872d4bcbe9b7503d742a6340a3eb3163 100644 --- a/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php +++ b/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Test\AppFramework\DependencyInjection; use OC\AppFramework\DependencyInjection\DIContainer; diff --git a/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php b/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php index fab488ef9906f6f0f2ae584278d61d96bbf1d7d1..b6163e90386ccef694054677f75916bc26879e84 100644 --- a/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php +++ b/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php @@ -6,7 +6,6 @@ * See the COPYING-README file. */ - namespace Test\AppFramework\Http; use OCP\AppFramework\Http; diff --git a/tests/lib/AppFramework/Http/DataResponseTest.php b/tests/lib/AppFramework/Http/DataResponseTest.php index 9cb99b06b6579ddecf1bec4cd301ecefe2a43a91..6f81e0d56b46713ac7ccff716e3cb74709754f58 100644 --- a/tests/lib/AppFramework/Http/DataResponseTest.php +++ b/tests/lib/AppFramework/Http/DataResponseTest.php @@ -21,13 +21,11 @@ * */ - namespace Test\AppFramework\Http; -use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http; - +use OCP\AppFramework\Http\DataResponse; class DataResponseTest extends \Test\TestCase { diff --git a/tests/lib/AppFramework/Http/DispatcherTest.php b/tests/lib/AppFramework/Http/DispatcherTest.php index 221e27e3b6871035953c881dd16ae8ef13a4602a..404c94abdbddc72de4a236e4d9b2b7a2da94213d 100644 --- a/tests/lib/AppFramework/Http/DispatcherTest.php +++ b/tests/lib/AppFramework/Http/DispatcherTest.php @@ -21,21 +21,19 @@ * */ - namespace Test\AppFramework\Http; use OC\AppFramework\Http\Dispatcher; use OC\AppFramework\Http\Request; use OC\AppFramework\Middleware\MiddlewareDispatcher; use OC\AppFramework\Utility\ControllerMethodReflector; +use OCP\AppFramework\Controller; use OCP\AppFramework\Http; -use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\DataResponse; +use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\Response; -use OCP\AppFramework\Controller; use OCP\IConfig; - class TestController extends Controller { /** * @param string $appName diff --git a/tests/lib/AppFramework/Http/DownloadResponseTest.php b/tests/lib/AppFramework/Http/DownloadResponseTest.php index 07c932b2725c8236c7cd2916f32eae2da3ae7f94..97c7ab75ed9c21a3ceadcf66ec1a2635318dd66c 100644 --- a/tests/lib/AppFramework/Http/DownloadResponseTest.php +++ b/tests/lib/AppFramework/Http/DownloadResponseTest.php @@ -21,7 +21,6 @@ * */ - namespace Test\AppFramework\Http; diff --git a/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php b/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php index 7e86903892f972f333325d147b58e8d9edfbb1f5..d9bdfccf60bdc30dd8b3bff142f4dfb6006241ce 100644 --- a/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php +++ b/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php @@ -6,7 +6,6 @@ * See the COPYING-README file. */ - namespace Test\AppFramework\Http; use OCP\AppFramework\Http; diff --git a/tests/lib/AppFramework/Http/FileDisplayResponseTest.php b/tests/lib/AppFramework/Http/FileDisplayResponseTest.php index 49334c17e7481592c14da6c20cb6a2b7244e66c9..2c91289a5c99924ad8a8aefa75d79a677ff0d289 100644 --- a/tests/lib/AppFramework/Http/FileDisplayResponseTest.php +++ b/tests/lib/AppFramework/Http/FileDisplayResponseTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Test\AppFramework\Http; use OCP\AppFramework\Http; diff --git a/tests/lib/AppFramework/Http/HttpTest.php b/tests/lib/AppFramework/Http/HttpTest.php index 66256d1a86f78a35427f4542c662f707051e9c29..0a13e1e11e5e123367310a8b253c8f69bf682ce2 100644 --- a/tests/lib/AppFramework/Http/HttpTest.php +++ b/tests/lib/AppFramework/Http/HttpTest.php @@ -21,12 +21,10 @@ * */ - namespace Test\AppFramework\Http; use OC\AppFramework\Http; - class HttpTest extends \Test\TestCase { private $server; diff --git a/tests/lib/AppFramework/Http/JSONResponseTest.php b/tests/lib/AppFramework/Http/JSONResponseTest.php index 3c3a273a97ec97d5d4a022bd4b111ef6d2556679..a74bd67d1f07695749c59e3320b323fa60b9529b 100644 --- a/tests/lib/AppFramework/Http/JSONResponseTest.php +++ b/tests/lib/AppFramework/Http/JSONResponseTest.php @@ -23,12 +23,11 @@ * */ - namespace Test\AppFramework\Http; -use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http; +use OCP\AppFramework\Http\JSONResponse; class JSONResponseTest extends \Test\TestCase { diff --git a/tests/lib/AppFramework/Http/OCSResponseTest.php b/tests/lib/AppFramework/Http/OCSResponseTest.php index adac66a231c61d59f3db34f84f4b3ad4c383a871..e092cb53f58c50b6452d132277b0f7d7e17855bd 100644 --- a/tests/lib/AppFramework/Http/OCSResponseTest.php +++ b/tests/lib/AppFramework/Http/OCSResponseTest.php @@ -21,13 +21,11 @@ * */ - namespace Test\AppFramework\Http; use OCP\AppFramework\Http\OCSResponse; - class OCSResponseTest extends \Test\TestCase { diff --git a/tests/lib/AppFramework/Http/PublicTemplateResponseTest.php b/tests/lib/AppFramework/Http/PublicTemplateResponseTest.php index 8aaaec0733c0c9ee9683916c49cb7d2f162c835f..90fb8cceca14b8ca8e5de2b6986db40370f0ccb0 100644 --- a/tests/lib/AppFramework/Http/PublicTemplateResponseTest.php +++ b/tests/lib/AppFramework/Http/PublicTemplateResponseTest.php @@ -22,11 +22,10 @@ * */ - namespace Test\AppFramework\Http; -use OCP\AppFramework\Http\Template\PublicTemplateResponse; use OCP\AppFramework\Http; +use OCP\AppFramework\Http\Template\PublicTemplateResponse; use Test\TestCase; class PublicTemplateResponseTest extends TestCase { diff --git a/tests/lib/AppFramework/Http/RedirectResponseTest.php b/tests/lib/AppFramework/Http/RedirectResponseTest.php index 5ef82a1221dce95c344d0451a54dd1294861fbd3..218f748a88b361d369edd4c858afc8a962821921 100644 --- a/tests/lib/AppFramework/Http/RedirectResponseTest.php +++ b/tests/lib/AppFramework/Http/RedirectResponseTest.php @@ -21,13 +21,11 @@ * */ - namespace Test\AppFramework\Http; use OCP\AppFramework\Http; use OCP\AppFramework\Http\RedirectResponse; - class RedirectResponseTest extends \Test\TestCase { /** diff --git a/tests/lib/AppFramework/Http/RequestTest.php b/tests/lib/AppFramework/Http/RequestTest.php index b01176f0cf181aef17a4a6788c3721c4bbf510c0..2ad660405f3c12f657386d31aef4893176f08241 100644 --- a/tests/lib/AppFramework/Http/RequestTest.php +++ b/tests/lib/AppFramework/Http/RequestTest.php @@ -13,8 +13,8 @@ namespace Test\AppFramework\Http; use OC\AppFramework\Http\Request; use OC\Security\CSRF\CsrfToken; use OC\Security\CSRF\CsrfTokenManager; -use OCP\Security\ISecureRandom; use OCP\IConfig; +use OCP\Security\ISecureRandom; /** * Class RequestTest diff --git a/tests/lib/AppFramework/Http/ResponseTest.php b/tests/lib/AppFramework/Http/ResponseTest.php index 9d6442ea3ce2559cf5d23b444a037267361021d3..64b9566f8e6fc0fb6220d9aadd9c463c8f6651a7 100644 --- a/tests/lib/AppFramework/Http/ResponseTest.php +++ b/tests/lib/AppFramework/Http/ResponseTest.php @@ -21,15 +21,13 @@ * */ - namespace Test\AppFramework\Http; -use OCP\AppFramework\Http\Response; use OCP\AppFramework\Http; +use OCP\AppFramework\Http\Response; use OCP\AppFramework\Utility\ITimeFactory; - class ResponseTest extends \Test\TestCase { /** diff --git a/tests/lib/AppFramework/Http/StreamResponseTest.php b/tests/lib/AppFramework/Http/StreamResponseTest.php index c082b36e0ace5c17c89b7d07e5d1609e5a0a5892..ef9a37aa81b8eaa85623da572a5e7be6724909a1 100644 --- a/tests/lib/AppFramework/Http/StreamResponseTest.php +++ b/tests/lib/AppFramework/Http/StreamResponseTest.php @@ -21,14 +21,12 @@ * */ - namespace Test\AppFramework\Http; -use OCP\AppFramework\Http\StreamResponse; -use OCP\AppFramework\Http\IOutput; use OCP\AppFramework\Http; - +use OCP\AppFramework\Http\IOutput; +use OCP\AppFramework\Http\StreamResponse; class StreamResponseTest extends \Test\TestCase { diff --git a/tests/lib/AppFramework/Http/TemplateResponseTest.php b/tests/lib/AppFramework/Http/TemplateResponseTest.php index c06497ef5d5ada2d0f67a24e22cabc7326e3a328..b558622225754847739a7d629c4ab62d91141211 100644 --- a/tests/lib/AppFramework/Http/TemplateResponseTest.php +++ b/tests/lib/AppFramework/Http/TemplateResponseTest.php @@ -21,12 +21,10 @@ * */ - namespace Test\AppFramework\Http; -use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Http; - +use OCP\AppFramework\Http\TemplateResponse; class TemplateResponseTest extends \Test\TestCase { diff --git a/tests/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php b/tests/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php index e6c2c1b4f53150292a90e549d5cf34328090af8b..e38aa4525e3828410168f660f4bd5e4310d581fa 100644 --- a/tests/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php +++ b/tests/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php @@ -21,17 +21,15 @@ * */ - namespace Test\AppFramework\Middleware; use OC\AppFramework\Http\Request; use OC\AppFramework\Middleware\MiddlewareDispatcher; use OCP\AppFramework\Controller; -use OCP\AppFramework\Middleware; use OCP\AppFramework\Http\Response; +use OCP\AppFramework\Middleware; use OCP\IConfig; - // needed to test ordering class TestMiddleware extends Middleware { public static $beforeControllerCalled = 0; diff --git a/tests/lib/AppFramework/Middleware/MiddlewareTest.php b/tests/lib/AppFramework/Middleware/MiddlewareTest.php index 038bec25148cdc9ebeeac6349997bc25287cf230..8f9c60b65ff36aaa4820d9faa80ca6d0dd2906ea 100644 --- a/tests/lib/AppFramework/Middleware/MiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/MiddlewareTest.php @@ -21,12 +21,11 @@ * */ - namespace Test\AppFramework\Middleware; use OC\AppFramework\Http\Request; -use OCP\AppFramework\Middleware; use OCP\AppFramework\Http\Response; +use OCP\AppFramework\Middleware; use OCP\IConfig; class ChildMiddleware extends Middleware {}; diff --git a/tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php b/tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php index 5b88872d9055dc61fe3cf7ab89721c62a77ac44b..cca3b4aecca2e4f83af72eb28d0b07a8b3dd1a08 100644 --- a/tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php @@ -19,8 +19,10 @@ * along with this program. If not, see . * */ + namespace Test\AppFramework\Middleware; +use OC\AppFramework\Middleware\OCSMiddleware; use OC\AppFramework\OCS\BaseResponse; use OC\AppFramework\OCS\V1Response; use OC\AppFramework\OCS\V2Response; @@ -32,8 +34,6 @@ use OCP\AppFramework\OCS\OCSForbiddenException; use OCP\AppFramework\OCS\OCSNotFoundException; use OCP\AppFramework\OCSController; use OCP\IRequest; -use OC\AppFramework\Middleware\OCSMiddleware; - class OCSMiddlewareTest extends \Test\TestCase { diff --git a/tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php b/tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php index de610100c2adcb2a7e7f90cb8d30afc7d2e3f55d..4ad90b6e874fbb9820aefa09dd9cb3c413d44fb2 100644 --- a/tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Test\AppFramework\Middleware\PublicShare; use OC\AppFramework\Middleware\PublicShare\Exceptions\NeedAuthenticationException; @@ -35,7 +36,6 @@ use OCP\IRequest; use OCP\ISession; use OCP\IURLGenerator; - class PublicShareMiddlewareTest extends \Test\TestCase { /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ diff --git a/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php index 498eaed8949750d4cbe3ca345e07faedaa891594..0fab880307326cc36551f3f186416b4ce02a2a97 100644 --- a/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php @@ -9,13 +9,12 @@ * @copyright Bernhard Posselt 2014 */ - namespace Test\AppFramework\Middleware\Security; use OC\AppFramework\Http\Request; use OC\AppFramework\Middleware\Security\CORSMiddleware; -use OC\AppFramework\Utility\ControllerMethodReflector; use OC\AppFramework\Middleware\Security\Exceptions\SecurityException; +use OC\AppFramework\Utility\ControllerMethodReflector; use OC\Security\Bruteforce\Throttler; use OC\User\Session; use OCP\AppFramework\Controller; diff --git a/tests/lib/AppFramework/Middleware/Security/PasswordConfirmationMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/PasswordConfirmationMiddlewareTest.php index 95729e286f9fa6374caca8a8c23af8a9eb2fadbd..c981e840d701592c4b17929f98767f395d6db7f5 100644 --- a/tests/lib/AppFramework/Middleware/Security/PasswordConfirmationMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/PasswordConfirmationMiddlewareTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Test\AppFramework\Middleware\Security; use OC\AppFramework\Middleware\Security\Exceptions\NotConfirmedException; diff --git a/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php index 7784f55e84aaec8a1a7f2306e97a9b32d06bb317..c92c131780ef4558722d9d6221b6bb312ca1e4a9 100644 --- a/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Test\AppFramework\Middleware\Security; use OC\AppFramework\Http\Request; diff --git a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php index 6a1adf03b2f10f4050f25843634faec2c8b71214..00bb1a0bb3c74a0dae9512ea4437f04f8d0623f3 100644 --- a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php @@ -40,8 +40,8 @@ use OC\Security\CSRF\CsrfTokenManager; use OCP\App\IAppManager; use OCP\AppFramework\Controller; use OCP\AppFramework\Http\EmptyContentSecurityPolicy; -use OCP\AppFramework\Http\RedirectResponse; use OCP\AppFramework\Http\JSONResponse; +use OCP\AppFramework\Http\RedirectResponse; use OCP\AppFramework\Http\Response; use OCP\AppFramework\Http\TemplateResponse; use OCP\IConfig; diff --git a/tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php b/tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php index 813b0d54dc6e50781192b21d5160b57f82b3d0e9..2cd61c73c71a724cfa1670960433c82fc207be7f 100644 --- a/tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php @@ -9,7 +9,6 @@ * @copyright Thomas Müller 2014 */ - namespace Test\AppFramework\Middleware; use OC\AppFramework\Http\Request; @@ -19,7 +18,6 @@ use OCP\AppFramework\Controller; use OCP\AppFramework\Http\Response; use OCP\IConfig; - class SessionMiddlewareTest extends \Test\TestCase { /** @var ControllerMethodReflector */ diff --git a/tests/lib/AppFramework/Routing/RoutingTest.php b/tests/lib/AppFramework/Routing/RoutingTest.php index fccece481ce6e0a0473defde7b01252b836c005b..559561a8ccdee334c070e9b1d9b93f6f5febfc7d 100644 --- a/tests/lib/AppFramework/Routing/RoutingTest.php +++ b/tests/lib/AppFramework/Routing/RoutingTest.php @@ -5,10 +5,10 @@ namespace Test\AppFramework\Routing; use OC\AppFramework\DependencyInjection\DIContainer; use OC\AppFramework\Routing\RouteActionHandler; use OC\AppFramework\Routing\RouteConfig; +use OC\Route\Router; use OCP\ILogger; use OCP\Route\IRouter; use PHPUnit\Framework\MockObject\MockObject; -use OC\Route\Router; class RoutingTest extends \Test\TestCase { diff --git a/tests/lib/AppFramework/Utility/ControllerMethodReflectorTest.php b/tests/lib/AppFramework/Utility/ControllerMethodReflectorTest.php index 3c43e7f92193e552c6d99573078ea8bdfd9e300e..fe1fc5bfa1a58899c78c618504cabd43111aefc2 100644 --- a/tests/lib/AppFramework/Utility/ControllerMethodReflectorTest.php +++ b/tests/lib/AppFramework/Utility/ControllerMethodReflectorTest.php @@ -21,7 +21,6 @@ * */ - namespace Test\AppFramework\Utility; diff --git a/tests/lib/AppFramework/Utility/SimpleContainerTest.php b/tests/lib/AppFramework/Utility/SimpleContainerTest.php index e21e0ca13f236cd3647ee587df30c547b229f36e..b2f6c6ad8d0673460b098cdd3bd5734b030416f1 100644 --- a/tests/lib/AppFramework/Utility/SimpleContainerTest.php +++ b/tests/lib/AppFramework/Utility/SimpleContainerTest.php @@ -20,11 +20,11 @@ * License along with this library. If not, see . * */ + namespace Test\AppFramework\Utility; use OC\AppFramework\Utility\SimpleContainer; - interface TestInterface {} class ClassEmptyConstructor implements IInterfaceConstructor {} diff --git a/tests/lib/AppTest.php b/tests/lib/AppTest.php index 0848f3072302b26e4889c4bb24da5dd6a3328cb7..a1f340075b85603bd8292f62c1ddf8d814a08480 100644 --- a/tests/lib/AppTest.php +++ b/tests/lib/AppTest.php @@ -618,4 +618,3 @@ class AppTest extends \Test\TestCase { $this->assertEquals('English', \OC_App::parseAppInfo($data, 'en')['description']); } } - diff --git a/tests/lib/Authentication/Login/CompleteLoginCommandTest.php b/tests/lib/Authentication/Login/CompleteLoginCommandTest.php index 8912dcab09c324079104a81f71be1345907df689..bf312e7f4e3d3f80d368cc5a004f28b68bf04260 100644 --- a/tests/lib/Authentication/Login/CompleteLoginCommandTest.php +++ b/tests/lib/Authentication/Login/CompleteLoginCommandTest.php @@ -64,4 +64,4 @@ class CompleteLoginCommandTest extends ALoginCommandTest { } -} \ No newline at end of file +} diff --git a/tests/lib/Authentication/Token/ManagerTest.php b/tests/lib/Authentication/Token/ManagerTest.php index 1b7f3a637ced258203d522deb13d43988ec9a3bf..48876cade6bc545df406b00b7b10b0b8c491a813 100644 --- a/tests/lib/Authentication/Token/ManagerTest.php +++ b/tests/lib/Authentication/Token/ManagerTest.php @@ -27,12 +27,12 @@ use OC\Authentication\Exceptions\InvalidTokenException; use OC\Authentication\Exceptions\PasswordlessTokenException; use OC\Authentication\Token\DefaultToken; use OC\Authentication\Token\DefaultTokenProvider; +use OC\Authentication\Token\ExpiredTokenException; +use OC\Authentication\Token\IToken; use OC\Authentication\Token\Manager; use OC\Authentication\Token\PublicKeyToken; use OC\Authentication\Token\PublicKeyTokenMapper; use OC\Authentication\Token\PublicKeyTokenProvider; -use OC\Authentication\Token\ExpiredTokenException; -use OC\Authentication\Token\IToken; use OCP\AppFramework\Db\DoesNotExistException; use OCP\AppFramework\Utility\ITimeFactory; use OCP\IConfig; diff --git a/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php b/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php index 22e1891b51febe969e9ca3a80caf3679a148256f..b8c399b81f89c8794066c594ab21fa0ea62b9999 100644 --- a/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php +++ b/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php @@ -25,9 +25,9 @@ declare(strict_types=1); namespace Test\Authentication\Token; use OC; +use OC\Authentication\Token\IToken; use OC\Authentication\Token\PublicKeyToken; use OC\Authentication\Token\PublicKeyTokenMapper; -use OC\Authentication\Token\IToken; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; use OCP\IUser; diff --git a/tests/lib/Authentication/Token/PublicKeyTokenProviderTest.php b/tests/lib/Authentication/Token/PublicKeyTokenProviderTest.php index ce64878bf5e6a15ad64100ddd4f24a8f9cf2b579..1b468839cb76bf5fa76f72644955595db7ff0148 100644 --- a/tests/lib/Authentication/Token/PublicKeyTokenProviderTest.php +++ b/tests/lib/Authentication/Token/PublicKeyTokenProviderTest.php @@ -26,10 +26,10 @@ namespace Test\Authentication\Token; use OC\Authentication\Exceptions\ExpiredTokenException; use OC\Authentication\Exceptions\InvalidTokenException; use OC\Authentication\Token\DefaultToken; +use OC\Authentication\Token\IToken; use OC\Authentication\Token\PublicKeyToken; use OC\Authentication\Token\PublicKeyTokenMapper; use OC\Authentication\Token\PublicKeyTokenProvider; -use OC\Authentication\Token\IToken; use OCP\AppFramework\Db\DoesNotExistException; use OCP\AppFramework\Utility\ITimeFactory; use OCP\IConfig; diff --git a/tests/lib/Authentication/Token/RemoteWipeTest.php b/tests/lib/Authentication/Token/RemoteWipeTest.php index 7193bee53898fc013a0700124387f52ad62cdbac..5773bb596a5237e74f50a02135a5f3ff0a9eabc6 100644 --- a/tests/lib/Authentication/Token/RemoteWipeTest.php +++ b/tests/lib/Authentication/Token/RemoteWipeTest.php @@ -26,8 +26,8 @@ namespace Test\Authentication\Token; use OC\Authentication\Events\RemoteWipeFinished; use OC\Authentication\Events\RemoteWipeStarted; use OC\Authentication\Exceptions\WipeTokenException; -use OC\Authentication\Token\IProvider as ITokenProvider; use OC\Authentication\Token\IProvider; +use OC\Authentication\Token\IProvider as ITokenProvider; use OC\Authentication\Token\IToken; use OC\Authentication\Token\IWipeableToken; use OC\Authentication\Token\RemoteWipe; diff --git a/tests/lib/Avatar/AvatarManagerTest.php b/tests/lib/Avatar/AvatarManagerTest.php index 7466f664eb5435df0c17fb9f61cb9f58080a3e72..ae3ee89cec2532ecad0ee37855b7458faf80d1b2 100644 --- a/tests/lib/Avatar/AvatarManagerTest.php +++ b/tests/lib/Avatar/AvatarManagerTest.php @@ -24,8 +24,8 @@ namespace Test\Avatar; -use OC\Avatar\UserAvatar; use OC\Avatar\AvatarManager; +use OC\Avatar\UserAvatar; use OC\User\Manager; use OCP\Files\IAppData; use OCP\Files\SimpleFS\ISimpleFolder; diff --git a/tests/lib/Calendar/ManagerTest.php b/tests/lib/Calendar/ManagerTest.php index 657a50a3d880b04c6ed817a3ee4ba8ec1c1d34e2..dca9368558fd2f0ebe6a4c8d4ab5516b21ebddc9 100644 --- a/tests/lib/Calendar/ManagerTest.php +++ b/tests/lib/Calendar/ManagerTest.php @@ -23,9 +23,9 @@ namespace Test\Calendar; -use \OC\Calendar\Manager; +use OC\Calendar\Manager; use OCP\Calendar\ICalendar; -use \Test\TestCase; +use Test\TestCase; class ManagerTest extends TestCase { diff --git a/tests/lib/Calendar/Resource/ManagerTest.php b/tests/lib/Calendar/Resource/ManagerTest.php index 1d9229856db16f7578ddb6d7bf2746d3f3936add..3e065c699084594c104e6e6d4081e22b557ea5de 100644 --- a/tests/lib/Calendar/Resource/ManagerTest.php +++ b/tests/lib/Calendar/Resource/ManagerTest.php @@ -23,10 +23,10 @@ namespace Test\Calendar\Resource; -use \OC\Calendar\Resource\Manager; -use \OCP\Calendar\Resource\IBackend; +use OC\Calendar\Resource\Manager; +use OCP\Calendar\Resource\IBackend; use OCP\IServerContainer; -use \Test\TestCase; +use Test\TestCase; class ManagerTest extends TestCase { diff --git a/tests/lib/Calendar/Room/ManagerTest.php b/tests/lib/Calendar/Room/ManagerTest.php index 52347f439faf24d65aa964995e2f09f2f9ab0d34..9a85132aa3a05ff988ff322f5d7e5d914b6bdbbf 100644 --- a/tests/lib/Calendar/Room/ManagerTest.php +++ b/tests/lib/Calendar/Room/ManagerTest.php @@ -23,10 +23,10 @@ namespace Test\Calendar\Room; -use \OC\Calendar\Room\Manager; -use \OCP\Calendar\Room\IBackend; +use OC\Calendar\Room\Manager; +use OCP\Calendar\Room\IBackend; use OCP\IServerContainer; -use \Test\TestCase; +use Test\TestCase; class ManagerTest extends TestCase { diff --git a/tests/lib/Command/BackgroundJobsTest.php b/tests/lib/Command/BackgroundJobsTest.php index 6292d5d0e97405560e1b5acdf7a961c4d9aecbf5..fc506be644aa44533b60668a23ab4aaa6ac5080f 100644 --- a/tests/lib/Command/BackgroundJobsTest.php +++ b/tests/lib/Command/BackgroundJobsTest.php @@ -25,13 +25,13 @@ namespace Test\Command; -use Test\TestCase; -use Symfony\Component\Console\Input\StringInput; -use Symfony\Component\Console\Output\NullOutput; - +use OC\Core\Command\Background\Ajax; use OC\Core\Command\Background\Cron; use OC\Core\Command\Background\WebCron; -use OC\Core\Command\Background\Ajax; + +use Symfony\Component\Console\Input\StringInput; +use Symfony\Component\Console\Output\NullOutput; +use Test\TestCase; class BackgroundJobsTest extends TestCase { diff --git a/tests/lib/Command/Integrity/SignAppTest.php b/tests/lib/Command/Integrity/SignAppTest.php index 013290b56e98060279b2299b3cdfba0ca5212524..2615c6afc1e495466680272913426b4836c04b62 100644 --- a/tests/lib/Command/Integrity/SignAppTest.php +++ b/tests/lib/Command/Integrity/SignAppTest.php @@ -18,6 +18,7 @@ * along with this program. If not, see * */ + namespace Test\Command\Integrity; use OC\Core\Command\Integrity\SignApp; diff --git a/tests/lib/Command/Integrity/SignCoreTest.php b/tests/lib/Command/Integrity/SignCoreTest.php index 35e52b951daa3b4ac51b2e53710f44e1e25df070..e601b4a1a90ea00f48dc3f26f10cf8885e7b5846 100644 --- a/tests/lib/Command/Integrity/SignCoreTest.php +++ b/tests/lib/Command/Integrity/SignCoreTest.php @@ -18,6 +18,7 @@ * along with this program. If not, see * */ + namespace Test\Command\Integrity; use OC\Core\Command\Integrity\SignCore; diff --git a/tests/lib/DB/MigrationsTest.php b/tests/lib/DB/MigrationsTest.php index 8654c83a545a82f05563f865fa688c565e08b52a..87547debe80a83501b15256dfc97b9bfe72cf758 100644 --- a/tests/lib/DB/MigrationsTest.php +++ b/tests/lib/DB/MigrationsTest.php @@ -7,7 +7,6 @@ * See the COPYING-README file. */ - namespace Test\DB; use Doctrine\DBAL\Platforms\OraclePlatform; diff --git a/tests/lib/DB/MigratorTest.php b/tests/lib/DB/MigratorTest.php index 9dfed5ecd1ac07403961bfb762e67a5146bf1e22..e9c52015dbebb5d7acf0464b649f5dd41034e5f9 100644 --- a/tests/lib/DB/MigratorTest.php +++ b/tests/lib/DB/MigratorTest.php @@ -9,10 +9,10 @@ namespace Test\DB; -use \Doctrine\DBAL\DBALException; +use Doctrine\DBAL\DBALException; use Doctrine\DBAL\Platforms\OraclePlatform; -use \Doctrine\DBAL\Schema\Schema; -use \Doctrine\DBAL\Schema\SchemaConfig; +use Doctrine\DBAL\Schema\Schema; +use Doctrine\DBAL\Schema\SchemaConfig; use OCP\IConfig; /** diff --git a/tests/lib/Encryption/DecryptAllTest.php b/tests/lib/Encryption/DecryptAllTest.php index 4e4b2438a25cd40967df584c2d9901a40eab8826..158e52f4a07090f1232fa7bb21458cf8734bb01e 100644 --- a/tests/lib/Encryption/DecryptAllTest.php +++ b/tests/lib/Encryption/DecryptAllTest.php @@ -19,7 +19,6 @@ * */ - namespace Test\Encryption; diff --git a/tests/lib/Encryption/EncryptionWrapperTest.php b/tests/lib/Encryption/EncryptionWrapperTest.php index cff48d2cd6d8b1beceb799680ced885386ec1003..6a51d7697514d48036616b7d72fb59d8d80d7783 100644 --- a/tests/lib/Encryption/EncryptionWrapperTest.php +++ b/tests/lib/Encryption/EncryptionWrapperTest.php @@ -19,7 +19,6 @@ * */ - namespace Test\Encryption; diff --git a/tests/lib/Encryption/UpdateTest.php b/tests/lib/Encryption/UpdateTest.php index a8cbef70d756b9171fb599f385960ce93ea06b7e..68639ad6e2427fee8ba6041f238b0ddbbdeed95a 100644 --- a/tests/lib/Encryption/UpdateTest.php +++ b/tests/lib/Encryption/UpdateTest.php @@ -19,7 +19,6 @@ * */ - namespace Test\Encryption; diff --git a/tests/lib/FileChunkingTest.php b/tests/lib/FileChunkingTest.php index 42fc820c5d06fd376d714935c2bf045fae9c941d..75a6913d4ad8d2ac8cb5417d7e435a7029b85f09 100644 --- a/tests/lib/FileChunkingTest.php +++ b/tests/lib/FileChunkingTest.php @@ -18,6 +18,7 @@ * along with this program. If not, see * */ + namespace Test; use OCP\ICache; diff --git a/tests/lib/Files/AppData/AppDataTest.php b/tests/lib/Files/AppData/AppDataTest.php index 1d5cea0faf1878626da9dd5b0288931b0c338614..a9353540fffccf0096baed17799206afd869feaf 100644 --- a/tests/lib/Files/AppData/AppDataTest.php +++ b/tests/lib/Files/AppData/AppDataTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Test\Files\AppData; use OC\Files\AppData\AppData; diff --git a/tests/lib/Files/AppData/FactoryTest.php b/tests/lib/Files/AppData/FactoryTest.php index 75999c8c7da92d69592e16047948f63d895efe09..9b7529b18d9a96975426ff3a7c04306e3b4d3917 100644 --- a/tests/lib/Files/AppData/FactoryTest.php +++ b/tests/lib/Files/AppData/FactoryTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Test\Files\AppData; use OC\Files\AppData\Factory; diff --git a/tests/lib/Files/Cache/UpdaterLegacyTest.php b/tests/lib/Files/Cache/UpdaterLegacyTest.php index 66fa8d51932ee388d22e3bda054e579779e80c29..a0cc1c5d89c7d747a382d90d3d02f6a63b1e30a6 100644 --- a/tests/lib/Files/Cache/UpdaterLegacyTest.php +++ b/tests/lib/Files/Cache/UpdaterLegacyTest.php @@ -8,7 +8,7 @@ namespace Test\Files\Cache; -use \OC\Files\Filesystem as Filesystem; +use OC\Files\Filesystem as Filesystem; use OC\Files\Storage\Temporary; use OC\Files\View; diff --git a/tests/lib/Files/Config/UserMountCacheTest.php b/tests/lib/Files/Config/UserMountCacheTest.php index 299ec1a437803212c4d8c794943204f05927eb86..4bfc8710951a462b662c763ae3197a92a8ed1d3e 100644 --- a/tests/lib/Files/Config/UserMountCacheTest.php +++ b/tests/lib/Files/Config/UserMountCacheTest.php @@ -10,10 +10,10 @@ namespace Test\Files\Config; use OC\DB\QueryBuilder\Literal; use OC\Files\Mount\MountPoint; +use OC\Files\Storage\Storage; use OC\Log; use OC\User\Manager; use OCP\Files\Config\ICachedMountInfo; -use OC\Files\Storage\Storage; use OCP\IConfig; use OCP\IDBConnection; use OCP\IUserManager; diff --git a/tests/lib/Files/Mount/ManagerTest.php b/tests/lib/Files/Mount/ManagerTest.php index 46ae597f56b34aefcaa42960e9e49670c06c1140..7633ffb2f2db3d315a8257540649532437932cd8 100644 --- a/tests/lib/Files/Mount/ManagerTest.php +++ b/tests/lib/Files/Mount/ManagerTest.php @@ -8,7 +8,7 @@ namespace Test\Files\Mount; -use \OC\Files\Storage\Temporary; +use OC\Files\Storage\Temporary; class LongId extends Temporary { public function getId() { diff --git a/tests/lib/Files/Node/NodeTest.php b/tests/lib/Files/Node/NodeTest.php index dee5a0211c5640b5b72e961a6fdf33e1d8d51845..566c84e2c8586ae19b0bbb7e1de1c0cc7177c072 100644 --- a/tests/lib/Files/Node/NodeTest.php +++ b/tests/lib/Files/Node/NodeTest.php @@ -14,13 +14,13 @@ use OC\Files\View; use OCP\Files\Config\IUserMountCache; use OCP\Files\IRootFolder; use OCP\Files\Node; +use OCP\Files\NotFoundException; use OCP\Files\Storage; use OCP\IConfig; use OCP\ILogger; use OCP\IURLGenerator; use OCP\IUser; use OCP\IUserManager; -use OCP\Files\NotFoundException; /** * Class NodeTest diff --git a/tests/lib/Files/ObjectStore/FailDeleteObjectStore.php b/tests/lib/Files/ObjectStore/FailDeleteObjectStore.php index 4ad3798a467d4228e0d974fecc671ce8c3242460..aa3b2519ec175ccd920b3732ac3a3ba91296b269 100644 --- a/tests/lib/Files/ObjectStore/FailDeleteObjectStore.php +++ b/tests/lib/Files/ObjectStore/FailDeleteObjectStore.php @@ -51,4 +51,3 @@ class FailDeleteObjectStore implements IObjectStore { return $this->objectStore->objectExists($urn); } } - diff --git a/tests/lib/Files/ObjectStore/MapperTest.php b/tests/lib/Files/ObjectStore/MapperTest.php index 19451622fa312a6710fcdd57b4cb8706a5588b47..eef308af088f4bb2929ee47cab7f71a9c607cb33 100644 --- a/tests/lib/Files/ObjectStore/MapperTest.php +++ b/tests/lib/Files/ObjectStore/MapperTest.php @@ -18,6 +18,7 @@ * along with this program. If not, see * */ + namespace Test\Files\ObjectStore; diff --git a/tests/lib/Files/ObjectStore/NoopScannerTest.php b/tests/lib/Files/ObjectStore/NoopScannerTest.php index 6d593225e9711eb3f6b705fca07d6437fd6db831..1832ed8d61a3bf597a608b389876a30a324efae8 100644 --- a/tests/lib/Files/ObjectStore/NoopScannerTest.php +++ b/tests/lib/Files/ObjectStore/NoopScannerTest.php @@ -9,6 +9,7 @@ * later. * See the COPYING-README file. */ + namespace Test\Files\ObjectStore; class NoopScannerTest extends \Test\TestCase { diff --git a/tests/lib/Files/SimpleFS/SimpleFileTest.php b/tests/lib/Files/SimpleFS/SimpleFileTest.php index c1c53b15ecfa3fbec91122ec1b01a12119235504..b31fa348afa9ffdf3516d5b19693665b3b74d1c0 100644 --- a/tests/lib/Files/SimpleFS/SimpleFileTest.php +++ b/tests/lib/Files/SimpleFS/SimpleFileTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Test\File\SimpleFS; use OC\Files\SimpleFS\SimpleFile; diff --git a/tests/lib/Files/SimpleFS/SimpleFolderTest.php b/tests/lib/Files/SimpleFS/SimpleFolderTest.php index d86c705d88083b1163db98d40e558e6354691a04..551d8c9520540b585e534d3d6e967f4a189e79a6 100644 --- a/tests/lib/Files/SimpleFS/SimpleFolderTest.php +++ b/tests/lib/Files/SimpleFS/SimpleFolderTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Test\File\SimpleFS; use OC\Files\SimpleFS\SimpleFolder; diff --git a/tests/lib/Files/Storage/CopyDirectoryTest.php b/tests/lib/Files/Storage/CopyDirectoryTest.php index 74b8148aa369332791e7358fd3578232b256a034..034ffb5a53a4ba4d8b4fb4e58d436e6db77d1e2f 100644 --- a/tests/lib/Files/Storage/CopyDirectoryTest.php +++ b/tests/lib/Files/Storage/CopyDirectoryTest.php @@ -50,4 +50,3 @@ class CopyDirectoryTest extends Storage { $this->instance = new CopyDirectoryStorage([]); } } - diff --git a/tests/lib/Files/Storage/LocalTest.php b/tests/lib/Files/Storage/LocalTest.php index f17933413a591908ac1dedaa0046592922c20263..c611a990236f44ddde4162aafe0a5b85ece97a9e 100644 --- a/tests/lib/Files/Storage/LocalTest.php +++ b/tests/lib/Files/Storage/LocalTest.php @@ -109,4 +109,3 @@ class LocalTest extends Storage { $this->addToAssertionCount(1); } } - diff --git a/tests/lib/Files/Storage/StorageFactoryTest.php b/tests/lib/Files/Storage/StorageFactoryTest.php index d3dc036ab429984eda15d4240cc34ab1b8ffec8c..20b51cdda2231e3a6e8586b0f90e5c1a3a11a54d 100644 --- a/tests/lib/Files/Storage/StorageFactoryTest.php +++ b/tests/lib/Files/Storage/StorageFactoryTest.php @@ -9,10 +9,10 @@ namespace Test\Files\Storage; use OC\Files\Mount\MountPoint; +use OC\Files\Storage\Wrapper\Wrapper; use OCP\Files\Mount\IMountPoint; use OCP\Files\Storage as IStorage; use Test\TestCase; -use OC\Files\Storage\Wrapper\Wrapper; class DummyWrapper extends Wrapper { public $data; diff --git a/tests/lib/Files/Stream/DummyEncryptionWrapper.php b/tests/lib/Files/Stream/DummyEncryptionWrapper.php index bb512d99c6646dc5317d71379f3998c14fe92fa8..599abf894ef21b103f94a20ac3e7127e7bf5f5ce 100644 --- a/tests/lib/Files/Stream/DummyEncryptionWrapper.php +++ b/tests/lib/Files/Stream/DummyEncryptionWrapper.php @@ -19,7 +19,6 @@ * */ - namespace Test\Files\Stream; class DummyEncryptionWrapper extends \OC\Files\Stream\Encryption { diff --git a/tests/lib/Files/Type/LoaderTest.php b/tests/lib/Files/Type/LoaderTest.php index a77d672f6673a33931d42648955c7a14293977a4..cf6aa31a04770a7e5ed08ea5864225a2ec4bef6e 100644 --- a/tests/lib/Files/Type/LoaderTest.php +++ b/tests/lib/Files/Type/LoaderTest.php @@ -21,8 +21,8 @@ namespace Test\Files\Type; -use \OC\Files\Type\Loader; -use \OCP\IDBConnection; +use OC\Files\Type\Loader; +use OCP\IDBConnection; class LoaderTest extends \Test\TestCase { /** @var IDBConnection */ diff --git a/tests/lib/Files/ViewTest.php b/tests/lib/Files/ViewTest.php index 5c37c9a0e937a821f6716bb50d8821752183ac8f..43a3a06ba0bac18377f7408c7f2b38195a7fcb75 100644 --- a/tests/lib/Files/ViewTest.php +++ b/tests/lib/Files/ViewTest.php @@ -10,8 +10,8 @@ namespace Test\Files; use OC\Cache\CappedMemoryCache; use OC\Files\Cache\Watcher; use OC\Files\Filesystem; -use OC\Files\Storage\Common; use OC\Files\Mount\MountPoint; +use OC\Files\Storage\Common; use OC\Files\Storage\Temporary; use OC\Files\Stream\Quota; use OC\Files\View; @@ -23,8 +23,8 @@ use OCP\Lock\ILockingProvider; use OCP\Lock\LockedException; use OCP\Share; use OCP\Util; -use Test\TestMoveableMountPoint; use Test\HookHelper; +use Test\TestMoveableMountPoint; use Test\Traits\UserTrait; class TemporaryNoTouch extends Temporary { diff --git a/tests/lib/GlobalScale/ConfigTest.php b/tests/lib/GlobalScale/ConfigTest.php index ec1581625c67f54a0aa9c206ed7106a8a58c2d5b..ab5ef351fc0aeebc108954c90b5e69b6a0806d1b 100644 --- a/tests/lib/GlobalScale/ConfigTest.php +++ b/tests/lib/GlobalScale/ConfigTest.php @@ -19,7 +19,6 @@ * */ - namespace Test\GlobalScale; diff --git a/tests/lib/Group/ManagerTest.php b/tests/lib/Group/ManagerTest.php index 32e302177599326cdeaeba4dc21a982259613153..33c2daa9476277cd954a53982b3569cac0af98a8 100644 --- a/tests/lib/Group/ManagerTest.php +++ b/tests/lib/Group/ManagerTest.php @@ -20,13 +20,14 @@ * along with this program. If not, see * */ + namespace Test\Group; use OC\Group\Database; use OC\User\Manager; +use OCP\GroupInterface; use OCP\ILogger; use OCP\IUser; -use OCP\GroupInterface; use PHPUnit\Framework\MockObject\MockObject; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Test\TestCase; diff --git a/tests/lib/Http/Client/ResponseTest.php b/tests/lib/Http/Client/ResponseTest.php index d50f9a717d5da1e1479dd645a0a2b539808d4a2e..f62563a95e98b0d954f9dcc45560e56a1890b0e1 100644 --- a/tests/lib/Http/Client/ResponseTest.php +++ b/tests/lib/Http/Client/ResponseTest.php @@ -8,8 +8,8 @@ namespace Test\Http\Client; -use function GuzzleHttp\Psr7\stream_for; use GuzzleHttp\Psr7\Response as GuzzleResponse; +use function GuzzleHttp\Psr7\stream_for; use OC\Http\Client\Response; /** diff --git a/tests/lib/IntegrityCheck/CheckerTest.php b/tests/lib/IntegrityCheck/CheckerTest.php index 7f67f405ac713d29761ca271ffae6ec193f1adc1..febd9f56622bf30230835a65ff0b9e1a91d9a143 100644 --- a/tests/lib/IntegrityCheck/CheckerTest.php +++ b/tests/lib/IntegrityCheck/CheckerTest.php @@ -22,16 +22,16 @@ namespace Test\IntegrityCheck; use OC\IntegrityCheck\Checker; +use OC\IntegrityCheck\Helpers\AppLocator; +use OC\IntegrityCheck\Helpers\EnvironmentHelper; +use OC\IntegrityCheck\Helpers\FileAccessHelper; use OC\Memcache\NullCache; +use OCP\App\IAppManager; +use OCP\ICacheFactory; +use OCP\IConfig; use phpseclib\Crypt\RSA; use phpseclib\File\X509; use Test\TestCase; -use OC\IntegrityCheck\Helpers\EnvironmentHelper; -use OC\IntegrityCheck\Helpers\FileAccessHelper; -use OC\IntegrityCheck\Helpers\AppLocator; -use OCP\IConfig; -use OCP\ICacheFactory; -use OCP\App\IAppManager; class CheckerTest extends TestCase { /** @var EnvironmentHelper|\PHPUnit_Framework_MockObject_MockObject */ diff --git a/tests/lib/IntegrityCheck/Helpers/FileAccessHelperTest.php b/tests/lib/IntegrityCheck/Helpers/FileAccessHelperTest.php index 4e581c0f2e2881ba88307f820390a4d76fd51971..f2ac46555f55c89aa91f7464c25ce41cb2086a0c 100644 --- a/tests/lib/IntegrityCheck/Helpers/FileAccessHelperTest.php +++ b/tests/lib/IntegrityCheck/Helpers/FileAccessHelperTest.php @@ -18,6 +18,7 @@ * along with this program. If not, see * */ + namespace Test\IntegrityCheck\Helpers; use OC\IntegrityCheck\Helpers\FileAccessHelper; diff --git a/tests/lib/IntegrityCheck/Iterator/ExcludeFileByNameFilterIteratorTest.php b/tests/lib/IntegrityCheck/Iterator/ExcludeFileByNameFilterIteratorTest.php index 8d5c38d275a9907b829b8659e5d26b21d70916ea..735a5e2d19a1a076b193c22c2ca2d213cbf69d74 100644 --- a/tests/lib/IntegrityCheck/Iterator/ExcludeFileByNameFilterIteratorTest.php +++ b/tests/lib/IntegrityCheck/Iterator/ExcludeFileByNameFilterIteratorTest.php @@ -21,7 +21,7 @@ namespace Test\IntegrityCheck\Iterator; -use \OC\IntegrityCheck\Iterator\ExcludeFileByNameFilterIterator; +use OC\IntegrityCheck\Iterator\ExcludeFileByNameFilterIterator; use Test\TestCase; class ExcludeFileByNameFilterIteratorTest extends TestCase { diff --git a/tests/lib/Lock/NonCachingDBLockingProviderTest.php b/tests/lib/Lock/NonCachingDBLockingProviderTest.php index be5cd1600c86cee039bdedabcce62453269d95f2..a5da1f8de757903520d8612f44cb866bd615ad73 100644 --- a/tests/lib/Lock/NonCachingDBLockingProviderTest.php +++ b/tests/lib/Lock/NonCachingDBLockingProviderTest.php @@ -51,4 +51,4 @@ class NonCachingDBLockingProviderTest extends DBLockingProviderTest { $this->assertEquals(0, $this->getLockValue('foo')); } -} \ No newline at end of file +} diff --git a/tests/lib/Lockdown/Filesystem/NullStorageTest.php b/tests/lib/Lockdown/Filesystem/NullStorageTest.php index c6faf325cd43f93d92533833d312410735387c67..a8e2d8d6ba48ac5f5e714ad228e1b00c58b4b5da 100644 --- a/tests/lib/Lockdown/Filesystem/NullStorageTest.php +++ b/tests/lib/Lockdown/Filesystem/NullStorageTest.php @@ -24,10 +24,10 @@ namespace Test\Lockdown\Filesystem; use Icewind\Streams\IteratorDirectory; +use OC\Files\FileInfo; use OC\ForbiddenException; use OC\Lockdown\Filesystem\NullCache; use OC\Lockdown\Filesystem\NullStorage; -use OC\Files\FileInfo; use OCP\Files\Storage; use Test\TestCase; diff --git a/tests/lib/Memcache/FactoryTest.php b/tests/lib/Memcache/FactoryTest.php index 1944b1bd35d6b535a88e368344577168906bf501..971b22d69b29f6ee76de2c8beca9de9b872a5765 100644 --- a/tests/lib/Memcache/FactoryTest.php +++ b/tests/lib/Memcache/FactoryTest.php @@ -18,6 +18,7 @@ * along with this program. If not, see * */ + namespace Test\Memcache; use OC\Memcache\NullCache; diff --git a/tests/lib/NavigationManagerTest.php b/tests/lib/NavigationManagerTest.php index 97471fa52132e25a69c57075d482780381cfe0c1..acf0808878417ced28b13e7c8a387afaf698a524 100644 --- a/tests/lib/NavigationManagerTest.php +++ b/tests/lib/NavigationManagerTest.php @@ -12,6 +12,10 @@ namespace Test; +use OC\App\AppManager; +use OC\Group\Manager; +use OC\NavigationManager; +use OC\SubAdmin; use OCP\IConfig; use OCP\IGroupManager; use OCP\IL10N; @@ -19,10 +23,6 @@ use OCP\IURLGenerator; use OCP\IUser; use OCP\IUserSession; use OCP\L10N\IFactory; -use OC\App\AppManager; -use OC\Group\Manager; -use OC\NavigationManager; -use OC\SubAdmin; class NavigationManagerTest extends TestCase { /** @var AppManager|\PHPUnit_Framework_MockObject_MockObject */ diff --git a/tests/lib/OCS/DiscoveryServiceTest.php b/tests/lib/OCS/DiscoveryServiceTest.php index fdcdddb0813880c223d472bf35e826cc91a4e52f..f8ec68f6f551d7d066b880f2073d7b022da5ca74 100644 --- a/tests/lib/OCS/DiscoveryServiceTest.php +++ b/tests/lib/OCS/DiscoveryServiceTest.php @@ -19,7 +19,6 @@ * */ - namespace Test\OCS; diff --git a/tests/lib/Preview/GeneratorTest.php b/tests/lib/Preview/GeneratorTest.php index 9bca43a1a7efbf707426fd89e4a23b575154aad0..c7fe1ea5f8a7e2f474a34d62a4773e0bd83b2115 100644 --- a/tests/lib/Preview/GeneratorTest.php +++ b/tests/lib/Preview/GeneratorTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Test\Preview; use OC\Preview\Generator; diff --git a/tests/lib/Preview/HEICTest.php b/tests/lib/Preview/HEICTest.php index 63b9038d35dd1000ed3613e4607fd4785593549e..a3cc37d24fb7b064f4b1c31ca0856c1e0b707c23 100644 --- a/tests/lib/Preview/HEICTest.php +++ b/tests/lib/Preview/HEICTest.php @@ -45,4 +45,4 @@ class HEICTest extends Provider { } -} \ No newline at end of file +} diff --git a/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php b/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php index dd98307993faf41b9d9eb9bec951854192e3ca68..e52fcbe7c21d10a3400a6fb786cb079b2a88e501 100644 --- a/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php +++ b/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php @@ -23,10 +23,10 @@ namespace Test\Repair; -use OCP\IConfig; -use OCP\Migration\IOutput; use OC\Avatar\AvatarManager; use OC\Repair\ClearGeneratedAvatarCache; +use OCP\IConfig; +use OCP\Migration\IOutput; class ClearGeneratedAvatarCacheTest extends \Test\TestCase { diff --git a/tests/lib/Repair/NC11/FixMountStoragesTest.php b/tests/lib/Repair/NC11/FixMountStoragesTest.php index 12e091050388c6045a7440b740041c7e202c29bc..fe1b75cac9befd98311092d66cc7676acb0c2bc8 100644 --- a/tests/lib/Repair/NC11/FixMountStoragesTest.php +++ b/tests/lib/Repair/NC11/FixMountStoragesTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Test\Repair\NC11; use OC\Repair\NC11\FixMountStorages; diff --git a/tests/lib/Repair/RepairInvalidSharesTest.php b/tests/lib/Repair/RepairInvalidSharesTest.php index 0c67cc992ef4b342d168cbb6f6952c7480ce7ed5..f28d6807d6a3486fd42670f4387fdcfac068e778 100644 --- a/tests/lib/Repair/RepairInvalidSharesTest.php +++ b/tests/lib/Repair/RepairInvalidSharesTest.php @@ -202,4 +202,3 @@ class RepairInvalidSharesTest extends TestCase { return $this->connection->lastInsertId('*PREFIX*share'); } } - diff --git a/tests/lib/Repair/RepairMimeTypesTest.php b/tests/lib/Repair/RepairMimeTypesTest.php index b9d73d27d00b173322217c46b7e5ed6f05151a16..6579c3213c465cee1c6d9610d09e0b4f22e49a56 100644 --- a/tests/lib/Repair/RepairMimeTypesTest.php +++ b/tests/lib/Repair/RepairMimeTypesTest.php @@ -6,6 +6,7 @@ * later. * See the COPYING-README file. */ + namespace Test\Repair; use OC\Files\Storage\Temporary; @@ -283,4 +284,3 @@ class RepairMimeTypesTest extends \Test\TestCase { $this->renameMimeTypes($currentMimeTypes, $fixedMimeTypes); } } - diff --git a/tests/lib/Security/Bruteforce/CapabilitiesTest.php b/tests/lib/Security/Bruteforce/CapabilitiesTest.php index 6ebaf79ddafe299064d962936dd3adf9f6c5b46e..e9b998c7bc85cb068578654b7d1ee5fd147b07eb 100644 --- a/tests/lib/Security/Bruteforce/CapabilitiesTest.php +++ b/tests/lib/Security/Bruteforce/CapabilitiesTest.php @@ -18,6 +18,7 @@ * along with this program. If not, see . * */ + namespace Test\Security\Bruteforce; use OC\Security\Bruteforce\Capabilities; diff --git a/tests/lib/Security/Bruteforce/ThrottlerTest.php b/tests/lib/Security/Bruteforce/ThrottlerTest.php index da386db9d2d9bb815ae0eb8f43d136a0cd156899..e68ae70e152e9204f918b96d0c7a816bb4ded317 100644 --- a/tests/lib/Security/Bruteforce/ThrottlerTest.php +++ b/tests/lib/Security/Bruteforce/ThrottlerTest.php @@ -18,6 +18,7 @@ * along with this program. If not, see . * */ + namespace Test\Security\Bruteforce; use OC\AppFramework\Utility\TimeFactory; diff --git a/tests/lib/Security/CSRF/CsrfTokenGeneratorTest.php b/tests/lib/Security/CSRF/CsrfTokenGeneratorTest.php index 28b85c3951fafcfc75cda1bf09c2ba7e732a5ea9..424f620b619531e9d5bc7f120ff2b79c7479e4cc 100644 --- a/tests/lib/Security/CSRF/CsrfTokenGeneratorTest.php +++ b/tests/lib/Security/CSRF/CsrfTokenGeneratorTest.php @@ -53,4 +53,3 @@ class CsrfTokenGeneratorTest extends \Test\TestCase { $this->assertSame('12345678901234567890123456789012', $this->csrfTokenGenerator->generateToken(32)); } } - diff --git a/tests/lib/Security/CertificateManagerTest.php b/tests/lib/Security/CertificateManagerTest.php index 2804ad99c0f41117a96d7330a5a3d2d9368841e9..04da057a14c2543f3f3d2d98b67ce52a35da4a78 100644 --- a/tests/lib/Security/CertificateManagerTest.php +++ b/tests/lib/Security/CertificateManagerTest.php @@ -10,7 +10,7 @@ namespace Test\Security; use OC\Files\Storage\Temporary; use OC\Files\View; -use \OC\Security\CertificateManager; +use OC\Security\CertificateManager; use OCP\IConfig; use OCP\ILogger; use OCP\Security\ISecureRandom; diff --git a/tests/lib/Security/CertificateTest.php b/tests/lib/Security/CertificateTest.php index 6f7d7d4a37f2b09c4cf9f7431daec95aae82b586..21d1dab4ab81fac5ea890a7d782d378b36b9238c 100644 --- a/tests/lib/Security/CertificateTest.php +++ b/tests/lib/Security/CertificateTest.php @@ -21,7 +21,7 @@ namespace Test\Security; -use \OC\Security\Certificate; +use OC\Security\Certificate; class CertificateTest extends \Test\TestCase { diff --git a/tests/lib/Security/CredentialsManagerTest.php b/tests/lib/Security/CredentialsManagerTest.php index 38da26a21a9ea13c6b3016ac6c355b9539cc624b..d1cbdcd3366a4422c0290d88df0819897c3940d9 100644 --- a/tests/lib/Security/CredentialsManagerTest.php +++ b/tests/lib/Security/CredentialsManagerTest.php @@ -21,11 +21,11 @@ namespace Test\Security; +use OC\Security\CredentialsManager; use OC\SystemConfig; +use OCP\IDBConnection; use OCP\ILogger; -use \OCP\Security\ICrypto; -use \OCP\IDBConnection; -use \OC\Security\CredentialsManager; +use OCP\Security\ICrypto; class CredentialsManagerTest extends \Test\TestCase { diff --git a/tests/lib/Security/CryptoTest.php b/tests/lib/Security/CryptoTest.php index 356d504f4b37ca214e2fd769f4352ede376dab1e..ff164cddc9da201197c0b931bc62c52aa57ac1bd 100644 --- a/tests/lib/Security/CryptoTest.php +++ b/tests/lib/Security/CryptoTest.php @@ -8,7 +8,7 @@ namespace Test\Security; -use \OC\Security\Crypto; +use OC\Security\Crypto; class CryptoTest extends \Test\TestCase { diff --git a/tests/lib/Security/IdentityProof/KeyTest.php b/tests/lib/Security/IdentityProof/KeyTest.php index 0468afe633ad6a9cd80bc02bcaf1a79f65879e9d..bb550bd1b2abd53c5ed1f000889c4de3cb8f4f79 100644 --- a/tests/lib/Security/IdentityProof/KeyTest.php +++ b/tests/lib/Security/IdentityProof/KeyTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Test\Security\IdentityProof; use OC\Security\IdentityProof\Key; diff --git a/tests/lib/Security/IdentityProof/SignerTest.php b/tests/lib/Security/IdentityProof/SignerTest.php index f12e6d94be35e10eadd3929288e2e52f40fda5dd..114c03348f6e0d0b5a71c59297002a106d08105a 100644 --- a/tests/lib/Security/IdentityProof/SignerTest.php +++ b/tests/lib/Security/IdentityProof/SignerTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Test\Security\IdentityProof; use OC\Security\IdentityProof\Key; diff --git a/tests/lib/Security/SecureRandomTest.php b/tests/lib/Security/SecureRandomTest.php index 40431c89795d4a866ade15ae5ee6d1fe744a7d12..500e18d0ca6bcc4318b6602ec5a9280637ccfa8c 100644 --- a/tests/lib/Security/SecureRandomTest.php +++ b/tests/lib/Security/SecureRandomTest.php @@ -8,7 +8,7 @@ namespace Test\Security; -use \OC\Security\SecureRandom; +use OC\Security\SecureRandom; class SecureRandomTest extends \Test\TestCase { diff --git a/tests/lib/Security/TrustedDomainHelperTest.php b/tests/lib/Security/TrustedDomainHelperTest.php index 86420e22c219aec98937ee721e55890fcde85672..3fe0889b79670c52a1c851f75d881bbbcbd16be7 100644 --- a/tests/lib/Security/TrustedDomainHelperTest.php +++ b/tests/lib/Security/TrustedDomainHelperTest.php @@ -8,7 +8,7 @@ namespace Test\Security; -use \OC\Security\TrustedDomainHelper; +use OC\Security\TrustedDomainHelper; use OCP\IConfig; /** diff --git a/tests/lib/Settings/ManagerTest.php b/tests/lib/Settings/ManagerTest.php index ed02061c595c2cae1c0575a587f1aba80f189690..8d1c9f768e83864ae76ca281f0147c3e06a08521 100644 --- a/tests/lib/Settings/ManagerTest.php +++ b/tests/lib/Settings/ManagerTest.php @@ -23,10 +23,10 @@ namespace OCA\Settings\Tests\AppInfo; -use OCA\Settings\Admin\Sharing; use OC\Settings\Manager; -use OCA\Settings\Personal\Security; use OC\Settings\Section; +use OCA\Settings\Admin\Sharing; +use OCA\Settings\Personal\Security; use OCP\IDBConnection; use OCP\IL10N; use OCP\ILogger; diff --git a/tests/lib/Share20/DefaultShareProviderTest.php b/tests/lib/Share20/DefaultShareProviderTest.php index 8f725022edaf6c8713517b96651d9282ad50313c..a9852882fa8b30a32a71a6247f62e793e131c5a8 100644 --- a/tests/lib/Share20/DefaultShareProviderTest.php +++ b/tests/lib/Share20/DefaultShareProviderTest.php @@ -19,21 +19,22 @@ * along with this program. If not, see * */ + namespace Test\Share20; +use OC\Share20\DefaultShareProvider; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\Defaults; use OCP\Files\File; use OCP\Files\Folder; +use OCP\Files\IRootFolder; use OCP\IDBConnection; use OCP\IGroup; +use OCP\IGroupManager; use OCP\IL10N; use OCP\IURLGenerator; use OCP\IUser; use OCP\IUserManager; -use OCP\IGroupManager; -use OCP\Files\IRootFolder; -use OC\Share20\DefaultShareProvider; use OCP\Mail\IMailer; use OCP\Share\IShare; diff --git a/tests/lib/Share20/LegacyHooksTest.php b/tests/lib/Share20/LegacyHooksTest.php index 5fc6a447047c0112d9f5bce724cb4ecad2efbac0..057173c4f339590a2cadd77d3aed01b037a1d75d 100644 --- a/tests/lib/Share20/LegacyHooksTest.php +++ b/tests/lib/Share20/LegacyHooksTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Test\Share20; use OC\Share20\LegacyHooks; diff --git a/tests/lib/Share20/ManagerTest.php b/tests/lib/Share20/ManagerTest.php index 4a7686acd359fa41b61b54dd8d55f19d89e763ef..26008c2a3deb1da47bf3ad1fe1627ab71c6b5268 100644 --- a/tests/lib/Share20/ManagerTest.php +++ b/tests/lib/Share20/ManagerTest.php @@ -18,39 +18,40 @@ * along with this program. If not, see * */ + namespace Test\Share20; use OC\Files\Mount\MoveableMount; use OC\HintException; use OC\Share20\DefaultShareProvider; +use OC\Share20\Exception; +use OC\Share20\Manager; +use OC\Share20\Share; use OCP\Files\File; use OCP\Files\Folder; use OCP\Files\IRootFolder; +use OCP\Files\Mount\IMountManager; use OCP\Files\Mount\IMountPoint; use OCP\Files\Node; use OCP\Files\Storage; +use OCP\IConfig; use OCP\IGroup; +use OCP\IGroupManager; +use OCP\IL10N; +use OCP\ILogger; use OCP\IServerContainer; use OCP\IURLGenerator; use OCP\IUser; + use OCP\IUserManager; use OCP\L10N\IFactory; use OCP\Mail\IMailer; +use OCP\Security\IHasher; +use OCP\Security\ISecureRandom; use OCP\Share\Exceptions\ShareNotFound; use OCP\Share\IProviderFactory; use OCP\Share\IShare; -use OC\Share20\Manager; -use OC\Share20\Exception; - -use OC\Share20\Share; -use OCP\IL10N; -use OCP\ILogger; -use OCP\IConfig; use OCP\Share\IShareProvider; -use OCP\Security\ISecureRandom; -use OCP\Security\IHasher; -use OCP\Files\Mount\IMountManager; -use OCP\IGroupManager; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\GenericEvent; diff --git a/tests/lib/Share20/ShareHelperTest.php b/tests/lib/Share20/ShareHelperTest.php index 69609f9f724af1f8e1907ee6ae97d5e0c106548f..39141418f353cc81f94d80edbd97ca3fdd5e868f 100644 --- a/tests/lib/Share20/ShareHelperTest.php +++ b/tests/lib/Share20/ShareHelperTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Test\Share20; use OC\Share20\ShareHelper; diff --git a/tests/lib/Share20/ShareTest.php b/tests/lib/Share20/ShareTest.php index fbdf8e5c15b1346fec3ebc99a8d182a6c3c58e69..9e5c4970d3bbf60d5a2c599d1d24b4a1d3cb98e5 100644 --- a/tests/lib/Share20/ShareTest.php +++ b/tests/lib/Share20/ShareTest.php @@ -18,6 +18,7 @@ * along with this program. If not, see * */ + namespace Test\Share20; use OCP\Files\IRootFolder; diff --git a/tests/lib/SubAdminTest.php b/tests/lib/SubAdminTest.php index 4c0b030c44b4d9c06b8adf972b8b429498f0bd6a..8b293426e750751cc74dd966de0321531cf95840 100644 --- a/tests/lib/SubAdminTest.php +++ b/tests/lib/SubAdminTest.php @@ -18,6 +18,7 @@ * along with this program. If not, see * */ + namespace Test; /** diff --git a/tests/lib/SystemTag/SystemTagManagerTest.php b/tests/lib/SystemTag/SystemTagManagerTest.php index f81bbaf16439c1db55d74bc9c4d22c16886c408c..41c838914c7d1d8d9a006bba5384e589d8382212 100644 --- a/tests/lib/SystemTag/SystemTagManagerTest.php +++ b/tests/lib/SystemTag/SystemTagManagerTest.php @@ -13,13 +13,13 @@ namespace Test\SystemTag; use OC\SystemTag\SystemTagManager; use OC\SystemTag\SystemTagObjectMapper; use OCP\IDBConnection; +use OCP\IGroupManager; use OCP\IUser; +use OCP\IUserManager; use OCP\SystemTag\ISystemTag; use OCP\SystemTag\ISystemTagManager; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Test\TestCase; -use OCP\IUserManager; -use OCP\IGroupManager; /** * Class TestSystemTagManager diff --git a/tests/lib/Template/CSSResourceLocatorTest.php b/tests/lib/Template/CSSResourceLocatorTest.php index a928f043ed3fde3932945f918b113af4f5a77f09..790d1f44e1b89c0a7585e39b84be724b159c740d 100644 --- a/tests/lib/Template/CSSResourceLocatorTest.php +++ b/tests/lib/Template/CSSResourceLocatorTest.php @@ -25,16 +25,16 @@ namespace Test\Template; use OC\Files\AppData\AppData; use OC\Files\AppData\Factory; +use OC\Template\CSSResourceLocator; +use OC\Template\IconsCacher; +use OC\Template\SCSSCacher; +use OCA\Theming\ThemingDefaults; use OCP\AppFramework\Utility\ITimeFactory; use OCP\Files\IAppData; use OCP\ICacheFactory; +use OCP\IConfig; use OCP\ILogger; use OCP\IURLGenerator; -use OCP\IConfig; -use OCA\Theming\ThemingDefaults; -use OC\Template\IconsCacher; -use OC\Template\SCSSCacher; -use OC\Template\CSSResourceLocator; class CSSResourceLocatorTest extends \Test\TestCase { /** @var IAppData|\PHPUnit_Framework_MockObject_MockObject */ diff --git a/tests/lib/Template/IconsCacherTest.php b/tests/lib/Template/IconsCacherTest.php index 376243564430637b53c5900df619a6249e90a417..50b678da6d366e43ac6fc4a87b8fec0789771b28 100644 --- a/tests/lib/Template/IconsCacherTest.php +++ b/tests/lib/Template/IconsCacherTest.php @@ -27,6 +27,7 @@ namespace Test\Template; use OC\Files\AppData\AppData; use OC\Files\AppData\Factory; use OC\Template\IconsCacher; +use OC_App; use OCA\Theming\ThemingDefaults; use OCP\AppFramework\Utility\ITimeFactory; use OCP\Files\IAppData; @@ -38,7 +39,6 @@ use OCP\ICacheFactory; use OCP\IConfig; use OCP\ILogger; use OCP\IURLGenerator; -use OC_App; class IconsCacherTest extends \Test\TestCase { /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ diff --git a/tests/lib/Template/JSCombinerTest.php b/tests/lib/Template/JSCombinerTest.php index 6eaedccbe8932209bc7d02b907c9ef9e67445a0f..51b15b804052b1d1ab6f97b8bfdf930d3f8bf90f 100644 --- a/tests/lib/Template/JSCombinerTest.php +++ b/tests/lib/Template/JSCombinerTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Test\Template; use function foo\func; diff --git a/tests/lib/Template/JSResourceLocatorTest.php b/tests/lib/Template/JSResourceLocatorTest.php index f5dff62729fa1c1aa2bffbcc668ec9d9bec1b320..400637ae960196eadcf0d9848da2e436f84e2065 100644 --- a/tests/lib/Template/JSResourceLocatorTest.php +++ b/tests/lib/Template/JSResourceLocatorTest.php @@ -23,13 +23,13 @@ namespace Test\Template; +use OC\SystemConfig; use OC\Template\JSCombiner; +use OC\Template\JSResourceLocator; use OCP\Files\IAppData; use OCP\ICacheFactory; -use OCP\IURLGenerator; -use OC\SystemConfig; use OCP\ILogger; -use OC\Template\JSResourceLocator; +use OCP\IURLGenerator; class JSResourceLocatorTest extends \Test\TestCase { /** @var IAppData|\PHPUnit_Framework_MockObject_MockObject */ diff --git a/tests/lib/Template/SCSSCacherTest.php b/tests/lib/Template/SCSSCacherTest.php index d4d60c2dc1ba058b86d6ac54d3c5935f4e8a1f53..421046b38f301c8dbc3f58bdb7ba60e65ae62df7 100644 --- a/tests/lib/Template/SCSSCacherTest.php +++ b/tests/lib/Template/SCSSCacherTest.php @@ -25,8 +25,9 @@ namespace Test\Template; use OC\Files\AppData\AppData; use OC\Files\AppData\Factory; -use OC\Template\SCSSCacher; use OC\Template\IconsCacher; +use OC\Template\SCSSCacher; +use OC_App; use OCA\Theming\ThemingDefaults; use OCP\AppFramework\Utility\ITimeFactory; use OCP\Files\IAppData; @@ -38,7 +39,6 @@ use OCP\ICacheFactory; use OCP\IConfig; use OCP\ILogger; use OCP\IURLGenerator; -use OC_App; class SCSSCacherTest extends \Test\TestCase { /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ diff --git a/tests/lib/Traits/EncryptionTrait.php b/tests/lib/Traits/EncryptionTrait.php index ba759a51a28805aee305c453e9eb6c3d1a7c2379..1f389fc82c8a796d9ce63be42b3e13cbf95af74e 100644 --- a/tests/lib/Traits/EncryptionTrait.php +++ b/tests/lib/Traits/EncryptionTrait.php @@ -9,11 +9,11 @@ namespace Test\Traits; use OC\Encryption\EncryptionWrapper; +use OC\Files\Filesystem; use OC\Memcache\ArrayCache; use OCA\Encryption\AppInfo\Application; use OCA\Encryption\KeyManager; use OCA\Encryption\Users\Setup; -use OC\Files\Filesystem; /** * Enables encryption diff --git a/tests/lib/UpdaterTest.php b/tests/lib/UpdaterTest.php index afc9f9b1f862ee1734733a5edb1e80d73d0b8e95..47028cf3f18a03d542070231d2c61f90a16a84ca 100644 --- a/tests/lib/UpdaterTest.php +++ b/tests/lib/UpdaterTest.php @@ -23,10 +23,10 @@ namespace Test; use OC\Installer; +use OC\IntegrityCheck\Checker; use OC\Updater; use OCP\IConfig; use OCP\ILogger; -use OC\IntegrityCheck\Checker; class UpdaterTest extends TestCase { /** @var IConfig | \PHPUnit_Framework_MockObject_MockObject */ diff --git a/tests/lib/User/DatabaseTest.php b/tests/lib/User/DatabaseTest.php index 666833ec44c175c2cc9bc7e66aff013e431d4f98..feba7a6926d0191f7dc37b13fb9e9048fab72713 100644 --- a/tests/lib/User/DatabaseTest.php +++ b/tests/lib/User/DatabaseTest.php @@ -22,9 +22,9 @@ namespace Test\User; use OC\HintException; +use OC\User\User; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\GenericEvent; -use OC\User\User; /** * Class DatabaseTest diff --git a/tests/lib/User/SessionTest.php b/tests/lib/User/SessionTest.php index a60f89fb4572bd3260ec2a9e7d25dbe307ead406..a37181c504c9fbd1923d34d448aafa479269505b 100644 --- a/tests/lib/User/SessionTest.php +++ b/tests/lib/User/SessionTest.php @@ -15,7 +15,6 @@ use OC\Authentication\Token\IProvider; use OC\Authentication\Token\IToken; use OC\Security\Bruteforce\Throttler; use OC\Session\Memory; -use OCP\User\Events\PostLoginEvent; use OC\User\Manager; use OC\User\Session; use OC\User\User; @@ -30,6 +29,7 @@ use OCP\IUser; use OCP\Lockdown\ILockdownManager; use OCP\Security\ICrypto; use OCP\Security\ISecureRandom; +use OCP\User\Events\PostLoginEvent; use PHPUnit\Framework\MockObject\MockObject; use Symfony\Component\EventDispatcher\EventDispatcherInterface; diff --git a/tests/lib/Util/User/Dummy.php b/tests/lib/Util/User/Dummy.php index 3db519cedfcc6f630b4a66d6ffe38d3be63375d4..4771983e9bcfa2f03cc05bc1151f6e7734b2e173 100644 --- a/tests/lib/Util/User/Dummy.php +++ b/tests/lib/Util/User/Dummy.php @@ -27,7 +27,7 @@ namespace Test\Util\User; -use \OC\User\Backend; +use OC\User\Backend; /** * dummy user backend, does not keep state, only for testing use