Added compare() method to projects, along with Comparison and Diff objects

Author: Matt Humphrey

lib/Gitlab/Model/AbstractModel.php

@@ -80,6 +80,14 @@ protected function setData($field, $value)
         return $this;
     }
 
+    /**
+     * @return array
+     */
+    public function getData()
+    {
+        return $this->data;
+    }
+
     /**
      * @param string $property
      * @param mixed $value

lib/Gitlab/Model/Comparison.php

@@ -0,0 +1,73 @@
+<?php namespace Gitlab\Model;
+
+use Gitlab\Client;
+
+/**
+ * Class Comparison
+ *
+ * @property-read bool $compare_timeout
+ * @property-read bool $compare_same_ref
+ * @property-read Commit $commit
+ * @property-read Commit[] $commits
+ * @property-read Diff[] $diffs
+ * @property-read Project $project
+ */
+class Comparison extends AbstractModel
+{
+    /**
+     * @var array
+     */
+    protected static $properties = array(
+        'commit',
+        'commits',
+        'diffs',
+        'compare_timeout',
+        'compare_same_ref',
+        'project'
+    );
+
+    /**
+     * @param Client $client
+     * @param Project $project
+     * @param array $data
+     * @return Comparison
+     */
+    public static function fromArray(Client $client, Project $project, array $data)
+    {
+        $file = new static($project, $client);
+
+        if (isset($data['commit'])) {
+            $data['commit'] = Commit::fromArray($client, $project, $data['commit']);
+        }
+
+        if (isset($data['commits'])) {
+            $commits = array();
+            foreach ($data['commits'] as $commit) {
+                $commits[] = Commit::fromArray($client, $project, $commit);
+            }
+
+            $data['commits'] = $commits;
+        }
+
+        if (isset($data['diffs'])) {
+            $diffs = array();
+            foreach ($data['diffs'] as $diff) {
+                $diffs[] = Diff::fromArray($client, $project, $diff);
+            }
+
+            $data['diffs'] = $diffs;
+        }
+
+        return $file->hydrate($data);
+    }
+
+    /**
+     * @param Project $project
+     * @param Client $client
+     */
+    public function __construct(Project $project, Client $client = null)
+    {
+        $this->setClient($client);
+        $this->setData('project', $project);
+    }
+} 

lib/Gitlab/Model/Diff.php

@@ -0,0 +1,65 @@
+<?php namespace Gitlab\Model;
+
+use Gitlab\Client;
+
+/**
+ * Class Diff
+ *
+ * @property-read string $old_path
+ * @property-read string $new_path
+ * @property-read string $a_mode
+ * @property-read string $b_mode
+ * @property-read string $diff
+ * @property-read bool $new_file
+ * @property-read bool $renamed_file
+ * @property-read bool $deleted_file
+ * @property-read Project $project
+ */
+class Diff extends AbstractModel
+{
+    /**
+     * @var array
+     */
+    protected static $properties = array(
+        'old_path',
+        'new_path',
+        'a_mode',
+        'b_mode',
+        'diff',
+        'new_file',
+        'renamed_file',
+        'deleted_file',
+        'project'
+    );
+
+    /**
+     * @param Client $client
+     * @param Project $project
+     * @param array $data
+     * @return Diff
+     */
+    public static function fromArray(Client $client, Project $project, array $data)
+    {
+        $diff = new static($project, $client);
+
+        return $diff->hydrate($data);
+    }
+
+    /**
+     * @param Project $project
+     * @param Client $client
+     */
+    public function __construct(Project $project, Client $client = null)
+    {
+        $this->setClient($client);
+        $this->setData('project', $project);
+    }
+
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->diff;
+    }
+} 

lib/Gitlab/Model/Project.php

@@ -470,6 +470,18 @@ public function diff($sha)
         return $this->api('repo')->diff($this->id, $sha);
     }
 
+    /**
+     * @param string $from
+     * @param string $to
+     * @return Comparison
+     */
+    public function compare($from, $to)
+    {
+        $data = $this->api('repo')->compare($this->id, $from, $to);
+
+        return Comparison::fromArray($this->getClient(), $this, $data);
+    }
+
     /**
      * @param array $params
      * @return Node[]