Skip to content

Commit 5542f8e

Browse files
committed
[dns] Rename headers => header
1 parent 5bd304a commit 5542f8e

4 files changed

Lines changed: 12 additions & 12 deletions

File tree

BinaryDumper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public function toBinary(Message $message)
1111
{
1212
$data = '';
1313

14-
$data .= $this->headerToBinary($message->headers);
14+
$data .= $this->headerToBinary($message->header);
1515
$data .= $this->questionToBinary($message->questions);
1616

1717
return $data;

Model/Message.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@ class Message
2727

2828
public $data = '';
2929

30-
public $headers;
30+
public $header;
3131
public $questions = array();
3232
public $answers = array();
3333
public $authority = array();
3434
public $additional = array();
3535

3636
public function __construct()
3737
{
38-
$this->headers = new HeaderBag();
38+
$this->header = new HeaderBag();
3939
}
4040

4141
public function prepare()
4242
{
43-
$this->headers->populateCounts($this);
43+
$this->header->populateCounts($this);
4444
}
4545
}

Parser.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ public function parseChunk($data, Message $message)
1616
{
1717
$message->data .= $data;
1818

19-
if (!$message->headers->get('id')) {
19+
if (!$message->header->get('id')) {
2020
if (!$this->parseHeader($message)) {
2121
return;
2222
}
2323
}
2424

25-
if ($message->headers->get('qdCount') != count($message->questions)) {
25+
if ($message->header->get('qdCount') != count($message->questions)) {
2626
if (!$this->parseQuestion($message)) {
2727
return;
2828
}
2929
}
3030

31-
if ($message->headers->get('anCount') != count($message->answers)) {
31+
if ($message->header->get('anCount') != count($message->answers)) {
3232
if (!$this->parseAnswer($message)) {
3333
return;
3434
}
@@ -62,7 +62,7 @@ private function parseHeader(Message $message)
6262

6363

6464
foreach ($vars as $name => $value) {
65-
$message->headers->set($name, $value);
65+
$message->header->set($name, $value);
6666
}
6767

6868
return $message;
@@ -112,7 +112,7 @@ private function parseQuestion(Message $message)
112112
'class' => $class,
113113
);
114114

115-
if ($message->headers->get('qdCount') != count($message->questions)) {
115+
if ($message->header->get('qdCount') != count($message->questions)) {
116116
return $this->parseQuestion($message);
117117
}
118118

Resolver.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ public function query($nameserver, Query $query, $callback)
3434
$parser = new Parser();
3535

3636
$request = new Message();
37-
$request->headers->set('id', rand());
38-
$request->headers->set('rd', 1);
37+
$request->header->set('id', rand());
38+
$request->header->set('rd', 1);
3939
$request->questions[] = (array) $query;
4040
$request->prepare();
4141

@@ -56,7 +56,7 @@ public function doQuery($nameserver, $transport, $queryData, Parser $parser, $ca
5656
$conn->on('data', function ($data) use ($that, $conn, $parser, $response, $callback) {
5757
$responseReady = $parser->parseChunk($data, $response);
5858
if ($responseReady) {
59-
if ($response->headers->isTruncated()) {
59+
if ($response->header->isTruncated()) {
6060
$conn->end();
6161
$that->doQuery($nameserver, 'tcp', $queryData, $parser, $callback);
6262
return;

0 commit comments

Comments
 (0)