public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Improved variable name.

pull/2188/head
Danack 2013-08-18 22:57:26 +01:00
parent 74b4bcd22e
commit abfefd1faa
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Composer/Repository/ArtifactRepository.php
View File

@ -82,29 +82,25 @@ class ArtifactRepository extends ArrayRepository
* @return bool|int * @return bool|int
*/ */
private function locateFile(\ZipArchive $zip, $filename) { private function locateFile(\ZipArchive $zip, $filename) {
$shortestIndex = -1; $indexOfShortestMatch = false;
$shortestIndexLength = -1; $lengthOfShortestMatch = -1;
for ($i = 0; $i < $zip->numFiles; $i++ ){ for ($i = 0; $i < $zip->numFiles; $i++ ){
$stat = $zip->statIndex($i); $stat = $zip->statIndex($i);
if (strcmp(basename($stat['name']), $filename) === 0){ if (strcmp(basename($stat['name']), $filename) === 0){
$length = strlen($stat['name']); $length = strlen($stat['name']);
if ($shortestIndex == -1 || $length < $shortestIndexLength) { if ($indexOfShortestMatch == false || $length < $lengthOfShortestMatch) {
//Check it's not a directory. //Check it's not a directory.
$contents = $zip->getFromIndex($i); $contents = $zip->getFromIndex($i);
if ($contents !== false) { if ($contents !== false) {
$shortestIndex = $i; $indexOfShortestMatch = $i;
$shortestIndexLength = $length; $lengthOfShortestMatch = $length;
} }
} }
} }
} }
if ($shortestIndex == -1) { return $indexOfShortestMatch;
return false;
}
return $shortestIndex;
} }
private function getComposerInformation(\SplFileInfo $file) private function getComposerInformation(\SplFileInfo $file)