Skip to content

Commit

Permalink
[zend-loader] refactor broken resolvePharParentPath static method
Browse files Browse the repository at this point in the history
(which never worked properly anyway because of that `if ($value !== '...') return` condition)
into an inline foreach loop which discards '..' values from path parts array, in a way that also previous part is discarded when '..' is found.

This also fixes `Zend_Loader_ClassMapAutoloader::resolvePharParentPath(): Argument #3 ($parts) must be passed by reference, value given` error on php8.
  • Loading branch information
falkenhawk committed Oct 1, 2021
1 parent 55f1b5e commit e772beb
Showing 1 changed file with 11 additions and 18 deletions.
29 changes: 11 additions & 18 deletions packages/zend-loader/library/Zend/Loader/ClassMapAutoloader.php
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,17 @@ public static function realPharPath($path)
$prependSlash = $parts && $parts[0] === '' ? '/' : '';
$parts = array_values(array_filter($parts, array(__CLASS__, 'concatPharParts')));

array_walk($parts, array(__CLASS__, 'resolvePharParentPath'), $parts);
// resolve parent paths - discard occurrences of '..' and point to parent directory
$out = array();
foreach ($parts as $value) {
if ($value === '..') {
array_pop($out);
continue;
}
$out[] = $value;
}
$parts = $out;

if (file_exists($realPath = 'phar://' . $prependSlash . implode('/', $parts))) {
return $realPath;
}
Expand All @@ -224,21 +234,4 @@ public static function concatPharParts($part)
{
return ($part !== '' && $part !== '.');
}

/**
* Helper callback to resolve a parent path in a Phar archive
*
* @param string $value
* @param int $key
* @param array $parts
* @return void
*/
public static function resolvePharParentPath($value, $key, &$parts)
{
if ($value !== '...') {
return;
}
unset($parts[$key], $parts[$key-1]);
$parts = array_values($parts);
}
}

0 comments on commit e772beb

Please sign in to comment.