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

Revert default change from #5603

pull/5639/head
Jordi Boggiano 2016-08-26 11:32:58 +02:00
parent 4479b8a690
commit edddae42db
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Installer.php
View File

@ -625,7 +625,7 @@ class Installer
// but as it is not persisted on disk we use a loader/dumper // but as it is not persisted on disk we use a loader/dumper
// to reload it in memory // to reload it in memory
$localRepo = new InstalledArrayRepository(array()); $localRepo = new InstalledArrayRepository(array());
$loader = new ArrayLoader(); $loader = new ArrayLoader(null, true);
$dumper = new ArrayDumper(); $dumper = new ArrayDumper();
foreach ($tempLocalRepo->getCanonicalPackages() as $pkg) { foreach ($tempLocalRepo->getCanonicalPackages() as $pkg) {
$localRepo->addPackage($loader->load($dumper->dump($pkg))); $localRepo->addPackage($loader->load($dumper->dump($pkg)));

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

@ -29,7 +29,7 @@ class ArrayLoader implements LoaderInterface
protected $versionParser; protected $versionParser;
protected $loadOptions; protected $loadOptions;
public function __construct(SemverVersionParser $parser = null, $loadOptions = true) public function __construct(SemverVersionParser $parser = null, $loadOptions = false)
{ {
if (!$parser) { if (!$parser) {
$parser = new VersionParser; $parser = new VersionParser;

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

@ -150,6 +150,7 @@ class ArrayLoaderTest extends \PHPUnit_Framework_TestCase
$package = $this->loader->load($config); $package = $this->loader->load($config);
$dumper = new ArrayDumper; $dumper = new ArrayDumper;
$expectedConfig = $config; $expectedConfig = $config;
$expectedConfig = $this->fixConfigWhenLoadConfigIsFalse($config);
$this->assertEquals($expectedConfig, $dumper->dump($package)); $this->assertEquals($expectedConfig, $dumper->dump($package));
} }