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

Fix missing var ref, refs #5117

pull/5124/head
Jordi Boggiano 2016-03-27 13:25:07 +01:00
parent 6a88d49ffb
commit 9af645ef50
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/Installer/PearBinaryInstaller.php
View File

@ -27,6 +27,7 @@ use Composer\Util\Silencer;
class PearBinaryInstaller extends BinaryInstaller class PearBinaryInstaller extends BinaryInstaller
{ {
private $installer; private $installer;
private $vendorDir;
/** /**
* @param IOInterface $io * @param IOInterface $io
@ -34,10 +35,11 @@ class PearBinaryInstaller extends BinaryInstaller
* @param string $binCompat * @param string $binCompat
* @param Filesystem $filesystem * @param Filesystem $filesystem
*/ */
public function __construct(IOInterface $io, $binDir, $binCompat, Filesystem $filesystem, PearInstaller $installer) public function __construct(IOInterface $io, $binDir, $vendorDir, $binCompat, Filesystem $filesystem, PearInstaller $installer)
{ {
parent::__construct($io, $binDir, $binCompat, $filesystem); parent::__construct($io, $binDir, $binCompat, $filesystem);
$this->installer = $installer; $this->installer = $installer;
$this->vendorDir = $vendorDir;
} }
protected function getBinaries(PackageInterface $package) protected function getBinaries(PackageInterface $package)

2
src/Composer/Installer/PearInstaller.php
View File

@ -39,7 +39,7 @@ class PearInstaller extends LibraryInstaller
public function __construct(IOInterface $io, Composer $composer, $type = 'pear-library') public function __construct(IOInterface $io, Composer $composer, $type = 'pear-library')
{ {
$filesystem = new Filesystem(); $filesystem = new Filesystem();
$binaryInstaller = new PearBinaryInstaller($io, rtrim($composer->getConfig()->get('bin-dir'), '/'), $composer->getConfig()->get('bin-compat'), $filesystem, $this); $binaryInstaller = new PearBinaryInstaller($io, rtrim($composer->getConfig()->get('bin-dir'), '/'), rtrim($composer->getConfig()->get('vendor-dir'), '/'), $composer->getConfig()->get('bin-compat'), $filesystem, $this);
parent::__construct($io, $composer, $type, $filesystem, $binaryInstaller); parent::__construct($io, $composer, $type, $filesystem, $binaryInstaller);
} }