cs fixes

Author: kbsali

example.php

@@ -56,8 +56,9 @@
 $client->api('project')->show($projectId);
 $client->api('project')->getIdByName('Elvis');
 $client->api('project')->create(array(
-    'name'       => 'some name',
-    'identifier' => 'the_identifier',
+    'name'        => 'some name',
+    'identifier'  => 'the_identifier',
+    'tracker_ids' => array(),
 ));
 $client->api('project')->update($projectId, array(
     'name' => 'different name',
@@ -128,6 +129,7 @@
             'value' => $_POST['EMAIL'],
         ),
     ),
+    'watcher_user_ids' => array(),
 ));
 $client->api('issue')->update($issueId, array(
     // 'subject'        => 'test note (xml) 1',
@@ -262,7 +264,8 @@
 $client->api('membership')->all($projectId);
 $client->api('membership')->create($projectId, array(
     'user_id'  => null,
-    'role_ids' => null,
+    'user_ids' => array(),
+    'role_ids' => array(),
 ));
 $client->api('membership')->remove($membershipId);
 

lib/Redmine/Api/AbstractApi.php

@@ -118,15 +118,16 @@ protected function retrieveAll($endpoint, array $params = array())
             }
             $params['limit'] = $_limit;
             $params['offset'] = $offset;
+
             $newDataSet = (array) $this->get($endpoint . '?' . http_build_query($params));
             $ret = array_merge_recursive($ret, $newDataSet);
+
             $offset += $_limit;
-            // Break if the data set is the last one, as the offset is greater
-            // than the total count
-            if (empty($newDataSet)
-                || (array_key_exists('offset', $newDataSet)
-                && array_key_exists('total_count', $newDataSet)
-                && $newDataSet['offset'] >= $newDataSet['total_count'])
+            if (empty($newDataSet) || (
+                    isset($newDataSet['offset']) &&
+                    isset($newDataSet['total_count']) &&
+                    $newDataSet['offset'] >= $newDataSet['total_count']
+                )
             ) {
                 $limit = 0;
             }
@@ -143,15 +144,17 @@ protected function retrieveAll($endpoint, array $params = array())
      * @return $xml             Element
      * @see http://www.redmine.org/projects/redmine/wiki/Rest_api#Working-with-custom-fields
      */
-    protected function attachCustomFieldXML($xml, $fields)
+    protected function attachCustomFieldXML(SimpleXMLElement $xml, $fields)
     {
-        $fieldsXML = $xml->addChild('custom_fields');
-        $fieldsXML->addAttribute('type', 'array');
+        $fields = $xml->addChild('custom_fields');
+        $fields->addAttribute('type', 'array');
         foreach ($fields as $field) {
-            $fieldXML = $fieldsXML->addChild('custom_field');
-            $fieldXML->addAttribute('name', $field['name']);
-            $fieldXML->addAttribute('id', $field['id']);
-            $fieldXML->addChild('value', $field['value']);
+            $field = $fields->addChild('custom_field');
+            if (isset($field['name'])) {
+                $field->addAttribute('name', $field['name']);
+            }
+            $field->addAttribute('id', $field['id']);
+            $field->addChild('value', $field['value']);
         }
 
         return $xml;

lib/Redmine/Api/Issue.php

@@ -64,13 +64,7 @@ private function buildXML(array $params = array())
 
         foreach ($params as $k => $v) {
             if ('custom_fields' === $k && is_array($v)) {
-                $custom_fields_item = $xml->addChild('custom_fields', '');
-                $custom_fields_item->addAttribute('type', 'array');
-                foreach ($v as $field) {
-                    $item = $custom_fields_item->addChild('custom_field', '');
-                    $item->addAttribute('id', (int) $field['id']);
-                    $item->addChild('value', $field['value']);
-                }
+                $this->attachCustomFieldXML($xml, $v);
             } elseif ('watcher_user_ids' === $k && is_array($v)) {
                 $watcher_user_ids = $xml->addChild('watcher_user_ids', '');
                 $watcher_user_ids->addAttribute('type', 'array');

lib/Redmine/Api/Membership.php

@@ -43,8 +43,7 @@ public function create($project, array $params = array())
             'role_ids' => null,
         );
         $params = array_filter(array_merge($defaults, $params));
-        if(
-           (!isset($params['user_ids']) && !isset($params['user_id']))
+        if((!isset($params['user_ids']) && !isset($params['user_id']))
          || !isset($params['role_ids'])
         ) {
             throw new \Exception('Missing mandatory parameters');