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

Merge pull request #154 from webfactory/fix_driver_detection 

Fix driver detection
pull/108/merge
Jordi Boggiano 2011-12-12 03:40:28 -08:00
parent 0767cdca14 ebbc807de0
commit 82a2a1f7ac
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Composer/Repository/ComposerRepository.php
View File

@ -26,7 +26,8 @@ class ComposerRepository extends ArrayRepository
public function __construct(array $config)
{
if (!preg_match('{^https?://}', $config['url'])) {
if (!preg_match('{^\w+://}', $config['url'])) {
// assume http as the default protocol
$config['url'] = 'http://'.$config['url'];
}
$config['url'] = rtrim($config['url'], '/');

5
src/Composer/Repository/Vcs/HgDriver.php
View File

@ -180,8 +180,7 @@ class HgDriver implements VcsDriverInterface
return false;
}
exec(sprintf('hg identify %s', escapeshellarg($url)), $output);
return (boolean)$output;
exec(sprintf('hg identify %s', escapeshellarg($url)), $ignored, $exit);
return $exit === 0;
}
}

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

@ -178,7 +178,7 @@ class SvnDriver implements VcsDriverInterface
return false;
}
exec(sprintf('svn info --non-interactive %s', escapeshellarg($url)), $output);
return preg_match('{^Repository UUID:}m', implode("\n", $output)) >= 1;
exec(sprintf('svn info --non-interactive %s 2>/dev/null', escapeshellarg($url)), $ignored, $exit);
return $exit === 0;
}
}