Fix CS/WS issues

Author: sebastianbergmann

src/Differ.php

@@ -81,25 +81,23 @@ public function __construct($header = "--- Original\n+++ New\n")
     public function diff($from, $to)
     {
         $buffer = $this->header;
-        $diff   = $this->diffToArray($from,$to);
+        $diff   = $this->diffToArray($from, $to);
 
-        $inOld = FALSE;
+        $inOld = false;
         $i     = 0;
         $old   = array();
 
         foreach ($diff as $line) {
             if ($line[1] ===  0 /* OLD */) {
-                if ($inOld === FALSE) {
+                if ($inOld === false) {
                     $inOld = $i;
                 }
-            }
-
-            else if ($inOld !== FALSE) {
+            } elseif ($inOld !== false) {
                 if (($i - $inOld) > 5) {
                     $old[$inOld] = $i - 1;
                 }
 
-                $inOld = FALSE;
+                $inOld = false;
             }
 
             ++$i;
@@ -112,29 +110,25 @@ public function diff($from, $to)
             $end = $tmp;
         }
 
-        $newChunk = TRUE;
+        $newChunk = true;
 
         for ($i = $start; $i < $end; $i++) {
             if (isset($old[$i])) {
                 $buffer  .= "\n";
-                $newChunk = TRUE;
+                $newChunk = true;
                 $i        = $old[$i];
             }
 
             if ($newChunk) {
                 $buffer  .= "@@ @@\n";
-                $newChunk = FALSE;
+                $newChunk = false;
             }
 
             if ($diff[$i][1] === 1 /* ADDED */) {
                 $buffer .= '+' . $diff[$i][0] . "\n";
-            }
-
-            else if ($diff[$i][1] === 2 /* REMOVED */) {
+            } elseif ($diff[$i][1] === 2 /* REMOVED */) {
                 $buffer .= '-' . $diff[$i][0] . "\n";
-            }
-
-            else {
+            } else {
                 $buffer .= ' ' . $diff[$i][0] . "\n";
             }
         }
@@ -197,7 +191,8 @@ public function diffToArray($from, $to)
         }
 
         $common = $this->longestCommonSubsequence(
-          array_values($from), array_values($to)
+            array_values($from),
+            array_values($to)
         );
 
         $diff = array();
@@ -232,11 +227,11 @@ public function diffToArray($from, $to)
             array_shift($to);
         }
 
-        while (($token = array_shift($from)) !== NULL) {
+        while (($token = array_shift($from)) !== null) {
             $diff[] = array($token, 2 /* REMOVED */);
         }
 
-        while (($token = array_shift($to)) !== NULL) {
+        while (($token = array_shift($to)) !== null) {
             $diff[] = array($token, 1 /* ADDED */);
         }
 
@@ -272,9 +267,9 @@ private function longestCommonSubsequence(array $from, array $to)
         for ($i = 1; $i <= $fromLength; ++$i) {
             for ($j = 1; $j <= $toLength; ++$j) {
                 $matrix[$i][$j] = max(
-                  $matrix[$i-1][$j],
-                  $matrix[$i][$j-1],
-                  $from[$i-1] === $to[$j-1] ? $matrix[$i-1][$j-1] + 1 : 0
+                    $matrix[$i-1][$j],
+                    $matrix[$i][$j-1],
+                    $from[$i-1] === $to[$j-1] ? $matrix[$i-1][$j-1] + 1 : 0
                 );
             }
         }
@@ -287,13 +282,9 @@ private function longestCommonSubsequence(array $from, array $to)
                 array_unshift($common, $from[$i-1]);
                 --$i;
                 --$j;
-            }
-
-            else if ($matrix[$i][$j-1] > $matrix[$i-1][$j]) {
+            } elseif ($matrix[$i][$j-1] > $matrix[$i-1][$j]) {
                 --$j;
-            }
-
-            else {
+            } else {
                 --$i;
             }
         }

src/Parser.php

@@ -119,13 +119,13 @@ private function parseFileDiff(Diff $diff, array $lines)
 
             while (count($lines) &&
                   (preg_match('(^(?P<type>[+ -])?(?P<line>.*))', $last = array_shift($lines), $match) ||
-                  (strpos($last, '\\ No newline at end of file' ) === 0))) {
+                  (strpos($last, '\\ No newline at end of file') === 0))) {
                 if (count($match)) {
                     $type = Line::UNCHANGED;
 
                     if ($match['type'] == '+') {
                         $type = Line::ADDED;
-                    } else if ($match['type'] == '-') {
+                    } elseif ($match['type'] == '-') {
                         $type = Line::REMOVED;
                     }