Merge branch 'feature/impl-attachment' into develop

Author: lesstif

composer.json

@@ -1,6 +1,8 @@
 {
     "name": "lesstif/php-jira-rest-client",
     "description": "JIRA REST API Client for PHP Users.",
+     "type": "library",
+    "keywords": ["jira", "jira-php", "jira-rest"],
     "require": {
         "netresearch/jsonmapper": "0.4.*",
         "monolog/monolog": "~1.12"

src/JiraClient.php

@@ -67,13 +67,13 @@ public function __construct($config)
         $this->password = $config['password'];
 
         if (isset($config['CURLOPT_SSL_VERIFYHOST']))
-        	$this->CURLOPT_SSL_VERIFYHOST = $config['CURLOPT_SSL_VERIFYHOST'] === 'true'? true: false;
+        	$this->CURLOPT_SSL_VERIFYHOST = $config['CURLOPT_SSL_VERIFYHOST'] === true ? true: false;
 
         if (isset($config['CURLOPT_SSL_VERIFYPEER']))
-        	$this->CURLOPT_SSL_VERIFYPEER = $config['CURLOPT_SSL_VERIFYPEER'] === 'true'? true: false;
+        	$this->CURLOPT_SSL_VERIFYPEER = $config['CURLOPT_SSL_VERIFYPEER'] === true ? true: false;
 
         if (isset($config['CURLOPT_VERBOSE']))
-        	$this->CURLOPT_VERBOSE = $config['CURLOPT_VERBOSE'] === 'true'? true: false;
+        	$this->CURLOPT_VERBOSE = $config['CURLOPT_VERBOSE'] === true ? true: false;
 
         if (isset($config['LOG_FILE']))
         	$this->LOG_FILE = $config['LOG_FILE'];
@@ -152,6 +152,71 @@ public function exec($context, $post_data = null, $custom_request = null) {
 		return $response;
 	}
 
+	/**
+	 * file upload
+	 * 
+	 * @param context url context
+	 * @param upload_file upload file.
+	 * 
+	 * @todo multiple file upload suppport.
+	 * 
+	 */
+	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(
+        	'file' => '@' . realpath($upload_file)
+        	);
+
+        // send file
+		curl_setopt($ch, CURLOPT_POST, true);
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $attachments);
+        
+		curl_setopt($ch, CURLOPT_USERPWD, "$this->username:$this->password");
+
+		curl_setopt ($ch, CURLOPT_SSL_VERIFYHOST, $this->CURLOPT_SSL_VERIFYHOST);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, $this->CURLOPT_SSL_VERIFYPEER);
+
+		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+		curl_setopt($ch, CURLOPT_HTTPHEADER, 
+			array(
+				'Accept: */*', 
+				'Content-Type: multipart/form-data',
+				'X-Atlassian-Token: nocheck'
+				)); 
+		
+		curl_setopt($ch, CURLOPT_VERBOSE, $this->CURLOPT_VERBOSE);
+
+		$this->log->addDebug('Curl exec=' . $url);	
+		$response = curl_exec($ch);
+
+		// if request failed.
+		if (!$response) {		
+			$body = curl_error($ch);
+			curl_close($ch);
+			// HostNotFound, No route to Host, etc Network error
+			$this->log->addError("CURL Error: = " . $body);
+			throw new JIRAException("CURL Error: = " . $body);
+		} else {
+			// if request was ok, parsing http response code.
+			$this->http_response = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+
+			curl_close($ch);
+
+			// don't check 301, 302 because setting CURLOPT_FOLLOWLOCATION 
+			if ($this->http_response != 200 && $this->http_response != 201) {
+				throw new JIRAException("CURL HTTP Request Failed: Status Code : "
+				 . $this->http_response . ", URL:" . $url
+				 . "\nError Message : " . $response, $this->http_response);
+			}			
+		}		
+
+		return $response;
+	}
 }
 
 

src/issue/Attachment.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace JiraRestApi\Issue;
+
+class Attachment {	
+  	/* @var string */
+    public $self;
+
+    /* @var string */
+    public $id;
+
+   /* @var string */
+   public $filename;
+
+   /* @var Reporter */
+   public $author;
+
+   /* @var DateTime */
+   public $created;
+
+   /* @var int */
+   public $size;
+
+   /* @var string */
+   public $mimeType;
+
+   /* @var string */
+   public $content;
+
+    /* @var string */
+   public $thumbnail;
+}
+
+?>

src/issue/IssueField.php

@@ -146,6 +146,9 @@ public function addVersion($id, $name) {
 
 	/* @var VersionList[\JiraRestApi\Issue\Version] */
 	public $versions;
+
+	/** @var AttachmentList[\JiraRestApi\Issue\Attachment] */
+	public $attachments;	
 }
 
 ?>

src/issue/IssueService.php

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

tests/IssueTest.php

@@ -28,7 +28,7 @@ public function testIssue()
 
 	public function testCreateIssue()
     {
-    	//$this->markTestIncomplete();
+    	$this->markTestIncomplete();
 		try {
 			$issueField = new IssueField();
 
@@ -39,7 +39,10 @@ public function testCreateIssue()
 						->setIssueType("Bug")
 						->setDescription("Full description for issue")
 						->addVersion(null, "1.0.1")
-						->addVersion(null, "1.0.3");
+						->addVersion(null, "1.0.3")
+						->addAttachment('screen_capture.png')
+						->addAttachment('bug-description.pdf')
+						;
 
 			$issueService = new IssueService();
 
@@ -52,6 +55,21 @@ public function testCreateIssue()
 		}
 	}
 	//
+
+	public function testAddAttachment()
+    {
+    	$this->markTestIncomplete();
+		try {
+			
+			$issueService = new IssueService();
+
+			$ret = $issueService->addAttachments("TEST-879", 'screen_capture.png');
+
+			print_r($ret);
+		} catch (JIRAException $e) {
+			$this->assertTrue(FALSE, "Attach Failed : " . $e->getMessage());
+		}
+	}
 }
 
 ?>