Skip to content

fix(FileInfo): correctly implement \ArrayAccess::offsetGet #47784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
susnux merged 1 commit into from
Sep 6, 2024
Merged

fix(FileInfo): correctly implement \ArrayAccess::offsetGet #47784

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions lib/private/Files/FileInfo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,7 @@ public function offsetUnset($offset): void {
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(),
Expand Down Expand Up @@ -164,7 +160,7 @@ public function getName() {
* @return string
*/
public function getEtag() {
$this->updateEntryfromSubMounts();
$this->updateEntryFromSubMounts();
if (count($this->childEtags) > 0) {
$combinedEtag = $this->data['etag'] . '::' . implode('::', $this->childEtags);
return md5($combinedEtag);
Expand All @@ -179,7 +175,7 @@ public function getEtag() {
*/
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'];
Expand All @@ -195,7 +191,7 @@ public function getSize($includeMounts = true) {
* @return int
*/
public function getMTime() {
$this->updateEntryfromSubMounts();
$this->updateEntryFromSubMounts();
return (int)$this->data['mtime'];
}

Expand Down Expand Up @@ -318,7 +314,7 @@ public function setSubMounts(array $mounts) {
$this->subMounts = $mounts;
}

private function updateEntryfromSubMounts(): void {
private function updateEntryFromSubMounts(): void {
if ($this->subMountsUsed) {
return;
}
Expand Down