fix deprecated search to search/jql (#554)

Co-authored-by: Tuen Lee <[email protected]>
Co-authored-by: KwangSeob Jeong <[email protected]>

Author: 3 people

src/Issue/IssueBulkResult.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace JiraRestApi\Issue;
+
+/**
+ * Issue search result.
+ */
+class IssueBulkResult
+{
+    /**
+     * @var string
+     */
+    public $expand;
+
+    /**
+     * @var \JiraRestApi\Issue\Issue[]
+     */
+    public $issues;
+
+    /**
+     * @var array
+     */
+    public $issueErrors;
+
+    /**
+     * @return array
+     */
+    public function getIssueErrors()
+    {
+        return $this->issueErrors;
+    }
+
+    /**
+     * @param array $issueErrors
+     */
+    public function setIssueErrors($issueErrors)
+    {
+        $this->issueErrors = $issueErrors;
+    }
+
+    /**
+     * @return Issue[]
+     */
+    public function getIssues()
+    {
+        return $this->issues;
+    }
+
+    /**
+     * @param Issue[] $issues
+     */
+    public function setIssues($issues)
+    {
+        $this->issues = $issues;
+    }
+
+    /**
+     * @param int $ndx
+     *
+     * @return Issue
+     */
+    public function getIssue($ndx)
+    {
+        return $this->issues[$ndx];
+    }
+
+    /**
+     * @return string
+     */
+    public function getExpand()
+    {
+        return $this->expand;
+    }
+
+    /**
+     * @param string $expand
+     */
+    public function setExpand($expand)
+    {
+        $this->expand = $expand;
+    }
+}

src/Issue/IssueSearchResult.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Created by PhpStorm.
  * User: keanor
@@ -14,9 +13,8 @@
  */
 class IssueSearchResult
 {
-    /**
-     * @var string
-     */
+    public ?string $nextPageToken = null;
+
     public ?string $expand = null;
 
     /**
@@ -42,49 +40,17 @@ class IssueSearchResult
     /**
      * @return int
      */
-    public function getStartAt()
-    {
-        return $this->startAt;
-    }
-
-    /**
-     * @param int $startAt
-     */
-    public function setStartAt($startAt)
-    {
-        $this->startAt = $startAt;
-    }
-
-    /**
-     * @return int
-     */
-    public function getMaxResults()
-    {
-        return $this->maxResults;
-    }
-
-    /**
-     * @param int $maxResults
-     */
-    public function setMaxResults($maxResults)
-    {
-        $this->maxResults = $maxResults;
-    }
-
-    /**
-     * @return int
-     */
-    public function getTotal()
+    public function getNextPageToken()
     {
-        return $this->total;
+        return $this->nextPageToken;
     }
 
     /**
-     * @param int $total
+     * @param string $nextPageToken
      */
-    public function setTotal($total)
+    public function setNextPageToken($nextPageToken)
     {
-        $this->total = $total;
+        $this->nextPageToken = $nextPageToken;
     }
 
     /**
@@ -116,7 +82,7 @@ public function getIssue($ndx)
     /**
      * @return ?string
      */
-    public function getExpand()
+    public function getExpand() : ?$string
     {
         return $this->expand;
     }

src/Issue/IssueService.php

@@ -534,25 +534,26 @@ public function transition($issueIdOrKey, $transition): ?string
      *
      * @return IssueSearchResult
      */
-    public function search(string $jql, int $startAt = 0, int $maxResults = 15, array $fields = [], array $expand = [], bool $validateQuery = true): IssueSearchResult
+    public function search(string $jql, string $nextPageToken = '', int $maxResults = 50, array $fields = [], string $expand = '', array $reconcileIssues = []): IssueBulkResult
     {
-        $data = json_encode([
-            'jql'           => $jql,
-            'startAt'       => $startAt,
-            'maxResults'    => $maxResults,
-            'fields'        => $fields,
-            'expand'        => $expand,
-            'validateQuery' => $validateQuery,
-        ]);
+        $data = [
+            'jql'             => $jql,
+            'maxResults'      => $maxResults,
+            'fields'          => $fields,
+            'expand'          => $expand,
+            'reconcileIssues' => $reconcileIssues,
+        ];
 
-        $ret = $this->exec('search', $data, 'POST');
-        $json = json_decode($ret);
+        if ($nextPageToken) {
+            $data['nextPageToken'] = $nextPageToken;
+        }
 
-        $result = null;
+        $ret = $this->exec('search//jql', json_encode($data), 'POST');
+        $json = json_decode($ret);
 
         $result = $this->json_mapper->map(
             $json,
-            new IssueSearchResult()
+            new IssueBulkResult()
         );
 
         return $result;