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

Rename a few things

pull/2453/head
Jordi Boggiano 2013-11-20 15:17:10 +01:00
parent e2f7e4871f
commit fc3fbdeab3
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Composer/Package/LinkConstraint/VersionConstraint.php
View File

@ -60,19 +60,20 @@ class VersionConstraint extends SpecificConstraint
return version_compare($a, $b, $operator); return version_compare($a, $b, $operator);
} }
/**
* @param VersionConstraint $provider
* @param bool $compareBranches
* @return bool
*/
public function matchSpecific(VersionConstraint $provider, $compareBranches = false) public function matchSpecific(VersionConstraint $provider, $compareBranches = false)
{ {
static $c = array(); static $cache = array();
if (isset($c[$this->operator][$this->version][$provider->operator][$provider->version][$compareBranches])) { if (isset($cache[$this->operator][$this->version][$provider->operator][$provider->version][$compareBranches])) {
//if ($c[$this->operator][$this->version][$provider->operator][$provider->version][$compareBranches] != return $cache[$this->operator][$this->version][$provider->operator][$provider->version][$compareBranches];
// $this->_matchSpecific($provider, $compareBranches)) {
// throw new \Exception('Broken cache');
//}
return $c[$this->operator][$this->version][$provider->operator][$provider->version][$compareBranches];
} }
return $c[$this->operator][$this->version][$provider->operator][$provider->version][$compareBranches] = return $cache[$this->operator][$this->version][$provider->operator][$provider->version][$compareBranches] =
$this->_matchSpecific($provider, $compareBranches); $this->doMatchSpecific($provider, $compareBranches);
} }
/** /**
@ -80,7 +81,7 @@ class VersionConstraint extends SpecificConstraint
* @param bool $compareBranches * @param bool $compareBranches
* @return bool * @return bool
*/ */
public function _matchSpecific(VersionConstraint $provider, $compareBranches = false) private function doMatchSpecific(VersionConstraint $provider, $compareBranches = false)
{ {
$noEqualOp = str_replace('=', '', $this->operator); $noEqualOp = str_replace('=', '', $this->operator);
$providerNoEqualOp = str_replace('=', '', $provider->operator); $providerNoEqualOp = str_replace('=', '', $provider->operator);