From: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 19 Oct 2024 02:46:25 +0000 (+0000) Subject: chore(deps): Bump nextcloud/coding-standard in /vendor-bin/cs-fixer X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fheads%2Fdependabot%2Fcomposer%2Fvendor-bin%2Fcs-fixer%2Fnextcloud%2Fcoding-standard-1.3.2;p=nextcloud-server.git chore(deps): Bump nextcloud/coding-standard in /vendor-bin/cs-fixer Bumps [nextcloud/coding-standard](https://github.com/nextcloud/coding-standard) from 1.3.1 to 1.3.2. - [Release notes](https://github.com/nextcloud/coding-standard/releases) - [Changelog](https://github.com/nextcloud/coding-standard/blob/master/CHANGELOG.md) - [Commits](https://github.com/nextcloud/coding-standard/compare/v1.3.1...v1.3.2) --- updated-dependencies: - dependency-name: nextcloud/coding-standard dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: provokateurin --- diff --git a/apps/dav/lib/CalDAV/BirthdayService.php b/apps/dav/lib/CalDAV/BirthdayService.php index 9a717b96d63..00b27219cbd 100644 --- a/apps/dav/lib/CalDAV/BirthdayService.php +++ b/apps/dav/lib/CalDAV/BirthdayService.php @@ -139,9 +139,9 @@ class BirthdayService { * @return VCalendar|null * @throws InvalidDataException */ - public function buildDateFromContact(string $cardData, - string $dateField, - string $postfix, + public function buildDateFromContact(string $cardData, + string $dateField, + string $postfix, ?string $reminderOffset):?VCalendar { if (empty($cardData)) { return null; diff --git a/apps/dav/lib/CalDAV/Reminder/INotificationProvider.php b/apps/dav/lib/CalDAV/Reminder/INotificationProvider.php index 1428eb9c46c..31d60f1531d 100644 --- a/apps/dav/lib/CalDAV/Reminder/INotificationProvider.php +++ b/apps/dav/lib/CalDAV/Reminder/INotificationProvider.php @@ -29,6 +29,6 @@ interface INotificationProvider { */ public function send(VEvent $vevent, ?string $calendarDisplayName, - array $principalEmailAddresses, + array $principalEmailAddresses, array $users = []): void; } diff --git a/apps/files/lib/BackgroundJob/ScanFiles.php b/apps/files/lib/BackgroundJob/ScanFiles.php index 88b45033255..1d72ed6cde4 100644 --- a/apps/files/lib/BackgroundJob/ScanFiles.php +++ b/apps/files/lib/BackgroundJob/ScanFiles.php @@ -33,11 +33,11 @@ class ScanFiles extends TimedJob { public const USERS_PER_SESSION = 500; public function __construct( - IConfig $config, + IConfig $config, IEventDispatcher $dispatcher, - LoggerInterface $logger, - IDBConnection $connection, - ITimeFactory $time, + LoggerInterface $logger, + IDBConnection $connection, + ITimeFactory $time, ) { parent::__construct($time); // Run once per 10 minutes diff --git a/apps/files_sharing/lib/External/Manager.php b/apps/files_sharing/lib/External/Manager.php index 58e24a96338..e9383b9abc7 100644 --- a/apps/files_sharing/lib/External/Manager.php +++ b/apps/files_sharing/lib/External/Manager.php @@ -73,19 +73,19 @@ class Manager { private $logger; public function __construct( - IDBConnection $connection, - \OC\Files\Mount\Manager $mountManager, - IStorageFactory $storageLoader, - IClientService $clientService, - IManager $notificationManager, - IDiscoveryService $discoveryService, + IDBConnection $connection, + \OC\Files\Mount\Manager $mountManager, + IStorageFactory $storageLoader, + IClientService $clientService, + IManager $notificationManager, + IDiscoveryService $discoveryService, ICloudFederationProviderManager $cloudFederationProviderManager, - ICloudFederationFactory $cloudFederationFactory, - IGroupManager $groupManager, - IUserManager $userManager, - IUserSession $userSession, - IEventDispatcher $eventDispatcher, - LoggerInterface $logger, + ICloudFederationFactory $cloudFederationFactory, + IGroupManager $groupManager, + IUserManager $userManager, + IUserSession $userSession, + IEventDispatcher $eventDispatcher, + LoggerInterface $logger, ) { $user = $userSession->getUser(); $this->connection = $connection; diff --git a/apps/files_sharing/lib/SharesReminderJob.php b/apps/files_sharing/lib/SharesReminderJob.php index b3b3590ec09..854ad196d6b 100644 --- a/apps/files_sharing/lib/SharesReminderJob.php +++ b/apps/files_sharing/lib/SharesReminderJob.php @@ -38,16 +38,16 @@ class SharesReminderJob extends TimedJob { private int $folderMimeTypeId; public function __construct( - ITimeFactory $time, - private readonly IDBConnection $db, - private readonly IManager $shareManager, - private readonly IUserManager $userManager, + ITimeFactory $time, + private readonly IDBConnection $db, + private readonly IManager $shareManager, + private readonly IUserManager $userManager, private readonly LoggerInterface $logger, - private readonly IURLGenerator $urlGenerator, - private readonly IFactory $l10nFactory, - private readonly IMailer $mailer, - private readonly Defaults $defaults, - IMimeTypeLoader $mimeTypeLoader, + private readonly IURLGenerator $urlGenerator, + private readonly IFactory $l10nFactory, + private readonly IMailer $mailer, + private readonly Defaults $defaults, + IMimeTypeLoader $mimeTypeLoader, ) { parent::__construct($time); $this->setInterval(60 * 60); diff --git a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php index 84234660665..7ae010b026f 100644 --- a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php +++ b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php @@ -60,7 +60,7 @@ class ShareAPIControllerTest extends TestCase { private IRootFolder|\PHPUnit\Framework\MockObject\MockObject $rootFolder; private IURLGenerator|\PHPUnit\Framework\MockObject\MockObject $urlGenerator; private string|\PHPUnit\Framework\MockObject\MockObject $currentUser; - private ShareAPIController $ocs; + private ShareAPIController $ocs; private IL10N|\PHPUnit\Framework\MockObject\MockObject $l; private IConfig|\PHPUnit\Framework\MockObject\MockObject $config; private IAppManager|\PHPUnit\Framework\MockObject\MockObject $appManager; diff --git a/apps/files_trashbin/lib/Storage.php b/apps/files_trashbin/lib/Storage.php index c6f90b175b9..5703f3be527 100644 --- a/apps/files_trashbin/lib/Storage.php +++ b/apps/files_trashbin/lib/Storage.php @@ -20,7 +20,7 @@ use Psr\Log\LoggerInterface; class Storage extends Wrapper { private string $mountPoint; - private IUserManager$userManager; + private IUserManager $userManager; private LoggerInterface $logger; private IEventDispatcher $eventDispatcher; private IRootFolder $rootFolder; diff --git a/apps/settings/tests/Controller/UsersControllerTest.php b/apps/settings/tests/Controller/UsersControllerTest.php index 80eb252f988..96823e5ceed 100644 --- a/apps/settings/tests/Controller/UsersControllerTest.php +++ b/apps/settings/tests/Controller/UsersControllerTest.php @@ -791,7 +791,7 @@ class UsersControllerTest extends \Test\TestCase { array $data, string $oldEmailAddress, string $oldDisplayName, - bool $setDisplayNameResult, + bool $setDisplayNameResult, bool $canChangeEmail, ): void { $this->expectException(ForbiddenException::class); diff --git a/apps/systemtags/lib/Search/TagSearchProvider.php b/apps/systemtags/lib/Search/TagSearchProvider.php index 6e6f587d366..d09befd194e 100644 --- a/apps/systemtags/lib/Search/TagSearchProvider.php +++ b/apps/systemtags/lib/Search/TagSearchProvider.php @@ -47,10 +47,10 @@ class TagSearchProvider implements IProvider { private ISystemTagManager $tagManager; public function __construct( - IL10N $l10n, - IURLGenerator $urlGenerator, + IL10N $l10n, + IURLGenerator $urlGenerator, IMimeTypeDetector $mimeTypeDetector, - IRootFolder $rootFolder, + IRootFolder $rootFolder, ISystemTagObjectMapper $objectMapper, ISystemTagManager $tagManager, ) { diff --git a/core/Command/Preview/Cleanup.php b/core/Command/Preview/Cleanup.php index 2049bb98bc4..dad981a5243 100644 --- a/core/Command/Preview/Cleanup.php +++ b/core/Command/Preview/Cleanup.php @@ -21,7 +21,7 @@ use Symfony\Component\Console\Output\OutputInterface; class Cleanup extends Base { public function __construct( - private IRootFolder $rootFolder, + private IRootFolder $rootFolder, private LoggerInterface $logger, ) { parent::__construct(); diff --git a/core/Controller/TaskProcessingApiController.php b/core/Controller/TaskProcessingApiController.php index cc685d34bf0..7ee5e7068af 100644 --- a/core/Controller/TaskProcessingApiController.php +++ b/core/Controller/TaskProcessingApiController.php @@ -46,13 +46,13 @@ use RuntimeException; */ class TaskProcessingApiController extends \OCP\AppFramework\OCSController { public function __construct( - string $appName, - IRequest $request, - private IManager $taskProcessingManager, - private IL10N $l, - private ?string $userId, + string $appName, + IRequest $request, + private IManager $taskProcessingManager, + private IL10N $l, + private ?string $userId, private IRootFolder $rootFolder, - private IAppData $appData, + private IAppData $appData, ) { parent::__construct($appName, $request); } diff --git a/core/Controller/TextProcessingApiController.php b/core/Controller/TextProcessingApiController.php index e62389dee11..a0acf193289 100644 --- a/core/Controller/TextProcessingApiController.php +++ b/core/Controller/TextProcessingApiController.php @@ -38,13 +38,13 @@ use Psr\Log\LoggerInterface; */ class TextProcessingApiController extends \OCP\AppFramework\OCSController { public function __construct( - string $appName, - IRequest $request, - private IManager $textProcessingManager, - private IL10N $l, - private ?string $userId, + string $appName, + IRequest $request, + private IManager $textProcessingManager, + private IL10N $l, + private ?string $userId, private ContainerInterface $container, - private LoggerInterface $logger, + private LoggerInterface $logger, ) { parent::__construct($appName, $request); } diff --git a/lib/composer/composer/InstalledVersions.php b/lib/composer/composer/InstalledVersions.php index cee8310f347..51e734a774b 100644 --- a/lib/composer/composer/InstalledVersions.php +++ b/lib/composer/composer/InstalledVersions.php @@ -255,7 +255,7 @@ class InstalledVersions /** * Returns the raw installed.php data for custom implementations * - * @deprecated 23.0.0 Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect. + * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect. * @return array[] * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} */ diff --git a/lib/composer/composer/installed.json b/lib/composer/composer/installed.json index f20a6c47c6d..13ea12dca2a 100644 --- a/lib/composer/composer/installed.json +++ b/lib/composer/composer/installed.json @@ -1,5 +1,68 @@ { - "packages": [], - "dev": false, - "dev-package-names": [] + "packages": [ + { + "name": "bamarni/composer-bin-plugin", + "version": "1.8.2", + "version_normalized": "1.8.2.0", + "source": { + "type": "git", + "url": "https://github.com/bamarni/composer-bin-plugin.git", + "reference": "92fd7b1e6e9cdae19b0d57369d8ad31a37b6a880" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/bamarni/composer-bin-plugin/zipball/92fd7b1e6e9cdae19b0d57369d8ad31a37b6a880", + "reference": "92fd7b1e6e9cdae19b0d57369d8ad31a37b6a880", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^2.0", + "php": "^7.2.5 || ^8.0" + }, + "require-dev": { + "composer/composer": "^2.0", + "ext-json": "*", + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-phpunit": "^1.1", + "phpunit/phpunit": "^8.5 || ^9.5", + "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", + "symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", + "symfony/process": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0" + }, + "time": "2022-10-31T08:38:03+00:00", + "type": "composer-plugin", + "extra": { + "class": "Bamarni\\Composer\\Bin\\BamarniBinPlugin" + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Bamarni\\Composer\\Bin\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "No conflicts for your bin dependencies", + "keywords": [ + "composer", + "conflict", + "dependency", + "executable", + "isolation", + "tool" + ], + "support": { + "issues": "https://github.com/bamarni/composer-bin-plugin/issues", + "source": "https://github.com/bamarni/composer-bin-plugin/tree/1.8.2" + }, + "install-path": "../bamarni/composer-bin-plugin" + } + ], + "dev": true, + "dev-package-names": [ + "bamarni/composer-bin-plugin" + ] } diff --git a/lib/composer/composer/installed.php b/lib/composer/composer/installed.php index 5fe8d8f7f49..3d7c94e736c 100644 --- a/lib/composer/composer/installed.php +++ b/lib/composer/composer/installed.php @@ -3,21 +3,30 @@ 'name' => '__root__', 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => 'b99276fdfbac6b1ff243807b8b5b8161f0f67a24', + 'reference' => 'd481e4c575c189d6ddb128740892dd54a7c7ed48', 'type' => 'library', 'install_path' => __DIR__ . '/../../../', 'aliases' => array(), - 'dev' => false, + 'dev' => true, ), 'versions' => array( '__root__' => array( 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => 'b99276fdfbac6b1ff243807b8b5b8161f0f67a24', + 'reference' => 'd481e4c575c189d6ddb128740892dd54a7c7ed48', 'type' => 'library', 'install_path' => __DIR__ . '/../../../', 'aliases' => array(), 'dev_requirement' => false, ), + 'bamarni/composer-bin-plugin' => array( + 'pretty_version' => '1.8.2', + 'version' => '1.8.2.0', + 'reference' => '92fd7b1e6e9cdae19b0d57369d8ad31a37b6a880', + 'type' => 'composer-plugin', + 'install_path' => __DIR__ . '/../bamarni/composer-bin-plugin', + 'aliases' => array(), + 'dev_requirement' => true, + ), ), ); diff --git a/lib/private/BinaryFinder.php b/lib/private/BinaryFinder.php index 3dad245ff0d..74e72d1564a 100644 --- a/lib/private/BinaryFinder.php +++ b/lib/private/BinaryFinder.php @@ -30,7 +30,7 @@ class BinaryFinder implements IBinaryFinder { private ICache $cache; public function __construct( - ICacheFactory $cacheFactory, + ICacheFactory $cacheFactory, private IConfig $config, ) { $this->cache = $cacheFactory->createLocal('findBinaryPath'); diff --git a/lib/private/DB/QueryBuilder/CompositeExpression.php b/lib/private/DB/QueryBuilder/CompositeExpression.php index bcdbce8c5cb..122998036ae 100644 --- a/lib/private/DB/QueryBuilder/CompositeExpression.php +++ b/lib/private/DB/QueryBuilder/CompositeExpression.php @@ -16,7 +16,7 @@ class CompositeExpression implements ICompositeExpression, \Countable { public function __construct( private string $type, - private array $parts = [], + private array $parts = [], ) { } diff --git a/lib/private/DB/QueryBuilder/Partitioned/PartitionedQueryBuilder.php b/lib/private/DB/QueryBuilder/Partitioned/PartitionedQueryBuilder.php index 9d351c1d3f1..a9cc3e74c97 100644 --- a/lib/private/DB/QueryBuilder/Partitioned/PartitionedQueryBuilder.php +++ b/lib/private/DB/QueryBuilder/Partitioned/PartitionedQueryBuilder.php @@ -50,10 +50,10 @@ class PartitionedQueryBuilder extends ShardedQueryBuilder { private ?int $offset = null; public function __construct( - IQueryBuilder $builder, - array $shardDefinitions, + IQueryBuilder $builder, + array $shardDefinitions, ShardConnectionManager $shardConnectionManager, - AutoIncrementHandler $autoIncrementHandler, + AutoIncrementHandler $autoIncrementHandler, ) { parent::__construct($builder, $shardDefinitions, $shardConnectionManager, $autoIncrementHandler); $this->quoteHelper = new QuoteHelper(); diff --git a/lib/private/DB/QueryBuilder/Sharded/AutoIncrementHandler.php b/lib/private/DB/QueryBuilder/Sharded/AutoIncrementHandler.php index c3ce28376e3..caedaa71c97 100644 --- a/lib/private/DB/QueryBuilder/Sharded/AutoIncrementHandler.php +++ b/lib/private/DB/QueryBuilder/Sharded/AutoIncrementHandler.php @@ -25,7 +25,7 @@ class AutoIncrementHandler { private ?IMemcache $cache = null; public function __construct( - private ICacheFactory $cacheFactory, + private ICacheFactory $cacheFactory, private ShardConnectionManager $shardConnectionManager, ) { if (PHP_INT_SIZE < 8) { diff --git a/lib/private/DB/QueryBuilder/Sharded/ShardQueryRunner.php b/lib/private/DB/QueryBuilder/Sharded/ShardQueryRunner.php index 51cd055e801..c020e72868e 100644 --- a/lib/private/DB/QueryBuilder/Sharded/ShardQueryRunner.php +++ b/lib/private/DB/QueryBuilder/Sharded/ShardQueryRunner.php @@ -77,12 +77,12 @@ class ShardQueryRunner { */ public function executeQuery( IQueryBuilder $query, - bool $allShards, - array $shardKeys, - array $primaryKeys, - ?array $sortList = null, - ?int $limit = null, - ?int $offset = null, + bool $allShards, + array $shardKeys, + array $primaryKeys, + ?array $sortList = null, + ?int $limit = null, + ?int $offset = null, ): IResult { $shards = $this->getShards($allShards, $shardKeys); $results = []; diff --git a/lib/private/DB/QueryBuilder/Sharded/ShardedQueryBuilder.php b/lib/private/DB/QueryBuilder/Sharded/ShardedQueryBuilder.php index e5b66470de0..2219a369778 100644 --- a/lib/private/DB/QueryBuilder/Sharded/ShardedQueryBuilder.php +++ b/lib/private/DB/QueryBuilder/Sharded/ShardedQueryBuilder.php @@ -41,8 +41,8 @@ class ShardedQueryBuilder extends ExtendedQueryBuilder { private string $mainTable = ''; public function __construct( - IQueryBuilder $builder, - protected array $shardDefinitions, + IQueryBuilder $builder, + protected array $shardDefinitions, protected ShardConnectionManager $shardConnectionManager, protected AutoIncrementHandler $autoIncrementHandler, ) { diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php index f5baddb8590..59d5a838d72 100644 --- a/lib/private/Files/Cache/Cache.php +++ b/lib/private/Files/Cache/Cache.php @@ -55,7 +55,7 @@ class Cache implements ICache { protected array $partial = []; protected string $storageId; protected Storage $storageCache; - protected IMimeTypeLoader$mimetypeLoader; + protected IMimeTypeLoader $mimetypeLoader; protected IDBConnection $connection; protected SystemConfig $systemConfig; protected LoggerInterface $logger; diff --git a/lib/private/Mail/Mailer.php b/lib/private/Mail/Mailer.php index 7497a8d9079..da3fcd35888 100644 --- a/lib/private/Mail/Mailer.php +++ b/lib/private/Mail/Mailer.php @@ -61,13 +61,13 @@ class Mailer implements IMailer { private ?MailerInterface $instance = null; public function __construct( - private IConfig $config, - private LoggerInterface $logger, - private Defaults $defaults, - private IURLGenerator $urlGenerator, - private IL10N $l10n, + private IConfig $config, + private LoggerInterface $logger, + private Defaults $defaults, + private IURLGenerator $urlGenerator, + private IL10N $l10n, private IEventDispatcher $dispatcher, - private IFactory $l10nFactory, + private IFactory $l10nFactory, ) { } diff --git a/lib/private/PreviewManager.php b/lib/private/PreviewManager.php index ae0aa42a522..c8ef2fac8f3 100644 --- a/lib/private/PreviewManager.php +++ b/lib/private/PreviewManager.php @@ -53,16 +53,16 @@ class PreviewManager implements IPreview { private bool $enablePreviews; public function __construct( - IConfig $config, - IRootFolder $rootFolder, - IAppData $appData, - IEventDispatcher $eventDispatcher, - GeneratorHelper $helper, - ?string $userId, - Coordinator $bootstrapCoordinator, - IServerContainer $container, - IBinaryFinder $binaryFinder, - IMagickSupport $imagickSupport, + IConfig $config, + IRootFolder $rootFolder, + IAppData $appData, + IEventDispatcher $eventDispatcher, + GeneratorHelper $helper, + ?string $userId, + Coordinator $bootstrapCoordinator, + IServerContainer $container, + IBinaryFinder $binaryFinder, + IMagickSupport $imagickSupport, ) { $this->config = $config; $this->rootFolder = $rootFolder; diff --git a/lib/private/Security/Ip/Address.php b/lib/private/Security/Ip/Address.php index 1df94e0a9c7..e0bb906e82d 100644 --- a/lib/private/Security/Ip/Address.php +++ b/lib/private/Security/Ip/Address.php @@ -32,7 +32,7 @@ class Address implements IAddress { return Factory::parseAddressString($ip) !== null; } - public function matches(IRange... $ranges): bool { + public function matches(IRange ... $ranges): bool { foreach ($ranges as $range) { if ($range->contains($this)) { return true; diff --git a/lib/private/Security/Ip/RemoteAddress.php b/lib/private/Security/Ip/RemoteAddress.php index cef511099b1..4eef8813898 100644 --- a/lib/private/Security/Ip/RemoteAddress.php +++ b/lib/private/Security/Ip/RemoteAddress.php @@ -34,7 +34,7 @@ class RemoteAddress implements IRemoteAddress, IAddress { return Address::isValid($ip); } - public function matches(IRange... $ranges): bool { + public function matches(IRange ... $ranges): bool { return $this->ip === null ? true : $this->ip->matches(... $ranges); diff --git a/lib/private/Settings/DeclarativeManager.php b/lib/private/Settings/DeclarativeManager.php index 5c2b868f417..d8c25c9a5c7 100644 --- a/lib/private/Settings/DeclarativeManager.php +++ b/lib/private/Settings/DeclarativeManager.php @@ -34,11 +34,11 @@ use Psr\Log\LoggerInterface; class DeclarativeManager implements IDeclarativeManager { public function __construct( private IEventDispatcher $eventDispatcher, - private IGroupManager $groupManager, - private Coordinator $coordinator, - private IConfig $config, - private IAppConfig $appConfig, - private LoggerInterface $logger, + private IGroupManager $groupManager, + private Coordinator $coordinator, + private IConfig $config, + private IAppConfig $appConfig, + private LoggerInterface $logger, ) { } diff --git a/lib/private/Template/JSConfigHelper.php b/lib/private/Template/JSConfigHelper.php index 44563f2938c..e6d3c6af87e 100644 --- a/lib/private/Template/JSConfigHelper.php +++ b/lib/private/Template/JSConfigHelper.php @@ -42,20 +42,20 @@ class JSConfigHelper { private $excludedUserBackEnds = ['user_saml' => true, 'user_globalsiteselector' => true]; public function __construct( - protected ServerVersion $serverVersion, - protected IL10N $l, - protected Defaults $defaults, - protected IAppManager $appManager, - protected ISession $session, - protected ?IUser $currentUser, - protected IConfig $config, - protected IGroupManager $groupManager, - protected IniGetWrapper $iniWrapper, - protected IURLGenerator $urlGenerator, - protected CapabilitiesManager $capabilitiesManager, + protected ServerVersion $serverVersion, + protected IL10N $l, + protected Defaults $defaults, + protected IAppManager $appManager, + protected ISession $session, + protected ?IUser $currentUser, + protected IConfig $config, + protected IGroupManager $groupManager, + protected IniGetWrapper $iniWrapper, + protected IURLGenerator $urlGenerator, + protected CapabilitiesManager $capabilitiesManager, protected IInitialStateService $initialStateService, - protected IProvider $tokenProvider, - protected FilenameValidator $filenameValidator, + protected IProvider $tokenProvider, + protected FilenameValidator $filenameValidator, ) { } diff --git a/lib/private/TextProcessing/TaskBackgroundJob.php b/lib/private/TextProcessing/TaskBackgroundJob.php index 781d8207934..2942fd7d0aa 100644 --- a/lib/private/TextProcessing/TaskBackgroundJob.php +++ b/lib/private/TextProcessing/TaskBackgroundJob.php @@ -19,8 +19,8 @@ use OCP\TextProcessing\IManager; class TaskBackgroundJob extends QueuedJob { public function __construct( - ITimeFactory $timeFactory, - private IManager $textProcessingManager, + ITimeFactory $timeFactory, + private IManager $textProcessingManager, private IEventDispatcher $eventDispatcher, ) { parent::__construct($timeFactory); diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php index 6fcef435249..408ebffb390 100644 --- a/lib/private/User/Session.php +++ b/lib/private/User/Session.php @@ -70,14 +70,14 @@ class Session implements IUserSession, Emitter { protected $activeUser; public function __construct( - private Manager $manager, - private ISession $session, - private ITimeFactory $timeFactory, - private ?IProvider $tokenProvider, - private IConfig $config, - private ISecureRandom $random, + private Manager $manager, + private ISession $session, + private ITimeFactory $timeFactory, + private ?IProvider $tokenProvider, + private IConfig $config, + private ISecureRandom $random, private ILockdownManager $lockdownManager, - private LoggerInterface $logger, + private LoggerInterface $logger, private IEventDispatcher $dispatcher, ) { } diff --git a/lib/public/Security/Ip/IAddress.php b/lib/public/Security/Ip/IAddress.php index 242418962fc..bff7744ddce 100644 --- a/lib/public/Security/Ip/IAddress.php +++ b/lib/public/Security/Ip/IAddress.php @@ -24,7 +24,7 @@ interface IAddress { * * @since 30.0.0 */ - public function matches(IRange... $ranges): bool; + public function matches(IRange ... $ranges): bool; /** * Normalized IP address diff --git a/lib/public/Security/RateLimiting/ILimiter.php b/lib/public/Security/RateLimiting/ILimiter.php index 50e2e9008ea..22a07f3d430 100644 --- a/lib/public/Security/RateLimiting/ILimiter.php +++ b/lib/public/Security/RateLimiting/ILimiter.php @@ -34,8 +34,8 @@ interface ILimiter { * */ public function registerAnonRequest(string $identifier, - int $anonLimit, - int $anonPeriod, + int $anonLimit, + int $anonPeriod, string $ip): void; /** @@ -50,7 +50,7 @@ interface ILimiter { * */ public function registerUserRequest(string $identifier, - int $userLimit, - int $userPeriod, - IUser $user): void; + int $userLimit, + int $userPeriod, + IUser $user): void; } diff --git a/vendor-bin/cs-fixer/composer.lock b/vendor-bin/cs-fixer/composer.lock index 6e6a3ac3e90..32ba19362f5 100644 --- a/vendor-bin/cs-fixer/composer.lock +++ b/vendor-bin/cs-fixer/composer.lock @@ -54,16 +54,16 @@ }, { "name": "nextcloud/coding-standard", - "version": "v1.3.1", + "version": "v1.3.2", "source": { "type": "git", "url": "https://github.com/nextcloud/coding-standard.git", - "reference": "e88acb0df6217b808d1632286ddfec9267a102e4" + "reference": "9c719c4747fa26efc12f2e8b21c14a9a75c6ba6d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/e88acb0df6217b808d1632286ddfec9267a102e4", - "reference": "e88acb0df6217b808d1632286ddfec9267a102e4", + "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/9c719c4747fa26efc12f2e8b21c14a9a75c6ba6d", + "reference": "9c719c4747fa26efc12f2e8b21c14a9a75c6ba6d", "shasum": "" }, "require": { @@ -90,9 +90,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.3.1" + "source": "https://github.com/nextcloud/coding-standard/tree/v1.3.2" }, - "time": "2024-09-19T09:07:10+00:00" + "time": "2024-10-14T16:49:05+00:00" }, { "name": "php-cs-fixer/shim",