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

Merge branch '1.4'

pull/6455/merge
Jordi Boggiano 2017-06-15 16:28:08 +02:00
parent cc9234562d 1f4882a3e6
commit 7cee8e385f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/Autoload/AutoloadGenerator.php
View File

@ -534,10 +534,6 @@ EOF;
} }
} }
if (preg_match('/\.phar$/', $path)) {
$baseDir = "'phar://' . " . $baseDir;
}
return $baseDir . (($path !== false) ? var_export($path, true) : ""); return $baseDir . (($path !== false) ? var_export($path, true) : "");
} }

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;