Added missing MR features

Author: m4tthumphrey

lib/Gitlab/Model/MergeRequest.php

@@ -58,12 +58,17 @@ public function update(array $params)
 
     public function close()
     {
-        return $this->update(array('closed' => true));
+        return $this->update(array('state_event' => 'close'));
     }
 
     public function open()
     {
-        return $this->update(array('closed' => false));
+        return $this->update(array('state_event' => 'reopen'));
+    }
+
+    public function merge()
+    {
+        return $this->update(array('state_event' => 'merge'));
     }
 
     public function addComment($note)

lib/Gitlab/Model/Project.php

@@ -245,8 +245,7 @@ public function mergeRequests($page = 1, $per_page = Api::PER_PAGE)
 
     public function mergeRequest($id)
     {
-        $mr = new MergeRequest($this, $id);
-        $mr->setClient($this->getClient());
+        $mr = new MergeRequest($this, $id, $this->getClient());
 
         return $mr->show();
     }
@@ -258,6 +257,34 @@ public function createMergeRequest($source, $target, $title, $assignee = null)
         return MergeRequest::fromArray($this->getClient(), $this, $data);
     }
 
+    public function updateMergeRequest($id, array $params)
+    {
+        $mr = new MergeRequest($this, $id, $this->getClient());
+
+        return $mr->update($params);
+    }
+
+    public function closeMergeRequest($id)
+    {
+        $mr = new MergeRequest($this, $id, $this->getClient());
+
+        return $mr->close();
+    }
+
+    public function openMergeRequest($id)
+    {
+        $mr = new MergeRequest($this, $id, $this->getClient());
+
+        return $mr->open();
+    }
+
+    public function mergeMergeRequest($id)
+    {
+        $mr = new MergeRequest($this, $id, $this->getClient());
+
+        return $mr->merge();
+    }
+
     public function issues($page = 1, $per_page = Api::PER_PAGE)
     {
         $data = $this->api('issues')->all($this->id, $page, $per_page);
@@ -280,24 +307,21 @@ public function createIssue($title, array $params = array())
 
     public function issue($id)
     {
-        $issue = new Issue($this, $id);
-        $issue->setClient($this->getClient());
+        $issue = new Issue($this, $id, $this->getClient());
 
         return $issue->show();
     }
 
     public function updateIssue($id, array $params)
     {
-        $issue = new Issue($this, $id);
-        $issue->setClient($this->getClient());
+        $issue = new Issue($this, $id, $this->getClient());
 
         return $issue->update($params);
     }
 
     public function removeIssue($id)
     {
-        $issue = new Issue($this, $id);
-        $issue->setClient($this->getClient());
+        $issue = new Issue($this, $id, $this->getClient());
 
         return $issue->remove();
     }
@@ -324,16 +348,14 @@ public function createMilestone($title, array $params = array())
 
     public function milestone($id)
     {
-        $milestone = new Milestone($this, $id);
-        $milestone->setClient($this->getClient());
+        $milestone = new Milestone($this, $id, $this->getClient());
 
         return $milestone->show();
     }
 
     public function updateMilestone($id, array $params)
     {
-        $milestone = new Milestone($this, $id);
-        $milestone->setClient($this->getClient());
+        $milestone = new Milestone($this, $id, $this->getClient());
 
         return $milestone->update($params);
     }