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

Use parse_url instead of manual parsing

pull/308/head
Jordi Boggiano 2012-02-17 12:13:56 +01:00
parent 8b7a64ab28
commit 60fddb2c09
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Composer/Util/RemoteFilesystem.php
View File

@ -96,7 +96,7 @@ class RemoteFilesystem
$auth = $this->io->getAuthorization($originUrl); $auth = $this->io->getAuthorization($originUrl);
$authStr = base64_encode($auth['username'] . ':' . $auth['password']); $authStr = base64_encode($auth['username'] . ':' . $auth['password']);
$options['http']['header'] = "Authorization: Basic $authStr\r\n"; $options['http']['header'] = "Authorization: Basic $authStr\r\n";
} else if (null !== $this->io->getLastUsername()) { } elseif (null !== $this->io->getLastUsername()) {
$authStr = base64_encode($this->io->getLastUsername() . ':' . $this->io->getLastPassword()); $authStr = base64_encode($this->io->getLastUsername() . ':' . $this->io->getLastPassword());
$options['http'] = array('header' => "Authorization: Basic $authStr\r\n"); $options['http'] = array('header' => "Authorization: Basic $authStr\r\n");
$this->io->setAuthorization($originUrl, $this->io->getLastUsername(), $this->io->getLastPassword()); $this->io->setAuthorization($originUrl, $this->io->getLastUsername(), $this->io->getLastPassword());
@ -161,7 +161,7 @@ class RemoteFilesystem
throw new \RuntimeException($mess); throw new \RuntimeException($mess);
} }
$this->io->overwrite(' Authorization required (<info>' .$this->getHostname($this->fileUrl).'</info>):'); $this->io->overwrite(' Authorization required (<info>'.parse_url($this->fileUrl, PHP_URL_HOST).'</info>):');
$username = $this->io->ask(' Username: '); $username = $this->io->ask(' Username: ');
$password = $this->io->askAndHideAnswer(' Password: '); $password = $this->io->askAndHideAnswer(' Password: ');
$this->io->setAuthorization($this->originUrl, $username, $password); $this->io->setAuthorization($this->originUrl, $username, $password);
@ -195,19 +195,4 @@ class RemoteFilesystem
break; break;
} }
} }
/**
* Get the hostname.
*
* @param string $url The file URL
*
* @return string The hostname
*/
protected function getHostname($url)
{
$host = substr($url, strpos($url, '://') + 3);
$host = substr($host, 0, strpos($host, '/'));
return $host;
}
} }