mass update changes

Author: ArrayIterator

phpunit.xml

@@ -12,6 +12,7 @@
         stopOnRisky="true"
         failOnRisky="true"
         failOnEmptyTestSuite="true"
+        displayDetailsOnTestsThatTriggerWarnings="true"
         displayDetailsOnIncompleteTests="true"
 >
     <testsuites>
@@ -26,7 +27,8 @@
         </testsuite>
     </testsuites>
     <php>
+        <ini name="display_errors" value="On" />
+        <ini name="display_startup_errors" value="On" />
         <env name="APP_ENV" value="testing"/>
-        <env name="DEFAULT_TIMEOUT" value="3.5"/>
     </php>
 </phpunit>

src/Abstracts/AbstractResourceRecordType.php

@@ -125,7 +125,6 @@ protected function parseMessage(): void
                 'Response header length is invalid'
             );
         }
-
         [
             'type' => $type,
             'class' => $class,
@@ -201,11 +200,11 @@ public function getHeader(): string
     }
 
     /**
-     * @return string
+     * @inheritdoc
      */
-    public function getMessage(): string
+    public function getMessage(): PacketMessageInterface
     {
-        return $this->getHeader() . $this->getRData();
+        return $this->message;
     }
 
     /**
@@ -315,7 +314,7 @@ public function toArray(): array
             'host' => $this->getName(),
             'class' => $this->getClass()->getName(),
             'ttl' => $this->getTTL(),
-            'type' => $this->getType(),
+            'type' => $this->getType()->getName(),
             'value' => $this->getValue(),
         ];
     }

src/Interfaces/Packet/PacketHeaderInterface.php

@@ -304,6 +304,14 @@ public function withARCount(int $ar) : static;
      */
     public function withANCount(int $an) : static;
 
+    /**
+     * With NS count
+     *
+     * @param int $ns
+     * @return $this
+     */
+    public function withNSCount(int $ns) : static;
+
     /**
      * With QD Count
      * @param int $qd

src/Interfaces/Packet/PacketResourceRecordsInterface.php

@@ -46,6 +46,13 @@ public function getRecords(): array;
      */
     public function getFilteredType(string $type, bool $single = false) : null|array|ResourceRecordTypeInterface;
 
+    /**
+     * Return array records
+     * @uses ResourceRecordTypeInterface::toArray()
+     * @return array<array>
+     */
+    public function toArray() : array;
+
     /**
      * @return Traversable<ResourceRecordTypeInterface>
      */

src/Interfaces/ResourceRecord/ResourceRecordTypeInterface.php

@@ -74,11 +74,11 @@ public function getOffsetPosition() : int;
     public function getHeader() : string;
 
     /**
-     * Get message raw response answer data
+     * Get message raw all response answer data
      *
-     * @return string
+     * @return PacketMessageInterface
      */
-    public function getMessage(): string;
+    public function getMessage(): PacketMessageInterface;
 
     /**
      * The dns name
@@ -141,7 +141,8 @@ public function getQueryMessage() : string;
     /**
      * Return array data
      *
-     * @return array
+     * @return array like dns_get_record()
+     * @see \dns_get_record()
      */
     public function toArray() : array;
 }

src/Packet/Header.php

@@ -340,6 +340,17 @@ public function withANCount(int $an): static
         return $obj;
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function withNSCount(int $ns): static
+    {
+        $obj = clone $this;
+        $obj->nscount = $ns;
+        $obj->message = null;
+        return $obj;
+    }
+
     /**
      * @inheritdoc
      */

src/Packet/Question.php

@@ -194,6 +194,7 @@ public function __serialize(): array
      * @param int $type
      * @param int $class
      * @return Question
+     * @noinspection PhpDocMissingThrowsInspection
      */
     public static function fromFilteredResponse(
         string $name,

src/Packet/Records.php

@@ -7,6 +7,8 @@
 use ArrayAccess\DnsRecord\Interfaces\ResourceRecord\ResourceRecordTypeInterface;
 use ArrayIterator;
 use Traversable;
+use function array_map;
+use function array_values;
 use function md5;
 use function serialize;
 use function strtoupper;
@@ -86,6 +88,14 @@ public function getFilteredType(string $type, bool $single = false) : null|array
         return $result === [] ? null : $result;
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function toArray(): array
+    {
+        return array_map(static fn ($e) => $e->toArray(), array_values($this->getRecords()));
+    }
+
     /**
      * @inheritdoc
      */

src/Resolver.php

@@ -152,7 +152,8 @@ public function createQueryOpcode(
         $class = trim($class?:IN::NAME)?:IN::NAME;
         $class = Lookup::resourceClass($class);
         $type = Lookup::resourceType($type);
-        $isOpt = $type->getName() === OPT::TYPE;
+        $typeName = $type->getName();
+        $isOpt = $typeName === OPT::TYPE;
         if ($isOpt) { // if is OPT fallback to A
             $type = 'A';
         }
@@ -165,12 +166,13 @@ public function createQueryOpcode(
             }
             $dns = new DnsServerStorage(...$ss);
         }
+
+        $header = Header::createQueryHeader($opcode, null, $adFlag, $cdFlag, $recurse);
         $requestData = new RequestData(
-            Header::createQueryHeader($opcode, null, $adFlag, $cdFlag, $recurse),
+            $header,
             $dns,
             $question
         );
-
         if ($isOpt || $dnsSec) {
             $requestData
                 ->getAdditionalRecords()

src/ResourceRecord/RRTypes/CERT.php

@@ -5,6 +5,7 @@
 
 use ArrayAccess\DnsRecord\Abstracts\AbstractResourceRecordType;
 use function array_values;
+use function base64_encode;
 use function substr;
 
 /**
@@ -56,26 +57,27 @@ protected function parseRData(string $message, int $rdataOffset): void
         //
         // copy the certificate
         //
-        $this->certificate  = substr($this->rData, 5, $this->rdLength - 5);
+        $this->certificate  = base64_encode(substr($this->rData, 5, $this->rdLength - 5));
     }
 
-    public function getFormat(): ?int
+    public function getFormat(): int
     {
-        return $this->format??null;
+        return $this->format;
     }
 
-    public function getKeyTag(): ?int
+    public function getKeyTag(): int
     {
-        return $this->keyTag??null;
+        return $this->keyTag;
     }
 
-    public function getAlgorithm(): ?string
+    public function getAlgorithm(): string
     {
-        return $this->algorithm??null;
+        return $this->algorithm;
     }
 
-    public function getCertificate(): ?string
+    public function getCertificate(): string
     {
-        return $this->certificate??null;
+        return $this->certificate;
     }
 }
+// @todo add toArray()