Skip to content

Commit 7a81d5e

Browse files
committed
Merge branch 'feature/exception-class-case-typo' into develop
2 parents fea1ec2 + eb27bac commit 7a81d5e

21 files changed

+141
-181
lines changed

README.md

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515

1616
2. Next, run the Composer command to install the latest version of php jira rest client.
1717
``` sh
18-
php composer.phar require lesstif/php-jira-rest-client dev-master
18+
php composer.phar require lesstif/php-jira-rest-client "~1.6"
1919
```
2020
or add the following to your composer.json file.
2121
```json
2222
{
2323
"require": {
24-
"lesstif/php-jira-rest-client": "dev-master"
24+
"lesstif/php-jira-rest-client": "~1.6"
2525
}
2626
}
2727
```
@@ -84,7 +84,7 @@ try {
8484
} catch (JIRAException $e) {
8585
print("Error Occured! " . $e->getMessage());
8686
}
87-
?>
87+
8888
````
8989

9090
## Get All Project list
@@ -108,7 +108,7 @@ try {
108108
} catch (JIRAException $e) {
109109
print("Error Occured! " . $e->getMessage());
110110
}
111-
?>
111+
112112
````
113113

114114
## Get Issue Info
@@ -128,7 +128,6 @@ try {
128128
print("Error Occured! " . $e->getMessage());
129129
}
130130

131-
?>
132131
````
133132

134133
## Create Issue
@@ -160,7 +159,6 @@ try {
160159
print("Error Occured! " . $e->getMessage());
161160
}
162161

163-
?>
164162
````
165163

166164
## Add Attachment
@@ -186,7 +184,6 @@ try {
186184
$this->assertTrue(FALSE, "Attach Failed : " . $e->getMessage());
187185
}
188186

189-
?>
190187
````
191188

192189
## Update issue
@@ -221,7 +218,6 @@ try {
221218
$this->assertTrue(FALSE, "update Failed : " . $e->getMessage());
222219
}
223220

224-
?>
225221
````
226222

227223
## Add comment
@@ -258,7 +254,6 @@ COMMENT;
258254
$this->assertTrue(FALSE, "add Comment Failed : " . $e->getMessage());
259255
}
260256

261-
?>
262257
````
263258

264259
## Perform a transition on an issue
@@ -284,7 +279,6 @@ try {
284279
$this->assertTrue(FALSE, "add Comment Failed : " . $e->getMessage());
285280
}
286281

287-
?>
288282
````
289283

290284
## Perform an advanced search
@@ -305,7 +299,7 @@ try {
305299
} catch (JIRAException $e) {
306300
$this->assertTrue(false, 'testSearch Failed : '.$e->getMessage());
307301
}
308-
?>
302+
309303
````
310304

311305
## Issue time tracking
@@ -337,7 +331,7 @@ try {
337331
} catch (JIRAException $e) {
338332
$this->assertTrue(false, 'testSearch Failed : '.$e->getMessage());
339333
}
340-
?>
334+
341335
````
342336

343337
## Issue worklog
@@ -359,7 +353,7 @@ try {
359353
} catch (JIRAException $e) {
360354
$this->assertTrue(false, 'testSearch Failed : '.$e->getMessage());
361355
}
362-
?>
356+
363357
````
364358

365359
# License

src/Configuration/AbstractConfiguration.php

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,65 @@
11
<?php
2-
/**
3-
* Created by PhpStorm.
4-
* User: keanor
5-
* Date: 17.08.15
6-
* Time: 22:23
7-
*/
82

93
namespace JiraRestApi\Configuration;
104

115
/**
12-
* Class AbstractConfiguration
13-
*
14-
* @package JiraRestApi\Configuration
6+
* Class AbstractConfiguration.
157
*/
168
abstract class AbstractConfiguration implements ConfigurationInterface
179
{
1810
/**
19-
* Jira host
11+
* Jira host.
2012
*
2113
* @var string
2214
*/
2315
protected $jiraHost;
2416

2517
/**
26-
* Jira login
18+
* Jira login.
2719
*
2820
* @var string
2921
*/
3022
protected $jiraUser;
3123

3224
/**
33-
* Jira password
25+
* Jira password.
3426
*
3527
* @var string
3628
*/
3729
protected $jiraPassword;
3830

3931
/**
40-
* Path to log file
32+
* Path to log file.
4133
*
4234
* @var string
4335
*/
4436
protected $jiraLogFile;
4537

4638
/**
47-
* Log level (DEBUG, INFO, ERROR, WARNING)
39+
* Log level (DEBUG, INFO, ERROR, WARNING).
4840
*
4941
* @var string
5042
*/
5143
protected $jiraLogLevel;
5244

5345
/**
54-
* Curl options CURLOPT_SSL_VERIFYHOST
46+
* Curl options CURLOPT_SSL_VERIFYHOST.
5547
*
56-
* @var boolean
48+
* @var bool
5749
*/
5850
protected $curlOptSslVerifyHost;
5951

6052
/**
61-
* Curl options CURLOPT_SSL_VERIFYPEER
53+
* Curl options CURLOPT_SSL_VERIFYPEER.
6254
*
63-
* @var boolean
55+
* @var bool
6456
*/
6557
protected $curlOptSslVerifyPeer;
6658

6759
/**
68-
* Curl options CURLOPT_VERBOSE
60+
* Curl options CURLOPT_VERBOSE.
6961
*
70-
* @var boolean
62+
* @var bool
7163
*/
7264
protected $curlOptVerbose;
7365

@@ -112,23 +104,23 @@ public function getJiraLogLevel()
112104
}
113105

114106
/**
115-
* @return boolean
107+
* @return bool
116108
*/
117109
public function isCurlOptSslVerifyHost()
118110
{
119111
return $this->curlOptSslVerifyHost;
120112
}
121113

122114
/**
123-
* @return boolean
115+
* @return bool
124116
*/
125117
public function isCurlOptSslVerifyPeer()
126118
{
127119
return $this->curlOptSslVerifyPeer;
128120
}
129121

130122
/**
131-
* @return boolean
123+
* @return bool
132124
*/
133125
public function isCurlOptVerbose()
134126
{

src/Configuration/ArrayConfiguration.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33
* Created by PhpStorm.
44
* User: keanor
55
* Date: 17.08.15
6-
* Time: 22:40
6+
* Time: 22:40.
77
*/
88

99
namespace JiraRestApi\Configuration;
1010

1111
/**
12-
* Class ArrayConfiguration
13-
*
14-
* @package JiraRestApi\Configuration
12+
* Class ArrayConfiguration.
1513
*/
1614
class ArrayConfiguration extends AbstractConfiguration
1715
{
@@ -26,4 +24,4 @@ public function __construct(array $configuration)
2624
}
2725
}
2826
}
29-
}
27+
}

src/Configuration/ConfigurationInterface.php

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,70 +3,69 @@
33
* Created by PhpStorm.
44
* User: keanor
55
* Date: 17.08.15
6-
* Time: 21:58
6+
* Time: 21:58.
77
*/
8+
89
namespace JiraRestApi\Configuration;
910

1011
/**
11-
* Interface ConfigurationInterface
12-
*
13-
* @package JiraRestApi\Configuration
12+
* Interface ConfigurationInterface.
1413
*/
1514
interface ConfigurationInterface
1615
{
1716
/**
18-
* Jira host
17+
* Jira host.
1918
*
2019
* @return string
2120
*/
2221
public function getJiraHost();
2322

2423
/**
25-
* Jira login
24+
* Jira login.
2625
*
2726
* @return string
2827
*/
2928
public function getJiraUser();
3029

3130
/**
32-
* Jira password
31+
* Jira password.
3332
*
3433
* @return string
3534
*/
3635
public function getJiraPassword();
3736

3837
/**
39-
* Path to log file
38+
* Path to log file.
4039
*
4140
* @return string
4241
*/
4342
public function getJiraLogFile();
4443

4544
/**
46-
* Log level (DEBUG, INFO, ERROR, WARNING)
45+
* Log level (DEBUG, INFO, ERROR, WARNING).
4746
*
4847
* @return string
4948
*/
5049
public function getJiraLogLevel();
5150

5251
/**
53-
* Curl options CURLOPT_SSL_VERIFYHOST
52+
* Curl options CURLOPT_SSL_VERIFYHOST.
5453
*
55-
* @return boolean
54+
* @return bool
5655
*/
5756
public function isCurlOptSslVerifyHost();
5857

5958
/**
60-
* Curl options CURLOPT_SSL_VERIFYPEER
59+
* Curl options CURLOPT_SSL_VERIFYPEER.
6160
*
62-
* @return boolean
61+
* @return bool
6362
*/
6463
public function isCurlOptSslVerifyPeer();
6564

6665
/**
67-
* Curl options CURLOPT_VERBOSE
66+
* Curl options CURLOPT_VERBOSE.
6867
*
69-
* @return boolean
68+
* @return bool
7069
*/
7170
public function isCurlOptVerbose();
72-
}
71+
}

src/Configuration/DotEnvConfiguration.php

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
<?php
2-
/**
3-
* Created by PhpStorm.
4-
* User: keanor
5-
* Date: 17.08.15
6-
* Time: 22:01
7-
*/
2+
83
namespace JiraRestApi\Configuration;
94

105
/**
11-
* Class DotEnvConfiguration
12-
*
13-
* @package JiraRestApi\Configuration
6+
* Class DotEnvConfiguration.
147
*/
158
class DotEnvConfiguration extends AbstractConfiguration
169
{
@@ -64,7 +57,7 @@ private function env($key, $default = null)
6457

6558
case 'null':
6659
case '(null)':
67-
return null;
60+
return;
6861
}
6962

7063
if ($this->startsWith($value, '"') && endsWith($value, '"')) {
@@ -111,4 +104,4 @@ public function endsWith($haystack, $needles)
111104

112105
return false;
113106
}
114-
}
107+
}

src/Issue/Issue.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Issue implements \JsonSerializable
2020
/* @var string */
2121
public $key;
2222

23-
/** @var IssueField */
23+
/** @var IssueField */
2424
public $fields;
2525

2626
public function jsonSerialize()

src/Issue/IssueField.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,8 @@ public function setIssueType($name)
135135
}
136136

137137
$this->issuetype->name = $name;
138-
}
139-
else {
140-
$this->issuetype = $name;
138+
} else {
139+
$this->issuetype = $name;
141140
}
142141

143142
return $this;
@@ -258,5 +257,4 @@ public function getIssueType()
258257

259258
/** @var object */
260259
public $timeoriginalestimate;
261-
262260
}

0 commit comments

Comments
 (0)