Merge pull request #173 from kbsali/misc

Misc

Author: kbsali

lib/Redmine/Api/AbstractApi.php

@@ -175,7 +175,7 @@ protected function retrieveAll($endpoint, array $params = array())
      * Attaches Custom Fields to a create/update query.
      *
      * @param \SimpleXMLElement $xml    XML Element the custom fields are attached to
-     * @param array            $fields array of fields to attach, each field needs name, id and value set
+     * @param array             $fields array of fields to attach, each field needs name, id and value set
      *
      * @return \SimpleXMLElement $xml
      *

lib/Redmine/Api/Project.php

@@ -153,7 +153,9 @@ protected function prepareParamsXml($params)
 
         $xml = new \SimpleXMLElement('<?xml version="1.0"?><project></project>');
         foreach ($params as $k => $v) {
-            if (isset($_params[$k]) && is_array($v)) {
+            if ('custom_fields' === $k && is_array($v)) {
+                $this->attachCustomFieldXML($xml, $v);
+            } elseif (isset($_params[$k]) && is_array($v)) {
                 $array = $xml->addChild($k, '');
                 $array->addAttribute('type', 'array');
                 foreach ($v as $id) {

lib/Redmine/Api/User.php

@@ -94,7 +94,7 @@ public function getIdByUsername($username, array $params = array())
      *  - memberships: adds extra information about user's memberships and roles on the projects
      *  - groups (added in 2.1): adds extra information about user's groups
      *  - api_key: the API key of the user, visible for admins and for yourself (added in 2.3.0)
-     *  - status: a numeric id representing the status of the user, visible for admins only (added in 2.4.0).
+     *  - status: a numeric id representing the status of the user, visible for admins only (added in 2.4.0)
      *
      * @param string $id     the user id
      * @param array  $params extra associated data

lib/Redmine/Client.php

@@ -492,12 +492,11 @@ public function getCurlOptions()
      * @param string $method
      * @param string $data
      *
-     * @return resource a cURL handle on success, <b>FALSE</b> on errors.
+     * @return resource a cURL handle on success, <b>FALSE</b> on errors
      */
     public function prepareRequest($path, $method = 'GET', $data = '')
     {
         $this->responseCode = null;
-        $this->curlOptions = array();
         $curl = curl_init();
 
         // General cURL options

test/Redmine/Fixtures/MockClient.php

@@ -6,7 +6,7 @@
 
 /**
  * Mock client class.
- * 
+ *
  * The runRequest method of this client class just returns the value of
  * the path, method and data or the $runRequestReturnValue value if set.
  */

test/Redmine/Tests/ClientTest.php

@@ -362,9 +362,13 @@ public function testPrepareXmlPutRequestWithHttpUsernameAndPassword()
 
         // Perform the tests
         $data = array(1 => 'post_1', '25' => 'post_25');
+        $client->setCurlOption(CURLOPT_PROXY, 'PROXYURL:PORT');
         $client->prepareRequest('/issues.xml', 'PUT', $data);
+
         $curlOptions = $client->getCurlOptions();
+
         $this->assertRegExp('/username\:secret/m', $curlOptions[CURLOPT_USERPWD]);
+        $this->assertSame('PROXYURL:PORT', $curlOptions[CURLOPT_PROXY]);
         $this->assertSame(CURLAUTH_BASIC, $curlOptions[CURLOPT_HTTPAUTH]);
         $this->assertSame('http://test.local/issues.xml', $curlOptions[CURLOPT_URL]);
         $this->assertSame(0, $curlOptions[CURLOPT_VERBOSE]);

test/Redmine/Tests/ProjectXmlTest.php

@@ -28,12 +28,29 @@ public function testCreateComplex()
         $res = $this->client->api('project')->create(array(
             'name' => 'some name',
             'identifier' => 'the_identifier',
+            'custom_fields' => array(
+                array(
+                    'id' => 123,
+                    'name' => 'cf_name',
+                    'field_format' => 'string',
+                    'value' => array(1, 2, 3),
+                ),
+            ),
         ));
 
         $xml = '<?xml version="1.0"?>
 <project>
     <name>some name</name>
     <identifier>the_identifier</identifier>
+    <custom_fields type="array">
+        <custom_field name="cf_name" field_format="string" id="123" multiple="true">
+            <value type="array">
+                <value>1</value>
+                <value>2</value>
+                <value>3</value>
+            </value>
+        </custom_field>
+    </custom_fields>
 </project>';
         $this->assertEquals($this->formatXml($xml), $this->formatXml($res['data']));
     }