Merge branch 'feature/exception-class-case-typo' into develop

lesstif · Apr 12, 2016 · 7a81d5e · 7a81d5e
2 parents fea1ec2 + eb27bac
commit 7a81d5e
Show file tree

Hide file tree

Showing 21 changed files with 141 additions and 181 deletions.
diff --git a/README.md b/README.md
@@ -15,13 +15,13 @@
 
 2. Next, run the Composer command to install the latest version of php jira rest client.
 	``` sh
-	php composer.phar require lesstif/php-jira-rest-client dev-master
+	php composer.phar require lesstif/php-jira-rest-client "~1.6"
 	```
     or add the following to your composer.json file.
 	```json
 	{
 	    "require": {
-	        "lesstif/php-jira-rest-client": "dev-master"
+	        "lesstif/php-jira-rest-client": "~1.6"
 	    }
 	}
 	```
@@ -84,7 +84,7 @@ try {
 } catch (JIRAException $e) {
 	print("Error Occured! " . $e->getMessage());
 }
-?>
+
 ````
 
 ## Get All Project list
@@ -108,7 +108,7 @@ try {
 } catch (JIRAException $e) {
 	print("Error Occured! " . $e->getMessage());
 }
-?>
+
 ````
 
 ## Get Issue Info
@@ -128,7 +128,6 @@ try {
 	print("Error Occured! " . $e->getMessage());
 }
 
-?>
 ````
 
 ## Create Issue
@@ -160,7 +159,6 @@ try {
 	print("Error Occured! " . $e->getMessage());
 }
 
-?>
 ````
 
 ## Add Attachment
@@ -186,7 +184,6 @@ try {
     $this->assertTrue(FALSE, "Attach Failed : " . $e->getMessage());
 }
 
-?>
 ````
 
 ## Update issue
@@ -221,7 +218,6 @@ try {
 	$this->assertTrue(FALSE, "update Failed : " . $e->getMessage());
 }
 
-?>
 ````
 
 ## Add comment
@@ -258,7 +254,6 @@ COMMENT;
 	$this->assertTrue(FALSE, "add Comment Failed : " . $e->getMessage());
 }
 
-?>
 ````
 
 ## Perform a transition on an issue
@@ -284,7 +279,6 @@ try {
 	$this->assertTrue(FALSE, "add Comment Failed : " . $e->getMessage());
 }
 
-?>
 ````
 
 ## Perform an advanced search
@@ -305,7 +299,7 @@ try {
 } catch (JIRAException $e) {
     $this->assertTrue(false, 'testSearch Failed : '.$e->getMessage());
 }
-?>
+
 ````
 
 ## Issue time tracking
@@ -337,7 +331,7 @@ try {
 } catch (JIRAException $e) {
     $this->assertTrue(false, 'testSearch Failed : '.$e->getMessage());
 }
-?>
+
 ````
 
 ## Issue worklog
@@ -359,7 +353,7 @@ try {
 } catch (JIRAException $e) {
     $this->assertTrue(false, 'testSearch Failed : '.$e->getMessage());
 }
-?>
+
 ````
 
 # License

diff --git a/src/Configuration/AbstractConfiguration.php b/src/Configuration/AbstractConfiguration.php
@@ -1,73 +1,65 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: keanor
- * Date: 17.08.15
- * Time: 22:23
- */
 
 namespace JiraRestApi\Configuration;
 
 /**
- * Class AbstractConfiguration
- *
- * @package JiraRestApi\Configuration
+ * Class AbstractConfiguration.
  */
 abstract class AbstractConfiguration implements ConfigurationInterface
 {
     /**
-     * Jira host
+     * Jira host.
      *
      * @var string
      */
     protected $jiraHost;
 
     /**
-     * Jira login
+     * Jira login.
      *
      * @var string
      */
     protected $jiraUser;
 
     /**
-     * Jira password
+     * Jira password.
      *
      * @var string
      */
     protected $jiraPassword;
 
     /**
-     * Path to log file
+     * Path to log file.
      *
      * @var string
      */
     protected $jiraLogFile;
 
     /**
-     * Log level (DEBUG, INFO, ERROR, WARNING)
+     * Log level (DEBUG, INFO, ERROR, WARNING).
      *
      * @var string
      */
     protected $jiraLogLevel;
 
     /**
-     * Curl options CURLOPT_SSL_VERIFYHOST
+     * Curl options CURLOPT_SSL_VERIFYHOST.
      *
-     * @var boolean
+     * @var bool
      */
     protected $curlOptSslVerifyHost;
 
     /**
-     * Curl options CURLOPT_SSL_VERIFYPEER
+     * Curl options CURLOPT_SSL_VERIFYPEER.
      *
-     * @var boolean
+     * @var bool
      */
     protected $curlOptSslVerifyPeer;
 
     /**
-     * Curl options CURLOPT_VERBOSE
+     * Curl options CURLOPT_VERBOSE.
      *
-     * @var boolean
+     * @var bool
      */
     protected $curlOptVerbose;
 
@@ -112,23 +104,23 @@ public function getJiraLogLevel()
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function isCurlOptSslVerifyHost()
     {
         return $this->curlOptSslVerifyHost;
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function isCurlOptSslVerifyPeer()
     {
         return $this->curlOptSslVerifyPeer;
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function isCurlOptVerbose()
     {

diff --git a/src/Configuration/ArrayConfiguration.php b/src/Configuration/ArrayConfiguration.php
@@ -3,15 +3,13 @@
  * Created by PhpStorm.
  * User: keanor
  * Date: 17.08.15
- * Time: 22:40
+ * Time: 22:40.
  */
 
 namespace JiraRestApi\Configuration;
 
 /**
- * Class ArrayConfiguration
- *
- * @package JiraRestApi\Configuration
+ * Class ArrayConfiguration.
  */
 class ArrayConfiguration extends AbstractConfiguration
 {
@@ -26,4 +24,4 @@ public function __construct(array $configuration)
             }
         }
     }
-}
+}
diff --git a/src/Configuration/ConfigurationInterface.php b/src/Configuration/ConfigurationInterface.php
@@ -3,70 +3,69 @@
  * Created by PhpStorm.
  * User: keanor
  * Date: 17.08.15
- * Time: 21:58
+ * Time: 21:58.
  */
+
 namespace JiraRestApi\Configuration;
 
 /**
- * Interface ConfigurationInterface
- *
- * @package JiraRestApi\Configuration
+ * Interface ConfigurationInterface.
  */
 interface ConfigurationInterface
 {
     /**
-     * Jira host
+     * Jira host.
      *
      * @return string
      */
     public function getJiraHost();
 
     /**
-     * Jira login
+     * Jira login.
      *
      * @return string
      */
     public function getJiraUser();
 
     /**
-     * Jira password
+     * Jira password.
      *
      * @return string
      */
     public function getJiraPassword();
 
     /**
-     * Path to log file
+     * Path to log file.
      *
      * @return string
      */
     public function getJiraLogFile();
 
     /**
-     * Log level (DEBUG, INFO, ERROR, WARNING)
+     * Log level (DEBUG, INFO, ERROR, WARNING).
      *
      * @return string
      */
     public function getJiraLogLevel();
 
     /**
-     * Curl options CURLOPT_SSL_VERIFYHOST
+     * Curl options CURLOPT_SSL_VERIFYHOST.
      *
-     * @return boolean
+     * @return bool
      */
     public function isCurlOptSslVerifyHost();
 
     /**
-     * Curl options CURLOPT_SSL_VERIFYPEER
+     * Curl options CURLOPT_SSL_VERIFYPEER.
      *
-     * @return boolean
+     * @return bool
      */
     public function isCurlOptSslVerifyPeer();
 
     /**
-     * Curl options CURLOPT_VERBOSE
+     * Curl options CURLOPT_VERBOSE.
      *
-     * @return boolean
+     * @return bool
      */
     public function isCurlOptVerbose();
-}
+}
diff --git a/src/Configuration/DotEnvConfiguration.php b/src/Configuration/DotEnvConfiguration.php
@@ -1,16 +1,9 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: keanor
- * Date: 17.08.15
- * Time: 22:01
- */
+
 namespace JiraRestApi\Configuration;
 
 /**
- * Class DotEnvConfiguration
- *
- * @package JiraRestApi\Configuration
+ * Class DotEnvConfiguration.
  */
 class DotEnvConfiguration extends AbstractConfiguration
 {
@@ -64,7 +57,7 @@ private function env($key, $default = null)
 
             case 'null':
             case '(null)':
-                return null;
+                return;
         }
 
         if ($this->startsWith($value, '"') && endsWith($value, '"')) {
@@ -111,4 +104,4 @@ public function endsWith($haystack, $needles)
 
         return false;
     }
-}
+}
diff --git a/src/Issue/Issue.php b/src/Issue/Issue.php
@@ -20,7 +20,7 @@ class Issue implements \JsonSerializable
    /* @var string */
    public $key;
 
-    /** @var IssueField */
+   /** @var IssueField */
    public $fields;
 
     public function jsonSerialize()

diff --git a/src/Issue/IssueField.php b/src/Issue/IssueField.php
@@ -135,9 +135,8 @@ public function setIssueType($name)
             }
 
             $this->issuetype->name = $name;
-        }
-        else {
-          $this->issuetype = $name;
+        } else {
+            $this->issuetype = $name;
         }
 
         return $this;
@@ -258,5 +257,4 @@ public function getIssueType()
 
     /** @var object */
     public $timeoriginalestimate;
-
 }