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

Reformat code to follow coding style

pull/2681/head
Nils Adermann 2014-02-06 23:06:48 +01:00
parent 410181ee29
commit f2c48788b8
1 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Composer/Package/Loader/RootPackageLoader.php
View File

@ -186,8 +186,6 @@ class RootPackageLoader extends ArrayLoader
return $this->guessSvnVersion($config); return $this->guessSvnVersion($config);
} }
return null;
} }
private function guessGitVersion(array $config) private function guessGitVersion(array $config)
@ -307,30 +305,14 @@ class RootPackageLoader extends ArrayLoader
{ {
// try to fetch current version from svn // try to fetch current version from svn
if (0 === $this->process->execute('svn info --xml', $output)) { if (0 === $this->process->execute('svn info --xml', $output)) {
$trunkPath = isset($config['trunk-path']) ? preg_quote($config['trunk-path'], '#') : 'trunk';
$branchesPath = isset($config['branches-path']) ? preg_quote($config['branches-path'], '#') : 'branches';
$tagsPath = isset($config['tags-path']) ? preg_quote($config['tags-path'], '#') : 'tags';
$regexDelimiter = '#'; $urlPattern = '#<url>.*/('.$trunkPath.'|('.$branchesPath.'|'. $tagsPath .')/(.*))</url>#';
$trunkPath =
isset($config['trunk-path'])
? preg_quote($config['trunk-path'], $regexDelimiter)
: 'trunk';
$branchesPath =
isset($config['branches-path'])
? preg_quote($config['branches-path'], $regexDelimiter)
: 'branches';
$tagsPath =
isset($config['tags-path'])
? preg_quote($config['tags-path'], $regexDelimiter)
: 'tags';
$urlPattern = $regexDelimiter
. '<url>.*/(' . $trunkPath . '|(' . $branchesPath . '|' . $tagsPath .')/(.*))</url>'
. $regexDelimiter;
if (preg_match($urlPattern, $output, $matches)) { if (preg_match($urlPattern, $output, $matches)) {
if(isset($matches[2]) && isset($matches[3]) && $branchesPath === $matches[2]) { if (isset($matches[2]) && $branchesPath === $matches[2]) {
// we are in a branches path // we are in a branches path
$version = $this->versionParser->normalizeBranch($matches[3]); $version = $this->versionParser->normalizeBranch($matches[3]);
if ('9999999-dev' === $version) { if ('9999999-dev' === $version) {