Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): Bump nextcloud/coding-standard from 1.3.1 to 1.3.2 in /vendor-bin/cs-fixer #48806

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions apps/dav/lib/CalDAV/BirthdayService.php
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@ public function ensureCalendarExists(string $principal): ?array {
* @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;
Expand Down
2 changes: 1 addition & 1 deletion apps/dav/lib/CalDAV/Reminder/INotificationProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ interface INotificationProvider {
*/
public function send(VEvent $vevent,
?string $calendarDisplayName,
array $principalEmailAddresses,
array $principalEmailAddresses,
array $users = []): void;
}
8 changes: 4 additions & 4 deletions apps/files/lib/BackgroundJob/ScanFiles.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 12 additions & 12 deletions apps/files_sharing/lib/External/Manager.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
18 changes: 9 additions & 9 deletions apps/files_sharing/lib/SharesReminderJob.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion apps/files_trashbin/lib/Storage.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

class Storage extends Wrapper {
private string $mountPoint;
private IUserManager$userManager;
private IUserManager $userManager;
private LoggerInterface $logger;
private IEventDispatcher $eventDispatcher;
private IRootFolder $rootFolder;
Expand Down
2 changes: 1 addition & 1 deletion apps/settings/tests/Controller/UsersControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ public function testSaveUserSettingsException(
array $data,
string $oldEmailAddress,
string $oldDisplayName,
bool $setDisplayNameResult,
bool $setDisplayNameResult,
bool $canChangeEmail,
): void {
$this->expectException(ForbiddenException::class);
Expand Down
6 changes: 3 additions & 3 deletions apps/systemtags/lib/Search/TagSearchProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
) {
Expand Down
2 changes: 1 addition & 1 deletion core/Command/Preview/Cleanup.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
class Cleanup extends Base {

public function __construct(
private IRootFolder $rootFolder,
private IRootFolder $rootFolder,
private LoggerInterface $logger,
) {
parent::__construct();
Expand Down
12 changes: 6 additions & 6 deletions core/Controller/TaskProcessingApiController.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@
*/
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);
}
Expand Down
12 changes: 6 additions & 6 deletions core/Controller/TextProcessingApiController.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@
*/
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);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/composer/composer/InstalledVersions.php
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ public static function getRootPackage()
/**
* 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<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}
*/
Expand Down
69 changes: 66 additions & 3 deletions lib/composer/composer/installed.json
Original file line number Diff line number Diff line change
@@ -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"
]
}
15 changes: 12 additions & 3 deletions lib/composer/composer/installed.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
),
);
2 changes: 1 addition & 1 deletion lib/private/BinaryFinder.php
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion lib/private/DB/QueryBuilder/CompositeExpression.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class CompositeExpression implements ICompositeExpression, \Countable {

public function __construct(
private string $type,
private array $parts = [],
private array $parts = [],
) {
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
12 changes: 6 additions & 6 deletions lib/private/DB/QueryBuilder/Sharded/ShardQueryRunner.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,12 @@ private function getLikelyShards(array $primaryKeys): array {
*/
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 = [];
Expand Down
4 changes: 2 additions & 2 deletions lib/private/DB/QueryBuilder/Sharded/ShardedQueryBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
) {
Expand Down
2 changes: 1 addition & 1 deletion lib/private/Files/Cache/Cache.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions lib/private/Mail/Mailer.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
) {
}

Expand Down
Loading
Loading