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

Rename module-path to package-path

pull/1819/head
Andrey Utkin 2013-04-27 22:20:50 +07:00
parent 9022b0ae38
commit 28c219311c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,7 @@ class SvnDriver extends VcsDriver
protected $trunkPath = 'trunk'; protected $trunkPath = 'trunk';
protected $branchesPath = 'branches'; protected $branchesPath = 'branches';
protected $tagsPath = 'tags'; protected $tagsPath = 'tags';
protected $modulePath = ''; protected $packagePath = '';
/** /**
* @var \Composer\Util\Svn * @var \Composer\Util\Svn
@ -59,8 +59,8 @@ class SvnDriver extends VcsDriver
if (isset($this->repoConfig['tags-path'])) { if (isset($this->repoConfig['tags-path'])) {
$this->tagsPath = $this->repoConfig['tags-path']; $this->tagsPath = $this->repoConfig['tags-path'];
} }
if (isset($this->repoConfig['module-path'])) { if (isset($this->repoConfig['package-path'])) {
$this->modulePath = '/' . trim($this->repoConfig['module-path'], '/'); $this->packagePath = '/' . trim($this->repoConfig['package-path'], '/');
} }
if (false !== ($pos = strrpos($this->url, '/' . $this->trunkPath))) { if (false !== ($pos = strrpos($this->url, '/' . $this->trunkPath))) {
@ -171,7 +171,7 @@ class SvnDriver extends VcsDriver
$line = trim($line); $line = trim($line);
if ($line && preg_match('{^\s*(\S+).*?(\S+)\s*$}', $line, $match)) { if ($line && preg_match('{^\s*(\S+).*?(\S+)\s*$}', $line, $match)) {
if (isset($match[1]) && isset($match[2]) && $match[2] !== './') { if (isset($match[1]) && isset($match[2]) && $match[2] !== './') {
$this->tags[rtrim($match[2], '/')] = $this->buildModuleId( $this->tags[rtrim($match[2], '/')] = $this->buildIdentifier(
'/' . $this->tagsPath . '/' . $match[2], '/' . $this->tagsPath . '/' . $match[2],
$match[1] $match[1]
); );
@ -199,7 +199,7 @@ class SvnDriver extends VcsDriver
$line = trim($line); $line = trim($line);
if ($line && preg_match('{^\s*(\S+).*?(\S+)\s*$}', $line, $match)) { if ($line && preg_match('{^\s*(\S+).*?(\S+)\s*$}', $line, $match)) {
if (isset($match[1]) && isset($match[2]) && $match[2] === $this->trunkPath . '/') { if (isset($match[1]) && isset($match[2]) && $match[2] === $this->trunkPath . '/') {
$this->branches[$this->trunkPath] = $this->buildModuleId( $this->branches[$this->trunkPath] = $this->buildIdentifier(
'/' . $this->trunkPath, '/' . $this->trunkPath,
$match[1] $match[1]
); );
@ -218,7 +218,7 @@ class SvnDriver extends VcsDriver
$line = trim($line); $line = trim($line);
if ($line && preg_match('{^\s*(\S+).*?(\S+)\s*$}', $line, $match)) { if ($line && preg_match('{^\s*(\S+).*?(\S+)\s*$}', $line, $match)) {
if (isset($match[1]) && isset($match[2]) && $match[2] !== './') { if (isset($match[1]) && isset($match[2]) && $match[2] !== './') {
$this->branches[rtrim($match[2], '/')] = $this->buildModuleId( $this->branches[rtrim($match[2], '/')] = $this->buildIdentifier(
'/' . $this->branchesPath . '/' . $match[2], '/' . $this->branchesPath . '/' . $match[2],
$match[1] $match[1]
); );
@ -314,16 +314,16 @@ class SvnDriver extends VcsDriver
} }
/** /**
* Build module identifier respecting the module-path config option * Build the identifier respecting "package-path" config option
* *
* @param string $baseDir The path to trunk/branch/tag * @param string $baseDir The path to trunk/branch/tag
* @param int $revision The revision mark to add to identifier * @param int $revision The revision mark to add to identifier
* *
* @return string * @return string
*/ */
protected function buildModuleId($baseDir, $revision) protected function buildIdentifier($baseDir, $revision)
{ {
return rtrim($baseDir, '/') . $this->modulePath . '/@' . $revision; return rtrim($baseDir, '/') . $this->packagePath . '/@' . $revision;
} }
} }