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

Merge pull request #6903 from carusogabriel/clean-else 

Clean elses
pull/6907/merge
Jordi Boggiano 2017-12-16 21:48:04 +01:00 committed by GitHub
parent 84f5a1a7e8 32a409a3ee
commit b8bcc375fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/DependencyResolver/RuleWatchNode.php
View File

@ -90,9 +90,9 @@ class RuleWatchNode
{ {
if ($this->watch1 == $literal) { if ($this->watch1 == $literal) {
return $this->watch2; return $this->watch2;
} else {
return $this->watch1;
} }
return $this->watch1;
} }
/** /**

4
src/Composer/Package/Archiver/HgExcludeFilter.php
View File

@ -70,9 +70,9 @@ class HgExcludeFilter extends BaseExcludeFilter
if ($this->patternMode == self::HG_IGNORE_GLOB) { if ($this->patternMode == self::HG_IGNORE_GLOB) {
return $this->patternFromGlob($line); return $this->patternFromGlob($line);
} else {
return $this->patternFromRegex($line);
} }
return $this->patternFromRegex($line);
} }
/** /**

4
src/Composer/Util/Perforce.php
View File

@ -425,7 +425,8 @@ class Perforce
$path = $identifier. '/' . $file; $path = $identifier. '/' . $file;
return $path; return $path;
} else { }
$path = substr($identifier, 0, $index) . '/' . $file . substr($identifier, $index); $path = substr($identifier, 0, $index) . '/' . $file . substr($identifier, $index);
$command = $this->generateP4Command(' files ' . $path, false); $command = $this->generateP4Command(' files ' . $path, false);
$this->executeCommand($command); $this->executeCommand($command);
@ -440,7 +441,6 @@ class Perforce
return substr($identifier, 0, $index) . '/' . $file . '@' . $fields[1]; return substr($identifier, 0, $index) . '/' . $file . '@' . $fields[1];
} }
} }
}
return null; return null;
} }