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

Fixes for SVN support, fixes #172

pull/258/head
Jordi Boggiano 2012-02-24 10:17:59 +01:00
parent c0b18bddb9
commit 773338a688
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Composer/Repository/Vcs/SvnDriver.php
View File

@ -71,6 +71,7 @@ class SvnDriver extends VcsDriver implements VcsDriverInterface
*/ */
public function getComposerInformation($identifier) public function getComposerInformation($identifier)
{ {
$identifier = '/' . trim($identifier, '/') . '/';
if (!isset($this->infoCache[$identifier])) { if (!isset($this->infoCache[$identifier])) {
preg_match('{^(.+?)(@\d+)?$}', $identifier, $match); preg_match('{^(.+?)(@\d+)?$}', $identifier, $match);
if (!empty($match[2])) { if (!empty($match[2])) {
@ -141,7 +142,7 @@ class SvnDriver extends VcsDriver implements VcsDriverInterface
unset($output); unset($output);
$this->process->execute(sprintf('svn ls --verbose --non-interactive %s', escapeshellarg($this->baseUrl.'/branches')), $output); $this->process->execute(sprintf('svn ls --verbose --non-interactive %s', escapeshellarg($this->baseUrl.'/branches')), $output);
foreach ($this->process->splitLines($output) as $line) { foreach ($this->process->splitLines(trim($output)) as $line) {
preg_match('{^\s*(\S+).*?(\S+)\s*$}', $line, $match); preg_match('{^\s*(\S+).*?(\S+)\s*$}', $line, $match);
if ($match[2] === './') { if ($match[2] === './') {
continue; continue;