Mistralys / text-diff

src/Diff.php

Spacing +17 added lines, -17 removed lines

@@ -65,7 +65,7 @@ 
     * @param bool $compare
     * @return Diff
     */
-    public function setCompareCharacters(bool $compare=true) : Diff
+    public function setCompareCharacters(bool $compare = true) : Diff
     {
         $this->compareCharacters = $compare;
         
@@ -157,7 +157,7 @@ 
      */
     public function toArray() : array
     {
-        if($this->disposed)
+        if ($this->disposed)
         {
             throw new DiffException(
                 'The diff has been disposed.',
@@ -189,14 +189,14 @@ 
         // skip any common prefix
         while ($start <= $end1 && $start <= $end2 && $this->sequence1[$start] === $this->sequence2[$start])
         {
-            $start ++;
+            $start++;
         }
         
         // skip any common suffix
         while ($end1 >= $start && $end2 >= $start && $this->sequence1[$end1] === $this->sequence2[$end2])
         {
-            $end1 --;
-            $end2 --;
+            $end1--;
+            $end2--;
         }
         
         // generate the partial diff
@@ -205,7 +205,7 @@ 
         // generate the full diff
         $diff = array();
         
-        for ($index = 0; $index < $start; $index ++)
+        for ($index = 0; $index < $start; $index++)
         {
             $diff[] = array($this->sequence1[$index], self::UNMODIFIED);
         }
@@ -215,7 +215,7 @@ 
             $diff[] = array_pop($partialDiff);
         }
         
-        for ($index = $end1 + 1; $index < $totalSequence; $index ++)
+        for ($index = $end1 + 1; $index < $totalSequence; $index++)
         {
             $diff[] = array($this->sequence1[$index], self::UNMODIFIED);
         }
@@ -238,7 +238,7 @@ 
     {
         $split = preg_split('/\R/', $string);
         
-        if(is_array($split))
+        if (is_array($split))
         {
             return $split;
         }
@@ -269,19 +269,19 @@ 
         $table = array(array_fill(0, $length2 + 1, 0));
         
         // loop over the rows
-        for ($index1 = 1; $index1 <= $length1; $index1 ++){
+        for ($index1 = 1; $index1 <= $length1; $index1++) {
             
             // create the new row
             $table[$index1] = array(0);
             
             // loop over the columns
-            for ($index2 = 1; $index2 <= $length2; $index2 ++){
+            for ($index2 = 1; $index2 <= $length2; $index2++) {
                 
                 // store the longest common subsequence length
                 if ($this->sequence1[$index1 + $start - 1]
-                    === $this->sequence2[$index2 + $start - 1]){
+                    === $this->sequence2[$index2 + $start - 1]) {
                         $table[$index1][$index2] = $table[$index1 - 1][$index2 - 1] + 1;
-                }else{
+                } else {
                     $table[$index1][$index2] =
                     max($table[$index1 - 1][$index2], $table[$index1][$index2 - 1]);
                 }
@@ -320,11 +320,11 @@ 
                 $index1 > 0 && $index2 > 0
                 && $this->sequence1[$index1 + $start - 1]
                 === $this->sequence2[$index2 + $start - 1]
-            ){
+            ) {
                 // update the diff and the indices
                 $diff[] = array($this->sequence1[$index1 + $start - 1], self::UNMODIFIED);
-                $index1 --;
-                $index2 --;
+                $index1--;
+                $index2--;
             }
             elseif (
                 $index2 > 0
@@ -332,13 +332,13 @@ 
             ) {
                 // update the diff and the indices
                 $diff[] = array($this->sequence2[$index2 + $start - 1], self::INSERTED);
-                $index2 --;
+                $index2--;
             }
             else
             {
                 // update the diff and the indices
                 $diff[] = array($this->sequence1[$index1 + $start - 1], self::DELETED);
-                $index1 --;
+                $index1--;
             }
         }
         

Braces +4 added lines, -7 removed lines

@@ -176,8 +176,7 @@ 
             $end1 = strlen($this->string1) - 1;
             $end2 = strlen($this->string2) - 1;
             $totalSequence = strlen($this->sequence1);
-        }
-        else
+        } else
         {
             $this->sequence1 = $this->splitString($this->string1);
             $this->sequence2 = $this->splitString($this->string2);
@@ -281,7 +280,7 @@ 
                 if ($this->sequence1[$index1 + $start - 1]
                     === $this->sequence2[$index2 + $start - 1]){
                         $table[$index1][$index2] = $table[$index1 - 1][$index2 - 1] + 1;
-                }else{
+                } else{
                     $table[$index1][$index2] =
                     max($table[$index1 - 1][$index2], $table[$index1][$index2 - 1]);
                 }
@@ -325,16 +324,14 @@ 
                 $diff[] = array($this->sequence1[$index1 + $start - 1], self::UNMODIFIED);
                 $index1 --;
                 $index2 --;
-            }
-            elseif (
+            } elseif (
                 $index2 > 0
                 && $table[$index1][$index2] === $table[$index1][$index2 - 1]
             ) {
                 // update the diff and the indices
                 $diff[] = array($this->sequence2[$index2 + $start - 1], self::INSERTED);
                 $index2 --;
-            }
-            else
+            } else
             {
                 // update the diff and the indices
                 $diff[] = array($this->sequence1[$index1 + $start - 1], self::DELETED);

src/Diff/Renderer/HTMLTable.php

Spacing +12 added lines, -12 removed lines

@@ -133,24 +133,24 @@ 
             
             // extend the HTML with the new row
             $html .=
-            $i2. "<tr>". $nl . 
-            $i3.     '<td class="text-diff-'.$leftType. '">'. $leftCell . "</td>".$nl.
-            $i3.     '<td class="text-diff-'.$rightType. '">'. $rightCell . "</td>".$nl.
-            $i2. "</tr>".$nl;
+            $i2."<tr>".$nl. 
+            $i3.'<td class="text-diff-'.$leftType.'">'.$leftCell."</td>".$nl.
+            $i3.'<td class="text-diff-'.$rightType.'">'.$rightCell."</td>".$nl.
+            $i2."</tr>".$nl;
                                                 
         }
         
-        return $i1. sprintf($this->container, $nl.$html).$nl;
+        return $i1.sprintf($this->container, $nl.$html).$nl;
     }
     
     private function resolveLeftType(string $leftCell, string $rightCell) : string
     {
-        if(empty($leftCell))
+        if (empty($leftCell))
         {
             return 'empty';
         }
         
-        if($leftCell !== $rightCell)
+        if ($leftCell !== $rightCell)
         {
             return 'del';
         }
@@ -160,12 +160,12 @@ 
     
     private function resolveRightType(string $leftCell, string $rightCell) : string
     {
-        if(empty($rightCell))
+        if (empty($rightCell))
         {
             return 'empty';
         }
         
-        if($leftCell !== $rightCell)
+        if ($leftCell !== $rightCell)
         {
             return 'ins';
         }
@@ -192,11 +192,11 @@ 
             $html .= sprintf(
                 '<%1$s>%2$s</%1$s>%3$s',
                 $tag,
-                htmlspecialchars((string)$this->array[$index][0]),
+                htmlspecialchars((string) $this->array[$index][0]),
                 $this->separator
             );
             
-            $index ++;
+            $index++;
         }
         
         return $html;
@@ -204,7 +204,7 @@ 
     
     private function resolveTag(int $type) : string
     {
-        switch($type)
+        switch ($type)
         {
             case Diff::DELETED: return 'del';
             case Diff::INSERTED: return 'ins';

src/Diff/Renderer/HTML.php

Spacing +3 added lines, -3 removed lines

@@ -48,14 +48,14 @@
             switch ($line[1])
             {
                 case Diff::UNMODIFIED : $element = 'span'; break;
-                case Diff::DELETED    : $element = 'del';  break;
-                case Diff::INSERTED   : $element = 'ins';  break;
+                case Diff::DELETED    : $element = 'del'; break;
+                case Diff::INSERTED   : $element = 'ins'; break;
             }
             
             $html .= sprintf(
                 '<%1$s>%2$s</%1$s>',
                 $element,
-                htmlspecialchars((string)$line[0])
+                htmlspecialchars((string) $line[0])
             );
             
             // extend the HTML with the separator