to polish the custom field code

Author: lesstif

src/Field/FieldService.php

@@ -57,15 +57,15 @@ public function getAllFields($fieldType = Field::BOTH)
      *
      * @throws \JiraCloud\JiraException
      *
-     * @return string
+     * @return \stdClass
      */
-    public function getCustomFieldOption($id)
+    public function getCustomFieldOption($id) : \stdClass
     {
         $ret = $this->exec('/customFieldOption/'.$id);
 
         $this->log->debug("get custom Field Option=\n".$ret);
 
-        return $ret;
+        return json_decode($ret);
     }
 
     /**

tests/CustomFieldsTest.php

@@ -10,51 +10,64 @@
 
 class CustomFieldsTest extends TestCase
 {
-    public function testGetFields()
+    /**
+     * @test
+     * @return array
+     */
+    public function get_all_custom_fields() : array
     {
         try {
             $fieldService = new FieldService();
 
             $ret = $fieldService->getAllFields(Field::CUSTOM);
-            Dumper::dump($ret);
 
-            file_put_contents("custom-field.json", json_encode($ret, JSON_UNESCAPED_UNICODE|JSON_PRETTY_PRINT));
+            //file_put_contents("custom-field.json", json_encode($ret, JSON_UNESCAPED_UNICODE|JSON_PRETTY_PRINT));
 
             $ids = array_map(function($cf) {
                 // extract custom field id
                     preg_match('/\d+/', $cf->id, $matches);
                     return $matches[0];
                 }, $ret);
 
-            return $ids;
+            $this->assertNotNull($ids);
+            $this->assertIsArray($ids);
 
+            return $ids;
         } catch (JiraException $e) {
-            $this->assertTrue(false, 'testSearch Failed : '.$e->getMessage());
+            $this->fail('get_all_custom_fields Failed : '.$e->getMessage());
         }
     }
 
     /**
-     * @depends testGetFields
+     * @test
+     * @depends get_all_custom_fields
      *
-     * @param $ids
+     * @param array $ids
      */
-    public function testGetFieldOptions($ids)
+    public function get_customer_field_options(array $ids) :void
     {
         try {
             $fieldService = new FieldService();
 
             foreach ($ids as $id) {
                 try {
                     $ret = $fieldService->getCustomFieldOption($id);
-                    Dumper::dump($ret);
+
+                    $this->assertNotNull($ret->self);
                 }catch (JiraException $e) {}
             }
         } catch (JiraException $e) {
-            $this->assertTrue(false, 'testGetFieldOptions Failed : '.$e->getMessage());
+            $this->fail('get_customer_field_options Failed : '.$e->getMessage());
         }
     }
 
-    public function testCreateFields()
+    /**
+     * @test
+     * @depends get_customer_field_options
+     * @return string
+     * @throws \JsonMapper_Exception
+     */
+    public function create_customer_field() : string
     {
         //$this->markTestSkipped();
         try {
@@ -69,9 +82,29 @@ public function testCreateFields()
             $fieldService = new FieldService();
 
             $ret = $fieldService->create($field);
-            Dumper::dump($ret);
+
+            return $ret->id;
+        } catch (JiraException $e) {
+            $this->fail('create_customer_field Failed : '.$e->getMessage());
+        }
+    }
+
+    /**
+     * @test
+     * @depends create_customer_field
+     * @param string $id
+     * @return \stdClass
+     */
+    public function get_created_customer_field_options(string $id) :\stdClass
+    {
+        try {
+            $fieldService = new FieldService();
+
+            $ret = $fieldService->getCustomFieldOption($id);
+
+            return $ret;
         } catch (JiraException $e) {
-            $this->assertTrue(false, 'Field Create Failed : '.$e->getMessage());
+            $this->fail('get_created_customer_field_options Failed : '.$e->getMessage());
         }
     }
 }