petru/nextcloud-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Fix ci after run of rector

Browse Source 
Signed-off-by: Carl Schwan <carlschwan@kde.org>
This commit is contained in:
Carl Schwan
2026-03-01 22:44:17 +01:00
parent 663018455e
commit 4588c7134d
9 changed files with 16 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/psalm-baseline.xml
-16
View File
@@ -3613,22 +3613,6 @@
<code><![CDATA[$this->fileInfo]]></code>
</UndefinedInterfaceMethod>
</file>
<file src="lib/private/Files/Node/Root.php">
<LessSpecificReturnStatement>
<code><![CDATA[$folders]]></code>
<code><![CDATA[$this->mountManager->findByNumericId($numericId)]]></code>
<code><![CDATA[$this->mountManager->findByStorageId($storageId)]]></code>
<code><![CDATA[$this->mountManager->findIn($mountPoint)]]></code>
</LessSpecificReturnStatement>
<MoreSpecificReturnType>
<code><![CDATA[MountPoint[]]]></code>
<code><![CDATA[\OC\Files\Mount\MountPoint[]]]></code>
<code><![CDATA[\OC\Files\Mount\MountPoint[]]]></code>
</MoreSpecificReturnType>
<UndefinedMethod>
<code><![CDATA[remove]]></code>
</UndefinedMethod>
</file>
<file src="lib/private/Files/ObjectStore/S3ConnectionTrait.php">
<InternalClass>
<code><![CDATA[ClientResolver::_default_signature_provider()]]></code>
lib/composer/composer/InstalledVersions.php
+2 -2
View File
@@ -277,7 +277,7 @@ class InstalledVersions
if (null === self::$installed) {
// only require the installed.php file if this file is loaded from its dumped location,
// and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
if (substr(__DIR__, -8, 1) !== 'C') {
if (substr(__DIR__, -8, 1) !== 'C' && is_file(__DIR__ . '/installed.php')) {
self::$installed = include __DIR__ . '/installed.php';
} else {
self::$installed = array();
@@ -378,7 +378,7 @@ class InstalledVersions
if (null === self::$installed) {
// only require the installed.php file if this file is loaded from its dumped location,
// and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
if (substr(__DIR__, -8, 1) !== 'C') {
if (substr(__DIR__, -8, 1) !== 'C' && is_file(__DIR__ . '/installed.php')) {
/** @var 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[]}>} $required */
$required = require __DIR__ . '/installed.php';
self::$installed = $required;
lib/composer/composer/installed.json
+3 -66
View File
@@ -1,68 +1,5 @@
{
"packages": [
{
"name": "bamarni/composer-bin-plugin",
"version": "1.9.1",
"version_normalized": "1.9.1.0",
"source": {
"type": "git",
"url": "https://github.com/bamarni/composer-bin-plugin.git",
"reference": "641d0663f5ac270b1aeec4337b7856f76204df47"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/bamarni/composer-bin-plugin/zipball/641d0663f5ac270b1aeec4337b7856f76204df47",
"reference": "641d0663f5ac270b1aeec4337b7856f76204df47",
"shasum": ""
},
"require": {
"composer-plugin-api": "^2.0",
"php": "^7.2.5 || ^8.0"
},
"require-dev": {
"composer/composer": "^2.2.26",
"ext-json": "*",
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan": "^1.8 || ^2.0",
"phpstan/phpstan-phpunit": "^1.1 || ^2.0",
"phpunit/phpunit": "^8.5 || ^9.6 || ^10.0",
"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": "2026-02-04T10:18:12+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.9.1"
},
"install-path": "../bamarni/composer-bin-plugin"
}
],
"dev": true,
"dev-package-names": [
"bamarni/composer-bin-plugin"
]
"packages": [],
"dev": false,
"dev-package-names": []
}
lib/composer/composer/installed.php
+3 -12
View File
@@ -3,30 +3,21 @@
'name' => '__root__',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => 'ee43b68606d008d69e41e1b9fe74b30aa9933959',
'reference' => '671cec33f134e670bb21c5e3c49c685bd78fc339',
'type' => 'library',
'install_path' => __DIR__ . '/../../../',
'aliases' => array(),
'dev' => true,
'dev' => false,
),
'versions' => array(
'__root__' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => 'ee43b68606d008d69e41e1b9fe74b30aa9933959',
'reference' => '671cec33f134e670bb21c5e3c49c685bd78fc339',
'type' => 'library',
'install_path' => __DIR__ . '/../../../',
'aliases' => array(),
'dev_requirement' => false,
),
'bamarni/composer-bin-plugin' => array(
'pretty_version' => '1.9.1',
'version' => '1.9.1.0',
'reference' => '641d0663f5ac270b1aeec4337b7856f76204df47',
'type' => 'composer-plugin',
'install_path' => __DIR__ . '/../bamarni/composer-bin-plugin',
'aliases' => array(),
'dev_requirement' => true,
),
),
);
lib/private/Files/FileInfo.php
+2 -2
View File
@@ -42,7 +42,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
private int|float $rawSize = 0;
/**
* @param string|boolean $path
* @param string $path
* @param Storage\Storage $storage
* @param string $internalPath
* @param array|ICacheEntry $data
@@ -55,7 +55,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
private $internalPath,
private array|ICacheEntry $data,
$mount,
private ?IUser $owner = null
private ?IUser $owner = null,
) {
$this->mount = $mount;
if (isset($this->data['unencrypted_size']) && $this->data['unencrypted_size'] !== 0) {
lib/private/Files/Node/LazyFolder.php
+1 -1
View File
@@ -37,7 +37,7 @@ class LazyFolder implements Folder {
public function __construct(
IRootFolder $rootFolder,
private \Closure $folderClosure,
protected array $data = []
protected array $data = [],
) {
$this->rootFolder = $rootFolder;
}
lib/private/Files/Node/Node.php
+1 -1
View File
@@ -45,7 +45,7 @@ class Node implements INode {
protected $path,
protected ?FileInfo $fileInfo = null,
protected ?INode $parent = null,
private bool $infoHasSubMountsIncluded = true
private bool $infoHasSubMountsIncluded = true,
) {
if (Filesystem::normalizePath($view->getRoot()) !== '/') {
throw new PreConditionNotMetException('The view passed to the node should not have any fake root set');
lib/private/Files/Node/Root.php
+3 -29
View File
@@ -135,35 +135,12 @@ class Root extends Folder implements IRootFolder {
/**
* @param string $mountPoint
* @return MountPoint[]
* @return IMountPoint[]
*/
public function getMountsIn(string $mountPoint): array {
return $this->mountManager->findIn($mountPoint);
}
/**
* @param string $storageId
* @return MountPoint[]
*/
public function getMountByStorageId($storageId) {
return $this->mountManager->findByStorageId($storageId);
}
/**
* @param int $numericId
* @return MountPoint[]
*/
public function getMountByNumericStorageId($numericId) {
return $this->mountManager->findByNumericId($numericId);
}
/**
* @param MountPoint $mount
*/
public function unMount($mount) {
$this->mountManager->remove($mount);
}
public function get($path) {
$path = $this->normalizePath($path);
if ($this->isValidPath($path)) {
@@ -403,8 +380,7 @@ class Root extends Folder implements IRootFolder {
}
/**
* @param int $id
* @return Node[]
* @return INode[]
*/
public function getByIdInPath(int $id, string $path): array {
$mountCache = $this->getUserMountCache();
@@ -512,9 +488,7 @@ class Root extends Folder implements IRootFolder {
$folders = array_filter($nodes, function (Node $node) use ($path) {
return PathHelper::getRelativePath($path, $node->getPath()) !== null;
});
usort($folders, function ($a, $b) {
return $b->getPath() <=> $a->getPath();
});
usort($folders, static fn (Node $a, Node $b): int => $b->getPath() <=> $a->getPath());
return $folders;
}
lib/private/FilesMetadata/Model/MetadataValueWrapper.php
+1 -1
View File
@@ -38,7 +38,7 @@ class MetadataValueWrapper implements IMetadataValueWrapper {
* @since 28.0.0
*/
public function __construct(
private string $type = ''
private string $type = '',
) {
}