sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #47784 from nextcloud/fix/file-info 

fix(FileInfo): correctly implement `\ArrayAccess::offsetGet`
pull/47731/head
Ferdinand Thiessen 2024-09-06 12:18:30 +07:00 committed by GitHub
parent 141fed839a a96406086c
commit ba73beaac1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/private/Files/FileInfo.php
Unescape Escape View File

@ -95,11 +95,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
unset($this->data[$offset]);
}
/**
* @return mixed
*/
#[\ReturnTypeWillChange]
public function offsetGet($offset) {
public function offsetGet(mixed $offset): mixed {
return match ($offset) {
'type' => $this->getType(),
'etag' => $this->getEtag(),
@ -164,7 +160,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
* @return string
*/
public function getEtag() {
$this->updateEntryfromSubMounts();
$this->updateEntryFromSubMounts();
if (count($this->childEtags) > 0) {
$combinedEtag = $this->data['etag'] . '::' . implode('::', $this->childEtags);
return md5($combinedEtag);
@ -179,7 +175,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
*/
public function getSize($includeMounts = true) {
if ($includeMounts) {
$this->updateEntryfromSubMounts();
$this->updateEntryFromSubMounts();
if ($this->isEncrypted() && isset($this->data['unencrypted_size']) && $this->data['unencrypted_size'] > 0) {
return $this->data['unencrypted_size'];
@ -195,7 +191,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
* @return int
*/
public function getMTime() {
$this->updateEntryfromSubMounts();
$this->updateEntryFromSubMounts();
return (int)$this->data['mtime'];
}
@ -318,7 +314,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
$this->subMounts = $mounts;
}
private function updateEntryfromSubMounts(): void {
private function updateEntryFromSubMounts(): void {
if ($this->subMountsUsed) {
return;
}