Abstracted validateDiffInput function out of diff function.

Author: Junade Ali

src/Differ.php

@@ -41,44 +41,22 @@ public function __construct($header = "--- Original\n+++ New\n", $showNonDiffLin
     /**
      * Returns the diff between two arrays or strings as string.
      *
-     * @param array|string             $from
-     * @param array|string             $to
+     * @param array|string $from
+     * @param array|string $to
      * @param LongestCommonSubsequence $lcs
      *
      * @return string
      */
     public function diff($from, $to, LongestCommonSubsequence $lcs = null)
     {
-        if (!is_array($from) && !is_string($from)) {
-            $from = (string) $from;
-        }
+        $from = $this->validateDiffInput($from);
 
-        if (!is_array($to) && !is_string($to)) {
-            $to = (string) $to;
-        }
+        $to = $this->validateDiffInput($to);
 
         $buffer = $this->header;
         $diff   = $this->diffToArray($from, $to, $lcs);
 
-        $inOld = false;
-        $i     = 0;
-        $old   = array();
-
-        foreach ($diff as $line) {
-            if ($line[1] ===  0 /* OLD */) {
-                if ($inOld === false) {
-                    $inOld = $i;
-                }
-            } elseif ($inOld !== false) {
-                if (($i - $inOld) > 5) {
-                    $old[$inOld] = $i - 1;
-                }
-
-                $inOld = false;
-            }
-
-            ++$i;
-        }
+        $old = $this->checkIfDiffInOld($diff);
 
         $start = isset($old[0]) ? $old[0] : 0;
         $end   = count($diff);
@@ -91,7 +69,7 @@ public function diff($from, $to, LongestCommonSubsequence $lcs = null)
 
         for ($i = $start; $i < $end; $i++) {
             if (isset($old[$i])) {
-                $buffer  .= "\n";
+                $buffer .= "\n";
                 $newChunk = true;
                 $i        = $old[$i];
             }
@@ -115,6 +93,54 @@ public function diff($from, $to, LongestCommonSubsequence $lcs = null)
         return $buffer;
     }
 
+    /**
+     * Casts variable to string if it is not a string or array.
+     *
+     * @param $input
+     *
+     * @return string
+     */
+    private function validateDiffInput($input)
+    {
+        if ( ! is_array($input) && ! is_string($input)) {
+            return (string)$input;
+        } else {
+            return $input;
+        }
+    }
+
+    /**
+     * Takes input of the diff array and returns the old array.
+     * Iterates through diff line by line,
+     * @param array $diff
+     *
+     * @return array
+     */
+    private function checkIfDiffInOld(Array $diff)
+    {
+        $inOld = false;
+        $i     = 0;
+        $old   = array();
+
+        foreach ($diff as $line) {
+            if ($line[1] === 0 /* OLD */) {
+                if ($inOld === false) {
+                    $inOld = $i;
+                }
+            } elseif ($inOld !== false) {
+                if (($i - $inOld) > 5) {
+                    $old[$inOld] = $i - 1;
+                }
+
+                $inOld = false;
+            }
+
+            ++$i;
+        }
+
+        return $old;
+    }
+
     /**
      * Returns the diff between two arrays or strings as array.
      *
@@ -126,8 +152,8 @@ public function diff($from, $to, LongestCommonSubsequence $lcs = null)
      * - 1: ADDED: $token was added to $from
      * - 0: OLD: $token is not changed in $to
      *
-     * @param array|string             $from
-     * @param array|string             $to
+     * @param array|string $from
+     * @param array|string $to
      * @param LongestCommonSubsequence $lcs
      *
      * @return array
@@ -180,9 +206,11 @@ public function diffToArray($from, $to, LongestCommonSubsequence $lcs = null)
 
         if (isset($fromMatches[0]) && $toMatches[0] &&
             count($fromMatches[0]) === count($toMatches[0]) &&
-            $fromMatches[0] !== $toMatches[0]) {
+            $fromMatches[0] !== $toMatches[0]
+        ) {
             $diff[] = array(
-              '#Warning: Strings contain different line endings!', 0
+                '#Warning: Strings contain different line endings!',
+                0
             );
         }