From fc3fbdeab3355c2c9d03e496c41b1a3bb9565a49 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Wed, 20 Nov 2013 15:17:10 +0100
Subject: [PATCH] Rename a few things

---
 .../LinkConstraint/VersionConstraint.php      | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/Composer/Package/LinkConstraint/VersionConstraint.php b/src/Composer/Package/LinkConstraint/VersionConstraint.php
index 9bf5e515b..cd2336227 100644
--- a/src/Composer/Package/LinkConstraint/VersionConstraint.php
+++ b/src/Composer/Package/LinkConstraint/VersionConstraint.php
@@ -60,19 +60,20 @@ class VersionConstraint extends SpecificConstraint
         return version_compare($a, $b, $operator);
     }
 
+    /**
+     * @param  VersionConstraint $provider
+     * @param  bool              $compareBranches
+     * @return bool
+     */
     public function matchSpecific(VersionConstraint $provider, $compareBranches = false)
     {
-        static $c = array();
-        if (isset($c[$this->operator][$this->version][$provider->operator][$provider->version][$compareBranches])) {
-            //if ($c[$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];
+        static $cache = array();
+        if (isset($cache[$this->operator][$this->version][$provider->operator][$provider->version][$compareBranches])) {
+            return $cache[$this->operator][$this->version][$provider->operator][$provider->version][$compareBranches];
         }
 
-        return $c[$this->operator][$this->version][$provider->operator][$provider->version][$compareBranches] =
-            $this->_matchSpecific($provider, $compareBranches);
+        return $cache[$this->operator][$this->version][$provider->operator][$provider->version][$compareBranches] =
+            $this->doMatchSpecific($provider, $compareBranches);
     }
 
     /**
@@ -80,7 +81,7 @@ class VersionConstraint extends SpecificConstraint
      * @param  bool              $compareBranches
      * @return bool
      */
-    public function _matchSpecific(VersionConstraint $provider, $compareBranches = false)
+    private function doMatchSpecific(VersionConstraint $provider, $compareBranches = false)
     {
         $noEqualOp = str_replace('=', '', $this->operator);
         $providerNoEqualOp = str_replace('=', '', $provider->operator);