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

Merge branch '1.4'

pull/6578/merge
Jordi Boggiano 2017-08-06 17:21:58 +02:00
parent a6b6ca02d0 bf940fb21b
commit 23ab57c311
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Composer/Autoload/ClassMapGenerator.php
View File

@ -90,7 +90,8 @@ class ClassMapGenerator
$filePath = preg_replace('{[\\\\/]{2,}}', '/', $filePath); $filePath = preg_replace('{[\\\\/]{2,}}', '/', $filePath);
} }
if ($blacklist && preg_match($blacklist, strtr($filePath, '\\', '/'))) { // check the realpath of the file against the blacklist as the path might be a symlink and the blacklist is realpath'd so symlink are resolved
if ($blacklist && preg_match($blacklist, strtr(realpath($filePath), '\\', '/'))) {
continue; continue;
} }

2
src/Composer/Command/ShowCommand.php
View File

@ -353,7 +353,7 @@ EOT
} }
if ($input->getOption('outdated') && $latestPackage && $latestPackage->getFullPrettyVersion() === $package->getFullPrettyVersion() && !$latestPackage->isAbandoned()) { if ($input->getOption('outdated') && $latestPackage && $latestPackage->getFullPrettyVersion() === $package->getFullPrettyVersion() && !$latestPackage->isAbandoned()) {
continue; continue;
} elseif ($input->getOption('outdated')) { } elseif ($input->getOption('outdated') || $input->getOption('strict')) {
$hasOutdatedPackages = true; $hasOutdatedPackages = true;
} }

4
src/Composer/Installer.php
View File

@ -1199,10 +1199,12 @@ class Installer
} }
$package->setSourceReference($reference); $package->setSourceReference($reference);
$package->setDistReference($reference);
if (preg_match('{^https?://(?:(?:www\.)?bitbucket\.org|(api\.)?github\.com)/}i', $package->getDistUrl())) { if (preg_match('{^https?://(?:(?:www\.)?bitbucket\.org|(api\.)?github\.com)/}i', $package->getDistUrl())) {
$package->setDistReference($reference);
$package->setDistUrl(preg_replace('{(?<=/)[a-f0-9]{40}(?=/|$)}i', $reference, $package->getDistUrl())); $package->setDistUrl(preg_replace('{(?<=/)[a-f0-9]{40}(?=/|$)}i', $reference, $package->getDistUrl()));
} else if ($package->getDistReference()) { // update the dist reference if there was one, but if none was provided ignore it
$package->setDistReference($reference);
} }
} }