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

Update packagist default repo to be packagist.org

pull/5845/head
Jordi Boggiano 2016-11-03 10:59:59 +01:00
parent f7475c6ff6
commit e38ebefc7e
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/05-repositories.md
View File

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

19
src/Composer/Config.php
View File

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

4
tests/Composer/Test/Json/JsonManipulatorTest.php
View File

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