Skip to content

Commit e6a3b51

Browse files
committed
Update phpunit/tests
1 parent 25f690e commit e6a3b51

File tree

10 files changed

+67
-25
lines changed

10 files changed

+67
-25
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
"require-dev": {
1616
"php-http/guzzle6-adapter": "^2.0",
17-
"phpunit/phpunit": "6.*"
17+
"phpunit/phpunit": "6.* | 7.* | 8.* | 9.*"
1818
},
1919
"autoload": {
2020
"psr-4": {

tests/CampaignsTest.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,17 @@
33
namespace MailerLiteApi\Tests;
44

55
use MailerLiteApi\MailerLite;
6-
use MailerLiteApi\Api\Campaigns;
76

7+
/**
8+
* Class CampaignsTest
9+
*
10+
* @package MailerLiteApi\Tests
11+
*/
812
class CampaignsTest extends MlTestCase
913
{
1014
protected $campaignsApi;
1115

12-
protected function setUp()
16+
protected function setUp(): void
1317
{
1418
$this->campaignsApi = (new MailerLite(API_KEY))->campaigns();
1519
}
@@ -55,4 +59,4 @@ public function get_campaigns()
5559
$this->assertDoesNotContainValue($sent, 'status', 'draft');
5660
}
5761

58-
}
62+
}

tests/FieldsTest.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,17 @@
33
namespace MailerLiteApi\Tests;
44

55
use MailerLiteApi\MailerLite;
6-
use MailerLiteApi\Api\Fields;
76

7+
/**
8+
* Class FieldsTest
9+
*
10+
* @package MailerLiteApi\Tests
11+
*/
812
class FieldsTest extends MlTestCase
913
{
1014
protected $fieldsApi;
1115

12-
protected function setUp()
16+
protected function setUp(): void
1317
{
1418
$this->fieldsApi = (new MailerLite(API_KEY))->fields();
1519
}
@@ -32,4 +36,4 @@ public function create_field()
3236
$this->fieldsApi->delete($field->id);
3337
}
3438

35-
}
39+
}

tests/GroupsTest.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@
33
namespace MailerLiteApi\Tests;
44

55
use MailerLiteApi\MailerLite;
6-
use MailerLiteApi\Api\Groups;
76

7+
/**
8+
* Class GroupsTest
9+
*
10+
* @package MailerLiteApi\Tests
11+
*/
812
class GroupsTest extends MlTestCase
913
{
1014
protected $groupsApi;
@@ -15,7 +19,7 @@ class GroupsTest extends MlTestCase
1519

1620
protected $testSubscribers;
1721

18-
protected function setUp()
22+
protected function setUp(): void
1923
{
2024
$this->groupsApi = (new MailerLite(API_KEY))->groups();
2125
$this->testGroup = $this->createGroup();
@@ -24,7 +28,7 @@ protected function setUp()
2428
$this->addSubscriber($this->testGroup->id, uniqid() . '@mailerlite-test.dev', 'unsubscribed');
2529
}
2630

27-
protected function tearDown()
31+
protected function tearDown(): void
2832
{
2933
$this->groupsApi->delete($this->testGroup->id);
3034
$this->groupsApi->delete($this->testGroupEmpty->id);

tests/MailerLiteTest.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44

55
use MailerLiteApi\MailerLite;
66

7+
/**
8+
* Class MailerLiteTest
9+
*
10+
* @package MailerLiteApi\Tests
11+
*/
712
class MailerLiteTest extends MlTestCase
813
{
914
/** @test **/

tests/MlTestCase.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,14 @@
33
namespace MailerLiteApi\Tests;
44

55
use MailerLiteApi\Api\Groups;
6-
7-
class MlTestCase extends \PHPUnit\Framework\TestCase
6+
use PHPUnit\Framework\TestCase;
7+
8+
/**
9+
* Class MlTestCase
10+
*
11+
* @package MailerLiteApi\Tests
12+
*/
13+
class MlTestCase extends TestCase
814
{
915
/** @var Groups */
1016
protected $groupsApi;

tests/RestClientTest.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,17 @@
88
use GuzzleHttp\Client as GuzzleClient;
99
use Http\Adapter\Guzzle6\Client as GuzzleAdapter;
1010

11+
/**
12+
* Class RestClientTest
13+
*
14+
* @package MailerLiteApi\Tests
15+
*/
1116
class RestClientTest extends MlTestCase
1217
{
1318

1419
protected $client;
1520

16-
protected function setUp()
21+
protected function setUp(): void
1722
{
1823
$guzzle = new GuzzleClient();
1924
$adapter = new GuzzleAdapter($guzzle);

tests/SegmentsTest.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,19 @@
33
namespace MailerLiteApi\Tests;
44

55
use MailerLiteApi\MailerLite;
6-
use MailerLiteApi\Api\Segments;
76

7+
/**
8+
* Class SegmentsTest
9+
*
10+
* @package MailerLiteApi\Tests
11+
*/
812
class SegmentsTest extends MlTestCase
913
{
1014
protected $segmentsApi;
1115

1216
protected $testSegment;
1317

14-
protected function setUp()
18+
protected function setUp(): void
1519
{
1620
$this->segmentsApi = (new MailerLite(API_KEY))->segments();
1721
}
@@ -23,4 +27,4 @@ public function get_segments()
2327

2428
$this->assertContains('Demo segment', (array) $segments->first()->data[0]);
2529
}
26-
}
30+
}

tests/StatsTest.php

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,19 @@
33
namespace MailerLiteApi\Tests;
44

55
use MailerLiteApi\MailerLite;
6-
use MailerLiteApi\Api\Stats;
76

7+
/**
8+
* Class StatsTest
9+
*
10+
* @package MailerLiteApi\Tests
11+
*/
812
class StatsTest extends MlTestCase
913
{
1014
protected $campaignsApi;
1115

12-
protected function setUp()
16+
protected $statsApi;
17+
18+
protected function setUp(): void
1319
{
1420
$this->statsApi = (new MailerLite(API_KEY))->stats();
1521
}
@@ -46,4 +52,4 @@ public function get_stats_in_the_past()
4652
$this->assertTrue($stats->bounce_rate === 0);
4753
}
4854

49-
}
55+
}

tests/SubscribersTest.php

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@
33
namespace MailerLiteApi\Tests;
44

55
use MailerLiteApi\MailerLite;
6-
use MailerLiteApi\Resources\Fields;
76

7+
/**
8+
* Class SubscribersTest
9+
*
10+
* @package MailerLiteApi\Tests
11+
*/
812
class SubscribersTest extends MlTestCase
913
{
1014
protected $groupsApi;
@@ -15,7 +19,7 @@ class SubscribersTest extends MlTestCase
1519

1620
protected $testSubscriber;
1721

18-
protected function setUp()
22+
protected function setUp(): void
1923
{
2024
$ml = new MailerLite(API_KEY);
2125
$this->groupsApi = $ml->groups();
@@ -25,7 +29,7 @@ protected function setUp()
2529
$this->testSubscriber = $this->addSubscriber($this->testGroup->id);
2630
}
2731

28-
protected function tearDown()
32+
protected function tearDown(): void
2933
{
3034
$this->groupsApi->delete($this->testGroup->id);
3135
}
@@ -55,9 +59,9 @@ public function update_subscriber()
5559

5660
$subscriber = $this->subscribersApi->update($this->testSubscriber->id, $subscriberData);
5761

58-
$this->assertEquals($subscriber->type, 'unsubscribed');
62+
$this->assertEquals('unsubscribed', $subscriber->type);
5963

60-
$subscriber = $this->subscribersApi->update($this->testSubscriber->id, ['type' => 'active']);
64+
$this->subscribersApi->update($this->testSubscriber->id, ['type' => 'active']);
6165
}
6266

6367
/** @test **/
@@ -68,4 +72,4 @@ public function search_for_a_subscriber()
6872
$this->assertTrue(count($subscribers) > 0);
6973
}
7074

71-
}
75+
}

0 commit comments

Comments
 (0)