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

Fix/add tests and also handle case where a json object is used

pull/9702/head
Jordi Boggiano 2021-02-11 11:13:58 +01:00
parent 4130d388fe
commit 52d7c6c383
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Composer/Config.php
View File

@ -179,12 +179,13 @@ class Config
continue; continue;
} }
// store repo
if (is_int($name)) {
// auto-deactivate the default packagist.org repo if it gets redefined // auto-deactivate the default packagist.org repo if it gets redefined
if (isset($repository['type'], $repository['url']) && $repository['type'] === 'composer' && preg_match('{^https?://(?:[a-z0-9-.]+\.)?packagist.org(/|$)}', $repository['url'])) { if (isset($repository['type'], $repository['url']) && $repository['type'] === 'composer' && preg_match('{^https?://(?:[a-z0-9-.]+\.)?packagist.org(/|$)}', $repository['url'])) {
$this->disableRepoByName('packagist.org'); $this->disableRepoByName('packagist.org');
} }
// store repo
if (is_int($name)) {
$this->repositories[] = $repository; $this->repositories[] = $repository;
} else { } else {
if ($name === 'packagist') { // BC support for default "packagist" named repo if ($name === 'packagist') { // BC support for default "packagist" named repo

26
tests/Composer/Test/ConfigTest.php
View File

@ -35,7 +35,7 @@ class ConfigTest extends TestCase
$data = array(); $data = array();
$data['local config inherits system defaults'] = array( $data['local config inherits system defaults'] = array(
array( array(
'packagist.org' => array('type' => 'composer', 'url' => 'https?://repo.packagist.org', 'allow_ssl_downgrade' => true), 'packagist.org' => array('type' => 'composer', 'url' => 'https://repo.packagist.org'),
), ),
array(), array(),
); );
@ -58,7 +58,7 @@ class ConfigTest extends TestCase
array( array(
1 => array('type' => 'vcs', 'url' => 'git://github.com/composer/composer.git'), 1 => array('type' => 'vcs', 'url' => 'git://github.com/composer/composer.git'),
0 => array('type' => 'pear', 'url' => 'http://pear.composer.org'), 0 => array('type' => 'pear', 'url' => 'http://pear.composer.org'),
'packagist.org' => array('type' => 'composer', 'url' => 'https?://repo.packagist.org', 'allow_ssl_downgrade' => true), 'packagist.org' => array('type' => 'composer', 'url' => 'https://repo.packagist.org'),
), ),
array( array(
array('type' => 'vcs', 'url' => 'git://github.com/composer/composer.git'), array('type' => 'vcs', 'url' => 'git://github.com/composer/composer.git'),
@ -69,7 +69,7 @@ class ConfigTest extends TestCase
$data['system config adds above core defaults'] = array( $data['system config adds above core defaults'] = array(
array( array(
'example.com' => array('type' => 'composer', 'url' => 'http://example.com'), 'example.com' => array('type' => 'composer', 'url' => 'http://example.com'),
'packagist.org' => array('type' => 'composer', 'url' => 'https?://repo.packagist.org', 'allow_ssl_downgrade' => true), 'packagist.org' => array('type' => 'composer', 'url' => 'https://repo.packagist.org'),
), ),
array(), array(),
array( array(
@ -104,9 +104,27 @@ class ConfigTest extends TestCase
), ),
); );
$data['local config redefining packagist.org by URL override it if no named keys are used'] = array(
array(
array('type' => 'composer', 'url' => 'https://repo.packagist.org'),
),
array(
array('type' => 'composer', 'url' => 'https://repo.packagist.org'),
),
);
$data['local config redefining packagist.org by URL override it also with named keys'] = array(
array(
'example' => array('type' => 'composer', 'url' => 'https://repo.packagist.org'),
),
array(
'example' => array('type' => 'composer', 'url' => 'https://repo.packagist.org'),
),
);
$data['incorrect local config does not cause ErrorException'] = array( $data['incorrect local config does not cause ErrorException'] = array(
array( array(
'packagist.org' => array('type' => 'composer', 'url' => 'https?://repo.packagist.org', 'allow_ssl_downgrade' => true), 'packagist.org' => array('type' => 'composer', 'url' => 'https://repo.packagist.org'),
'type' => 'vcs', 'type' => 'vcs',
'url' => 'http://example.com', 'url' => 'http://example.com',
), ),