1
0
Fork 0

Backport update packagist default repo to be packagist.org

pull/5918/merge
Jordi Boggiano 2016-11-03 10:59:59 +01:00
parent 7259630cbe
commit 91e7372c6e
3 changed files with 21 additions and 8 deletions

View File

@ -686,7 +686,7 @@ You can disable the default Packagist repository by adding this to your
{
"repositories": [
{
"packagist": false
"packagist.org": false
}
]
}

View File

@ -67,7 +67,7 @@ class Config
);
public static $defaultRepositories = array(
'packagist' => array(
'packagist.org' => array(
'type' => 'composer',
'url' => 'https?://packagist.org',
'allow_ssl_downgrade' => true,
@ -157,23 +157,27 @@ class Config
foreach ($newRepos as $name => $repository) {
// disable a repository by name
if (false === $repository) {
unset($this->repositories[$name]);
$this->disableRepoByName($name);
continue;
}
// disable a repository with an anonymous {"name": false} repo
if (is_array($repository) && 1 === count($repository) && false === current($repository)) {
unset($this->repositories[key($repository)]);
$this->disableRepoByName(key($repository));
continue;
}
// store repo
if (is_int($name)) {
$this->repositories[] = $repository;
} else {
if ($name === 'packagist') { // BC support for default "packagist" named repo
$this->repositories[$name . '.org'] = $repository;
} else {
$this->repositories[$name] = $repository;
}
}
}
$this->repositories = array_reverse($this->repositories, true);
}
}
@ -404,6 +408,15 @@ class Config
return false;
}
private function disableRepoByName($name)
{
if (isset($this->repositories[$name])) {
unset($this->repositories[$name]);
} else if ($name === 'packagist') { // BC support for default "packagist" named repo
unset($this->repositories['packagist.org']);
}
}
/**
* Validates that the passed URL is allowed to be used by current config, or throws an exception.
*

View File

@ -292,7 +292,7 @@ class JsonManipulatorTest extends \PHPUnit_Framework_TestCase
},
"repositories": [
{
"packagist": false
"packagist.org": false
},
{
"type": "package",
@ -773,7 +773,7 @@ class JsonManipulatorTest extends \PHPUnit_Framework_TestCase
},
"repositories": [
{
"packagist": false
"packagist.org": false
},
{
"type": "package",