Merge pull request #6339 from nextcloud/dependabot/composer/nextcloud/coding-standard-1.3.1

This commit is contained in:
dependabot[bot]
2024-09-26 16:07:56 +00:00
committed by GitHub
45 changed files with 126 additions and 77 deletions

71
composer.lock generated
View File

@@ -338,6 +338,52 @@
],
"time": "2022-12-30T00:15:36+00:00"
},
{
"name": "kubawerlos/php-cs-fixer-custom-fixers",
"version": "v3.22.0",
"source": {
"type": "git",
"url": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers.git",
"reference": "8701394f0c7cd450ac4fa577d24589122c1d5d5e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/kubawerlos/php-cs-fixer-custom-fixers/zipball/8701394f0c7cd450ac4fa577d24589122c1d5d5e",
"reference": "8701394f0c7cd450ac4fa577d24589122c1d5d5e",
"shasum": ""
},
"require": {
"ext-filter": "*",
"ext-tokenizer": "*",
"friendsofphp/php-cs-fixer": "^3.61.1",
"php": "^7.4 || ^8.0"
},
"require-dev": {
"phpunit/phpunit": "^9.6.4 || ^10.5.29"
},
"type": "library",
"autoload": {
"psr-4": {
"PhpCsFixerCustomFixers\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Kuba Werłos",
"email": "werlos@gmail.com"
}
],
"description": "A set of custom fixers for PHP CS Fixer",
"support": {
"issues": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/issues",
"source": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/tree/v3.22.0"
},
"time": "2024-08-16T20:44:35+00:00"
},
{
"name": "myclabs/deep-copy",
"version": "1.11.1",
@@ -399,19 +445,20 @@
},
{
"name": "nextcloud/coding-standard",
"version": "v1.2.3",
"version": "v1.3.1",
"source": {
"type": "git",
"url": "https://github.com/nextcloud/coding-standard.git",
"reference": "bc9c53a5306114b60c4363057aff9c2ed10a54da"
"reference": "e88acb0df6217b808d1632286ddfec9267a102e4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/bc9c53a5306114b60c4363057aff9c2ed10a54da",
"reference": "bc9c53a5306114b60c4363057aff9c2ed10a54da",
"url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/e88acb0df6217b808d1632286ddfec9267a102e4",
"reference": "e88acb0df6217b808d1632286ddfec9267a102e4",
"shasum": ""
},
"require": {
"kubawerlos/php-cs-fixer-custom-fixers": "^3.22",
"php": "^7.3|^8.0",
"php-cs-fixer/shim": "^3.17"
},
@@ -434,9 +481,9 @@
"description": "Nextcloud coding standards for the php cs fixer",
"support": {
"issues": "https://github.com/nextcloud/coding-standard/issues",
"source": "https://github.com/nextcloud/coding-standard/tree/v1.2.3"
"source": "https://github.com/nextcloud/coding-standard/tree/v1.3.1"
},
"time": "2024-08-23T14:32:32+00:00"
"time": "2024-09-19T09:07:10+00:00"
},
{
"name": "nextcloud/ocp",
@@ -661,16 +708,16 @@
},
{
"name": "php-cs-fixer/shim",
"version": "v3.62.0",
"version": "v3.64.0",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/shim.git",
"reference": "7a91d5ce45c486f5b445d95901228507a02f60ae"
"reference": "81ccfd24baf3a10810dab1152c403981a790b837"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/7a91d5ce45c486f5b445d95901228507a02f60ae",
"reference": "7a91d5ce45c486f5b445d95901228507a02f60ae",
"url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/81ccfd24baf3a10810dab1152c403981a790b837",
"reference": "81ccfd24baf3a10810dab1152c403981a790b837",
"shasum": ""
},
"require": {
@@ -707,9 +754,9 @@
"description": "A tool to automatically fix PHP code style",
"support": {
"issues": "https://github.com/PHP-CS-Fixer/shim/issues",
"source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.62.0"
"source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.64.0"
},
"time": "2024-08-07T17:03:46+00:00"
"time": "2024-08-30T23:10:11+00:00"
},
{
"name": "phpunit/php-code-coverage",

View File

@@ -100,7 +100,7 @@ class ActivityManager {
StackMapper $stackMapper,
AclMapper $aclMapper,
IFactory $l10nFactory,
?string $userId
?string $userId,
) {
$this->manager = $manager;
$this->permissionService = $permissionsService;

View File

@@ -15,7 +15,7 @@ class Filter implements \OCP\Activity\IFilter {
public function __construct(
IL10N $l10n,
IURLGenerator $urlGenerator
IURLGenerator $urlGenerator,
) {
$this->l10n = $l10n;
$this->urlGenerator = $urlGenerator;

View File

@@ -15,7 +15,7 @@ use Symfony\Component\Console\Output\OutputInterface;
class BoardImport extends Command {
public function __construct(
private BoardImportCommandService $boardImportCommandService
private BoardImportCommandService $boardImportCommandService,
) {
parent::__construct();
}

View File

@@ -21,7 +21,8 @@ use OCP\AppFramework\OCSController;
use OCP\IRequest;
class SessionController extends OCSController {
public function __construct($appName,
public function __construct(
$appName,
IRequest $request,
private SessionService $sessionService,
private PermissionService $permissionService,

View File

@@ -20,7 +20,7 @@ class ScheduledNotifications extends Job {
ITimeFactory $time,
protected CardMapper $cardMapper,
protected NotificationHelper $notificationHelper,
protected LoggerInterface $logger
protected LoggerInterface $logger,
) {
parent::__construct($time);
}

View File

@@ -32,7 +32,7 @@ class DeckCalendarBackend {
public function __construct(
BoardService $boardService, StackService $stackService, CardService $cardService, PermissionService $permissionService,
BoardMapper $boardMapper
BoardMapper $boardMapper,
) {
$this->boardService = $boardService;
$this->stackService = $stackService;

View File

@@ -31,7 +31,7 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
private IUserManager $userManager,
private IGroupManager $groupManager,
private CirclesService $circlesService,
private LoggerInterface $logger
private LoggerInterface $logger,
) {
parent::__construct($db, 'deck_boards', Board::class);

View File

@@ -45,7 +45,7 @@ class CardMapper extends QBMapper implements IPermissionMapper {
IManager $notificationManager,
ICacheFactory $cacheFactory,
$databaseType = 'sqlite3',
$database4ByteSupport = true
$database4ByteSupport = true,
) {
parent::__construct($db, 'deck_cards', Card::class);
$this->labelMapper = $labelMapper;

View File

@@ -24,7 +24,7 @@ class ChangeHelper {
IDBConnection $db,
ICacheFactory $cacheFactory,
IRequest $request,
?string $userId
?string $userId,
) {
$this->db = $db;
$this->cache = $cacheFactory->createDistributed('deck_changes');

View File

@@ -24,7 +24,7 @@ class StackMapper extends DeckMapper implements IPermissionMapper {
public function __construct(
IDBConnection $db,
CardMapper $cardMapper,
ICacheFactory $cacheFactory
ICacheFactory $cacheFactory,
) {
parent::__construct($db, 'deck_stacks', Stack::class);
$this->cardMapper = $cardMapper;

View File

@@ -38,7 +38,7 @@ class LiveUpdateListener implements IEventListener {
IRequest $request,
LoggerInterface $logger,
SessionService $sessionService,
StackMapper $stackMapper
StackMapper $stackMapper,
) {
try {
$this->queue = $container->get(IQueue::class);

View File

@@ -58,7 +58,7 @@ class NotificationHelper {
IConfig $config,
IManager $notificationManager,
IGroupManager $groupManager,
$userId
$userId,
) {
$this->cardMapper = $cardMapper;
$this->boardMapper = $boardMapper;

View File

@@ -36,7 +36,7 @@ class Notifier implements INotifier {
IUserManager $userManager,
CardMapper $cardMapper,
StackMapper $stackMapper,
BoardMapper $boardMapper
BoardMapper $boardMapper,
) {
$this->l10nFactory = $l10nFactory;
$this->url = $url;

View File

@@ -47,7 +47,7 @@ class DeckProvider implements IFullTextSearchProvider {
* @param FullTextSearchService $fullTextSearchService
*/
public function __construct(
IL10N $l10n, IUrlGenerator $urlGenerator, FullTextSearchService $fullTextSearchService
IL10N $l10n, IUrlGenerator $urlGenerator, FullTextSearchService $fullTextSearchService,
) {
$this->l10n = $l10n;
$this->urlGenerator = $urlGenerator;

View File

@@ -17,7 +17,8 @@ class CreateCardReferenceProvider extends ADiscoverableReferenceProvider {
public function __construct(
private IL10N $l10n,
private IURLGenerator $urlGenerator,
private ?string $userId) {
private ?string $userId,
) {
}
/**

View File

@@ -25,7 +25,7 @@ class CardCommentProvider implements IProvider {
public function __construct(
SearchService $searchService,
IL10N $l10n
IL10N $l10n,
) {
$this->searchService = $searchService;
$this->l10n = $l10n;

View File

@@ -27,7 +27,7 @@ class DeckProvider implements IProvider {
public function __construct(
SearchService $searchService,
IURLGenerator $urlGenerator,
IL10N $l10n
IL10N $l10n,
) {
$this->l10n = $l10n;
$this->searchService = $searchService;

View File

@@ -76,7 +76,7 @@ class AssignmentService {
ChangeHelper $changeHelper,
IEventDispatcher $eventDispatcher,
AssignmentServiceValidator $assignmentServiceValidator,
$userId
$userId,
) {
$this->assignmentServiceValidator = $assignmentServiceValidator;
$this->permissionService = $permissionService;

View File

@@ -58,7 +58,7 @@ class AttachmentService {
$userId,
IL10N $l10n,
ActivityManager $activityManager,
AttachmentServiceValidator $attachmentServiceValidator
AttachmentServiceValidator $attachmentServiceValidator,
) {
$this->attachmentMapper = $attachmentMapper;
$this->cardMapper = $cardMapper;

View File

@@ -89,7 +89,7 @@ class BoardService {
IDBConnection $connection,
BoardServiceValidator $boardServiceValidator,
SessionMapper $sessionMapper,
?string $userId
?string $userId,
) {
$this->boardMapper = $boardMapper;
$this->stackMapper = $stackMapper;

View File

@@ -77,7 +77,7 @@ class CardService {
LoggerInterface $logger,
IRequest $request,
CardServiceValidator $cardServiceValidator,
?string $userId
?string $userId,
) {
$this->cardMapper = $cardMapper;
$this->stackMapper = $stackMapper;

View File

@@ -29,7 +29,7 @@ class ConfigService {
public function __construct(
IConfig $config,
IGroupManager $groupManager
IGroupManager $groupManager,
) {
$this->groupManager = $groupManager;
$this->config = $config;

View File

@@ -27,7 +27,7 @@ class DefaultBoardService {
BoardService $boardService,
StackService $stackService,
CardService $cardService,
IConfig $config
IConfig $config,
) {
$this->boardService = $boardService;
$this->stackService = $stackService;

View File

@@ -33,7 +33,7 @@ class FileService implements IAttachmentService {
private IRootFolder $rootFolder,
private IConfig $config,
private AttachmentMapper $attachmentMapper,
private IMimeTypeDetector $mimeTypeDetector
private IMimeTypeDetector $mimeTypeDetector,
) {
}

View File

@@ -55,7 +55,7 @@ class FilesAppService implements IAttachmentService, ICustomAttachmentService {
CardMapper $cardMapper,
LoggerInterface $logger,
IDBConnection $connection,
?string $userId
?string $userId,
) {
$this->request = $request;
$this->l10n = $l10n;

View File

@@ -39,7 +39,7 @@ class FullTextSearchService {
private $cardMapper;
public function __construct(
BoardMapper $boardMapper, StackMapper $stackMapper, CardMapper $cardMapper
BoardMapper $boardMapper, StackMapper $stackMapper, CardMapper $cardMapper,
) {
$this->boardMapper = $boardMapper;
$this->stackMapper = $stackMapper;

View File

@@ -70,7 +70,7 @@ class BoardImportService {
private CardMapper $cardMapper,
private ICommentsManager $commentsManager,
private IEventDispatcher $eventDispatcher,
private LoggerInterface $logger
private LoggerInterface $logger,
) {
$this->board = new Board();
$this->disableCommentsEvents();

View File

@@ -31,7 +31,7 @@ class TrelloApiService extends TrelloJsonService {
IURLGenerator $urlGenerator,
IL10N $l10n,
LoggerInterface $logger,
IClientService $httpClientService
IClientService $httpClientService,
) {
parent::__construct($userManager, $urlGenerator, $l10n);
$this->logger = $logger;

View File

@@ -37,7 +37,7 @@ class TrelloJsonService extends ABoardImportService {
public function __construct(
IUserManager $userManager,
IURLGenerator $urlGenerator,
IL10N $l10n
IL10N $l10n,
) {
$this->userManager = $userManager;
$this->urlGenerator = $urlGenerator;

View File

@@ -32,7 +32,7 @@ class LabelService {
PermissionService $permissionService,
BoardService $boardService,
ChangeHelper $changeHelper,
LabelServiceValidator $labelServiceValidator
LabelServiceValidator $labelServiceValidator,
) {
$this->labelMapper = $labelMapper;
$this->permissionService = $permissionService;

View File

@@ -36,7 +36,7 @@ class OverviewService {
AssignmentMapper $assignedUsersMapper,
IUserManager $userManager,
ICommentsManager $commentsManager,
AttachmentService $attachmentService
AttachmentService $attachmentService,
) {
$this->cardService = $cardService;
$this->boardMapper = $boardMapper;

View File

@@ -40,7 +40,7 @@ class PermissionService {
private IGroupManager $groupManager,
private IManager $shareManager,
private IConfig $config,
private ?string $userId
private ?string $userId,
) {
$this->boardCache = new CappedMemoryCache();
$this->permissionCache = new CappedMemoryCache();

View File

@@ -46,7 +46,7 @@ class SearchService {
FilterStringParser $filterStringParser,
IUserManager $userManager,
IL10N $l10n,
IURLGenerator $urlGenerator
IURLGenerator $urlGenerator,
) {
$this->boardService = $boardService;
$this->cardMapper = $cardMapper;

View File

@@ -33,7 +33,7 @@ class SessionService {
ISecureRandom $secureRandom,
ITimeFactory $timeFactory,
$userId,
IEventDispatcher $eventDispatcher
IEventDispatcher $eventDispatcher,
) {
$this->sessionMapper = $sessionMapper;
$this->secureRandom = $secureRandom;

View File

@@ -56,7 +56,7 @@ class StackService {
ChangeHelper $changeHelper,
LoggerInterface $logger,
IEventDispatcher $eventDispatcher,
StackServiceValidator $stackServiceValidator
StackServiceValidator $stackServiceValidator,
) {
$this->stackMapper = $stackMapper;
$this->boardMapper = $boardMapper;

View File

@@ -69,7 +69,7 @@ class DeckShareProvider implements \OCP\Share\IShareProvider {
IL10N $l,
ITimeFactory $timeFactory,
IMimeTypeLoader $mimeTypeLoader,
?string $userId
?string $userId,
) {
$this->dbConnection = $connection;
$this->shareManager = $shareManager;
@@ -174,7 +174,7 @@ class DeckShareProvider implements \OCP\Share\IShareProvider {
string $target,
int $permissions,
string $token,
?\DateTime $expirationDate
?\DateTime $expirationDate,
): int {
$qb = $this->dbConnection->getQueryBuilder();
$qb->insert('share')