diff options
Diffstat (limited to 'lib')
20 files changed, 145 insertions, 73 deletions
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<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} */ 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; } |