Skip to content

Fixed undefined index when merging file metadata #2

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
hexus merged 3 commits into from
Jan 19, 2021
Merged

Fixed undefined index when merging file metadata #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d02293a
fix Notice: Undefined index: 0777 in Twistor\Flysystem\Plugin\Stat->m…
Jan 9, 2020
824d6db
fix
Jan 9, 2020
3f90145
more generic (different adapter)
Jan 10, 2020
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
38 changes: 37 additions & 1 deletion src/Flysystem/Plugin/Stat.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,38 @@ protected function getWithMetadata($path, array $ignore)
return $metadata;
}

/**
* Normalize a permissions string.
*
* @param string $permissions
*
* @return int
*/
protected function normalizePermissions($permissions)
{
if (is_numeric($permissions)) {
return $permissions & 0777;
}

// remove the type identifier
$permissions = substr($permissions, 1);

// map the string rights to the numeric counterparts
$map = ['-' => '0', 'r' => '4', 'w' => '2', 'x' => '1'];
$permissions = strtr($permissions, $map);

// split up the permission groups
$parts = str_split($permissions, 3);

// convert the groups
$mapper = function ($part) {
return array_sum(str_split($part));
};

// converts to decimal number
return octdec(implode('', array_map($mapper, $parts)));
}

/**
* Merges the available metadata from Filesystem::getMetadata().
*
Expand All @@ -154,7 +186,11 @@ protected function mergeMeta(array $metadata)
$ret['gid'] = $this->uid->getGid();

$ret['mode'] = $metadata['type'] === 'dir' ? 040000 : 0100000;
$ret['mode'] += $this->permissions[$metadata['type']][$metadata['visibility']];
$visibility = $metadata['visibility'];
if ($visibility != AdapterInterface::VISIBILITY_PUBLIC && $visibility != AdapterInterface::VISIBILITY_PRIVATE) {
$visibility = $this->normalizePermissions($visibility) & 0044 ? AdapterInterface::VISIBILITY_PUBLIC : AdapterInterface::VISIBILITY_PRIVATE;
}
$ret['mode'] += $this->permissions[$metadata['type']][$visibility];

if (isset($metadata['size'])) {
$ret['size'] = (int) $metadata['size'];
Expand Down