Fix the bug for counter variable type on PR #183 (#184)

Co-authored-by: Graham Campbell <GrahamCampbell@users.noreply.github.com>

Author: peter279k

src/Gitonomy/Git/Diff/FileChange.php

@@ -24,6 +24,15 @@ class FileChange
     protected $rangeNewCount;
     protected $lines;
 
+    /**
+     * @param int   $rangeOldStart
+     * @param int   $rangeOldCount
+     * @param int   $rangeNewStart
+     * @param int   $rangeNewCount
+     * @param array $lines
+     *
+     * @return void
+     */
     public function __construct($rangeOldStart, $rangeOldCount, $rangeNewStart, $rangeNewCount, $lines)
     {
         $this->rangeOldStart = $rangeOldStart;
@@ -33,6 +42,9 @@ public function __construct($rangeOldStart, $rangeOldCount, $rangeNewStart, $ran
         $this->lines = $lines;
     }
 
+    /**
+     * @return int
+     */
     public function getCount($type)
     {
         $result = 0;
@@ -45,31 +57,49 @@ public function getCount($type)
         return $result;
     }
 
+    /**
+     * @return int
+     */
     public function getRangeOldStart()
     {
         return $this->rangeOldStart;
     }
 
+    /**
+     * @return int
+     */
     public function getRangeOldCount()
     {
         return $this->rangeOldCount;
     }
 
+    /**
+     * @return int
+     */
     public function getRangeNewStart()
     {
         return $this->rangeNewStart;
     }
 
+    /**
+     * @return int
+     */
     public function getRangeNewCount()
     {
         return $this->rangeNewCount;
     }
 
+    /**
+     * @return array
+     */
     public function getLines()
     {
         return $this->lines;
     }
 
+    /**
+     * @return array
+     */
     public function toArray()
     {
         return [
@@ -81,6 +111,11 @@ public function toArray()
         ];
     }
 
+    /**
+     * @param array $array
+     *
+     * @return self
+     */
     public static function fromArray(array $array)
     {
         return new self($array['range_old_start'], $array['range_old_count'], $array['range_new_start'], $array['range_new_count'], $array['lines']);

src/Gitonomy/Git/Parser/DiffParser.php

@@ -97,10 +97,10 @@ protected function doParse()
             // 5. Diff
             while ($this->expects('@@ ')) {
                 $vars = $this->consumeRegexp('/-(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))?/');
-                $rangeOldStart = $vars[1];
-                $rangeOldCount = $vars[2];
-                $rangeNewStart = $vars[3];
-                $rangeNewCount = isset($vars[4]) ? $vars[4] : $vars[2]; // @todo Ici, t'as pris un gros raccourci mon loulou
+                $rangeOldStart = (int) $vars[1];
+                $rangeOldCount = (int) $vars[2];
+                $rangeNewStart = (int) $vars[3];
+                $rangeNewCount = isset($vars[4]) ? (int) $vars[4] : (int) $vars[2]; // @todo Ici, t'as pris un gros raccourci mon loulou
                 $this->consume(' @@');
                 $this->consumeTo("\n");
                 $this->consumeNewLine();

tests/Gitonomy/Git/Tests/DiffTest.php

@@ -134,10 +134,10 @@ public function testDiffRangeParse($repository)
 
         $changes = $files[0]->getChanges();
 
-        $this->assertEquals(0, $changes[0]->getRangeOldStart());
-        $this->assertEquals(0, $changes[0]->getRangeOldCount());
+        $this->assertSame(0, $changes[0]->getRangeOldStart());
+        $this->assertSame(0, $changes[0]->getRangeOldCount());
 
-        $this->assertEquals(1, $changes[0]->getRangeNewStart());
-        $this->assertEquals(0, $changes[0]->getRangeNewCount());
+        $this->assertSame(1, $changes[0]->getRangeNewStart());
+        $this->assertSame(0, $changes[0]->getRangeNewCount());
     }
 }