Skip to content

Commit 16e57a3

Browse files
GrahamCampbellGrahamCampbell
committed
Applied further fixes
1 parent 3cd5680 commit 16e57a3

File tree

10 files changed

+37
-90
lines changed

10 files changed

+37
-90
lines changed

‎rector.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ parameters:
55
auto_import_names: true
66
import_short_classes: false
77
import_doc_blocks: false
8-
php_version_features: '5.6'
8+
php_version_features: '7.1'
99
paths:
1010
- 'src'
1111
- 'tests'
@@ -16,8 +16,13 @@ parameters:
1616
- 'php54'
1717
- 'php55'
1818
- 'php56'
19+
- 'php70'
20+
- 'php71'
1921
- 'phpunit40'
2022
- 'phpunit50'
23+
- 'phpunit60'
24+
- 'phpunit70'
25+
- 'phpunit75'
2126

2227
services:
2328
Rector\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector: ~
@@ -50,3 +55,4 @@ services:
5055
Rector\SOLID\Rector\If_\ChangeIfElseValueAssignToEarlyReturnRector: ~
5156
Rector\SOLID\Rector\If_\ChangeNestedIfsToEarlyReturnRector: ~
5257
Rector\SOLID\Rector\If_\RemoveAlwaysElseRector: ~
58+
Rector\SOLID\Rector\Property\ChangeReadOnlyPropertyWithDefaultValueToConstantRector: ~

‎src/Model/User.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ final class User extends AbstractModel
7474
*/
7575
public static function fromArray(Client $client, array $data)
7676
{
77-
$id = isset($data['id']) ? $data['id'] : 0;
77+
$id = $data['id'] ?? 0;
7878

7979
$user = new self($id, $client);
8080

‎src/ResultPager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ private function postFetch()
220220
*/
221221
private function get(string $key)
222222
{
223-
$pagination = isset($this->pagination[$key]) ? $this->pagination[$key] : null;
223+
$pagination = $this->pagination[$key] ?? null;
224224

225225
if (null === $pagination) {
226226
return [];

‎tests/Api/TestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ abstract protected function getApiClass();
1818
/**
1919
* @param array $methods
2020
*
21-
* @return \PHPUnit_Framework_MockObject_MockObject
21+
* @return \PHPUnit\Framework\MockObject\MockObject
2222
*/
2323
protected function getApiMock(array $methods = [])
2424
{

‎tests/HttpClient/BuilderTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,24 @@ class BuilderTest extends TestCase
2828
public function initBuilder()
2929
{
3030
$this->subject = new Builder(
31-
$this->getMockBuilder(ClientInterface::class)->getMock(),
32-
$this->getMockBuilder(RequestFactoryInterface::class)->getMock(),
33-
$this->getMockBuilder(StreamFactoryInterface::class)->getMock()
31+
$this->createMock(ClientInterface::class),
32+
$this->createMock(RequestFactoryInterface::class),
33+
$this->createMock(StreamFactoryInterface::class)
3434
);
3535
}
3636

3737
public function testAddPluginShouldInvalidateHttpClient()
3838
{
3939
$client = $this->subject->getHttpClient();
4040

41-
$this->subject->addPlugin($this->getMockBuilder(Plugin::class)->getMock());
41+
$this->subject->addPlugin($this->createMock(Plugin::class));
4242

4343
$this->assertNotSame($client, $this->subject->getHttpClient());
4444
}
4545

4646
public function testRemovePluginShouldInvalidateHttpClient()
4747
{
48-
$this->subject->addPlugin($this->getMockBuilder(Plugin::class)->getMock());
48+
$this->subject->addPlugin($this->createMock(Plugin::class));
4949

5050
$client = $this->subject->getHttpClient();
5151

‎tests/Model/GroupTest.php

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ class GroupTest extends TestCase
1414
{
1515
public function testFromArray()
1616
{
17-
$client = $this->getMockBuilder(Client::class)
18-
->disableOriginalConstructor()
19-
->getMock();
17+
$client = $this->createMock(Client::class);
2018

2119
$data = [
2220
'id' => 1,
@@ -78,14 +76,8 @@ public function testProjects()
7876
];
7977

8078
//Mock API methods
81-
$client = $this->getMockBuilder(Client::class)
82-
->disableOriginalConstructor()
83-
->getMock()
84-
;
85-
$groups = $this->getMockBuilder(Groups::class)
86-
->disableOriginalConstructor()
87-
->getMock()
88-
;
79+
$client = $this->createMock(Client::class);
80+
$groups = $this->createMock(Groups::class);
8981
$client->method('groups')->willReturn($groups);
9082
$groups->method('projects')->willReturn([$project_data]);
9183

‎tests/Model/IssueTest.php

Lines changed: 13 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,7 @@ public function testCorrectConstructWithoutClient()
4040
public function testCorrectConstruct()
4141
{
4242
$project = new Project();
43-
$client = $this->getMockBuilder(Client::class)
44-
->disableOriginalConstructor()
45-
->getMock()
46-
;
43+
$client = $this->createMock(Client::class);
4744

4845
$sUT = new Issue($project, 10, $client);
4946

@@ -55,10 +52,7 @@ public function testCorrectConstruct()
5552
public function testFromArray()
5653
{
5754
$project = new Project();
58-
$client = $this->getMockBuilder(Client::class)
59-
->disableOriginalConstructor()
60-
->getMock()
61-
;
55+
$client = $this->createMock(Client::class);
6256

6357
$sUT = Issue::fromArray($client, $project, ['iid' => 10]);
6458

@@ -69,9 +63,7 @@ public function testFromArray()
6963

7064
private function getIssueMock(array $data = [])
7165
{
72-
$client = $this->getMockBuilder(Client::class)
73-
->disableOriginalConstructor()
74-
->getMock();
66+
$client = $this->createMock(Client::class);
7567

7668
$project = new Project(1, $client);
7769

@@ -114,12 +106,8 @@ public function testMove()
114106
{
115107
$project = new Project(1);
116108
$toProject = new Project(2);
117-
$client = $this->getMockBuilder(Client::class)
118-
->disableOriginalConstructor()
119-
->getMock();
120-
$issues = $this->getMockBuilder(Issues::class)
121-
->disableOriginalConstructor()
122-
->getMock();
109+
$client = $this->createMock(Client::class);
110+
$issues = $this->createMock(Issues::class);
123111
$client->expects($this->once())
124112
->method('issues')
125113
->willReturn($issues);
@@ -140,18 +128,9 @@ public function testMove()
140128
*/
141129
public function testLinks()
142130
{
143-
$issueLinks = $this->getMockBuilder(IssueLinks::class)
144-
->disableOriginalConstructor()
145-
->getMock()
146-
;
147-
$projects = $this->getMockBuilder(Projects::class)
148-
->disableOriginalConstructor()
149-
->getMock()
150-
;
151-
$client = $this->getMockBuilder(Client::class)
152-
->disableOriginalConstructor()
153-
->getMock()
154-
;
131+
$issueLinks = $this->createMock(IssueLinks::class);
132+
$projects = $this->createMock(Projects::class);
133+
$client = $this->createMock(Client::class);
155134

156135
$client->method('issueLinks')->willReturn($issueLinks);
157136
$client->method('projects')->willReturn($projects);
@@ -196,14 +175,8 @@ public function testLinks()
196175
*/
197176
public function testAddLink()
198177
{
199-
$issueLinks = $this->getMockBuilder(IssueLinks::class)
200-
->disableOriginalConstructor()
201-
->getMock()
202-
;
203-
$client = $this->getMockBuilder(Client::class)
204-
->disableOriginalConstructor()
205-
->getMock()
206-
;
178+
$issueLinks = $this->createMock(IssueLinks::class);
179+
$client = $this->createMock(Client::class);
207180

208181
$client->method('issueLinks')->willReturn($issueLinks);
209182

@@ -238,18 +211,9 @@ public function testAddLink()
238211
*/
239212
public function testRemoveLink()
240213
{
241-
$issueLinks = $this->getMockBuilder(IssueLinks::class)
242-
->disableOriginalConstructor()
243-
->getMock()
244-
;
245-
$projects = $this->getMockBuilder(Projects::class)
246-
->disableOriginalConstructor()
247-
->getMock()
248-
;
249-
$client = $this->getMockBuilder(Client::class)
250-
->disableOriginalConstructor()
251-
->getMock()
252-
;
214+
$issueLinks = $this->createMock(IssueLinks::class);
215+
$projects = $this->createMock(Projects::class);
216+
$client = $this->createMock(Client::class);
253217

254218
$client->method('issueLinks')->willReturn($issueLinks);
255219
$client->method('projects')->willReturn($projects);

‎tests/Model/LabelTest.php

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@ public function testCorrectConstructWithoutClient()
2323
public function testCorrectConstruct()
2424
{
2525
$project = new Project();
26-
$client = $this->getMockBuilder(Client::class)
27-
->disableOriginalConstructor()
28-
->getMock()
29-
;
26+
$client = $this->createMock(Client::class);
3027

3128
$sUT = new Label($project, $client);
3229

@@ -36,10 +33,7 @@ public function testCorrectConstruct()
3633
public function testFromArray()
3734
{
3835
$project = new Project();
39-
$client = $this->getMockBuilder(Client::class)
40-
->disableOriginalConstructor()
41-
->getMock()
42-
;
36+
$client = $this->createMock(Client::class);
4337

4438
$sUT = Label::fromArray($client, $project, ['color' => '#FF0000', 'name' => 'Testing', 'id' => 123]);
4539

‎tests/Model/ProjectTest.php

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,7 @@ public function defaultArray(array $overrides = [])
6868

6969
public function testFromArray()
7070
{
71-
$client = $this->getMockBuilder(Client::class)
72-
->disableOriginalConstructor()
73-
->getMock();
71+
$client = $this->createMock(Client::class);
7472

7573
$data = $this->defaultArray();
7674

@@ -127,9 +125,7 @@ public function testFromArray()
127125

128126
public function testCreateProjectWhenSharedWithGroup()
129127
{
130-
$client = $this->getMockBuilder(Client::class)
131-
->disableOriginalConstructor()
132-
->getMock();
128+
$client = $this->createMock(Client::class);
133129

134130
$data = $this->defaultArray([
135131
'shared_with_groups' => [
@@ -149,9 +145,7 @@ public function testCreateProjectWhenSharedWithGroup()
149145

150146
public function testCreateProjectCanSharedWithMultipleGroups()
151147
{
152-
$client = $this->getMockBuilder(Client::class)
153-
->disableOriginalConstructor()
154-
->getMock();
148+
$client = $this->createMock(Client::class);
155149

156150
$data = $this->defaultArray([
157151
'shared_with_groups' => [

‎tests/Model/ReleaseTest.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ public function testFromArray()
1919
];
2020

2121
$project = new Project();
22-
$client = $this->getMockBuilder(Client::class)
23-
->disableOriginalConstructor()
24-
->getMock()
25-
;
22+
$client = $this->createMock(Client::class);
2623

2724
$release = Release::fromArray($client, $params);
2825

0 commit comments

Comments
 (0)