Draft: Fix search (#555)

* Fix PHP syntax error

* Use correct result class for returning results from search

We need to switch back to IssueSearchResult, as it contains sthe nextPageToken which is required for paged searches.

* Add searchApproximateCount as the new search endpoint does not provide that info anymore

Author: stmh

src/Issue/IssueSearchResult.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Created by PhpStorm.
  * User: keanor
@@ -82,7 +83,7 @@ public function getIssue($ndx)
     /**
      * @return ?string
      */
-    public function getExpand() : ?$string
+    public function getExpand(): ?string
     {
         return $this->expand;
     }

src/Issue/IssueService.php

@@ -534,7 +534,7 @@ public function transition($issueIdOrKey, $transition): ?string
      *
      * @return IssueSearchResult
      */
-    public function search(string $jql, string $nextPageToken = '', int $maxResults = 50, array $fields = [], string $expand = '', array $reconcileIssues = []): IssueBulkResult
+    public function search(string $jql, string $nextPageToken = '', int $maxResults = 50, array $fields = [], string $expand = '', array $reconcileIssues = []): IssueSearchResult
     {
         $data = [
             'jql'             => $jql,
@@ -548,12 +548,39 @@ public function search(string $jql, string $nextPageToken = '', int $maxResults
             $data['nextPageToken'] = $nextPageToken;
         }
 
-        $ret = $this->exec('search//jql', json_encode($data), 'POST');
+        $ret = $this->exec('search/jql', json_encode($data), 'POST');
         $json = json_decode($ret);
 
         $result = $this->json_mapper->map(
             $json,
-            new IssueBulkResult()
+            new IssueSearchResult()
+        );
+
+        return $result;
+    }
+
+    /**
+     * Get an approximate count of issues that match a JQL query.
+     *
+     * @param string $jql The JQL query string
+     *
+     * @throws \JsonMapper_Exception
+     * @throws JiraException
+     *
+     * @return JQLCountResult
+     */
+    public function searchApproximateCount(string $jql): JQLCountResult
+    {
+        $data = [
+            'jql' => $jql,
+        ];
+
+        $ret = $this->exec('search/approximate-count', json_encode($data), 'POST');
+        $json = json_decode($ret);
+
+        $result = $this->json_mapper->map(
+            $json,
+            new JQLCountResult()
         );
 
         return $result;

src/Issue/JQLCountResult.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace JiraRestApi\Issue;
+
+/**
+ * JQL Count result for approximate count API.
+ */
+class JQLCountResult implements \JsonSerializable
+{
+    /**
+     * @var int The approximate count of issues matching the JQL query
+     */
+    public int $count;
+
+    /**
+     * Get the count of issues.
+     *
+     * @return int
+     */
+    public function getCount(): int
+    {
+        return $this->count;
+    }
+
+    /**
+     * Set the count of issues.
+     *
+     * @param int $count
+     */
+    public function setCount(int $count): void
+    {
+        $this->count = $count;
+    }
+
+    #[\ReturnTypeWillChange]
+    public function jsonSerialize(): array
+    {
+        return [
+            'count' => $this->count
+        ];
+    }
+}