Merge branch 'master' into development

Author: JBlond

lib/jblond/Diff/SequenceMatcher.php

@@ -130,51 +130,51 @@ public function setOptions($options)
     /**
      * Set the first and second sequences to use with the sequence matcher.
      *
-     * @param string|array $a A string or array containing the lines to compare against.
-     * @param string|array $b A string or array containing the lines to compare.
+     * @param string|array $partA A string or array containing the lines to compare against.
+     * @param string|array $partB A string or array containing the lines to compare.
      */
-    public function setSequences($a, $b)
+    public function setSequences($partA, $partB)
     {
-        $this->setSeq1($a);
-        $this->setSeq2($b);
+        $this->setSeq1($partA);
+        $this->setSeq2($partB);
     }
 
     /**
-     * Set the first sequence ($a) and reset any internal caches to indicate that
+     * Set the first sequence ($partA) and reset any internal caches to indicate that
      * when calling the calculation methods, we need to recalculate them.
      *
-     * @param string|array $a The sequence to set as the first sequence.
+     * @param string|array $partA The sequence to set as the first sequence.
      */
-    public function setSeq1($a)
+    public function setSeq1($partA)
     {
-        if (!is_array($a)) {
-            $a = str_split($a);
+        if (!is_array($partA)) {
+            $partA = str_split($partA);
         }
-        if ($a == $this->a) {
+        if ($partA == $this->a) {
             return;
         }
 
-        $this->a = $a;
+        $this->a = $partA;
         $this->matchingBlocks = null;
         $this->opCodes = null;
     }
 
     /**
-     * Set the second sequence ($b) and reset any internal caches to indicate that
+     * Set the second sequence ($partB) and reset any internal caches to indicate that
      * when calling the calculation methods, we need to recalculate them.
      *
-     * @param string|array $b The sequence to set as the second sequence.
+     * @param string|array $partB The sequence to set as the second sequence.
      */
-    public function setSeq2($b)
+    public function setSeq2($partB)
     {
-        if (!is_array($b)) {
-            $b = str_split($b);
+        if (!is_array($partB)) {
+            $partB = str_split($partB);
         }
-        if ($b == $this->b) {
+        if ($partB == $this->b) {
             return;
         }
 
-        $this->b = $b;
+        $this->b = $partB;
         $this->matchingBlocks = null;
         $this->opCodes = null;
         $this->fullBCount = null;