diff --git a/apps/accessibility/lib/Controller/ConfigController.php b/apps/accessibility/lib/Controller/ConfigController.php
index d089feda3001db95e58313d90b07181ec21b84e3..fe2dfbb512250101a3c31326de51f96587fdbd2a 100644
--- a/apps/accessibility/lib/Controller/ConfigController.php
+++ b/apps/accessibility/lib/Controller/ConfigController.php
@@ -30,7 +30,6 @@ declare(strict_types=1);
namespace OCA\Accessibility\Controller;
use OCA\Accessibility\AccessibilityProvider;
-use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\OCS\OCSBadRequestException;
use OCP\AppFramework\OCSController;
diff --git a/apps/cloud_federation_api/lib/Config.php b/apps/cloud_federation_api/lib/Config.php
index 7addd27e18baf357d82848efd4fd990733bed939..cd2b333c237efb94aecb2c05adef9f1651beeca1 100644
--- a/apps/cloud_federation_api/lib/Config.php
+++ b/apps/cloud_federation_api/lib/Config.php
@@ -23,8 +23,6 @@
namespace OCA\CloudFederationAPI;
use OCP\Federation\ICloudFederationProviderManager;
-use OCP\GlobalScale\IConfig as IGsConfig;
-use OCP\IConfig;
/**
* Class config
diff --git a/apps/comments/lib/Controller/Notifications.php b/apps/comments/lib/Controller/Notifications.php
index eab5a842fa69423d597813e9d2816450dcc14bfc..6610b56b689184efe3abcfcd3f6eca43c37caef1 100644
--- a/apps/comments/lib/Controller/Notifications.php
+++ b/apps/comments/lib/Controller/Notifications.php
@@ -30,7 +30,6 @@ use OCP\AppFramework\Http\RedirectResponse;
use OCP\AppFramework\Http\Response;
use OCP\Comments\IComment;
use OCP\Comments\ICommentsManager;
-use OCP\Files\Folder;
use OCP\Files\IRootFolder;
use OCP\IRequest;
use OCP\IURLGenerator;
diff --git a/apps/comments/tests/Unit/Collaboration/CommentersSorterTest.php b/apps/comments/tests/Unit/Collaboration/CommentersSorterTest.php
index 63d4b06b4226f68e4913520a3cdbd821ee751a3a..7223019b96ad14af9078cc3db0d06f72e4dff81c 100644
--- a/apps/comments/tests/Unit/Collaboration/CommentersSorterTest.php
+++ b/apps/comments/tests/Unit/Collaboration/CommentersSorterTest.php
@@ -28,7 +28,6 @@ namespace OCA\Comments\Tests\Unit\Collaboration;
use OCA\Comments\Collaboration\CommentersSorter;
use OCP\Comments\IComment;
use OCP\Comments\ICommentsManager;
-use OCP\IConfig;
use Test\TestCase;
class CommentersSorterTest extends TestCase {
diff --git a/apps/contactsinteraction/lib/AppInfo/Application.php b/apps/contactsinteraction/lib/AppInfo/Application.php
index 674034cbe48e601991bd67a73bb260398c64760e..3a7e0111f6c7e22a4f4e556b5600133fc3d73c8d 100644
--- a/apps/contactsinteraction/lib/AppInfo/Application.php
+++ b/apps/contactsinteraction/lib/AppInfo/Application.php
@@ -25,15 +25,10 @@ declare(strict_types=1);
namespace OCA\ContactsInteraction\AppInfo;
-use OCA\ContactsInteraction\AddressBook;
use OCA\ContactsInteraction\Listeners\ContactInteractionListener;
-use OCA\ContactsInteraction\Store;
use OCP\AppFramework\App;
-use OCP\AppFramework\IAppContainer;
use OCP\Contacts\Events\ContactInteractedWithEvent;
use OCP\EventDispatcher\IEventDispatcher;
-use OCP\EventDispatcher\IEventListener;
-use OCP\IL10N;
class Application extends App {
diff --git a/apps/dav/lib/CalDAV/Activity/Provider/Event.php b/apps/dav/lib/CalDAV/Activity/Provider/Event.php
index 46e3a95d95e942668befa695250a70c91192ce8b..c554b2b6d20605f9e7dc91e08ffcd0053ddd683b 100644
--- a/apps/dav/lib/CalDAV/Activity/Provider/Event.php
+++ b/apps/dav/lib/CalDAV/Activity/Provider/Event.php
@@ -24,7 +24,6 @@
namespace OCA\DAV\CalDAV\Activity\Provider;
-use OCA\DAV\CalDAV\CalDavBackend;
use OCP\Activity\IEvent;
use OCP\Activity\IEventMerger;
use OCP\Activity\IManager;
diff --git a/apps/dav/lib/CalDAV/Calendar.php b/apps/dav/lib/CalDAV/Calendar.php
index e3147062b1a18488c588bfda80684fb828ee34b3..7a46060290363353d24d48fe76988dbab6e0ef58 100644
--- a/apps/dav/lib/CalDAV/Calendar.php
+++ b/apps/dav/lib/CalDAV/Calendar.php
@@ -27,7 +27,6 @@
namespace OCA\DAV\CalDAV;
-use OCA\DAV\CalDAV\Proxy\ProxyMapper;
use OCA\DAV\DAV\Sharing\IShareable;
use OCA\DAV\Exception\UnsupportedLimitOnInitialSyncException;
use OCP\IConfig;
diff --git a/apps/dav/lib/CalDAV/Integration/ICalendarProvider.php b/apps/dav/lib/CalDAV/Integration/ICalendarProvider.php
index 29f5f113ef50fb6e976220b48d3df047af4b6488..806d0f13a036f5ec9262efaaefe2d0a132e3f0f7 100644
--- a/apps/dav/lib/CalDAV/Integration/ICalendarProvider.php
+++ b/apps/dav/lib/CalDAV/Integration/ICalendarProvider.php
@@ -22,7 +22,6 @@
*/
namespace OCA\DAV\CalDAV\Integration;
-use Sabre\CalDAV\ICalendar;
/**
* Interface ICalendarProvider
diff --git a/apps/dav/lib/CalDAV/ResourceBooking/AbstractPrincipalBackend.php b/apps/dav/lib/CalDAV/ResourceBooking/AbstractPrincipalBackend.php
index bad549960d981e047174de3182ea960d9c0e9153..5a25fbaa22e78f52d895f8fb8cbddd9e69af6ecf 100644
--- a/apps/dav/lib/CalDAV/ResourceBooking/AbstractPrincipalBackend.php
+++ b/apps/dav/lib/CalDAV/ResourceBooking/AbstractPrincipalBackend.php
@@ -30,7 +30,6 @@ use OCP\IDBConnection;
use OCP\IGroupManager;
use OCP\ILogger;
use OCP\IUserSession;
-use Sabre\DAV\Exception;
use Sabre\DAV\PropPatch;
use Sabre\DAVACL\PrincipalBackend\BackendInterface;
diff --git a/apps/dav/lib/CalDAV/WebcalCaching/RefreshWebcalService.php b/apps/dav/lib/CalDAV/WebcalCaching/RefreshWebcalService.php
index a057e29eb2c67a908a699e102de6381835865fc7..3b53487facdbbc831fdd1856cbf224b7d4f7d5a3 100644
--- a/apps/dav/lib/CalDAV/WebcalCaching/RefreshWebcalService.php
+++ b/apps/dav/lib/CalDAV/WebcalCaching/RefreshWebcalService.php
@@ -32,7 +32,6 @@ use Exception;
use GuzzleHttp\HandlerStack;
use GuzzleHttp\Middleware;
use OCA\DAV\CalDAV\CalDavBackend;
-use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Http\Client\IClientService;
use OCP\IConfig;
use OCP\ILogger;
diff --git a/apps/dav/lib/CardDAV/Integration/IAddressBookProvider.php b/apps/dav/lib/CardDAV/Integration/IAddressBookProvider.php
index 4410a7486bf91fbb26fa78349cf8eaa33517e3ad..1299d935c5706052373ffa1a8e1197f7e9644147 100644
--- a/apps/dav/lib/CardDAV/Integration/IAddressBookProvider.php
+++ b/apps/dav/lib/CardDAV/Integration/IAddressBookProvider.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
namespace OCA\DAV\CardDAV\Integration;
-use Sabre\CardDAV\IAddressBook;
/**
* @since 19.0.0
diff --git a/apps/dav/lib/Command/ListCalendars.php b/apps/dav/lib/Command/ListCalendars.php
index fc7d123a27231bef8bda8ffc4b46a6ce2aa68b51..768486a07ebb92011e24297387ccfbbc6bcf1341 100644
--- a/apps/dav/lib/Command/ListCalendars.php
+++ b/apps/dav/lib/Command/ListCalendars.php
@@ -27,13 +27,7 @@ namespace OCA\DAV\Command;
use OCA\DAV\CalDAV\BirthdayService;
use OCA\DAV\CalDAV\CalDavBackend;
-use OCA\DAV\Connector\Sabre\Principal;
-use OCP\IConfig;
-use OCP\IDBConnection;
-use OCP\IGroupManager;
use OCP\IUserManager;
-use OCP\IUserSession;
-use OCP\Share\IManager;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Helper\Table;
use Symfony\Component\Console\Input\InputArgument;
diff --git a/apps/dav/lib/Command/MoveCalendar.php b/apps/dav/lib/Command/MoveCalendar.php
index 1c43190c4e2752f2fde0c4aff5fa9a86095a3172..f74a5062c2b7349cd907af7258ca2df1ec84a690 100644
--- a/apps/dav/lib/Command/MoveCalendar.php
+++ b/apps/dav/lib/Command/MoveCalendar.php
@@ -27,13 +27,10 @@ namespace OCA\DAV\Command;
use OCA\DAV\CalDAV\CalDavBackend;
use OCA\DAV\CalDAV\Calendar;
-use OCA\DAV\Connector\Sabre\Principal;
use OCP\IConfig;
-use OCP\IDBConnection;
use OCP\IGroupManager;
use OCP\IL10N;
use OCP\IUserManager;
-use OCP\IUserSession;
use OCP\Share\IManager as IShareManager;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument;
diff --git a/apps/dav/lib/Connector/Sabre/Node.php b/apps/dav/lib/Connector/Sabre/Node.php
index 5f9ecf8814259e0ba2be8146cf8cf4b74d24a543..1dd209a830371213542d4cc4c2d7b56c60863534 100644
--- a/apps/dav/lib/Connector/Sabre/Node.php
+++ b/apps/dav/lib/Connector/Sabre/Node.php
@@ -45,7 +45,6 @@ use OCP\Files\StorageNotAvailableException;
use OCP\Share;
use OCP\Share\Exceptions\ShareNotFound;
use OCP\Share\IManager;
-use OCP\Share\IShare;
abstract class Node implements \Sabre\DAV\INode {
diff --git a/apps/dav/lib/Connector/Sabre/Principal.php b/apps/dav/lib/Connector/Sabre/Principal.php
index 41b85f162c8d4bcf6e919933adc13582842d1735..6be21eda3f6a9e7af2cff7f4721251de8a0f069e 100644
--- a/apps/dav/lib/Connector/Sabre/Principal.php
+++ b/apps/dav/lib/Connector/Sabre/Principal.php
@@ -33,13 +33,11 @@
namespace OCA\DAV\Connector\Sabre;
use OCA\Circles\Exceptions\CircleDoesNotExistException;
-use OCA\DAV\CalDAV\Proxy\Proxy;
use OCA\DAV\CalDAV\Proxy\ProxyMapper;
use OCA\DAV\Traits\PrincipalProxyTrait;
use OCP\App\IAppManager;
use OCP\AppFramework\QueryException;
use OCP\IConfig;
-use OCP\IGroup;
use OCP\IGroupManager;
use OCP\IUser;
use OCP\IUserManager;
diff --git a/apps/dav/lib/Connector/Sabre/QuotaPlugin.php b/apps/dav/lib/Connector/Sabre/QuotaPlugin.php
index 305ce5154a6aeb062f2bd066bd3e1d62cbad0627..39bee3a6656d104998200de6a90fa956060ad8b2 100644
--- a/apps/dav/lib/Connector/Sabre/QuotaPlugin.php
+++ b/apps/dav/lib/Connector/Sabre/QuotaPlugin.php
@@ -28,7 +28,6 @@
namespace OCA\DAV\Connector\Sabre;
use OCA\DAV\Upload\FutureFile;
-use OCP\Files\FileInfo;
use OCP\Files\StorageNotAvailableException;
use Sabre\DAV\Exception\InsufficientStorage;
use Sabre\DAV\Exception\ServiceUnavailable;
diff --git a/apps/dav/lib/Connector/Sabre/ShareeList.php b/apps/dav/lib/Connector/Sabre/ShareeList.php
index 48cc0540378a8bfc7aea4f1bdfcc54c2306b3926..67b42aad919a4b23f45ea231573315e4a2f68fea 100644
--- a/apps/dav/lib/Connector/Sabre/ShareeList.php
+++ b/apps/dav/lib/Connector/Sabre/ShareeList.php
@@ -28,8 +28,6 @@ declare(strict_types=1);
namespace OCA\DAV\Connector\Sabre;
use OCP\Share\IShare;
-use Sabre\Xml\Element;
-use Sabre\Xml\Reader;
use Sabre\Xml\Writer;
use Sabre\Xml\XmlSerializable;
diff --git a/apps/dav/lib/DAV/CustomPropertiesBackend.php b/apps/dav/lib/DAV/CustomPropertiesBackend.php
index 8b0408a461b30ba33d3ce4492198a2874a070282..81fb63dd856e12161e8527f521d07de34b076bdf 100644
--- a/apps/dav/lib/DAV/CustomPropertiesBackend.php
+++ b/apps/dav/lib/DAV/CustomPropertiesBackend.php
@@ -30,9 +30,6 @@ namespace OCA\DAV\DAV;
use OCA\DAV\Connector\Sabre\Node;
use OCP\IDBConnection;
use OCP\IUser;
-use Sabre\DAV\Exception\NotFound;
-use Sabre\DAV\Exception\ServiceUnavailable;
-use Sabre\DAV\INode;
use Sabre\DAV\PropertyStorage\Backend\BackendInterface;
use Sabre\DAV\PropFind;
use Sabre\DAV\PropPatch;
diff --git a/apps/dav/lib/Migration/Version1011Date20190725113607.php b/apps/dav/lib/Migration/Version1011Date20190725113607.php
index 12796334d6b547bdcc4a5ded61a729744e0691ae..c2604c8e274dcf82a6abed797fca37506d3cd787 100644
--- a/apps/dav/lib/Migration/Version1011Date20190725113607.php
+++ b/apps/dav/lib/Migration/Version1011Date20190725113607.php
@@ -27,7 +27,6 @@ declare(strict_types=1);
*/
namespace OCA\DAV\Migration;
-use Closure;
use Doctrine\DBAL\Types\Type;
use OCP\DB\ISchemaWrapper;
use OCP\Migration\IOutput;
diff --git a/apps/dav/lib/Upload/UploadFolder.php b/apps/dav/lib/Upload/UploadFolder.php
index 737e7e0b557d8b83b0fb4b0c4d093200ea1e02c1..6778a30b8a2cb4459955944b15d1f428d35ed763 100644
--- a/apps/dav/lib/Upload/UploadFolder.php
+++ b/apps/dav/lib/Upload/UploadFolder.php
@@ -24,9 +24,7 @@
namespace OCA\DAV\Upload;
-use OCA\DAV\BackgroundJob\UploadCleanup;
use OCA\DAV\Connector\Sabre\Directory;
-use OCP\BackgroundJob\IJobList;
use Sabre\DAV\Exception\Forbidden;
use Sabre\DAV\ICollection;
diff --git a/apps/dav/tests/unit/CalDAV/CachedSubscriptionObjectTest.php b/apps/dav/tests/unit/CalDAV/CachedSubscriptionObjectTest.php
index 28921e81ebf9bb472ba0d9a598a735a12f93c08d..0640af32fc546cc669933ddc07d23db58470bb86 100644
--- a/apps/dav/tests/unit/CalDAV/CachedSubscriptionObjectTest.php
+++ b/apps/dav/tests/unit/CalDAV/CachedSubscriptionObjectTest.php
@@ -26,8 +26,6 @@ namespace OCA\DAV\Tests\unit\CalDAV;
use OCA\DAV\CalDAV\CachedSubscriptionObject;
use OCA\DAV\CalDAV\CalDavBackend;
-use OCA\DAV\CalDAV\Calendar;
-use OCA\DAV\CalDAV\CalendarImpl;
class CachedSubscriptionObjectTest extends \Test\TestCase {
diff --git a/apps/dav/tests/unit/CalDAV/CalendarHomeTest.php b/apps/dav/tests/unit/CalDAV/CalendarHomeTest.php
index d366db8dba6bcaa77fd561e9536a27d3b1084672..efe56da8b3b75eb1e6a557bd52116dd864b54c65 100644
--- a/apps/dav/tests/unit/CalDAV/CalendarHomeTest.php
+++ b/apps/dav/tests/unit/CalDAV/CalendarHomeTest.php
@@ -31,7 +31,6 @@ use OCA\DAV\CalDAV\Integration\ExternalCalendar;
use OCA\DAV\CalDAV\Integration\ICalendarProvider;
use OCA\DAV\CalDAV\Outbox;
use Sabre\CalDAV\Schedule\Inbox;
-use Sabre\DAV\Exception\NotFound;
use Sabre\DAV\MkCol;
use Test\TestCase;
diff --git a/apps/dav/tests/unit/CalDAV/Reminder/BackendTest.php b/apps/dav/tests/unit/CalDAV/Reminder/BackendTest.php
index 88300e2ffec900054b8dfc277390857f92e0d921..6a49909902345b1c458f08a13c9ee32554824db2 100644
--- a/apps/dav/tests/unit/CalDAV/Reminder/BackendTest.php
+++ b/apps/dav/tests/unit/CalDAV/Reminder/BackendTest.php
@@ -31,7 +31,6 @@ namespace OCA\DAV\Tests\unit\CalDAV\Reminder;
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/EmailProviderTest.php b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php
index dc1e89f34c4dc1723588725913c8e77cb66f5c96..2a6a7f0dbb366f3938be28097cecb12ad123e493 100644
--- a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php
+++ b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php
@@ -36,12 +36,10 @@ use OCP\ILogger;
use OCP\IURLGenerator;
use OCP\IUser;
use OCP\L10N\IFactory as L10NFactory;
-use OCP\Mail\IAttachment;
use OCP\Mail\IEMailTemplate;
use OCP\Mail\IMailer;
use OCP\Mail\IMessage;
use Sabre\VObject\Component\VCalendar;
-use Test\TestCase;
class EmailProviderTest extends AbstractNotificationProviderTest {
diff --git a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/PushProviderTest.php b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/PushProviderTest.php
index 92ccbfb08f8034f5c1b9b7027c1c3a7b4a3dffa8..0003b5bb6b3d2bb6cf251d1d7e465922982285ec 100644
--- a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/PushProviderTest.php
+++ b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/PushProviderTest.php
@@ -29,7 +29,6 @@ declare(strict_types=1);
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;
@@ -40,7 +39,6 @@ use OCP\IUser;
use OCP\L10N\IFactory as L10NFactory;
use OCP\Notification\IManager;
use OCP\Notification\INotification;
-use Test\TestCase;
class PushProviderTest extends AbstractNotificationProviderTest {
diff --git a/apps/dav/tests/unit/CalDAV/Reminder/ReminderServiceTest.php b/apps/dav/tests/unit/CalDAV/Reminder/ReminderServiceTest.php
index 7e8ee32cec6478efc81de781bfc78e80e0cb2249..28f44fbf1c08e2b15a9080d8e491d49705239dc4 100644
--- a/apps/dav/tests/unit/CalDAV/Reminder/ReminderServiceTest.php
+++ b/apps/dav/tests/unit/CalDAV/Reminder/ReminderServiceTest.php
@@ -29,15 +29,11 @@ declare(strict_types=1);
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\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;
use OCP\IGroupManager;
use OCP\IUser;
use OCP\IUserManager;
diff --git a/apps/dav/tests/unit/CalDAV/ResourceBooking/AbstractPrincipalBackendTest.php b/apps/dav/tests/unit/CalDAV/ResourceBooking/AbstractPrincipalBackendTest.php
index b07fd70d9f1d4e9b22002bc8874ff2cb426e1a95..14294af11bdfd33998d52f3da307b35372f92c5f 100644
--- a/apps/dav/tests/unit/CalDAV/ResourceBooking/AbstractPrincipalBackendTest.php
+++ b/apps/dav/tests/unit/CalDAV/ResourceBooking/AbstractPrincipalBackendTest.php
@@ -26,7 +26,6 @@ namespace OCA\DAV\Tests\unit\CalDAV\ResourceBooking;
use OCA\DAV\CalDAV\Proxy\Proxy;
use OCA\DAV\CalDAV\Proxy\ProxyMapper;
-use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IGroupManager;
use OCP\ILogger;
use OCP\IUser;
diff --git a/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php b/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php
index 0d48392686a7b1ec56c94151247925b041011ff1..ee7d7e1957cce2b29a2ad5b26fe37830a3cd4e72 100644
--- a/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php
+++ b/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php
@@ -28,7 +28,6 @@
namespace OCA\DAV\Tests\unit\CalDAV\Schedule;
-use OC\Mail\Mailer;
use OCA\DAV\CalDAV\Schedule\IMipPlugin;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\DB\QueryBuilder\IQueryBuilder;
diff --git a/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php b/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php
index 251ce88457b08896fcc86256e43d862fcd7669a8..9298edb53ad7386299a1e87b36825acc8ad71958 100644
--- a/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php
+++ b/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php
@@ -32,7 +32,6 @@
namespace OCA\DAV\Tests\unit\CardDAV;
-use InvalidArgumentException;
use OCA\DAV\CalDAV\Proxy\ProxyMapper;
use OCA\DAV\CardDAV\AddressBook;
use OCA\DAV\CardDAV\CardDavBackend;
diff --git a/apps/dav/tests/unit/CardDAV/ConverterTest.php b/apps/dav/tests/unit/CardDAV/ConverterTest.php
index 110e8ad7bf830832bbe9aacab5328c8539d6e47f..0c129b0de7d51c0ac9c55a98bc2dd114ff2830bc 100644
--- a/apps/dav/tests/unit/CardDAV/ConverterTest.php
+++ b/apps/dav/tests/unit/CardDAV/ConverterTest.php
@@ -29,7 +29,6 @@ namespace OCA\DAV\Tests\unit\CardDAV;
use OC\Accounts\AccountManager;
use OCA\DAV\CardDAV\Converter;
-use OCP\IDBConnection;
use OCP\IImage;
use OCP\IUser;
use PHPUnit_Framework_MockObject_MockObject;
diff --git a/apps/dav/tests/unit/Command/ListCalendarsTest.php b/apps/dav/tests/unit/Command/ListCalendarsTest.php
index 42e24be5cd3506a7ebd58306311459056f0b74e6..7d2fdc6b1577263430a8e57b6c3ae742742e368a 100644
--- a/apps/dav/tests/unit/Command/ListCalendarsTest.php
+++ b/apps/dav/tests/unit/Command/ListCalendarsTest.php
@@ -25,7 +25,6 @@
namespace OCA\DAV\Tests\Command;
-use InvalidArgumentException;
use OCA\DAV\CalDAV\BirthdayService;
use OCA\DAV\CalDAV\CalDavBackend;
use OCA\DAV\Command\ListCalendars;
diff --git a/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php
index d7554741fc07628c3c547fe41911c867d5cc6828..3af82f31f509121481bc7facd465d48530ef1273 100644
--- a/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php
@@ -27,12 +27,8 @@
namespace OCA\DAV\Tests\unit\Connector\Sabre;
use OC\Files\View;
-use OCA\DAV\Connector\Sabre\Directory;
use OCA\DAV\Connector\Sabre\QuotaPlugin;
-use OCA\DAV\Files\FilesHome;
use OCP\Files\FileInfo;
-use Sabre\DAV\Exception\InsufficientStorage;
-use Sabre\DAV\Tree;
use Test\TestCase;
/**
diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/UploadTest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/UploadTest.php
index 3769399b6243b3984982373ca46288772db6ea23..07396f6f53559d7656ab79e26b7598f94212df09 100644
--- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/UploadTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/UploadTest.php
@@ -25,7 +25,6 @@
namespace OCA\DAV\Tests\unit\Connector\Sabre\RequestTest;
-use OC\Connector\Sabre\Exception\FileLocked;
use OCP\AppFramework\Http;
use OCP\Lock\ILockingProvider;
diff --git a/apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php b/apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php
index 1c29ca7d80b0377f38b754dfbe16853f3bb6f805..c4cea80b6473e70a63e1ea001a2ee7e75de47807 100644
--- a/apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php
+++ b/apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php
@@ -29,7 +29,6 @@ declare(strict_types=1);
namespace OCA\DAV\Tests\Unit\DAV\Controller;
use OCA\DAV\CalDAV\InvitationResponse\InvitationResponseServer;
-use OCA\DAV\CalDAV\Schedule\Plugin;
use OCA\DAV\Controller\InvitationResponseController;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\AppFramework\Utility\ITimeFactory;
diff --git a/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php b/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php
index 28af0715ea118be59e55e3d9f081e334dcbec512..f9a1b6d59e0721abd38a3f319436e9d18b28e173 100644
--- a/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php
+++ b/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php
@@ -24,12 +24,9 @@
namespace OCA\DAV\Tests\DAV;
-use OCA\DAV\Connector\Sabre\Node;
use OCA\DAV\DAV\CustomPropertiesBackend;
use OCP\IDBConnection;
use OCP\IUser;
-use Sabre\DAV\Exception\NotFound;
-use Sabre\DAV\INode;
use Sabre\DAV\PropFind;
use Sabre\DAV\PropPatch;
use Sabre\DAV\Tree;
diff --git a/apps/dav/tests/unit/Files/FileSearchBackendTest.php b/apps/dav/tests/unit/Files/FileSearchBackendTest.php
index 167b68e076c205323ed8bdf8e14a4d01b7882616..633d4695a5b675d4abc8254e2cd98bc2798d2f5e 100644
--- a/apps/dav/tests/unit/Files/FileSearchBackendTest.php
+++ b/apps/dav/tests/unit/Files/FileSearchBackendTest.php
@@ -43,10 +43,7 @@ use OCP\Share\IManager;
use SearchDAV\Backend\SearchPropertyDefinition;
use SearchDAV\Query\Limit;
use SearchDAV\Query\Query;
-use SearchDAV\XML\BasicSearch;
-use SearchDAV\XML\Literal;
use SearchDAV\XML\Operator;
-use SearchDAV\XML\Scope;
use Test\TestCase;
class FileSearchBackendTest extends TestCase {
diff --git a/apps/dav/tests/unit/ServerTest.php b/apps/dav/tests/unit/ServerTest.php
index a880e898479fc0b83263028dc1637e4c42a4b5c1..c9bdb2627c507b7b92ba7bd1cd9182efa5d7f504 100644
--- a/apps/dav/tests/unit/ServerTest.php
+++ b/apps/dav/tests/unit/ServerTest.php
@@ -26,7 +26,6 @@
namespace OCA\DAV\Tests\unit;
-use OCA\DAV\AppInfo\PluginManager;
use OCA\DAV\Server;
use OCP\IRequest;
diff --git a/apps/encryption/lib/Command/RecoverUser.php b/apps/encryption/lib/Command/RecoverUser.php
index 5d7909a3e9862540747a9ea69cae74db64338f43..fee9195cf1e75104a27840f13ad010ca7538ca70 100644
--- a/apps/encryption/lib/Command/RecoverUser.php
+++ b/apps/encryption/lib/Command/RecoverUser.php
@@ -24,11 +24,6 @@
namespace OCA\Encryption\Command;
-use OC\Files\Filesystem;
-use OC\User\NoUserException;
-use OCA\Encryption\Crypto\Crypt;
-use OCA\Encryption\KeyManager;
-use OCA\Encryption\Recovery;
use OCA\Encryption\Util;
use OCP\IConfig;
use OCP\IUserManager;
diff --git a/apps/encryption/tests/RecoveryTest.php b/apps/encryption/tests/RecoveryTest.php
index 9dbc818af3a5944591d241a7ba4ab7858c8b43a8..414e8d895b84f90681f3b4b20a9c909555c8470b 100644
--- a/apps/encryption/tests/RecoveryTest.php
+++ b/apps/encryption/tests/RecoveryTest.php
@@ -33,11 +33,9 @@ use OCA\Encryption\Crypto\Crypt;
use OCA\Encryption\KeyManager;
use OCA\Encryption\Recovery;
use OCP\Encryption\IFile;
-use OCP\Encryption\Keys\IStorage;
use OCP\IConfig;
use OCP\IUser;
use OCP\IUserSession;
-use OCP\Security\ISecureRandom;
use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;
diff --git a/apps/federatedfilesharing/lib/Controller/MountPublicLinkController.php b/apps/federatedfilesharing/lib/Controller/MountPublicLinkController.php
index c0c9ce9bc8c94283949d5678325c75b5b1e813cf..bf2948b0f64cd033b93fdd529f91b50661a86104 100644
--- a/apps/federatedfilesharing/lib/Controller/MountPublicLinkController.php
+++ b/apps/federatedfilesharing/lib/Controller/MountPublicLinkController.php
@@ -29,17 +29,13 @@
namespace OCA\FederatedFileSharing\Controller;
-use OC\Files\Filesystem;
use OC\HintException;
-use OC\Share\Helper;
use OCA\FederatedFileSharing\AddressHandler;
use OCA\FederatedFileSharing\FederatedShareProvider;
-use OCA\Files_Sharing\External\Manager;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\JSONResponse;
use OCP\Federation\ICloudIdManager;
-use OCP\Files\StorageInvalidException;
use OCP\Http\Client\IClientService;
use OCP\IL10N;
use OCP\ILogger;
@@ -47,7 +43,6 @@ use OCP\IRequest;
use OCP\ISession;
use OCP\IUserSession;
use OCP\Share\IManager;
-use OCP\Util;
/**
* Class MountPublicLinkController
diff --git a/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php b/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php
index 805b79f4396ed816c1ea507578fcaf76aa62b1ba..a99dfb55801e6e186269c32bc0efbb26cb4319a1 100644
--- a/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php
+++ b/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php
@@ -28,28 +28,19 @@
namespace OCA\FederatedFileSharing\Tests;
-use OC\AppFramework\Http;
-use OC\Federation\CloudIdManager;
-use OC\Files\Filesystem;
use OCA\FederatedFileSharing\Controller\RequestHandlerController;
-use OCA\FederatedFileSharing\FederatedShareProvider;
use OCP\AppFramework\Http\DataResponse;
use OCP\Federation\ICloudFederationFactory;
use OCP\Federation\ICloudFederationProvider;
use OCP\Federation\ICloudFederationProviderManager;
use OCP\Federation\ICloudFederationShare;
use OCP\Federation\ICloudIdManager;
-use OCP\Http\Client\IClient;
-use OCP\Http\Client\IClientService;
-use OCP\Http\Client\IResponse;
-use OCP\IConfig;
use OCP\IDBConnection;
use OCP\ILogger;
use OCP\IRequest;
use OCP\IUserManager;
use OCP\Share;
use OCP\Share\IShare;
-use PHPUnit\Framework\MockObject\Builder\InvocationMocker;
/**
* Class RequestHandlerTest
diff --git a/apps/files/lib/Capabilities.php b/apps/files/lib/Capabilities.php
index 7e6d5521fd7cfaebb5178b849883acbbfe34dbea..ad5c4e1b773d6be02ab4c64b95d37e99366406ae 100644
--- a/apps/files/lib/Capabilities.php
+++ b/apps/files/lib/Capabilities.php
@@ -26,14 +26,8 @@
namespace OCA\Files;
-use OC\DirectEditing\Manager;
use OCA\Files\Service\DirectEditingService;
use OCP\Capabilities\ICapability;
-use OCP\DirectEditing\ACreateEmpty;
-use OCP\DirectEditing\ACreateFromTemplate;
-use OCP\DirectEditing\IEditor;
-use OCP\DirectEditing\RegisterDirectEditorEvent;
-use OCP\EventDispatcher\IEventDispatcher;
use OCP\IConfig;
use OCP\IURLGenerator;
diff --git a/apps/files/lib/Controller/ApiController.php b/apps/files/lib/Controller/ApiController.php
index 9e6b6b550fc3529ca20447adb2543913acee8ade..3819e07909dd14b3c56fcf78eed3402b115fbb7e 100644
--- a/apps/files/lib/Controller/ApiController.php
+++ b/apps/files/lib/Controller/ApiController.php
@@ -52,7 +52,6 @@ use OCP\IPreview;
use OCP\IRequest;
use OCP\IUserSession;
use OCP\Share\IManager;
-use Sabre\VObject\Property\Boolean;
/**
* Class ApiController
diff --git a/apps/files/lib/Controller/DirectEditingController.php b/apps/files/lib/Controller/DirectEditingController.php
index 099c65f73e64596a17c56b84a6d4b905ee55f9df..ccef73b6a06eb70a332c7412e6acc038979ecf17 100644
--- a/apps/files/lib/Controller/DirectEditingController.php
+++ b/apps/files/lib/Controller/DirectEditingController.php
@@ -29,9 +29,6 @@ use OCA\Files\Service\DirectEditingService;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\OCSController;
-use OCP\DirectEditing\ACreateEmpty;
-use OCP\DirectEditing\ACreateFromTemplate;
-use OCP\DirectEditing\IEditor;
use OCP\DirectEditing\IManager;
use OCP\DirectEditing\RegisterDirectEditorEvent;
use OCP\EventDispatcher\IEventDispatcher;
diff --git a/apps/files/lib/Notification/Notifier.php b/apps/files/lib/Notification/Notifier.php
index 604408eee1026e4c6f4381d2dc7df00b8555eff9..529eb7cbc77ec33dfee6d1fd2d90dc8c45f87635 100644
--- a/apps/files/lib/Notification/Notifier.php
+++ b/apps/files/lib/Notification/Notifier.php
@@ -30,8 +30,6 @@ namespace OCA\Files\Notification;
use OCA\Files\Db\TransferOwnershipMapper;
use OCP\AppFramework\Db\DoesNotExistException;
-use OCP\AppFramework\Http;
-use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\IURLGenerator;
use OCP\L10N\IFactory;
diff --git a/apps/files/tests/HelperTest.php b/apps/files/tests/HelperTest.php
index 8dda7be5a198e62e70c7a145dbd36efcdec5754f..74dad8b6f311e1a44d9cba67504bf7c21beea054 100644
--- a/apps/files/tests/HelperTest.php
+++ b/apps/files/tests/HelperTest.php
@@ -25,7 +25,6 @@
*
*/
-use OCA\Files\Tests;
/**
* Class Helper
diff --git a/apps/files_external/3rdparty/icewind/smb/src/Wrapped/Share.php b/apps/files_external/3rdparty/icewind/smb/src/Wrapped/Share.php
index 5a79c49fecf551bec53b605bb0b0c09c742b1765..a48de62e69dc6d369ac5f5f0bf51053399c010ce 100644
--- a/apps/files_external/3rdparty/icewind/smb/src/Wrapped/Share.php
+++ b/apps/files_external/3rdparty/icewind/smb/src/Wrapped/Share.php
@@ -13,14 +13,11 @@ use Icewind\SMB\Exception\DependencyException;
use Icewind\SMB\Exception\FileInUseException;
use Icewind\SMB\Exception\InvalidTypeException;
use Icewind\SMB\Exception\NotFoundException;
-use Icewind\SMB\Exception\InvalidRequestException;
use Icewind\SMB\IFileInfo;
use Icewind\SMB\INotifyHandler;
use Icewind\SMB\IServer;
use Icewind\SMB\ISystem;
use Icewind\Streams\CallbackWrapper;
-use Icewind\SMB\Native\NativeShare;
-use Icewind\SMB\Native\NativeServer;
class Share extends AbstractShare {
/**
diff --git a/apps/files_external/lib/AppInfo/Application.php b/apps/files_external/lib/AppInfo/Application.php
index 761eeff113f67ef32a511d8b3b9d15643d7c005d..47f52fbcb8767552afca7a98eb1dddd46711ed41 100644
--- a/apps/files_external/lib/AppInfo/Application.php
+++ b/apps/files_external/lib/AppInfo/Application.php
@@ -62,8 +62,6 @@ 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;
use OCP\IGroup;
use OCP\IUser;
use Symfony\Component\EventDispatcher\GenericEvent;
diff --git a/apps/files_external/lib/Lib/Backend/InvalidBackend.php b/apps/files_external/lib/Lib/Backend/InvalidBackend.php
index 5b574d8cd00b56eca8cff998ee264ab474655880..fc9b0992197fe400ec1f583a56f3360e3513aee0 100644
--- a/apps/files_external/lib/Lib/Backend/InvalidBackend.php
+++ b/apps/files_external/lib/Lib/Backend/InvalidBackend.php
@@ -24,7 +24,6 @@
namespace OCA\Files_External\Lib\Backend;
-use OCA\Files_External\Lib\Storage\InvalidStorage;
use OCA\Files_External\Lib\StorageConfig;
use OCP\Files\StorageNotAvailableException;
use OCP\IUser;
diff --git a/apps/files_external/lib/Lib/Backend/Swift.php b/apps/files_external/lib/Lib/Backend/Swift.php
index e2d6c6848c4fad90f571e7fe5eac29369a9363ff..86238b542b1d49295d40c62a3e3051d4d9c346b5 100644
--- a/apps/files_external/lib/Lib/Backend/Swift.php
+++ b/apps/files_external/lib/Lib/Backend/Swift.php
@@ -30,7 +30,6 @@ 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/Migration/StorageMigrator.php b/apps/files_external/lib/Migration/StorageMigrator.php
index 8802e7b82b91ee085cfc4a55c327ebbc1016277c..5fef0d3ac38400cee2e213d1aa9260298de0cd4d 100644
--- a/apps/files_external/lib/Migration/StorageMigrator.php
+++ b/apps/files_external/lib/Migration/StorageMigrator.php
@@ -26,7 +26,6 @@ namespace OCA\Files_External\Migration;
use OCA\Files_External\Service\BackendService;
use OCA\Files_External\Service\DBConfigService;
-use OCA\Files_External\Service\GlobalLegacyStoragesService;
use OCA\Files_External\Service\LegacyStoragesService;
use OCA\Files_External\Service\StoragesService;
use OCA\Files_External\Service\UserLegacyStoragesService;
diff --git a/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php b/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php
index f784a7266944202cb3c968619464cee80c097287..b829525b516316029c5c0ed5e9c3e5cff2ac57f9 100644
--- a/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php
+++ b/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php
@@ -28,7 +28,6 @@ namespace OCA\Files_External\Tests\Controller;
use OCA\Files_External\Controller\GlobalStoragesController;
use OCA\Files_External\Service\BackendService;
-use OCP\AppFramework\Http;
use OCP\IL10N;
use OCP\ILogger;
use OCP\IRequest;
diff --git a/apps/files_sharing/lib/Controller/PublicPreviewController.php b/apps/files_sharing/lib/Controller/PublicPreviewController.php
index 076b3a381f8e11eceb671e9ad6a6188d719e1274..d0c2296f0dbfec290bf86f5eff8070fcca215832 100644
--- a/apps/files_sharing/lib/Controller/PublicPreviewController.php
+++ b/apps/files_sharing/lib/Controller/PublicPreviewController.php
@@ -25,7 +25,6 @@
namespace OCA\Files_Sharing\Controller;
-use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\Http\FileDisplayResponse;
diff --git a/apps/files_sharing/lib/Controller/ShareesAPIController.php b/apps/files_sharing/lib/Controller/ShareesAPIController.php
index 14ed90411498d8dba6d745ba626ddd4655816e3b..63c96151ebc5ebbd42082a73abfdff8df096bb19 100644
--- a/apps/files_sharing/lib/Controller/ShareesAPIController.php
+++ b/apps/files_sharing/lib/Controller/ShareesAPIController.php
@@ -34,7 +34,6 @@ declare(strict_types=1);
namespace OCA\Files_Sharing\Controller;
-use function array_filter;
use function array_slice;
use function array_values;
use Generator;
diff --git a/apps/files_sharing/lib/Helper.php b/apps/files_sharing/lib/Helper.php
index b487aab6d7f84581f040f5516f1afd74e9fbafff..3efb4e25eef4285b559fe8bbeb6c37613d34d7be 100644
--- a/apps/files_sharing/lib/Helper.php
+++ b/apps/files_sharing/lib/Helper.php
@@ -29,9 +29,6 @@ namespace OCA\Files_Sharing;
use OC\Files\Filesystem;
use OC\Files\View;
-use OCP\Files\NotFoundException;
-use OCP\Share\Exceptions\ShareNotFound;
-use OCP\User;
class Helper {
diff --git a/apps/files_sharing/lib/Hooks.php b/apps/files_sharing/lib/Hooks.php
index 831e37e7e06e69b84331e64dd22c07514b167f59..cb9e20bb869216ce057847687f700fcfefdc814f 100644
--- a/apps/files_sharing/lib/Hooks.php
+++ b/apps/files_sharing/lib/Hooks.php
@@ -29,7 +29,6 @@
namespace OCA\Files_Sharing;
use OC\Files\Filesystem;
-use OCA\FederatedFileSharing\DiscoveryManager;
class Hooks {
diff --git a/apps/files_sharing/lib/Middleware/SharingCheckMiddleware.php b/apps/files_sharing/lib/Middleware/SharingCheckMiddleware.php
index de168c43f5279a6fda354cc9e35f8f41d1bced4c..4f0b547e4334581e8104a91678bd0e129ad1d08b 100644
--- a/apps/files_sharing/lib/Middleware/SharingCheckMiddleware.php
+++ b/apps/files_sharing/lib/Middleware/SharingCheckMiddleware.php
@@ -27,7 +27,6 @@
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;
diff --git a/apps/files_sharing/tests/TestCase.php b/apps/files_sharing/tests/TestCase.php
index 8ea72943be47fc3e6d904bcd445ca452298593c9..c9f024cd67a4f9c2cda74d9dc51c61e792fe7ac7 100644
--- a/apps/files_sharing/tests/TestCase.php
+++ b/apps/files_sharing/tests/TestCase.php
@@ -32,7 +32,6 @@
namespace OCA\Files_Sharing\Tests;
-use OC\Files\Cache\Scanner;
use OC\Files\Filesystem;
use OCA\Files_Sharing\AppInfo\Application;
use OCP\Share\IShare;
diff --git a/apps/files_trashbin/lib/AppInfo/Application.php b/apps/files_trashbin/lib/AppInfo/Application.php
index e6954a7e0baf6f1fe905ed099a22aa6ad63a87b1..59f1b1d8c561169fdd834662d3ce9686b4ef3b5e 100644
--- a/apps/files_trashbin/lib/AppInfo/Application.php
+++ b/apps/files_trashbin/lib/AppInfo/Application.php
@@ -34,7 +34,6 @@ use OCA\Files_Trashbin\Trash\ITrashManager;
use OCA\Files_Trashbin\Trash\TrashManager;
use OCP\AppFramework\App;
use OCP\AppFramework\IAppContainer;
-use OCP\AppFramework\Utility\ITimeFactory;
class Application extends App {
public function __construct (array $urlParams = []) {
diff --git a/apps/files_trashbin/lib/Sabre/AbstractTrash.php b/apps/files_trashbin/lib/Sabre/AbstractTrash.php
index a32b42429a5199b959bfa00b17182fb9417ad88d..b1088f132216f7ab33f85ab3a7e37107f5f3d61f 100644
--- a/apps/files_trashbin/lib/Sabre/AbstractTrash.php
+++ b/apps/files_trashbin/lib/Sabre/AbstractTrash.php
@@ -29,7 +29,6 @@ namespace OCA\Files_Trashbin\Sabre;
use OCA\Files_Trashbin\Trash\ITrashItem;
use OCA\Files_Trashbin\Trash\ITrashManager;
use OCP\Files\FileInfo;
-use OCP\IUser;
abstract class AbstractTrash implements ITrash {
/** @var ITrashItem */
diff --git a/apps/files_trashbin/lib/Sabre/PropfindPlugin.php b/apps/files_trashbin/lib/Sabre/PropfindPlugin.php
index e27400372d39cb7143ad4e346ced43522691d53e..53619c6e85c2d559425d9ef9efff9bed775e561b 100644
--- a/apps/files_trashbin/lib/Sabre/PropfindPlugin.php
+++ b/apps/files_trashbin/lib/Sabre/PropfindPlugin.php
@@ -28,7 +28,6 @@ declare(strict_types=1);
namespace OCA\Files_Trashbin\Sabre;
use OCA\DAV\Connector\Sabre\FilesPlugin;
-use OCP\Constants;
use OCP\IPreview;
use Sabre\DAV\INode;
use Sabre\DAV\PropFind;
diff --git a/apps/files_trashbin/lib/Storage.php b/apps/files_trashbin/lib/Storage.php
index c9f1a928f3b5df060ec23fcb37f692867f059238..9cf154e9bfdf4a114fbe772d4c17fa306e4a74b9 100644
--- a/apps/files_trashbin/lib/Storage.php
+++ b/apps/files_trashbin/lib/Storage.php
@@ -31,7 +31,6 @@ namespace OCA\Files_Trashbin;
use OC\Files\Filesystem;
use OC\Files\Storage\Wrapper\Wrapper;
-use OC\Files\View;
use OCA\Files_Trashbin\Events\MoveToTrashEvent;
use OCA\Files_Trashbin\Trash\ITrashManager;
use OCP\Encryption\Exceptions\GenericEncryptionException;
diff --git a/apps/files_trashbin/lib/Trash/ITrashBackend.php b/apps/files_trashbin/lib/Trash/ITrashBackend.php
index 478dfa3971c95986b2dd7a1daf0d0b3a623d9fbb..e0d7ea50ac80d0cf4fe4758b23a424a33db4c8b5 100644
--- a/apps/files_trashbin/lib/Trash/ITrashBackend.php
+++ b/apps/files_trashbin/lib/Trash/ITrashBackend.php
@@ -23,9 +23,7 @@
namespace OCA\Files_Trashbin\Trash;
-use OCP\Files\FileInfo;
use OCP\Files\Node;
-use OCP\Files\SimpleFS\ISimpleFile;
use OCP\Files\Storage\IStorage;
use OCP\IUser;
diff --git a/apps/files_trashbin/lib/Trash/TrashManager.php b/apps/files_trashbin/lib/Trash/TrashManager.php
index d5f8eb1330fd492fea1b883d2fd2859ebab55e60..8d75ac21658dead9b7a95865d6521b2bf8677cbf 100644
--- a/apps/files_trashbin/lib/Trash/TrashManager.php
+++ b/apps/files_trashbin/lib/Trash/TrashManager.php
@@ -23,8 +23,6 @@
namespace OCA\Files_Trashbin\Trash;
-use OCP\Files\FileInfo;
-use OCP\Files\Mount\IMountPoint;
use OCP\Files\Storage\IStorage;
use OCP\IUser;
diff --git a/apps/files_trashbin/tests/TrashbinTest.php b/apps/files_trashbin/tests/TrashbinTest.php
index bdcef91e37cd2fcc000c3b174f37ae9ea0a11c1f..bde05e9b9ab53379283ca17daaa556a4738eec11 100644
--- a/apps/files_trashbin/tests/TrashbinTest.php
+++ b/apps/files_trashbin/tests/TrashbinTest.php
@@ -28,7 +28,6 @@
*
*/
-use OCA\Files_Trashbin\Tests;
use OCA\Files_Sharing\AppInfo\Application;
/**
diff --git a/apps/files_versions/lib/BackgroundJob/ExpireVersions.php b/apps/files_versions/lib/BackgroundJob/ExpireVersions.php
index c45e7c4a244413eb45d909b9b608b9d1ab6c4483..cb2e0abb0c47326b91c8ba5a00c9d88d3b5fc584 100644
--- a/apps/files_versions/lib/BackgroundJob/ExpireVersions.php
+++ b/apps/files_versions/lib/BackgroundJob/ExpireVersions.php
@@ -25,7 +25,6 @@
namespace OCA\Files_Versions\BackgroundJob;
-use OCA\Files_Versions\AppInfo\Application;
use OCA\Files_Versions\Expiration;
use OCA\Files_Versions\Storage;
use OCP\IUser;
diff --git a/apps/files_versions/lib/Sabre/RestoreFolder.php b/apps/files_versions/lib/Sabre/RestoreFolder.php
index eef12dcfd1814297cec40eb2007afbd9e69ee9f6..89f379e3c1cfff00580165b9f71b339513919823 100644
--- a/apps/files_versions/lib/Sabre/RestoreFolder.php
+++ b/apps/files_versions/lib/Sabre/RestoreFolder.php
@@ -27,7 +27,6 @@ declare(strict_types=1);
namespace OCA\Files_Versions\Sabre;
-use OCP\IUser;
use Sabre\DAV\Exception\Forbidden;
use Sabre\DAV\ICollection;
use Sabre\DAV\IMoveTarget;
diff --git a/apps/files_versions/lib/Sabre/VersionCollection.php b/apps/files_versions/lib/Sabre/VersionCollection.php
index eeb5453e9a047151d59ccdec0ffeb6c1ce8f9887..e2ad562e8bcb724c13f6aef0c5080599cbb071c2 100644
--- a/apps/files_versions/lib/Sabre/VersionCollection.php
+++ b/apps/files_versions/lib/Sabre/VersionCollection.php
@@ -27,7 +27,6 @@ declare(strict_types=1);
namespace OCA\Files_Versions\Sabre;
-use OCA\Files_Versions\Storage;
use OCA\Files_Versions\Versions\IVersion;
use OCA\Files_Versions\Versions\IVersionManager;
use OCP\Files\File;
diff --git a/apps/files_versions/lib/Versions/IVersionBackend.php b/apps/files_versions/lib/Versions/IVersionBackend.php
index d526df6996776e94cf4f7c83ebf68fdfeaa3e7fc..dd7e5f96398d190ab407ce522ae63a04c94c11b4 100644
--- a/apps/files_versions/lib/Versions/IVersionBackend.php
+++ b/apps/files_versions/lib/Versions/IVersionBackend.php
@@ -29,7 +29,6 @@ namespace OCA\Files_Versions\Versions;
use OCP\Files\File;
use OCP\Files\FileInfo;
use OCP\Files\NotFoundException;
-use OCP\Files\SimpleFS\ISimpleFile;
use OCP\Files\Storage\IStorage;
use OCP\IUser;
diff --git a/apps/files_versions/tests/Controller/PreviewControllerTest.php b/apps/files_versions/tests/Controller/PreviewControllerTest.php
index e5461d230708d7954a63f850e178089e83c32b3e..084bb25da82cd7b63f35c92688dd747efa3dfab5 100644
--- a/apps/files_versions/tests/Controller/PreviewControllerTest.php
+++ b/apps/files_versions/tests/Controller/PreviewControllerTest.php
@@ -24,7 +24,6 @@
namespace OCA\Files_Versions\Tests\Controller;
-use OC\User\User;
use OCA\Files_Versions\Controller\PreviewController;
use OCA\Files_Versions\Versions\IVersionManager;
use OCP\AppFramework\Http;
diff --git a/apps/files_versions/tests/VersioningTest.php b/apps/files_versions/tests/VersioningTest.php
index c7eaec0a6994b1af9634642c34e958044401c54a..89688958e60b5be5d109b6791046ddfb47b0646a 100644
--- a/apps/files_versions/tests/VersioningTest.php
+++ b/apps/files_versions/tests/VersioningTest.php
@@ -38,7 +38,6 @@ require_once __DIR__ . '/../appinfo/app.php';
use OC\Files\Storage\Temporary;
use OCP\IConfig;
use OCP\IUser;
-use OCP\Share\IShare;
/**
* Class Test_Files_versions
diff --git a/apps/settings/lib/AppInfo/Application.php b/apps/settings/lib/AppInfo/Application.php
index 4d837500c4ccac15fae54f6b2a067e558ce963ce..96c8734129017d239f37c32b2fcf863192bd720c 100644
--- a/apps/settings/lib/AppInfo/Application.php
+++ b/apps/settings/lib/AppInfo/Application.php
@@ -37,13 +37,7 @@ use OC\AppFramework\Utility\TimeFactory;
use OC\Authentication\Token\IProvider;
use OC\Authentication\Token\IToken;
use OC\Server;
-use OCA\Settings\Activity\GroupProvider;
-use OCA\Settings\Activity\GroupSetting;
use OCA\Settings\Activity\Provider;
-use OCA\Settings\Activity\SecurityFilter;
-use OCA\Settings\Activity\SecurityProvider;
-use OCA\Settings\Activity\SecuritySetting;
-use OCA\Settings\Activity\Setting;
use OCA\Settings\Hooks;
use OCA\Settings\Mailer\NewUserMailHelper;
use OCA\Settings\Middleware\SubadminMiddleware;
diff --git a/apps/settings/lib/Controller/AuthSettingsController.php b/apps/settings/lib/Controller/AuthSettingsController.php
index 7f6d74e5fc76c42a8f67ca05acff4f973a0ccc90..405044746a376b79f884df5be6581484900e023b 100644
--- a/apps/settings/lib/Controller/AuthSettingsController.php
+++ b/apps/settings/lib/Controller/AuthSettingsController.php
@@ -40,7 +40,6 @@ use OC\Authentication\Exceptions\WipeTokenException;
use OC\Authentication\Token\INamedToken;
use OC\Authentication\Token\IProvider;
use OC\Authentication\Token\IToken;
-use OC\Authentication\Token\IWipeableToken;
use OC\Authentication\Token\RemoteWipe;
use OCA\Settings\Activity\Provider;
use OCP\Activity\IManager;
diff --git a/apps/settings/lib/Controller/UsersController.php b/apps/settings/lib/Controller/UsersController.php
index 3f6bcd3a46c38383ae76452c7771c5776c4936af..e58d1ea7324cf0c236b05887229f0dbcda3958e4 100644
--- a/apps/settings/lib/Controller/UsersController.php
+++ b/apps/settings/lib/Controller/UsersController.php
@@ -35,7 +35,6 @@ use OC\AppFramework\Http;
use OC\Encryption\Exceptions\ModuleDoesNotExistsException;
use OC\ForbiddenException;
use OC\Security\IdentityProof\Manager;
-use OCA\Settings\AppInfo\Application;
use OCA\Settings\BackgroundJobs\VerifyUserData;
use OCA\User_LDAP\User_Proxy;
use OCP\App\IAppManager;
diff --git a/apps/settings/lib/Mailer/NewUserMailHelper.php b/apps/settings/lib/Mailer/NewUserMailHelper.php
index 7352ac0ec6f123fc03a32a21881cbf3534d4fa84..ca6a59475270d2a328d733bf93af9d420b01ad44 100644
--- a/apps/settings/lib/Mailer/NewUserMailHelper.php
+++ b/apps/settings/lib/Mailer/NewUserMailHelper.php
@@ -33,7 +33,6 @@ namespace OCA\Settings\Mailer;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Defaults;
use OCP\IConfig;
-use OCP\IL10N;
use OCP\IURLGenerator;
use OCP\IUser;
use OCP\L10N\IFactory;
diff --git a/apps/settings/lib/Settings/Admin/Sharing.php b/apps/settings/lib/Settings/Admin/Sharing.php
index 980e579d3608dcca89f627370425fe32aac12af3..080f866ae564ba2738d520064e02fadad8cc870d 100644
--- a/apps/settings/lib/Settings/Admin/Sharing.php
+++ b/apps/settings/lib/Settings/Admin/Sharing.php
@@ -34,7 +34,6 @@ use OCP\AppFramework\Http\TemplateResponse;
use OCP\Constants;
use OCP\IConfig;
use OCP\IL10N;
-use OCP\L10N\IFactory;
use OCP\Settings\ISettings;
use OCP\Share\IManager;
use OCP\Util;
diff --git a/apps/settings/tests/Mailer/NewUserMailHelperTest.php b/apps/settings/tests/Mailer/NewUserMailHelperTest.php
index 35700245c84b1ecadef89c8311fbfa6b30efa058..0c6d26151b19bde2fa6035241f8394373c94b43d 100644
--- a/apps/settings/tests/Mailer/NewUserMailHelperTest.php
+++ b/apps/settings/tests/Mailer/NewUserMailHelperTest.php
@@ -32,7 +32,6 @@ namespace OCA\Settings\Tests\Mailer;
use OC\Mail\EMailTemplate;
use OC\Mail\Message;
-use OCA\Settings\Mailer\NewUserMailHelper;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Defaults;
use OCP\IConfig;
diff --git a/apps/theming/lib/Controller/ThemingController.php b/apps/theming/lib/Controller/ThemingController.php
index d043c64f853dda9f4ca7e98d40dbadf901614271..6a17b23722e3b38b50ad531a18a8d022ecbc1ca8 100644
--- a/apps/theming/lib/Controller/ThemingController.php
+++ b/apps/theming/lib/Controller/ThemingController.php
@@ -48,8 +48,6 @@ use OCP\AppFramework\Http\DataDownloadResponse;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\Http\FileDisplayResponse;
use OCP\AppFramework\Http\NotFoundResponse;
-use OCP\AppFramework\Utility\ITimeFactory;
-use OCP\Files\File;
use OCP\Files\IAppData;
use OCP\Files\NotFoundException;
use OCP\Files\NotPermittedException;
diff --git a/apps/theming/tests/Controller/IconControllerTest.php b/apps/theming/tests/Controller/IconControllerTest.php
index 7f41e8cc6d96f30b3d400bad2703059b46ff1d67..c159c7237ead48dcc8d51cc935a1d6b4caf35607 100644
--- a/apps/theming/tests/Controller/IconControllerTest.php
+++ b/apps/theming/tests/Controller/IconControllerTest.php
@@ -34,7 +34,6 @@ 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;
diff --git a/apps/theming/tests/Controller/ThemingControllerTest.php b/apps/theming/tests/Controller/ThemingControllerTest.php
index d6f8ff4c6b0a0a049ecc65351a4ffbb447a2a4a8..8d38c13962414adc81f685f4065a12f8dc38c09b 100644
--- a/apps/theming/tests/Controller/ThemingControllerTest.php
+++ b/apps/theming/tests/Controller/ThemingControllerTest.php
@@ -35,7 +35,6 @@
namespace OCA\Theming\Tests\Controller;
-use OC\Files\AppData\Factory;
use OC\L10N\L10N;
use OC\Template\SCSSCacher;
use OCA\Theming\Controller\ThemingController;
@@ -47,13 +46,11 @@ use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\Utility\ITimeFactory;
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\IL10N;
-use OCP\ILogger;
use OCP\IRequest;
use OCP\ITempManager;
use OCP\IURLGenerator;
diff --git a/apps/theming/tests/ImageManagerTest.php b/apps/theming/tests/ImageManagerTest.php
index 2360006958e894fa73d6a82ad96d044b41251716..fbdadf697e1d313dedc03ecbd37dbc7fb6a86fe8 100644
--- a/apps/theming/tests/ImageManagerTest.php
+++ b/apps/theming/tests/ImageManagerTest.php
@@ -27,7 +27,6 @@
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;
diff --git a/apps/theming/tests/ThemingDefaultsTest.php b/apps/theming/tests/ThemingDefaultsTest.php
index 458b602d62b89d4cdb6fa879dc753e70446d3cc1..a06cdb8f7a8e0a941f7b10e7f4767c4dd395065a 100644
--- a/apps/theming/tests/ThemingDefaultsTest.php
+++ b/apps/theming/tests/ThemingDefaultsTest.php
@@ -41,7 +41,6 @@ use OCP\App\IAppManager;
use OCP\Files\IAppData;
use OCP\Files\NotFoundException;
use OCP\Files\SimpleFS\ISimpleFile;
-use OCP\Files\SimpleFS\ISimpleFolder;
use OCP\ICache;
use OCP\ICacheFactory;
use OCP\IConfig;
diff --git a/apps/theming/tests/UtilTest.php b/apps/theming/tests/UtilTest.php
index f0f7089b6249a18341b63e9eba8036cfe67aa32f..969d35f7d2787d2c220dbda9cd6d8ca4425bb53b 100644
--- a/apps/theming/tests/UtilTest.php
+++ b/apps/theming/tests/UtilTest.php
@@ -30,7 +30,6 @@ 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;
diff --git a/apps/twofactor_backupcodes/lib/AppInfo/Application.php b/apps/twofactor_backupcodes/lib/AppInfo/Application.php
index d71e7654cb50b62d58cd95c947961dcbea0ad192..4c5d852f9564849b682ee9421ee38e4e212b392a 100644
--- a/apps/twofactor_backupcodes/lib/AppInfo/Application.php
+++ b/apps/twofactor_backupcodes/lib/AppInfo/Application.php
@@ -36,7 +36,6 @@ use OCA\TwoFactorBackupCodes\Notifications\Notifier;
use OCP\AppFramework\App;
use OCP\Authentication\TwoFactorAuth\IRegistry;
use OCP\EventDispatcher\IEventDispatcher;
-use OCP\IL10N;
use OCP\Notification\IManager;
use OCP\Util;
diff --git a/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php b/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php
index 8316e9d922312db500e4463c46c065d198f334ff..73883b3eb30c6319ec8a2cd3e852077fa74a5301 100644
--- a/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php
+++ b/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php
@@ -25,7 +25,6 @@
namespace OCA\TwoFactorBackupCodes\Db;
-use OCP\AppFramework\Db\Mapper;
use OCP\AppFramework\Db\QBMapper;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection;
diff --git a/apps/twofactor_backupcodes/lib/Service/BackupCodeStorage.php b/apps/twofactor_backupcodes/lib/Service/BackupCodeStorage.php
index c77c6b01d8cda10931825011def43c5deb9645a9..ffb456792a4b8c2516c9d086b7e933e788a33e52 100644
--- a/apps/twofactor_backupcodes/lib/Service/BackupCodeStorage.php
+++ b/apps/twofactor_backupcodes/lib/Service/BackupCodeStorage.php
@@ -25,17 +25,13 @@
namespace OCA\TwoFactorBackupCodes\Service;
-use BadMethodCallException;
use OCA\TwoFactorBackupCodes\Db\BackupCode;
use OCA\TwoFactorBackupCodes\Db\BackupCodeMapper;
use OCA\TwoFactorBackupCodes\Event\CodesGenerated;
-use OCP\Activity\IManager;
use OCP\EventDispatcher\IEventDispatcher;
-use OCP\ILogger;
use OCP\IUser;
use OCP\Security\IHasher;
use OCP\Security\ISecureRandom;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
class BackupCodeStorage {
diff --git a/apps/updatenotification/lib/Settings/Admin.php b/apps/updatenotification/lib/Settings/Admin.php
index 8d36e774b06a2e34d2d6b2a82d13a20c38ff1476..db2efffc46bf06786035468b8a8d958bfdd6b54b 100644
--- a/apps/updatenotification/lib/Settings/Admin.php
+++ b/apps/updatenotification/lib/Settings/Admin.php
@@ -33,7 +33,6 @@ use OCP\AppFramework\Http\TemplateResponse;
use OCP\IConfig;
use OCP\IDateTimeFormatter;
use OCP\IGroupManager;
-use OCP\IUserSession;
use OCP\L10N\IFactory;
use OCP\Settings\ISettings;
use OCP\Support\Subscription\IRegistry;
diff --git a/apps/updatenotification/tests/Settings/AdminTest.php b/apps/updatenotification/tests/Settings/AdminTest.php
index af5db66795a55da6a31cccffa804bfdfb2dc68d9..7ac404be57f73e5e0855464cb8a1e205eef877da 100644
--- a/apps/updatenotification/tests/Settings/AdminTest.php
+++ b/apps/updatenotification/tests/Settings/AdminTest.php
@@ -36,7 +36,6 @@ use OCP\IConfig;
use OCP\IDateTimeFormatter;
use OCP\IGroup;
use OCP\IGroupManager;
-use OCP\IUserSession;
use OCP\L10N\IFactory;
use OCP\L10N\ILanguageIterator;
use OCP\Support\Subscription\IRegistry;
diff --git a/apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserCleanUp.php b/apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserCleanUp.php
index 4bb5bd71647306b319f433140688c0a3b7ee46b2..b656b50ef50fa1a24fb7877cb8955df9e4d5e03c 100644
--- a/apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserCleanUp.php
+++ b/apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserCleanUp.php
@@ -23,7 +23,6 @@
namespace OCA\User_LDAP\Tests\Integration\Lib\User;
-use OC\User\NoUserException;
use OCA\User_LDAP\Jobs\CleanUp;
use OCA\User_LDAP\Mapping\UserMapping;
use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest;
diff --git a/apps/user_ldap/tests/Jobs/SyncTest.php b/apps/user_ldap/tests/Jobs/SyncTest.php
index dc21255da39ba5d56a1fecfe32e4b149d6307137..8cab95fc801fa23e8e18af7240ae0631cb4b8c0b 100644
--- a/apps/user_ldap/tests/Jobs/SyncTest.php
+++ b/apps/user_ldap/tests/Jobs/SyncTest.php
@@ -38,7 +38,6 @@ use OCP\IConfig;
use OCP\IDBConnection;
use OCP\IUserManager;
use OCP\Notification\IManager;
-use function Sodium\memcmp;
use Test\TestCase;
class SyncTest extends TestCase {
diff --git a/apps/user_ldap/tests/Settings/AdminTest.php b/apps/user_ldap/tests/Settings/AdminTest.php
index 54008e3def72f96d0b8608a9a2677baecf644520..8f3a699af5ddde7d6d7a67109ff8c6f515b31f40 100644
--- a/apps/user_ldap/tests/Settings/AdminTest.php
+++ b/apps/user_ldap/tests/Settings/AdminTest.php
@@ -27,7 +27,6 @@
namespace OCA\User_LDAP\Tests\Settings;
use OCA\User_LDAP\Configuration;
-use OCA\User_LDAP\Helper;
use OCA\User_LDAP\Settings\Admin;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\IL10N;
diff --git a/apps/user_ldap/tests/User_ProxyTest.php b/apps/user_ldap/tests/User_ProxyTest.php
index f2e49d4dbec17737e5d2d8d180f98eafd63a5bee..0a073b3948e8807514b6d1a6bcf24e054410f863 100644
--- a/apps/user_ldap/tests/User_ProxyTest.php
+++ b/apps/user_ldap/tests/User_ProxyTest.php
@@ -27,7 +27,6 @@
namespace OCA\User_LDAP\Tests;
-use OCA\User_LDAP\ILDAPUserPlugin;
use OCA\User_LDAP\ILDAPWrapper;
use OCA\User_LDAP\User_Proxy;
use OCA\User_LDAP\UserPluginManager;
diff --git a/apps/workflowengine/lib/Check/FileSize.php b/apps/workflowengine/lib/Check/FileSize.php
index 736a3d932fb5ab2fb65ef5a8b6a6b273b390633a..ce1bd4718f98962b89cc10d192ac10adf4bd3e53 100644
--- a/apps/workflowengine/lib/Check/FileSize.php
+++ b/apps/workflowengine/lib/Check/FileSize.php
@@ -27,7 +27,6 @@ use OCP\IL10N;
use OCP\IRequest;
use OCP\Util;
use OCP\WorkflowEngine\ICheck;
-use OCP\WorkflowEngine\IEntity;
class FileSize implements ICheck {
diff --git a/build/integration/features/bootstrap/CapabilitiesContext.php b/build/integration/features/bootstrap/CapabilitiesContext.php
index 1de5001d13646794c426dfbe18ed57276299049a..f38ba17551aa5a6987d02c3e936215d14844807c 100644
--- a/build/integration/features/bootstrap/CapabilitiesContext.php
+++ b/build/integration/features/bootstrap/CapabilitiesContext.php
@@ -26,10 +26,6 @@
*/
use Behat\Behat\Context\Context;
use Behat\Behat\Context\SnippetAcceptingContext;
-use Behat\Behat\Hook\Scope\AfterScenarioScope;
-use Behat\Behat\Hook\Scope\BeforeScenarioScope;
-use GuzzleHttp\Client;
-use GuzzleHttp\Message\ResponseInterface;
use PHPUnit\Framework\Assert;
require __DIR__ . '/../../vendor/autoload.php';
diff --git a/build/integration/features/bootstrap/Download.php b/build/integration/features/bootstrap/Download.php
index e3b47b3ef33e4c143623c286043a3482c6859c1b..71a96eb585fcdc62e8361dec3b7c6b03b5566e91 100644
--- a/build/integration/features/bootstrap/Download.php
+++ b/build/integration/features/bootstrap/Download.php
@@ -22,8 +22,6 @@
*
*/
-use GuzzleHttp\Client;
-use GuzzleHttp\Message\ResponseInterface;
use PHPUnit\Framework\Assert;
require __DIR__ . '/../../vendor/autoload.php';
diff --git a/build/integration/features/bootstrap/FederationContext.php b/build/integration/features/bootstrap/FederationContext.php
index 092f0326d3a01168ed7b501ef1e00194b006715e..d710b9e502d804a6a9d2a39e01dd3d58bbf5d636 100644
--- a/build/integration/features/bootstrap/FederationContext.php
+++ b/build/integration/features/bootstrap/FederationContext.php
@@ -26,8 +26,6 @@
*/
use Behat\Behat\Context\Context;
use Behat\Behat\Context\SnippetAcceptingContext;
-use GuzzleHttp\Client;
-use GuzzleHttp\Message\ResponseInterface;
require __DIR__ . '/../../vendor/autoload.php';
diff --git a/build/integration/features/bootstrap/FilesDropContext.php b/build/integration/features/bootstrap/FilesDropContext.php
index bc54f51cc819e4d7685070e674905f3124d07d38..8f522d6f2ce2227fc660ab0784a6391c57d88c19 100644
--- a/build/integration/features/bootstrap/FilesDropContext.php
+++ b/build/integration/features/bootstrap/FilesDropContext.php
@@ -24,7 +24,6 @@
*/
use Behat\Behat\Context\Context;
use Behat\Behat\Context\SnippetAcceptingContext;
-use Behat\Behat\Tester\Exception\PendingException;
use GuzzleHttp\Client;
require __DIR__ . '/../../vendor/autoload.php';
diff --git a/build/integration/features/bootstrap/ShareesContext.php b/build/integration/features/bootstrap/ShareesContext.php
index 4042bb64f5cd4b33c666c3f06342b00cb2a8e7b7..cf472e0321ed098aab0d6d0122e81ed1ea6cdc56 100644
--- a/build/integration/features/bootstrap/ShareesContext.php
+++ b/build/integration/features/bootstrap/ShareesContext.php
@@ -26,8 +26,6 @@
*/
use Behat\Behat\Context\Context;
use Behat\Behat\Context\SnippetAcceptingContext;
-use PHPUnit\Framework\Assert;
-use Psr\Http\Message\ResponseInterface;
require __DIR__ . '/../../vendor/autoload.php';
diff --git a/build/integration/features/bootstrap/SharingContext.php b/build/integration/features/bootstrap/SharingContext.php
index cace64e4f8af595d99a6a62efcb37b18d2301633..ec03283de5a37b37883d83c2bc4f0376cf5ce873 100644
--- a/build/integration/features/bootstrap/SharingContext.php
+++ b/build/integration/features/bootstrap/SharingContext.php
@@ -22,8 +22,6 @@
*/
use Behat\Behat\Context\Context;
use Behat\Behat\Context\SnippetAcceptingContext;
-use PHPUnit\Framework\Assert;
-use Psr\Http\Message\ResponseInterface;
require __DIR__ . '/../../vendor/autoload.php';
diff --git a/core/Application.php b/core/Application.php
index 879ac1cff744695e672d5d293db175ff57926ff3..c2da7f8d19467b32e859b6ca0505a0bb79f98635 100644
--- a/core/Application.php
+++ b/core/Application.php
@@ -44,7 +44,6 @@ use OC\DB\SchemaWrapper;
use OCP\AppFramework\App;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\IDBConnection;
-use OCP\IServerContainer;
use OCP\User\Events\UserDeletedEvent;
use OCP\Util;
use Symfony\Component\EventDispatcher\GenericEvent;
diff --git a/core/Command/App/CheckCode.php b/core/Command/App/CheckCode.php
index b658ccbe2ea18cc40f4fa52102c88fd07e4545aa..3a17114261f884dc64ccbe00839a278e60d4c839 100644
--- a/core/Command/App/CheckCode.php
+++ b/core/Command/App/CheckCode.php
@@ -34,7 +34,6 @@ 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;
use Symfony\Component\Console\Command\Command;
diff --git a/core/Command/TwoFactorAuth/Disable.php b/core/Command/TwoFactorAuth/Disable.php
index d08bf7b767ee71479da20c7955eeb5a93914707d..1dd3a2cf64d655c4ac1c435f17ccaaee78ab96d6 100644
--- a/core/Command/TwoFactorAuth/Disable.php
+++ b/core/Command/TwoFactorAuth/Disable.php
@@ -23,7 +23,6 @@
namespace OC\Core\Command\TwoFactorAuth;
-use OC\Authentication\TwoFactorAuth\Manager;
use OC\Authentication\TwoFactorAuth\ProviderManager;
use OCP\IUserManager;
use Symfony\Component\Console\Input\InputArgument;
diff --git a/core/Controller/CssController.php b/core/Controller/CssController.php
index b332ee1aa2698184457157d809e0229ac8ea820d..3e7215966bc02f2a7ab25d50c37bf76083e2bb78 100644
--- a/core/Controller/CssController.php
+++ b/core/Controller/CssController.php
@@ -41,7 +41,6 @@ use OCP\Files\IAppData;
use OCP\Files\NotFoundException;
use OCP\Files\SimpleFS\ISimpleFile;
use OCP\Files\SimpleFS\ISimpleFolder;
-use OCP\IConfig;
use OCP\IRequest;
class CssController extends Controller {
diff --git a/core/Controller/RecommendedAppsController.php b/core/Controller/RecommendedAppsController.php
index f0860f46a3f4205bd59ed636380a4565a6676f22..fe3435d9be8a3086c6001a2e3b438091da429a46 100644
--- a/core/Controller/RecommendedAppsController.php
+++ b/core/Controller/RecommendedAppsController.php
@@ -27,7 +27,6 @@ declare(strict_types=1);
namespace OC\Core\Controller;
use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http\ContentSecurityPolicy;
use OCP\AppFramework\Http\Response;
use OCP\AppFramework\Http\StandaloneTemplateResponse;
use OCP\IInitialStateService;
diff --git a/core/Controller/SetupController.php b/core/Controller/SetupController.php
index 0135e01f1487e1bdfc8b113d659774a871fc3a95..7449717831bc11c0a5feaec6c646ae91e91f833c 100644
--- a/core/Controller/SetupController.php
+++ b/core/Controller/SetupController.php
@@ -34,7 +34,6 @@ namespace OC\Core\Controller;
use OC\Setup;
use OCP\ILogger;
-use function urlencode;
class SetupController {
/** @var Setup */
diff --git a/core/Migrations/Version15000Date20181015062942.php b/core/Migrations/Version15000Date20181015062942.php
index 22c430f7a9681e07c20c1aa48e8c10f73b4f0fee..eaeaf0dd268517c9aaee055533c1514da66a858b 100644
--- a/core/Migrations/Version15000Date20181015062942.php
+++ b/core/Migrations/Version15000Date20181015062942.php
@@ -27,7 +27,6 @@ declare(strict_types=1);
namespace OC\Core\Migrations;
use Closure;
-use Doctrine\DBAL\Types\Type;
use OCP\DB\ISchemaWrapper;
use OCP\Migration\IOutput;
use OCP\Migration\SimpleMigrationStep;
diff --git a/core/Migrations/Version18000Date20191204114856.php b/core/Migrations/Version18000Date20191204114856.php
index 995af4de2f1845f904662ddedf39ac251757663b..256b42f9597854e4928c87805506800d206525ac 100644
--- a/core/Migrations/Version18000Date20191204114856.php
+++ b/core/Migrations/Version18000Date20191204114856.php
@@ -27,7 +27,6 @@ declare(strict_types=1);
namespace OC\Core\Migrations;
use Closure;
-use Doctrine\DBAL\Types\Type;
use OCP\DB\ISchemaWrapper;
use OCP\IDBConnection;
use OCP\Migration\SimpleMigrationStep;
diff --git a/lib/private/App/AppStore/Fetcher/AppFetcher.php b/lib/private/App/AppStore/Fetcher/AppFetcher.php
index d6affe4f09b2c3e9dcbf0fab7fb152c0d612eefc..c0917b17469a83b23c564a68061e987c3510f9c4 100644
--- a/lib/private/App/AppStore/Fetcher/AppFetcher.php
+++ b/lib/private/App/AppStore/Fetcher/AppFetcher.php
@@ -35,7 +35,6 @@ use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Http\Client\IClientService;
use OCP\IConfig;
use OCP\ILogger;
-use OCP\Util;
class AppFetcher extends Fetcher {
diff --git a/lib/private/App/AppStore/Fetcher/Fetcher.php b/lib/private/App/AppStore/Fetcher/Fetcher.php
index e2876dd28c649311f0adfbd88631b8ddb5e4e21e..fd0600a3ce440a6b432b2bacd9a8b4101398e404 100644
--- a/lib/private/App/AppStore/Fetcher/Fetcher.php
+++ b/lib/private/App/AppStore/Fetcher/Fetcher.php
@@ -38,7 +38,6 @@ use OCP\Files\NotFoundException;
use OCP\Http\Client\IClientService;
use OCP\IConfig;
use OCP\ILogger;
-use OCP\Util;
abstract class Fetcher {
const INVALIDATE_AFTER_SECONDS = 300;
diff --git a/lib/private/App/CodeChecker/InfoChecker.php b/lib/private/App/CodeChecker/InfoChecker.php
index 0db9571d48a9c64c35f9206b794a3946da16c5ed..038fd34f436bcb9269f7ae03e555301627452dfc 100644
--- a/lib/private/App/CodeChecker/InfoChecker.php
+++ b/lib/private/App/CodeChecker/InfoChecker.php
@@ -24,8 +24,6 @@
namespace OC\App\CodeChecker;
use OC\Hooks\BasicEmitter;
-use OCP\App\AppPathNotFoundException;
-use OCP\App\IAppManager;
class InfoChecker extends BasicEmitter {
diff --git a/lib/private/App/DependencyAnalyzer.php b/lib/private/App/DependencyAnalyzer.php
index 81ae6e7a168d1f442243c7f1ee6615d2714240c9..06af62af241a7e2f5ddd5c85281966869dd49bba 100644
--- a/lib/private/App/DependencyAnalyzer.php
+++ b/lib/private/App/DependencyAnalyzer.php
@@ -29,7 +29,6 @@
namespace OC\App;
-use OCP\IConfig;
use OCP\IL10N;
class DependencyAnalyzer {
diff --git a/lib/private/AppFramework/Middleware/PublicShare/PublicShareMiddleware.php b/lib/private/AppFramework/Middleware/PublicShare/PublicShareMiddleware.php
index 131612848cb1740d15763e82222727cb1f5b5691..b6e2611179f6a0bbb902fa7b0da826d4dc09ee58 100644
--- a/lib/private/AppFramework/Middleware/PublicShare/PublicShareMiddleware.php
+++ b/lib/private/AppFramework/Middleware/PublicShare/PublicShareMiddleware.php
@@ -26,7 +26,6 @@ namespace OC\AppFramework\Middleware\PublicShare;
use OC\AppFramework\Middleware\PublicShare\Exceptions\NeedAuthenticationException;
use OCP\AppFramework\AuthPublicShareController;
use OCP\AppFramework\Http\NotFoundResponse;
-use OCP\AppFramework\Http\Response;
use OCP\AppFramework\Middleware;
use OCP\AppFramework\PublicShareController;
use OCP\Files\NotFoundException;
diff --git a/lib/private/AppFramework/Middleware/Security/FeaturePolicyMiddleware.php b/lib/private/AppFramework/Middleware/Security/FeaturePolicyMiddleware.php
index 67d2480a1f252ea5738ec518a6e902812063c22a..63f665f512d11fee8c39c7316d62797f17f84e25 100644
--- a/lib/private/AppFramework/Middleware/Security/FeaturePolicyMiddleware.php
+++ b/lib/private/AppFramework/Middleware/Security/FeaturePolicyMiddleware.php
@@ -26,14 +26,9 @@ declare(strict_types=1);
namespace OC\AppFramework\Middleware\Security;
-use OC\Security\CSP\ContentSecurityPolicyManager;
-use OC\Security\CSP\ContentSecurityPolicyNonceManager;
-use OC\Security\CSRF\CsrfTokenManager;
use OC\Security\FeaturePolicy\FeaturePolicy;
use OC\Security\FeaturePolicy\FeaturePolicyManager;
use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http\ContentSecurityPolicy;
-use OCP\AppFramework\Http\EmptyContentSecurityPolicy;
use OCP\AppFramework\Http\EmptyFeaturePolicy;
use OCP\AppFramework\Http\Response;
use OCP\AppFramework\Middleware;
diff --git a/lib/private/AppFramework/Middleware/SessionMiddleware.php b/lib/private/AppFramework/Middleware/SessionMiddleware.php
index 00ead5f2476ff84792c0eeee03969d67311fbe74..1f4ba123104038492ba84df1bb23435a816d9263 100644
--- a/lib/private/AppFramework/Middleware/SessionMiddleware.php
+++ b/lib/private/AppFramework/Middleware/SessionMiddleware.php
@@ -29,7 +29,6 @@ use OC\AppFramework\Utility\ControllerMethodReflector;
use OCP\AppFramework\Controller;
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 c7aa5ad073b102d8224d4338afd62767ba96048f..d6a30c900cc88f6576029d59f3c772ba926dc9f2 100644
--- a/lib/private/AppFramework/OCS/BaseResponse.php
+++ b/lib/private/AppFramework/OCS/BaseResponse.php
@@ -26,7 +26,6 @@ namespace OC\AppFramework\OCS;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataResponse;
-use OCP\AppFramework\Http\EmptyContentSecurityPolicy;
use OCP\AppFramework\Http\Response;
abstract class BaseResponse extends Response {
diff --git a/lib/private/Authentication/Events/ARemoteWipeEvent.php b/lib/private/Authentication/Events/ARemoteWipeEvent.php
index 9dfd740c2209088d3a2ff16586f5b8fc9239d6f0..111c6cfeeef9b595e122d1ae3e0a4ac8bbb263c7 100644
--- a/lib/private/Authentication/Events/ARemoteWipeEvent.php
+++ b/lib/private/Authentication/Events/ARemoteWipeEvent.php
@@ -28,7 +28,6 @@ namespace OC\Authentication\Events;
use OC\Authentication\Token\IToken;
use OCP\EventDispatcher\Event;
-use Symfony\Component\EventDispatcher\GenericEvent;
abstract class ARemoteWipeEvent extends Event {
diff --git a/lib/private/Authentication/Listeners/RemoteWipeActivityListener.php b/lib/private/Authentication/Listeners/RemoteWipeActivityListener.php
index 57ea002c6abaf5263abe0db94d72d44b53a509bb..f7d3693acc9adfbf3294999c1fbb7a86c66f920f 100644
--- a/lib/private/Authentication/Listeners/RemoteWipeActivityListener.php
+++ b/lib/private/Authentication/Listeners/RemoteWipeActivityListener.php
@@ -27,7 +27,6 @@ declare(strict_types=1);
namespace OC\Authentication\Listeners;
use BadMethodCallException;
-use OC\Authentication\Events\ARemoteWipeEvent;
use OC\Authentication\Events\RemoteWipeFinished;
use OC\Authentication\Events\RemoteWipeStarted;
use OC\Authentication\Token\IToken;
diff --git a/lib/private/Authentication/Listeners/RemoteWipeNotificationsListener.php b/lib/private/Authentication/Listeners/RemoteWipeNotificationsListener.php
index f97d8da735156f6bdc4adfcc5ad8570598c2408a..9eab3e74e9cebd6a9416344d0e62ef3b40e0937d 100644
--- a/lib/private/Authentication/Listeners/RemoteWipeNotificationsListener.php
+++ b/lib/private/Authentication/Listeners/RemoteWipeNotificationsListener.php
@@ -27,7 +27,6 @@ declare(strict_types=1);
namespace OC\Authentication\Listeners;
-use OC\Authentication\Events\ARemoteWipeEvent;
use OC\Authentication\Events\RemoteWipeFinished;
use OC\Authentication\Events\RemoteWipeStarted;
use OC\Authentication\Token\IToken;
diff --git a/lib/private/Authentication/Token/RemoteWipe.php b/lib/private/Authentication/Token/RemoteWipe.php
index e0fbf0734f5c1494977139d3540b7b5cb96eb8c0..b16246319e150c1ee981ef1e14174cdd27515811 100644
--- a/lib/private/Authentication/Token/RemoteWipe.php
+++ b/lib/private/Authentication/Token/RemoteWipe.php
@@ -30,7 +30,6 @@ namespace OC\Authentication\Token;
use function array_filter;
use OC\Authentication\Events\RemoteWipeFinished;
use OC\Authentication\Events\RemoteWipeStarted;
-use OC\Authentication\Exceptions\ExpiredTokenException;
use OC\Authentication\Exceptions\InvalidTokenException;
use OC\Authentication\Exceptions\WipeTokenException;
use OCP\EventDispatcher\IEventDispatcher;
diff --git a/lib/private/Authentication/TwoFactorAuth/Manager.php b/lib/private/Authentication/TwoFactorAuth/Manager.php
index b048d4e1f3c208c27753f89d2dd5573115bddaec..170048f451b712770bb342ded00984de60e3fd15 100644
--- a/lib/private/Authentication/TwoFactorAuth/Manager.php
+++ b/lib/private/Authentication/TwoFactorAuth/Manager.php
@@ -31,13 +31,11 @@ use function array_diff;
use function array_filter;
use BadMethodCallException;
use Exception;
-use OC\Authentication\Exceptions\ExpiredTokenException;
use OC\Authentication\Exceptions\InvalidTokenException;
use OC\Authentication\Token\IProvider as TokenProvider;
use OCP\Activity\IManager;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Authentication\TwoFactorAuth\IActivatableAtLogin;
-use OCP\Authentication\TwoFactorAuth\ILoginSetupProvider;
use OCP\Authentication\TwoFactorAuth\IProvider;
use OCP\Authentication\TwoFactorAuth\IRegistry;
use OCP\IConfig;
diff --git a/lib/private/Authentication/TwoFactorAuth/ProviderManager.php b/lib/private/Authentication/TwoFactorAuth/ProviderManager.php
index 8c41ac30bfdcec467244f21728f68fd643a285ec..26c1af0ae17be0ccc6db8b2ecb5ed4c89fab0bfd 100644
--- a/lib/private/Authentication/TwoFactorAuth/ProviderManager.php
+++ b/lib/private/Authentication/TwoFactorAuth/ProviderManager.php
@@ -28,7 +28,6 @@ namespace OC\Authentication\TwoFactorAuth;
use OC\Authentication\Exceptions\InvalidProviderException;
use OCP\Authentication\TwoFactorAuth\IActivatableByAdmin;
-use OCP\Authentication\TwoFactorAuth\IDeactivableByAdmin;
use OCP\Authentication\TwoFactorAuth\IDeactivatableByAdmin;
use OCP\Authentication\TwoFactorAuth\IProvider;
use OCP\Authentication\TwoFactorAuth\IRegistry;
diff --git a/lib/private/Collaboration/Resources/Manager.php b/lib/private/Collaboration/Resources/Manager.php
index 82731cbdb44bae6b34d1e512e977136bc99a4f4f..35ae0330e51b6377c8b4b7124290c15173770984 100644
--- a/lib/private/Collaboration/Resources/Manager.php
+++ b/lib/private/Collaboration/Resources/Manager.php
@@ -30,7 +30,6 @@ namespace OC\Collaboration\Resources;
use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
-use OCP\AppFramework\QueryException;
use OCP\Collaboration\Resources\CollectionException;
use OCP\Collaboration\Resources\ICollection;
use OCP\Collaboration\Resources\IManager;
diff --git a/lib/private/DB/AdapterPgSql.php b/lib/private/DB/AdapterPgSql.php
index 6cfd1d458bc0ef8acc3019b093e5397d4ae373a9..628c91dbb9e598d7009f57478020e41bcec0b97c 100644
--- a/lib/private/DB/AdapterPgSql.php
+++ b/lib/private/DB/AdapterPgSql.php
@@ -26,7 +26,6 @@
namespace OC\DB;
-use Doctrine\DBAL\DBALException;
class AdapterPgSql extends Adapter {
protected $compatModePre9_5 = null;
diff --git a/lib/private/DB/Connection.php b/lib/private/DB/Connection.php
index 03cd7f1af66705cfebdd6f77d4bae1d4e901bbeb..555dbd6082f1215de91e73fcff11649a97824f7a 100644
--- a/lib/private/DB/Connection.php
+++ b/lib/private/DB/Connection.php
@@ -41,7 +41,6 @@ use Doctrine\DBAL\Driver;
use Doctrine\DBAL\Exception\ConstraintViolationException;
use Doctrine\DBAL\Platforms\MySqlPlatform;
use Doctrine\DBAL\Schema\Schema;
-use Doctrine\DBAL\TransactionIsolationLevel;
use OC\DB\QueryBuilder\QueryBuilder;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection;
diff --git a/lib/private/DirectEditing/Manager.php b/lib/private/DirectEditing/Manager.php
index 5e3f77559385684e036fdc24f30c0d2d641d1393..e342863d52f37e4bf3a7f1b3eef381b8331b734d 100644
--- a/lib/private/DirectEditing/Manager.php
+++ b/lib/private/DirectEditing/Manager.php
@@ -34,8 +34,6 @@ use OCP\DirectEditing\ACreateFromTemplate;
use OCP\DirectEditing\IEditor;
use \OCP\DirectEditing\IManager;
use OCP\DirectEditing\IToken;
-use OCP\DirectEditing\RegisterDirectEditorEvent;
-use OCP\EventDispatcher\IEventDispatcher;
use OCP\Files\File;
use OCP\Files\IRootFolder;
use OCP\Files\Node;
diff --git a/lib/private/Files/Filesystem.php b/lib/private/Files/Filesystem.php
index d4e584c39f9878425f18907bcdb326212c03275f..8fddbf71200fe9b5b7027accbaa1ce2b8dfedb00 100644
--- a/lib/private/Files/Filesystem.php
+++ b/lib/private/Files/Filesystem.php
@@ -62,7 +62,6 @@ namespace OC\Files;
use OC\Cache\CappedMemoryCache;
use OC\Files\Config\MountProviderCollection;
use OC\Files\Mount\MountPoint;
-use OC\Files\Storage\StorageFactory;
use OC\Lockdown\Filesystem\NullStorage;
use OCP\Files\Config\IMountProvider;
use OCP\Files\NotFoundException;
diff --git a/lib/private/Files/Type/Loader.php b/lib/private/Files/Type/Loader.php
index 616994d0c7bebf9eb176d7042946752faf819021..348de2d88442926e8a74693628a3b16866fbcf5d 100644
--- a/lib/private/Files/Type/Loader.php
+++ b/lib/private/Files/Type/Loader.php
@@ -26,7 +26,6 @@
namespace OC\Files\Type;
-use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
use OCP\Files\IMimeTypeLoader;
use OCP\IDBConnection;
diff --git a/lib/private/Lock/DBLockingProvider.php b/lib/private/Lock/DBLockingProvider.php
index 974b0b55c89b20696fc9ba8230599d7b314bb0cb..a8c22b59cb17884f4fe4c2c62f0eb3d7d4f5168c 100644
--- a/lib/private/Lock/DBLockingProvider.php
+++ b/lib/private/Lock/DBLockingProvider.php
@@ -28,7 +28,6 @@
namespace OC\Lock;
-use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
use OC\DB\QueryBuilder\Literal;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\DB\QueryBuilder\IQueryBuilder;
diff --git a/lib/private/Log/Systemdlog.php b/lib/private/Log/Systemdlog.php
index 5dc6ab875b80bb1bfbf10c5bb9419865f0957680..e74cab40fd6fbba219941e564934797ab82c53c2 100644
--- a/lib/private/Log/Systemdlog.php
+++ b/lib/private/Log/Systemdlog.php
@@ -27,7 +27,6 @@ namespace OC\Log;
use OC\HintException;
use OC\SystemConfig;
-use OCP\IConfig;
use OCP\ILogger;
use OCP\Log\IWriter;
diff --git a/lib/private/Preview/Generator.php b/lib/private/Preview/Generator.php
index dcd4ccd130c80ba5731fcdaaad6bcd4c58987ae2..bb597460f9d329eb6dab202afa492fd3352593a0 100644
--- a/lib/private/Preview/Generator.php
+++ b/lib/private/Preview/Generator.php
@@ -26,7 +26,6 @@
namespace OC\Preview;
-use OC\Preview\GeneratorHelper;
use OCP\Files\File;
use OCP\Files\IAppData;
use OCP\Files\NotFoundException;
@@ -36,7 +35,6 @@ use OCP\Files\SimpleFS\ISimpleFolder;
use OCP\IConfig;
use OCP\IImage;
use OCP\IPreview;
-use OCP\Preview\IProvider;
use OCP\Preview\IProviderV2;
use OCP\Preview\IVersionedPreviewFile;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
diff --git a/lib/private/Preview/GeneratorHelper.php b/lib/private/Preview/GeneratorHelper.php
index 470cad2d0a656e1cfbd2c608e0bb87804201b964..28611005b2971e4e50fb2619fd7be5df4b59fe74 100644
--- a/lib/private/Preview/GeneratorHelper.php
+++ b/lib/private/Preview/GeneratorHelper.php
@@ -25,7 +25,6 @@
namespace OC\Preview;
-use OC\Files\View;
use OCP\Files\File;
use OCP\Files\IRootFolder;
use OCP\Files\SimpleFS\ISimpleFile;
diff --git a/lib/private/Session/Internal.php b/lib/private/Session/Internal.php
index b9aae76c3b036129b632a52ab61a5ee597916492..7990c4a7dae57b18271c73dced1f96bcf7ec87e7 100644
--- a/lib/private/Session/Internal.php
+++ b/lib/private/Session/Internal.php
@@ -36,8 +36,6 @@ namespace OC\Session;
use OC\Authentication\Exceptions\InvalidTokenException;
use OC\Authentication\Token\IProvider;
-use OC\SystemConfig;
-use OCP\IConfig;
use OCP\Session\Exceptions\SessionNotAvailableException;
/**
diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php
index ed1d2f45cd7f41d0023739db09c66e390e0a5fd5..d9f50185620b1e6292bdfd22d9e3ce7a0608c22f 100644
--- a/lib/private/Settings/Manager.php
+++ b/lib/private/Settings/Manager.php
@@ -33,7 +33,6 @@
namespace OC\Settings;
use Closure;
-use OC\Settings\Personal\PersonalInfo;
use OCP\AppFramework\QueryException;
use OCP\IL10N;
use OCP\ILogger;
diff --git a/lib/private/Setup.php b/lib/private/Setup.php
index 4042d502a7ec3fe87dbd38d9c4668995b45992ca..809d5b1e1568a9147842d8c688893fe26d6a944e 100644
--- a/lib/private/Setup.php
+++ b/lib/private/Setup.php
@@ -59,7 +59,6 @@ use OCP\Defaults;
use OCP\IGroup;
use OCP\IL10N;
use OCP\ILogger;
-use OCP\IUser;
use OCP\Security\ISecureRandom;
class Setup {
diff --git a/lib/private/Share/Share.php b/lib/private/Share/Share.php
index d54dcb2e0e2c4d9c3cd37ba739c650587b31b685..c9bd67b113d7852198a8db28f5a96ba737dacaa9 100644
--- a/lib/private/Share/Share.php
+++ b/lib/private/Share/Share.php
@@ -37,9 +37,7 @@
namespace OC\Share;
use OCP\DB\QueryBuilder\IQueryBuilder;
-use OCP\IConfig;
use OCP\ILogger;
-use OCP\Util;
/**
* This class provides the ability for apps to share their content between users.
diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php
index 3c39b58245e914915eac8f9df4f7ee5bff7dcdce..0778eda90451b5966636515655ad1ae5c34468f7 100644
--- a/lib/private/Share20/DefaultShareProvider.php
+++ b/lib/private/Share20/DefaultShareProvider.php
@@ -53,7 +53,6 @@ use OCP\IUserManager;
use OCP\Mail\IMailer;
use OCP\Share\Exceptions\ShareNotFound;
use OCP\Share\IShare;
-use OCP\Share\IShareHelper;
use OCP\Share\IShareProvider;
/**
diff --git a/lib/private/Share20/ProviderFactory.php b/lib/private/Share20/ProviderFactory.php
index 5a91202a1d02a476564bd0c31529ba4cbbd34144..cdfd40c87038c133745a96b15d481bd03792460b 100644
--- a/lib/private/Share20/ProviderFactory.php
+++ b/lib/private/Share20/ProviderFactory.php
@@ -36,7 +36,6 @@ use OC\Share20\Exception\ProviderException;
use OCA\FederatedFileSharing\AddressHandler;
use OCA\FederatedFileSharing\FederatedShareProvider;
use OCA\FederatedFileSharing\Notifications;
-use OCA\FederatedFileSharing\OCM\CloudFederationProvider;
use OCA\FederatedFileSharing\TokenHandler;
use OCA\ShareByMail\Settings\SettingsManager;
use OCA\ShareByMail\ShareByMailProvider;
diff --git a/lib/private/User/Database.php b/lib/private/User/Database.php
index 905a66f3797250cb60bba4c06284287c8f4d8c5a..856959a4596dd9ee8436da438cb64043d1e8135b 100644
--- a/lib/private/User/Database.php
+++ b/lib/private/User/Database.php
@@ -72,7 +72,6 @@ use OCP\User\Backend\IGetHomeBackend;
use OCP\User\Backend\IGetRealUIDBackend;
use OCP\User\Backend\ISetDisplayNameBackend;
use OCP\User\Backend\ISetPasswordBackend;
-use Symfony\Component\EventDispatcher\GenericEvent;
/**
* Class for user management in a SQL Database (e.g. MySQL, SQLite)
diff --git a/lib/private/legacy/files.php b/lib/private/legacy/files.php
index ebce03385007508346307525e5062cd653ceaeb5..d44fd72eb03fde45ddcf3584532c5bad4df00b38 100644
--- a/lib/private/legacy/files.php
+++ b/lib/private/legacy/files.php
@@ -42,7 +42,6 @@
use OC\Files\View;
use OC\Streamer;
-use OCP\ILogger;
use OCP\Lock\ILockingProvider;
/**
diff --git a/lib/public/AppFramework/Http/Template/ExternalShareMenuAction.php b/lib/public/AppFramework/Http/Template/ExternalShareMenuAction.php
index af112a7076dc288c10a5f8c4dc36a65a65139d0a..7866f19d430678792e059a3525e328e001ef438e 100644
--- a/lib/public/AppFramework/Http/Template/ExternalShareMenuAction.php
+++ b/lib/public/AppFramework/Http/Template/ExternalShareMenuAction.php
@@ -26,7 +26,6 @@
namespace OCP\AppFramework\Http\Template;
-use OCP\AppFramework\Http\Template\SimpleMenuAction;
use OCP\Util;
/**
diff --git a/lib/public/AppFramework/Http/Template/LinkMenuAction.php b/lib/public/AppFramework/Http/Template/LinkMenuAction.php
index 1ddb1a46e94d3cb5bdaa21042815938f94b01e63..489a7d534ad6886a57791e55840beb702811d451 100644
--- a/lib/public/AppFramework/Http/Template/LinkMenuAction.php
+++ b/lib/public/AppFramework/Http/Template/LinkMenuAction.php
@@ -24,7 +24,6 @@
namespace OCP\AppFramework\Http\Template;
-use OCP\AppFramework\Http\Template\SimpleMenuAction;
use OCP\Util;
/**
diff --git a/lib/public/Group/Events/BeforeGroupCreatedEvent.php b/lib/public/Group/Events/BeforeGroupCreatedEvent.php
index b9bb1788f8456fd82c3bb5819f3744426daf0676..3385d1a9397981eb7c2d82cf5da103759ab952cb 100644
--- a/lib/public/Group/Events/BeforeGroupCreatedEvent.php
+++ b/lib/public/Group/Events/BeforeGroupCreatedEvent.php
@@ -27,7 +27,6 @@ declare(strict_types=1);
namespace OCP\Group\Events;
use OCP\EventDispatcher\Event;
-use OCP\IGroup;
/**
* @since 18.0.0
diff --git a/lib/public/IUser.php b/lib/public/IUser.php
index c05403cc236fa8915e7e4cc02fd1186150af9b5d..a5e94bf8ac4162cbcb1ed1a38796fb3e65fc2b47 100644
--- a/lib/public/IUser.php
+++ b/lib/public/IUser.php
@@ -28,7 +28,6 @@
namespace OCP;
-use OCP\UserInterface;
/**
* Interface IUser
diff --git a/lib/public/Share/IProviderFactory.php b/lib/public/Share/IProviderFactory.php
index 120d46258ff99d7b9940ea19bc113e232b6696ef..b2587459d8571c776753f64dabe030b52280e207 100644
--- a/lib/public/Share/IProviderFactory.php
+++ b/lib/public/Share/IProviderFactory.php
@@ -24,7 +24,6 @@
namespace OCP\Share;
use OC\Share20\Exception\ProviderException;
-use OCP\IServerContainer;
/**
* Interface IProviderFactory
diff --git a/lib/public/User/Events/BeforeUserLoggedInWithCookieEvent.php b/lib/public/User/Events/BeforeUserLoggedInWithCookieEvent.php
index fd7463bc0f95e7fb781020011097c49088d8b9f5..1bcf3231829199c11b8821cc96c8088065d8f911 100644
--- a/lib/public/User/Events/BeforeUserLoggedInWithCookieEvent.php
+++ b/lib/public/User/Events/BeforeUserLoggedInWithCookieEvent.php
@@ -27,7 +27,6 @@ declare(strict_types=1);
namespace OCP\User\Events;
use OCP\EventDispatcher\Event;
-use OCP\IUser;
/**
* @since 18.0.0
diff --git a/tests/Core/Command/Maintenance/UpdateTheme.php b/tests/Core/Command/Maintenance/UpdateTheme.php
index ace756b26470b23e4ece3325e7df9e72af3a898e..bb6f5f45095f309f84061352d578fd34af0c54c6 100644
--- a/tests/Core/Command/Maintenance/UpdateTheme.php
+++ b/tests/Core/Command/Maintenance/UpdateTheme.php
@@ -23,12 +23,9 @@
namespace Tests\Core\Command\Maintenance;
-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;
diff --git a/tests/Core/Controller/OCSControllerTest.php b/tests/Core/Controller/OCSControllerTest.php
index af776274e5ccc9b7ac0902ce1b29e6e507c05ddb..e860ff6d6411fa4cd1fcc6bae22cb8ac7ea66d78 100644
--- a/tests/Core/Controller/OCSControllerTest.php
+++ b/tests/Core/Controller/OCSControllerTest.php
@@ -24,7 +24,6 @@
namespace OC\Core\Controller;
use OC\CapabilitiesManager;
-use OC\Security\Bruteforce\Throttler;
use OC\Security\IdentityProof\Key;
use OC\Security\IdentityProof\Manager;
use OCP\AppFramework\Http\DataResponse;
diff --git a/tests/acceptance/features/bootstrap/FileListAncestorSetter.php b/tests/acceptance/features/bootstrap/FileListAncestorSetter.php
index 2f8d3ad00e55b5c1ceea9cb404ebd133169a9f7f..d914edf234faedbf991a8e234b5687fd03e74e13 100644
--- a/tests/acceptance/features/bootstrap/FileListAncestorSetter.php
+++ b/tests/acceptance/features/bootstrap/FileListAncestorSetter.php
@@ -21,7 +21,6 @@
*
*/
-use Behat\Behat\Context\Context;
use Behat\Behat\Hook\Scope\BeforeScenarioScope;
/**
diff --git a/tests/lib/App/CodeChecker/InfoCheckerTest.php b/tests/lib/App/CodeChecker/InfoCheckerTest.php
index 531066a54c6e1b896b91e3ef0b71c9674c53566f..3b5060ae69465c17ff08b61ce822e38ff1a660be 100644
--- a/tests/lib/App/CodeChecker/InfoCheckerTest.php
+++ b/tests/lib/App/CodeChecker/InfoCheckerTest.php
@@ -22,7 +22,6 @@
namespace Test\App\CodeChecker;
use OC\App\CodeChecker\InfoChecker;
-use OC\App\InfoParser;
use Test\TestCase;
class InfoCheckerTest extends TestCase {
diff --git a/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php b/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php
index 0f4b83ff5cafdb8a79765100b0b929b0fb94ea1e..8259ec930fd5e3b299908e9b690f24e636ef774d 100644
--- a/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php
+++ b/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php
@@ -23,16 +23,9 @@
namespace Test\AppFramework\Controller;
-use OC\AppFramework\Middleware\PublicShare\Exceptions\NeedAuthenticationException;
-use OC\AppFramework\Middleware\PublicShare\PublicShareMiddleware;
use OCP\AppFramework\AuthPublicShareController;
-use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http\NotFoundResponse;
use OCP\AppFramework\Http\RedirectResponse;
use OCP\AppFramework\Http\TemplateResponse;
-use OCP\AppFramework\PublicShareController;
-use OCP\Files\NotFoundException;
-use OCP\IConfig;
use OCP\IRequest;
use OCP\ISession;
use OCP\IURLGenerator;
diff --git a/tests/lib/AppFramework/Controller/ControllerTest.php b/tests/lib/AppFramework/Controller/ControllerTest.php
index 675d4b7ccec293eb4ccef62ac6cf8a7f132441fd..f15d178df282c3e22fe7898ce3945b794cfb2a15 100644
--- a/tests/lib/AppFramework/Controller/ControllerTest.php
+++ b/tests/lib/AppFramework/Controller/ControllerTest.php
@@ -27,7 +27,6 @@ use OC\AppFramework\Http\Request;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\Http\JSONResponse;
-use OCP\AppFramework\Http\TemplateResponse;
use OCP\IConfig;
class ChildController extends Controller {
diff --git a/tests/lib/AppFramework/Controller/PublicShareControllerTest.php b/tests/lib/AppFramework/Controller/PublicShareControllerTest.php
index 318647ca8448fad2ac6e865ba5e8e931ec366fc8..388d5fbeef20368d83ea8d3563a0d8c909c284d2 100644
--- a/tests/lib/AppFramework/Controller/PublicShareControllerTest.php
+++ b/tests/lib/AppFramework/Controller/PublicShareControllerTest.php
@@ -23,18 +23,9 @@
namespace Test\AppFramework\Controller;
-use OC\AppFramework\Middleware\PublicShare\Exceptions\NeedAuthenticationException;
-use OC\AppFramework\Middleware\PublicShare\PublicShareMiddleware;
-use OCP\AppFramework\AuthPublicShareController;
-use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http\NotFoundResponse;
-use OCP\AppFramework\Http\RedirectResponse;
use OCP\AppFramework\PublicShareController;
-use OCP\Files\NotFoundException;
-use OCP\IConfig;
use OCP\IRequest;
use OCP\ISession;
-use OCP\IURLGenerator;
class PublicShareControllerTest extends \Test\TestCase {
diff --git a/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php b/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php
index 6acc21550d1c59154cb89cfaf2e42ffc0f7dd289..0c8d125d96045f76c9d8bfbd848e7d91dcda7810 100644
--- a/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php
+++ b/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php
@@ -8,7 +8,6 @@
namespace Test\AppFramework\Http;
-use OCP\AppFramework\Http;
use OCP\AppFramework\Http\ContentSecurityPolicy;
/**
diff --git a/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php b/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php
index c19caad23c7480268b17bae541a7d8aba914ff7a..121bb904d18bffd482ed8d17ba97093c8136e22d 100644
--- a/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php
+++ b/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php
@@ -8,7 +8,6 @@
namespace Test\AppFramework\Http;
-use OCP\AppFramework\Http;
use OCP\AppFramework\Http\EmptyContentSecurityPolicy;
/**
diff --git a/tests/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php b/tests/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php
index 4790e9baca7643d752e51f11c661b995efded199..69dd6d16226b3a01fbf649433e2c62502e3f21bd 100644
--- a/tests/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php
+++ b/tests/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php
@@ -25,7 +25,6 @@ namespace Test\AppFramework\Middleware;
use OC\AppFramework\Http\Request;
use OC\AppFramework\Middleware\MiddlewareDispatcher;
-use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\Response;
use OCP\AppFramework\Middleware;
use OCP\IConfig;
diff --git a/tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php
index f6ce5c27b22ca1e57cc7f55736993e716b7de592..55c874ccdb52bab8225993ed9f4267c8a47f31b6 100644
--- a/tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php
+++ b/tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php
@@ -26,7 +26,6 @@ use OC\AppFramework\Utility\ControllerMethodReflector;
use OC\Security\Bruteforce\Throttler;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\Response;
-use OCP\Http\Client\IResponse;
use OCP\IRequest;
use Test\TestCase;
diff --git a/tests/lib/AppFramework/Middleware/Security/FeaturePolicyMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/FeaturePolicyMiddlewareTest.php
index e136d7836162f27767380d10d1f6cbe281d501ba..62be8037cfc5bf1c5fd80cdef83c2f39145e2d9d 100644
--- a/tests/lib/AppFramework/Middleware/Security/FeaturePolicyMiddlewareTest.php
+++ b/tests/lib/AppFramework/Middleware/Security/FeaturePolicyMiddlewareTest.php
@@ -25,12 +25,9 @@ declare(strict_types=1);
namespace Test\AppFramework\Middleware\Security;
use OC\AppFramework\Middleware\Security\FeaturePolicyMiddleware;
-use OC\Security\CSP\ContentSecurityPolicy;
-use OC\Security\CSRF\CsrfToken;
use OC\Security\FeaturePolicy\FeaturePolicy;
use OC\Security\FeaturePolicy\FeaturePolicyManager;
use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http\EmptyContentSecurityPolicy;
use OCP\AppFramework\Http\EmptyFeaturePolicy;
use OCP\AppFramework\Http\Response;
use PHPUnit\Framework\MockObject\MockObject;
diff --git a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php
index 5a8260d796865eeb5b7baf2851d47e6293a334b6..85e1ac4e205b3a872565afcf6c0c28761ff48e13 100644
--- a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php
+++ b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php
@@ -32,17 +32,10 @@ use OC\AppFramework\Middleware\Security\Exceptions\SecurityException;
use OC\Appframework\Middleware\Security\Exceptions\StrictCookieMissingException;
use OC\AppFramework\Middleware\Security\SecurityMiddleware;
use OC\AppFramework\Utility\ControllerMethodReflector;
-use OC\Security\CSP\ContentSecurityPolicy;
-use OC\Security\CSP\ContentSecurityPolicyManager;
-use OC\Security\CSP\ContentSecurityPolicyNonceManager;
-use OC\Security\CSRF\CsrfToken;
-use OC\Security\CSRF\CsrfTokenManager;
use OCP\App\IAppManager;
use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http\EmptyContentSecurityPolicy;
use OCP\AppFramework\Http\JSONResponse;
use OCP\AppFramework\Http\RedirectResponse;
-use OCP\AppFramework\Http\Response;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\IConfig;
use OCP\IL10N;
diff --git a/tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php b/tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php
index db2a9d5b62507a962facfd2c7c88503384c980f6..940112311c31babd03c466a832ef3992fd7bd895 100644
--- a/tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php
+++ b/tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php
@@ -11,12 +11,10 @@
namespace Test\AppFramework\Middleware;
-use OC\AppFramework\Http\Request;
use OC\AppFramework\Middleware\SessionMiddleware;
use OC\AppFramework\Utility\ControllerMethodReflector;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\Response;
-use OCP\IConfig;
class SessionMiddlewareTest extends \Test\TestCase {
diff --git a/tests/lib/Authentication/Listeners/RemoteWipeActivityListenerTest.php b/tests/lib/Authentication/Listeners/RemoteWipeActivityListenerTest.php
index 47d1d53a74c99dd109ed1d3fdfb2af2219fba481..4f203b368c0273e655bb5b5d5fe27704e6367a2c 100644
--- a/tests/lib/Authentication/Listeners/RemoteWipeActivityListenerTest.php
+++ b/tests/lib/Authentication/Listeners/RemoteWipeActivityListenerTest.php
@@ -32,7 +32,6 @@ use OCP\Activity\IManager as IActivityManager;
use OCP\EventDispatcher\Event;
use OCP\EventDispatcher\IEventListener;
use OCP\ILogger;
-use OCP\IUser;
use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;
diff --git a/tests/lib/Authentication/Login/ClearLostPasswordTokensCommandTest.php b/tests/lib/Authentication/Login/ClearLostPasswordTokensCommandTest.php
index 0d3b7acfa2d31eac62954695990e11825ca08aaa..9c14c2a3fb2a2da2e57134c285df13f1d1276da9 100644
--- a/tests/lib/Authentication/Login/ClearLostPasswordTokensCommandTest.php
+++ b/tests/lib/Authentication/Login/ClearLostPasswordTokensCommandTest.php
@@ -27,7 +27,6 @@ namespace Test\Authentication\Login;
use lib\Authentication\Login\ALoginCommandTest;
use OC\Authentication\Login\ClearLostPasswordTokensCommand;
-use OC\Authentication\Login\LoginData;
use OCP\IConfig;
use PHPUnit\Framework\MockObject\MockObject;
diff --git a/tests/lib/Authentication/Login/UidLoginCommandTest.php b/tests/lib/Authentication/Login/UidLoginCommandTest.php
index c4dd3f10381d189010710a54f43a0d585aa51530..1d477921677410cd1d9f6fc782824d6923114a53 100644
--- a/tests/lib/Authentication/Login/UidLoginCommandTest.php
+++ b/tests/lib/Authentication/Login/UidLoginCommandTest.php
@@ -25,7 +25,6 @@ declare(strict_types=1);
namespace lib\Authentication\Login;
-use OC\Authentication\Login\UidCheckCommand;
use OC\Authentication\Login\UidLoginCommand;
use OC\User\Manager;
use PHPUnit\Framework\MockObject\MockObject;
diff --git a/tests/lib/Authentication/Token/ManagerTest.php b/tests/lib/Authentication/Token/ManagerTest.php
index 6f64424364e3a5d808a3e80307c33f2c467ec640..8cac7d5be5c1ba3ac1712171d6258cd2a7538a8a 100644
--- a/tests/lib/Authentication/Token/ManagerTest.php
+++ b/tests/lib/Authentication/Token/ManagerTest.php
@@ -29,7 +29,6 @@ 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;
diff --git a/tests/lib/Authentication/TwoFactorAuth/ManagerTest.php b/tests/lib/Authentication/TwoFactorAuth/ManagerTest.php
index b5cea26e73f132eebb4bc6730a58a99ebfa33544..95eff5f08a94c9d6e6ec3d4ff6801ebc298f30eb 100644
--- a/tests/lib/Authentication/TwoFactorAuth/ManagerTest.php
+++ b/tests/lib/Authentication/TwoFactorAuth/ManagerTest.php
@@ -22,7 +22,6 @@
namespace Test\Authentication\TwoFactorAuth;
-use Exception;
use OC;
use OC\Authentication\Token\IProvider as TokenProvider;
use OC\Authentication\TwoFactorAuth\Manager;
diff --git a/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php b/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php
index 60635d488776d1a75ea0a7af5f54afb31c3ee82e..046c541f4d59d4644c1edef34797f844307e6e1c 100644
--- a/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php
+++ b/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php
@@ -25,7 +25,6 @@ declare(strict_types=1);
namespace lib\Authentication\TwoFactorAuth;
-use Exception;
use OC\Authentication\TwoFactorAuth\ProviderLoader;
use OCP\App\IAppManager;
use OCP\Authentication\TwoFactorAuth\IProvider;
diff --git a/tests/lib/Collaboration/Collaborators/SearchResultTest.php b/tests/lib/Collaboration/Collaborators/SearchResultTest.php
index 4367234522696ca090bddb92208bc5238c1ffbd1..3d09a9b632decad0dd275c168d03fd3324cdd63b 100644
--- a/tests/lib/Collaboration/Collaborators/SearchResultTest.php
+++ b/tests/lib/Collaboration/Collaborators/SearchResultTest.php
@@ -27,10 +27,8 @@ namespace Test\Collaboration\Collaborators;
use OC\Collaboration\Collaborators\Search;
use OC\Collaboration\Collaborators\SearchResult;
use OCP\Collaboration\Collaborators\ISearch;
-use OCP\Collaboration\Collaborators\ISearchPlugin;
use OCP\Collaboration\Collaborators\SearchResultType;
use OCP\IContainer;
-use OCP\Share;
use Test\TestCase;
class SearchResultTest extends TestCase {
diff --git a/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php b/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php
index 8df04086ab6c29335f84d49335a5850419342928..31c52ea80e1b5722e9ce48c8f2368ffb28568bdd 100644
--- a/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php
+++ b/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php
@@ -24,7 +24,6 @@
namespace Tests\Contacts\ContactsMenu;
-use Exception;
use OC\App\AppManager;
use OC\Contacts\ContactsMenu\ActionProviderStore;
use OC\Contacts\ContactsMenu\Providers\EMailProvider;
diff --git a/tests/lib/DirectEditing/ManagerTest.php b/tests/lib/DirectEditing/ManagerTest.php
index 737a41425e199bb92880f332d8d41e7c26b92800..004292eb47f735a53d3481e629da51f376f1275d 100644
--- a/tests/lib/DirectEditing/ManagerTest.php
+++ b/tests/lib/DirectEditing/ManagerTest.php
@@ -12,7 +12,6 @@ use OCP\DirectEditing\IEditor;
use OCP\DirectEditing\IToken;
use OCP\Files\Folder;
use OCP\Files\IRootFolder;
-use OCP\Files\NotFoundException;
use OCP\IDBConnection;
use OCP\IL10N;
use OCP\IUserSession;
diff --git a/tests/lib/Encryption/DecryptAllTest.php b/tests/lib/Encryption/DecryptAllTest.php
index e2c76db7ed9bb5cf44890b68d3222e49b13869a7..3365b1fedca4afa6c3a2712134515cd335bd0409 100644
--- a/tests/lib/Encryption/DecryptAllTest.php
+++ b/tests/lib/Encryption/DecryptAllTest.php
@@ -33,7 +33,6 @@ use OCP\UserInterface;
use Symfony\Component\Console\Formatter\OutputFormatterInterface;
use Symfony\Component\Console\Helper\ProgressBar;
use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\ConsoleOutputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Test\TestCase;
diff --git a/tests/lib/Files/Cache/UpdaterLegacyTest.php b/tests/lib/Files/Cache/UpdaterLegacyTest.php
index 6366a8eb7eb6aad7f8e23d8b3231eb7ebe69e0a9..02cb6d79eb134281409488f3630d61076338b298 100644
--- a/tests/lib/Files/Cache/UpdaterLegacyTest.php
+++ b/tests/lib/Files/Cache/UpdaterLegacyTest.php
@@ -9,7 +9,6 @@
namespace Test\Files\Cache;
use OC\Files\Filesystem as Filesystem;
-use OC\Files\Storage\Temporary;
use OC\Files\View;
/**
diff --git a/tests/lib/Files/Cache/UpdaterTest.php b/tests/lib/Files/Cache/UpdaterTest.php
index f8880d0f2a87bcd9b4cd36ee71f0b3c650e14820..4c99b24d9d6cec6f2fbf3f622c77582cfdf3a6f2 100644
--- a/tests/lib/Files/Cache/UpdaterTest.php
+++ b/tests/lib/Files/Cache/UpdaterTest.php
@@ -10,7 +10,6 @@ namespace Test\Files\Cache;
use OC\Files\Filesystem;
use OC\Files\Storage\Temporary;
-use OC\Files\View;
/**
* Class UpdaterTest
diff --git a/tests/lib/Files/EtagTest.php b/tests/lib/Files/EtagTest.php
index 8c6dd1964aba85ee4bd7345b68713975cd532295..39069ce4dfecab71f301a1cb13de8082509d7b17 100644
--- a/tests/lib/Files/EtagTest.php
+++ b/tests/lib/Files/EtagTest.php
@@ -10,7 +10,6 @@ namespace Test\Files;
use OC\Files\Filesystem;
use OCP\EventDispatcher\IEventDispatcher;
-use OCP\Share;
use OCA\Files_Sharing\AppInfo\Application;
/**
diff --git a/tests/lib/Files/FileInfoTest.php b/tests/lib/Files/FileInfoTest.php
index 0037941b6294216bd8493a7f6f5b1cf06718a6dd..fd2b506beb9cb274d3a716ea944847e3635a5697 100644
--- a/tests/lib/Files/FileInfoTest.php
+++ b/tests/lib/Files/FileInfoTest.php
@@ -8,11 +8,9 @@
namespace Test\Files;
-use OC\AllConfig;
use OC\Files\FileInfo;
use OC\Files\Storage\Home;
use OC\Files\Storage\Temporary;
-use OC\User\User;
use OCP\IConfig;
use OCP\IUser;
use Test\TestCase;
diff --git a/tests/lib/Files/Node/FolderTest.php b/tests/lib/Files/Node/FolderTest.php
index 83ebc478370c1ab8778db8957ccd2dbfe48d495a..d2bbf65965ab269a208fd5c4b46bf8500f27e147 100644
--- a/tests/lib/Files/Node/FolderTest.php
+++ b/tests/lib/Files/Node/FolderTest.php
@@ -19,7 +19,6 @@ use OC\Files\Node\Root;
use OC\Files\Storage\Temporary;
use OC\Files\Storage\Wrapper\Jail;
use OC\Files\View;
-use OC\User\User;
use OCP\Files\Mount\IMountPoint;
use OCP\Files\NotFoundException;
use OCP\Files\Storage;
diff --git a/tests/lib/Files/Node/NodeTest.php b/tests/lib/Files/Node/NodeTest.php
index b963a395560d18adfdf619e490f809c05e75a831..adcf43956bed64ff1f7c449435f21b552da8ed7d 100644
--- a/tests/lib/Files/Node/NodeTest.php
+++ b/tests/lib/Files/Node/NodeTest.php
@@ -11,14 +11,11 @@ namespace Test\Files\Node;
use OC\Files\FileInfo;
use OC\Files\Mount\Manager;
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;
diff --git a/tests/lib/Files/Node/RootTest.php b/tests/lib/Files/Node/RootTest.php
index c78bef07627ed4320be91636e953d95bab1d456c..6c006d1cf627aca8500b5c06e204adb32be53225 100644
--- a/tests/lib/Files/Node/RootTest.php
+++ b/tests/lib/Files/Node/RootTest.php
@@ -13,9 +13,7 @@ use OC\Files\FileInfo;
use OC\Files\Mount\Manager;
use OC\Files\Node\Folder;
use OC\Files\View;
-use OCP\IConfig;
use OCP\ILogger;
-use OCP\IURLGenerator;
use OCP\IUser;
use OCP\IUserManager;
diff --git a/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php b/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php
index b8c7b15e039681fd9073cb0e23ed9ea6a37c0a0b..25ce5525361e1e9b7f146a95919d18c3c299444b 100644
--- a/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php
+++ b/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php
@@ -20,7 +20,6 @@
namespace Test\Files\ObjectStore;
-use OC\Files\ObjectStore\ObjectStoreStorage;
use OC\Files\ObjectStore\StorageObjectStore;
use OC\Files\Storage\Temporary;
use OCP\Files\ObjectStore\IObjectStore;
diff --git a/tests/lib/Files/SimpleFS/SimpleFileTest.php b/tests/lib/Files/SimpleFS/SimpleFileTest.php
index 07a7e79c7a36219afefc4cce56d02e4f2ee8af45..8de5cf50aa37650aea068b1c16fc5b32752f7c07 100644
--- a/tests/lib/Files/SimpleFS/SimpleFileTest.php
+++ b/tests/lib/Files/SimpleFS/SimpleFileTest.php
@@ -27,7 +27,6 @@ use OC\Files\SimpleFS\SimpleFile;
use OCP\Files\File;
use OCP\Files\Folder;
use OCP\Files\NotFoundException;
-use OCP\Files\NotPermittedException;
class SimpleFileTest extends \Test\TestCase {
/** @var File|\PHPUnit_Framework_MockObject_MockObject */
diff --git a/tests/lib/Files/SimpleFS/SimpleFolderTest.php b/tests/lib/Files/SimpleFS/SimpleFolderTest.php
index b902cac77cc2bbc9d8998a8c2fe77c162e897abb..4cab1136d8223a0d728e22ddac2ced4ecf2367d7 100644
--- a/tests/lib/Files/SimpleFS/SimpleFolderTest.php
+++ b/tests/lib/Files/SimpleFS/SimpleFolderTest.php
@@ -25,10 +25,7 @@ namespace Test\File\SimpleFS;
use OC\Files\SimpleFS\SimpleFolder;
use OC\Files\Storage\Temporary;
-use OC\Files\View;
-use OCP\Files\File;
use OCP\Files\Folder;
-use OCP\Files\Node;
use OCP\Files\NotFoundException;
use OCP\Files\SimpleFS\ISimpleFile;
use Test\Traits\MountProviderTrait;
diff --git a/tests/lib/Group/GroupTest.php b/tests/lib/Group/GroupTest.php
index fe4421688701970444b13c5c38b557f5d076e65e..b85496620b83b5167beb6a54970e6fc72ae9b619 100644
--- a/tests/lib/Group/GroupTest.php
+++ b/tests/lib/Group/GroupTest.php
@@ -10,8 +10,6 @@
namespace Test\Group;
use OC\User\User;
-use OCP\IConfig;
-use OCP\IURLGenerator;
use OCP\IUser;
use PHPUnit\Framework\MockObject\MockObject;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
diff --git a/tests/lib/InstallerTest.php b/tests/lib/InstallerTest.php
index 4530784e8e2f2270c33af007f6886d8f4aae8684..7a91fcab2708be3c7a480a5017f17ffd8950fb43 100644
--- a/tests/lib/InstallerTest.php
+++ b/tests/lib/InstallerTest.php
@@ -9,7 +9,6 @@
namespace Test;
-use OC\App\AppStore\Bundles\Bundle;
use OC\App\AppStore\Fetcher\AppFetcher;
use OC\Archive\ZIP;
use OC\Installer;
diff --git a/tests/lib/Log/LogFactoryTest.php b/tests/lib/Log/LogFactoryTest.php
index 37dbf1d97b8ed873700b28cc40c70a5b7e26e254..4a3997dbf2097044a8beb83fa72ed7b134c517f5 100644
--- a/tests/lib/Log/LogFactoryTest.php
+++ b/tests/lib/Log/LogFactoryTest.php
@@ -29,7 +29,6 @@ use OC\Log\LogFactory;
use OC\Log\Syslog;
use OC\Log\Systemdlog;
use OC\SystemConfig;
-use OCP\IConfig;
use OCP\IServerContainer;
use Test\TestCase;
diff --git a/tests/lib/Mail/MailerTest.php b/tests/lib/Mail/MailerTest.php
index bc451f833f2f47a858754a0bd74cca60bfa1ae2e..8d169d598c90ee3eb96d4bff16736c13f581f9e2 100644
--- a/tests/lib/Mail/MailerTest.php
+++ b/tests/lib/Mail/MailerTest.php
@@ -22,7 +22,6 @@ use OCP\IL10N;
use OCP\ILogger;
use OCP\IURLGenerator;
use OCP\Mail\Events\BeforeMessageSent;
-use OCP\Mail\IMessage;
use Test\TestCase;
use Swift_SwiftException;
diff --git a/tests/lib/Notification/ManagerTest.php b/tests/lib/Notification/ManagerTest.php
index 6ca83b4b36748ddbf0cb46a5919fb59790a0562f..a8a946311373ceea6c78110baac1f1b69cedeb62 100644
--- a/tests/lib/Notification/ManagerTest.php
+++ b/tests/lib/Notification/ManagerTest.php
@@ -23,10 +23,8 @@ namespace Test\Notification;
use OC\Notification\Manager;
use OCP\ILogger;
-use OCP\Notification\IApp;
use OCP\Notification\IManager;
use OCP\Notification\INotification;
-use OCP\Notification\INotifier;
use OCP\RichObjectStrings\IValidator;
use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;
diff --git a/tests/lib/Preview/BackgroundCleanupJobTest.php b/tests/lib/Preview/BackgroundCleanupJobTest.php
index 09c4a16f87ac3d01d01c7d31d8c8f2f9aec063a3..5536204dd20c28b026eb4658c197c585d30ff6d0 100644
--- a/tests/lib/Preview/BackgroundCleanupJobTest.php
+++ b/tests/lib/Preview/BackgroundCleanupJobTest.php
@@ -25,7 +25,6 @@ namespace Test\Preview;
use OC\Files\AppData\Factory;
use OC\Preview\BackgroundCleanupJob;
use OC\PreviewManager;
-use OC\SystemConfig;
use OCP\Files\IRootFolder;
use OCP\IDBConnection;
use Test\Traits\MountProviderTrait;
diff --git a/tests/lib/Preview/GeneratorTest.php b/tests/lib/Preview/GeneratorTest.php
index f5a3f9a1bf0381ae35aef6ccca422111279f873b..ae84d8eb4b33c7500d4e3d56e25fd8d9c256410e 100644
--- a/tests/lib/Preview/GeneratorTest.php
+++ b/tests/lib/Preview/GeneratorTest.php
@@ -33,7 +33,6 @@ use OCP\Files\SimpleFS\ISimpleFolder;
use OCP\IConfig;
use OCP\IImage;
use OCP\IPreview;
-use OCP\Preview\IProvider;
use OCP\Preview\IProviderV2;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\EventDispatcher\GenericEvent;
diff --git a/tests/lib/Security/CSP/ContentSecurityPolicyManagerTest.php b/tests/lib/Security/CSP/ContentSecurityPolicyManagerTest.php
index 009613fbe3295b9e4c596ad0ecb2247eea7a6faa..c474951314023e20d8dda3be525e57dbd890bc2b 100644
--- a/tests/lib/Security/CSP/ContentSecurityPolicyManagerTest.php
+++ b/tests/lib/Security/CSP/ContentSecurityPolicyManagerTest.php
@@ -25,8 +25,6 @@ namespace Test\Security\CSP;
use OC\Security\CSP\ContentSecurityPolicyManager;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Security\CSP\AddContentSecurityPolicyEvent;
-use PHPUnit\Framework\MockObject\MockObject;
-use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Test\TestCase;
diff --git a/tests/lib/Security/CertificateManagerTest.php b/tests/lib/Security/CertificateManagerTest.php
index f7196373c0002a8076bb57664a027f32ff580fa0..5d8e66bb99b985a9a4f263a968260d6afd7ca7af 100644
--- a/tests/lib/Security/CertificateManagerTest.php
+++ b/tests/lib/Security/CertificateManagerTest.php
@@ -8,7 +8,6 @@
namespace Test\Security;
-use OC\Files\Storage\Temporary;
use OC\Files\View;
use OC\Security\CertificateManager;
use OCP\IConfig;
diff --git a/tests/lib/Security/FeaturePolicy/FeaturePolicyManagerTest.php b/tests/lib/Security/FeaturePolicy/FeaturePolicyManagerTest.php
index 179bd6630ba0bc28f4255e690938eda59f5663df..d2be124a482cd9dac41cd65a7f1f2fe00cac8b21 100644
--- a/tests/lib/Security/FeaturePolicy/FeaturePolicyManagerTest.php
+++ b/tests/lib/Security/FeaturePolicy/FeaturePolicyManagerTest.php
@@ -24,14 +24,10 @@ declare(strict_types=1);
namespace Test\Security\CSP;
-use OC\Security\CSP\ContentSecurityPolicyManager;
use OC\Security\FeaturePolicy\FeaturePolicyManager;
use OCP\AppFramework\Http\FeaturePolicy;
use OCP\EventDispatcher\IEventDispatcher;
-use OCP\Security\CSP\AddContentSecurityPolicyEvent;
use OCP\Security\FeaturePolicy\AddFeaturePolicyEvent;
-use PHPUnit\Framework\MockObject\MockObject;
-use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Test\TestCase;
diff --git a/tests/lib/Security/IdentityProof/ManagerTest.php b/tests/lib/Security/IdentityProof/ManagerTest.php
index aff6d3ed5c73b362b41419c62920944b43ba6ed5..5f96782bae868df96ccb7e02ac246c4321ae7bca 100644
--- a/tests/lib/Security/IdentityProof/ManagerTest.php
+++ b/tests/lib/Security/IdentityProof/ManagerTest.php
@@ -33,7 +33,6 @@ use OCP\ILogger;
use OCP\IUser;
use OCP\Security\ICrypto;
use PHPUnit\Framework\MockObject\MockObject;
-use SebastianBergmann\Comparator\MockObjectComparator;
use Test\TestCase;
class ManagerTest extends TestCase {
diff --git a/tests/lib/Security/RateLimiting/LimiterTest.php b/tests/lib/Security/RateLimiting/LimiterTest.php
index 20b35029050bea14ef4932f6df1bbce299d4f1a3..ea74f476f3ce81a3fcdfb8c7e2b587fc7f03306d 100644
--- a/tests/lib/Security/RateLimiting/LimiterTest.php
+++ b/tests/lib/Security/RateLimiting/LimiterTest.php
@@ -24,10 +24,7 @@ namespace Test\Security\RateLimiting;
use OC\Security\RateLimiting\Backend\IBackend;
use OC\Security\RateLimiting\Limiter;
use OCP\AppFramework\Utility\ITimeFactory;
-use OCP\ICacheFactory;
-use OCP\IRequest;
use OCP\IUser;
-use OCP\IUserSession;
use Test\TestCase;
class LimiterTest extends TestCase {
diff --git a/tests/lib/Settings/ManagerTest.php b/tests/lib/Settings/ManagerTest.php
index f83bf99f3153a59ad5516ef131fb9ff9f43fc32a..a0d341266e8a1f33f49dd06818235896ac4f8f9b 100644
--- a/tests/lib/Settings/ManagerTest.php
+++ b/tests/lib/Settings/ManagerTest.php
@@ -24,7 +24,6 @@
namespace OCA\Settings\Tests\AppInfo;
use OC\Settings\Manager;
-use OCA\Settings\Admin\Sharing;
use OCP\IDBConnection;
use OCP\IL10N;
use OCP\ILogger;
diff --git a/tests/lib/Share/ShareTest.php b/tests/lib/Share/ShareTest.php
index 9b20744edb7604ac5db54b7a722e13335897d52c..c4464efa5dd7216a38f8c31c5098dd8d5a3ea5d2 100644
--- a/tests/lib/Share/ShareTest.php
+++ b/tests/lib/Share/ShareTest.php
@@ -23,7 +23,6 @@ namespace Test\Share;
use OC\Share\Share;
use OCP\IGroup;
use OCP\IGroupManager;
-use OCP\ILogger;
use OCP\IUser;
use OCP\IUserManager;
diff --git a/tests/lib/SystemTag/SystemTagManagerTest.php b/tests/lib/SystemTag/SystemTagManagerTest.php
index 2e9687b0ad3a3f472ff64449a42aa08cbb941405..552e16276292a0ff7c6e9abebf43a24baa37345b 100644
--- a/tests/lib/SystemTag/SystemTagManagerTest.php
+++ b/tests/lib/SystemTag/SystemTagManagerTest.php
@@ -15,7 +15,6 @@ 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;
diff --git a/tests/lib/Template/IconsCacherTest.php b/tests/lib/Template/IconsCacherTest.php
index f7d7f7b57e51b0f39f1547460906981c092adc60..bd7a175862a206b8cc147ec6c165c499060d5fab 100644
--- a/tests/lib/Template/IconsCacherTest.php
+++ b/tests/lib/Template/IconsCacherTest.php
@@ -27,16 +27,10 @@ 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;
-use OCP\Files\NotFoundException;
use OCP\Files\SimpleFS\ISimpleFile;
use OCP\Files\SimpleFS\ISimpleFolder;
-use OCP\ICache;
-use OCP\ICacheFactory;
-use OCP\IConfig;
use OCP\ILogger;
use OCP\IURLGenerator;
diff --git a/tests/lib/Template/JSCombinerTest.php b/tests/lib/Template/JSCombinerTest.php
index 7a2ced517254be195cce1713bbf4d8c2992fa64f..1e8ba5f6a2c6ef81d0467ccdf531bfa855a6efc0 100644
--- a/tests/lib/Template/JSCombinerTest.php
+++ b/tests/lib/Template/JSCombinerTest.php
@@ -23,7 +23,6 @@
namespace Test\Template;
-use function foo\func;
use OC\SystemConfig;
use OC\Template\JSCombiner;
use OCP\Files\IAppData;
diff --git a/tests/lib/Template/SCSSCacherTest.php b/tests/lib/Template/SCSSCacherTest.php
index 446821e62f8cf2361a234dbb74401b6811b647e4..fda899e51b29765cabe1a9521519df6da72e3506 100644
--- a/tests/lib/Template/SCSSCacherTest.php
+++ b/tests/lib/Template/SCSSCacherTest.php
@@ -27,7 +27,6 @@ use OC\Files\AppData\AppData;
use OC\Files\AppData\Factory;
use OC\Template\IconsCacher;
use OC\Template\SCSSCacher;
-use OC_App;
use OCA\Theming\ThemingDefaults;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Files\IAppData;