Use User Api in IssueApi

Author: Art4

src/Redmine/Api/Issue.php

@@ -47,6 +47,11 @@ class Issue extends AbstractApi
      */
     private $trackerApi;
 
+    /**
+     * @var User
+     */
+    private $userApi;
+
     /**
      * List issues.
      *
@@ -304,15 +309,16 @@ private function cleanParams(array $params = [])
         }
 
         if (isset($params['assigned_to'])) {
-            /** @var User */
-            $apiUser = $this->client->getApi('user');
-            $params['assigned_to_id'] = $apiUser->getIdByUsername($params['assigned_to']);
+            $userApi = $this->getUserApi();
+
+            $params['assigned_to_id'] = $userApi->getIdByUsername($params['assigned_to']);
             unset($params['assigned_to']);
         }
+
         if (isset($params['author'])) {
-            /** @var User */
-            $apiUser = $this->client->getApi('user');
-            $params['author_id'] = $apiUser->getIdByUsername($params['author']);
+            $userApi = $this->getUserApi();
+
+            $params['author_id'] = $userApi->getIdByUsername($params['author']);
             unset($params['author']);
         }
 
@@ -447,4 +453,23 @@ private function getTrackerApi()
 
         return $this->trackerApi;
     }
+
+    /**
+     * @return User
+     */
+    private function getUserApi()
+    {
+        if ($this->userApi === null) {
+            if ($this->client !== null && ! $this->client instanceof NativeCurlClient && ! $this->client instanceof Psr18Client) {
+                /** @var User */
+                $userApi = $this->client->getApi('user');
+            } else {
+                $userApi = new User($this->getHttpClient());
+            }
+
+            $this->userApi = $userApi;
+        }
+
+        return $this->userApi;
+    }
 }

tests/Unit/Api/IssueTest.php

@@ -437,6 +437,8 @@ public function testCreateCallsPost()
      * @covers ::getIssueCategoryApi
      * @covers ::getIssueStatusApi
      * @covers ::getProjectApi
+     * @covers ::getTrackerApi
+     * @covers ::getUserApi
      * @test
      */
     public function testCreateWithClientCleansParameters()
@@ -467,7 +469,7 @@ public function testCreateWithClientCleansParameters()
             ->willReturn('cleanedValue');
 
         $client = $this->createMock(Client::class);
-        $client->expects($this->exactly(6))
+        $client->expects($this->exactly(5))
             ->method('getApi')
             ->willReturnMap(
                 [
@@ -722,6 +724,60 @@ public function testCreateWithHttpClientRetrievesTrackerId()
         );
     }
 
+    /**
+     * @covers ::create
+     * @covers ::cleanParams
+     * @covers ::getUserApi
+     * @test
+     */
+    public function testCreateWithHttpClientRetrievesUserId()
+    {
+        $client = $this->createMock(HttpClient::class);
+        $client->expects($this->exactly(2))
+            ->method('request')
+            ->willReturnCallback(function (string $method, string $path, string $body = '') {
+                if ($method === 'GET') {
+                    $this->assertSame('/users.json', $path);
+                    $this->assertSame('', $body);
+
+                    return $this->createConfiguredMock(
+                        Response::class,
+                        [
+                            'getContentType' => 'application/json',
+                            'getBody' => '{"users":[{"login":"Author Name","id":5},{"login":"Assigned to User Name","id":6}]}',
+                        ]
+                    );
+                }
+
+                if ($method === 'POST') {
+                    $this->assertSame('/issues.xml', $path);
+                    $this->assertXmlStringEqualsXmlString('<?xml version="1.0"?><issue><assigned_to_id>6</assigned_to_id><author_id>5</author_id></issue>', $body);
+
+                    return $this->createConfiguredMock(
+                        Response::class,
+                        [
+                            'getContentType' => 'application/xml',
+                            'getBody' => '<?xml version="1.0"?><issue></issue>',
+                        ]
+                    );
+                }
+
+                throw new \Exception();
+            });
+
+        // Create the object under test
+        $api = new Issue($client);
+
+        $xmlElement = $api->create(['assigned_to' => 'Assigned to User Name', 'author' => 'Author Name']);
+
+        // Perform the tests
+        $this->assertInstanceOf(SimpleXMLElement::class, $xmlElement);
+        $this->assertXmlStringEqualsXmlString(
+            '<?xml version="1.0"?><issue></issue>',
+            $xmlElement->asXml(),
+        );
+    }
+
     /**
      * Test create() and buildXML().
      *
@@ -844,7 +900,7 @@ public function testUpdateCleansParameters()
             ->willReturn('cleanedValue');
 
         $client = $this->createMock(Client::class);
-        $client->expects($this->exactly(6))
+        $client->expects($this->exactly(5))
             ->method('getApi')
             ->willReturnMap(
                 [