Merge branch '2.2' into 2.3
commit
16ee2e479f
|
@ -12,6 +12,9 @@ env:
|
|||
COMPOSER_FLAGS: "--ansi --no-interaction --no-progress --prefer-dist"
|
||||
COMPOSER_UPDATE_FLAGS: ""
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
tests:
|
||||
name: "CI"
|
||||
|
|
|
@ -8,6 +8,9 @@ on:
|
|||
paths-ignore:
|
||||
- 'doc/**'
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
tests:
|
||||
name: "Lint"
|
||||
|
|
|
@ -12,6 +12,9 @@ env:
|
|||
COMPOSER_FLAGS: "--ansi --no-interaction --prefer-dist"
|
||||
SYMFONY_PHPUNIT_VERSION: ""
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
tests:
|
||||
name: "PHPStan"
|
||||
|
|
|
@ -460,7 +460,7 @@ class GitDownloader extends VcsDownloader implements DvcsDownloaderInterface
|
|||
// check whether non-commitish are branches or tags, and fetch branches with the remote name
|
||||
$gitRef = $reference;
|
||||
if (!Preg::isMatch('{^[a-f0-9]{40}$}', $reference)
|
||||
&& $branches
|
||||
&& null !== $branches
|
||||
&& Preg::isMatch('{^\s+composer/'.preg_quote($reference).'$}m', $branches)
|
||||
) {
|
||||
$command = sprintf('git checkout '.$force.'-B %s %s -- && git reset --hard %2$s --', ProcessExecutor::escape($branch), ProcessExecutor::escape('composer/'.$reference));
|
||||
|
@ -472,7 +472,7 @@ class GitDownloader extends VcsDownloader implements DvcsDownloaderInterface
|
|||
// try to checkout branch by name and then reset it so it's on the proper branch name
|
||||
if (Preg::isMatch('{^[a-f0-9]{40}$}', $reference)) {
|
||||
// add 'v' in front of the branch if it was stripped when generating the pretty name
|
||||
if (!Preg::isMatch('{^\s+composer/'.preg_quote($branch).'$}m', $branches) && Preg::isMatch('{^\s+composer/v'.preg_quote($branch).'$}m', $branches)) {
|
||||
if (null !== $branches && !Preg::isMatch('{^\s+composer/'.preg_quote($branch).'$}m', $branches) && Preg::isMatch('{^\s+composer/v'.preg_quote($branch).'$}m', $branches)) {
|
||||
$branch = 'v' . $branch;
|
||||
}
|
||||
|
||||
|
|
|
@ -437,7 +437,7 @@ if [ -d /proc/cygdrive ]; then
|
|||
esac
|
||||
fi
|
||||
|
||||
export COMPOSER_RUNTIME_BIN_DIR=\$(cd "\${self%[/\\\\]*}" > /dev/null; pwd)
|
||||
export COMPOSER_RUNTIME_BIN_DIR="\$(cd "\${self%[/\\\\]*}" > /dev/null; pwd)"
|
||||
|
||||
# If bash is sourcing this file, we have to source the target as well
|
||||
bashSource="\$BASH_SOURCE"
|
||||
|
|
|
@ -192,9 +192,9 @@ class AuthHelper
|
|||
// fail if the console is not interactive
|
||||
if (!$this->io->isInteractive()) {
|
||||
if ($statusCode === 401) {
|
||||
$message = "The '" . $url . "' URL required authentication.\nYou must be using the interactive console to authenticate";
|
||||
$message = "The '" . $url . "' URL required authentication (HTTP 401).\nYou must be using the interactive console to authenticate";
|
||||
} elseif ($statusCode === 403) {
|
||||
$message = "The '" . $url . "' URL could not be accessed: " . $reason;
|
||||
$message = "The '" . $url . "' URL could not be accessed (HTTP 403): " . $reason;
|
||||
} else {
|
||||
$message = "Unknown error code '" . $statusCode . "', reason: " . $reason;
|
||||
}
|
||||
|
@ -210,7 +210,7 @@ class AuthHelper
|
|||
return array('retry' => true, 'storeAuth' => false);
|
||||
}
|
||||
|
||||
throw new TransportException("Invalid credentials for '" . $url . "', aborting.", $statusCode);
|
||||
throw new TransportException("Invalid credentials (HTTP $statusCode) for '$url', aborting.", $statusCode);
|
||||
}
|
||||
|
||||
$this->io->writeError(' Authentication required (<info>'.$origin.'</info>):');
|
||||
|
|
Loading…
Reference in New Issue