Merge pull request #28 from gitonomy/feat-diff-fix

Fixed Diff + Added raw diff

Author: Alexandre Salomé

src/Gitonomy/Git/Blame/Line.php

@@ -29,7 +29,7 @@ class Line
     protected $content;
 
     /**
-     * Instanciates a new Diff File object.
+     * Instanciates a new Line object.
      */
     public function __construct(Commit $commit, $sourceLine, $targetLine, $blockLine, $content)
     {

src/Gitonomy/Git/Diff/Diff.php

@@ -34,24 +34,24 @@ class Diff
     /**
      * Constructs a new diff for a given revision.
      *
-     * @var Repository $repository
-     * @var string     $revision   A string revision, passed to git diff command
-     * @var boolean    $isTree     Indicates if revisions are commit-trees to compare
+     * @param array  $files   The files
+     * @param string $rawDiff The raw diff
      */
-    public function __construct(array $files)
+    public function __construct(array $files, $rawDiff)
     {
         $this->files = $files;
+        $this->rawDiff = $rawDiff;
     }
 
     /**
      * @return Diff
      */
-    static public function parse($rawDiff)
+    public static function parse($rawDiff)
     {
         $parser = new DiffParser();
         $parser->parse($rawDiff);
 
-        return new Diff($parser->files);
+        return new Diff($parser->files, $rawDiff);
     }
 
     /**
@@ -73,7 +73,7 @@ public function getFiles()
     }
 
     /**
-     * Get raw diff
+     * Returns the raw diff
      *
      * @return string The raw diff
      */
@@ -82,17 +82,39 @@ public function getRawDiff()
         return $this->rawDiff;
     }
 
+    /**
+     * Export a diff as array
+     *
+     * @return array The array
+     */
     public function toArray()
     {
-        return array_map(function (File $file) {
-            return $file->toArray();
-        }, $this->files);
+        return array(
+            'rawDiff' => $this->rawDiff,
+            'files'   => array_map(
+                function (File $file) {
+                    return $file->toArray();
+                }, $this->files
+            ),
+        );
     }
 
+    /**
+     * Create a new instance of Diff from an array
+     *
+     * @param array $array The array
+     *
+     * @return Diff The new instance
+     */
     public static function fromArray(array $array)
     {
-        return new Diff(array_map(function ($array) {
-            return File::fromArray($array);
-        }, $array));
+        return new static(
+            array_map(
+                function ($array) {
+                    return File::fromArray($array);
+                }, $array['files']
+            ),
+            $array['rawDiff']
+        );
     }
 }

src/Gitonomy/Git/Diff/File.php

@@ -12,8 +12,6 @@
 
 namespace Gitonomy\Git\Diff;
 
-use Gitonomy\Git\Repository;
-
 /**
  * @author Alexandre Salomé <[email protected]>
  */
@@ -60,7 +58,7 @@ class File
     protected $changes;
 
     /**
-     * Instanciates a new Diff File object.
+     * Instanciates a new File object.
      */
     public function __construct($oldName, $newName, $oldMode, $newMode, $oldIndex, $newIndex, $isBinary)
     {

src/Gitonomy/Git/Log.php

@@ -58,7 +58,7 @@ public function __construct(Repository $repository, $revisions, $paths, $offset
      */
     public function getDiff()
     {
-        return new Diff($this->repository, $this->revisions, false);
+        return $this->repository->getDiff($this->revisions);
     }
 
     /**

src/Gitonomy/Git/Parser/DiffParser.php

@@ -14,7 +14,6 @@
 
 use Gitonomy\Git\Diff\File;
 use Gitonomy\Git\Diff\FileChange;
-use Gitonomy\Git\Repository;
 
 class DiffParser extends ParserBase
 {

src/Gitonomy/Git/Repository.php

@@ -266,8 +266,9 @@ public function getBlame($revision, $file, $lineRange = null)
      *                         any text value type
      * @param array $paths     Restrict log to modifications occuring on given
      *                         paths.
-     * @param int   $offset    Start from a given offset in results.
-     * @param int   $limit     Limit number of total results.
+     *
+     * @param int $offset Start from a given offset in results.
+     * @param int $limit  Limit number of total results.
      *
      * @return Log
      */
@@ -283,7 +284,7 @@ public function getDiff($revision)
     {
         $args = array('-r', '-p', '-m', '-M', '--no-commit-id', '--full-index', $revision);
 
-        return new Diff($this->run('diff', $args));
+        return Diff::parse($this->run('diff', $args));
     }
 
     /**