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

Merge pull request #6435 from remicollet/issue-deps 

Issue deps
pull/6353/merge
Jordi Boggiano 2017-05-22 09:43:56 +02:00 committed by GitHub
parent d7b2e42fa9 741c8d63fb
commit 771ea8bffe
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/Composer/Test/IO/ConsoleIOTest.php
View File

@ -218,8 +218,11 @@ class ConsoleIOTest extends TestCase
->will($this->returnValue($helperMock)) ->will($this->returnValue($helperMock))
; ;
$validator = function ($value) {
return true;
};
$consoleIO = new ConsoleIO($inputMock, $outputMock, $setMock); $consoleIO = new ConsoleIO($inputMock, $outputMock, $setMock);
$consoleIO->askAndValidate('Why?', 'validator', 10, 'default'); $consoleIO->askAndValidate('Why?', $validator, 10, 'default');
} }
public function testSelect() public function testSelect()

3
tests/Composer/Test/Json/ComposerSchemaTest.php
View File

@ -101,9 +101,10 @@ class ComposerSchemaTest extends \PHPUnit_Framework_TestCase
if (!$validator->isValid()) { if (!$validator->isValid()) {
$errors = $validator->getErrors(); $errors = $validator->getErrors();
// remove justinrainbow/json-schema 3.0 props so it works with all versions // remove justinrainbow/json-schema 3.0/5.2 props so it works with all versions
foreach ($errors as &$err) { foreach ($errors as &$err) {
unset($err['pointer']); unset($err['pointer']);
unset($err['context']);
} }
return $errors; return $errors;