1
0
Fork 0

Fix tests

pull/5918/merge
Jordi Boggiano 2016-11-03 11:30:35 +01:00
parent ce4d941b3e
commit 8a2f597db3
1 changed files with 14 additions and 7 deletions

View File

@ -35,12 +35,19 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
$data = array(); $data = array();
$data['local config inherits system defaults'] = array( $data['local config inherits system defaults'] = array(
array( array(
'packagist' => array('type' => 'composer', 'url' => 'https?://packagist.org', 'allow_ssl_downgrade' => true), 'packagist.org' => array('type' => 'composer', 'url' => 'https?://packagist.org', 'allow_ssl_downgrade' => true),
), ),
array(), array(),
); );
$data['local config can disable system config by name'] = array( $data['local config can disable system config by name'] = array(
array(),
array(
array('packagist.org' => false),
),
);
$data['local config can disable system config by name bc'] = array(
array(), array(),
array( array(
array('packagist' => false), array('packagist' => false),
@ -51,7 +58,7 @@ class ConfigTest extends \PHPUnit_Framework_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' => array('type' => 'composer', 'url' => 'https?://packagist.org', 'allow_ssl_downgrade' => true), 'packagist.org' => array('type' => 'composer', 'url' => 'https?://packagist.org', 'allow_ssl_downgrade' => true),
), ),
array( array(
array('type' => 'vcs', 'url' => 'git://github.com/composer/composer.git'), array('type' => 'vcs', 'url' => 'git://github.com/composer/composer.git'),
@ -62,7 +69,7 @@ class ConfigTest extends \PHPUnit_Framework_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' => array('type' => 'composer', 'url' => 'https?://packagist.org', 'allow_ssl_downgrade' => true), 'packagist.org' => array('type' => 'composer', 'url' => 'https?://packagist.org', 'allow_ssl_downgrade' => true),
), ),
array(), array(),
array( array(
@ -76,7 +83,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
'example.com' => array('type' => 'composer', 'url' => 'http://example.com'), 'example.com' => array('type' => 'composer', 'url' => 'http://example.com'),
), ),
array( array(
array('packagist' => false), array('packagist.org' => false),
array('type' => 'composer', 'url' => 'http://packagist.org'), array('type' => 'composer', 'url' => 'http://packagist.org'),
), ),
array( array(
@ -86,11 +93,11 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
$data['local config can override by name to bring a repo above system config'] = array( $data['local config can override by name to bring a repo above system config'] = array(
array( array(
'packagist' => array('type' => 'composer', 'url' => 'http://packagistnew.org'), 'packagist.org' => array('type' => 'composer', 'url' => 'http://packagistnew.org'),
'example.com' => array('type' => 'composer', 'url' => 'http://example.com'), 'example.com' => array('type' => 'composer', 'url' => 'http://example.com'),
), ),
array( array(
'packagist' => array('type' => 'composer', 'url' => 'http://packagistnew.org'), 'packagist.org' => array('type' => 'composer', 'url' => 'http://packagistnew.org'),
), ),
array( array(
'example.com' => array('type' => 'composer', 'url' => 'http://example.com'), 'example.com' => array('type' => 'composer', 'url' => 'http://example.com'),
@ -99,7 +106,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
$data['incorrect local config does not cause ErrorException'] = array( $data['incorrect local config does not cause ErrorException'] = array(
array( array(
'packagist' => array('type' => 'composer', 'url' => 'https?://packagist.org', 'allow_ssl_downgrade' => true), 'packagist.org' => array('type' => 'composer', 'url' => 'https?://packagist.org', 'allow_ssl_downgrade' => true),
'type' => 'vcs', 'type' => 'vcs',
'url' => 'http://example.com', 'url' => 'http://example.com',
), ),