public-mirrors/composer
1
0
Fork 0
mirror of https://github.com/composer/composer synced 2025-05-09 00:22:53 +00:00
Code Activity

Merge remote-tracking branch 'lcobucci/master'

Browse source 
Conflicts:
	src/Composer/Downloader/FileDownloader.php
This commit is contained in:
Jordi Boggiano 2014-05-07 18:02:46 +02:00
commit 016a016455
12 changed files with 90 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tests/Composer/Test/Package/Loader/ValidatingArrayLoaderTest.php
View file

@ -146,6 +146,7 @@ class ValidatingArrayLoaderTest extends \PHPUnit_Framework_TestCase
'bin/foo',
'bin/bar',
),
'options' => array('ssl' => array('local_cert' => '/opt/certs/test.pem'))
),
),
array( // test as array
@ -263,6 +264,15 @@ class ValidatingArrayLoaderTest extends \PHPUnit_Framework_TestCase
'autoload : invalid value (psr0), must be one of psr-0, psr-4, classmap, files'
)
),
array(
array(
'name' => 'foo/bar',
'options' => 'test',
),
array(
'options : should be an array, string given'
)
),
);
}