From 41bc13f1622ee34ed6b25fd98f09265692cec45b Mon Sep 17 00:00:00 2001 From: Kyle Wiering Date: Fri, 8 Sep 2017 08:52:14 -0500 Subject: [PATCH] #242 Gitlab/Model/MergeRequest methods fails on incorrect id usage * Adjusted the model to use the iid instead of id. --- lib/Gitlab/Model/MergeRequest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Gitlab/Model/MergeRequest.php b/lib/Gitlab/Model/MergeRequest.php index f22d6f1f2..03251f3b0 100644 --- a/lib/Gitlab/Model/MergeRequest.php +++ b/lib/Gitlab/Model/MergeRequest.php @@ -90,14 +90,14 @@ public static function fromArray(Client $client, Project $project, array $data) /** * @param Project $project - * @param int $id + * @param int $iid * @param Client $client */ - public function __construct(Project $project, $id = null, Client $client = null) + public function __construct(Project $project, $iid = null, Client $client = null) { $this->setClient($client); $this->setData('project', $project); - $this->setData('id', $id); + $this->setData('iid', $iid); } /**