Update packagist default repo to be packagist.org
parent
f7475c6ff6
commit
e38ebefc7e
|
@ -662,7 +662,7 @@ You can disable the default Packagist repository by adding this to your
|
|||
{
|
||||
"repositories": [
|
||||
{
|
||||
"packagist": false
|
||||
"packagist.org": false
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
@ -68,7 +68,7 @@ class Config
|
|||
);
|
||||
|
||||
public static $defaultRepositories = array(
|
||||
'packagist' => array(
|
||||
'packagist.org' => array(
|
||||
'type' => 'composer',
|
||||
'url' => 'https?://packagist.org',
|
||||
'allow_ssl_downgrade' => true,
|
||||
|
@ -158,13 +158,13 @@ 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;
|
||||
}
|
||||
|
||||
|
@ -172,7 +172,11 @@ class Config
|
|||
if (is_int($name)) {
|
||||
$this->repositories[] = $repository;
|
||||
} else {
|
||||
$this->repositories[$name] = $repository;
|
||||
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);
|
||||
|
@ -405,6 +409,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.
|
||||
*
|
||||
|
|
|
@ -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",
|
||||
|
|
Loading…
Reference in New Issue