iid instead of id in issue contruct

GitLabPHP · Apr 24, 2018 · d4af179 · d4af179
1 parent 62b4684
commit d4af179
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 16 deletions.
diff --git a/lib/Gitlab/Model/Issue.php b/lib/Gitlab/Model/Issue.php
@@ -50,7 +50,7 @@ class Issue extends AbstractModel implements Noteable
      */
     public static function fromArray(Client $client, Project $project, array $data)
     {
-        $issue = new static($project, $data['id'], $client);
+        $issue = new static($project, $data['iid'], $client);
 
         if (isset($data['author'])) {
             $data['author'] = User::fromArray($client, $data['author']);
@@ -65,14 +65,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);
     }
 
     /**

diff --git a/lib/Gitlab/Model/Project.php b/lib/Gitlab/Model/Project.php
@@ -807,47 +807,47 @@ public function createIssue($title, array $params = array())
     }
 
     /**
-     * @param int $id
+     * @param int $iid
      * @return Issue
      */
-    public function issue($id)
+    public function issue($iid)
     {
-        $issue = new Issue($this, $id, $this->getClient());
+        $issue = new Issue($this, $iid, $this->getClient());
 
         return $issue->show();
     }
 
     /**
-     * @param int $id
+     * @param int $iid
      * @param array $params
      * @return Issue
      */
-    public function updateIssue($id, array $params)
+    public function updateIssue($iid, array $params)
     {
-        $issue = new Issue($this, $id, $this->getClient());
+        $issue = new Issue($this, $iid, $this->getClient());
 
         return $issue->update($params);
     }
 
     /**
-     * @param int $id
+     * @param int $iid
      * @param string $comment
      * @return Issue
      */
-    public function closeIssue($id, $comment = null)
+    public function closeIssue($iid, $comment = null)
     {
-        $issue = new Issue($this, $id, $this->getClient());
+        $issue = new Issue($this, $iid, $this->getClient());
 
         return $issue->close($comment);
     }
 
     /**
-     * @param int $id
+     * @param int $iid
      * @return Issue
      */
-    public function openIssue($id)
+    public function openIssue($iid)
     {
-        $issue = new Issue($this, $id, $this->getClient());
+        $issue = new Issue($this, $iid, $this->getClient());
 
         return $issue->open();
     }

diff --git a/test/Gitlab/Tests/Model/IssueTest.php b/test/Gitlab/Tests/Model/IssueTest.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Gitlab\Tests\Model;
+
+use Gitlab\Client;
+use Gitlab\Model\Issue;
+use Gitlab\Model\Project;
+
+class IssueTest extends \PHPUnit_Framework_TestCase
+{
+    public function testCorrectConstructWithoutIidAndClient()
+    {
+        $project = new Project();
+
+        $sUT = new Issue($project);
+
+        $this->assertSame($project, $sUT->project);
+        $this->assertSame(null, $sUT->iid);
+        $this->assertSame(null, $sUT->getClient());
+    }
+
+    public function testCorrectConstructWithoutClient()
+    {
+        $project = new Project();
+
+        $sUT = new Issue($project, 10);
+
+        $this->assertSame($project, $sUT->project);
+        $this->assertSame(10, $sUT->iid);
+        $this->assertSame(null, $sUT->getClient());
+    }
+
+    public function testCorrectConstruct()
+    {
+        $project = new Project();
+        $client = $this->getMockBuilder(Client::class)
+            ->disableOriginalConstructor()
+            ->getMock()
+        ;
+
+        $sUT = new Issue($project, 10, $client);
+
+        $this->assertSame($project, $sUT->project);
+        $this->assertSame(10, $sUT->iid);
+        $this->assertSame($client, $sUT->getClient());
+    }
+
+    public function testFromArray()
+    {
+        $project = new Project();
+        $client = $this->getMockBuilder(Client::class)
+            ->disableOriginalConstructor()
+            ->getMock()
+        ;
+
+        $sUT = Issue::fromArray($client, $project, ['iid' => 10]);
+
+        $this->assertSame($project, $sUT->project);
+        $this->assertSame(10, $sUT->iid);
+        $this->assertSame($client, $sUT->getClient());
+    }
+}