Ability to set parameter 'created_at' when creating new discussion or creating new discussion note

Author: o.trelin

lib/Gitlab/Api/Issues.php

@@ -192,28 +192,38 @@ public function showDiscussion($project_id, $issue_iid, $discussion_id)
     /**
      * @param int $project_id
      * @param int $issue_iid
-     * @param string $body
+     * @param string|array $body
      * @return mixed
      */
     public function addDiscussion($project_id, $issue_iid, $body)
     {
-        return $this->post($this->getProjectPath($project_id, 'issues/'.$this->encodePath($issue_iid).'/discussions'), array(
-            'body' => $body
-        ));
+        // backwards compatibility
+        if (is_array($body)) {
+            $params = $body;
+        } else {
+            $params = array('body' => $body);
+        }
+
+        return $this->post($this->getProjectPath($project_id, 'issues/'.$this->encodePath($issue_iid).'/discussions'), $params);
     }
 
     /**
      * @param int $project_id
      * @param int $issue_iid
      * @param string $discussion_id
-     * @param string $body
+     * @param string|array $body
      * @return mixed
      */
     public function addDiscussionNote($project_id, $issue_iid, $discussion_id, $body)
     {
-        return $this->post($this->getProjectPath($project_id, 'issues/'.$this->encodePath($issue_iid).'/discussions/'.$this->encodePath($discussion_id).'/notes'), array(
-            'body' => $body
-        ));
+        // backwards compatibility
+        if (is_array($body)) {
+            $params = $body;
+        } else {
+            $params = array('body' => $body);
+        }
+
+        return $this->post($this->getProjectPath($project_id, 'issues/'.$this->encodePath($issue_iid).'/discussions/'.$this->encodePath($discussion_id).'/notes'), $params);
     }
 
     /**

lib/Gitlab/Api/MergeRequests.php

@@ -265,14 +265,19 @@ public function resolveDiscussion($project_id, $mr_iid, $discussion_id, $resolve
      * @param int $project_id
      * @param int $mr_iid
      * @param string $discussion_id
-     * @param string $body
+     * @param string|array $body
      * @return mixed
      */
     public function addDiscussionNote($project_id, $mr_iid, $discussion_id, $body)
     {
-        return $this->post($this->getProjectPath($project_id, 'merge_requests/'.$this->encodePath($mr_iid).'/discussions/'.$this->encodePath($discussion_id).'/notes'), array(
-            'body' => $body
-        ));
+        // backwards compatibility
+        if (is_array($body)) {
+            $params = $body;
+        } else {
+            $params = array('body' => $body);
+        }
+
+        return $this->post($this->getProjectPath($project_id, 'merge_requests/'.$this->encodePath($mr_iid).'/discussions/'.$this->encodePath($discussion_id).'/notes'), $params);
     }
 
     /**

test/Gitlab/Tests/Api/IssuesTest.php

@@ -247,12 +247,13 @@ public function shouldCreateDiscussion()
         $expectedArray = array('id' => 'abc', 'body' => 'A new discussion');
 
         $api = $this->getApiMock();
-        $api->expects($this->once())
+        $api->expects($this->exactly(2))
             ->method('post')
             ->with('projects/1/issues/2/discussions', array('body' => 'A new discussion'))
             ->will($this->returnValue($expectedArray))
         ;
 
+        $this->assertEquals($expectedArray, $api->addDiscussion(1, 2, array('body' => 'A new discussion')));
         $this->assertEquals($expectedArray, $api->addDiscussion(1, 2, 'A new discussion'));
     }
 
@@ -264,12 +265,13 @@ public function shouldCreateDiscussionNote()
         $expectedArray = array('id' => 3, 'body' => 'A new discussion note');
 
         $api = $this->getApiMock();
-        $api->expects($this->once())
+        $api->expects($this->exactly(2))
             ->method('post')
             ->with('projects/1/issues/2/discussions/abc/notes', array('body' => 'A new discussion note'))
             ->will($this->returnValue($expectedArray))
         ;
 
+        $this->assertEquals($expectedArray, $api->addDiscussionNote(1, 2, 'abc', array('body' => 'A new discussion note')));
         $this->assertEquals($expectedArray, $api->addDiscussionNote(1, 2, 'abc', 'A new discussion note'));
     }
 

test/Gitlab/Tests/Api/MergeRequestsTest.php

@@ -344,12 +344,13 @@ public function shouldCreateDiscussionNote()
         $expectedArray = array('id' => 3, 'body' => 'A new discussion note');
 
         $api = $this->getApiMock();
-        $api->expects($this->once())
+        $api->expects($this->exactly(2))
             ->method('post')
             ->with('projects/1/merge_requests/2/discussions/abc/notes', array('body' => 'A new discussion note'))
             ->will($this->returnValue($expectedArray))
         ;
 
+        $this->assertEquals($expectedArray, $api->addDiscussionNote(1, 2, 'abc', array('body' => 'A new discussion note')));
         $this->assertEquals($expectedArray, $api->addDiscussionNote(1, 2, 'abc', 'A new discussion note'));
     }