Merge pull request #48806 from nextcloud/dependabot/composer/vendor-b…

…in/cs-fixer/nextcloud/coding-standard-1.3.2

apps/dav/lib/CalDAV/BirthdayService.php

@@ -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;

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;
 }

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

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;

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);

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;

apps/files_trashbin/lib/Storage.php

@@ -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;

apps/settings/tests/Controller/UsersControllerTest.php

@@ -791,7 +791,7 @@ public function testSaveUserSettingsException(
 		array $data,
 		string $oldEmailAddress,
 		string $oldDisplayName,
-		bool  $setDisplayNameResult,
+		bool $setDisplayNameResult,
 		bool $canChangeEmail,
 	): void {
 		$this->expectException(ForbiddenException::class);

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,
 	) {

core/Command/Preview/Cleanup.php

@@ -21,7 +21,7 @@
 class Cleanup extends Base {
 
 	public function __construct(
-		private IRootFolder     $rootFolder,
+		private IRootFolder $rootFolder,
 		private LoggerInterface $logger,
 	) {
 		parent::__construct();

core/Controller/TaskProcessingApiController.php

@@ -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);
 	}

core/Controller/TextProcessingApiController.php

@@ -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);
 	}

lib/composer/composer/InstalledVersions.php

@@ -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[]}>}
      */

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"
+    ]
 }

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,
+        ),
     ),
 );

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');

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 = [],
 	) {
 	}
 

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();

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) {

lib/private/DB/QueryBuilder/Sharded/ShardQueryRunner.php

@@ -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 = [];

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,
 	) {

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;

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,
 	) {
 	}