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

fix classname clashing cause of existing class in current namespace

pull/4446/head
Rob Bast 2015-09-24 16:48:46 +02:00
parent 3a289ed5c3
commit a1ad7fc435
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Composer/Package/Version/VersionGuesser.php
View File

@ -15,7 +15,7 @@ namespace Composer\Package\Version;
use Composer\Config; use Composer\Config;
use Composer\Repository\Vcs\HgDriver; use Composer\Repository\Vcs\HgDriver;
use Composer\IO\NullIO; use Composer\IO\NullIO;
use Composer\Semver\VersionParser; use Composer\Semver\VersionParser as BaseVersionParser;
use Composer\Util\Git as GitUtil; use Composer\Util\Git as GitUtil;
use Composer\Util\ProcessExecutor; use Composer\Util\ProcessExecutor;
use Composer\Util\Svn as SvnUtil; use Composer\Util\Svn as SvnUtil;
@ -39,7 +39,7 @@ class VersionGuesser
private $process; private $process;
/** /**
* @var VersionParser * @var BaseVersionParser
*/ */
private $versionParser; private $versionParser;
@ -48,7 +48,7 @@ class VersionGuesser
* @param ProcessExecutor $process * @param ProcessExecutor $process
* @param VersionParser $versionParser * @param VersionParser $versionParser
*/ */
public function __construct(Config $config, ProcessExecutor $process, VersionParser $versionParser) public function __construct(Config $config, ProcessExecutor $process, BaseVersionParser $versionParser)
{ {
$this->config = $config; $this->config = $config;
$this->process = $process; $this->process = $process;

4
src/Composer/Package/Version/VersionSelector.php
View File

@ -16,7 +16,7 @@ use Composer\DependencyResolver\Pool;
use Composer\Package\PackageInterface; use Composer\Package\PackageInterface;
use Composer\Package\Loader\ArrayLoader; use Composer\Package\Loader\ArrayLoader;
use Composer\Package\Dumper\ArrayDumper; use Composer\Package\Dumper\ArrayDumper;
use Composer\Semver\VersionParser; use Composer\Semver\VersionParser as BaseVersionParser;
/** /**
* Selects the best possible version for a package * Selects the best possible version for a package
@ -131,7 +131,7 @@ class VersionSelector
private function getParser() private function getParser()
{ {
if ($this->parser === null) { if ($this->parser === null) {
$this->parser = new VersionParser(); $this->parser = new BaseVersionParser();
} }
return $this->parser; return $this->parser;