diff options
1107 files changed, 2574 insertions, 2262 deletions
diff --git a/3rdparty b/3rdparty -Subproject a6d0660582347473a020446fef4896bbd5f8184 +Subproject 36ace8134ad3b7ee967079f4764ee670700f323 diff --git a/apps/accessibility/lib/AppInfo/Application.php b/apps/accessibility/lib/AppInfo/Application.php index e884acad0af..c6f4e33005c 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 12014d98e37..577442dc665 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 589861163f1..c4cec595a35 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 77b76885a20..3f68edc1e5d 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 3ea3037d12a..107b5472255 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 d614d7d4730..df85d5b2b16 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 2fb842697d4..31510cef79d 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 e7c6c415d3c..3ebfca55d2d 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 8a6bd982173..e6dd845a25b 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 bb714993f7a..b27b851cc5e 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 80e9dea8829..1403c70652a 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 <http://www.gnu.org/licenses/> * */ + 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 a5c397326b2..22ead5c1ca5 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 <http://www.gnu.org/licenses/> * */ + 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 2047c5894e4..0430f3d025a 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 c40ed1b52db..898372ecaee 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 4fc12b5d3ed..3c073f279db 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 <http://www.gnu.org/licenses/>. * */ + 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 01d39a2193b..4b9f153460a 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 <http://www.gnu.org/licenses/>. * */ + namespace OCA\DAV\BackgroundJob; -use OCP\BackgroundJob\QueuedJob; use OCA\DAV\CalDAV\Reminder\ReminderService; use OCP\AppFramework\Utility\ITimeFactory; use OCP\BackgroundJob\IJobList; +use OCP\BackgroundJob\QueuedJob; use OCP\IDBConnection; use OCP\ILogger; @@ -132,4 +133,4 @@ 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 dfa76ffe168..b8169dbb9cd 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 <http://www.gnu.org/licenses/> * */ + 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 dd6fca73c8f..243943375e8 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 <http://www.gnu.org/licenses/>. * */ + 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 e99cd7038f6..acd7c103bc2 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 <http://www.gnu.org/licenses/>. * */ + namespace OCA\DAV\BackgroundJob; use GuzzleHttp\HandlerStack; diff --git a/apps/dav/lib/BackgroundJob/RegisterRegenerateBirthdayCalendars.php b/apps/dav/lib/BackgroundJob/RegisterRegenerateBirthdayCalendars.php index e20547053c5..3608b740191 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 <http://www.gnu.org/licenses/>. * */ + 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 24d2cef913e..1dd95dd70e5 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 14b22ad220e..3bc4cbc76ee 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 272843198a9..184eb5aea69 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 497d7112b3c..2452f5b63ef 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 da8c5434cf2..2d27f5b42c0 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 <http://www.gnu.org/licenses/>. * */ + 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 c2f7eeabf41..07981bb71b2 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 <http://www.gnu.org/licenses/>. * */ + 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 62d3909ce39..454ab7f6f63 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 b875d42e0a3..a80acfda5a3 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 <http://www.gnu.org/licenses/> * */ + 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 9ff71410f87..3e1ee361687 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 <http://www.gnu.org/licenses/> * */ + 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 cfdf821a563..afb333872ab 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 0db592898af..c527462f533 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 f84e8a96780..2f8b223a212 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 <http://www.gnu.org/licenses/> * */ + 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 61ead99ce12..9cb92e4c364 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 <http://www.gnu.org/licenses/> * */ + 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 8f0c57c7890..5025d41e09b 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 <http://www.gnu.org/licenses/> * */ + namespace OCA\DAV\CalDAV; use OCP\IConfig; diff --git a/apps/dav/lib/CalDAV/PublicCalendar.php b/apps/dav/lib/CalDAV/PublicCalendar.php index f65ac9797b8..d8350242b40 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 <http://www.gnu.org/licenses/>. * */ + 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 aaeea64b237..d50701ad369 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 <http://www.gnu.org/licenses/>. * */ + 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 9385f487bda..bd16025b451 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 <http://www.gnu.org/licenses/> * */ + 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 fc276fb25ca..35c00666446 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 <http://www.gnu.org/licenses/>. * */ + 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 6d5e05e0cc3..4c2aa83527c 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 <http://www.gnu.org/licenses/>. * */ + 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 b3cc013fb3e..3ddd4b1c3a1 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 <http://www.gnu.org/licenses/>. * */ + 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 d0e526eb0ee..bd182950ee5 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 <http://www.gnu.org/licenses/>. * */ + 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 6e3a8eaddef..2d3fefe696e 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 <http://www.gnu.org/licenses/>. * */ + 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 ad4ac342f66..85dbe86ba2c 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 <http://www.gnu.org/licenses/> * */ + 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 f5932a87b3e..3dbf31da8ca 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 <http://www.gnu.org/licenses/>. * */ + 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 bfa6db95852..251e4bedbf1 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 <http://www.gnu.org/licenses/>. * */ + 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 6e9e7831865..c07bb168666 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 <http://www.gnu.org/licenses/>. * */ + 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 c9bcf2dd064..d7ad12b2b82 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 <http://www.gnu.org/licenses/> * */ + namespace OCA\DAV\CalDAV\Reminder; /** diff --git a/apps/dav/lib/CalDAV/Reminder/Notifier.php b/apps/dav/lib/CalDAV/Reminder/Notifier.php index 2c5f05f62ab..5495d672c6b 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 dd19c400720..3c815801c96 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 <http://www.gnu.org/licenses/> * */ + 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 63ed3381d14..e3e3c117c30 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 <http://www.gnu.org/licenses/>. * */ + 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 128e6c21fad..b4f7e48a83c 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 <http://www.gnu.org/licenses/>. * */ + 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 3e9e8f68852..dd740d4ee0b 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 <http://www.gnu.org/licenses/>. * */ + 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 56b3ab04ddc..f4a233a0f06 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 <http://www.gnu.org/licenses/> * */ + 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 24fe625e009..79644e1036b 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 <http://www.gnu.org/licenses/>. * */ + 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 e984267ff37..c5086ed1b5d 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 <http://www.gnu.org/licenses/>. * */ + 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 5cc8f799f90..d68c08204b9 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 <http://www.gnu.org/licenses/>. * */ + 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 bac661b6722..52e52e6f043 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 <http://www.gnu.org/licenses/>. * */ + 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 8ced850bbc0..120310c9c58 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 <http://www.gnu.org/licenses/>. * */ + 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 bfcb960d402..81bd2c97f81 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 <http://www.gnu.org/licenses/>. * */ + 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 cfb2211fb59..0aa704efed1 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 <http://www.gnu.org/licenses/>. * */ + 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 ddd36818223..a00324c9615 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 <http://www.gnu.org/licenses/>. * */ + 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 e7c229c7b03..a105a9b695a 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 <http://www.gnu.org/licenses/>. * */ + 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 de2ff5a8e8b..95af7c2e75a 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 <http://www.gnu.org/licenses/>. * */ + 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 a301a393008..7bb6908e5f0 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 3b02bdf5ba6..171fb461fb2 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 <http://www.gnu.org/licenses/> * */ + 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 c52ee2d74f8..d8fe96fabea 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 <http://www.gnu.org/licenses/> * */ + namespace OCA\DAV\CardDAV; use OCP\IL10N; diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php index 7dbd41a69c8..18ac99cd2a8 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 8632fd45f22..cf3a1149590 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 <http://www.gnu.org/licenses/>. * */ + 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 d1fcbf2ce13..c0f4b434087 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 <http://www.gnu.org/licenses/> * */ + 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 9240b90a1eb..ebbc1ef37ea 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 <http://www.gnu.org/licenses/> * */ + 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 96ad350121c..502021d7f51 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 <http://www.gnu.org/licenses/> * */ + 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 a40bf48cc8e..c6bfffb2425 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 <http://www.gnu.org/licenses/> * */ + 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 6c2f5bdb506..e31d08dbcb6 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 <http://www.gnu.org/licenses/> * */ + 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 a2c7ca8c4d8..afd924cdfae 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 <http://www.gnu.org/licenses/> * */ + 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 93477cb0f72..bcbc0694625 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 <http://www.gnu.org/licenses/> * */ + 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 3d1bcab6c31..c1244f8b35f 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 <http://www.gnu.org/licenses/> * */ + 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 e91ab38593d..e1700b950b1 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 <http://www.gnu.org/licenses/> * */ + 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 d49dfdb14ef..19a825dff8f 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 e84fbb50566..a4f457aa58c 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 839eb34aa90..22c2adcbd2e 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 292be61c9dc..b5258c107c0 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 <http://www.gnu.org/licenses/> * */ + 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 0a70d44395b..6e6e9b5baa2 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 1bc38f75fb9..7fceacf56cc 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 <http://www.gnu.org/licenses/> * */ + 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 a39a3d29779..b3fe6581063 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 f3f685a8b9e..a844b58c81e 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 5a0d9e83c62..8e6b5af0d3c 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 aaf5f54ec26..e61470a52a0 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 f28f86e502e..54a07b13715 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 09ced838037..ff124435af8 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 <http://www.gnu.org/licenses/> * */ + 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 2a90ceeb7ff..9a4915d44fa 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 5edead6c1e3..95ea92558b1 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 <http://www.gnu.org/licenses/> * */ + 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 4fa208d8805..0ef7619cda5 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 3ce305d75f3..bcbddc30545 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 b2a0e9a31b4..1ae62a70d2d 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 d679fa307c2..8d7a47eebd6 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 2a3e8145f6f..effc360738d 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 ae185b1a611..5288745362c 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 0388bc48f8d..b3ca822ed86 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 <http://www.gnu.org/licenses/> * */ + 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 5edf28e6e50..8aaacefb85b 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 <http://www.gnu.org/licenses/> * */ + 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 c9c9ec8661f..5f332209420 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 <http://www.gnu.org/licenses/> * */ + 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 e3bdab90aaf..1ec4c031b42 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 <http://www.gnu.org/licenses/>. * */ + 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 a797a25f90b..88ca421f39a 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 <http://www.gnu.org/licenses/> * */ + 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 636039eeb3c..99e4851d3b6 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 <http://www.gnu.org/licenses/> * */ + 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 07492d70a24..ef30ecac153 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 <http://www.gnu.org/licenses/> * */ + 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 376ae3ee78c..e4092643d3f 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 <http://www.gnu.org/licenses/> * */ + 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 6bdf8c1aca2..5384d9b6c20 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 <http://www.gnu.org/licenses/> * */ + 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 b065a900789..2c04e78aced 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 <http://www.gnu.org/licenses/> * */ + 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 0157ae038cb..3eba158c944 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 1ff918aabbb..bdf6638f1cc 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 <http://www.gnu.org/licenses/> * */ + 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 f5544693f2c..8f7e3f6e1b1 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 <http://www.gnu.org/licenses/> * */ + 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 3485df09d0f..23a5091fb23 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 <http://www.gnu.org/licenses/>. * */ + namespace OCA\DAV\Files\Sharing; use OC\Files\View; diff --git a/apps/dav/lib/HookManager.php b/apps/dav/lib/HookManager.php index 272c4cd1ad3..d0f8c304750 100644 --- a/apps/dav/lib/HookManager.php +++ b/apps/dav/lib/HookManager.php @@ -24,6 +24,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + 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 22274e36c6b..35f5fd426a7 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 <http://www.gnu.org/licenses/>. * */ + 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 a4fa2c63e02..2d66b03a208 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 <http://www.gnu.org/licenses/>. * */ + 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 492ae876e8a..54d52b04ebb 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 <http://www.gnu.org/licenses/>. * */ + 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 c7a1cf63ab9..306cdc7c7c3 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 <http://www.gnu.org/licenses/>. * */ + 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 26855c2e23e..8ce3ab7ce01 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 <http://www.gnu.org/licenses/>. * */ + 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 2cf4065011b..33a5797febf 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 <http://www.gnu.org/licenses/>. * */ + 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 7a87f6d2b04..fda032315c0 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 <http://www.gnu.org/licenses/>. * */ + 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 5da6465bc86..76a13db0725 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 <http://www.gnu.org/licenses/>. * */ + 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 cd6aeca6b48..5081f680fd9 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 6f3d6b9cc1f..fcdb1795589 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 <http://www.gnu.org/licenses/>. * */ + 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 91d4826c277..9af5eac982d 100644 --- a/apps/dav/lib/Migration/Version1006Date20180619154313.php +++ b/apps/dav/lib/Migration/Version1006Date20180619154313.php @@ -1,10 +1,11 @@ <?php + 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/Migration/Version1006Date20180628111625.php b/apps/dav/lib/Migration/Version1006Date20180628111625.php index d3e49ca227d..c24413e6181 100644 --- a/apps/dav/lib/Migration/Version1006Date20180628111625.php +++ b/apps/dav/lib/Migration/Version1006Date20180628111625.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 Version1006Date20180628111625 extends SimpleMigrationStep { diff --git a/apps/dav/lib/Migration/Version1008Date20181030113700.php b/apps/dav/lib/Migration/Version1008Date20181030113700.php index 9e26df7792e..4f4deff942a 100644 --- a/apps/dav/lib/Migration/Version1008Date20181030113700.php +++ b/apps/dav/lib/Migration/Version1008Date20181030113700.php @@ -28,8 +28,8 @@ use Closure; use Doctrine\DBAL\Types\Type; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version1008Date20181030113700 extends SimpleMigrationStep { diff --git a/apps/dav/lib/Migration/Version1008Date20181105104826.php b/apps/dav/lib/Migration/Version1008Date20181105104826.php index b5b0545102d..38a38e8ee5b 100644 --- a/apps/dav/lib/Migration/Version1008Date20181105104826.php +++ b/apps/dav/lib/Migration/Version1008Date20181105104826.php @@ -30,8 +30,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 Version1008Date20181105104826 extends SimpleMigrationStep { diff --git a/apps/dav/lib/Migration/Version1008Date20181105104833.php b/apps/dav/lib/Migration/Version1008Date20181105104833.php index 9167fa0463b..bafdc90636f 100644 --- a/apps/dav/lib/Migration/Version1008Date20181105104833.php +++ b/apps/dav/lib/Migration/Version1008Date20181105104833.php @@ -27,8 +27,8 @@ namespace OCA\DAV\Migration; use Closure; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version1008Date20181105104833 extends SimpleMigrationStep { diff --git a/apps/dav/lib/Migration/Version1008Date20181105110300.php b/apps/dav/lib/Migration/Version1008Date20181105110300.php index db5c0afbd38..069fcaf42c5 100644 --- a/apps/dav/lib/Migration/Version1008Date20181105110300.php +++ b/apps/dav/lib/Migration/Version1008Date20181105110300.php @@ -29,8 +29,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 Version1008Date20181105110300 extends SimpleMigrationStep { diff --git a/apps/dav/lib/Migration/Version1008Date20181105112049.php b/apps/dav/lib/Migration/Version1008Date20181105112049.php index 9fe2903603b..e8d5da1850f 100644 --- a/apps/dav/lib/Migration/Version1008Date20181105112049.php +++ b/apps/dav/lib/Migration/Version1008Date20181105112049.php @@ -27,8 +27,8 @@ namespace OCA\DAV\Migration; use Closure; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version1008Date20181105112049 extends SimpleMigrationStep { diff --git a/apps/dav/lib/Migration/Version1008Date20181114084440.php b/apps/dav/lib/Migration/Version1008Date20181114084440.php index a7ac1664bad..7d6d22d1b07 100644 --- a/apps/dav/lib/Migration/Version1008Date20181114084440.php +++ b/apps/dav/lib/Migration/Version1008Date20181114084440.php @@ -27,8 +27,8 @@ namespace OCA\DAV\Migration; use Closure; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version1008Date20181114084440 extends SimpleMigrationStep { diff --git a/apps/dav/lib/Migration/Version1011Date20190725113607.php b/apps/dav/lib/Migration/Version1011Date20190725113607.php index ac4019e64e6..1fa5cba1219 100644 --- a/apps/dav/lib/Migration/Version1011Date20190725113607.php +++ b/apps/dav/lib/Migration/Version1011Date20190725113607.php @@ -7,8 +7,8 @@ namespace OCA\DAV\Migration; use Closure; 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/Migration/Version1011Date20190806104428.php b/apps/dav/lib/Migration/Version1011Date20190806104428.php index c144e62bcde..3e8ea78c5c6 100644 --- a/apps/dav/lib/Migration/Version1011Date20190806104428.php +++ b/apps/dav/lib/Migration/Version1011Date20190806104428.php @@ -7,8 +7,8 @@ namespace OCA\DAV\Migration; use Closure; 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/Migration/Version1012Date20190808122342.php b/apps/dav/lib/Migration/Version1012Date20190808122342.php index 376d8472968..e6fc460046d 100644 --- a/apps/dav/lib/Migration/Version1012Date20190808122342.php +++ b/apps/dav/lib/Migration/Version1012Date20190808122342.php @@ -21,12 +21,13 @@ declare(strict_types=1); * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + 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 ed8297783d7..8c66609ed66 100644 --- a/apps/dav/lib/RootCollection.php +++ b/apps/dav/lib/RootCollection.php @@ -22,10 +22,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + 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 cd67b3995a4..7dd1cf3a8fa 100644 --- a/apps/dav/lib/Server.php +++ b/apps/dav/lib/Server.php @@ -30,14 +30,17 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + 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 b601aef50ec..6033cd3a207 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 b825820aa9d..65b7b7313c1 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 98c730906c6..88706c97999 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 <http://www.gnu.org/licenses/> * */ + 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 ca423739de4..7d384c74c1b 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 b23bf8f14db..4d57667e0b4 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 0ed246faa5a..4887eba6281 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 eb4b3a7c9e6..c89bbf3d01a 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 5e16d3a2f83..a86e631e211 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 <http://www.gnu.org/licenses/>. * */ + 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 421a2dd519a..dff9d811569 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 d86603fd8c2..ad59cb60a92 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 <http://www.gnu.org/licenses/> * */ + 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 436792e25ec..8c2dc7e15cf 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 <http://www.gnu.org/licenses/> * */ + 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 233c3ac3e52..79801193aa4 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 <http://www.gnu.org/licenses/> * */ + 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 fcfd978b33d..75a615815b1 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 <http://www.gnu.org/licenses/> * */ + 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 0e4c0d20eaa..ee3f13c6127 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 2dffa8b7424..07eb9670279 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 98a868aa14c..66098ab0822 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 8e24fb1f638..a26378038d1 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 c118e7497fa..a08d3824d7f 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 9c4f5eeb47c..db4d3e55fd8 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 131c3011e46..7d4463c81b4 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 1b2169b6675..9a65b7c70c5 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 874d4d84ffa..51977313ed4 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 <http://www.gnu.org/licenses/>. * */ + 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 98dd330f427..194fdbfb113 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 36aa4fa449b..923eaed08a6 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 <http://www.gnu.org/licenses/>. * */ + 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 efdafe8bc33..ed803c67dd3 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 <http://www.gnu.org/licenses/>. * */ + 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 71453ac73a3..dae3cb74e24 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 <http://www.gnu.org/licenses/> * */ + 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 5a8d328ef81..889ac867315 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 <http://www.gnu.org/licenses/> * */ + 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 9938b2f732c..2dc95e1ca77 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 <http://www.gnu.org/licenses/> * */ + 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 9bf2957e9f0..a288907b4ba 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 <http://www.gnu.org/licenses/> * */ + 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 8bd4a660dc4..346faf1a65e 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 <http://www.gnu.org/licenses/> * */ + 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 b4c62eacd7a..d55f15ee5ae 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 <http://www.gnu.org/licenses/> * */ + 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 4dcb688caa1..73f5ddde15d 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 <http://www.gnu.org/licenses/> * */ + 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 c6e16e2c484..ea2a7520227 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 <http://www.gnu.org/licenses/> * */ + 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 461246dd51d..ef71cd3b8d7 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 <http://www.gnu.org/licenses/> * */ + 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 6b691400cd1..92788f0d7a8 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 <http://www.gnu.org/licenses/> * */ + 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 89253ce9dc9..833221bd3ea 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 1f7ad404251..f7b9137b480 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 9dbeee2434e..c8dce8598a3 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 1a0ca8c7954..f2d315504b5 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 07d789dbfb2..94bcce03f3a 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 2574e4d0aec..be55ac186b0 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 5f35182fa27..d23d9743e6b 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 <http://www.gnu.org/licenses/> * */ + 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 e6482de8878..88baf981acc 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 afb72b09778..90bcb5f511c 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 580558b9517..cc47a3a4805 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 <http://www.gnu.org/licenses/> * */ + 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 3b7bd859b9f..1f58351622f 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 <http://www.gnu.org/licenses/> * */ + 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 968cb548068..a6dc1592db0 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 1de9333207f..01a51dbf459 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 d8fce27e9e6..0510e36a362 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 <http://www.gnu.org/licenses/> * */ + 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 c579a904260..0157757a737 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 ea520bca7e5..65130b64a84 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 <http://www.gnu.org/licenses/> * */ + 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 <pvince81@owncloud.com> diff --git a/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php index 09f9ea4dbfa..37a72da0bf2 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 5a1a4619ead..71448c1ba12 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 2a5c122ce9e..54ec1f5aeee 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 8d3cf3620e7..e5d229733c5 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 <http://www.gnu.org/licenses/> * */ + 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 a869e68fbbe..fe31ccba13c 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 af8208791e0..6494dab2b19 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 <http://www.gnu.org/licenses/> * */ + 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 37b35bc0178..0f6f4f6ef24 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 <http://www.gnu.org/licenses/> * */ + 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 780324abaa6..a7731f8b026 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 <http://www.gnu.org/licenses/>. * */ + 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 c9a72e0b948..e5be0d75d53 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 c3b41590368..96cabfab1ce 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 e2990f27b60..90e8b007833 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 <http://www.gnu.org/licenses/>. * */ + 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 2c77078bb5e..8f2aa7f8b57 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 <http://www.gnu.org/licenses/>. * */ + 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 fcdb383465e..693b3f61f9d 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 57ad65372e1..1b854a541c2 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 986899a2107..0d1f85fc298 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 <http://www.gnu.org/licenses/> * */ + 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 8992cb78d0f..77f69c0734a 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 b9a6efdcc22..bfaff5c2141 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 7e1f34a5ebf..21afc4fc177 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 0ac9cbb234e..7af034d5dfb 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 <http://www.gnu.org/licenses/> * */ + 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 3951d1f1795..410ab2fc021 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 1f20642ff09..94be4ea66dd 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 <http://www.gnu.org/licenses/> * */ + 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 5846a01db13..0f5533f934d 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 <http://www.gnu.org/licenses/> * */ + 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 230de754bfc..34d29d2f5fa 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 6f0800c9340..10fb65f9b58 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 58ea4e4ece7..4cf85c6886e 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 fa88a35453e..3a2351db433 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 b2fdec513d2..c2862387949 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 195dc7891fc..94db0a543d9 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 ee13fee9eef..586397b82ae 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 3f6001cab74..f58718dc401 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 ec1770cc019..0a2fbe2873d 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 <http://www.gnu.org/licenses/> * */ + 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 6b7c360b904..6cca838ad0d 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 <http://www.gnu.org/licenses/> * */ + 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 463d7db7d93..9819b872527 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 <http://www.gnu.org/licenses/> * */ + 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 bf3f3f42b47..f3ef96a61b2 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 c66afc1ffc5..dd0ecbba448 100644 --- a/apps/encryption/lib/KeyManager.php +++ b/apps/encryption/lib/KeyManager.php @@ -25,14 +25,15 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + 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 2c515fd5f72..e53315082b9 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 f9cdef53f13..2e4bddc8e5b 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 778d1f224ad..016b266f052 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 7ada315e233..e98aa129ab6 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 eb2357bd10f..12087e1cce8 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 3b58148f376..ea591076470 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 c38436e68e2..79f03f214ea 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 8e3b71e4d52..ffd12bd20b9 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 9645dc3cce0..7ecb017b855 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 c14549bb96a..64e29241a07 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 af9b2eae307..80ff97f17ee 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 3e47b4b0750..1f628ff19c9 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 0b0c09bbf79..5db3d10cc8f 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 2295b90625d..c59343a7c9b 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 9b737cdb82f..942c3469c95 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 7bced196793..a11aca2f75b 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 54b3187a97e..728ffe1d932 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 f61969039a8..141120671f2 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 17721d81eaf..477501be1a8 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 73ac062be09..158ef1f4c18 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 e3d7028ef65..02c21020b70 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 d54f24d97fe..febd43c554c 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 4d93dec18f7..a95320daf48 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 70733bc9e2c..fc820abb584 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 bfe02169fbd..85a65fae1d9 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 062c79ad97d..fa3e17271cf 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 358bef428bc..63691f61624 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 e4556972b10..db4c3914115 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 7edcb56d0c6..57d82f63e16 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 98ad8832fa1..ae233e565d1 100644 --- a/apps/federatedfilesharing/tests/FederatedShareProviderTest.php +++ b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php @@ -25,6 +25,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OCA\FederatedFileSharing\Tests; diff --git a/apps/federatedfilesharing/tests/NotificationsTest.php b/apps/federatedfilesharing/tests/NotificationsTest.php index 4c491ba2f9a..d93b9d608c3 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 d6f3f8fe5da..37798269a38 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 3798a03cb54..76d4bd3596f 100644 --- a/apps/federation/lib/AppInfo/Application.php +++ b/apps/federation/lib/AppInfo/Application.php @@ -29,10 +29,10 @@ use OCA\Federation\Hooks; use OCA\Federation\Middleware\AddServerMiddleware; use OCP\AppFramework\App; use OCP\SabrePluginEvent; +use OCP\Share; use OCP\Util; use Sabre\DAV\Auth\Plugin; use Sabre\DAV\Server; -use OCP\Share; class Application extends App { diff --git a/apps/federation/lib/BackgroundJob/GetSharedSecret.php b/apps/federation/lib/BackgroundJob/GetSharedSecret.php index 30b04c5b123..d4e403ae45e 100644 --- a/apps/federation/lib/BackgroundJob/GetSharedSecret.php +++ b/apps/federation/lib/BackgroundJob/GetSharedSecret.php @@ -27,14 +27,13 @@ * */ - namespace OCA\Federation\BackgroundJob; use GuzzleHttp\Exception\ClientException; use GuzzleHttp\Exception\RequestException; use GuzzleHttp\Ring\Exception\RingException; -use OC\BackgroundJob\JobList; use OC\BackgroundJob\Job; +use OC\BackgroundJob\JobList; use OCA\Federation\TrustedServers; use OCP\AppFramework\Http; use OCP\AppFramework\Utility\ITimeFactory; diff --git a/apps/federation/lib/BackgroundJob/RequestSharedSecret.php b/apps/federation/lib/BackgroundJob/RequestSharedSecret.php index fb9fd25888f..863c893e51c 100644 --- a/apps/federation/lib/BackgroundJob/RequestSharedSecret.php +++ b/apps/federation/lib/BackgroundJob/RequestSharedSecret.php @@ -27,15 +27,14 @@ * */ - namespace OCA\Federation\BackgroundJob; use GuzzleHttp\Exception\ClientException; use GuzzleHttp\Exception\RequestException; use GuzzleHttp\Ring\Exception\RingException; -use OC\BackgroundJob\JobList; use OC\BackgroundJob\Job; +use OC\BackgroundJob\JobList; use OCA\Federation\TrustedServers; use OCP\AppFramework\Http; use OCP\AppFramework\Utility\ITimeFactory; diff --git a/apps/federation/lib/Command/SyncFederationAddressBooks.php b/apps/federation/lib/Command/SyncFederationAddressBooks.php index 3b1f95b0502..ebfcb4dd949 100644 --- a/apps/federation/lib/Command/SyncFederationAddressBooks.php +++ b/apps/federation/lib/Command/SyncFederationAddressBooks.php @@ -22,6 +22,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OCA\Federation\Command; use Symfony\Component\Console\Command\Command; diff --git a/apps/federation/lib/Controller/OCSAuthAPIController.php b/apps/federation/lib/Controller/OCSAuthAPIController.php index 0433cd04b1b..8a21603bb96 100644 --- a/apps/federation/lib/Controller/OCSAuthAPIController.php +++ b/apps/federation/lib/Controller/OCSAuthAPIController.php @@ -26,7 +26,6 @@ * */ - namespace OCA\Federation\Controller; use OCA\Federation\DbHandler; diff --git a/apps/federation/lib/Controller/SettingsController.php b/apps/federation/lib/Controller/SettingsController.php index 6e64200dc8c..97aff93491e 100644 --- a/apps/federation/lib/Controller/SettingsController.php +++ b/apps/federation/lib/Controller/SettingsController.php @@ -31,7 +31,6 @@ use OCP\AppFramework\Http\DataResponse; use OCP\IL10N; use OCP\IRequest; - class SettingsController extends Controller { /** @var IL10N */ diff --git a/apps/federation/lib/DAV/FedAuth.php b/apps/federation/lib/DAV/FedAuth.php index 511888f7683..eb96fa75d76 100644 --- a/apps/federation/lib/DAV/FedAuth.php +++ b/apps/federation/lib/DAV/FedAuth.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OCA\Federation\DAV; use OCA\Federation\DbHandler; diff --git a/apps/federation/lib/DbHandler.php b/apps/federation/lib/DbHandler.php index abfb4c2f1b9..60142a8f0a7 100644 --- a/apps/federation/lib/DbHandler.php +++ b/apps/federation/lib/DbHandler.php @@ -24,7 +24,6 @@ * */ - namespace OCA\Federation; diff --git a/apps/federation/lib/Hooks.php b/apps/federation/lib/Hooks.php index 6601b9c0eb7..48ef0f3c0b7 100644 --- a/apps/federation/lib/Hooks.php +++ b/apps/federation/lib/Hooks.php @@ -20,7 +20,6 @@ * */ - namespace OCA\Federation; diff --git a/apps/federation/lib/SyncFederationAddressBooks.php b/apps/federation/lib/SyncFederationAddressBooks.php index b5cd9a574c4..cb485ccfc63 100644 --- a/apps/federation/lib/SyncFederationAddressBooks.php +++ b/apps/federation/lib/SyncFederationAddressBooks.php @@ -22,6 +22,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OCA\Federation; use OC\OCS\DiscoveryService; diff --git a/apps/federation/lib/TrustedServers.php b/apps/federation/lib/TrustedServers.php index 092279eb2b9..391ba76c998 100644 --- a/apps/federation/lib/TrustedServers.php +++ b/apps/federation/lib/TrustedServers.php @@ -24,7 +24,6 @@ * */ - namespace OCA\Federation; use OC\HintException; diff --git a/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php b/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php index d195c81de31..adc621650af 100644 --- a/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php +++ b/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php @@ -24,15 +24,14 @@ * */ - namespace OCA\Federation\Tests\BackgroundJob; use GuzzleHttp\Exception\ConnectException; use GuzzleHttp\Ring\Exception\RingException; use OCA\Federation\BackgroundJob\GetSharedSecret; -use OCA\Files_Sharing\Tests\TestCase; use OCA\Federation\TrustedServers; +use OCA\Files_Sharing\Tests\TestCase; use OCP\AppFramework\Http; use OCP\AppFramework\Utility\ITimeFactory; use OCP\BackgroundJob\IJobList; diff --git a/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php b/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php index 45bed657ef8..e8f63fb30d3 100644 --- a/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php +++ b/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php @@ -23,7 +23,6 @@ * */ - namespace OCA\Federation\Tests\BackgroundJob; diff --git a/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php b/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php index 26c0235fa70..df9f284d2c9 100644 --- a/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php +++ b/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php @@ -23,7 +23,6 @@ * */ - namespace OCA\Federation\Tests\Controller; diff --git a/apps/federation/tests/Controller/SettingsControllerTest.php b/apps/federation/tests/Controller/SettingsControllerTest.php index f023274e3e4..41312b8ef2c 100644 --- a/apps/federation/tests/Controller/SettingsControllerTest.php +++ b/apps/federation/tests/Controller/SettingsControllerTest.php @@ -21,7 +21,6 @@ * */ - namespace OCA\Federation\Tests\Controller; diff --git a/apps/federation/tests/DAV/FedAuthTest.php b/apps/federation/tests/DAV/FedAuthTest.php index 10c5e165eef..1140df334c8 100644 --- a/apps/federation/tests/DAV/FedAuthTest.php +++ b/apps/federation/tests/DAV/FedAuthTest.php @@ -20,7 +20,6 @@ * */ - namespace OCA\Federation\Tests\DAV; use OCA\Federation\DAV\FedAuth; diff --git a/apps/federation/tests/DbHandlerTest.php b/apps/federation/tests/DbHandlerTest.php index 8a1b9e32755..bad02685534 100644 --- a/apps/federation/tests/DbHandlerTest.php +++ b/apps/federation/tests/DbHandlerTest.php @@ -23,7 +23,6 @@ * */ - namespace OCA\Federation\Tests; diff --git a/apps/federation/tests/HooksTest.php b/apps/federation/tests/HooksTest.php index e60c244d08c..34ac8dfd539 100644 --- a/apps/federation/tests/HooksTest.php +++ b/apps/federation/tests/HooksTest.php @@ -21,7 +21,6 @@ * */ - namespace OCA\Federation\Tests; diff --git a/apps/federation/tests/Middleware/AddServerMiddlewareTest.php b/apps/federation/tests/Middleware/AddServerMiddlewareTest.php index 7bae5e566fc..eb063019424 100644 --- a/apps/federation/tests/Middleware/AddServerMiddlewareTest.php +++ b/apps/federation/tests/Middleware/AddServerMiddlewareTest.php @@ -23,7 +23,6 @@ * */ - namespace OCA\Federation\Tests\Middleware; diff --git a/apps/federation/tests/SyncFederationAddressbooksTest.php b/apps/federation/tests/SyncFederationAddressbooksTest.php index 3ee12c8830c..2148b4b3c00 100644 --- a/apps/federation/tests/SyncFederationAddressbooksTest.php +++ b/apps/federation/tests/SyncFederationAddressbooksTest.php @@ -23,6 +23,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OCA\Federation\Tests; use OC\OCS\DiscoveryService; diff --git a/apps/federation/tests/TrustedServersTest.php b/apps/federation/tests/TrustedServersTest.php index c350796a01a..209f41322c4 100644 --- a/apps/federation/tests/TrustedServersTest.php +++ b/apps/federation/tests/TrustedServersTest.php @@ -25,7 +25,6 @@ * */ - namespace OCA\Federation\Tests; diff --git a/apps/files/l10n/de_DE.js b/apps/files/l10n/de_DE.js index 664a8264951..e6c398dd9b0 100644 --- a/apps/files/l10n/de_DE.js +++ b/apps/files/l10n/de_DE.js @@ -110,7 +110,7 @@ OC.L10N.register( "Moved by {user}" : "Verschoben durch {user}", "\"remote user\"" : "„Externer Benutzer“", "You created {file}" : "Sie haben {file} erstellt", - "You created an encrypted file in {file}" : "Sie haben die verschlüsselte Datei in {file} erstellt", + "You created an encrypted file in {file}" : "Sie haben eine verschlüsselte Datei in {file} erstellt", "{user} created {file}" : "{user} hat {file} erstellt", "{user} created an encrypted file in {file}" : "{user} hat eine verschlüsselte Datei in {file} erstellt", "{file} was created in a public folder" : "{file} wurde in einem öffentlichen Ordner erstellt", diff --git a/apps/files/l10n/de_DE.json b/apps/files/l10n/de_DE.json index 1df1d671185..2b06750ae5f 100644 --- a/apps/files/l10n/de_DE.json +++ b/apps/files/l10n/de_DE.json @@ -108,7 +108,7 @@ "Moved by {user}" : "Verschoben durch {user}", "\"remote user\"" : "„Externer Benutzer“", "You created {file}" : "Sie haben {file} erstellt", - "You created an encrypted file in {file}" : "Sie haben die verschlüsselte Datei in {file} erstellt", + "You created an encrypted file in {file}" : "Sie haben eine verschlüsselte Datei in {file} erstellt", "{user} created {file}" : "{user} hat {file} erstellt", "{user} created an encrypted file in {file}" : "{user} hat eine verschlüsselte Datei in {file} erstellt", "{file} was created in a public folder" : "{file} wurde in einem öffentlichen Ordner erstellt", diff --git a/apps/files/l10n/zh_CN.js b/apps/files/l10n/zh_CN.js index 8e0bf24c148..cf2edfe71bd 100644 --- a/apps/files/l10n/zh_CN.js +++ b/apps/files/l10n/zh_CN.js @@ -73,7 +73,7 @@ OC.L10N.register( "New" : "新建", "Select file range" : "选择文件范围", "{used} of {quota} used" : "已使用 {used} / {quota}", - "{used} used" : "{used} 已使用", + "{used} used" : "已使用 {used} 存储空间", "\"{name}\" is an invalid file name." : "\"{name}\" 是一个无效的文件名。", "File name cannot be empty." : "文件名不能为空。", "\"/\" is not allowed inside a file name." : "文件名不能包含“/”", diff --git a/apps/files/l10n/zh_CN.json b/apps/files/l10n/zh_CN.json index 57dddb1d1c9..f640bb5cd69 100644 --- a/apps/files/l10n/zh_CN.json +++ b/apps/files/l10n/zh_CN.json @@ -71,7 +71,7 @@ "New" : "新建", "Select file range" : "选择文件范围", "{used} of {quota} used" : "已使用 {used} / {quota}", - "{used} used" : "{used} 已使用", + "{used} used" : "已使用 {used} 存储空间", "\"{name}\" is an invalid file name." : "\"{name}\" 是一个无效的文件名。", "File name cannot be empty." : "文件名不能为空。", "\"/\" is not allowed inside a file name." : "文件名不能包含“/”", diff --git a/apps/files/lib/Activity/Settings/FavoriteAction.php b/apps/files/lib/Activity/Settings/FavoriteAction.php index 8f798d6e5d3..e352172e4fa 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 f89c088e1bd..c1a5140ff10 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 945d25806a7..c655435c6eb 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 34ecc7cb2d7..bf2c84a0da0 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 ae0a4cae674..8ef838bc265 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 76f2cca5888..1e7c6174582 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 0bf9ae20525..8f355fa6255 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 6f06faa3cae..1ffd5e96471 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 <http://www.gnu.org/licenses/> * */ + 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 6950afd1f00..734692d9c6c 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 244293ae70d..7ac42e7c6df 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 <http://www.gnu.org/licenses/>. * */ + 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 a77a02a4947..5f51a80d998 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 38c378d480d..77db0dbe56a 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 17caf06b480..a1c1e5e3530 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 7437f0c31ad..0a31be7a558 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 e558800b9de..a75e54edfee 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 <http://www.gnu.org/licenses/> * */ + 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 8c48b9feca7..684192858e7 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 3beabf73ada..22daf7c23b4 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 eb4e4f6ca2c..4de56082e98 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 e4a41bd5d2e..709ba3b9c98 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 <http://www.gnu.org/licenses/> * */ + 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/l10n/de_DE.js b/apps/files_external/l10n/de_DE.js index e596fe4e89f..ddb91734dbd 100644 --- a/apps/files_external/l10n/de_DE.js +++ b/apps/files_external/l10n/de_DE.js @@ -128,7 +128,7 @@ OC.L10N.register( "Authentication" : "Authentifizierung", "Configuration" : "Konfiguration", "Available for" : "Verfügbar für", - "Click to recheck the configuration" : "Hier klicken um die Konfiguration erneut zu prüfen", + "Click to recheck the configuration" : "Hier klicken, um die Konfiguration erneut zu prüfen", "Add storage" : "Speicher hinzufügen", "Advanced settings" : "Erweiterte Einstellungen", "Allow users to mount external storage" : "Benutzern erlauben, externen Speicher einzubinden", diff --git a/apps/files_external/l10n/de_DE.json b/apps/files_external/l10n/de_DE.json index 55487e9b6a5..6c15e850a10 100644 --- a/apps/files_external/l10n/de_DE.json +++ b/apps/files_external/l10n/de_DE.json @@ -126,7 +126,7 @@ "Authentication" : "Authentifizierung", "Configuration" : "Konfiguration", "Available for" : "Verfügbar für", - "Click to recheck the configuration" : "Hier klicken um die Konfiguration erneut zu prüfen", + "Click to recheck the configuration" : "Hier klicken, um die Konfiguration erneut zu prüfen", "Add storage" : "Speicher hinzufügen", "Advanced settings" : "Erweiterte Einstellungen", "Allow users to mount external storage" : "Benutzern erlauben, externen Speicher einzubinden", diff --git a/apps/files_external/lib/AppInfo/Application.php b/apps/files_external/lib/AppInfo/Application.php index 57ef28f2ae0..1ee7cb08ccf 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 c9586635baf..abed1117279 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 6404fb9de51..519018662a2 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 69056225f8a..a86cd8bd144 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 dd2bf69a0a6..d0efee750ea 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 55d079e9c69..4b1146ecb7a 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 724bdd01463..c0226497681 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 7da3458e54d..8f64fa1f288 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 6b583e6daa0..3b887003331 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 d39f459c660..89f4a10d06c 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 f0d741e0124..ff90481958a 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 6a95710b3ef..4f94192913c 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 a5317ae9fa6..15b046b2765 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 f25918561f8..27ddb56086c 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 ead790e0ab5..0206185fe36 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 14398c1ad82..25b6ad80bbe 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 c1397ae8f8c..abdc5a12a60 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 dfdfd072980..a8846f814d2 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 95a10ebb1d9..ca1dfc2cb82 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 8ea9ad0f785..aea2a44baa9 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 6bac2bd9c18..271f55d2c1c 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 25c4a1767e9..3f7168fea11 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 fecdbae9e4e..91ef66d12a0 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 <http://www.gnu.org/licenses/>. * */ + 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 509c6453dc9..56c549c7dcb 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 d00c1802b4b..53e2e8558ab 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 2863a33c2c0..34f1a91e0ea 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 d224d231281..3798deddf6e 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 7b3eb26aec9..b8a14281544 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 3fc073b842d..4742108aced 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 e0a2734d7ba..1a406645a2a 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 cbf28be2bf2..8ca176db502 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 561e0496083..e15b3c26948 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 73d3acd3565..e7f386b4b7f 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 e9bb5665606..83835ff5f61 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 074c729b429..872377ab396 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 72fc236bcdc..ce38ebde9fb 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 251b04eada0..bc6973353b1 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 178e5e5d2b6..2f20de2e6fd 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 1d99fa9c162..6b31b66027c 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 dc0799042e5..76fb480dd14 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 07fe99f9406..6a29f3b605a 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 d060dbe2f9d..156d455a2de 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 37cd0eae9ea..5c66e3cf978 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 b5e5d12472d..a707031121e 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 9340b08fefc..37b86395e23 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 <http://www.gnu.org/licenses/> * */ + 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 093e6840a19..fc2d6f9faa3 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 a0f5c53382e..00430fae076 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 7d886de04dd..1442d85b2d3 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 59af54f79e4..167b1017b02 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 d0431ed11a6..3d1e717d84f 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 79eb03cea21..9656e99c5cb 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 355401bb84f..0a34d6c3485 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 0c422b2b85e..4d9541cb416 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 5c6464cf719..5bf7b82d4dd 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 85bbbeb57d9..1162b50929f 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 bc8aa6a0aee..fc109722b74 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 c1d54d1ca34..8a53de43e64 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 1153036c414..f18ee8323b3 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 <http://www.gnu.org/licenses/>. * */ + 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 2e0245e76fa..c3a684f2e98 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 <http://www.gnu.org/licenses/> * */ + 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 ad0a3401412..0340057809d 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 <http://www.gnu.org/licenses/> * */ + 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 817c5b4e5c3..067fd45972c 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 <http://www.gnu.org/licenses/> * */ + 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 d60d9677dbe..0d30359ff7d 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 89c9fc76fae..0fa95418958 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 71990553e8d..707ee899419 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 <http://www.gnu.org/licenses/> * */ + 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 ba62feb7f96..2760374e59d 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 <http://www.gnu.org/licenses/> * */ + 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 44fa6c31b7d..ef0f1852d91 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 88928d1a217..3a6d22f2ad4 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 <http://www.gnu.org/licenses/> * */ + 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 2d90ec3a488..ea6346151bf 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 <http://www.gnu.org/licenses/> * */ + 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 ce616ca175f..83552ca21a3 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 5b56becb4ad..0e12a5f4afa 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 f1564304e2f..3853d0e6ce1 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 6cd62309e68..c67d418f674 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 85b2eec057f..9ad7cfd56a8 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 609b362d60d..fc59f0ed38b 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 fdda8baace8..6517be493d7 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 b007ded2662..c0d69592c2a 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/l10n/zh_CN.js b/apps/files_sharing/l10n/zh_CN.js index 233943cd63f..ff063dd2e6c 100644 --- a/apps/files_sharing/l10n/zh_CN.js +++ b/apps/files_sharing/l10n/zh_CN.js @@ -117,6 +117,7 @@ OC.L10N.register( "File sharing" : "文件共享", "This application enables users to share files within Nextcloud. If enabled, the admin can choose which groups can share files. The applicable users can then share files and folders with other users and groups within Nextcloud. In addition, if the admin enables the share link feature, an external link can be used to share files with other users outside of Nextcloud. Admins can also enforce passwords, expirations dates, and enable server to server sharing via share links, as well as sharing from mobile devices.\nTurning the feature off removes shared files and folders on the server for all share recipients, and also on the sync clients and mobile apps. More information is available in the Nextcloud Documentation." : "这个应用程序允许用户在 Nextcloud 内部共享文件。如果启用，管理员能够选择哪个组可以共享文件。然后，可用的用户能够共享文件和文件夹给 Nextcloud 中的其他用户和组。另外，如果管理员启用了共享链接功能，能够使用外部链接将文件共享给 Nextcloud 之外的其他用户。管理员也可以强制设置密码，过期日期，并且可以通过共享链接启用服务器到服务器的共享，以及从移动设备共享。\n关闭该功能将删除服务器上所有共享接收者以用同步客户端和移动应用上的共享文件和文件夹。更多信息可查阅 Nextcloud 文档。", "Allow editing" : "允许编辑", + "Can reshare" : "可以再次共享", "Expiration date enforced" : "强制过期日期", "Set expiration date" : "设置过期日期", "Enter a date" : "输入日期", @@ -124,19 +125,28 @@ OC.L10N.register( "group" : "分组", "conversation" : "会话", "remote" : "远程", + "remote group" : "远程分组", "guest" : "访客", "Shared with the group {user} by {owner}" : "{owner} 共享给分组 {user}", "Shared with {user} by {owner}" : "{owner} 共享给 {user}", + "Internal link" : "内部链接", + "Link copied" : "已复制链接", + "Copy to clipboard" : "复制到剪贴板", "Only works for users with access to this folder" : "仅适用于有权限访问此文件夹的用户", "Password protection (enforced)" : "密码保护（强制）", + "Password protection" : "密码保护", "Enter a password" : "输入密码", + "Expiration date (enforced)" : "过期日期（强制）", "Cancel" : "取消", "Read only" : "只读", "Allow upload and editing" : "允许上传和编辑", "Password protect" : "密码保护", "Delete share" : "删除共享", + "Add another link" : "添加其他链接", + "Create a new share link" : "创建新的共享链接", "Shared via link by {initiator}" : "由 {initiator} 通过链接共享", "Share link" : "共享链接", + "Error, please enter proper password and/or expiration date" : "错误，请输入正确的密码和/或过期日期", "No recommendations. Start typing." : "没有推荐。开始输入。", "Name or email address..." : "姓名或电子邮件地址...", "Name or federated cloud ID..." : "姓名或联合云 ID...", diff --git a/apps/files_sharing/l10n/zh_CN.json b/apps/files_sharing/l10n/zh_CN.json index cb872733608..fe03d20d9a0 100644 --- a/apps/files_sharing/l10n/zh_CN.json +++ b/apps/files_sharing/l10n/zh_CN.json @@ -115,6 +115,7 @@ "File sharing" : "文件共享", "This application enables users to share files within Nextcloud. If enabled, the admin can choose which groups can share files. The applicable users can then share files and folders with other users and groups within Nextcloud. In addition, if the admin enables the share link feature, an external link can be used to share files with other users outside of Nextcloud. Admins can also enforce passwords, expirations dates, and enable server to server sharing via share links, as well as sharing from mobile devices.\nTurning the feature off removes shared files and folders on the server for all share recipients, and also on the sync clients and mobile apps. More information is available in the Nextcloud Documentation." : "这个应用程序允许用户在 Nextcloud 内部共享文件。如果启用，管理员能够选择哪个组可以共享文件。然后，可用的用户能够共享文件和文件夹给 Nextcloud 中的其他用户和组。另外，如果管理员启用了共享链接功能，能够使用外部链接将文件共享给 Nextcloud 之外的其他用户。管理员也可以强制设置密码，过期日期，并且可以通过共享链接启用服务器到服务器的共享，以及从移动设备共享。\n关闭该功能将删除服务器上所有共享接收者以用同步客户端和移动应用上的共享文件和文件夹。更多信息可查阅 Nextcloud 文档。", "Allow editing" : "允许编辑", + "Can reshare" : "可以再次共享", "Expiration date enforced" : "强制过期日期", "Set expiration date" : "设置过期日期", "Enter a date" : "输入日期", @@ -122,19 +123,28 @@ "group" : "分组", "conversation" : "会话", "remote" : "远程", + "remote group" : "远程分组", "guest" : "访客", "Shared with the group {user} by {owner}" : "{owner} 共享给分组 {user}", "Shared with {user} by {owner}" : "{owner} 共享给 {user}", + "Internal link" : "内部链接", + "Link copied" : "已复制链接", + "Copy to clipboard" : "复制到剪贴板", "Only works for users with access to this folder" : "仅适用于有权限访问此文件夹的用户", "Password protection (enforced)" : "密码保护（强制）", + "Password protection" : "密码保护", "Enter a password" : "输入密码", + "Expiration date (enforced)" : "过期日期（强制）", "Cancel" : "取消", "Read only" : "只读", "Allow upload and editing" : "允许上传和编辑", "Password protect" : "密码保护", "Delete share" : "删除共享", + "Add another link" : "添加其他链接", + "Create a new share link" : "创建新的共享链接", "Shared via link by {initiator}" : "由 {initiator} 通过链接共享", "Share link" : "共享链接", + "Error, please enter proper password and/or expiration date" : "错误，请输入正确的密码和/或过期日期", "No recommendations. Start typing." : "没有推荐。开始输入。", "Name or email address..." : "姓名或电子邮件地址...", "Name or federated cloud ID..." : "姓名或联合云 ID...", diff --git a/apps/files_sharing/lib/Activity/Settings/PublicLinks.php b/apps/files_sharing/lib/Activity/Settings/PublicLinks.php index 081081b9adf..1959bf97f0e 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 a208ead7ba5..98b2eeb9890 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 b07872ded99..9b2d9098ff8 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 5f48088d719..a9060763a2b 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 6249eaca502..793ee632d49 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 <http://www.gnu.org/licenses/>. * */ + 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 7c0478fa7c1..6a16da0231c 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 <http://www.gnu.org/licenses/> * */ + 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 fe4c09dd195..3cba4416800 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 33990727ffd..d9ec459d1ae 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 <http://www.gnu.org/licenses/>. * */ + 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 90a76e2223d..db92b8f3818 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 @@ -181,7 +181,7 @@ class ShareAPIController extends OCSController { throw new NotFoundException(); } } else { - $node = $nodes[0]; + $node = reset($nodes); } } diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php index f5cbb63e083..aca93197674 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 14b56d28954..5ecf00321fc 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 <http://www.gnu.org/licenses/>. * */ + 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 e1546e115ec..e750235470d 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 <http://www.gnu.org/licenses/> * */ + 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 72dea4b7dcb..ad33ec1dd7c 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 <http://www.gnu.org/licenses/> * */ + 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 faf9ef4756d..4bc6d2499cc 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 <http://www.gnu.org/licenses/>. * */ + 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 7a6ecc483e8..489a67aec91 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 <http://www.gnu.org/licenses/>. * */ + 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 b5f1178b7f0..f3546514c40 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 52bb0eb8236..21ee7e08802 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 18ea879d5d8..20499b47154 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 67868b512c3..5f02c2fe5c4 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 077f2cdbe71..493f607dba2 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 <http://www.gnu.org/licenses/> * */ + 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 7380f39dfba..257d9c35dff 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 175f05fb1da..ed556172a27 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 <http://www.gnu.org/licenses/>. * */ + 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 c741159cdb4..6452ad50019 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 <http://www.gnu.org/licenses/> * */ + 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 97e234ca22c..01b20e58572 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 882e858217e..cd548ecfa21 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 <http://www.gnu.org/licenses/>. * */ + 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 a20c66a39bd..03f19525e0d 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 84449048ef3..e255f08ccf1 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 0129e760648..02109e35db1 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 <http://www.gnu.org/licenses/> * */ + 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 8cbf03b8b61..a1d1f1bf551 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 <http://www.gnu.org/licenses/>. * */ + 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 cbac5c7bef5..781861aa392 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 <http://www.gnu.org/licenses/>. * */ + 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 1fea73e6b47..f49b472a35c 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 7b533bf8106..f4acfdfafe7 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 05a83302566..a64d0b25e17 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 b26af57fc11..e2cb65d9acc 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 a2613a13b41..08fdae18d9d 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 919317a7b7a..225c751cc4b 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 d2f8f72be8b..af024d0e823 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 6b46fd9e626..72520b9e9ba 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 e62d875c59d..65c35e8eb11 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 933375c9537..be1e1871220 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 071a1a7766a..e19a5cfa480 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 <http://www.gnu.org/licenses/> * */ + 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 7a05fbe9507..4bb74161c12 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 <http://www.gnu.org/licenses/>. * */ + 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 177064dbb48..83c53d04558 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 108aaf4f312..fa927632def 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 <http://www.gnu.org/licenses/>. * */ + namespace OCA\Files_Trashbin\Sabre; diff --git a/apps/files_trashbin/lib/Sabre/TrashFolderFile.php b/apps/files_trashbin/lib/Sabre/TrashFolderFile.php index 31ee9535b72..553e6ca0ac4 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 <http://www.gnu.org/licenses/>. * */ + namespace OCA\Files_Trashbin\Sabre; diff --git a/apps/files_trashbin/lib/Sabre/TrashRoot.php b/apps/files_trashbin/lib/Sabre/TrashRoot.php index 45f27f48b17..78e1e0303d6 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 <http://www.gnu.org/licenses/>. * */ + 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 5339d600722..894030792e3 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 2a3e89bf414..c4729d7a7c7 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 1ea3fc19c05..9a517df1a54 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 02bb63fa17a..fd562b5cd04 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 <http://www.gnu.org/licenses/>. * */ + 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 7632915e002..c98f5fd2b1e 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 c5791f33d3a..25dc7fe5973 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 47a1903a535..71ddaaac6de 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 0669034431b..8df0c8144df 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 83195d10a30..23df07b0a7e 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 ad08f10e46c..aeea35e80cd 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 37125064caf..481f245b610 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 c8504646bad..880d501b408 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 1c689a4d87b..68b256d4771 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 <http://www.gnu.org/licenses/>. * */ + 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 289c7123c24..48720d2fbcc 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 a7c34b7ac70..3502132b2f2 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 66bd2dd062c..4e919728328 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 <http://www.gnu.org/licenses/>. * */ + 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 0a7e3cd5b9b..2421dda5d43 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 b05d3781e5c..82806e228d0 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 14d925d3b6f..aa0dbc1a53c 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 487eee49c44..b47ddff237b 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 f5a8138fa2d..04fd3d6ecd9 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 c09a7b3420c..c6f7ab2a0e8 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 d642d095d5d..317be717fce 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 <http://www.gnu.org/licenses/>. * */ + 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 780d4f7a761..8804dc21031 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 3ceb16c1b0d..63d08ebf57d 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 72285f55192..b758c75ca21 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 c69c7d62605..ced4f72178c 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 11ffb8b0903..f9f063b8834 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 <http://www.gnu.org/licenses/>. * */ + 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 c882ec10279..780f541184f 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 <http://www.gnu.org/licenses/>. * */ + 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 d1b0754633d..e47db4fd51d 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 2d8b79842f2..5ebc43d2b1d 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 <http://www.gnu.org/licenses/>. * */ + 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 1ff2c82a3be..7d65c5bc1bc 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/l10n/cs.js b/apps/settings/l10n/cs.js index 9733b0d9182..915cf76303c 100644 --- a/apps/settings/l10n/cs.js +++ b/apps/settings/l10n/cs.js @@ -262,7 +262,7 @@ OC.L10N.register( "Issued By" : "Vydal", "Valid until %s" : "Platný do %s", "Import root certificate" : "Import kořenového certifikátu", - "Administrator documentation" : "Dokumentace pro správu", + "Administrator documentation" : "Dokumentace pro správce", "Documentation" : "Dokumentace", "Forum" : "Diskuzní fórum", "None" : "Žádné", diff --git a/apps/settings/l10n/cs.json b/apps/settings/l10n/cs.json index 8bb04caf6a5..ad0c4c7e0be 100644 --- a/apps/settings/l10n/cs.json +++ b/apps/settings/l10n/cs.json @@ -260,7 +260,7 @@ "Issued By" : "Vydal", "Valid until %s" : "Platný do %s", "Import root certificate" : "Import kořenového certifikátu", - "Administrator documentation" : "Dokumentace pro správu", + "Administrator documentation" : "Dokumentace pro správce", "Documentation" : "Dokumentace", "Forum" : "Diskuzní fórum", "None" : "Žádné", diff --git a/apps/settings/l10n/zh_CN.js b/apps/settings/l10n/zh_CN.js index 3abf3087df9..edb290eda38 100644 --- a/apps/settings/l10n/zh_CN.js +++ b/apps/settings/l10n/zh_CN.js @@ -83,7 +83,7 @@ OC.L10N.register( "Settings saved" : "设置已保存", "Unable to change full name" : "无法修改全名", "Unable to change email address" : "无法修改电子邮箱地址", - "In order to verify your Twitter account, post the following tweet on Twitter (please make sure to post it without any line breaks):" : "为了验证您的 Twitter 帐户，请在 Twitter 上发布以下推文（请确保发布没有任何换行符）：", + "In order to verify your Twitter account, post the following tweet on Twitter (please make sure to post it without any line breaks):" : "为了验证您的 Twitter 账号，请在 Twitter 上发布以下推文（请确保发布内容中没有任何换行符）：", "In order to verify your Website, store the following content in your web-root at '.well-known/CloudIdVerificationCode.txt' (please make sure that the complete text is in one line):" : "为了验证您的网站，请将以下内容存储在“.well-known / CloudIdVerificationCode.txt”的网络根目录中（请确保完整的文本在一行中）：", "%1$s changed your password on %2$s." : "%1$s 更改了您在 %2$s 上的密码。", "Your password on %s was changed." : "您在 %s 上的密码已被更改。", @@ -96,10 +96,10 @@ OC.L10N.register( "Email address for %1$s changed on %2$s" : "%2$s 上 %1$s 的电子邮件地址已更改", "Email address changed for %s" : "%s 的电子邮件地址已更改", "The new email address is %s" : "新的电子邮件地址是%s", - "Your %s account was created" : "您的 %s 帐户已创建", + "Your %s account was created" : "您的账号 %s 已创建", "Welcome aboard" : "欢迎使用", "Welcome aboard %s" : "%s，欢迎使用", - "Welcome to your %s account, you can add, protect, and share your data." : "欢迎使用您的 %s 帐户，您可以添加、保护和共享您的数据。", + "Welcome to your %s account, you can add, protect, and share your data." : "欢迎使用您的 %s 账号，您可以添加、保护和共享您的数据。", "Your username is: %s" : "您的用户名是：%s", "Set your password" : "设置您的密码", "Go to %s" : "访问 %s", @@ -110,7 +110,7 @@ OC.L10N.register( "Share" : "共享", "Unlimited" : "无限", "Verifying" : "正在验证", - "Nextcloud settings" : "Nextcloud设置", + "Nextcloud settings" : "Nextcloud 设置", "Two-factor authentication can be enforced for all\tusers and specific groups. If they do not have a two-factor provider configured, they will be unable to log into the system." : "两步验证可以对于所有用户和特定组启用。如果没有设置两步验证方式提供者，他们则不能登录到系统。", "Enforce two-factor authentication" : "强制启用两步验证", "Limit to groups" : "限制于组", @@ -123,6 +123,8 @@ OC.L10N.register( "Save changes" : "保存修改", "This app is supported via your current Nextcloud subscription." : "根据您的Nextcloud订阅，此应用受到支持。", "Supported" : "受支持", + "Featured apps are developed by and within the community. They offer central functionality and are ready for production use." : "特色应用由社区并在社区内开发。 它们提供了中心功能，并准备投入生产使用。", + "Featured" : "精选", "by" : "由", "Update to {version}" : "更新至 {version}", "Remove" : "移除", @@ -148,7 +150,7 @@ OC.L10N.register( "Enable" : "启用", "Enable untested app" : "启用未经测试的应用", "The app will be downloaded from the app store" : "该应用将从应用商店下载", - "This app is not marked as compatible with your Nextcloud version. If you continue you will still be able to install the app. Note that the app might not work as expected." : "此应用被标记为与您的Nextcloud版本不兼容。如果您要继续，您仍可安装此应用。请注意此应用可能不会正常工作。", + "This app is not marked as compatible with your Nextcloud version. If you continue you will still be able to install the app. Note that the app might not work as expected." : "此应用被标记为与您的 Nextcloud 版本不兼容。如果您要继续，您仍可安装此应用。请注意此应用可能不会正常工作。", "Marked for remote wipe" : "标记为远程擦除", "Device settings" : "设备设置", "Allow filesystem access" : "允许访问文件系统", @@ -173,7 +175,7 @@ OC.L10N.register( "Device" : "设备", "Last activity" : "最后活跃", "Devices & sessions" : "设备和活动链接", - "Web, desktop and mobile clients currently logged in to your account." : "您账号当前登录的 Web 页面，桌面和移动客户端。", + "Web, desktop and mobile clients currently logged in to your account." : "您账号当前登录的网页版，桌面和移动客户端。", "Do you really want to wipe your data from this device?" : "您真的要从此设备擦除您的数据吗？", "Confirm wipe" : "确认擦除", "Error while creating device token" : "创建设备令牌时出错", @@ -188,7 +190,7 @@ OC.L10N.register( "Username" : "用户名", "Password" : "密码", "Done" : "完成", - "Show QR code for mobile apps" : "为移动应用展示QR二维码", + "Show QR code for mobile apps" : "为移动应用展示二维码", "Copied!" : "已复制！", "Copy" : "复制", "Could not copy app password. Please copy it manually." : "无法复制应用密码。请手动复制。", @@ -205,8 +207,14 @@ OC.L10N.register( "Disable user" : "禁用用户", "Enable user" : "启用用户", "Resend welcome email" : "重新发送欢迎邮件", - "{size} used" : "{size} 已使用", + "{size} used" : "已使用 {size}", + "In case of lost device or exiting the organization, this can remotely wipe the Nextcloud data from all devices associated with {userid}. Only works if the devices are connected to the internet." : "如果设备丢失或退出组织，这可以从与 {userid} 关联的所有设备中远程擦除 Nextcloud 数据。 仅当设备连接到互联网时才有效。", + "Remote wipe of devices" : "远程擦除设备", + "Wipe {userid}'s devices" : "擦除 {userid} 的设备", "Cancel" : "取消", + "Fully delete {userid}'s account including all their personal files, app data, etc." : "完全删除 {userid} 的账号，包括其所有个人文件，应用程序数据等。", + "Account deletion" : "帐号删除", + "Delete {userid}'s account" : "删除 {userid} 的账号", "Welcome mail sent!" : "欢迎邮件已经发送！", "Display name" : "显示名称", "Email" : "电子邮件", @@ -354,7 +362,7 @@ OC.L10N.register( "Choose as profile picture" : "选择个人头像", "Details" : "详情", "You are a member of the following groups:" : "您是以下群组的成员：", - "You are using <strong>%s</strong>" : "您正在使用<strong>%s</strong>", + "You are using <strong>%s</strong>" : "您已经使用了 <strong>%s</strong> 存储空间", "You are using <strong>%1$s</strong> of <strong>%2$s</strong> (<strong>%3$s %%</strong>)" : "您正在使用 <strong>%1$s</strong> ，来自 <strong>%2$s</strong> (<strong>%3$s %%</strong>)", "Full name" : "全名", "No display name set" : "不显示名称设置", @@ -366,7 +374,7 @@ OC.L10N.register( "Address" : "地址", "Your postal address" : "您的邮寄地址", "Website" : "网站", - "It can take up to 24 hours before the account is displayed as verified." : "在帐户显示为验证之前最多可能需要24小时。", + "It can take up to 24 hours before the account is displayed as verified." : "在账号显示为已验证之前最多可能需要 24 小时。", "Link https://…" : "链接 https://…", "Twitter" : "推特", "Twitter handle @…" : "推特用户名@…", diff --git a/apps/settings/l10n/zh_CN.json b/apps/settings/l10n/zh_CN.json index 71587312c95..cb474d86d50 100644 --- a/apps/settings/l10n/zh_CN.json +++ b/apps/settings/l10n/zh_CN.json @@ -81,7 +81,7 @@ "Settings saved" : "设置已保存", "Unable to change full name" : "无法修改全名", "Unable to change email address" : "无法修改电子邮箱地址", - "In order to verify your Twitter account, post the following tweet on Twitter (please make sure to post it without any line breaks):" : "为了验证您的 Twitter 帐户，请在 Twitter 上发布以下推文（请确保发布没有任何换行符）：", + "In order to verify your Twitter account, post the following tweet on Twitter (please make sure to post it without any line breaks):" : "为了验证您的 Twitter 账号，请在 Twitter 上发布以下推文（请确保发布内容中没有任何换行符）：", "In order to verify your Website, store the following content in your web-root at '.well-known/CloudIdVerificationCode.txt' (please make sure that the complete text is in one line):" : "为了验证您的网站，请将以下内容存储在“.well-known / CloudIdVerificationCode.txt”的网络根目录中（请确保完整的文本在一行中）：", "%1$s changed your password on %2$s." : "%1$s 更改了您在 %2$s 上的密码。", "Your password on %s was changed." : "您在 %s 上的密码已被更改。", @@ -94,10 +94,10 @@ "Email address for %1$s changed on %2$s" : "%2$s 上 %1$s 的电子邮件地址已更改", "Email address changed for %s" : "%s 的电子邮件地址已更改", "The new email address is %s" : "新的电子邮件地址是%s", - "Your %s account was created" : "您的 %s 帐户已创建", + "Your %s account was created" : "您的账号 %s 已创建", "Welcome aboard" : "欢迎使用", "Welcome aboard %s" : "%s，欢迎使用", - "Welcome to your %s account, you can add, protect, and share your data." : "欢迎使用您的 %s 帐户，您可以添加、保护和共享您的数据。", + "Welcome to your %s account, you can add, protect, and share your data." : "欢迎使用您的 %s 账号，您可以添加、保护和共享您的数据。", "Your username is: %s" : "您的用户名是：%s", "Set your password" : "设置您的密码", "Go to %s" : "访问 %s", @@ -108,7 +108,7 @@ "Share" : "共享", "Unlimited" : "无限", "Verifying" : "正在验证", - "Nextcloud settings" : "Nextcloud设置", + "Nextcloud settings" : "Nextcloud 设置", "Two-factor authentication can be enforced for all\tusers and specific groups. If they do not have a two-factor provider configured, they will be unable to log into the system." : "两步验证可以对于所有用户和特定组启用。如果没有设置两步验证方式提供者，他们则不能登录到系统。", "Enforce two-factor authentication" : "强制启用两步验证", "Limit to groups" : "限制于组", @@ -121,6 +121,8 @@ "Save changes" : "保存修改", "This app is supported via your current Nextcloud subscription." : "根据您的Nextcloud订阅，此应用受到支持。", "Supported" : "受支持", + "Featured apps are developed by and within the community. They offer central functionality and are ready for production use." : "特色应用由社区并在社区内开发。 它们提供了中心功能，并准备投入生产使用。", + "Featured" : "精选", "by" : "由", "Update to {version}" : "更新至 {version}", "Remove" : "移除", @@ -146,7 +148,7 @@ "Enable" : "启用", "Enable untested app" : "启用未经测试的应用", "The app will be downloaded from the app store" : "该应用将从应用商店下载", - "This app is not marked as compatible with your Nextcloud version. If you continue you will still be able to install the app. Note that the app might not work as expected." : "此应用被标记为与您的Nextcloud版本不兼容。如果您要继续，您仍可安装此应用。请注意此应用可能不会正常工作。", + "This app is not marked as compatible with your Nextcloud version. If you continue you will still be able to install the app. Note that the app might not work as expected." : "此应用被标记为与您的 Nextcloud 版本不兼容。如果您要继续，您仍可安装此应用。请注意此应用可能不会正常工作。", "Marked for remote wipe" : "标记为远程擦除", "Device settings" : "设备设置", "Allow filesystem access" : "允许访问文件系统", @@ -171,7 +173,7 @@ "Device" : "设备", "Last activity" : "最后活跃", "Devices & sessions" : "设备和活动链接", - "Web, desktop and mobile clients currently logged in to your account." : "您账号当前登录的 Web 页面，桌面和移动客户端。", + "Web, desktop and mobile clients currently logged in to your account." : "您账号当前登录的网页版，桌面和移动客户端。", "Do you really want to wipe your data from this device?" : "您真的要从此设备擦除您的数据吗？", "Confirm wipe" : "确认擦除", "Error while creating device token" : "创建设备令牌时出错", @@ -186,7 +188,7 @@ "Username" : "用户名", "Password" : "密码", "Done" : "完成", - "Show QR code for mobile apps" : "为移动应用展示QR二维码", + "Show QR code for mobile apps" : "为移动应用展示二维码", "Copied!" : "已复制！", "Copy" : "复制", "Could not copy app password. Please copy it manually." : "无法复制应用密码。请手动复制。", @@ -203,8 +205,14 @@ "Disable user" : "禁用用户", "Enable user" : "启用用户", "Resend welcome email" : "重新发送欢迎邮件", - "{size} used" : "{size} 已使用", + "{size} used" : "已使用 {size}", + "In case of lost device or exiting the organization, this can remotely wipe the Nextcloud data from all devices associated with {userid}. Only works if the devices are connected to the internet." : "如果设备丢失或退出组织，这可以从与 {userid} 关联的所有设备中远程擦除 Nextcloud 数据。 仅当设备连接到互联网时才有效。", + "Remote wipe of devices" : "远程擦除设备", + "Wipe {userid}'s devices" : "擦除 {userid} 的设备", "Cancel" : "取消", + "Fully delete {userid}'s account including all their personal files, app data, etc." : "完全删除 {userid} 的账号，包括其所有个人文件，应用程序数据等。", + "Account deletion" : "帐号删除", + "Delete {userid}'s account" : "删除 {userid} 的账号", "Welcome mail sent!" : "欢迎邮件已经发送！", "Display name" : "显示名称", "Email" : "电子邮件", @@ -352,7 +360,7 @@ "Choose as profile picture" : "选择个人头像", "Details" : "详情", "You are a member of the following groups:" : "您是以下群组的成员：", - "You are using <strong>%s</strong>" : "您正在使用<strong>%s</strong>", + "You are using <strong>%s</strong>" : "您已经使用了 <strong>%s</strong> 存储空间", "You are using <strong>%1$s</strong> of <strong>%2$s</strong> (<strong>%3$s %%</strong>)" : "您正在使用 <strong>%1$s</strong> ，来自 <strong>%2$s</strong> (<strong>%3$s %%</strong>)", "Full name" : "全名", "No display name set" : "不显示名称设置", @@ -364,7 +372,7 @@ "Address" : "地址", "Your postal address" : "您的邮寄地址", "Website" : "网站", - "It can take up to 24 hours before the account is displayed as verified." : "在帐户显示为验证之前最多可能需要24小时。", + "It can take up to 24 hours before the account is displayed as verified." : "在账号显示为已验证之前最多可能需要 24 小时。", "Link https://…" : "链接 https://…", "Twitter" : "推特", "Twitter handle @…" : "推特用户名@…", diff --git a/apps/settings/lib/BackgroundJobs/VerifyUserData.php b/apps/settings/lib/BackgroundJobs/VerifyUserData.php index caac35f2de4..b4bc80b4ab5 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 93bb2cbb423..e0dddb68b4e 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 8325c911283..cb2abc2a52d 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 96b8867fff8..cabbfdf4387 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 <http://www.gnu.org/licenses/>. * */ + namespace OCA\Settings\Controller; use OC\HintException; diff --git a/apps/settings/lib/Controller/CommonSettingsTrait.php b/apps/settings/lib/Controller/CommonSettingsTrait.php index 69fe28d6fe5..c43587cb410 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/HelpController.php b/apps/settings/lib/Controller/HelpController.php index b09392aa8c8..df99d75e992 100644 --- a/apps/settings/lib/Controller/HelpController.php +++ b/apps/settings/lib/Controller/HelpController.php @@ -65,6 +65,7 @@ class HelpController extends Controller { * * @NoCSRFRequired * @NoAdminRequired + * @NoSubadminRequired */ public function help(string $mode = 'user'): TemplateResponse { $this->navigationManager->setActiveEntry('help'); diff --git a/apps/settings/lib/Controller/MailSettingsController.php b/apps/settings/lib/Controller/MailSettingsController.php index 3f91586b98e..cb77d9c4052 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 cb99d1bd74b..2c73ff50871 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 a927080df92..56d3bcb8cb7 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 c4c4cd0375c..7c0f196a856 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 800bec992a2..9019a63f473 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 <http://www.gnu.org/licenses/>. * */ + 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 f1f81c7c75b..2789fe00974 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 <http://www.gnu.org/licenses/>. * */ + 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 449f158ec4a..9b09631226f 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 40000e19171..ff698ffe225 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 a36cc201779..ed0e7775dc1 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 23e282b6eb4..4d6a4c21f00 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 7b12ca03e6c..1607926219e 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 20e6612f94e..f99af1e2f91 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 ee72ca00384..a55469c21e5 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 3eabc9ec89f..e6f9b060337 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 de57cd13211..020ed41364e 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 e032bc43ff1..6d8ca66b763 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 93a8d3aafa4..e3d40c8d873 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 2b35e5833a7..e041d75656d 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 903df175e9c..f77155af0b9 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 8b2fc200d57..b7150e6c6dc 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 090e6e92848..744c2d6f3ee 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 febb2c34432..7551d6c3a7a 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 233af80d9fb..76361678def 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 519e49077f8..0942ca22311 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 bffabf43dd7..68a309a4738 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 <http://www.gnu.org/licenses/>. * */ + 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 47895335640..25c2273279e 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 d377aa4f222..217d896adcb 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 dbcabfb8652..f7faf442a16 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 e749a1dbd44..85259b9abe7 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 <http://www.gnu.org/licenses/>. * */ + 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 93a1e040b4b..63e5d1e285a 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 <http://www.gnu.org/licenses/>. * */ + 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 994e0e4a045..69ec6495605 100644 --- a/apps/theming/tests/IconBuilderTest.php +++ b/apps/theming/tests/IconBuilderTest.php @@ -23,6 +23,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace OCA\Theming\Tests; use OC\Files\AppData\AppData; diff --git a/apps/theming/tests/ImageManagerTest.php b/apps/theming/tests/ImageManagerTest.php index fc9eac7f143..0f03c565e91 100644 --- a/apps/theming/tests/ImageManagerTest.php +++ b/apps/theming/tests/ImageManagerTest.php @@ -21,19 +21,20 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + 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 ea8ab6975ef..3c69490bef5 100644 --- a/apps/theming/tests/ThemingDefaultsTest.php +++ b/apps/theming/tests/ThemingDefaultsTest.php @@ -27,13 +27,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + 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 a36c7330681..9fa5dd91da8 100644 --- a/apps/theming/tests/UtilTest.php +++ b/apps/theming/tests/UtilTest.php @@ -22,16 +22,17 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + 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 9d369ae3a8d..fa523906973 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 6895aa44a51..a6dd8bca4cf 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 5cbbcb2ecca..6eddf1f0ddf 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 0e19fe2a35e..52e1ee4e46d 100644 --- a/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170926101419.php +++ b/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170926101419.php @@ -1,4 +1,5 @@ <?php + namespace OCA\TwoFactorBackupCodes\Migration; use OCP\Migration\BigIntMigration; diff --git a/apps/twofactor_backupcodes/lib/Migration/Version1002Date20180821043638.php b/apps/twofactor_backupcodes/lib/Migration/Version1002Date20180821043638.php index 15c0242ee6a..847d97c761f 100644 --- a/apps/twofactor_backupcodes/lib/Migration/Version1002Date20180821043638.php +++ b/apps/twofactor_backupcodes/lib/Migration/Version1002Date20180821043638.php @@ -26,8 +26,8 @@ namespace OCA\TwoFactorBackupCodes\Migration; use Closure; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version1002Date20180821043638 extends SimpleMigrationStep { diff --git a/apps/twofactor_backupcodes/lib/Provider/BackupCodesProvider.php b/apps/twofactor_backupcodes/lib/Provider/BackupCodesProvider.php index 81f9a836c12..1ba7592f4c1 100644 --- a/apps/twofactor_backupcodes/lib/Provider/BackupCodesProvider.php +++ b/apps/twofactor_backupcodes/lib/Provider/BackupCodesProvider.php @@ -162,4 +162,3 @@ class BackupCodesProvider implements IProvider, IProvidesPersonalSettings { } } - diff --git a/apps/twofactor_backupcodes/tests/Unit/Listener/ProviderDisabledTest.php b/apps/twofactor_backupcodes/tests/Unit/Listener/ProviderDisabledTest.php index 39df7a417f6..c357fdeb2f0 100644 --- a/apps/twofactor_backupcodes/tests/Unit/Listener/ProviderDisabledTest.php +++ b/apps/twofactor_backupcodes/tests/Unit/Listener/ProviderDisabledTest.php @@ -22,7 +22,6 @@ declare(strict_types=1); * */ - namespace OCA\TwoFactorBackupCodes\Tests\Unit\Listener; use OCA\TwoFactorBackupCodes\BackgroundJob\RememberBackupCodesJob; diff --git a/apps/updatenotification/tests/Notification/BackgroundJobTest.php b/apps/updatenotification/tests/Notification/BackgroundJobTest.php index 4ed1c350674..694051d33f6 100644 --- a/apps/updatenotification/tests/Notification/BackgroundJobTest.php +++ b/apps/updatenotification/tests/Notification/BackgroundJobTest.php @@ -25,17 +25,17 @@ namespace OCA\UpdateNotification\Tests\Notification; use OC\Installer; +use OC\Updater\VersionCheck; use OCA\UpdateNotification\Notification\BackgroundJob; use OCP\App\IAppManager; use OCP\Http\Client\IClientService; use OCP\IConfig; +use OCP\IGroup; use OCP\IGroupManager; use OCP\IUser; use OCP\Notification\IManager; -use Test\TestCase; -use OC\Updater\VersionCheck; use OCP\Notification\INotification; -use OCP\IGroup; +use Test\TestCase; class BackgroundJobTest extends TestCase { diff --git a/apps/user_ldap/l10n/de.js b/apps/user_ldap/l10n/de.js index 9ada9226167..c52ef923ba6 100644 --- a/apps/user_ldap/l10n/de.js +++ b/apps/user_ldap/l10n/de.js @@ -132,7 +132,7 @@ OC.L10N.register( "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte kontaktiere Deinen Systemadministrator und bitte ihn um die Installation des Moduls.", "Connection Settings" : "Verbindungseinstellungen", "Configuration Active" : "Konfiguration aktiv", - "When unchecked, this configuration will be skipped." : "Konfiguration wird übersprungen, wenn deaktiviert", + "When unchecked, this configuration will be skipped." : "Konfiguration wird übersprungen, wenn nicht angehakt.", "Backup (Replica) Host" : "Backup-Host (Kopie)", "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Gib einen optionalen Backup-Host an. Es muss sich um eine Kopie des Haupt-LDAP/AD-Servers handeln.", "Backup (Replica) Port" : "Port des Backup-Hosts (Kopie)", diff --git a/apps/user_ldap/l10n/de.json b/apps/user_ldap/l10n/de.json index 1c22402e3bc..75cc34cf153 100644 --- a/apps/user_ldap/l10n/de.json +++ b/apps/user_ldap/l10n/de.json @@ -130,7 +130,7 @@ "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte kontaktiere Deinen Systemadministrator und bitte ihn um die Installation des Moduls.", "Connection Settings" : "Verbindungseinstellungen", "Configuration Active" : "Konfiguration aktiv", - "When unchecked, this configuration will be skipped." : "Konfiguration wird übersprungen, wenn deaktiviert", + "When unchecked, this configuration will be skipped." : "Konfiguration wird übersprungen, wenn nicht angehakt.", "Backup (Replica) Host" : "Backup-Host (Kopie)", "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Gib einen optionalen Backup-Host an. Es muss sich um eine Kopie des Haupt-LDAP/AD-Servers handeln.", "Backup (Replica) Port" : "Port des Backup-Hosts (Kopie)", diff --git a/apps/user_ldap/l10n/de_DE.js b/apps/user_ldap/l10n/de_DE.js index e4285c4b4d4..395d7311965 100644 --- a/apps/user_ldap/l10n/de_DE.js +++ b/apps/user_ldap/l10n/de_DE.js @@ -132,7 +132,7 @@ OC.L10N.register( "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte kontaktieren Sie Ihren Systemadministrator und bitten Sie um die Installation des Moduls.", "Connection Settings" : "Verbindungseinstellungen", "Configuration Active" : "Konfiguration aktiv", - "When unchecked, this configuration will be skipped." : "Wenn nicht angehakt, wird diese Konfiguration übersprungen.", + "When unchecked, this configuration will be skipped." : "Konfiguration wird übersprungen, wenn nicht angehakt.", "Backup (Replica) Host" : "Backup-Host (Kopie)", "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Geben Sie einen optionalen Backup-Host an. Es muss sich um eine Kopie des Haupt-LDAP/AD-Servers handeln.", "Backup (Replica) Port" : "Port des Backup-Hosts (Kopie)", diff --git a/apps/user_ldap/l10n/de_DE.json b/apps/user_ldap/l10n/de_DE.json index 8da82aaad1e..9bb6d4bc6d5 100644 --- a/apps/user_ldap/l10n/de_DE.json +++ b/apps/user_ldap/l10n/de_DE.json @@ -130,7 +130,7 @@ "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte kontaktieren Sie Ihren Systemadministrator und bitten Sie um die Installation des Moduls.", "Connection Settings" : "Verbindungseinstellungen", "Configuration Active" : "Konfiguration aktiv", - "When unchecked, this configuration will be skipped." : "Wenn nicht angehakt, wird diese Konfiguration übersprungen.", + "When unchecked, this configuration will be skipped." : "Konfiguration wird übersprungen, wenn nicht angehakt.", "Backup (Replica) Host" : "Backup-Host (Kopie)", "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Geben Sie einen optionalen Backup-Host an. Es muss sich um eine Kopie des Haupt-LDAP/AD-Servers handeln.", "Backup (Replica) Port" : "Port des Backup-Hosts (Kopie)", diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php index 6104c908a84..eee2482dfa0 100644 --- a/apps/user_ldap/lib/Access.php +++ b/apps/user_ldap/lib/Access.php @@ -45,11 +45,11 @@ namespace OCA\User_LDAP; use OC\HintException; use OC\Hooks\PublicEmitter; +use OC\ServerNotAvailableException; use OCA\User_LDAP\Exceptions\ConstraintViolationException; +use OCA\User_LDAP\Mapping\AbstractMapping; use OCA\User_LDAP\User\Manager; use OCA\User_LDAP\User\OfflineUser; -use OCA\User_LDAP\Mapping\AbstractMapping; -use OC\ServerNotAvailableException; use OCP\IConfig; use OCP\ILogger; use OCP\IUserManager; diff --git a/apps/user_ldap/lib/Command/CheckUser.php b/apps/user_ldap/lib/Command/CheckUser.php index 83bcae37950..72ae050b4ec 100644 --- a/apps/user_ldap/lib/Command/CheckUser.php +++ b/apps/user_ldap/lib/Command/CheckUser.php @@ -24,15 +24,15 @@ namespace OCA\User_LDAP\Command; +use OCA\User_LDAP\Helper; +use OCA\User_LDAP\Mapping\UserMapping; +use OCA\User_LDAP\User\DeletedUsersIndex; +use OCA\User_LDAP\User_Proxy; use Symfony\Component\Console\Command\Command; 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 OCA\User_LDAP\User\DeletedUsersIndex; -use OCA\User_LDAP\Mapping\UserMapping; -use OCA\User_LDAP\Helper; -use OCA\User_LDAP\User_Proxy; class CheckUser extends Command { /** @var User_Proxy */ diff --git a/apps/user_ldap/lib/Command/Search.php b/apps/user_ldap/lib/Command/Search.php index c81b8d54696..6dba696cf9b 100644 --- a/apps/user_ldap/lib/Command/Search.php +++ b/apps/user_ldap/lib/Command/Search.php @@ -27,18 +27,18 @@ namespace OCA\User_LDAP\Command; +use OCA\User_LDAP\Group_Proxy; +use OCA\User_LDAP\Helper; +use OCA\User_LDAP\LDAP; +use OCA\User_LDAP\User_Proxy; +use OCP\IConfig; + use Symfony\Component\Console\Command\Command; 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 OCA\User_LDAP\User_Proxy; -use OCA\User_LDAP\Group_Proxy; -use OCA\User_LDAP\Helper; -use OCA\User_LDAP\LDAP; -use OCP\IConfig; - class Search extends Command { /** @var \OCP\IConfig */ protected $ocConfig; diff --git a/apps/user_ldap/lib/Command/SetConfig.php b/apps/user_ldap/lib/Command/SetConfig.php index cf73874ade8..f65f8c77a89 100644 --- a/apps/user_ldap/lib/Command/SetConfig.php +++ b/apps/user_ldap/lib/Command/SetConfig.php @@ -26,14 +26,14 @@ namespace OCA\User_LDAP\Command; +use OCA\User_LDAP\Configuration; use OCA\User_LDAP\ConnectionFactory; +use OCA\User_LDAP\Helper; use OCA\User_LDAP\LDAP; 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 OCA\User_LDAP\Helper; -use OCA\User_LDAP\Configuration; class SetConfig extends Command { diff --git a/apps/user_ldap/lib/Command/ShowConfig.php b/apps/user_ldap/lib/Command/ShowConfig.php index 7a24889eb09..52f19b9e475 100644 --- a/apps/user_ldap/lib/Command/ShowConfig.php +++ b/apps/user_ldap/lib/Command/ShowConfig.php @@ -25,14 +25,14 @@ namespace OCA\User_LDAP\Command; +use OCA\User_LDAP\Configuration; +use OCA\User_LDAP\Helper; use Symfony\Component\Console\Command\Command; 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 OCA\User_LDAP\Helper; -use OCA\User_LDAP\Configuration; class ShowConfig extends Command { /** @var \OCA\User_LDAP\Helper */ diff --git a/apps/user_ldap/lib/Command/ShowRemnants.php b/apps/user_ldap/lib/Command/ShowRemnants.php index 6fb207c4e2d..eb3bde944a2 100644 --- a/apps/user_ldap/lib/Command/ShowRemnants.php +++ b/apps/user_ldap/lib/Command/ShowRemnants.php @@ -25,15 +25,15 @@ namespace OCA\User_LDAP\Command; +use OCA\User_LDAP\User\DeletedUsersIndex; +use OCP\IDateTimeFormatter; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Helper\Table; use Symfony\Component\Console\Input\InputInterface; + use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use OCA\User_LDAP\User\DeletedUsersIndex; -use OCP\IDateTimeFormatter; - class ShowRemnants extends Command { /** @var \OCA\User_LDAP\User\DeletedUsersIndex */ protected $dui; diff --git a/apps/user_ldap/lib/Command/TestConfig.php b/apps/user_ldap/lib/Command/TestConfig.php index a385c892e1e..8d8512baca1 100644 --- a/apps/user_ldap/lib/Command/TestConfig.php +++ b/apps/user_ldap/lib/Command/TestConfig.php @@ -26,12 +26,12 @@ namespace OCA\User_LDAP\Command; +use OCA\User_LDAP\Connection; +use OCA\User_LDAP\Helper; 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 \OCA\User_LDAP\Helper; -use \OCA\User_LDAP\Connection; class TestConfig extends Command { diff --git a/apps/user_ldap/lib/Jobs/CleanUp.php b/apps/user_ldap/lib/Jobs/CleanUp.php index 295cb14c7aa..8fcc58969b6 100644 --- a/apps/user_ldap/lib/Jobs/CleanUp.php +++ b/apps/user_ldap/lib/Jobs/CleanUp.php @@ -31,9 +31,9 @@ use OC\BackgroundJob\TimedJob; use OCA\User_LDAP\Helper; use OCA\User_LDAP\LDAP; use OCA\User_LDAP\Mapping\UserMapping; +use OCA\User_LDAP\User\DeletedUsersIndex; use OCA\User_LDAP\User_LDAP; use OCA\User_LDAP\User_Proxy; -use OCA\User_LDAP\User\DeletedUsersIndex; /** * Class CleanUp diff --git a/apps/user_ldap/lib/LDAPProvider.php b/apps/user_ldap/lib/LDAPProvider.php index 41a4bc6d658..2979f371932 100644 --- a/apps/user_ldap/lib/LDAPProvider.php +++ b/apps/user_ldap/lib/LDAPProvider.php @@ -27,10 +27,10 @@ namespace OCA\User_LDAP; -use OCP\LDAP\ILDAPProvider; -use OCP\LDAP\IDeletionFlagSupport; -use OCP\IServerContainer; use OCA\User_LDAP\User\DeletedUsersIndex; +use OCP\IServerContainer; +use OCP\LDAP\IDeletionFlagSupport; +use OCP\LDAP\ILDAPProvider; /** * LDAP provider for pulic access to the LDAP backend. diff --git a/apps/user_ldap/lib/LDAPProviderFactory.php b/apps/user_ldap/lib/LDAPProviderFactory.php index c57f996cde5..66e2b2d728c 100644 --- a/apps/user_ldap/lib/LDAPProviderFactory.php +++ b/apps/user_ldap/lib/LDAPProviderFactory.php @@ -25,10 +25,10 @@ namespace OCA\User_LDAP; -use OCP\LDAP\ILDAPProviderFactory; -use OCP\IServerContainer; -use OCA\User_LDAP\User\DeletedUsersIndex; use OCA\User_LDAP\Mapping\UserMapping; +use OCA\User_LDAP\User\DeletedUsersIndex; +use OCP\IServerContainer; +use OCP\LDAP\ILDAPProviderFactory; class LDAPProviderFactory implements ILDAPProviderFactory { /** diff --git a/apps/user_ldap/lib/Migration/UUIDFixUser.php b/apps/user_ldap/lib/Migration/UUIDFixUser.php index 28765917ae0..597aecede35 100644 --- a/apps/user_ldap/lib/Migration/UUIDFixUser.php +++ b/apps/user_ldap/lib/Migration/UUIDFixUser.php @@ -24,10 +24,10 @@ namespace OCA\User_LDAP\Migration; +use OCA\User_LDAP\Group_Proxy; use OCA\User_LDAP\Helper; use OCA\User_LDAP\LDAP; use OCA\User_LDAP\Mapping\UserMapping; -use OCA\User_LDAP\Group_Proxy; use OCP\IConfig; class UUIDFixUser extends UUIDFix { diff --git a/apps/user_ldap/lib/Proxy.php b/apps/user_ldap/lib/Proxy.php index 8b5ff996085..42fb248e70f 100644 --- a/apps/user_ldap/lib/Proxy.php +++ b/apps/user_ldap/lib/Proxy.php @@ -32,8 +32,8 @@ namespace OCA\User_LDAP; -use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\Mapping\GroupMapping; +use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\User\Manager; abstract class Proxy { diff --git a/apps/user_ldap/lib/User/Manager.php b/apps/user_ldap/lib/User/Manager.php index 046b42551b6..3122311b95e 100644 --- a/apps/user_ldap/lib/User/Manager.php +++ b/apps/user_ldap/lib/User/Manager.php @@ -29,8 +29,8 @@ namespace OCA\User_LDAP\User; use OC\Cache\CappedMemoryCache; use OCA\User_LDAP\Access; -use OCA\User_LDAP\LogWrapper; use OCA\User_LDAP\FilesystemHelper; +use OCA\User_LDAP\LogWrapper; use OCP\IAvatarManager; use OCP\IConfig; use OCP\IDBConnection; diff --git a/apps/user_ldap/lib/UserPluginManager.php b/apps/user_ldap/lib/UserPluginManager.php index 85eaae29daa..96d85204314 100644 --- a/apps/user_ldap/lib/UserPluginManager.php +++ b/apps/user_ldap/lib/UserPluginManager.php @@ -207,4 +207,3 @@ class UserPluginManager { throw new \Exception('No plugin implements deleteUser in this LDAP Backend.'); } } - diff --git a/apps/user_ldap/tests/GroupLDAPPluginTest.php b/apps/user_ldap/tests/GroupLDAPPluginTest.php index 9b13e37bc97..3b8bfd795c5 100644 --- a/apps/user_ldap/tests/GroupLDAPPluginTest.php +++ b/apps/user_ldap/tests/GroupLDAPPluginTest.php @@ -24,8 +24,8 @@ namespace OCA\User_LDAP\Tests; -use OCP\GroupInterface; use OCA\User_LDAP\GroupPluginManager; +use OCP\GroupInterface; class GroupLDAPPluginTest extends \Test\TestCase { diff --git a/apps/user_ldap/tests/Group_LDAPTest.php b/apps/user_ldap/tests/Group_LDAPTest.php index a505c403acb..e0ece5d50a6 100644 --- a/apps/user_ldap/tests/Group_LDAPTest.php +++ b/apps/user_ldap/tests/Group_LDAPTest.php @@ -32,13 +32,13 @@ namespace OCA\User_LDAP\Tests; -use OCA\User_LDAP\GroupPluginManager; -use OCP\GroupInterface; use OCA\User_LDAP\Access; use OCA\User_LDAP\Connection; use OCA\User_LDAP\Group_LDAP as GroupLDAP; +use OCA\User_LDAP\GroupPluginManager; use OCA\User_LDAP\ILDAPWrapper; use OCA\User_LDAP\User\Manager; +use OCP\GroupInterface; use Test\TestCase; /** diff --git a/apps/user_ldap/tests/HelperTest.php b/apps/user_ldap/tests/HelperTest.php index 31d17cbaede..54d7d8868ce 100644 --- a/apps/user_ldap/tests/HelperTest.php +++ b/apps/user_ldap/tests/HelperTest.php @@ -21,6 +21,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace OCA\User_LDAP\Tests; diff --git a/apps/user_ldap/tests/Integration/AbstractIntegrationTest.php b/apps/user_ldap/tests/Integration/AbstractIntegrationTest.php index 8d29df6ede6..2aa10c75bea 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 764c14bafe7..38f575db75b 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 cab5f6196fd..e2557aac4a0 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 fcb2e59b4a9..481ffaed61a 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 599458a9721..bddd3af0e46 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 1f30af3a58a..cef753ad118 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 054a3adf787..deaa368806c 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 8921648da83..37502027df7 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 b91f4af433f..a85c4a4dc5e 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 a5f7ea50175..0536d0b10af 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 28eca1608d2..193e460c3c7 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 7517994b34a..6671742c428 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 f11f7bec206..1cae2f58e5f 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 8ac291b9289..a654c87d2e7 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 c048ffbb5be..787cd06bfa1 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 20ea8ad43c4..fa668231b41 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 2b629861088..ad3c2355dc8 100644 --- a/core/BackgroundJobs/BackgroundCleanupUpdaterBackupsJob.php +++ b/core/BackgroundJobs/BackgroundCleanupUpdaterBackupsJob.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace OC\Core\BackgroundJobs; use OC\BackgroundJob\QueuedJob; diff --git a/core/Command/App/CheckCode.php b/core/Command/App/CheckCode.php index 530c1d30ec0..82d15fae4fb 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 525b0095f04..cfddaed34da 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 71d5cef229c..e3777c8be41 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 c571a9a1624..881ad1fcf1e 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 48fee818d0a..32d22d64cb9 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 16176a171a2..e6274082ea0 100644 --- a/core/Command/Check.php +++ b/core/Command/Check.php @@ -21,6 +21,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OC\Core\Command; use OC\SystemConfig; diff --git a/core/Command/Db/AddMissingIndices.php b/core/Command/Db/AddMissingIndices.php index 527a2cd7b19..4de1d0f12f4 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 bd26c5e5154..d4a4d406eea 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; @@ -383,6 +383,9 @@ class ConvertType extends Command implements CompletionAwareInterface { case Type::TEXT: $this->columnTypes[$tableName][$columnName] = IQueryBuilder::PARAM_LOB; break; + case Type::BOOLEAN: + $this->columnTypes[$tableName][$columnName] = IQueryBuilder::PARAM_BOOL; + break; default: $this->columnTypes[$tableName][$columnName] = false; } diff --git a/core/Command/Db/Migrations/GenerateCommand.php b/core/Command/Db/Migrations/GenerateCommand.php index 69bf4a84a8f..c140d6ec176 100644 --- a/core/Command/Db/Migrations/GenerateCommand.php +++ b/core/Command/Db/Migrations/GenerateCommand.php @@ -47,8 +47,8 @@ namespace {{namespace}}; use Closure; 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/Command/Encryption/ChangeKeyStorageRoot.php b/core/Command/Encryption/ChangeKeyStorageRoot.php index 15e88326973..f89a66873b0 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 4270ee9f57f..09331f04b6e 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/Group/Add.php b/core/Command/Group/Add.php index f2ee6195a44..4850ec9ce6c 100644 --- a/core/Command/Group/Add.php +++ b/core/Command/Group/Add.php @@ -25,6 +25,7 @@ declare(strict_types=1); namespace OC\Core\Command\Group; use OC\Core\Command\Base; +use OCP\IGroup; use OCP\IGroupManager; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; @@ -68,12 +69,17 @@ class Add extends Base { return 1; } else { $group = $this->groupManager->createGroup($gid); + if (!$group instanceof IGroup) { + $output->writeln('<error>Could not create group</error>'); + return 2; + } $output->writeln('Created group "' . $group->getGID() . '"'); - $displayName = trim((string) $input->getOption('display-name')); + $displayName = trim((string)$input->getOption('display-name')); if ($displayName !== '') { $group->setDisplayName($displayName); } } + return 0; } } diff --git a/core/Command/Integrity/CheckApp.php b/core/Command/Integrity/CheckApp.php index 1c71286195a..c19d03649b8 100644 --- a/core/Command/Integrity/CheckApp.php +++ b/core/Command/Integrity/CheckApp.php @@ -20,12 +20,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + 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 a3426ce9345..3d087247aa7 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 4470ea82d2b..3747c4a7f17 100644 --- a/core/Command/InterruptedException.php +++ b/core/Command/InterruptedException.php @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OC\Core\Command; /** diff --git a/core/Command/Log/File.php b/core/Command/Log/File.php index 8be01d2b6ef..877e0a592e9 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 37e8de24552..479e5f17536 100644 --- a/core/Command/Maintenance/DataFingerprint.php +++ b/core/Command/Maintenance/DataFingerprint.php @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + 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 39692e036ba..4197234ae7e 100644 --- a/core/Command/Maintenance/Install.php +++ b/core/Command/Maintenance/Install.php @@ -27,6 +27,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OC\Core\Command\Maintenance; use InvalidArgumentException; diff --git a/core/Command/Maintenance/Mimetype/GenerateMimetypeFileBuilder.php b/core/Command/Maintenance/Mimetype/GenerateMimetypeFileBuilder.php index 2eef5e9faaa..302f6b91342 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 1c8d651b9c0..7a7d9c11e55 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 0606e210c3f..230d0fac6a6 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 1692eb08d87..8b13175f0bb 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 04c870f07a4..d67d2d32edf 100644 --- a/core/Command/Maintenance/UpdateHtaccess.php +++ b/core/Command/Maintenance/UpdateHtaccess.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + 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 2ab66a4ce75..825cfc0da88 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 aa4f40fc771..3a9b4224eb9 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 cc53f1c78c0..4dbf55b3fb8 100644 --- a/core/Command/User/Add.php +++ b/core/Command/User/Add.php @@ -25,15 +25,16 @@ namespace OC\Core\Command\User; use OC\Files\Filesystem; +use OCP\IGroup; use OCP\IGroupManager; 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 { @@ -152,10 +153,14 @@ class Add extends Command { if (!$group) { $this->groupManager->createGroup($groupName); $group = $this->groupManager->get($groupName); - $output->writeln('Created group "' . $group->getGID() . '"'); + if($group instanceof IGroup) { + $output->writeln('Created group "' . $group->getGID() . '"'); + } + } + if($group instanceof IGroup) { + $group->addUser($user); + $output->writeln('User "' . $user->getUID() . '" added to group "' . $group->getGID() . '"'); } - $group->addUser($user); - $output->writeln('User "' . $user->getUID() . '" added to group "' . $group->getGID() . '"'); } } } diff --git a/core/Command/User/Delete.php b/core/Command/User/Delete.php index 495c0903bba..6406d4823ee 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 7c6e8315702..63e23b05700 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 164027d809a..48bf4785164 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 58592e05150..d2b168d63c9 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 9e69626c38d..4f2173c155e 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 d7bb436783f..3883d57b043 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 80f5d3c8630..df244df987c 100644 --- a/core/Controller/AutoCompleteController.php +++ b/core/Controller/AutoCompleteController.php @@ -24,8 +24,8 @@ declare(strict_types=1); namespace OC\Core\Controller; -use OCP\AppFramework\OCSController as Controller; use OCP\AppFramework\Http\DataResponse; +use OCP\AppFramework\OCSController as Controller; use OCP\Collaboration\AutoComplete\AutoCompleteEvent; use OCP\Collaboration\AutoComplete\IManager; use OCP\Collaboration\Collaborators\ISearch; diff --git a/core/Controller/AvatarController.php b/core/Controller/AvatarController.php index 9ee344f7ed8..cef68ec8348 100644 --- a/core/Controller/AvatarController.php +++ b/core/Controller/AvatarController.php @@ -25,6 +25,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OC\Core\Controller; use OC\AppFramework\Utility\TimeFactory; @@ -37,8 +38,8 @@ use OCP\Files\File; use OCP\Files\IRootFolder; use OCP\IAvatarManager; use OCP\ICache; -use OCP\ILogger; use OCP\IL10N; +use OCP\ILogger; use OCP\IRequest; use OCP\IUserManager; use OCP\IUserSession; diff --git a/core/Controller/CollaborationResourcesController.php b/core/Controller/CollaborationResourcesController.php index 46ec1136c94..caa1f1a16d0 100644 --- a/core/Controller/CollaborationResourcesController.php +++ b/core/Controller/CollaborationResourcesController.php @@ -24,8 +24,8 @@ namespace OC\Core\Controller; use Exception; use OCP\AppFramework\Http; -use OCP\AppFramework\OCSController; use OCP\AppFramework\Http\DataResponse; +use OCP\AppFramework\OCSController; use OCP\Collaboration\Resources\CollectionException; use OCP\Collaboration\Resources\ICollection; use OCP\Collaboration\Resources\IManager; diff --git a/core/Controller/CssController.php b/core/Controller/CssController.php index 901074d0285..bb9b7a37d8f 100644 --- a/core/Controller/CssController.php +++ b/core/Controller/CssController.php @@ -30,8 +30,8 @@ namespace OC\Core\Controller; use OC\Files\AppData\Factory; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; -use OCP\AppFramework\Http\NotFoundResponse; use OCP\AppFramework\Http\FileDisplayResponse; +use OCP\AppFramework\Http\NotFoundResponse; use OCP\AppFramework\Http\Response; use OCP\AppFramework\Utility\ITimeFactory; use OCP\Files\IAppData; diff --git a/core/Controller/JsController.php b/core/Controller/JsController.php index cdf22eda5fa..207b7113ab5 100644 --- a/core/Controller/JsController.php +++ b/core/Controller/JsController.php @@ -23,13 +23,14 @@ declare(strict_types=1); * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace OC\Core\Controller; use OC\Files\AppData\Factory; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; -use OCP\AppFramework\Http\NotFoundResponse; use OCP\AppFramework\Http\FileDisplayResponse; +use OCP\AppFramework\Http\NotFoundResponse; use OCP\AppFramework\Http\Response; use OCP\AppFramework\Utility\ITimeFactory; use OCP\Files\IAppData; diff --git a/core/Controller/LostController.php b/core/Controller/LostController.php index 49f015d511d..1a3f86f95d3 100644 --- a/core/Controller/LostController.php +++ b/core/Controller/LostController.php @@ -31,29 +31,29 @@ namespace OC\Core\Controller; +use function array_filter; +use function count; use OC\Authentication\TwoFactorAuth\Manager; use OC\Core\Exception\ResetPasswordException; use OC\HintException; -use \OCP\AppFramework\Controller; +use OCP\AppFramework\Controller; use OCP\AppFramework\Http\JSONResponse; -use \OCP\AppFramework\Http\TemplateResponse; +use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Utility\ITimeFactory; use OCP\Defaults; use OCP\Encryption\IEncryptionModule; use OCP\Encryption\IManager; +use OCP\IConfig; use OCP\IInitialStateService; +use OCP\IL10N; use OCP\ILogger; -use \OCP\IURLGenerator; -use \OCP\IRequest; -use \OCP\IL10N; -use \OCP\IConfig; +use OCP\IRequest; +use OCP\IURLGenerator; use OCP\IUser; use OCP\IUserManager; use OCP\Mail\IMailer; use OCP\Security\ICrypto; use OCP\Security\ISecureRandom; -use function array_filter; -use function count; use function reset; /** diff --git a/core/Controller/NavigationController.php b/core/Controller/NavigationController.php index eb3b0968da3..654cb6d253d 100644 --- a/core/Controller/NavigationController.php +++ b/core/Controller/NavigationController.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace OC\Core\Controller; use OCP\AppFramework\Http; diff --git a/core/Controller/OCJSController.php b/core/Controller/OCJSController.php index 37fe17c8dd1..8ffc6d99290 100644 --- a/core/Controller/OCJSController.php +++ b/core/Controller/OCJSController.php @@ -23,6 +23,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace OC\Core\Controller; use bantu\IniGetWrapper\IniGetWrapper; diff --git a/core/Controller/OCSController.php b/core/Controller/OCSController.php index 68861ce7e95..ce08fb657e2 100644 --- a/core/Controller/OCSController.php +++ b/core/Controller/OCSController.php @@ -23,6 +23,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace OC\Core\Controller; use OC\CapabilitiesManager; diff --git a/core/Controller/PreviewController.php b/core/Controller/PreviewController.php index c25d9178310..edda49d0ded 100644 --- a/core/Controller/PreviewController.php +++ b/core/Controller/PreviewController.php @@ -26,11 +26,11 @@ declare(strict_types=1); namespace OC\Core\Controller; use OCP\AppFramework\Controller; -use OCP\AppFramework\Utility\ITimeFactory; -use OCP\Files\File; use OCP\AppFramework\Http; use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http\FileDisplayResponse; +use OCP\AppFramework\Utility\ITimeFactory; +use OCP\Files\File; use OCP\Files\IRootFolder; use OCP\Files\Node; use OCP\Files\NotFoundException; diff --git a/core/Controller/SvgController.php b/core/Controller/SvgController.php index b956f724ad8..a94394e6ffe 100644 --- a/core/Controller/SvgController.php +++ b/core/Controller/SvgController.php @@ -24,14 +24,14 @@ declare (strict_types = 1); namespace OC\Core\Controller; +use OC\Template\IconsCacher; +use OCP\App\IAppManager; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; use OCP\AppFramework\Http\DataDisplayResponse; use OCP\AppFramework\Http\NotFoundResponse; use OCP\AppFramework\Utility\ITimeFactory; -use OCP\App\IAppManager; use OCP\IRequest; -use OC\Template\IconsCacher; class SvgController extends Controller { @@ -90,12 +90,6 @@ class SvgController extends Controller { * @return DataDisplayResponse|NotFoundResponse */ public function getSvgFromApp(string $app, string $fileName, string $color = 'ffffff') { - - if ($app === 'settings') { - $path = $this->serverRoot . "/settings/img/$fileName.svg"; - return $this->getSvg($path, $color, $fileName); - } - $appRootPath = $this->appManager->getAppPath($app); $appPath = substr($appRootPath, strlen($this->serverRoot)); diff --git a/core/Controller/UserController.php b/core/Controller/UserController.php index 24746c65e5f..a04e350b2b1 100644 --- a/core/Controller/UserController.php +++ b/core/Controller/UserController.php @@ -24,10 +24,10 @@ namespace OC\Core\Controller; -use \OCP\AppFramework\Controller; -use \OCP\AppFramework\Http\JSONResponse; -use \OCP\IRequest; -use \OCP\IUserManager; +use OCP\AppFramework\Controller; +use OCP\AppFramework\Http\JSONResponse; +use OCP\IRequest; +use OCP\IUserManager; class UserController extends Controller { /** diff --git a/core/Controller/WalledGardenController.php b/core/Controller/WalledGardenController.php index 737f5396779..be34b25b904 100644 --- a/core/Controller/WalledGardenController.php +++ b/core/Controller/WalledGardenController.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace OC\Core\Controller; use OCP\AppFramework\Controller; diff --git a/core/Migrations/Version13000Date20170705121758.php b/core/Migrations/Version13000Date20170705121758.php index 9d8b373b6b9..344085aae24 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 4c5fb7b9b02..cecdbf907da 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 0eae4167fb6..82f8b8a3157 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 6bdd79cf672..b700ebd747a 100644 --- a/core/Migrations/Version13000Date20170919121250.php +++ b/core/Migrations/Version13000Date20170919121250.php @@ -21,11 +21,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + 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 088de988020..0e02ed492f3 100644 --- a/core/Migrations/Version13000Date20170926101637.php +++ b/core/Migrations/Version13000Date20170926101637.php @@ -21,6 +21,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace OC\Core\Migrations; use OCP\Migration\BigIntMigration; diff --git a/core/Migrations/Version14000Date20180129121024.php b/core/Migrations/Version14000Date20180129121024.php index 9512d4adafd..8ae462a2f6a 100644 --- a/core/Migrations/Version14000Date20180129121024.php +++ b/core/Migrations/Version14000Date20180129121024.php @@ -20,11 +20,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + 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 86705f21d53..c8f1e16ea04 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 9b56e0ab601..75ab5af74e0 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 a738c6baa7e..9d1afb3867e 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 d2e364063ce..69fb142f80a 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 00a55455764..f0cf68c4219 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 e73b663d2fd..6c8b10e9f35 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 f3e12ddbb9b..20b4efb2b6b 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 c74c3ee1c36..ebd6a9e8bca 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 dcb2722222a..2713772c0f5 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 6fa0292133b..870ddbcedfb 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 cb42366fc09..6f6b59aec77 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 1cf4c9f5a37..aeae2e6467e 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 e84c698bb7b..a3f123c8d5a 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 2cf4377e3e4..4cff4569b46 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/core/css/icons.scss b/core/css/icons.scss index ca6314d5001..0c27da5fcf8 100644 --- a/core/css/icons.scss +++ b/core/css/icons.scss @@ -295,7 +295,7 @@ img, object, video, button, textarea, input, select, div[contenteditable='true'] } } -@include icon-black-white('tag', 'actions', 1, true); +@include icon-black-white('tag', 'actions', 2, true); @include icon-black-white('timezone', 'actions', 1, true); @include icon-black-white('toggle', 'actions', 1, true); @include icon-black-white('toggle-background', 'actions', 1, true); diff --git a/core/img/actions/details.svg b/core/img/actions/details.svg index 02d44921d4c..c5b875557c5 100644 --- a/core/img/actions/details.svg +++ b/core/img/actions/details.svg @@ -1 +1 @@ -<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="M5 7.474c.155.382.325.69.644.246.407-.268 1.76-1.427 1.662-.342-.368 2.017-.834 4.017-1.17 6.04-.393 1.114.634 2.067 1.637 1.31 1.078-.502 1.99-1.287 2.927-2.01-.144-.323-.25-.79-.596-.347-.468.24-1.47 1.318-1.696.472.315-2.18.975-4.295 1.365-6.462.397-1.005-.364-2.223-1.4-1.363C7.117 5.634 6.083 6.6 5 7.474zM9.46.005C8.15-.017 7.553 2.147 8.815 2.68c1.023.378 2.077-.714 1.79-1.75-.098-.542-.598-.97-1.147-.93z"/></svg> +<svg width="16" height="16" version="1.1" viewbox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="m7.75 1a1.75 1.75 0 0 0-1.75 1.75 1.75 1.75 0 0 0 1.75 1.75 1.75 1.75 0 0 0 1.75-1.75 1.75 1.75 0 0 0-1.75-1.75zm-2.75 5c-0.554 0-1 0.446-1 1s0.446 1 1 1h2v5h-2c-0.554 0-1 0.446-1 1s0.446 1 1 1h6c0.554 0 1-0.446 1-1s-0.446-1-1-1h-2v-6c0-0.554-0.446-1-1-1h-3z"/></svg> diff --git a/core/img/actions/info-white.svg b/core/img/actions/info-white.svg index 92f6e44add2..5c3573b19f2 100644 --- a/core/img/actions/info-white.svg +++ b/core/img/actions/info-white.svg @@ -1 +1 @@ -<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="M5 7.474c.155.382.325.69.644.246.407-.268 1.76-1.427 1.662-.342-.368 2.017-.834 4.017-1.17 6.04-.393 1.114.634 2.067 1.637 1.31 1.078-.502 1.99-1.287 2.927-2.01-.144-.323-.25-.79-.596-.347-.468.24-1.47 1.318-1.696.472.315-2.18.975-4.295 1.365-6.462.397-1.005-.364-2.223-1.4-1.363C7.117 5.634 6.083 6.6 5 7.474zM9.46.005C8.15-.017 7.553 2.147 8.815 2.68c1.023.378 2.077-.714 1.79-1.75-.098-.542-.598-.97-1.147-.93z" fill="#fff"/></svg> +<svg width="16" height="16" version="1.1" viewbox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="m7.75 1a1.75 1.75 0 0 0-1.75 1.75 1.75 1.75 0 0 0 1.75 1.75 1.75 1.75 0 0 0 1.75-1.75 1.75 1.75 0 0 0-1.75-1.75zm-2.75 5c-0.554 0-1 0.446-1 1s0.446 1 1 1h2v5h-2c-0.554 0-1 0.446-1 1s0.446 1 1 1h6c0.554 0 1-0.446 1-1s-0.446-1-1-1h-2v-6c0-0.554-0.446-1-1-1h-3z" fill="#fff"/></svg> diff --git a/core/img/actions/info.svg b/core/img/actions/info.svg index 02d44921d4c..c5b875557c5 100644 --- a/core/img/actions/info.svg +++ b/core/img/actions/info.svg @@ -1 +1 @@ -<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="M5 7.474c.155.382.325.69.644.246.407-.268 1.76-1.427 1.662-.342-.368 2.017-.834 4.017-1.17 6.04-.393 1.114.634 2.067 1.637 1.31 1.078-.502 1.99-1.287 2.927-2.01-.144-.323-.25-.79-.596-.347-.468.24-1.47 1.318-1.696.472.315-2.18.975-4.295 1.365-6.462.397-1.005-.364-2.223-1.4-1.363C7.117 5.634 6.083 6.6 5 7.474zM9.46.005C8.15-.017 7.553 2.147 8.815 2.68c1.023.378 2.077-.714 1.79-1.75-.098-.542-.598-.97-1.147-.93z"/></svg> +<svg width="16" height="16" version="1.1" viewbox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="m7.75 1a1.75 1.75 0 0 0-1.75 1.75 1.75 1.75 0 0 0 1.75 1.75 1.75 1.75 0 0 0 1.75-1.75 1.75 1.75 0 0 0-1.75-1.75zm-2.75 5c-0.554 0-1 0.446-1 1s0.446 1 1 1h2v5h-2c-0.554 0-1 0.446-1 1s0.446 1 1 1h6c0.554 0 1-0.446 1-1s-0.446-1-1-1h-2v-6c0-0.554-0.446-1-1-1h-3z"/></svg> diff --git a/core/img/actions/tag.png b/core/img/actions/tag.png Binary files differindex 981e043eb60..b96254c959e 100644 --- a/core/img/actions/tag.png +++ b/core/img/actions/tag.png diff --git a/core/img/actions/tag.svg b/core/img/actions/tag.svg index a13909ed9b5..da76790cfdc 100644 --- a/core/img/actions/tag.svg +++ b/core/img/actions/tag.svg @@ -1 +1 @@ -<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="m1 1.5v4.5l8.85 8.888c0.1606 0.1613 0.43 0.1463 0.6044-0.0281l4.405-4.405c0.1744-0.1744 0.189-0.4434 0.028-0.6044l-8.888-8.85h-4.5c-0.28-0-0.5 0.2201-0.5 0.5zm2.3 1.8c0.5-0.5 1.3-0.5 1.8 0s0.5 1.3 0 1.8-1.3 0.5-1.8 0-0.5-1.3 0-1.8z"/></svg> +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M1.55 1c-.15 0-.29.06-.39.16-.1.1-.16.24-.16.4v5.18c0 .16.07.3.17.4l7.68 7.68a.6.6 0 00.86 0l5.11-5.1a.6.6 0 000-.87L7.14 1.18a.57.57 0 00-.4-.18H1.55zM4.5 3A1.5 1.5 0 016 4.5 1.5 1.5 0 014.5 6 1.5 1.5 0 013 4.5 1.5 1.5 0 014.5 3z"/></svg>
\ No newline at end of file diff --git a/core/l10n/cs.js b/core/l10n/cs.js index 198044010e0..696434e9e65 100644 --- a/core/l10n/cs.js +++ b/core/l10n/cs.js @@ -128,7 +128,7 @@ OC.L10N.register( "Update to {version}" : "Aktualizovat na {version}", "An error occurred." : "Došlo k chybě.", "Please reload the page." : "Načtěte stránku znovu.", - "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Aktualizace nebyla úspěšná. Další informace <a href=\"{url}\">se dočtete v komentáři na diskuzním fóru</a>, pojednávajícím o tomto problému.", + "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Aktualizace nebyla úspěšná. Další informace <a href=\"{url}\">se dočtete v příspěvku na diskuzním fóru</a>, pojednávajícím o tomto problému.", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "Aktualizace nebyla úspěšná. Nahlaste problém <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">komunitě kolem Nextcloud</a>", "Continue to Nextcloud" : "Pokračovat do Nextcloud", "_The update was successful. Redirecting you to Nextcloud in %n second._::_The update was successful. Redirecting you to Nextcloud in %n seconds._" : ["Aktualizace byla úspěšná. Přesměrování do Nextcloud za %n sekundu.","Aktualizace byla úspěšná. Přesměrování do Nextcloud za %n sekundy.","Aktualizace byla úspěšná. Přesměrování do Nextcloud za %n sekund.","Aktualizace byla úspěšná. Přesměrování do Nextcloud za %n sekundy."], diff --git a/core/l10n/cs.json b/core/l10n/cs.json index e6d4e41a784..80eab14b1d4 100644 --- a/core/l10n/cs.json +++ b/core/l10n/cs.json @@ -126,7 +126,7 @@ "Update to {version}" : "Aktualizovat na {version}", "An error occurred." : "Došlo k chybě.", "Please reload the page." : "Načtěte stránku znovu.", - "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Aktualizace nebyla úspěšná. Další informace <a href=\"{url}\">se dočtete v komentáři na diskuzním fóru</a>, pojednávajícím o tomto problému.", + "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Aktualizace nebyla úspěšná. Další informace <a href=\"{url}\">se dočtete v příspěvku na diskuzním fóru</a>, pojednávajícím o tomto problému.", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "Aktualizace nebyla úspěšná. Nahlaste problém <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">komunitě kolem Nextcloud</a>", "Continue to Nextcloud" : "Pokračovat do Nextcloud", "_The update was successful. Redirecting you to Nextcloud in %n second._::_The update was successful. Redirecting you to Nextcloud in %n seconds._" : ["Aktualizace byla úspěšná. Přesměrování do Nextcloud za %n sekundu.","Aktualizace byla úspěšná. Přesměrování do Nextcloud za %n sekundy.","Aktualizace byla úspěšná. Přesměrování do Nextcloud za %n sekund.","Aktualizace byla úspěšná. Přesměrování do Nextcloud za %n sekundy."], diff --git a/core/l10n/de.js b/core/l10n/de.js index 2a8857e6b67..19d61d94e33 100644 --- a/core/l10n/de.js +++ b/core/l10n/de.js @@ -273,7 +273,7 @@ OC.L10N.register( "Skip to navigation of app" : "Zum Navigationsbereich der App springen", "More apps" : "Weitere Apps", "More" : "Mehr", - "More apps menu" : "Weitere-Apps-Menü", + "More apps menu" : "Weitere Apps-Menü", "Search" : "Suche", "Reset search" : "Suche zurücksetzen", "Contacts" : "Kontakte", diff --git a/core/l10n/de.json b/core/l10n/de.json index fff8a0a96ee..d58eb262bcc 100644 --- a/core/l10n/de.json +++ b/core/l10n/de.json @@ -271,7 +271,7 @@ "Skip to navigation of app" : "Zum Navigationsbereich der App springen", "More apps" : "Weitere Apps", "More" : "Mehr", - "More apps menu" : "Weitere-Apps-Menü", + "More apps menu" : "Weitere Apps-Menü", "Search" : "Suche", "Reset search" : "Suche zurücksetzen", "Contacts" : "Kontakte", diff --git a/lib/private/Accounts/AccountManager.php b/lib/private/Accounts/AccountManager.php index 7a73ec455eb..ada1228954c 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 df0b80e8229..2226b1e0b55 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 ba2d1147bc8..29c3c7bbc4d 100644 --- a/lib/private/Activity/Manager.php +++ b/lib/private/Activity/Manager.php @@ -23,6 +23,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OC\Activity; diff --git a/lib/private/App/AppStore/Fetcher/Fetcher.php b/lib/private/App/AppStore/Fetcher/Fetcher.php index db8c38ac686..b7679685b40 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 02fbb46d7de..0a2217212a2 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 <http://www.gnu.org/licenses/> * */ + 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 4dfaa23c538..d34d01cd55d 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 <http://www.gnu.org/licenses/> * */ + namespace OC\App\CodeChecker; interface ICheck { diff --git a/lib/private/App/PlatformRepository.php b/lib/private/App/PlatformRepository.php index f94fb3ad504..a264a4dd6c5 100644 --- a/lib/private/App/PlatformRepository.php +++ b/lib/private/App/PlatformRepository.php @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OC\App; /** diff --git a/lib/private/AppFramework/App.php b/lib/private/AppFramework/App.php index 691c5514881..122f4684558 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 5f3fa1b6dc6..b41be947adb 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 e126c8a1cf0..0b3b31fe541 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 0b9422f9fc9..6a04de76adc 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 e1262b6c712..70440e9623f 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 ad1d953f372..2174693a1d7 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 <http://www.gnu.org/licenses/>. * */ + 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 d752a68cf32..9f005448387 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 <http://www.gnu.org/licenses/>. * */ + 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 22a9246d661..3c011945477 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 <http://www.gnu.org/licenses/>. * */ + 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 db3157bda64..16725b1f5d6 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 3cb60874b38..cc927e6875c 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 90ea084dd99..19567f8fdaf 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 <http://www.gnu.org/licenses/>. * */ + 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 08b11788110..02405b5edbe 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 <http://www.gnu.org/licenses/>. * */ + namespace OC\AppFramework\OCS; use OCP\API; diff --git a/lib/private/AppFramework/OCS/V2Response.php b/lib/private/AppFramework/OCS/V2Response.php index 7e98efe867d..54e9e8bd9a7 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 <http://www.gnu.org/licenses/>. * */ + 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 bcbe2eb400b..7e1c089d2a8 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 fd42606cf54..187fb43a9fc 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 6f50523bbf6..b8398623490 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 4526f9b1abb..841d1838354 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 d5b2e2cbca7..ddc611b5ce3 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 <http://www.gnu.org/licenses/>. * */ + 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 c56059fd7b9..03b679596e2 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 <http://www.gnu.org/licenses/>. * */ + 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 87c52c6fef1..e8b5c0b6aaa 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 ede075a21c0..403116cb660 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 172f47d12a8..e7baa10fbb3 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 567ed3aec1e..b3f475ac698 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 44b6786841f..7b5469c48f4 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 ceb8205a7bb..b7ecce144c8 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 6d37cebdc2f..beef8ba9bd8 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 7c935930f28..ef7538d140d 100644 --- a/lib/private/Comments/Comment.php +++ b/lib/private/Comments/Comment.php @@ -22,6 +22,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OC\Comments; use OCP\Comments\IComment; diff --git a/lib/private/Comments/Manager.php b/lib/private/Comments/Manager.php index 024dd58b89c..5c36d5e2091 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 21926912b10..1fc5fb2730b 100644 --- a/lib/private/Comments/ManagerFactory.php +++ b/lib/private/Comments/ManagerFactory.php @@ -21,6 +21,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OC\Comments; use OCP\Comments\ICommentsManager; diff --git a/lib/private/Config.php b/lib/private/Config.php index f462bebaf58..4d24643c22f 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 d7c047527f1..0260d5f7a3c 100644 --- a/lib/private/Console/Application.php +++ b/lib/private/Console/Application.php @@ -27,6 +27,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OC\Console; use OC\MemoryInfo; diff --git a/lib/private/Contacts/ContactsMenu/ContactsStore.php b/lib/private/Contacts/ContactsMenu/ContactsStore.php index 05ef9cca53a..b3843b17a9e 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 aa784bb83dc..d9af077da70 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 359e4ba1b67..68e73ac8c44 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 42e57cd45f7..840d270d25f 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 0a482259b98..caf6a70b097 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 506f4bcd4c9..f9c6f4155a3 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 269400c3ba9..329500fa081 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 a853ab1ea1b..7f1db4b15d2 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 0cb9852d0d4..bcf8465d8aa 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 be90a4bb97f..9c6c9fd156a 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 bff38c0c8d6..b9fada8c4f0 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 635a5d98a9e..826bf8e1952 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 712d56641fa..c2ec8f25288 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 d95a8660762..86164f072d2 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 c4650d39ee3..30fee808097 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 de13536b0c5..946bd47b2c4 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 3e93e633ce1..73c02ac8d4c 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 fefd8d4f0ba..d351476ffcd 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 00bb0cf4262..b06087f0829 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 d2c2eb6289c..21dc6639f0d 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 223b959e661..77284be1b9d 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 9d9f5e4d954..65788424906 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 d9d7985f7cc..1f4a1ba9ab4 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 f8f80b6c5f8..70c03fcb1ff 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 c2944f410b3..772bc0aeb05 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 7ce29bd0e00..4f526bf04cf 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 5c7d554ba5b..3a880d5e29b 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 <http://www.gnu.org/licenses/>. * */ + namespace OC\Files\AppData; use OC\SystemConfig; diff --git a/lib/private/Files/Cache/AbstractCacheEvent.php b/lib/private/Files/Cache/AbstractCacheEvent.php index db1e7a1cf32..d4990f17743 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 f1d2c64e8fd..a90617f5c53 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/Watcher.php b/lib/private/Files/Cache/Watcher.php index 47dde26d7b7..8c5cb0db182 100644 --- a/lib/private/Files/Cache/Watcher.php +++ b/lib/private/Files/Cache/Watcher.php @@ -85,7 +85,7 @@ class Watcher implements IWatcher { if (is_null($cachedEntry)) { $cachedEntry = $this->cache->get($path); } - if ($this->needsUpdate($path, $cachedEntry)) { + if ($cachedEntry === false || $this->needsUpdate($path, $cachedEntry)) { $this->update($path, $cachedEntry); return true; } else { @@ -105,7 +105,7 @@ class Watcher implements IWatcher { } else { $this->scanner->scanFile($path); } - if ($cachedData['mimetype'] === 'httpd/unix-directory') { + if (is_array($cachedData) && $cachedData['mimetype'] === 'httpd/unix-directory') { $this->cleanFolder($path); } if ($this->cache instanceof Cache) { diff --git a/lib/private/Files/Cache/Wrapper/CacheWrapper.php b/lib/private/Files/Cache/Wrapper/CacheWrapper.php index 6d7f1876e29..157bb083b73 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 e315493a693..331e28d3d5e 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 a3c88dd6b4b..fbb455c5063 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 63abdf5fdeb..53bd52a2e6c 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 36e10bfb45a..1e67eecb9dc 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 4783a71b07b..b792b584077 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 f5d8cdc91a9..acf288860d9 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 <http://www.gnu.org/licenses/> * */ + 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 390d29edb31..ad0935ebaf7 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 fb5e8d83ab1..fd6c9a2ebc1 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 2b5cf6ea4ab..c4b5e5d7778 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 <http://www.gnu.org/licenses/> * */ + namespace OC\Files\ObjectStore; use OCP\IUser; diff --git a/lib/private/Files/ObjectStore/NoopScanner.php b/lib/private/Files/ObjectStore/NoopScanner.php index a3a396651a2..1ee868c49d4 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 f6270d36e7a..430d628d3ce 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 9c9ca10650c..85a1a64a854 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 <http://www.gnu.org/licenses/>. * */ + 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 5b55fe0f157..9375a3c5545 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 <http://www.gnu.org/licenses/>. * */ + 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 2dbaf619c05..3bc14d35cd0 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 2367c1aab3c..69e6f309c31 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 9ed09e82e7d..4ee9b21694a 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 77a23d26fb7..0c01595d306 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 <http://www.gnu.org/licenses/> * */ + 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 bc8519bf42c..f143c8b8c92 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 5485b80985b..7741f820c63 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 d1419dca4dc..46588a74d0d 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 28921973fcf..8dee7bf7423 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 8322576c5c2..4f4c4b90f2c 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 8ab1af05b0e..3aec4638a21 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 088bf075ae6..ce195eb8a2e 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 d5bef906021..1efa55b5ca1 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 6a67c9fe7df..d0eb0eab2ed 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 a01fb232916..8796f28a249 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 22333e712ce..a4c21d30bcc 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 da7a459741b..2ab862a0e4e 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 8d86425c8e5..fa14e4e9932 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/Manager.php b/lib/private/Group/Manager.php index 7567f719b0a..0e51b4ec2cc 100644 --- a/lib/private/Group/Manager.php +++ b/lib/private/Group/Manager.php @@ -93,8 +93,8 @@ class Manager extends PublicEmitter implements IGroupManager { $this->dispatcher = $dispatcher; $this->logger = $logger; - $cachedGroups = & $this->cachedGroups; - $cachedUserGroups = & $this->cachedUserGroups; + $cachedGroups = &$this->cachedGroups; + $cachedUserGroups = &$this->cachedUserGroups; $this->listen('\OC\Group', 'postDelete', function ($group) use (&$cachedGroups, &$cachedUserGroups) { /** * @var \OC\Group\Group $group @@ -149,6 +149,7 @@ class Manager extends PublicEmitter implements IGroupManager { /** * Get the active backends + * * @return \OCP\GroupInterface[] */ public function getBackends() { @@ -163,7 +164,7 @@ class Manager extends PublicEmitter implements IGroupManager { /** * @param string $gid - * @return \OC\Group\Group + * @return IGroup|null */ public function get($gid) { if (isset($this->cachedGroups[$gid])) { @@ -175,12 +176,12 @@ class Manager extends PublicEmitter implements IGroupManager { /** * @param string $gid * @param string $displayName - * @return \OCP\IGroup + * @return \OCP\IGroup|null */ protected function getGroupObject($gid, $displayName = null) { $backends = []; foreach ($this->backends as $backend) { - if ($backend->implementsActions(\OC\Group\Backend::GROUP_DETAILS)) { + if ($backend->implementsActions(Backend::GROUP_DETAILS)) { $groupData = $backend->getGroupDetails($gid); if (is_array($groupData) && !empty($groupData)) { // take the display name from the first backend that has a non-null one @@ -210,21 +211,22 @@ class Manager extends PublicEmitter implements IGroupManager { /** * @param string $gid - * @return \OC\Group\Group + * @return IGroup|null */ public function createGroup($gid) { if ($gid === '' || $gid === null) { - return false; + return null; } else if ($group = $this->get($gid)) { return $group; } else { - $this->emit('\OC\Group', 'preCreate', array($gid)); + $this->emit('\OC\Group', 'preCreate', [$gid]); foreach ($this->backends as $backend) { - if ($backend->implementsActions(\OC\Group\Backend::CREATE_GROUP)) { - $backend->createGroup($gid); - $group = $this->getGroupObject($gid); - $this->emit('\OC\Group', 'postCreate', array($group)); - return $group; + if ($backend->implementsActions(Backend::CREATE_GROUP)) { + if ($backend->createGroup($gid)) { + $group = $this->getGroupObject($gid); + $this->emit('\OC\Group', 'postCreate', [$group]); + return $group; + } } } return null; @@ -260,7 +262,7 @@ class Manager extends PublicEmitter implements IGroupManager { * @param IUser|null $user * @return \OC\Group\Group[] */ - public function getUserGroups(IUser $user= null) { + public function getUserGroups(IUser $user = null) { if (!$user instanceof IUser) { return []; } @@ -295,12 +297,13 @@ class Manager extends PublicEmitter implements IGroupManager { /** * Checks if a userId is in the admin group + * * @param string $userId * @return bool if admin */ public function isAdmin($userId) { foreach ($this->backends as $backend) { - if ($backend->implementsActions(\OC\Group\Backend::IS_ADMIN) && $backend->isAdmin($userId)) { + if ($backend->implementsActions(Backend::IS_ADMIN) && $backend->isAdmin($userId)) { return true; } } @@ -309,6 +312,7 @@ class Manager extends PublicEmitter implements IGroupManager { /** * Checks if a userId is in a group + * * @param string $userId * @param string $group * @return bool if in group @@ -319,28 +323,31 @@ class Manager extends PublicEmitter implements IGroupManager { /** * get a list of group ids for a user + * * @param IUser $user * @return array with group ids */ public function getUserGroupIds(IUser $user) { - return array_map(function($value) { - return (string) $value; + return array_map(function ($value) { + return (string)$value; }, array_keys($this->getUserGroups($user))); } /** * get an array of groupid and displayName for a user + * * @param IUser $user * @return array ['displayName' => displayname] */ public function getUserGroupNames(IUser $user) { - return array_map(function($group) { + return array_map(function ($group) { return array('displayName' => $group->getDisplayName()); }, $this->getUserGroups($user)); } /** * get a list of all display names in a group + * * @param string $gid * @param string $search * @param int $limit @@ -349,32 +356,32 @@ class Manager extends PublicEmitter implements IGroupManager { */ public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) { $group = $this->get($gid); - if(is_null($group)) { + if (is_null($group)) { return []; } $search = trim($search); $groupUsers = []; - if(!empty($search)) { + if (!empty($search)) { // only user backends have the capability to do a complex search for users $searchOffset = 0; $searchLimit = $limit * 100; - if($limit === -1) { + if ($limit === -1) { $searchLimit = 500; } do { $filteredUsers = $this->userManager->searchDisplayName($search, $searchLimit, $searchOffset); - foreach($filteredUsers as $filteredUser) { - if($group->inGroup($filteredUser)) { - $groupUsers[]= $filteredUser; + foreach ($filteredUsers as $filteredUser) { + if ($group->inGroup($filteredUser)) { + $groupUsers[] = $filteredUser; } } $searchOffset += $searchLimit; - } while(count($groupUsers) < $searchLimit+$offset && count($filteredUsers) >= $searchLimit); + } while (count($groupUsers) < $searchLimit + $offset && count($filteredUsers) >= $searchLimit); - if($limit === -1) { + if ($limit === -1) { $groupUsers = array_slice($groupUsers, $offset); } else { $groupUsers = array_slice($groupUsers, $offset, $limit); @@ -384,7 +391,7 @@ class Manager extends PublicEmitter implements IGroupManager { } $matchingUsers = []; - foreach($groupUsers as $groupUser) { + foreach ($groupUsers as $groupUser) { $matchingUsers[$groupUser->getUID()] = $groupUser->getDisplayName(); } return $matchingUsers; diff --git a/lib/private/Group/MetaData.php b/lib/private/Group/MetaData.php index f4877237ec7..cda208f3f58 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 317e0629b60..0f3b8140e08 100644 --- a/lib/private/L10N/LanguageNotFoundException.php +++ b/lib/private/L10N/LanguageNotFoundException.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace OC\L10N; class LanguageNotFoundException extends \Exception { diff --git a/lib/private/Lock/MemcacheLockingProvider.php b/lib/private/Lock/MemcacheLockingProvider.php index 4d1b3dc0bca..368c672dbb2 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 da29c351185..22792fe4020 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 9dc8b2cc49c..ebcb73be4ce 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 fe2bbf30a26..b982836b8ef 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 c40e4860f95..1fd0a6a419b 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 d103e1380c5..e3547c84da3 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 adf3c5050bd..8d0d1679e80 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 7ef90301cf3..7cab14f5ccc 100644 --- a/lib/private/Migration/BackgroundRepair.php +++ b/lib/private/Migration/BackgroundRepair.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OC\Migration; use OC\BackgroundJob\JobList; diff --git a/lib/private/Migration/ConsoleOutput.php b/lib/private/Migration/ConsoleOutput.php index 74c8c7340cc..d3487a771cc 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 ea61c44fcac..c3426a426f8 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 6662263fb76..f084dae35ed 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 000b1f8277f..fe309376296 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 79c512c84aa..981c820ccf3 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 7e35b5360d4..4389e269c8b 100644 --- a/lib/private/Preview/GeneratorHelper.php +++ b/lib/private/Preview/GeneratorHelper.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace OC\Preview; use OC\Files\View; diff --git a/lib/private/Preview/HEIC.php b/lib/private/Preview/HEIC.php index d23e6c6bd1f..9f4f9be38df 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 6f82904a6a7..b8767d3f639 100644 --- a/lib/private/Preview/Image.php +++ b/lib/private/Preview/Image.php @@ -25,6 +25,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OC\Preview; use OCP\Files\File; diff --git a/lib/private/Preview/MP3.php b/lib/private/Preview/MP3.php index f560f100109..6b19602b5c9 100644 --- a/lib/private/Preview/MP3.php +++ b/lib/private/Preview/MP3.php @@ -24,6 +24,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OC\Preview; use ID3Parser\ID3Parser; diff --git a/lib/private/Preview/MSOffice2003.php b/lib/private/Preview/MSOffice2003.php index 5af66f72720..67559224528 100644 --- a/lib/private/Preview/MSOffice2003.php +++ b/lib/private/Preview/MSOffice2003.php @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + 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 0d1177d9de9..125e0ecfcad 100644 --- a/lib/private/Preview/MSOffice2007.php +++ b/lib/private/Preview/MSOffice2007.php @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + 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 24d1a9d5b6a..e1359c6b903 100644 --- a/lib/private/Preview/MSOfficeDoc.php +++ b/lib/private/Preview/MSOfficeDoc.php @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OC\Preview; //.doc, .dot diff --git a/lib/private/Preview/MarkDown.php b/lib/private/Preview/MarkDown.php index ae24c4f4419..bdf16ae2bc5 100644 --- a/lib/private/Preview/MarkDown.php +++ b/lib/private/Preview/MarkDown.php @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OC\Preview; class MarkDown extends TXT { diff --git a/lib/private/Preview/Movie.php b/lib/private/Preview/Movie.php index 60fe443804a..17916896f97 100644 --- a/lib/private/Preview/Movie.php +++ b/lib/private/Preview/Movie.php @@ -23,6 +23,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OC\Preview; use OCP\Files\File; diff --git a/lib/private/Preview/Office.php b/lib/private/Preview/Office.php index f51023c5a83..49437aec186 100644 --- a/lib/private/Preview/Office.php +++ b/lib/private/Preview/Office.php @@ -23,11 +23,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + 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 929fecffb21..ab3394ffea0 100644 --- a/lib/private/Preview/OpenDocument.php +++ b/lib/private/Preview/OpenDocument.php @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + 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 d0dd259891f..ed128638e4b 100644 --- a/lib/private/Preview/Provider.php +++ b/lib/private/Preview/Provider.php @@ -23,6 +23,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OC\Preview; use OCP\Preview\IProvider; diff --git a/lib/private/Preview/SVG.php b/lib/private/Preview/SVG.php index 3f313f4bb9b..2fe4c464575 100644 --- a/lib/private/Preview/SVG.php +++ b/lib/private/Preview/SVG.php @@ -22,11 +22,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + 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 2c9542b22e6..1300bdc7b41 100644 --- a/lib/private/Preview/StarOffice.php +++ b/lib/private/Preview/StarOffice.php @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + 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 3e2032df2de..d1ee1c025ea 100644 --- a/lib/private/Preview/TXT.php +++ b/lib/private/Preview/TXT.php @@ -24,6 +24,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OC\Preview; use OCP\Files\File; diff --git a/lib/private/Preview/Watcher.php b/lib/private/Preview/Watcher.php index 0c0531dff94..30708445c76 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 <http://www.gnu.org/licenses/>. * */ + 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 f374b909d8f..346634ccf3a 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 <http://www.gnu.org/licenses/>. * */ + 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 b0858643d53..45b1529648b 100644 --- a/lib/private/PreviewManager.php +++ b/lib/private/PreviewManager.php @@ -24,6 +24,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OC; use OC\Preview\Generator; diff --git a/lib/private/Repair/AddCleanupUpdaterBackupsJob.php b/lib/private/Repair/AddCleanupUpdaterBackupsJob.php index 1574e665fb6..cf35bc1fda5 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 22add525adb..90fdaf6b70f 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 f2cc9373176..a7a53720db5 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 feb8a291282..adeabea9672 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 d57a356dff9..c3c239d11ba 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 <http://www.gnu.org/licenses/>. * */ + 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 c65ea47f02b..0d258aa3779 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 <http://www.gnu.org/licenses/>. * */ + 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 b58fabcba50..7bef59a9d37 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 <http://www.gnu.org/licenses/>. * */ + 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 cfa72d86b1e..8a2850080a6 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 0b1b64c3a3a..9c18ff809ae 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 f62f8b56b26..13f618b6747 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 814f955dc70..93f9961d565 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 4c83f251012..125c5ff2742 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 0cfdf24ac97..2ef7eeda4ad 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 3df0458c694..d6e08c399ed 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 <http://www.gnu.org/licenses/>. * */ + 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 9d1d043a165..c912b820eba 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 <http://www.gnu.org/licenses/> * */ + namespace OC\Security\CSP; /** diff --git a/lib/private/Security/CredentialsManager.php b/lib/private/Security/CredentialsManager.php index 0ac9b30c6ce..7c58cb3b1c9 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 876f159950c..2eb20d41456 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 48e2d34a5dd..a5ffa9e0f1e 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.php b/lib/private/Setup.php index d7c6df3535a..266c70846c6 100644 --- a/lib/private/Setup.php +++ b/lib/private/Setup.php @@ -50,6 +50,7 @@ use OC\Authentication\Token\DefaultTokenProvider; use OC\Log\Rotate; use OC\Preview\BackgroundCleanupJob; use OCP\Defaults; +use OCP\IGroup; use OCP\IL10N; use OCP\ILogger; use OCP\IUser; @@ -80,14 +81,15 @@ class Setup { * @param ISecureRandom $random * @param Installer $installer */ - public function __construct(SystemConfig $config, - IniGetWrapper $iniWrapper, - IL10N $l10n, - Defaults $defaults, - ILogger $logger, - ISecureRandom $random, - Installer $installer - ) { + public function __construct( + SystemConfig $config, + IniGetWrapper $iniWrapper, + IL10N $l10n, + Defaults $defaults, + ILogger $logger, + ISecureRandom $random, + Installer $installer + ) { $this->config = $config; $this->iniWrapper = $iniWrapper; $this->l10n = $l10n; @@ -100,13 +102,14 @@ class Setup { static protected $dbSetupClasses = [ 'mysql' => \OC\Setup\MySQL::class, 'pgsql' => \OC\Setup\PostgreSQL::class, - 'oci' => \OC\Setup\OCI::class, + 'oci' => \OC\Setup\OCI::class, 'sqlite' => \OC\Setup\Sqlite::class, 'sqlite3' => \OC\Setup\Sqlite::class, ]; /** * Wrapper around the "class_exists" PHP function to be able to mock it + * * @param string $name * @return bool */ @@ -116,6 +119,7 @@ class Setup { /** * Wrapper around the "is_callable" PHP function to be able to mock it + * * @param string $name * @return bool */ @@ -141,7 +145,7 @@ class Setup { */ public function getSupportedDatabases($allowAllDatabases = false) { $availableDatabases = [ - 'sqlite' => [ + 'sqlite' => [ 'type' => 'pdo', 'call' => 'sqlite', 'name' => 'SQLite', @@ -168,24 +172,24 @@ class Setup { $configuredDatabases = $this->config->getValue('supportedDatabases', ['sqlite', 'mysql', 'pgsql']); } - if(!is_array($configuredDatabases)) { + if (!is_array($configuredDatabases)) { throw new Exception('Supported databases are not properly configured.'); } $supportedDatabases = array(); - foreach($configuredDatabases as $database) { - if(array_key_exists($database, $availableDatabases)) { + foreach ($configuredDatabases as $database) { + if (array_key_exists($database, $availableDatabases)) { $working = false; $type = $availableDatabases[$database]['type']; $call = $availableDatabases[$database]['call']; if ($type === 'function') { $working = $this->is_callable($call); - } elseif($type === 'pdo') { + } elseif ($type === 'pdo') { $working = in_array($call, $this->getAvailableDbDriversForPdo(), true); } - if($working) { + if ($working) { $supportedDatabases[$database] = $availableDatabases[$database]['name']; } } @@ -204,14 +208,14 @@ class Setup { public function getSystemInfo($allowAllDatabases = false) { $databases = $this->getSupportedDatabases($allowAllDatabases); - $dataDir = $this->config->getValue('datadirectory', \OC::$SERVERROOT.'/data'); + $dataDir = $this->config->getValue('datadirectory', \OC::$SERVERROOT . '/data'); $errors = []; // Create data directory to test whether the .htaccess works // Notice that this is not necessarily the same data directory as the one // that will effectively be used. - if(!file_exists($dataDir)) { + if (!file_exists($dataDir)) { @mkdir($dataDir); } $htAccessWorking = true; @@ -242,7 +246,7 @@ class Setup { ]; } - if($this->iniWrapper->getString('open_basedir') !== '' && PHP_INT_SIZE === 4) { + if ($this->iniWrapper->getString('open_basedir') !== '' && PHP_INT_SIZE === 4) { $errors[] = [ 'error' => $this->l10n->t( 'It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. ' . @@ -275,14 +279,14 @@ class Setup { $error = array(); $dbType = $options['dbtype']; - if(empty($options['adminlogin'])) { + if (empty($options['adminlogin'])) { $error[] = $l->t('Set an admin username.'); } - if(empty($options['adminpass'])) { + if (empty($options['adminpass'])) { $error[] = $l->t('Set an admin password.'); } - if(empty($options['directory'])) { - $options['directory'] = \OC::$SERVERROOT."/data"; + if (empty($options['directory'])) { + $options['directory'] = \OC::$SERVERROOT . "/data"; } if (!isset(self::$dbSetupClasses[$dbType])) { @@ -310,8 +314,8 @@ class Setup { $request = \OC::$server->getRequest(); //no errors, good - if(isset($options['trusted_domains']) - && is_array($options['trusted_domains'])) { + if (isset($options['trusted_domains']) + && is_array($options['trusted_domains'])) { $trustedDomains = $options['trusted_domains']; } else { $trustedDomains = [$request->getInsecureServerHost()]; @@ -329,12 +333,12 @@ class Setup { //write the config file $newConfigValues = [ - 'passwordsalt' => $salt, - 'secret' => $secret, - 'trusted_domains' => $trustedDomains, - 'datadirectory' => $dataDir, - 'dbtype' => $dbType, - 'version' => implode('.', \OCP\Util::getVersion()), + 'passwordsalt' => $salt, + 'secret' => $secret, + 'trusted_domains' => $trustedDomains, + 'datadirectory' => $dataDir, + 'dbtype' => $dbType, + 'version' => implode('.', \OCP\Util::getVersion()), ]; if ($this->config->getValue('overwrite.cli.url', null) === null) { @@ -363,13 +367,13 @@ class Setup { } //create the user and group - $user = null; + $user = null; try { $user = \OC::$server->getUserManager()->createUser($username, $password); if (!$user) { $error[] = "User <$username> could not be created."; } - } catch(Exception $exception) { + } catch (Exception $exception) { $error[] = $exception->getMessage(); } @@ -379,22 +383,25 @@ class Setup { $config->setAppValue('core', 'lastupdatedat', microtime(true)); $config->setAppValue('core', 'vendor', $this->getVendor()); - $group =\OC::$server->getGroupManager()->createGroup('admin'); - $group->addUser($user); + $group = \OC::$server->getGroupManager()->createGroup('admin'); + if ($group instanceof IGroup) { + $group->addUser($user); + } // Install shipped apps and specified app bundles Installer::installShippedApps(); $bundleFetcher = new BundleFetcher(\OC::$server->getL10N('lib')); $defaultInstallationBundles = $bundleFetcher->getDefaultInstallationBundle(); - foreach($defaultInstallationBundles as $bundle) { + foreach ($defaultInstallationBundles as $bundle) { try { $this->installer->installAppBundle($bundle); - } catch (Exception $e) {} + } catch (Exception $e) { + } } // create empty file in data dir, so we can later find // out that this is indeed an ownCloud data directory - file_put_contents($config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/.ocdata', ''); + file_put_contents($config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/.ocdata', ''); // Update .htaccess files self::updateHtaccess(); @@ -434,7 +441,7 @@ class Setup { * @return string Absolute path to htaccess */ private function pathToHtaccess() { - return \OC::$SERVERROOT.'/.htaccess'; + return \OC::$SERVERROOT . '/.htaccess'; } /** @@ -499,7 +506,7 @@ class Setup { // Add rewrite rules if the RewriteBase is configured $rewriteBase = $config->getValue('htaccess.RewriteBase', ''); - if($rewriteBase !== '') { + if ($rewriteBase !== '') { $content .= "\n<IfModule mod_rewrite.c>"; $content .= "\n Options -MultiViews"; $content .= "\n RewriteRule ^core/js/oc.js$ index.php [PT,E=PATH_INFO:$1]"; @@ -532,7 +539,7 @@ class Setup { if ($content !== '') { //suppress errors in case we don't have permissions for it - return (bool) @file_put_contents($setupHelper->pathToHtaccess(), $htaccessContent.$content . "\n"); + return (bool)@file_put_contents($setupHelper->pathToHtaccess(), $htaccessContent . $content . "\n"); } return false; @@ -540,21 +547,21 @@ class Setup { public static function protectDataDirectory() { //Require all denied - $now = date('Y-m-d H:i:s'); + $now = date('Y-m-d H:i:s'); $content = "# Generated by Nextcloud on $now\n"; - $content.= "# line below if for Apache 2.4\n"; - $content.= "<ifModule mod_authz_core.c>\n"; - $content.= "Require all denied\n"; - $content.= "</ifModule>\n\n"; - $content.= "# line below if for Apache 2.2\n"; - $content.= "<ifModule !mod_authz_core.c>\n"; - $content.= "deny from all\n"; - $content.= "Satisfy All\n"; - $content.= "</ifModule>\n\n"; - $content.= "# section for Apache 2.2 and 2.4\n"; - $content.= "<ifModule mod_autoindex.c>\n"; - $content.= "IndexIgnore *\n"; - $content.= "</ifModule>\n"; + $content .= "# line below if for Apache 2.4\n"; + $content .= "<ifModule mod_authz_core.c>\n"; + $content .= "Require all denied\n"; + $content .= "</ifModule>\n\n"; + $content .= "# line below if for Apache 2.2\n"; + $content .= "<ifModule !mod_authz_core.c>\n"; + $content .= "deny from all\n"; + $content .= "Satisfy All\n"; + $content .= "</ifModule>\n\n"; + $content .= "# section for Apache 2.2 and 2.4\n"; + $content .= "<ifModule mod_autoindex.c>\n"; + $content .= "IndexIgnore *\n"; + $content .= "</ifModule>\n"; $baseDir = \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data'); file_put_contents($baseDir . '/.htaccess', $content); @@ -572,6 +579,6 @@ class Setup { // this should really be a JSON file require \OC::$SERVERROOT . '/version.php'; /** @var string $vendor */ - return (string) $vendor; + return (string)$vendor; } } diff --git a/lib/private/Setup/AbstractDatabase.php b/lib/private/Setup/AbstractDatabase.php index 903f8b6e386..459848d1c79 100644 --- a/lib/private/Setup/AbstractDatabase.php +++ b/lib/private/Setup/AbstractDatabase.php @@ -26,6 +26,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OC\Setup; use OC\DB\ConnectionFactory; diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php index 3bb940186f8..8a38f889c74 100644 --- a/lib/private/Setup/MySQL.php +++ b/lib/private/Setup/MySQL.php @@ -27,6 +27,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OC\Setup; use OC\DB\MySqlTools; diff --git a/lib/private/Setup/PostgreSQL.php b/lib/private/Setup/PostgreSQL.php index 6d1b5ca2927..020c2e555d9 100644 --- a/lib/private/Setup/PostgreSQL.php +++ b/lib/private/Setup/PostgreSQL.php @@ -24,6 +24,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OC\Setup; use OC\DatabaseException; diff --git a/lib/private/Share/SearchResultSorter.php b/lib/private/Share/SearchResultSorter.php index da63dd33b8e..8418a1e4119 100644 --- a/lib/private/Share/SearchResultSorter.php +++ b/lib/private/Share/SearchResultSorter.php @@ -21,6 +21,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + 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 7a146bf7890..c25a7b03d5c 100644 --- a/lib/private/Share20/DefaultShareProvider.php +++ b/lib/private/Share20/DefaultShareProvider.php @@ -27,29 +27,30 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + 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 10dae34cc34..f270dd53147 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 <http://www.gnu.org/licenses/> * */ + 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 1e7337b0418..f4a88ebc188 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 <http://www.gnu.org/licenses/> * */ + 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 f7ada6d48fd..89bd28a60eb 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 <http://www.gnu.org/licenses/> * */ + namespace OC\Share20\Exception; class ProviderException extends \Exception { } - diff --git a/lib/private/Share20/Hooks.php b/lib/private/Share20/Hooks.php index 4519b709a8c..4318fd57cf1 100644 --- a/lib/private/Share20/Hooks.php +++ b/lib/private/Share20/Hooks.php @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OC\Share20; class Hooks { diff --git a/lib/private/Share20/LegacyHooks.php b/lib/private/Share20/LegacyHooks.php index 4cc748aa418..4554ab64a14 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 298aa6f0f57..d9809fd128a 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 da1905bf986..dc77a9fbcbb 100644 --- a/lib/private/Share20/ProviderFactory.php +++ b/lib/private/Share20/ProviderFactory.php @@ -26,9 +26,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + 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 57b5304b102..3ac324b40ce 100644 --- a/lib/private/Share20/Share.php +++ b/lib/private/Share20/Share.php @@ -21,6 +21,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OC\Share20; use OCP\Files\Cache\ICacheEntry; diff --git a/lib/private/Share20/ShareHelper.php b/lib/private/Share20/ShareHelper.php index 5f692c6a62b..f94546d19ed 100644 --- a/lib/private/Share20/ShareHelper.php +++ b/lib/private/Share20/ShareHelper.php @@ -21,6 +21,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace OC\Share20; use OCP\Files\InvalidPathException; diff --git a/lib/private/SubAdmin.php b/lib/private/SubAdmin.php index f79a0b1ae5a..ec959e0e4ea 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 839a819a04a..ab17ae69ac8 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 <http://www.gnu.org/licenses/> * */ + namespace OC\SystemTag; use OCP\IServerContainer; diff --git a/lib/private/SystemTag/SystemTagManager.php b/lib/private/SystemTag/SystemTagManager.php index 055b744e5c3..85a12da67f2 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 de5ab0a485c..f20f22955a3 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 e5ca41f69e3..49361ff181a 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 6e8683d2f7c..479c41ff7fd 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 3c0a270d3f2..75175ad6373 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 93683753899..224a7a9b213 100644 --- a/lib/private/Template/JSCombiner.php +++ b/lib/private/Template/JSCombiner.php @@ -22,14 +22,15 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + 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 15e2fd76c48..df5eda9121b 100644 --- a/lib/private/Template/JSConfigHelper.php +++ b/lib/private/Template/JSConfigHelper.php @@ -25,6 +25,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace OC\Template; use bantu\IniGetWrapper\IniGetWrapper; diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php index c6d5fc8ef71..df90fca9817 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 6de6b33172c..e476ddd275d 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -36,13 +36,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + 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 446e04dc5ed..079ffe7ff44 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 30ed962555d..2b9b4d27ea3 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 7f9691073c9..da2d354b7ef 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 a80bf7dc54b..b72fb6a9e25 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 12af787a5a6..96f0f38b82a 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 eed49aff313..f73756dd240 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 d3c528ee4f9..5a41dfc7acb 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 1f85ac3ca86..c7213e278a6 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 d56719c4de3..56dbc840344 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 e380eca5c24..767d10f965a 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 b6e2025d2cd..ae5e65c605c 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 f3b953e95e0..4aedc03dd22 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 c731a5085f7..ff494e7b2fc 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 db5a1803c83..fbca8899d3a 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 391e3f0dd64..46025d9831b 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 5c99e170e00..bb17a34e8ba 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 f327e6ca022..6fd1646f3f9 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 64be033d1d9..76390d09b4a 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 9823a0a1fa8..563d7d22aa8 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 6910757add0..d8de9e23aa7 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 3955c417d57..465c76c4dcb 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 e9fcba8148d..78cf01f1ac7 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 <http://www.gnu.org/licenses/> * */ + namespace OCP\AppFramework\Http; /** diff --git a/lib/public/AppFramework/Http/DownloadResponse.php b/lib/public/AppFramework/Http/DownloadResponse.php index 774a6287cb2..4061dc42ad7 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 2d2dd29e6a1..a63a77ef4ef 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 <http://www.gnu.org/licenses/>. * */ + 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 dc44bbe999c..84f53936fe8 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 2ec50137ef9..0a2f4c9d9ee 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 <http://www.gnu.org/licenses/>. * */ + namespace OCP\AppFramework\Http; diff --git a/lib/public/AppFramework/Http/Template/ExternalShareMenuAction.php b/lib/public/AppFramework/Http/Template/ExternalShareMenuAction.php index 4d455a9a755..84eb48b954c 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 e42d2057981..8a037b62e4b 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 a520748a9ea..adffdd9ecdc 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 60bb268661c..2a09d89d31a 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 bec0812ab0c..4223912488b 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 4c9051a0b34..663e8e05452 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 843f8a5e0a4..7e7c775c368 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 <http://www.gnu.org/licenses/>. * */ + namespace OCP\AppFramework\OCS; use Exception; diff --git a/lib/public/AppFramework/OCS/OCSException.php b/lib/public/AppFramework/OCS/OCSException.php index 3ef6f3393ab..e6c506aef5c 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 <http://www.gnu.org/licenses/>. * */ + namespace OCP\AppFramework\OCS; use Exception; diff --git a/lib/public/AppFramework/OCS/OCSForbiddenException.php b/lib/public/AppFramework/OCS/OCSForbiddenException.php index 7545d87c0bf..a163ca5f175 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 <http://www.gnu.org/licenses/>. * */ + namespace OCP\AppFramework\OCS; use Exception; diff --git a/lib/public/AppFramework/OCS/OCSNotFoundException.php b/lib/public/AppFramework/OCS/OCSNotFoundException.php index 87a5ce20098..12e135251b4 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 <http://www.gnu.org/licenses/>. * */ + namespace OCP\AppFramework\OCS; use Exception; diff --git a/lib/public/AppFramework/OCSController.php b/lib/public/AppFramework/OCSController.php index 29f26bf7e71..e1273a0ca3e 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 fcc1c1a9b87..3569c50a034 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 6c7b979f2d6..563dbdcfe0f 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 2a59689665d..918c97f8b68 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 c882a24d56f..7f5d39f0ae3 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 c7c846bbe9d..3249d70f496 100644 --- a/lib/public/Comments/IComment.php +++ b/lib/public/Comments/IComment.php @@ -21,6 +21,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + 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 744263643ec..061dacba480 100644 --- a/lib/public/Comments/ICommentsManager.php +++ b/lib/public/Comments/ICommentsManager.php @@ -24,6 +24,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OCP\Comments; use OCP\IUser; diff --git a/lib/public/Comments/ICommentsManagerFactory.php b/lib/public/Comments/ICommentsManagerFactory.php index 4a38d992bc3..bdd15c816cb 100644 --- a/lib/public/Comments/ICommentsManagerFactory.php +++ b/lib/public/Comments/ICommentsManagerFactory.php @@ -21,6 +21,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OCP\Comments; use OCP\IServerContainer; diff --git a/lib/public/Comments/IllegalIDChangeException.php b/lib/public/Comments/IllegalIDChangeException.php index 97f18fee12e..605f373acf2 100644 --- a/lib/public/Comments/IllegalIDChangeException.php +++ b/lib/public/Comments/IllegalIDChangeException.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OCP\Comments; /** diff --git a/lib/public/Comments/MessageTooLongException.php b/lib/public/Comments/MessageTooLongException.php index 4c46ed46524..19c93b8252e 100644 --- a/lib/public/Comments/MessageTooLongException.php +++ b/lib/public/Comments/MessageTooLongException.php @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OCP\Comments; /** diff --git a/lib/public/Comments/NotFoundException.php b/lib/public/Comments/NotFoundException.php index ab83e4095c2..56b48efcff0 100644 --- a/lib/public/Comments/NotFoundException.php +++ b/lib/public/Comments/NotFoundException.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OCP\Comments; /** diff --git a/lib/public/Contacts/IManager.php b/lib/public/Contacts/IManager.php index 84948a929c0..b3ada74ba2d 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 99b45ee7c29..1debf81f2b8 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 <http://www.gnu.org/licenses/> * */ + namespace OCP\DB\QueryBuilder; /** diff --git a/lib/public/DB/QueryBuilder/IParameter.php b/lib/public/DB/QueryBuilder/IParameter.php index c4e3fe29971..9e50c0905eb 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 <http://www.gnu.org/licenses/> * */ + namespace OCP\DB\QueryBuilder; /** diff --git a/lib/public/DB/QueryBuilder/IQueryFunction.php b/lib/public/DB/QueryBuilder/IQueryFunction.php index 5c319194739..afb676db565 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 <http://www.gnu.org/licenses/> * */ + namespace OCP\DB\QueryBuilder; /** diff --git a/lib/public/Dashboard/Exceptions/DashboardAppNotAvailableException.php b/lib/public/Dashboard/Exceptions/DashboardAppNotAvailableException.php index 4c3013000e8..1e3d420e0bf 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 ede47c4baaf..93f96983583 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 bbbdf86da8f..b4bb3892911 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 0ae4cad50a9..b06e97100b4 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 3a3658b30b2..3df1e2d3693 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 616771f7bca..42d2f810bcd 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 8f0881a3a17..7073bbc922d 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 485d6298539..c668cfb7e7c 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 4262e235fd5..6717b804296 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 b9a4482b4fc..e2869f7f70c 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 bf790bb7239..82bf5be3843 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 b32ccf03eb6..89e5525701b 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 b3574535cb0..ef0c7c9bcc3 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 1cfd73fb288..e2983a8151d 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 af801959247..51baf5f5d4e 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 8aa4dc04aa9..effd4a45667 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 4a74403106c..0229f8357b0 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 29a83b4df7d..1fe01cfb29a 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 4d9e76b27f3..f09896bf93a 100644 --- a/lib/public/Files/FileInfo.php +++ b/lib/public/Files/FileInfo.php @@ -25,6 +25,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OCP\Files; /** diff --git a/lib/public/Files/FileNameTooLongException.php b/lib/public/Files/FileNameTooLongException.php index 8c46b7f5519..d2302cd66f9 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 425813c7e21..8e45051a118 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 4432c0d4934..03b0286695b 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 b5da4aabebd..dcbcd93bab8 100644 --- a/lib/public/Files/GenericFileException.php +++ b/lib/public/Files/GenericFileException.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace OCP\Files; /** diff --git a/lib/public/Files/IAppData.php b/lib/public/Files/IAppData.php index fd0d0649810..875463c98bf 100644 --- a/lib/public/Files/IAppData.php +++ b/lib/public/Files/IAppData.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace OCP\Files; use OCP\Files\SimpleFS\ISimpleRoot; diff --git a/lib/public/Files/IHomeStorage.php b/lib/public/Files/IHomeStorage.php index 3144dd8bc94..0d5f351ebad 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 f66eb4e0b9f..318927f2ffa 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 b041bcae301..aa5ca5b8dc9 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 8e8f1a15e3a..40c51cb2544 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 bdde7909b58..b8f449b6462 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 bb8aff50913..2f2caa95a62 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 1ef0e676b34..ece55b6c375 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 016b217afc3..4468b680014 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 f4407a95785..f7b4b6c59d4 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 f0ccb90a52b..d285dafd32d 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 516c323181b..75f34b787ce 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 83c4b1065d6..580a92729d9 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 <http://www.gnu.org/licenses/> * */ + namespace OCP\Files\ObjectStore; use OCP\Files\NotFoundException; diff --git a/lib/public/Files/ReservedWordException.php b/lib/public/Files/ReservedWordException.php index 67b205de57b..64f88ca5187 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 b00f5c482c6..041e915643e 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 <http://www.gnu.org/licenses/>. * */ + 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 54fbd466e46..ab3db007c54 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 <http://www.gnu.org/licenses/>. * */ + 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 054106fbaca..649f0233b02 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 <http://www.gnu.org/licenses/>. * */ + namespace OCP\Files\SimpleFS; use OCP\Files\NotFoundException; diff --git a/lib/public/Files/Storage.php b/lib/public/Files/Storage.php index 1cbba104dee..3fab0877990 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 5ec4a2be843..8b62491d39a 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 1fc45c041c3..1d9fa5363dc 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 4e216b0f01f..526feebb463 100644 --- a/lib/public/Files/StorageAuthException.php +++ b/lib/public/Files/StorageAuthException.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OCP\Files; /** diff --git a/lib/public/Files/StorageBadConfigException.php b/lib/public/Files/StorageBadConfigException.php index ea525b91f45..6cd3ee06b24 100644 --- a/lib/public/Files/StorageBadConfigException.php +++ b/lib/public/Files/StorageBadConfigException.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OCP\Files; /** diff --git a/lib/public/Files/StorageConnectionException.php b/lib/public/Files/StorageConnectionException.php index 7702460a2f8..be901b60a04 100644 --- a/lib/public/Files/StorageConnectionException.php +++ b/lib/public/Files/StorageConnectionException.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OCP\Files; /** diff --git a/lib/public/Files/StorageInvalidException.php b/lib/public/Files/StorageInvalidException.php index c772a714fcd..7f8d489304e 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 7a060417acb..3cf87331999 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 90b56095074..614b04c33f8 100644 --- a/lib/public/Files/StorageTimeoutException.php +++ b/lib/public/Files/StorageTimeoutException.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OCP\Files; /** diff --git a/lib/public/Files/UnseekableException.php b/lib/public/Files/UnseekableException.php index 059a8d55126..5185f0c056f 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 143788f33ad..d239521da44 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 4363376f0f4..5d533ff467d 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 3c2aa6324d7..1cc58a78909 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 01016269f6b..0ae355b0eef 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 b72c9e55435..1405a04420d 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 848e2200f60..bbd1e47411b 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 c1c83db2d4b..fd7a887ca46 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 d3184530a7f..3effb2c1afc 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 8cc5da13d4d..81087101544 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 0dff82bd5a0..21867be4d59 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 4ac995ad75f..e8f031e89cb 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 6874cf161b6..a8117789154 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 08884e25c2b..e040d5c8d4a 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 2ca61c2f37b..53fbaf9bf74 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 9cd6753f2a7..6abeaca581b 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 b70c7eb965f..abc0fcb6faa 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 64153c13965..26ce5d0c56f 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 7da38e44f5c..ac0d252f426 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 e67470f2e1a..ef6c22ebd8e 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 35d11755fac..2c67aafdba5 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 8d86773e771..77fc7b6567b 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 2f268185e62..aae8bce025c 100644 --- a/lib/public/IAppConfig.php +++ b/lib/public/IAppConfig.php @@ -23,6 +23,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OCP; /** diff --git a/lib/public/ICache.php b/lib/public/ICache.php index ba61100925b..5aa6dc9fc87 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 878c0acf0c3..95c72bb1fc8 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 558c72291c5..b9afa2f1d87 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 4c66896a2fe..da89d5bb842 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/IGroupManager.php b/lib/public/IGroupManager.php index f7a63dfefb7..d8a557777bc 100644 --- a/lib/public/IGroupManager.php +++ b/lib/public/IGroupManager.php @@ -75,7 +75,7 @@ interface IGroupManager { /** * @param string $gid - * @return \OCP\IGroup + * @return \OCP\IGroup|null * @since 8.0.0 */ public function get($gid); @@ -89,7 +89,7 @@ interface IGroupManager { /** * @param string $gid - * @return \OCP\IGroup + * @return \OCP\IGroup|null * @since 8.0.0 */ public function createGroup($gid); diff --git a/lib/public/IL10N.php b/lib/public/IL10N.php index 53decd78051..f7baa10b5e9 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 8f182553b67..19d89b86832 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 f840bc8c8a5..68969d0c3f7 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 6989871d29b..08a428ebeb1 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 05948cd480f..f61c1da0885 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 bcdb6e6c9f5..79d4ed9f71b 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 bbf36c86520..3d2f32f7f75 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 60d547e44ad..b0c9f0d7d90 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 fce47bb5bc7..c39117e924f 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 502856fc354..41123e8b7ae 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 b3c470e5be5..48fe135f28e 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 d583dffe91d..55060f3da48 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 de904d0eec1..04548046f55 100644 --- a/lib/public/L10N/IFactory.php +++ b/lib/public/L10N/IFactory.php @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OCP\L10N; use OCP\IUser; diff --git a/lib/public/Migration/IOutput.php b/lib/public/Migration/IOutput.php index 7c6b12ceaf4..8d3ea7cb669 100644 --- a/lib/public/Migration/IOutput.php +++ b/lib/public/Migration/IOutput.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OCP\Migration; /** diff --git a/lib/public/Migration/IRepairStep.php b/lib/public/Migration/IRepairStep.php index 0ba834e2cbf..1a39531bcde 100644 --- a/lib/public/Migration/IRepairStep.php +++ b/lib/public/Migration/IRepairStep.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OCP\Migration; /** diff --git a/lib/public/OCS/IDiscoveryService.php b/lib/public/OCS/IDiscoveryService.php index ad1499e75fd..f294cffe94f 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 ea6350afb4d..cbf0ec2f9b7 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 5d62b3ce6d0..6642b7e26c6 100644 --- a/lib/public/Preview/IProvider.php +++ b/lib/public/Preview/IProvider.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OCP\Preview; /** diff --git a/lib/public/Route/IRoute.php b/lib/public/Route/IRoute.php index 9b8218085ad..40566413508 100644 --- a/lib/public/Route/IRoute.php +++ b/lib/public/Route/IRoute.php @@ -22,6 +22,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OCP\Route; /** diff --git a/lib/public/SabrePluginEvent.php b/lib/public/SabrePluginEvent.php index 8f8d155ec10..165cccc22d2 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 f433a35f17a..10c7324d903 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 ef5586a362f..7ccac2fb2db 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 <http://www.gnu.org/licenses/> * */ + namespace OCP\Share\Exceptions; use OC\HintException; diff --git a/lib/public/Share/Exceptions/IllegalIDChangeException.php b/lib/public/Share/Exceptions/IllegalIDChangeException.php index 46cbe5fbf9f..fd5ef0dc2cd 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 <http://www.gnu.org/licenses/> * */ + namespace OCP\Share\Exceptions; /** diff --git a/lib/public/Share/IShareHelper.php b/lib/public/Share/IShareHelper.php index c957a815e89..db9f2adbacd 100644 --- a/lib/public/Share/IShareHelper.php +++ b/lib/public/Share/IShareHelper.php @@ -21,6 +21,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace OCP\Share; use OCP\Files\Node; diff --git a/lib/public/Share/IShareProvider.php b/lib/public/Share/IShareProvider.php index 49ab4bef3e6..891e8bf1bb8 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 7ebad8b64d3..4aa55844027 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 0c87a58ce95..d5bb97a1c0c 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 a7f866dd7d0..3ff8c86a6c7 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 da434e8b5a0..8fa959fcc4d 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 25956b41df4..5458cab8340 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 <http://www.gnu.org/licenses/> * */ + namespace OCP\SystemTag; use OCP\IServerContainer; diff --git a/lib/public/User.php b/lib/public/User.php index a669a3a06fc..04254db08a1 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 b82fc6ba550..d880f2f5df5 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 7e9f6b2efbc..a63e53b0720 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/package-lock.json b/package-lock.json index 832e6616a73..5a5bb24bcca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -182,17 +182,17 @@ } }, "@babel/helper-annotate-as-pure": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.0.tgz", - "integrity": "sha512-k50CQxMlYTYo+GGyUGFwpxKVtxVJi9yh61sXZji3zYHccK9RYliZGSTOgci85T+r+0VFN2nWbGM04PIqwfrpMg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.4.tgz", + "integrity": "sha512-2BQmQgECKzYKFPpiycoF9tlb5HA4lrVyAmLLVK177EcQAqjVLciUb2/R+n1boQ9y5ENV3uz2ZqiNw7QMBBw1Og==", "requires": { - "@babel/types": "^7.7.0" + "@babel/types": "^7.7.4" }, "dependencies": { "@babel/types": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.2.tgz", - "integrity": "sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", "requires": { "esutils": "^2.0.2", "lodash": "^4.17.13", @@ -202,18 +202,18 @@ } }, "@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.7.0.tgz", - "integrity": "sha512-Cd8r8zs4RKDwMG/92lpZcnn5WPQ3LAMQbCw42oqUh4s7vsSN5ANUZjMel0OOnxDLq57hoDDbai+ryygYfCTOsw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.7.4.tgz", + "integrity": "sha512-Biq/d/WtvfftWZ9Uf39hbPBYDUo986m5Bb4zhkeYDGUllF43D+nUe5M6Vuo6/8JDK/0YX/uBdeoQpyaNhNugZQ==", "requires": { - "@babel/helper-explode-assignable-expression": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/helper-explode-assignable-expression": "^7.7.4", + "@babel/types": "^7.7.4" }, "dependencies": { "@babel/types": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.2.tgz", - "integrity": "sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", "requires": { "esutils": "^2.0.2", "lodash": "^4.17.13", @@ -223,87 +223,87 @@ } }, "@babel/helper-call-delegate": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.7.0.tgz", - "integrity": "sha512-Su0Mdq7uSSWGZayGMMQ+z6lnL00mMCnGAbO/R0ZO9odIdB/WNU/VfQKqMQU0fdIsxQYbRjDM4BixIa93SQIpvw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.7.4.tgz", + "integrity": "sha512-8JH9/B7J7tCYJ2PpWVpw9JhPuEVHztagNVuQAFBVFYluRMlpG7F1CgKEgGeL6KFqcsIa92ZYVj6DSc0XwmN1ZA==", "requires": { - "@babel/helper-hoist-variables": "^7.7.0", - "@babel/traverse": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/helper-hoist-variables": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@babel/types": "^7.7.4" }, "dependencies": { "@babel/generator": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.2.tgz", - "integrity": "sha512-WthSArvAjYLz4TcbKOi88me+KmDJdKSlfwwN8CnUYn9jBkzhq0ZEPuBfkAWIvjJ3AdEV1Cf/+eSQTnp3IDJKlQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.4.tgz", + "integrity": "sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==", "requires": { - "@babel/types": "^7.7.2", + "@babel/types": "^7.7.4", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" } }, "@babel/helper-function-name": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.0.tgz", - "integrity": "sha512-tDsJgMUAP00Ugv8O2aGEua5I2apkaQO7lBGUq1ocwN3G23JE5Dcq0uh3GvFTChPa4b40AWiAsLvCZOA2rdnQ7Q==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz", + "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==", "requires": { - "@babel/helper-get-function-arity": "^7.7.0", - "@babel/template": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/helper-get-function-arity": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/helper-get-function-arity": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.0.tgz", - "integrity": "sha512-tLdojOTz4vWcEnHWHCuPN5P85JLZWbm5Fx5ZsMEMPhF3Uoe3O7awrbM2nQ04bDOUToH/2tH/ezKEOR8zEYzqyw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", + "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", "requires": { - "@babel/types": "^7.7.0" + "@babel/types": "^7.7.4" } }, "@babel/helper-split-export-declaration": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.0.tgz", - "integrity": "sha512-HgYSI8rH08neWlAH3CcdkFg9qX9YsZysZI5GD8LjhQib/mM0jGOZOVkoUiiV2Hu978fRtjtsGsW6w0pKHUWtqA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz", + "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==", "requires": { - "@babel/types": "^7.7.0" + "@babel/types": "^7.7.4" } }, "@babel/parser": { - "version": "7.7.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.3.tgz", - "integrity": "sha512-bqv+iCo9i+uLVbI0ILzKkvMorqxouI+GbV13ivcARXn9NNEabi2IEz912IgNpT/60BNXac5dgcfjb94NjsF33A==" + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.4.tgz", + "integrity": "sha512-jIwvLO0zCL+O/LmEJQjWA75MQTWwx3c3u2JOTDK5D3/9egrWRRA0/0hk9XXywYnXZVVpzrBYeIQTmhwUaePI9g==" }, "@babel/template": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.0.tgz", - "integrity": "sha512-OKcwSYOW1mhWbnTBgQY5lvg1Fxg+VyfQGjcBduZFljfc044J5iDlnDSfhQ867O17XHiSCxYHUxHg2b7ryitbUQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", + "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", "requires": { "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/traverse": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.2.tgz", - "integrity": "sha512-TM01cXib2+rgIZrGJOLaHV/iZUAxf4A0dt5auY6KNZ+cm6aschuJGqKJM3ROTt3raPUdIDk9siAufIFEleRwtw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.4.tgz", + "integrity": "sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==", "requires": { "@babel/code-frame": "^7.5.5", - "@babel/generator": "^7.7.2", - "@babel/helper-function-name": "^7.7.0", - "@babel/helper-split-export-declaration": "^7.7.0", - "@babel/parser": "^7.7.2", - "@babel/types": "^7.7.2", + "@babel/generator": "^7.7.4", + "@babel/helper-function-name": "^7.7.4", + "@babel/helper-split-export-declaration": "^7.7.4", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.13" } }, "@babel/types": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.2.tgz", - "integrity": "sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", "requires": { "esutils": "^2.0.2", "lodash": "^4.17.13", @@ -344,61 +344,61 @@ } }, "@babel/helper-create-regexp-features-plugin": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.2.tgz", - "integrity": "sha512-pAil/ZixjTlrzNpjx+l/C/wJk002Wo7XbbZ8oujH/AoJ3Juv0iN/UTcPUHXKMFLqsfS0Hy6Aow8M31brUYBlQQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.4.tgz", + "integrity": "sha512-Mt+jBKaxL0zfOIWrfQpnfYCN7/rS6GKx6CCCfuoqVVd+17R8zNDlzVYmIi9qyb2wOk002NsmSTDymkIygDUH7A==", "requires": { "@babel/helper-regex": "^7.4.4", "regexpu-core": "^4.6.0" } }, "@babel/helper-define-map": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.7.0.tgz", - "integrity": "sha512-kPKWPb0dMpZi+ov1hJiwse9dWweZsz3V9rP4KdytnX1E7z3cTNmFGglwklzFPuqIcHLIY3bgKSs4vkwXXdflQA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.7.4.tgz", + "integrity": "sha512-v5LorqOa0nVQUvAUTUF3KPastvUt/HzByXNamKQ6RdJRTV7j8rLL+WB5C/MzzWAwOomxDhYFb1wLLxHqox86lg==", "requires": { - "@babel/helper-function-name": "^7.7.0", - "@babel/types": "^7.7.0", + "@babel/helper-function-name": "^7.7.4", + "@babel/types": "^7.7.4", "lodash": "^4.17.13" }, "dependencies": { "@babel/helper-function-name": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.0.tgz", - "integrity": "sha512-tDsJgMUAP00Ugv8O2aGEua5I2apkaQO7lBGUq1ocwN3G23JE5Dcq0uh3GvFTChPa4b40AWiAsLvCZOA2rdnQ7Q==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz", + "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==", "requires": { - "@babel/helper-get-function-arity": "^7.7.0", - "@babel/template": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/helper-get-function-arity": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/helper-get-function-arity": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.0.tgz", - "integrity": "sha512-tLdojOTz4vWcEnHWHCuPN5P85JLZWbm5Fx5ZsMEMPhF3Uoe3O7awrbM2nQ04bDOUToH/2tH/ezKEOR8zEYzqyw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", + "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", "requires": { - "@babel/types": "^7.7.0" + "@babel/types": "^7.7.4" } }, "@babel/parser": { - "version": "7.7.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.3.tgz", - "integrity": "sha512-bqv+iCo9i+uLVbI0ILzKkvMorqxouI+GbV13ivcARXn9NNEabi2IEz912IgNpT/60BNXac5dgcfjb94NjsF33A==" + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.4.tgz", + "integrity": "sha512-jIwvLO0zCL+O/LmEJQjWA75MQTWwx3c3u2JOTDK5D3/9egrWRRA0/0hk9XXywYnXZVVpzrBYeIQTmhwUaePI9g==" }, "@babel/template": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.0.tgz", - "integrity": "sha512-OKcwSYOW1mhWbnTBgQY5lvg1Fxg+VyfQGjcBduZFljfc044J5iDlnDSfhQ867O17XHiSCxYHUxHg2b7ryitbUQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", + "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", "requires": { "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/types": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.2.tgz", - "integrity": "sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", "requires": { "esutils": "^2.0.2", "lodash": "^4.17.13", @@ -408,86 +408,86 @@ } }, "@babel/helper-explode-assignable-expression": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.7.0.tgz", - "integrity": "sha512-CDs26w2shdD1urNUAji2RJXyBFCaR+iBEGnFz3l7maizMkQe3saVw9WtjG1tz8CwbjvlFnaSLVhgnu1SWaherg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.7.4.tgz", + "integrity": "sha512-2/SicuFrNSXsZNBxe5UGdLr+HZg+raWBLE9vC98bdYOKX/U6PY0mdGlYUJdtTDPSU0Lw0PNbKKDpwYHJLn2jLg==", "requires": { - "@babel/traverse": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/traverse": "^7.7.4", + "@babel/types": "^7.7.4" }, "dependencies": { "@babel/generator": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.2.tgz", - "integrity": "sha512-WthSArvAjYLz4TcbKOi88me+KmDJdKSlfwwN8CnUYn9jBkzhq0ZEPuBfkAWIvjJ3AdEV1Cf/+eSQTnp3IDJKlQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.4.tgz", + "integrity": "sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==", "requires": { - "@babel/types": "^7.7.2", + "@babel/types": "^7.7.4", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" } }, "@babel/helper-function-name": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.0.tgz", - "integrity": "sha512-tDsJgMUAP00Ugv8O2aGEua5I2apkaQO7lBGUq1ocwN3G23JE5Dcq0uh3GvFTChPa4b40AWiAsLvCZOA2rdnQ7Q==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz", + "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==", "requires": { - "@babel/helper-get-function-arity": "^7.7.0", - "@babel/template": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/helper-get-function-arity": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/helper-get-function-arity": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.0.tgz", - "integrity": "sha512-tLdojOTz4vWcEnHWHCuPN5P85JLZWbm5Fx5ZsMEMPhF3Uoe3O7awrbM2nQ04bDOUToH/2tH/ezKEOR8zEYzqyw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", + "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", "requires": { - "@babel/types": "^7.7.0" + "@babel/types": "^7.7.4" } }, "@babel/helper-split-export-declaration": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.0.tgz", - "integrity": "sha512-HgYSI8rH08neWlAH3CcdkFg9qX9YsZysZI5GD8LjhQib/mM0jGOZOVkoUiiV2Hu978fRtjtsGsW6w0pKHUWtqA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz", + "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==", "requires": { - "@babel/types": "^7.7.0" + "@babel/types": "^7.7.4" } }, "@babel/parser": { - "version": "7.7.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.3.tgz", - "integrity": "sha512-bqv+iCo9i+uLVbI0ILzKkvMorqxouI+GbV13ivcARXn9NNEabi2IEz912IgNpT/60BNXac5dgcfjb94NjsF33A==" + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.4.tgz", + "integrity": "sha512-jIwvLO0zCL+O/LmEJQjWA75MQTWwx3c3u2JOTDK5D3/9egrWRRA0/0hk9XXywYnXZVVpzrBYeIQTmhwUaePI9g==" }, "@babel/template": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.0.tgz", - "integrity": "sha512-OKcwSYOW1mhWbnTBgQY5lvg1Fxg+VyfQGjcBduZFljfc044J5iDlnDSfhQ867O17XHiSCxYHUxHg2b7ryitbUQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", + "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", "requires": { "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/traverse": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.2.tgz", - "integrity": "sha512-TM01cXib2+rgIZrGJOLaHV/iZUAxf4A0dt5auY6KNZ+cm6aschuJGqKJM3ROTt3raPUdIDk9siAufIFEleRwtw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.4.tgz", + "integrity": "sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==", "requires": { "@babel/code-frame": "^7.5.5", - "@babel/generator": "^7.7.2", - "@babel/helper-function-name": "^7.7.0", - "@babel/helper-split-export-declaration": "^7.7.0", - "@babel/parser": "^7.7.2", - "@babel/types": "^7.7.2", + "@babel/generator": "^7.7.4", + "@babel/helper-function-name": "^7.7.4", + "@babel/helper-split-export-declaration": "^7.7.4", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.13" } }, "@babel/types": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.2.tgz", - "integrity": "sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", "requires": { "esutils": "^2.0.2", "lodash": "^4.17.13", @@ -533,17 +533,17 @@ } }, "@babel/helper-hoist-variables": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.0.tgz", - "integrity": "sha512-LUe/92NqsDAkJjjCEWkNe+/PcpnisvnqdlRe19FahVapa4jndeuJ+FBiTX1rcAKWKcJGE+C3Q3tuEuxkSmCEiQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.4.tgz", + "integrity": "sha512-wQC4xyvc1Jo/FnLirL6CEgPgPCa8M74tOdjWpRhQYapz5JC7u3NYU1zCVoVAGCE3EaIP9T1A3iW0WLJ+reZlpQ==", "requires": { - "@babel/types": "^7.7.0" + "@babel/types": "^7.7.4" }, "dependencies": { "@babel/types": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.2.tgz", - "integrity": "sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", "requires": { "esutils": "^2.0.2", "lodash": "^4.17.13", @@ -561,17 +561,17 @@ } }, "@babel/helper-module-imports": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.7.0.tgz", - "integrity": "sha512-Dv3hLKIC1jyfTkClvyEkYP2OlkzNvWs5+Q8WgPbxM5LMeorons7iPP91JM+DU7tRbhqA1ZeooPaMFvQrn23RHw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.7.4.tgz", + "integrity": "sha512-dGcrX6K9l8258WFjyDLJwuVKxR4XZfU0/vTUgOQYWEnRD8mgr+p4d6fCUMq/ys0h4CCt/S5JhbvtyErjWouAUQ==", "requires": { - "@babel/types": "^7.7.0" + "@babel/types": "^7.7.4" }, "dependencies": { "@babel/types": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.2.tgz", - "integrity": "sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", "requires": { "esutils": "^2.0.2", "lodash": "^4.17.13", @@ -581,45 +581,45 @@ } }, "@babel/helper-module-transforms": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.7.0.tgz", - "integrity": "sha512-rXEefBuheUYQyX4WjV19tuknrJFwyKw0HgzRwbkyTbB+Dshlq7eqkWbyjzToLrMZk/5wKVKdWFluiAsVkHXvuQ==", - "requires": { - "@babel/helper-module-imports": "^7.7.0", - "@babel/helper-simple-access": "^7.7.0", - "@babel/helper-split-export-declaration": "^7.7.0", - "@babel/template": "^7.7.0", - "@babel/types": "^7.7.0", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.7.4.tgz", + "integrity": "sha512-ehGBu4mXrhs0FxAqN8tWkzF8GSIGAiEumu4ONZ/hD9M88uHcD+Yu2ttKfOCgwzoesJOJrtQh7trI5YPbRtMmnA==", + "requires": { + "@babel/helper-module-imports": "^7.7.4", + "@babel/helper-simple-access": "^7.7.4", + "@babel/helper-split-export-declaration": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/types": "^7.7.4", "lodash": "^4.17.13" }, "dependencies": { "@babel/helper-split-export-declaration": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.0.tgz", - "integrity": "sha512-HgYSI8rH08neWlAH3CcdkFg9qX9YsZysZI5GD8LjhQib/mM0jGOZOVkoUiiV2Hu978fRtjtsGsW6w0pKHUWtqA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz", + "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==", "requires": { - "@babel/types": "^7.7.0" + "@babel/types": "^7.7.4" } }, "@babel/parser": { - "version": "7.7.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.3.tgz", - "integrity": "sha512-bqv+iCo9i+uLVbI0ILzKkvMorqxouI+GbV13ivcARXn9NNEabi2IEz912IgNpT/60BNXac5dgcfjb94NjsF33A==" + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.4.tgz", + "integrity": "sha512-jIwvLO0zCL+O/LmEJQjWA75MQTWwx3c3u2JOTDK5D3/9egrWRRA0/0hk9XXywYnXZVVpzrBYeIQTmhwUaePI9g==" }, "@babel/template": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.0.tgz", - "integrity": "sha512-OKcwSYOW1mhWbnTBgQY5lvg1Fxg+VyfQGjcBduZFljfc044J5iDlnDSfhQ867O17XHiSCxYHUxHg2b7ryitbUQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", + "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", "requires": { "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/types": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.2.tgz", - "integrity": "sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", "requires": { "esutils": "^2.0.2", "lodash": "^4.17.13", @@ -650,89 +650,89 @@ } }, "@babel/helper-remap-async-to-generator": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.0.tgz", - "integrity": "sha512-pHx7RN8X0UNHPB/fnuDnRXVZ316ZigkO8y8D835JlZ2SSdFKb6yH9MIYRU4fy/KPe5sPHDFOPvf8QLdbAGGiyw==", - "requires": { - "@babel/helper-annotate-as-pure": "^7.7.0", - "@babel/helper-wrap-function": "^7.7.0", - "@babel/template": "^7.7.0", - "@babel/traverse": "^7.7.0", - "@babel/types": "^7.7.0" + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.4.tgz", + "integrity": "sha512-Sk4xmtVdM9sA/jCI80f+KS+Md+ZHIpjuqmYPk1M7F/upHou5e4ReYmExAiu6PVe65BhJPZA2CY9x9k4BqE5klw==", + "requires": { + "@babel/helper-annotate-as-pure": "^7.7.4", + "@babel/helper-wrap-function": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@babel/types": "^7.7.4" }, "dependencies": { "@babel/generator": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.2.tgz", - "integrity": "sha512-WthSArvAjYLz4TcbKOi88me+KmDJdKSlfwwN8CnUYn9jBkzhq0ZEPuBfkAWIvjJ3AdEV1Cf/+eSQTnp3IDJKlQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.4.tgz", + "integrity": "sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==", "requires": { - "@babel/types": "^7.7.2", + "@babel/types": "^7.7.4", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" } }, "@babel/helper-function-name": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.0.tgz", - "integrity": "sha512-tDsJgMUAP00Ugv8O2aGEua5I2apkaQO7lBGUq1ocwN3G23JE5Dcq0uh3GvFTChPa4b40AWiAsLvCZOA2rdnQ7Q==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz", + "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==", "requires": { - "@babel/helper-get-function-arity": "^7.7.0", - "@babel/template": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/helper-get-function-arity": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/helper-get-function-arity": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.0.tgz", - "integrity": "sha512-tLdojOTz4vWcEnHWHCuPN5P85JLZWbm5Fx5ZsMEMPhF3Uoe3O7awrbM2nQ04bDOUToH/2tH/ezKEOR8zEYzqyw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", + "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", "requires": { - "@babel/types": "^7.7.0" + "@babel/types": "^7.7.4" } }, "@babel/helper-split-export-declaration": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.0.tgz", - "integrity": "sha512-HgYSI8rH08neWlAH3CcdkFg9qX9YsZysZI5GD8LjhQib/mM0jGOZOVkoUiiV2Hu978fRtjtsGsW6w0pKHUWtqA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz", + "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==", "requires": { - "@babel/types": "^7.7.0" + "@babel/types": "^7.7.4" } }, "@babel/parser": { - "version": "7.7.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.3.tgz", - "integrity": "sha512-bqv+iCo9i+uLVbI0ILzKkvMorqxouI+GbV13ivcARXn9NNEabi2IEz912IgNpT/60BNXac5dgcfjb94NjsF33A==" + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.4.tgz", + "integrity": "sha512-jIwvLO0zCL+O/LmEJQjWA75MQTWwx3c3u2JOTDK5D3/9egrWRRA0/0hk9XXywYnXZVVpzrBYeIQTmhwUaePI9g==" }, "@babel/template": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.0.tgz", - "integrity": "sha512-OKcwSYOW1mhWbnTBgQY5lvg1Fxg+VyfQGjcBduZFljfc044J5iDlnDSfhQ867O17XHiSCxYHUxHg2b7ryitbUQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", + "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", "requires": { "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/traverse": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.2.tgz", - "integrity": "sha512-TM01cXib2+rgIZrGJOLaHV/iZUAxf4A0dt5auY6KNZ+cm6aschuJGqKJM3ROTt3raPUdIDk9siAufIFEleRwtw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.4.tgz", + "integrity": "sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==", "requires": { "@babel/code-frame": "^7.5.5", - "@babel/generator": "^7.7.2", - "@babel/helper-function-name": "^7.7.0", - "@babel/helper-split-export-declaration": "^7.7.0", - "@babel/parser": "^7.7.2", - "@babel/types": "^7.7.2", + "@babel/generator": "^7.7.4", + "@babel/helper-function-name": "^7.7.4", + "@babel/helper-split-export-declaration": "^7.7.4", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.13" } }, "@babel/types": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.2.tgz", - "integrity": "sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", "requires": { "esutils": "^2.0.2", "lodash": "^4.17.13", @@ -771,33 +771,33 @@ } }, "@babel/helper-simple-access": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.7.0.tgz", - "integrity": "sha512-AJ7IZD7Eem3zZRuj5JtzFAptBw7pMlS3y8Qv09vaBWoFsle0d1kAn5Wq6Q9MyBXITPOKnxwkZKoAm4bopmv26g==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.7.4.tgz", + "integrity": "sha512-zK7THeEXfan7UlWsG2A6CI/L9jVnI5+xxKZOdej39Y0YtDYKx9raHk5F2EtK9K8DHRTihYwg20ADt9S36GR78A==", "requires": { - "@babel/template": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/template": "^7.7.4", + "@babel/types": "^7.7.4" }, "dependencies": { "@babel/parser": { - "version": "7.7.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.3.tgz", - "integrity": "sha512-bqv+iCo9i+uLVbI0ILzKkvMorqxouI+GbV13ivcARXn9NNEabi2IEz912IgNpT/60BNXac5dgcfjb94NjsF33A==" + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.4.tgz", + "integrity": "sha512-jIwvLO0zCL+O/LmEJQjWA75MQTWwx3c3u2JOTDK5D3/9egrWRRA0/0hk9XXywYnXZVVpzrBYeIQTmhwUaePI9g==" }, "@babel/template": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.0.tgz", - "integrity": "sha512-OKcwSYOW1mhWbnTBgQY5lvg1Fxg+VyfQGjcBduZFljfc044J5iDlnDSfhQ867O17XHiSCxYHUxHg2b7ryitbUQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", + "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", "requires": { "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/types": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.2.tgz", - "integrity": "sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", "requires": { "esutils": "^2.0.2", "lodash": "^4.17.13", @@ -815,88 +815,88 @@ } }, "@babel/helper-wrap-function": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.7.0.tgz", - "integrity": "sha512-sd4QjeMgQqzshSjecZjOp8uKfUtnpmCyQhKQrVJBBgeHAB/0FPi33h3AbVlVp07qQtMD4QgYSzaMI7VwncNK/w==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.7.4.tgz", + "integrity": "sha512-VsfzZt6wmsocOaVU0OokwrIytHND55yvyT4BPB9AIIgwr8+x7617hetdJTsuGwygN5RC6mxA9EJztTjuwm2ofg==", "requires": { - "@babel/helper-function-name": "^7.7.0", - "@babel/template": "^7.7.0", - "@babel/traverse": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/helper-function-name": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@babel/types": "^7.7.4" }, "dependencies": { "@babel/generator": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.2.tgz", - "integrity": "sha512-WthSArvAjYLz4TcbKOi88me+KmDJdKSlfwwN8CnUYn9jBkzhq0ZEPuBfkAWIvjJ3AdEV1Cf/+eSQTnp3IDJKlQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.4.tgz", + "integrity": "sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==", "requires": { - "@babel/types": "^7.7.2", + "@babel/types": "^7.7.4", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" } }, "@babel/helper-function-name": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.0.tgz", - "integrity": "sha512-tDsJgMUAP00Ugv8O2aGEua5I2apkaQO7lBGUq1ocwN3G23JE5Dcq0uh3GvFTChPa4b40AWiAsLvCZOA2rdnQ7Q==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz", + "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==", "requires": { - "@babel/helper-get-function-arity": "^7.7.0", - "@babel/template": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/helper-get-function-arity": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/helper-get-function-arity": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.0.tgz", - "integrity": "sha512-tLdojOTz4vWcEnHWHCuPN5P85JLZWbm5Fx5ZsMEMPhF3Uoe3O7awrbM2nQ04bDOUToH/2tH/ezKEOR8zEYzqyw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", + "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", "requires": { - "@babel/types": "^7.7.0" + "@babel/types": "^7.7.4" } }, "@babel/helper-split-export-declaration": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.0.tgz", - "integrity": "sha512-HgYSI8rH08neWlAH3CcdkFg9qX9YsZysZI5GD8LjhQib/mM0jGOZOVkoUiiV2Hu978fRtjtsGsW6w0pKHUWtqA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz", + "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==", "requires": { - "@babel/types": "^7.7.0" + "@babel/types": "^7.7.4" } }, "@babel/parser": { - "version": "7.7.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.3.tgz", - "integrity": "sha512-bqv+iCo9i+uLVbI0ILzKkvMorqxouI+GbV13ivcARXn9NNEabi2IEz912IgNpT/60BNXac5dgcfjb94NjsF33A==" + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.4.tgz", + "integrity": "sha512-jIwvLO0zCL+O/LmEJQjWA75MQTWwx3c3u2JOTDK5D3/9egrWRRA0/0hk9XXywYnXZVVpzrBYeIQTmhwUaePI9g==" }, "@babel/template": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.0.tgz", - "integrity": "sha512-OKcwSYOW1mhWbnTBgQY5lvg1Fxg+VyfQGjcBduZFljfc044J5iDlnDSfhQ867O17XHiSCxYHUxHg2b7ryitbUQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", + "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", "requires": { "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/traverse": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.2.tgz", - "integrity": "sha512-TM01cXib2+rgIZrGJOLaHV/iZUAxf4A0dt5auY6KNZ+cm6aschuJGqKJM3ROTt3raPUdIDk9siAufIFEleRwtw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.4.tgz", + "integrity": "sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==", "requires": { "@babel/code-frame": "^7.5.5", - "@babel/generator": "^7.7.2", - "@babel/helper-function-name": "^7.7.0", - "@babel/helper-split-export-declaration": "^7.7.0", - "@babel/parser": "^7.7.2", - "@babel/types": "^7.7.2", + "@babel/generator": "^7.7.4", + "@babel/helper-function-name": "^7.7.4", + "@babel/helper-split-export-declaration": "^7.7.4", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.13" } }, "@babel/types": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.2.tgz", - "integrity": "sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", "requires": { "esutils": "^2.0.2", "lodash": "^4.17.13", @@ -1048,148 +1048,148 @@ "dev": true }, "@babel/plugin-proposal-async-generator-functions": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.0.tgz", - "integrity": "sha512-ot/EZVvf3mXtZq0Pd0+tSOfGWMizqmOohXmNZg6LNFjHOV+wOPv7BvVYh8oPR8LhpIP3ye8nNooKL50YRWxpYA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.4.tgz", + "integrity": "sha512-1ypyZvGRXriY/QP668+s8sFr2mqinhkRDMPSQLNghCQE+GAkFtp+wkHVvg2+Hdki8gwP+NFzJBJ/N1BfzCCDEw==", "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-remap-async-to-generator": "^7.7.0", - "@babel/plugin-syntax-async-generators": "^7.2.0" + "@babel/helper-remap-async-to-generator": "^7.7.4", + "@babel/plugin-syntax-async-generators": "^7.7.4" } }, "@babel/plugin-proposal-class-properties": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.7.0.tgz", - "integrity": "sha512-tufDcFA1Vj+eWvwHN+jvMN6QsV5o+vUlytNKrbMiCeDL0F2j92RURzUsUMWE5EJkLyWxjdUslCsMQa9FWth16A==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.7.4.tgz", + "integrity": "sha512-EcuXeV4Hv1X3+Q1TsuOmyyxeTRiSqurGJ26+I/FW1WbymmRRapVORm6x1Zl3iDIHyRxEs+VXWp6qnlcfcJSbbw==", "dev": true, "requires": { - "@babel/helper-create-class-features-plugin": "^7.7.0", + "@babel/helper-create-class-features-plugin": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0" }, "dependencies": { "@babel/generator": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.2.tgz", - "integrity": "sha512-WthSArvAjYLz4TcbKOi88me+KmDJdKSlfwwN8CnUYn9jBkzhq0ZEPuBfkAWIvjJ3AdEV1Cf/+eSQTnp3IDJKlQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.4.tgz", + "integrity": "sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==", "dev": true, "requires": { - "@babel/types": "^7.7.2", + "@babel/types": "^7.7.4", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" } }, "@babel/helper-create-class-features-plugin": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.7.0.tgz", - "integrity": "sha512-MZiB5qvTWoyiFOgootmRSDV1udjIqJW/8lmxgzKq6oDqxdmHUjeP2ZUOmgHdYjmUVNABqRrHjYAYRvj8Eox/UA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.7.4.tgz", + "integrity": "sha512-l+OnKACG4uiDHQ/aJT8dwpR+LhCJALxL0mJ6nzjB25e5IPwqV1VOsY7ah6UB1DG+VOXAIMtuC54rFJGiHkxjgA==", "dev": true, "requires": { - "@babel/helper-function-name": "^7.7.0", - "@babel/helper-member-expression-to-functions": "^7.7.0", - "@babel/helper-optimise-call-expression": "^7.7.0", + "@babel/helper-function-name": "^7.7.4", + "@babel/helper-member-expression-to-functions": "^7.7.4", + "@babel/helper-optimise-call-expression": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-replace-supers": "^7.7.0", - "@babel/helper-split-export-declaration": "^7.7.0" + "@babel/helper-replace-supers": "^7.7.4", + "@babel/helper-split-export-declaration": "^7.7.4" } }, "@babel/helper-function-name": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.0.tgz", - "integrity": "sha512-tDsJgMUAP00Ugv8O2aGEua5I2apkaQO7lBGUq1ocwN3G23JE5Dcq0uh3GvFTChPa4b40AWiAsLvCZOA2rdnQ7Q==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz", + "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==", "dev": true, "requires": { - "@babel/helper-get-function-arity": "^7.7.0", - "@babel/template": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/helper-get-function-arity": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/helper-get-function-arity": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.0.tgz", - "integrity": "sha512-tLdojOTz4vWcEnHWHCuPN5P85JLZWbm5Fx5ZsMEMPhF3Uoe3O7awrbM2nQ04bDOUToH/2tH/ezKEOR8zEYzqyw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", + "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", "dev": true, "requires": { - "@babel/types": "^7.7.0" + "@babel/types": "^7.7.4" } }, "@babel/helper-member-expression-to-functions": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.0.tgz", - "integrity": "sha512-QaCZLO2RtBcmvO/ekOLp8p7R5X2JriKRizeDpm5ChATAFWrrYDcDxPuCIBXKyBjY+i1vYSdcUTMIb8psfxHDPA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.4.tgz", + "integrity": "sha512-9KcA1X2E3OjXl/ykfMMInBK+uVdfIVakVe7W7Lg3wfXUNyS3Q1HWLFRwZIjhqiCGbslummPDnmb7vIekS0C1vw==", "dev": true, "requires": { - "@babel/types": "^7.7.0" + "@babel/types": "^7.7.4" } }, "@babel/helper-optimise-call-expression": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.0.tgz", - "integrity": "sha512-48TeqmbazjNU/65niiiJIJRc5JozB8acui1OS7bSd6PgxfuovWsvjfWSzlgx+gPFdVveNzUdpdIg5l56Pl5jqg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.4.tgz", + "integrity": "sha512-VB7gWZ2fDkSuqW6b1AKXkJWO5NyNI3bFL/kK79/30moK57blr6NbH8xcl2XcKCwOmJosftWunZqfO84IGq3ZZg==", "dev": true, "requires": { - "@babel/types": "^7.7.0" + "@babel/types": "^7.7.4" } }, "@babel/helper-replace-supers": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.7.0.tgz", - "integrity": "sha512-5ALYEul5V8xNdxEeWvRsBzLMxQksT7MaStpxjJf9KsnLxpAKBtfw5NeMKZJSYDa0lKdOcy0g+JT/f5mPSulUgg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.7.4.tgz", + "integrity": "sha512-pP0tfgg9hsZWo5ZboYGuBn/bbYT/hdLPVSS4NMmiRJdwWhP0IznPwN9AE1JwyGsjSPLC364I0Qh5p+EPkGPNpg==", "dev": true, "requires": { - "@babel/helper-member-expression-to-functions": "^7.7.0", - "@babel/helper-optimise-call-expression": "^7.7.0", - "@babel/traverse": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/helper-member-expression-to-functions": "^7.7.4", + "@babel/helper-optimise-call-expression": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/helper-split-export-declaration": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.0.tgz", - "integrity": "sha512-HgYSI8rH08neWlAH3CcdkFg9qX9YsZysZI5GD8LjhQib/mM0jGOZOVkoUiiV2Hu978fRtjtsGsW6w0pKHUWtqA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz", + "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==", "dev": true, "requires": { - "@babel/types": "^7.7.0" + "@babel/types": "^7.7.4" } }, "@babel/parser": { - "version": "7.7.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.3.tgz", - "integrity": "sha512-bqv+iCo9i+uLVbI0ILzKkvMorqxouI+GbV13ivcARXn9NNEabi2IEz912IgNpT/60BNXac5dgcfjb94NjsF33A==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.4.tgz", + "integrity": "sha512-jIwvLO0zCL+O/LmEJQjWA75MQTWwx3c3u2JOTDK5D3/9egrWRRA0/0hk9XXywYnXZVVpzrBYeIQTmhwUaePI9g==", "dev": true }, "@babel/template": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.0.tgz", - "integrity": "sha512-OKcwSYOW1mhWbnTBgQY5lvg1Fxg+VyfQGjcBduZFljfc044J5iDlnDSfhQ867O17XHiSCxYHUxHg2b7ryitbUQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", + "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/traverse": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.2.tgz", - "integrity": "sha512-TM01cXib2+rgIZrGJOLaHV/iZUAxf4A0dt5auY6KNZ+cm6aschuJGqKJM3ROTt3raPUdIDk9siAufIFEleRwtw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.4.tgz", + "integrity": "sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==", "dev": true, "requires": { "@babel/code-frame": "^7.5.5", - "@babel/generator": "^7.7.2", - "@babel/helper-function-name": "^7.7.0", - "@babel/helper-split-export-declaration": "^7.7.0", - "@babel/parser": "^7.7.2", - "@babel/types": "^7.7.2", + "@babel/generator": "^7.7.4", + "@babel/helper-function-name": "^7.7.4", + "@babel/helper-split-export-declaration": "^7.7.4", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.13" } }, "@babel/types": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.2.tgz", - "integrity": "sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -1221,94 +1221,105 @@ } }, "@babel/plugin-proposal-dynamic-import": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.0.tgz", - "integrity": "sha512-7poL3Xi+QFPC7sGAzEIbXUyYzGJwbc2+gSD0AkiC5k52kH2cqHdqxm5hNFfLW3cRSTcx9bN0Fl7/6zWcLLnKAQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.4.tgz", + "integrity": "sha512-StH+nGAdO6qDB1l8sZ5UBV8AC3F2VW2I8Vfld73TMKyptMU9DY5YsJAS8U81+vEtxcH3Y/La0wG0btDrhpnhjQ==", "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-dynamic-import": "^7.2.0" + "@babel/plugin-syntax-dynamic-import": "^7.7.4" + }, + "dependencies": { + "@babel/plugin-syntax-dynamic-import": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.7.4.tgz", + "integrity": "sha512-jHQW0vbRGvwQNgyVxwDh4yuXu4bH1f5/EICJLAhl1SblLs2CDhrsmCk+v5XLdE9wxtAFRyxx+P//Iw+a5L/tTg==", + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" + } + } } }, "@babel/plugin-proposal-json-strings": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz", - "integrity": "sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.7.4.tgz", + "integrity": "sha512-wQvt3akcBTfLU/wYoqm/ws7YOAQKu8EVJEvHip/mzkNtjaclQoCCIqKXFP5/eyfnfbQCDV3OLRIK3mIVyXuZlw==", "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-json-strings": "^7.2.0" + "@babel/plugin-syntax-json-strings": "^7.7.4" } }, "@babel/plugin-proposal-object-rest-spread": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.6.2.tgz", - "integrity": "sha512-LDBXlmADCsMZV1Y9OQwMc0MyGZ8Ta/zlD9N67BfQT8uYwkRswiu2hU6nJKrjrt/58aH/vqfQlR/9yId/7A2gWw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.4.tgz", + "integrity": "sha512-rnpnZR3/iWKmiQyJ3LKJpSwLDcX/nSXhdLk4Aq/tXOApIvyu7qoabrige0ylsAJffaUC51WiBu209Q0U+86OWQ==", "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-object-rest-spread": "^7.2.0" + "@babel/plugin-syntax-object-rest-spread": "^7.7.4" } }, "@babel/plugin-proposal-optional-catch-binding": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz", - "integrity": "sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.7.4.tgz", + "integrity": "sha512-DyM7U2bnsQerCQ+sejcTNZh8KQEUuC3ufzdnVnSiUv/qoGJp2Z3hanKL18KDhsBT5Wj6a7CMT5mdyCNJsEaA9w==", "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-optional-catch-binding": "^7.2.0" + "@babel/plugin-syntax-optional-catch-binding": "^7.7.4" } }, "@babel/plugin-proposal-unicode-property-regex": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.0.tgz", - "integrity": "sha512-mk34H+hp7kRBWJOOAR0ZMGCydgKMD4iN9TpDRp3IIcbunltxEY89XSimc6WbtSLCDrwcdy/EEw7h5CFCzxTchw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.4.tgz", + "integrity": "sha512-cHgqHgYvffluZk85dJ02vloErm3Y6xtH+2noOBOJ2kXOJH3aVCDnj5eR/lVNlTnYu4hndAPJD3rTFjW3qee0PA==", "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.7.0", + "@babel/helper-create-regexp-features-plugin": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-syntax-async-generators": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz", - "integrity": "sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.7.4.tgz", + "integrity": "sha512-Li4+EjSpBgxcsmeEF8IFcfV/+yJGxHXDirDkEoyFjumuwbmfCVHUt0HuowD/iGM7OhIRyXJH9YXxqiH6N815+g==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-syntax-dynamic-import": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz", - "integrity": "sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.7.4.tgz", + "integrity": "sha512-jHQW0vbRGvwQNgyVxwDh4yuXu4bH1f5/EICJLAhl1SblLs2CDhrsmCk+v5XLdE9wxtAFRyxx+P//Iw+a5L/tTg==", + "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-syntax-json-strings": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz", - "integrity": "sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.7.4.tgz", + "integrity": "sha512-QpGupahTQW1mHRXddMG5srgpHWqRLwJnJZKXTigB9RPFCCGbDGCgBeM/iC82ICXp414WeYx/tD54w7M2qRqTMg==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-syntax-object-rest-spread": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz", - "integrity": "sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.7.4.tgz", + "integrity": "sha512-mObR+r+KZq0XhRVS2BrBKBpr5jqrqzlPvS9C9vuOf5ilSwzloAl7RPWLrgKdWS6IreaVrjHxTjtyqFiOisaCwg==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-syntax-optional-catch-binding": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz", - "integrity": "sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.7.4.tgz", + "integrity": "sha512-4ZSuzWgFxqHRE31Glu+fEr/MirNZOMYmD/0BhBWyLyOOQz/gTAl7QmWm2hX1QxEIXsr2vkdlwxIzTyiYRC4xcQ==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-syntax-top-level-await": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.0.tgz", - "integrity": "sha512-hi8FUNiFIY1fnUI2n1ViB1DR0R4QeK4iHcTlW6aJkrPoTdb8Rf1EMQ6GT3f67DDkYyWgew9DFoOZ6gOoEsdzTA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.4.tgz", + "integrity": "sha512-wdsOw0MvkL1UIgiQ/IFr3ETcfv1xb8RMM0H9wbiDyLaJFyiDg5oZvDLCXosIXmFeIlweML5iOBXAkqddkYNizg==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } @@ -1322,154 +1333,154 @@ } }, "@babel/plugin-transform-arrow-functions": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz", - "integrity": "sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.7.4.tgz", + "integrity": "sha512-zUXy3e8jBNPiffmqkHRNDdZM2r8DWhCB7HhcoyZjiK1TxYEluLHAvQuYnTT+ARqRpabWqy/NHkO6e3MsYB5YfA==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-async-to-generator": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.0.tgz", - "integrity": "sha512-vLI2EFLVvRBL3d8roAMqtVY0Bm9C1QzLkdS57hiKrjUBSqsQYrBsMCeOg/0KK7B0eK9V71J5mWcha9yyoI2tZw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.4.tgz", + "integrity": "sha512-zpUTZphp5nHokuy8yLlyafxCJ0rSlFoSHypTUWgpdwoDXWQcseaect7cJ8Ppk6nunOM6+5rPMkod4OYKPR5MUg==", "requires": { - "@babel/helper-module-imports": "^7.7.0", + "@babel/helper-module-imports": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-remap-async-to-generator": "^7.7.0" + "@babel/helper-remap-async-to-generator": "^7.7.4" } }, "@babel/plugin-transform-block-scoped-functions": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz", - "integrity": "sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.7.4.tgz", + "integrity": "sha512-kqtQzwtKcpPclHYjLK//3lH8OFsCDuDJBaFhVwf8kqdnF6MN4l618UDlcA7TfRs3FayrHj+svYnSX8MC9zmUyQ==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-block-scoping": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.3.tgz", - "integrity": "sha512-7hvrg75dubcO3ZI2rjYTzUrEuh1E9IyDEhhB6qfcooxhDA33xx2MasuLVgdxzcP6R/lipAC6n9ub9maNW6RKdw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.7.4.tgz", + "integrity": "sha512-2VBe9u0G+fDt9B5OV5DQH4KBf5DoiNkwFKOz0TCvBWvdAN2rOykCTkrL+jTLxfCAm76l9Qo5OqL7HBOx2dWggg==", "requires": { "@babel/helper-plugin-utils": "^7.0.0", "lodash": "^4.17.13" } }, "@babel/plugin-transform-classes": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.0.tgz", - "integrity": "sha512-/b3cKIZwGeUesZheU9jNYcwrEA7f/Bo4IdPmvp7oHgvks2majB5BoT5byAql44fiNQYOPzhk2w8DbgfuafkMoA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.4.tgz", + "integrity": "sha512-sK1mjWat7K+buWRuImEzjNf68qrKcrddtpQo3swi9j7dUcG6y6R6+Di039QN2bD1dykeswlagupEmpOatFHHUg==", "requires": { - "@babel/helper-annotate-as-pure": "^7.7.0", - "@babel/helper-define-map": "^7.7.0", - "@babel/helper-function-name": "^7.7.0", - "@babel/helper-optimise-call-expression": "^7.7.0", + "@babel/helper-annotate-as-pure": "^7.7.4", + "@babel/helper-define-map": "^7.7.4", + "@babel/helper-function-name": "^7.7.4", + "@babel/helper-optimise-call-expression": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-replace-supers": "^7.7.0", - "@babel/helper-split-export-declaration": "^7.7.0", + "@babel/helper-replace-supers": "^7.7.4", + "@babel/helper-split-export-declaration": "^7.7.4", "globals": "^11.1.0" }, "dependencies": { "@babel/generator": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.2.tgz", - "integrity": "sha512-WthSArvAjYLz4TcbKOi88me+KmDJdKSlfwwN8CnUYn9jBkzhq0ZEPuBfkAWIvjJ3AdEV1Cf/+eSQTnp3IDJKlQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.4.tgz", + "integrity": "sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==", "requires": { - "@babel/types": "^7.7.2", + "@babel/types": "^7.7.4", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" } }, "@babel/helper-function-name": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.0.tgz", - "integrity": "sha512-tDsJgMUAP00Ugv8O2aGEua5I2apkaQO7lBGUq1ocwN3G23JE5Dcq0uh3GvFTChPa4b40AWiAsLvCZOA2rdnQ7Q==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz", + "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==", "requires": { - "@babel/helper-get-function-arity": "^7.7.0", - "@babel/template": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/helper-get-function-arity": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/helper-get-function-arity": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.0.tgz", - "integrity": "sha512-tLdojOTz4vWcEnHWHCuPN5P85JLZWbm5Fx5ZsMEMPhF3Uoe3O7awrbM2nQ04bDOUToH/2tH/ezKEOR8zEYzqyw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", + "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", "requires": { - "@babel/types": "^7.7.0" + "@babel/types": "^7.7.4" } }, "@babel/helper-member-expression-to-functions": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.0.tgz", - "integrity": "sha512-QaCZLO2RtBcmvO/ekOLp8p7R5X2JriKRizeDpm5ChATAFWrrYDcDxPuCIBXKyBjY+i1vYSdcUTMIb8psfxHDPA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.4.tgz", + "integrity": "sha512-9KcA1X2E3OjXl/ykfMMInBK+uVdfIVakVe7W7Lg3wfXUNyS3Q1HWLFRwZIjhqiCGbslummPDnmb7vIekS0C1vw==", "requires": { - "@babel/types": "^7.7.0" + "@babel/types": "^7.7.4" } }, "@babel/helper-optimise-call-expression": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.0.tgz", - "integrity": "sha512-48TeqmbazjNU/65niiiJIJRc5JozB8acui1OS7bSd6PgxfuovWsvjfWSzlgx+gPFdVveNzUdpdIg5l56Pl5jqg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.4.tgz", + "integrity": "sha512-VB7gWZ2fDkSuqW6b1AKXkJWO5NyNI3bFL/kK79/30moK57blr6NbH8xcl2XcKCwOmJosftWunZqfO84IGq3ZZg==", "requires": { - "@babel/types": "^7.7.0" + "@babel/types": "^7.7.4" } }, "@babel/helper-replace-supers": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.7.0.tgz", - "integrity": "sha512-5ALYEul5V8xNdxEeWvRsBzLMxQksT7MaStpxjJf9KsnLxpAKBtfw5NeMKZJSYDa0lKdOcy0g+JT/f5mPSulUgg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.7.4.tgz", + "integrity": "sha512-pP0tfgg9hsZWo5ZboYGuBn/bbYT/hdLPVSS4NMmiRJdwWhP0IznPwN9AE1JwyGsjSPLC364I0Qh5p+EPkGPNpg==", "requires": { - "@babel/helper-member-expression-to-functions": "^7.7.0", - "@babel/helper-optimise-call-expression": "^7.7.0", - "@babel/traverse": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/helper-member-expression-to-functions": "^7.7.4", + "@babel/helper-optimise-call-expression": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/helper-split-export-declaration": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.0.tgz", - "integrity": "sha512-HgYSI8rH08neWlAH3CcdkFg9qX9YsZysZI5GD8LjhQib/mM0jGOZOVkoUiiV2Hu978fRtjtsGsW6w0pKHUWtqA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz", + "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==", "requires": { - "@babel/types": "^7.7.0" + "@babel/types": "^7.7.4" } }, "@babel/parser": { - "version": "7.7.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.3.tgz", - "integrity": "sha512-bqv+iCo9i+uLVbI0ILzKkvMorqxouI+GbV13ivcARXn9NNEabi2IEz912IgNpT/60BNXac5dgcfjb94NjsF33A==" + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.4.tgz", + "integrity": "sha512-jIwvLO0zCL+O/LmEJQjWA75MQTWwx3c3u2JOTDK5D3/9egrWRRA0/0hk9XXywYnXZVVpzrBYeIQTmhwUaePI9g==" }, "@babel/template": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.0.tgz", - "integrity": "sha512-OKcwSYOW1mhWbnTBgQY5lvg1Fxg+VyfQGjcBduZFljfc044J5iDlnDSfhQ867O17XHiSCxYHUxHg2b7ryitbUQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", + "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", "requires": { "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/traverse": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.2.tgz", - "integrity": "sha512-TM01cXib2+rgIZrGJOLaHV/iZUAxf4A0dt5auY6KNZ+cm6aschuJGqKJM3ROTt3raPUdIDk9siAufIFEleRwtw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.4.tgz", + "integrity": "sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==", "requires": { "@babel/code-frame": "^7.5.5", - "@babel/generator": "^7.7.2", - "@babel/helper-function-name": "^7.7.0", - "@babel/helper-split-export-declaration": "^7.7.0", - "@babel/parser": "^7.7.2", - "@babel/types": "^7.7.2", + "@babel/generator": "^7.7.4", + "@babel/helper-function-name": "^7.7.4", + "@babel/helper-split-export-declaration": "^7.7.4", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.13" } }, "@babel/types": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.2.tgz", - "integrity": "sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", "requires": { "esutils": "^2.0.2", "lodash": "^4.17.13", @@ -1497,101 +1508,101 @@ } }, "@babel/plugin-transform-computed-properties": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz", - "integrity": "sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.7.4.tgz", + "integrity": "sha512-bSNsOsZnlpLLyQew35rl4Fma3yKWqK3ImWMSC/Nc+6nGjC9s5NFWAer1YQ899/6s9HxO2zQC1WoFNfkOqRkqRQ==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-destructuring": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.6.0.tgz", - "integrity": "sha512-2bGIS5P1v4+sWTCnKNDZDxbGvEqi0ijeqM/YqHtVGrvG2y0ySgnEEhXErvE9dA0bnIzY9bIzdFK0jFA46ASIIQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.7.4.tgz", + "integrity": "sha512-4jFMXI1Cu2aXbcXXl8Lr6YubCn6Oc7k9lLsu8v61TZh+1jny2BWmdtvY9zSUlLdGUvcy9DMAWyZEOqjsbeg/wA==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-dotall-regex": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.0.tgz", - "integrity": "sha512-3QQlF7hSBnSuM1hQ0pS3pmAbWLax/uGNCbPBND9y+oJ4Y776jsyujG2k0Sn2Aj2a0QwVOiOFL5QVPA7spjvzSA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.4.tgz", + "integrity": "sha512-mk0cH1zyMa/XHeb6LOTXTbG7uIJ8Rrjlzu91pUx/KS3JpcgaTDwMS8kM+ar8SLOvlL2Lofi4CGBAjCo3a2x+lw==", "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.7.0", + "@babel/helper-create-regexp-features-plugin": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-duplicate-keys": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz", - "integrity": "sha512-igcziksHizyQPlX9gfSjHkE2wmoCH3evvD2qR5w29/Dk0SMKE/eOI7f1HhBdNhR/zxJDqrgpoDTq5YSLH/XMsQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.7.4.tgz", + "integrity": "sha512-g1y4/G6xGWMD85Tlft5XedGaZBCIVN+/P0bs6eabmcPP9egFleMAo65OOjlhcz1njpwagyY3t0nsQC9oTFegJA==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-exponentiation-operator": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz", - "integrity": "sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.7.4.tgz", + "integrity": "sha512-MCqiLfCKm6KEA1dglf6Uqq1ElDIZwFuzz1WH5mTf8k2uQSxEJMbOIEh7IZv7uichr7PMfi5YVSrr1vz+ipp7AQ==", "requires": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.1.0", + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-for-of": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz", - "integrity": "sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.7.4.tgz", + "integrity": "sha512-zZ1fD1B8keYtEcKF+M1TROfeHTKnijcVQm0yO/Yu1f7qoDoxEIc/+GX6Go430Bg84eM/xwPFp0+h4EbZg7epAA==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-function-name": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.7.0.tgz", - "integrity": "sha512-P5HKu0d9+CzZxP5jcrWdpe7ZlFDe24bmqP6a6X8BHEBl/eizAsY8K6LX8LASZL0Jxdjm5eEfzp+FIrxCm/p8bA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.7.4.tgz", + "integrity": "sha512-E/x09TvjHNhsULs2IusN+aJNRV5zKwxu1cpirZyRPw+FyyIKEHPXTsadj48bVpc1R5Qq1B5ZkzumuFLytnbT6g==", "requires": { - "@babel/helper-function-name": "^7.7.0", + "@babel/helper-function-name": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0" }, "dependencies": { "@babel/helper-function-name": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.0.tgz", - "integrity": "sha512-tDsJgMUAP00Ugv8O2aGEua5I2apkaQO7lBGUq1ocwN3G23JE5Dcq0uh3GvFTChPa4b40AWiAsLvCZOA2rdnQ7Q==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz", + "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==", "requires": { - "@babel/helper-get-function-arity": "^7.7.0", - "@babel/template": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/helper-get-function-arity": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/helper-get-function-arity": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.0.tgz", - "integrity": "sha512-tLdojOTz4vWcEnHWHCuPN5P85JLZWbm5Fx5ZsMEMPhF3Uoe3O7awrbM2nQ04bDOUToH/2tH/ezKEOR8zEYzqyw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", + "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", "requires": { - "@babel/types": "^7.7.0" + "@babel/types": "^7.7.4" } }, "@babel/parser": { - "version": "7.7.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.3.tgz", - "integrity": "sha512-bqv+iCo9i+uLVbI0ILzKkvMorqxouI+GbV13ivcARXn9NNEabi2IEz912IgNpT/60BNXac5dgcfjb94NjsF33A==" + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.4.tgz", + "integrity": "sha512-jIwvLO0zCL+O/LmEJQjWA75MQTWwx3c3u2JOTDK5D3/9egrWRRA0/0hk9XXywYnXZVVpzrBYeIQTmhwUaePI9g==" }, "@babel/template": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.0.tgz", - "integrity": "sha512-OKcwSYOW1mhWbnTBgQY5lvg1Fxg+VyfQGjcBduZFljfc044J5iDlnDSfhQ867O17XHiSCxYHUxHg2b7ryitbUQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", + "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", "requires": { "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.7.0", - "@babel/types": "^7.7.0" + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/types": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.2.tgz", - "integrity": "sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", "requires": { "esutils": "^2.0.2", "lodash": "^4.17.13", @@ -1601,158 +1612,303 @@ } }, "@babel/plugin-transform-literals": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz", - "integrity": "sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.7.4.tgz", + "integrity": "sha512-X2MSV7LfJFm4aZfxd0yLVFrEXAgPqYoDG53Br/tCKiKYfX0MjVjQeWPIhPHHsCqzwQANq+FLN786fF5rgLS+gw==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-member-expression-literals": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz", - "integrity": "sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.7.4.tgz", + "integrity": "sha512-9VMwMO7i69LHTesL0RdGy93JU6a+qOPuvB4F4d0kR0zyVjJRVJRaoaGjhtki6SzQUu8yen/vxPKN6CWnCUw6bA==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-modules-amd": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz", - "integrity": "sha512-n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.7.4.tgz", + "integrity": "sha512-/542/5LNA18YDtg1F+QHvvUSlxdvjZoD/aldQwkq+E3WCkbEjNSN9zdrOXaSlfg3IfGi22ijzecklF/A7kVZFQ==", "requires": { - "@babel/helper-module-transforms": "^7.1.0", + "@babel/helper-module-transforms": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0", "babel-plugin-dynamic-import-node": "^2.3.0" } }, "@babel/plugin-transform-modules-commonjs": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.0.tgz", - "integrity": "sha512-KEMyWNNWnjOom8vR/1+d+Ocz/mILZG/eyHHO06OuBQ2aNhxT62fr4y6fGOplRx+CxCSp3IFwesL8WdINfY/3kg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.4.tgz", + "integrity": "sha512-k8iVS7Jhc367IcNF53KCwIXtKAH7czev866ThsTgy8CwlXjnKZna2VHwChglzLleYrcHz1eQEIJlGRQxB53nqA==", "requires": { - "@babel/helper-module-transforms": "^7.7.0", + "@babel/helper-module-transforms": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-simple-access": "^7.7.0", + "@babel/helper-simple-access": "^7.7.4", "babel-plugin-dynamic-import-node": "^2.3.0" } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.0.tgz", - "integrity": "sha512-ZAuFgYjJzDNv77AjXRqzQGlQl4HdUM6j296ee4fwKVZfhDR9LAGxfvXjBkb06gNETPnN0sLqRm9Gxg4wZH6dXg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.4.tgz", + "integrity": "sha512-y2c96hmcsUi6LrMqvmNDPBBiGCiQu0aYqpHatVVu6kD4mFEXKjyNxd/drc18XXAf9dv7UXjrZwBVmTTGaGP8iw==", "requires": { - "@babel/helper-hoist-variables": "^7.7.0", + "@babel/helper-hoist-variables": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0", "babel-plugin-dynamic-import-node": "^2.3.0" } }, "@babel/plugin-transform-modules-umd": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.7.0.tgz", - "integrity": "sha512-u7eBA03zmUswQ9LQ7Qw0/ieC1pcAkbp5OQatbWUzY1PaBccvuJXUkYzoN1g7cqp7dbTu6Dp9bXyalBvD04AANA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.7.4.tgz", + "integrity": "sha512-u2B8TIi0qZI4j8q4C51ktfO7E3cQ0qnaXFI1/OXITordD40tt17g/sXqgNNCcMTcBFKrUPcGDx+TBJuZxLx7tw==", "requires": { - "@babel/helper-module-transforms": "^7.7.0", + "@babel/helper-module-transforms": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.0.tgz", - "integrity": "sha512-+SicSJoKouPctL+j1pqktRVCgy+xAch1hWWTMy13j0IflnyNjaoskj+DwRQFimHbLqO3sq2oN2CXMvXq3Bgapg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.4.tgz", + "integrity": "sha512-jBUkiqLKvUWpv9GLSuHUFYdmHg0ujC1JEYoZUfeOOfNydZXp1sXObgyPatpcwjWgsdBGsagWW0cdJpX/DO2jMw==", "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.7.0" + "@babel/helper-create-regexp-features-plugin": "^7.7.4" } }, "@babel/plugin-transform-new-target": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz", - "integrity": "sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.7.4.tgz", + "integrity": "sha512-CnPRiNtOG1vRodnsyGX37bHQleHE14B9dnnlgSeEs3ek3fHN1A1SScglTCg1sfbe7sRQ2BUcpgpTpWSfMKz3gg==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-object-super": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz", - "integrity": "sha512-un1zJQAhSosGFBduPgN/YFNvWVpRuHKU7IHBglLoLZsGmruJPOo6pbInneflUdmq7YvSVqhpPs5zdBvLnteltQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.7.4.tgz", + "integrity": "sha512-ho+dAEhC2aRnff2JCA0SAK7V2R62zJd/7dmtoe7MHcso4C2mS+vZjn1Pb1pCVZvJs1mgsvv5+7sT+m3Bysb6eg==", "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-replace-supers": "^7.5.5" + "@babel/helper-replace-supers": "^7.7.4" + }, + "dependencies": { + "@babel/generator": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.4.tgz", + "integrity": "sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==", + "requires": { + "@babel/types": "^7.7.4", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + } + }, + "@babel/helper-function-name": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz", + "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==", + "requires": { + "@babel/helper-get-function-arity": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/types": "^7.7.4" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", + "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", + "requires": { + "@babel/types": "^7.7.4" + } + }, + "@babel/helper-member-expression-to-functions": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.4.tgz", + "integrity": "sha512-9KcA1X2E3OjXl/ykfMMInBK+uVdfIVakVe7W7Lg3wfXUNyS3Q1HWLFRwZIjhqiCGbslummPDnmb7vIekS0C1vw==", + "requires": { + "@babel/types": "^7.7.4" + } + }, + "@babel/helper-optimise-call-expression": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.4.tgz", + "integrity": "sha512-VB7gWZ2fDkSuqW6b1AKXkJWO5NyNI3bFL/kK79/30moK57blr6NbH8xcl2XcKCwOmJosftWunZqfO84IGq3ZZg==", + "requires": { + "@babel/types": "^7.7.4" + } + }, + "@babel/helper-replace-supers": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.7.4.tgz", + "integrity": "sha512-pP0tfgg9hsZWo5ZboYGuBn/bbYT/hdLPVSS4NMmiRJdwWhP0IznPwN9AE1JwyGsjSPLC364I0Qh5p+EPkGPNpg==", + "requires": { + "@babel/helper-member-expression-to-functions": "^7.7.4", + "@babel/helper-optimise-call-expression": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@babel/types": "^7.7.4" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz", + "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==", + "requires": { + "@babel/types": "^7.7.4" + } + }, + "@babel/parser": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.4.tgz", + "integrity": "sha512-jIwvLO0zCL+O/LmEJQjWA75MQTWwx3c3u2JOTDK5D3/9egrWRRA0/0hk9XXywYnXZVVpzrBYeIQTmhwUaePI9g==" + }, + "@babel/template": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", + "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", + "requires": { + "@babel/code-frame": "^7.0.0", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4" + } + }, + "@babel/traverse": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.4.tgz", + "integrity": "sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==", + "requires": { + "@babel/code-frame": "^7.5.5", + "@babel/generator": "^7.7.4", + "@babel/helper-function-name": "^7.7.4", + "@babel/helper-split-export-declaration": "^7.7.4", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + }, + "@babel/types": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + } } }, "@babel/plugin-transform-parameters": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz", - "integrity": "sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.7.4.tgz", + "integrity": "sha512-VJwhVePWPa0DqE9vcfptaJSzNDKrWU/4FbYCjZERtmqEs05g3UMXnYMZoXja7JAJ7Y7sPZipwm/pGApZt7wHlw==", "requires": { - "@babel/helper-call-delegate": "^7.4.4", - "@babel/helper-get-function-arity": "^7.0.0", + "@babel/helper-call-delegate": "^7.7.4", + "@babel/helper-get-function-arity": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0" + }, + "dependencies": { + "@babel/helper-get-function-arity": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", + "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", + "requires": { + "@babel/types": "^7.7.4" + } + }, + "@babel/types": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/plugin-transform-property-literals": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz", - "integrity": "sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.7.4.tgz", + "integrity": "sha512-MatJhlC4iHsIskWYyawl53KuHrt+kALSADLQQ/HkhTjX954fkxIEh4q5slL4oRAnsm/eDoZ4q0CIZpcqBuxhJQ==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-regenerator": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.0.tgz", - "integrity": "sha512-AXmvnC+0wuj/cFkkS/HFHIojxH3ffSXE+ttulrqWjZZRaUOonfJc60e1wSNT4rV8tIunvu/R3wCp71/tLAa9xg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.4.tgz", + "integrity": "sha512-e7MWl5UJvmPEwFJTwkBlPmqixCtr9yAASBqff4ggXTNicZiwbF8Eefzm6NVgfiBp7JdAGItecnctKTgH44q2Jw==", "requires": { "regenerator-transform": "^0.14.0" } }, "@babel/plugin-transform-reserved-words": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz", - "integrity": "sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.7.4.tgz", + "integrity": "sha512-OrPiUB5s5XvkCO1lS7D8ZtHcswIC57j62acAnJZKqGGnHP+TIc/ljQSrgdX/QyOTdEK5COAhuc820Hi1q2UgLQ==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-shorthand-properties": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz", - "integrity": "sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.7.4.tgz", + "integrity": "sha512-q+suddWRfIcnyG5YiDP58sT65AJDZSUhXQDZE3r04AuqD6d/XLaQPPXSBzP2zGerkgBivqtQm9XKGLuHqBID6Q==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-spread": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.6.2.tgz", - "integrity": "sha512-DpSvPFryKdK1x+EDJYCy28nmAaIMdxmhot62jAXF/o99iA33Zj2Lmcp3vDmz+MUh0LNYVPvfj5iC3feb3/+PFg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.7.4.tgz", + "integrity": "sha512-8OSs0FLe5/80cndziPlg4R0K6HcWSM0zyNhHhLsmw/Nc5MaA49cAsnoJ/t/YZf8qkG7fD+UjTRaApVDB526d7Q==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-sticky-regex": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz", - "integrity": "sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.7.4.tgz", + "integrity": "sha512-Ls2NASyL6qtVe1H1hXts9yuEeONV2TJZmplLONkMPUG158CtmnrzW5Q5teibM5UVOFjG0D3IC5mzXR6pPpUY7A==", "requires": { "@babel/helper-plugin-utils": "^7.0.0", "@babel/helper-regex": "^7.0.0" } }, "@babel/plugin-transform-template-literals": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz", - "integrity": "sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.7.4.tgz", + "integrity": "sha512-sA+KxLwF3QwGj5abMHkHgshp9+rRz+oY9uoRil4CyLtgEuE/88dpkeWgNk5qKVsJE9iSfly3nvHapdRiIS2wnQ==", "requires": { - "@babel/helper-annotate-as-pure": "^7.0.0", + "@babel/helper-annotate-as-pure": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-typeof-symbol": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz", - "integrity": "sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.7.4.tgz", + "integrity": "sha512-KQPUQ/7mqe2m0B8VecdyaW5XcQYaePyl9R7IsKd+irzj6jvbhoGnRE+M0aNkyAzI07VfUQ9266L5xMARitV3wg==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } @@ -1768,11 +1924,11 @@ } }, "@babel/plugin-transform-unicode-regex": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.0.tgz", - "integrity": "sha512-RrThb0gdrNwFAqEAAx9OWgtx6ICK69x7i9tCnMdVrxQwSDp/Abu9DXFU5Hh16VP33Rmxh04+NGW28NsIkFvFKA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.4.tgz", + "integrity": "sha512-N77UUIV+WCvE+5yHw+oks3m18/umd7y392Zv7mYTpFqHtkpcc+QUz+gLJNTWVlWROIWeLqY0f3OjZxV5TcXnRw==", "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.7.0", + "@babel/helper-create-regexp-features-plugin": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0" } }, @@ -1786,56 +1942,56 @@ } }, "@babel/preset-env": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.7.1.tgz", - "integrity": "sha512-/93SWhi3PxcVTDpSqC+Dp4YxUu3qZ4m7I76k0w73wYfn7bGVuRIO4QUz95aJksbS+AD1/mT1Ie7rbkT0wSplaA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.7.4.tgz", + "integrity": "sha512-Dg+ciGJjwvC1NIe/DGblMbcGq1HOtKbw8RLl4nIjlfcILKEOkWT/vRqPpumswABEBVudii6dnVwrBtzD7ibm4g==", "requires": { - "@babel/helper-module-imports": "^7.7.0", + "@babel/helper-module-imports": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-proposal-async-generator-functions": "^7.7.0", - "@babel/plugin-proposal-dynamic-import": "^7.7.0", - "@babel/plugin-proposal-json-strings": "^7.2.0", - "@babel/plugin-proposal-object-rest-spread": "^7.6.2", - "@babel/plugin-proposal-optional-catch-binding": "^7.2.0", - "@babel/plugin-proposal-unicode-property-regex": "^7.7.0", - "@babel/plugin-syntax-async-generators": "^7.2.0", - "@babel/plugin-syntax-dynamic-import": "^7.2.0", - "@babel/plugin-syntax-json-strings": "^7.2.0", - "@babel/plugin-syntax-object-rest-spread": "^7.2.0", - "@babel/plugin-syntax-optional-catch-binding": "^7.2.0", - "@babel/plugin-syntax-top-level-await": "^7.7.0", - "@babel/plugin-transform-arrow-functions": "^7.2.0", - "@babel/plugin-transform-async-to-generator": "^7.7.0", - "@babel/plugin-transform-block-scoped-functions": "^7.2.0", - "@babel/plugin-transform-block-scoping": "^7.6.3", - "@babel/plugin-transform-classes": "^7.7.0", - "@babel/plugin-transform-computed-properties": "^7.2.0", - "@babel/plugin-transform-destructuring": "^7.6.0", - "@babel/plugin-transform-dotall-regex": "^7.7.0", - "@babel/plugin-transform-duplicate-keys": "^7.5.0", - "@babel/plugin-transform-exponentiation-operator": "^7.2.0", - "@babel/plugin-transform-for-of": "^7.4.4", - "@babel/plugin-transform-function-name": "^7.7.0", - "@babel/plugin-transform-literals": "^7.2.0", - "@babel/plugin-transform-member-expression-literals": "^7.2.0", - "@babel/plugin-transform-modules-amd": "^7.5.0", - "@babel/plugin-transform-modules-commonjs": "^7.7.0", - "@babel/plugin-transform-modules-systemjs": "^7.7.0", - "@babel/plugin-transform-modules-umd": "^7.7.0", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.7.0", - "@babel/plugin-transform-new-target": "^7.4.4", - "@babel/plugin-transform-object-super": "^7.5.5", - "@babel/plugin-transform-parameters": "^7.4.4", - "@babel/plugin-transform-property-literals": "^7.2.0", - "@babel/plugin-transform-regenerator": "^7.7.0", - "@babel/plugin-transform-reserved-words": "^7.2.0", - "@babel/plugin-transform-shorthand-properties": "^7.2.0", - "@babel/plugin-transform-spread": "^7.6.2", - "@babel/plugin-transform-sticky-regex": "^7.2.0", - "@babel/plugin-transform-template-literals": "^7.4.4", - "@babel/plugin-transform-typeof-symbol": "^7.2.0", - "@babel/plugin-transform-unicode-regex": "^7.7.0", - "@babel/types": "^7.7.1", + "@babel/plugin-proposal-async-generator-functions": "^7.7.4", + "@babel/plugin-proposal-dynamic-import": "^7.7.4", + "@babel/plugin-proposal-json-strings": "^7.7.4", + "@babel/plugin-proposal-object-rest-spread": "^7.7.4", + "@babel/plugin-proposal-optional-catch-binding": "^7.7.4", + "@babel/plugin-proposal-unicode-property-regex": "^7.7.4", + "@babel/plugin-syntax-async-generators": "^7.7.4", + "@babel/plugin-syntax-dynamic-import": "^7.7.4", + "@babel/plugin-syntax-json-strings": "^7.7.4", + "@babel/plugin-syntax-object-rest-spread": "^7.7.4", + "@babel/plugin-syntax-optional-catch-binding": "^7.7.4", + "@babel/plugin-syntax-top-level-await": "^7.7.4", + "@babel/plugin-transform-arrow-functions": "^7.7.4", + "@babel/plugin-transform-async-to-generator": "^7.7.4", + "@babel/plugin-transform-block-scoped-functions": "^7.7.4", + "@babel/plugin-transform-block-scoping": "^7.7.4", + "@babel/plugin-transform-classes": "^7.7.4", + "@babel/plugin-transform-computed-properties": "^7.7.4", + "@babel/plugin-transform-destructuring": "^7.7.4", + "@babel/plugin-transform-dotall-regex": "^7.7.4", + "@babel/plugin-transform-duplicate-keys": "^7.7.4", + "@babel/plugin-transform-exponentiation-operator": "^7.7.4", + "@babel/plugin-transform-for-of": "^7.7.4", + "@babel/plugin-transform-function-name": "^7.7.4", + "@babel/plugin-transform-literals": "^7.7.4", + "@babel/plugin-transform-member-expression-literals": "^7.7.4", + "@babel/plugin-transform-modules-amd": "^7.7.4", + "@babel/plugin-transform-modules-commonjs": "^7.7.4", + "@babel/plugin-transform-modules-systemjs": "^7.7.4", + "@babel/plugin-transform-modules-umd": "^7.7.4", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.7.4", + "@babel/plugin-transform-new-target": "^7.7.4", + "@babel/plugin-transform-object-super": "^7.7.4", + "@babel/plugin-transform-parameters": "^7.7.4", + "@babel/plugin-transform-property-literals": "^7.7.4", + "@babel/plugin-transform-regenerator": "^7.7.4", + "@babel/plugin-transform-reserved-words": "^7.7.4", + "@babel/plugin-transform-shorthand-properties": "^7.7.4", + "@babel/plugin-transform-spread": "^7.7.4", + "@babel/plugin-transform-sticky-regex": "^7.7.4", + "@babel/plugin-transform-template-literals": "^7.7.4", + "@babel/plugin-transform-typeof-symbol": "^7.7.4", + "@babel/plugin-transform-unicode-regex": "^7.7.4", + "@babel/types": "^7.7.4", "browserslist": "^4.6.0", "core-js-compat": "^3.1.1", "invariant": "^2.2.2", @@ -1843,10 +1999,18 @@ "semver": "^5.5.0" }, "dependencies": { + "@babel/plugin-syntax-dynamic-import": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.7.4.tgz", + "integrity": "sha512-jHQW0vbRGvwQNgyVxwDh4yuXu4bH1f5/EICJLAhl1SblLs2CDhrsmCk+v5XLdE9wxtAFRyxx+P//Iw+a5L/tTg==", + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" + } + }, "@babel/types": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.2.tgz", - "integrity": "sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", "requires": { "esutils": "^2.0.2", "lodash": "^4.17.13", @@ -2830,13 +2994,13 @@ } }, "browserslist": { - "version": "4.7.2", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.7.2.tgz", - "integrity": "sha512-uZavT/gZXJd2UTi9Ov7/Z340WOSQ3+m1iBVRUknf+okKxonL9P83S3ctiBDtuRmRu8PiCHjqyueqQ9HYlJhxiw==", + "version": "4.7.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.7.3.tgz", + "integrity": "sha512-jWvmhqYpx+9EZm/FxcZSbUZyDEvDTLDi3nSAKbzEkyWvtI0mNSmUosey+5awDW1RUlrgXbQb5A6qY1xQH9U6MQ==", "requires": { - "caniuse-lite": "^1.0.30001004", - "electron-to-chromium": "^1.3.295", - "node-releases": "^1.1.38" + "caniuse-lite": "^1.0.30001010", + "electron-to-chromium": "^1.3.306", + "node-releases": "^1.1.40" } }, "browserslist-config-nextcloud": { @@ -2959,9 +3123,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001008", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001008.tgz", - "integrity": "sha512-b8DJyb+VVXZGRgJUa30cbk8gKHZ3LOZTBLaUEEVr2P4xpmFigOCc62CO4uzquW641Ouq1Rm9N+rWLWdSYDaDIw==" + "version": "1.0.30001011", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001011.tgz", + "integrity": "sha512-h+Eqyn/YA6o6ZTqpS86PyRmNWOs1r54EBDcd2NTwwfsXQ8re1B38SnB+p2RKF8OUsyEIjeDU8XGec1RGO/wYCg==" }, "caseless": { "version": "0.12.0", @@ -3245,11 +3409,11 @@ "integrity": "sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==" }, "core-js-compat": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.4.0.tgz", - "integrity": "sha512-pgQUcgT2+v9/yxHgMynYjNj7nmxLRXv3UC39rjCjDwpe63ev2rioQTju1PKLYUBbPCQQvZNWvQC8tBJd65q11g==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.4.2.tgz", + "integrity": "sha512-W0Aj+LM3EAxxjD0Kp2o4be8UlnxIZHNupBv2znqrheR4aY2nOn91794k/xoSp+SxqqriiZpTsSwBtZr60cbkwQ==", "requires": { - "browserslist": "^4.7.2", + "browserslist": "^4.7.3", "semver": "^6.3.0" }, "dependencies": { @@ -3600,9 +3764,9 @@ } }, "electron-to-chromium": { - "version": "1.3.306", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.306.tgz", - "integrity": "sha512-frDqXvrIROoYvikSKTIKbHbzO6M3/qC6kCIt/1FOa9kALe++c4VAJnwjSFvf1tYLEUsP2n9XZ4XSCyqc3l7A/A==" + "version": "1.3.312", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.312.tgz", + "integrity": "sha512-/Nk6Hvwt+RfS9X3oA4IXpWqpcnS7cdWsTMP4AmrP8hPpxtZbHemvTEYzjAKghk28aS9zIV8NwGHNt8H+6OmJug==" }, "elliptic": { "version": "6.5.1", @@ -6777,9 +6941,9 @@ } }, "node-releases": { - "version": "1.1.39", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.39.tgz", - "integrity": "sha512-8MRC/ErwNCHOlAFycy9OPca46fQYUjbJRDcZTHVWIGXIjYLM73k70vv3WkYutVnM4cCo4hE0MqBVVZjP6vjISA==", + "version": "1.1.41", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.41.tgz", + "integrity": "sha512-+IctMa7wIs8Cfsa8iYzeaLTFwv5Y4r5jZud+4AnfymzeEXKBCavFX0KBgzVaPVqf0ywa6PrO8/b+bPqdwjGBSg==", "requires": { "semver": "^6.3.0" }, @@ -9222,14 +9386,14 @@ "integrity": "sha1-WvIvGMBSoACkjXuCxenC4v7tpyg=" }, "url-loader": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-2.2.0.tgz", - "integrity": "sha512-G8nk3np8ZAnwhHXas1JxJEwJyQdqFXAKJehfgZ/XrC48volFBRtO+FIKtF2u0Ma3bw+4vnDVjHPAQYlF9p2vsw==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-2.3.0.tgz", + "integrity": "sha512-goSdg8VY+7nPZKUEChZSEtW5gjbS66USIGCeSJ1OVOJ7Yfuh/36YxCwMi5HVEJh6mqUYOoy3NJ0vlOMrWsSHog==", "dev": true, "requires": { "loader-utils": "^1.2.3", "mime": "^2.4.4", - "schema-utils": "^2.4.1" + "schema-utils": "^2.5.0" }, "dependencies": { "mime": { @@ -9237,6 +9401,16 @@ "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz", "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==", "dev": true + }, + "schema-utils": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.5.0.tgz", + "integrity": "sha512-32ISrwW2scPXHUSusP8qMg5dLUawKkyV+/qIEV9JdXKx+rsM6mi8vZY8khg2M69Qom16rtroWXD3Ybtiws38gQ==", + "dev": true, + "requires": { + "ajv": "^6.10.2", + "ajv-keywords": "^3.4.1" + } } } }, diff --git a/package.json b/package.json index 1f132832cb6..ebdbda91aa1 100644 --- a/package.json +++ b/package.json @@ -76,9 +76,9 @@ }, "devDependencies": { "@babel/core": "^7.7.4", - "@babel/plugin-proposal-class-properties": "^7.7.0", - "@babel/plugin-syntax-dynamic-import": "^7.2.0", - "@babel/preset-env": "^7.7.1", + "@babel/plugin-proposal-class-properties": "^7.7.4", + "@babel/plugin-syntax-dynamic-import": "^7.7.4", + "@babel/preset-env": "^7.7.4", "@nextcloud/browserslist-config": "^1.0.0", "babel-eslint": "^10.0.3", "babel-loader": "^8.0.6", @@ -100,7 +100,7 @@ "node-sass": "^4.13.0", "sass-loader": "^7.3.1", "style-loader": "^1.0.0", - "url-loader": "^2.1.0", + "url-loader": "^2.3.0", "vue-loader": "^15.7.2", "vue-template-compiler": "^2.6.10", "webpack": "^4.41.2", diff --git a/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php b/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php index 4ecea745cfa..811b64029c6 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 af97a4b4a79..508d5da95f7 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 c6af7e38722..7fa4b5e5bbe 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 8aa2f040de1..c7010e53e58 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 <http://www.gnu.org/licenses/>. * */ + 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 af860e244d6..7660aad1192 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 <http://www.gnu.org/licenses/>. * */ + 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 708e10b0581..f9b1cbbe3a8 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 <http://www.gnu.org/licenses/>. * */ + 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 ac872e74ac8..ab089c93422 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 <http://www.gnu.org/licenses/>. * */ + 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 ec7b0f2d714..8a75571e3cb 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 <http://www.gnu.org/licenses/>. * */ + 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 8c023274da5..77757008633 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 cbc417dbdba..73141cefcbd 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 758020acc71..019fedc1da9 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 <http://www.gnu.org/licenses/>. * */ + namespace Tests\Core\Command\User; diff --git a/tests/Core/Command/User/EnableTest.php b/tests/Core/Command/User/EnableTest.php index 60b415ae79d..9a3df13efe0 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 <http://www.gnu.org/licenses/>. * */ + namespace Tests\Core\Command\User; diff --git a/tests/Core/Controller/AvatarControllerTest.php b/tests/Core/Controller/AvatarControllerTest.php index 5fce8fc6359..6f82607dc02 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 e171b46d86d..55f05c975ed 100644 --- a/tests/Core/Controller/ChangePasswordControllerTest.php +++ b/tests/Core/Controller/ChangePasswordControllerTest.php @@ -19,11 +19,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + 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 911a4923675..c3ed740432c 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 f4e6e83201e..faab89db40c 100644 --- a/tests/Core/Controller/CssControllerTest.php +++ b/tests/Core/Controller/CssControllerTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace Tests\Core\Controller; use OC\Core\Controller\CssController; diff --git a/tests/Core/Controller/JsControllerTest.php b/tests/Core/Controller/JsControllerTest.php index 307ef837786..e05f5bf5ded 100644 --- a/tests/Core/Controller/JsControllerTest.php +++ b/tests/Core/Controller/JsControllerTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace Tests\Core\Controller; use OC\Core\Controller\JsController; diff --git a/tests/Core/Controller/NavigationControllerTest.php b/tests/Core/Controller/NavigationControllerTest.php index 4095526fc0b..71730a8f8b9 100644 --- a/tests/Core/Controller/NavigationControllerTest.php +++ b/tests/Core/Controller/NavigationControllerTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace Tests\Core\Controller; use OC\Core\Controller\NavigationController; diff --git a/tests/Core/Controller/OCSControllerTest.php b/tests/Core/Controller/OCSControllerTest.php index a22c3bdc5e0..241c3b12477 100644 --- a/tests/Core/Controller/OCSControllerTest.php +++ b/tests/Core/Controller/OCSControllerTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace OC\Core\Controller; use OC\CapabilitiesManager; diff --git a/tests/Core/Controller/PreviewControllerTest.php b/tests/Core/Controller/PreviewControllerTest.php index df1af6a0802..7b66d32f61e 100644 --- a/tests/Core/Controller/PreviewControllerTest.php +++ b/tests/Core/Controller/PreviewControllerTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace Tests\Core\Controller; use OC\Core\Controller\PreviewController; diff --git a/tests/Core/Controller/UserControllerTest.php b/tests/Core/Controller/UserControllerTest.php index d15bbf7f871..7a089d5e57e 100644 --- a/tests/Core/Controller/UserControllerTest.php +++ b/tests/Core/Controller/UserControllerTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace Test\Core\Controller; use OC\Core\Controller\UserController; diff --git a/tests/Core/Middleware/TwoFactorMiddlewareTest.php b/tests/Core/Middleware/TwoFactorMiddlewareTest.php index 06aea147a23..994599212f9 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 bff3b353a1e..9d9a0e01583 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 071e78146ea..0534f2dba6b 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 0e3410b8f20..66b210c4c13 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 b9c0f47216a..cd3e7c47ad6 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 b7172ab6a9f..ccc44b97764 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 169ec82ce6d..30da40d36b4 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 <http://www.gnu.org/licenses/>. * */ + 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 09d89aa70fd..7831b44b632 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 0d379a8822c..f5eb838b584 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 eff7563cc4f..f20f996d5a3 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 <http://www.gnu.org/licenses/>. * */ + 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 c9a90da7c59..fd075a9300d 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 990391a1de1..8ca80fe11ca 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 bbc9b56701e..71c21a06632 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 673d8132836..279c95afaeb 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 29004b36b18..03c8265f2c9 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 e77f2021d9e..d3d3f73e872 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 <http://www.gnu.org/licenses/>. * */ + 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 fab488ef990..b6163e90386 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 9cb99b06b65..6f81e0d56b4 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 221e27e3b68..404c94abdbd 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 07c932b2725..97c7ab75ed9 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 7e86903892f..d9bdfccf60b 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 49334c17e74..2c91289a5c9 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 <http://www.gnu.org/licenses/>. * */ + 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 66256d1a86f..0a13e1e11e5 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 3c3a273a97e..a74bd67d1f0 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 adac66a231c..e092cb53f58 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 8aaaec0733c..90fb8cceca1 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 5ef82a1221d..218f748a88b 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 b01176f0cf1..2ad660405f3 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 9d6442ea3ce..64b9566f8e6 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 c082b36e0ac..ef9a37aa81b 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 c06497ef5d5..b5586222257 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 e6c2c1b4f53..e38aa4525e3 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 038bec25148..8f9c60b65ff 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 5b88872d905..cca3b4aecca 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 <http://www.gnu.org/licenses/>. * */ + 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 de610100c2a..4ad90b6e874 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 <http://www.gnu.org/licenses/>. * */ + 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 498eaed8949..0fab8803073 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 95729e286f9..c981e840d70 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 <http://www.gnu.org/licenses/>. * */ + 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 7784f55e84a..c92c131780e 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 <http://www.gnu.org/licenses/>. * */ + 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 6a1adf03b2f..00bb1a0bb3c 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 813b0d54dc6..2cd61c73c71 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 fccece481ce..559561a8ccd 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 3c43e7f9219..fe1fc5bfa1a 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 e21e0ca13f2..b2f6c6ad8d0 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 <http://www.gnu.org/licenses/>. * */ + 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 0848f307230..a1f340075b8 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 8912dcab09c..bf312e7f4e3 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 1b7f3a637ce..48876cade6b 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 22e1891b51f..b8c399b81f8 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 ce64878bf5e..1b468839cb7 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 7193bee5389..5773bb596a5 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 7466f664eb5..ae3ee89cec2 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 657a50a3d88..dca9368558f 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 1d9229856db..3e065c69908 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 52347f439fa..9a85132aa3a 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 6292d5d0e97..fc506be644a 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 013290b56e9..2615c6afc1e 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 <http://www.gnu.org/licenses/> * */ + 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 35e52b951da..e601b4a1a90 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 <http://www.gnu.org/licenses/> * */ + 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 8654c83a545..87547debe80 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 9dfed5ecd1a..e9c52015dbe 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 4e4b2438a25..158e52f4a07 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 cff48d2cd6d..6a51d769751 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 a8cbef70d75..68639ad6e24 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 42fc820c5d0..75a6913d4ad 100644 --- a/tests/lib/FileChunkingTest.php +++ b/tests/lib/FileChunkingTest.php @@ -18,6 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace Test; use OCP\ICache; diff --git a/tests/lib/Files/AppData/AppDataTest.php b/tests/lib/Files/AppData/AppDataTest.php index 1d5cea0faf1..a9353540fff 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 <http://www.gnu.org/licenses/>. * */ + 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 75999c8c7da..9b7529b18d9 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 <http://www.gnu.org/licenses/>. * */ + 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 66fa8d51932..a0cc1c5d89c 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 299ec1a4378..4bfc8710951 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 46ae597f56b..7633ffb2f2d 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 dee5a0211c5..566c84e2c85 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 4ad3798a467..aa3b2519ec1 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 19451622fa3..eef308af088 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 <http://www.gnu.org/licenses/> * */ + namespace Test\Files\ObjectStore; diff --git a/tests/lib/Files/ObjectStore/NoopScannerTest.php b/tests/lib/Files/ObjectStore/NoopScannerTest.php index 6d593225e97..1832ed8d61a 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 c1c53b15ecf..b31fa348afa 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 <http://www.gnu.org/licenses/>. * */ + 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 d86c705d880..551d8c95205 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 <http://www.gnu.org/licenses/>. * */ + 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 74b8148aa36..034ffb5a53a 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 f17933413a5..c611a990236 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 d3dc036ab42..20b51cdda22 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 bb512d99c66..599abf894ef 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 a77d672f667..cf6aa31a047 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 5c37c9a0e93..43a3a06ba0b 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 ec1581625c6..ab5ef351fc0 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 32e30217759..3069f9d148b 100644 --- a/tests/lib/Group/ManagerTest.php +++ b/tests/lib/Group/ManagerTest.php @@ -20,13 +20,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + 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; @@ -190,6 +191,7 @@ class ManagerTest extends TestCase { ->method('createGroup') ->will($this->returnCallback(function () use (&$backendGroupCreated) { $backendGroupCreated = true; + return true; })); $manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger); @@ -199,6 +201,35 @@ class ManagerTest extends TestCase { $this->assertEquals('group1', $group->getGID()); } + public function testCreateFailure() { + /**@var \PHPUnit_Framework_MockObject_MockObject|\OC\Group\Backend $backend */ + $backendGroupCreated = false; + $backend = $this->getTestBackend( + GroupInterface::ADD_TO_GROUP | + GroupInterface::REMOVE_FROM_GOUP | + GroupInterface::COUNT_USERS | + GroupInterface::CREATE_GROUP | + GroupInterface::DELETE_GROUP | + GroupInterface::GROUP_DETAILS + ); + $backend->expects($this->any()) + ->method('groupExists') + ->with('group1') + ->willReturn(false); + $backend->expects($this->once()) + ->method('createGroup') + ->willReturn(false); + $backend->expects($this->once()) + ->method('getGroupDetails') + ->willReturn([]); + + $manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger); + $manager->addBackend($backend); + + $group = $manager->createGroup('group1'); + $this->assertEquals(null, $group); + } + public function testCreateExists() { /** @var \PHPUnit_Framework_MockObject_MockObject|\OC\Group\Backend $backend */ $backend = $this->getTestBackend(); diff --git a/tests/lib/Http/Client/ResponseTest.php b/tests/lib/Http/Client/ResponseTest.php index d50f9a717d5..f62563a95e9 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 7f67f405ac7..febd9f56622 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 4e581c0f2e2..f2ac46555f5 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 <http://www.gnu.org/licenses/> * */ + 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 8d5c38d275a..735a5e2d19a 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 be5cd1600c8..a5da1f8de75 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 c6faf325cd4..a8e2d8d6ba4 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 1944b1bd35d..971b22d69b2 100644 --- a/tests/lib/Memcache/FactoryTest.php +++ b/tests/lib/Memcache/FactoryTest.php @@ -18,6 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace Test\Memcache; use OC\Memcache\NullCache; diff --git a/tests/lib/NavigationManagerTest.php b/tests/lib/NavigationManagerTest.php index 97471fa5213..acf08088784 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 fdcdddb0813..f8ec68f6f55 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 9bca43a1a7e..c7fe1ea5f8a 100644 --- a/tests/lib/Preview/GeneratorTest.php +++ b/tests/lib/Preview/GeneratorTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace Test\Preview; use OC\Preview\Generator; diff --git a/tests/lib/Preview/HEICTest.php b/tests/lib/Preview/HEICTest.php index 63b9038d35d..a3cc37d24fb 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 dd98307993f..e52fcbe7c21 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 12e09105038..fe1b75cac9b 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 <http://www.gnu.org/licenses/>. * */ + namespace Test\Repair\NC11; use OC\Repair\NC11\FixMountStorages; diff --git a/tests/lib/Repair/RepairInvalidSharesTest.php b/tests/lib/Repair/RepairInvalidSharesTest.php index 0c67cc992ef..f28d6807d6a 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 b9d73d27d00..6579c3213c4 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 6ebaf79ddaf..e9b998c7bc8 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 <http://www.gnu.org/licenses/>. * */ + 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 da386db9d2d..e68ae70e152 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 <http://www.gnu.org/licenses/>. * */ + 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 28b85c3951f..424f620b619 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 2804ad99c0f..04da057a14c 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 6f7d7d4a37f..21d1dab4ab8 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 38da26a21a9..d1cbdcd3366 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 356d504f4b3..ff164cddc9d 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 0468afe633a..bb550bd1b2a 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 <http://www.gnu.org/licenses/>. * */ + 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 f12e6d94be3..114c03348f6 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 <http://www.gnu.org/licenses/>. * */ + namespace Test\Security\IdentityProof; use OC\Security\IdentityProof\Key; diff --git a/tests/lib/Security/SecureRandomTest.php b/tests/lib/Security/SecureRandomTest.php index 40431c89795..500e18d0ca6 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 86420e22c21..3fe0889b796 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 ed02061c595..8d1c9f768e8 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 8f725022eda..a9852882fa8 100644 --- a/tests/lib/Share20/DefaultShareProviderTest.php +++ b/tests/lib/Share20/DefaultShareProviderTest.php @@ -19,21 +19,22 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + 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 5fc6a447047..057173c4f33 100644 --- a/tests/lib/Share20/LegacyHooksTest.php +++ b/tests/lib/Share20/LegacyHooksTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace Test\Share20; use OC\Share20\LegacyHooks; diff --git a/tests/lib/Share20/ManagerTest.php b/tests/lib/Share20/ManagerTest.php index 4a7686acd35..26008c2a3de 100644 --- a/tests/lib/Share20/ManagerTest.php +++ b/tests/lib/Share20/ManagerTest.php @@ -18,39 +18,40 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + 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 69609f9f724..39141418f35 100644 --- a/tests/lib/Share20/ShareHelperTest.php +++ b/tests/lib/Share20/ShareHelperTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace Test\Share20; use OC\Share20\ShareHelper; diff --git a/tests/lib/Share20/ShareTest.php b/tests/lib/Share20/ShareTest.php index fbdf8e5c15b..9e5c4970d3b 100644 --- a/tests/lib/Share20/ShareTest.php +++ b/tests/lib/Share20/ShareTest.php @@ -18,6 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace Test\Share20; use OCP\Files\IRootFolder; diff --git a/tests/lib/SubAdminTest.php b/tests/lib/SubAdminTest.php index 4c0b030c44b..8b293426e75 100644 --- a/tests/lib/SubAdminTest.php +++ b/tests/lib/SubAdminTest.php @@ -18,6 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace Test; /** diff --git a/tests/lib/SystemTag/SystemTagManagerTest.php b/tests/lib/SystemTag/SystemTagManagerTest.php index f81bbaf1643..41c838914c7 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 a928f043ed3..790d1f44e1b 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 37624356443..50b678da6d3 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 6eaedccbe89..51b15b80405 100644 --- a/tests/lib/Template/JSCombinerTest.php +++ b/tests/lib/Template/JSCombinerTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace Test\Template; use function foo\func; diff --git a/tests/lib/Template/JSResourceLocatorTest.php b/tests/lib/Template/JSResourceLocatorTest.php index f5dff62729f..400637ae960 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 d4d60c2dc1b..421046b38f3 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 ba759a51a28..1f389fc82c8 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 afc9f9b1f86..47028cf3f18 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 666833ec44c..feba7a6926d 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 a60f89fb457..a37181c504c 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 3db519cedfc..4771983e9bc 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 |
