snebes / php-daisydiff

src/RangeDifferencer/RangeComparatorLCS.php

Spacing +2 added lines, -2 removed lines

@@ -159,8 +159,8 @@
             if ($s1 != -1 &&
                 ($s1 + 1 < $this->comparator1->getRangeCount() || $s2 + 1 < $this->comparator2->getRangeCount())) {
                 // TODO: we need to find the proper way of representing an append.
-                $leftStart  = $s1 < $this->comparator1->getRangeCount()? $s1 + 1 : $s1;
-                $rightStart = $s2 < $this->comparator2->getRangeCount()? $s2 + 1 : $s2;
+                $leftStart  = $s1 < $this->comparator1->getRangeCount() ? $s1 + 1 : $s1;
+                $rightStart = $s2 < $this->comparator2->getRangeCount() ? $s2 + 1 : $s2;
 
                 // TODO: We need to confirm that this is the proper order.
                 $differences[] = new RangeDifference(

Braces +1 added lines, -2 removed lines

@@ -135,8 +135,7 @@
                     // There is a diff at the beginning.
                     // TODO: We need to confirm that this is the proper order.
                     $differences[] = new RangeDifference(RangeDifference::CHANGE, 0, $end2, 0, $end1);
-                }
-                elseif ($end1 != $s1 + 1 || $end2 != $s2 + 1) {
+                } elseif ($end1 != $s1 + 1 || $end2 != $s2 + 1) {
                     // A diff was found on one of the sides.
                     $leftStart   = $s1 + 1;
                     $leftLength  = $end1 - $leftStart;

src/RangeDifferencer/RangeDifferencer.php

Braces +2 added lines, -4 removed lines

@@ -101,11 +101,9 @@
             // Take the next diff that is closer to the start.
             if (null === $myIter->getDifference()) {
                 $startThread = $yourIter;
-            }
-            elseif (null === $yourIter->getDifference()) {
+            } elseif (null === $yourIter->getDifference()) {
                 $startThread = $myIter;
-            }
-            else {
+            } else {
                 // Not at end of both scripts take the lowest range.
                 if ($myIter->getDifference()->leftStart() <= $yourIter->getDifference()->leftStart()) {
                     $startThread = $myIter;

src/RangeDifferencer/Core/LCS.php

Spacing +3 added lines, -3 removed lines

@@ -162,14 +162,14 @@
         $M = $topL2 - $bottomL2 + 1;
 
         $delta  = $N - $M;
-        $isEven = ($delta & 1) == 1? false : true;
+        $isEven = ($delta & 1) == 1 ? false : true;
 
         $limit = min($this->maxDifferences, intval(ceil(($N + $M + 1) / 2)));
 
         // Offset to make it odd/even.
         // a 0 or 1 that we add to the start offset to make it odd/even
-        $valueToAddForward  = ($M & 1) == 1? 1 : 0;
-        $valueToAddBackward = ($N & 1) == 1? 1 : 0;
+        $valueToAddForward  = ($M & 1) == 1 ? 1 : 0;
+        $valueToAddBackward = ($N & 1) == 1 ? 1 : 0;
 
         $startForward  = -$M;
         $endForward    = $N;

Braces +3 added lines, -6 removed lines

@@ -253,8 +253,7 @@ 
                 if ($x <= 0) {
                     $startBackward = $k + 1;
                     $valueToAddBackward = 0;
-                }
-                elseif ($y <= 0 && $endBackward > $k - 1) {
+                } elseif ($y <= 0 && $endBackward > $k - 1) {
                     $endBackward = $k - 1;
                 }
             }
@@ -324,8 +323,7 @@ 
                 $maxProgress[0][0] = $x;
                 $maxProgress[0][1] = $y;
                 $maxProgress[0][2] = $progress;
-            }
-            elseif ($progress == $maxProgress[0][2]) {
+            } elseif ($progress == $maxProgress[0][2]) {
                 $numProgress++;
                 $maxProgress[$numProgress][0] = $x;
                 $maxProgress[$numProgress][1] = $y;
@@ -353,8 +351,7 @@ 
                 $maxProgress[0][0] = $x;
                 $maxProgress[0][1] = $y;
                 $maxProgress[0][2] = $progress;
-            }
-            elseif ($progress == $maxProgress[0][2] && !$maxProgressForward) {
+            } elseif ($progress == $maxProgress[0][2] && !$maxProgressForward) {
                 $numProgress++;
                 $maxProgress[$numProgress][0] = $x;
                 $maxProgress[$numProgress][1] = $y;

src/RangeDifferencer/OldDifferencer.php

Spacing +2 added lines, -2 removed lines

@@ -63,8 +63,8 @@
         $lastDiagonal[$origin] = $row;
         $script[$origin] = null;
 
-        $lower = ($row == $rightSize)? $origin + 1 : $origin - 1;
-        $upper = ($row == $leftSize)?  $origin - 1 : $origin + 1;
+        $lower = ($row == $rightSize) ? $origin + 1 : $origin - 1;
+        $upper = ($row == $leftSize) ? $origin - 1 : $origin + 1;
 
         if ($lower > $upper) {
             return [];

src/RangeDifferencer/RangeDifference.php

Spacing +6 added lines, -6 removed lines

@@ -206,12 +206,12 @@
     public function equals(RangeDifference $other): bool
     {
         return
-            $this->kind           == $other->kind() &&
-            $this->leftStart      == $other->leftStart() &&
-            $this->leftLength     == $other->leftLength() &&
-            $this->rightStart     == $other->rightStart() &&
-            $this->rightLength    == $other->rightLength() &&
-            $this->ancestorStart  == $other->ancestorStart() &&
+            $this->kind == $other->kind() &&
+            $this->leftStart == $other->leftStart() &&
+            $this->leftLength == $other->leftLength() &&
+            $this->rightStart == $other->rightStart() &&
+            $this->rightLength == $other->rightLength() &&
+            $this->ancestorStart == $other->ancestorStart() &&
             $this->ancestorLength == $other->ancestorLength()
         ;
     }

src/Html/Ancestor/TextOnlyComparator.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
             $distanceThis += $d->getRightLength();
         }
 
-        return (float)((0.0 + $distanceOther) / $other->getRangeCount() +
+        return (float) ((0.0 + $distanceOther) / $other->getRangeCount() +
                 (0.0 + $distanceThis) / $this->getRangeCount()) / 2;
     }
 }