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

Package options must be a non mandatory array and should be loaded when 

exists
pull/2189/head
Luís Otávio Cobucci Oblonczyk 2013-08-19 04:40:08 -03:00
parent 28d0e08785
commit 8630aab93f
4 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/Package/Loader/ArrayLoader.php
View File

@ -193,6 +193,10 @@ class ArrayLoader implements LoaderInterface
}
}
if (isset($config['options'])) {
$package->setOptions($config['options']);
}
return $package;
}

1
src/Composer/Package/Loader/ValidatingArrayLoader.php
View File

@ -196,6 +196,7 @@ class ValidatingArrayLoader implements LoaderInterface
// TODO validate package repositories' packages using this recursively
$this->validateFlatArray('include-path');
$this->validateArray('options');
// branch alias validation
if (isset($this->config['extra']['branch-alias'])) {

1
tests/Composer/Test/Package/Loader/ArrayLoaderTest.php
View File

@ -117,6 +117,7 @@ class ArrayLoaderTest extends \PHPUnit_Framework_TestCase
'archive' => array(
'exclude' => array('/foo/bar', 'baz', '!/foo/bar/baz'),
),
'options' => array('ssl' => array('local_cert' => '/opt/certs/test.pem'))
);
$package = $this->loader->load($config);

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

@ -143,6 +143,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
@ -256,6 +257,15 @@ class ValidatingArrayLoaderTest extends \PHPUnit_Framework_TestCase
'autoload : invalid value (psr0), must be one of psr-0, classmap, files'
)
),
array(
array(
'name' => 'foo/bar',
'options' => 'test',
),
array(
'options : should be an array, string given'
)
),
);
}