add attachment impl...

Author: lesstif

src/JiraClient.php

@@ -155,25 +155,22 @@ public function exec($context, $post_data = null, $custom_request = null) {
 	/**
 	 * file upload
 	 * 
+	 * @param context url context
+	 * @param upload_file upload file.
+	 * 
+	 * @todo multiple file upload suppport.
+	 * 
 	 */
-	public function upload($context, $file_list) {
+	public function upload($context, $upload_file) {
 		$url = $this->host . $this->api_uri . '/' . preg_replace('/\//', '', $context, 1);
 
 		$ch=curl_init();
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		curl_setopt($ch, CURLOPT_URL, $url);		
-
-		$attachments = array();
-
-		$i = 0;
-        foreach ($file_list as $f) {        	
-            $attachments[$i] = array(
-                    'file' => '@' . realpath($f)
-          		);
-        }
+		curl_setopt($ch, CURLOPT_URL, $url);				
 
-        var_dump($attachments);
-        flush();
+        $attachments = array(
+        	'file' => '@' . realpath($upload_file)
+        	);
 
         // send file
 		curl_setopt($ch, CURLOPT_POST, true);

src/issue/IssueService.php

@@ -59,15 +59,15 @@ public function create($issueField) {
      * Add one or more file to an issue
      * 
      * @param issueIdOrKey Issue id or key
-     * @param fileList attachment file array
+     * @param filePath attachment file.
      * 
      * @return
      */
-    public function addAttachments($issueIdOrKey, $fileList) {
+    public function addAttachments($issueIdOrKey, $filePath) {
 
         $this->log->addInfo("addAttachments=\n");
 
-        $ret = $this->upload($this->uri . "/$issueIdOrKey/attachments", $fileList);
+        $ret = $this->upload($this->uri . "/$issueIdOrKey/attachments", $filePath);
 
         $issue = $this->json_mapper->map(
              json_decode($ret), new Issue()

tests/IssueTest.php

@@ -60,53 +60,16 @@ public function testAddAttachment()
     {
     	$this->markTestIncomplete();
 		try {
-			$fileList = array(
-				'screen_capture.png',
-				'bug-description.pdf'
-				);
-
+			
 			$issueService = new IssueService();
 
-			$ret = $issueService->addAttachments("TEST-879", $fileList);
-
-			print_r($ret);
-		} catch (JIRAException $e) {
-			$this->assertTrue(FALSE, "Attach Failed : " . $e->getMessage());
-		}
-	}
-
-
-	static function addAttachments($issueIdOrKey, $fileList) {        
-		$c = new IssueService();
+			$ret = $issueService->addAttachments("TEST-879", 'screen_capture.png');
 
-        $ret = $c->upload("/issue/$issueIdOrKey/attachments", $fileList);
-
-        $issue = $c->json_mapper->map(
-             json_decode($ret), new Issue()
-        );
-
-        return $issue;
-    }
-
-	public function testRefection()
-    {
-    	//$this->markTestIncomplete();
-		try {
-			$fileList = array(
-				'screen_capture.png',
-				'bug-description.pdf'
-				);
-
-			$this->addAttachments("TEST-879", $fileList);
-			
 			print_r($ret);
 		} catch (JIRAException $e) {
 			$this->assertTrue(FALSE, "Attach Failed : " . $e->getMessage());
 		}
 	}
-
-
-
 }
 
 ?>