Merge pull request #5251 from nextcloud/dependabot/composer/psalm/phar-6.14.3

chore(deps-dev): Bump psalm/phar from 6.5.1 to 6.14.3

Author: elzody

composer.json

@@ -23,7 +23,7 @@
 	"require-dev": {
 		"roave/security-advisories": "dev-master",
 		"jakub-onderka/php-parallel-lint": "^1.0.0",
-		"psalm/phar": "^6.5",
+		"psalm/phar": "^6.14",
 		"friendsofphp/php-cs-fixer": "^3.8",
 		"nextcloud/coding-standard": "^1.0",
 		"nextcloud/ocp": "dev-master",

composer.lock

@@ -71,6 +71,7 @@ public function __construct(array $urlParams = []) {
 		parent::__construct(self::APPNAME, $urlParams);
 	}
 
+	#[\Override]
 	public function register(IRegistrationContext $context): void {
 		\OCP\Util::connectHook('OC_Filesystem', 'preSetup', $this, 'addStorageWrapper');
 
@@ -114,6 +115,7 @@ public function register(IRegistrationContext $context): void {
 		$context->registerTaskProcessingTaskType(SlideDeckGenerationTaskType::class);
 	}
 
+	#[\Override]
 	public function boot(IBootContext $context): void {
 	}
 

lib/AppInfo/Application.php

@@ -23,6 +23,7 @@ public function __construct(
 		$this->setInterval(60 * 60);
 	}
 
+	#[\Override]
 	protected function run($argument) {
 		// Expire template mappings for file creation
 		$query = $this->db->getQueryBuilder();

lib/Backgroundjobs/Cleanup.php

@@ -26,6 +26,7 @@ public function __construct(
 		$this->setInterval(60 * 60);
 	}
 
+	#[\Override]
 	protected function run($argument) {
 		if (!$this->appConfig->getCollaboraUrlInternal()) {
 			return;

lib/Backgroundjobs/ObtainCapabilities.php

@@ -99,6 +99,7 @@ public function __construct(
 	) {
 	}
 
+	#[\Override]
 	public function getCapabilities() {
 		// Only expose capabilities for users with enabled office or guests (where it depends on the share owner if they have access)
 		if (!$this->permissionManager->isEnabledForUser() && $this->userId !== null) {

lib/Capabilities.php

@@ -372,7 +372,7 @@ public function getFile(string $fileId, string $access_token): JSONResponse|Stre
 						$offset = intval($matches[1] ?? 0);
 						$length = intval($matches[2] ?? 0) - $offset + 1;
 						if ($length <= 0) {
-							$length = $filesize - $offset;
+							$length = (int)$filesize - $offset;
 						}
 
 						$fp = $file->fopen('rb');
@@ -385,7 +385,9 @@ public function getFile(string $fileId, string $access_token): JSONResponse|Stre
 						$response->addHeader('Accept-Ranges', 'bytes');
 						$response->addHeader('Content-Length', (string)$filesize);
 						$response->setStatus(Http::STATUS_PARTIAL_CONTENT);
-						$response->addHeader('Content-Range', 'bytes ' . $offset . '-' . ($offset + $length) . '/' . $filesize);
+
+						$blockSize = ($offset + $length);
+						$response->addHeader('Content-Range', "bytes $offset-$blockSize/$filesize");
 					} else {
 						$response = new StreamResponse($file->fopen('rb'));
 					}

lib/Controller/WopiController.php

@@ -57,6 +57,7 @@ public function __construct(
 		$this->l10n = $l10nFactory->get('richdocuments');
 	}
 
+	#[\Override]
 	public function getSupportedMimeTypes(): array {
 		$documents = self::MIME_TYPES['documents'];
 		$sheets = self::MIME_TYPES['sheets'];
@@ -133,6 +134,7 @@ public function getSupportedMimeTypes(): array {
 		];
 	}
 
+	#[\Override]
 	public function convertFile(File $file, string $targetMimeType): mixed {
 		$targetFileExtension = $this->getExtensionForMimeType($targetMimeType);
 		if ($targetFileExtension === null) {

lib/Conversion/ConversionProvider.php

@@ -168,6 +168,7 @@ public function getDirect() {
 		return (bool)$this->direct;
 	}
 
+	#[\Override]
 	#[\ReturnTypeWillChange]
 	public function jsonSerialize() {
 		$properties = get_object_vars($this);

lib/Db/Wopi.php

@@ -24,6 +24,7 @@ public function __construct(
 	) {
 	}
 
+	#[\Override]
 	public function handle(Event $event): void {
 		if (!$event instanceof AddContentSecurityPolicyEvent) {
 			return;