Skip to content

Commit 27db29b

Browse files
committed
Remove server forwarding rule reference
1 parent 1fbdfec commit 27db29b

File tree

3 files changed

+1
-69
lines changed

3 files changed

+1
-69
lines changed

src/Models/ForwardingRule.php

-51
This file was deleted.

src/Models/Server.php

+1-15
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ class Server
2020
/** @var int The number of messages currently in the server. */
2121
public $messages;
2222

23-
/** @var \Mailosaur\Models\ForwardingRule[] The rules used to manage email forwarding for this server */
24-
public $forwardingRules = array();
25-
2623
public function __construct(\stdClass $data)
2724
{
2825
if (property_exists($data, 'id')) {
@@ -44,12 +41,6 @@ public function __construct(\stdClass $data)
4441
if (property_exists($data, 'messages')) {
4542
$this->messages = $data->messages;
4643
}
47-
48-
if (property_exists($data, 'forwardingRules') && is_array($data->forwardingRules)) {
49-
foreach ($data->forwardingRules as $rule) {
50-
$this->forwardingRules[] = new ForwardingRule($rule);
51-
}
52-
}
5344
}
5445

5546
/**
@@ -62,14 +53,9 @@ public function __toArray()
6253
'password' => $this->password,
6354
'name' => $this->name,
6455
'users' => $this->users,
65-
'messages' => $this->messages,
66-
'forwardingRules' => array()
56+
'messages' => $this->messages
6757
);
6858

69-
foreach ($this->forwardingRules as $forwardingRule) {
70-
$serverInfo['forwardingRules'][] = $forwardingRule->__toArray();
71-
}
72-
7359
return $serverInfo;
7460
}
7561

tests/ServersTests.php

-3
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ public function testCrud()
5151
$this->assertNotNull($createdServer->password);
5252
$this->assertNotNull($createdServer->users);
5353
$this->assertEquals(0, $createdServer->messages);
54-
$this->assertNotNull($createdServer->forwardingRules);
5554

5655
// Retrieve a server and confirm it has expected content
5756
$retrievedServer = self::$client->servers->get($createdServer->id);
@@ -61,7 +60,6 @@ public function testCrud()
6160
$this->assertNotNull($retrievedServer->password);
6261
$this->assertNotNull($retrievedServer->users);
6362
$this->assertEquals(0, $retrievedServer->messages);
64-
$this->assertNotNull($retrievedServer->forwardingRules);
6563

6664
// Update a server and confirm it has changed
6765
$retrievedServer->name = $retrievedServer->name . ' updated with ellipsis … and emoji 👨🏿‍🚒';
@@ -72,7 +70,6 @@ public function testCrud()
7270
$this->assertEquals($retrievedServer->password, $updatedServer->password);
7371
$this->assertEquals($retrievedServer->users, $updatedServer->users);
7472
$this->assertEquals($retrievedServer->messages, $updatedServer->messages);
75-
$this->assertEquals($retrievedServer->forwardingRules, $updatedServer->forwardingRules);
7673

7774
self::$client->servers->delete($retrievedServer->id);
7875

0 commit comments

Comments
 (0)