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

CS fixes

pull/4141/merge
Jordi Boggiano 2015-10-25 15:19:15 +00:00
parent 2e75cde60a
commit 3d9daea6a0
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Composer/Factory.php
View File

@ -61,7 +61,7 @@ class Factory
} }
/** /**
* @param string $home * @param string $home
* @return string * @return string
*/ */
protected static function getCacheDir($home) protected static function getCacheDir($home)
@ -411,8 +411,8 @@ class Factory
} }
/** /**
* @param Config $config The configuration * @param Config $config The configuration
* @param Downloader\DownloadManager $dm Manager use to download sources * @param Downloader\DownloadManager $dm Manager use to download sources
* @return Archiver\ArchiveManager * @return Archiver\ArchiveManager
*/ */
public function createArchiveManager(Config $config, Downloader\DownloadManager $dm = null) public function createArchiveManager(Config $config, Downloader\DownloadManager $dm = null)

7
src/Composer/Installer/InstallationManager.php
View File

@ -234,10 +234,9 @@ class InstallationManager
public function notifyInstalls(IOInterface $io) public function notifyInstalls(IOInterface $io)
{ {
foreach ($this->notifiablePackages as $repoUrl => $packages) { foreach ($this->notifiablePackages as $repoUrl => $packages) {
$repositoryName = parse_url ($repoUrl, PHP_URL_HOST); $repositoryName = parse_url($repoUrl, PHP_URL_HOST);
if ($io->hasAuthentication ($repositoryName)) if ($io->hasAuthentication($repositoryName)) {
{ $auth = $io->getAuthentication($repositoryName);
$auth = $io->getAuthentication ($repositoryName);
$authStr = base64_encode($auth['username'] . ':' . $auth['password']); $authStr = base64_encode($auth['username'] . ':' . $auth['password']);
$authHeader = 'Authorization: Basic '.$authStr; $authHeader = 'Authorization: Basic '.$authStr;
} }

2
tests/Composer/Test/Package/Archiver/ArchiveManagerTest.php
View File

@ -82,7 +82,7 @@ class ArchiveManagerTest extends ArchiverTest
protected function getTargetName(PackageInterface $package, $format, $fileName = null) protected function getTargetName(PackageInterface $package, $format, $fileName = null)
{ {
if(null === $fileName) { if (null === $fileName) {
$packageName = $this->manager->getPackageFilename($package); $packageName = $this->manager->getPackageFilename($package);
} else { } else {
$packageName = $fileName; $packageName = $fileName;