chore: update composer dependencies, run cs:fix

raimund-schluessler · Dec 27, 2023 · 8993055 · 8993055
1 parent 539a116
commit 8993055
Show file tree

Hide file tree

Showing 32 changed files with 869 additions and 2,859 deletions.
diff --git a/composer.json b/composer.json
@@ -13,8 +13,9 @@
         "php": ">=7.3 <=8.1"
     },
     "require-dev": {
-        "nextcloud/coding-standard": "^1.0.0",
-        "phpunit/phpunit": "^9.5"
+        "nextcloud/coding-standard": "1.1.1",
+        "phpunit/phpunit": "^9.5",
+        "friendsofphp/php-cs-fixer": "3.42.0"
     },
     "config": {
         "platform": {

diff --git a/composer.lock b/composer.lock
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -25,13 +25,13 @@
 
 namespace OCA\Inventory\AppInfo;
 
+use OCA\Inventory\Middleware\ExceptionMiddleware;
+use OCA\Inventory\Search\Provider;
 use OCP\AppFramework\App;
-use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
+use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\Util;
-use OCA\Inventory\Middleware\ExceptionMiddleware;
-use OCA\Inventory\Search\Provider;
 
 class Application extends App implements IBootstrap {
 	public const APP_ID = 'inventory';

diff --git a/lib/Controller/InstanceController.php b/lib/Controller/InstanceController.php
@@ -22,9 +22,9 @@
 
 namespace OCA\Inventory\Controller;
 
+use OCA\Inventory\Service\IteminstanceService;
 use OCP\AppFramework\Controller;
 use OCP\IRequest;
-use OCA\Inventory\Service\IteminstanceService;
 
 class InstanceController extends Controller {
 	private $iteminstanceService;

diff --git a/lib/Controller/ItemsController.php b/lib/Controller/ItemsController.php
@@ -22,9 +22,9 @@
 
 namespace OCA\Inventory\Controller;
 
+use OCA\Inventory\Service\ItemsService;
 use OCP\AppFramework\Controller;
 use OCP\IRequest;
-use OCA\Inventory\Service\ItemsService;
 
 class ItemsController extends Controller {
 	private $itemsService;

diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
@@ -22,11 +22,11 @@
 
 namespace OCA\Inventory\Controller;
 
-use OCP\IRequest;
-use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IConfig;
 use OCP\IInitialStateService;
+use OCP\IRequest;
 
 /**
  * Controller class for main page.

diff --git a/lib/Controller/SearchController.php b/lib/Controller/SearchController.php
@@ -22,9 +22,9 @@
 
 namespace OCA\Inventory\Controller;
 
+use OCA\Inventory\Service\SearchService;
 use OCP\AppFramework\Controller;
 use OCP\IRequest;
-use OCA\Inventory\Service\SearchService;
 
 class SearchController extends Controller {
 	private $searchService;

diff --git a/lib/Db/AttachmentMapper.php b/lib/Db/AttachmentMapper.php
@@ -22,10 +22,10 @@
 
 namespace OCA\Inventory\Db;
 
-use OCP\IDBConnection;
+use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
-use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\IDBConnection;
 
 class AttachmentMapper extends QBMapper {
 	public function __construct(IDBConnection $db) {

diff --git a/lib/Db/FolderMapper.php b/lib/Db/FolderMapper.php
@@ -22,9 +22,9 @@
 
 namespace OCA\Inventory\Db;
 
-use OCP\IDBConnection;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IDBConnection;
 
 class FolderMapper extends QBMapper {
 	public function __construct(IDBConnection $db) {

diff --git a/lib/Db/ItemMapper.php b/lib/Db/ItemMapper.php
@@ -22,9 +22,9 @@
 
 namespace OCA\Inventory\Db;
 
-use OCP\IDBConnection;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IDBConnection;
 
 class ItemMapper extends QBMapper {
 	public function __construct(IDBConnection $db) {

diff --git a/lib/Db/ItemTagsMapper.php b/lib/Db/ItemTagsMapper.php
@@ -22,10 +22,10 @@
 
 namespace OCA\Inventory\Db;
 
-use OCP\IDBConnection;
+use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
-use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\IDBConnection;
 
 class ItemTagsMapper extends QBMapper {
 	public function __construct(IDBConnection $db) {

diff --git a/lib/Db/IteminstanceMapper.php b/lib/Db/IteminstanceMapper.php
@@ -22,9 +22,9 @@
 
 namespace OCA\Inventory\Db;
 
-use OCP\IDBConnection;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IDBConnection;
 
 class IteminstanceMapper extends QBMapper {
 	public function __construct(IDBConnection $db) {

diff --git a/lib/Db/IteminstanceUuidMapper.php b/lib/Db/IteminstanceUuidMapper.php
@@ -22,9 +22,9 @@
 
 namespace OCA\Inventory\Db;
 
-use OCP\IDBConnection;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IDBConnection;
 
 class IteminstanceUuidMapper extends QBMapper {
 	public function __construct(IDBConnection $db) {

diff --git a/lib/Db/ItemparentMapper.php b/lib/Db/ItemparentMapper.php
@@ -22,9 +22,9 @@
 
 namespace OCA\Inventory\Db;
 
-use OCP\IDBConnection;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IDBConnection;
 
 class ItemparentMapper extends QBMapper {
 	public function __construct(IDBConnection $db) {

diff --git a/lib/Db/ItemrelationMapper.php b/lib/Db/ItemrelationMapper.php
@@ -22,9 +22,9 @@
 
 namespace OCA\Inventory\Db;
 
-use OCP\IDBConnection;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IDBConnection;
 
 class ItemrelationMapper extends QBMapper {
 	public function __construct(IDBConnection $db) {

diff --git a/lib/Db/ItemtypeMapper.php b/lib/Db/ItemtypeMapper.php
@@ -22,9 +22,9 @@
 
 namespace OCA\Inventory\Db;
 
-use OCP\IDBConnection;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IDBConnection;
 
 class ItemtypeMapper extends QBMapper {
 	public function __construct(IDBConnection $db) {

diff --git a/lib/Db/PlaceMapper.php b/lib/Db/PlaceMapper.php
@@ -22,9 +22,9 @@
 
 namespace OCA\Inventory\Db;
 
-use OCP\IDBConnection;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IDBConnection;
 
 class PlaceMapper extends QBMapper {
 	public function __construct(IDBConnection $db) {

diff --git a/lib/Db/PlaceUuidMapper.php b/lib/Db/PlaceUuidMapper.php
@@ -22,9 +22,9 @@
 
 namespace OCA\Inventory\Db;
 
-use OCP\IDBConnection;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IDBConnection;
 
 class PlaceUuidMapper extends QBMapper {
 	public function __construct(IDBConnection $db) {

diff --git a/lib/Db/TagMapper.php b/lib/Db/TagMapper.php
@@ -22,10 +22,10 @@
 
 namespace OCA\Inventory\Db;
 
-use OCP\IDBConnection;
+use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
-use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\IDBConnection;
 
 class TagMapper extends QBMapper {
 	public function __construct(IDBConnection $db) {

diff --git a/lib/Middleware/ExceptionMiddleware.php b/lib/Middleware/ExceptionMiddleware.php
@@ -25,11 +25,11 @@
 
 namespace OCA\Inventory\Middleware;
 
-use OCP\AppFramework\Middleware;
+use OCA\Inventory\Exceptions\ConflictException;
+use OCA\Inventory\StatusException;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Http\JSONResponse;
-use OCA\Inventory\StatusException;
-use OCA\Inventory\Exceptions\ConflictException;
+use OCP\AppFramework\Middleware;
 
 class ExceptionMiddleware extends Middleware {
 	/**

diff --git a/lib/Migration/Version000001Date20191015191048.php b/lib/Migration/Version000001Date20191015191048.php
@@ -7,8 +7,8 @@
 use Closure;
 use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
-use OCP\Migration\SimpleMigrationStep;
 use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
 
 /**
  * Auto-generated migration step: Please modify to your needs!

diff --git a/lib/Migration/Version000001Date20191231181200.php b/lib/Migration/Version000001Date20191231181200.php
@@ -7,8 +7,8 @@
 use Closure;
 use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
-use OCP\Migration\SimpleMigrationStep;
 use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
 
 class Version000001Date20191231181200 extends SimpleMigrationStep {
 	/**

diff --git a/lib/Migration/Version000003Date20200216210000.php b/lib/Migration/Version000003Date20200216210000.php
@@ -5,11 +5,11 @@
 namespace OCA\Inventory\Migration;
 
 use Closure;
-use Doctrine\DBAL\Types\Types;
 use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
-use OCP\Migration\SimpleMigrationStep;
 use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
 
 class Version000003Date20200216210000 extends SimpleMigrationStep {
 	/**

diff --git a/lib/Migration/Version000004Date20200401210000.php b/lib/Migration/Version000004Date20200401210000.php
@@ -9,8 +9,8 @@
 use OCP\DB\ISchemaWrapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
-use OCP\Migration\SimpleMigrationStep;
 use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
 
 class Version000004Date20200401210000 extends SimpleMigrationStep {
 	/** @var IDBConnection */

diff --git a/lib/Migration/Version000005Date20211017220000.php b/lib/Migration/Version000005Date20211017220000.php
@@ -8,8 +8,8 @@
 use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
 use OCP\IDBConnection;
-use OCP\Migration\SimpleMigrationStep;
 use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
 
 class Version000005Date20211017220000 extends SimpleMigrationStep {
 	/** @var IDBConnection */

diff --git a/lib/Search/Provider.php b/lib/Search/Provider.php
@@ -26,12 +26,12 @@
 namespace OCA\Inventory\Search;
 
 use OCA\Inventory\AppInfo\Application;
-use OCA\Inventory\Service\ItemsService;
 use OCA\Inventory\Service\FoldersService;
+use OCA\Inventory\Service\ItemsService;
 use OCP\App\IAppManager;
 use OCP\IL10N;
-use OCP\IUser;
 use OCP\IURLGenerator;
+use OCP\IUser;
 use OCP\Search\IProvider;
 use OCP\Search\ISearchQuery;
 use OCP\Search\SearchResult;
@@ -62,10 +62,10 @@ class Provider implements IProvider {
 	 * @param CalDavBackend $backend
 	 */
 	public function __construct(IAppManager $appManager,
-								ItemsService $itemsService,
-								FoldersService $foldersService,
-								IL10N $l10n,
-								IURLGenerator $urlGenerator) {
+		ItemsService $itemsService,
+		FoldersService $foldersService,
+		IL10N $l10n,
+		IURLGenerator $urlGenerator) {
 		$this->appManager = $appManager;
 		$this->itemsService = $itemsService;
 		$this->foldersService = $foldersService;

diff --git a/lib/Service/AttachmentService.php b/lib/Service/AttachmentService.php
@@ -25,14 +25,14 @@
 
 namespace OCA\Inventory\Service;
 
+use OCA\Inventory\BadRequestException;
 use OCA\Inventory\Db\Attachment;
 use OCA\Inventory\Db\AttachmentMapper;
-use OCA\Inventory\Storage\AttachmentStorage;
-use OCA\Inventory\BadRequestException;
 use OCA\Inventory\InvalidAttachmentType;
 use OCA\Inventory\NoPermissionException;
 use OCA\Inventory\NotFoundException;
 use OCA\Inventory\StatusException;
+use OCA\Inventory\Storage\AttachmentStorage;
 use OCP\AppFramework\Http\Response;
 use OCP\IConfig;
 

diff --git a/lib/Service/FoldersService.php b/lib/Service/FoldersService.php
@@ -22,12 +22,12 @@
 
 namespace OCA\Inventory\Service;
 
-use OCP\IConfig;
+use OCA\Inventory\BadRequestException;
 use OCA\Inventory\Db\Folder;
 use OCA\Inventory\Db\FolderMapper;
 use OCA\Inventory\Db\ItemMapper;
-use OCA\Inventory\BadRequestException;
 use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\IConfig;
 
 class FoldersService {
 	private $userId;

diff --git a/lib/Service/IteminstanceService.php b/lib/Service/IteminstanceService.php
@@ -22,10 +22,10 @@
 
 namespace OCA\Inventory\Service;
 
+use OCA\Inventory\BadRequestException;
 use OCA\Inventory\Db\IteminstanceMapper;
-use OCA\Inventory\Db\PlaceMapper;
 use OCA\Inventory\Db\IteminstanceUuidMapper;
-use OCA\Inventory\BadRequestException;
+use OCA\Inventory\Db\PlaceMapper;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\IL10N;
 
@@ -44,7 +44,7 @@ class IteminstanceService {
 	private $iteminstanceUuidMapper;
 
 	public function __construct($userId, $AppName, PlacesService $placesService, IL10N $l10n, IteminstanceMapper $iteminstanceMapper,
-	PlaceMapper $placeMapper, IteminstanceUuidMapper $iteminstanceUuidMapper) {
+		PlaceMapper $placeMapper, IteminstanceUuidMapper $iteminstanceUuidMapper) {
 		$this->userId = $userId;
 		$this->appName = $AppName;
 		$this->placesService = $placesService;

diff --git a/lib/Service/ItemsService.php b/lib/Service/ItemsService.php
@@ -22,20 +22,20 @@
 
 namespace OCA\Inventory\Service;
 
-use OCA\Inventory\Db\TagMapper;
+use OCA\Inventory\BadRequestException;
 use OCA\Inventory\Db\FolderMapper;
 use OCA\Inventory\Db\Item;
-use OCA\Inventory\Db\ItemTagsMapper;
 use OCA\Inventory\Db\IteminstanceMapper;
-use OCA\Inventory\Db\ItemparentMapper;
 use OCA\Inventory\Db\ItemMapper;
+use OCA\Inventory\Db\ItemparentMapper;
 use OCA\Inventory\Db\ItemrelationMapper;
+use OCA\Inventory\Db\ItemTagsMapper;
 use OCA\Inventory\Db\ItemtypeMapper;
 use OCA\Inventory\Db\PlaceMapper;
+use OCA\Inventory\Db\TagMapper;
 use OCA\Inventory\Storage\AttachmentStorage;
-use OCA\Inventory\BadRequestException;
-use OCP\IL10N;
 use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\IL10N;
 
 class ItemsService {
 	private $userId;