Add length functions

yocto · Aug 8, 2024 · 20ef831 · 20ef831
1 parent 2294b72
commit 20ef831
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 10 deletions.
diff --git a/src/Connections/EPPTCPConnection.php b/src/Connections/EPPTCPConnection.php
@@ -20,7 +20,7 @@ public function __construct(EPPRegistry $registry){
      * @param string $data
      * @return int
      */
-    private function decodeInteger(string $data): int{
+    protected function decodeInteger(string $data): int{
         return unpack('N',substr($data,0,4))[1] ?? -1;
     }
 
@@ -29,14 +29,14 @@ private function decodeInteger(string $data): int{
      * @param int $integer
      * @return string
      */
-    private function encodeInteger(int $integer): string{
+    protected function encodeInteger(int $integer): string{
         return pack('N',$integer);
     }
 
     /**
      * Ensure if connection is not closed
      */
-    private function ensureConnection(): void{
+    protected function ensureConnection(): void{
         if($this->isClosed()){
             throw new RuntimeException('Connection closed');
         }
@@ -62,19 +62,28 @@ public function open(): bool{
         return $this->socket!==false;
     }
 
-    public function readXML(): ?string{
+    protected function readLength(): int{
         $this->ensureConnection();
-        $length = $this->decodeInteger(fread($this->socket,4))-4;
+        return $this->decodeInteger(fread($this->socket,4))-4;
+    }
+
+    public function readXML(): ?string{
+        $length = $this->readLength();
         if($length<0){
             return null;
         }
         return fread($this->socket,$length);
     }
 
-    public function writeXML(string $xml): void{
+    protected function writeLength(int $length): void{
         $this->ensureConnection();
+        fwrite($this->socket,$this->encodeInteger($length));
+    }
+
+    public function writeXML(string $xml): void{
         $length = strlen($xml)+4;
-        fwrite($this->socket,$this->encodeInteger($length).$xml);
+        $this->writeLength($length);
+        fwrite($this->socket,$xml);
     }
 
 }
diff --git a/tests/EPPConnectionTest.php b/tests/EPPConnectionTest.php
@@ -2,6 +2,7 @@
 namespace YOCLIB\EPP\Tests;
 
 use PHPUnit\Framework\TestCase;
+use RuntimeException;
 use YOCLIB\EPP\Connections\EPPBaseConnection;
 use YOCLIB\EPP\Connections\EPPTCPConnection;
 use YOCLIB\EPP\Elements\EPPEppElement;
@@ -19,7 +20,7 @@ public function readXML(): ?string{
             }
 
             public function writeXML(string $xml): void{
-                assertEquals('<writeXML/>',$xml);
+                assertEquals('<?xml version="1.0"?>'."\n".'<writeXML/>'."\n",$xml);
             }
 
             public function close(): bool{
@@ -35,8 +36,11 @@ public function open(): bool{
             }
         };
 
-        $this->assertEquals('<readXML/>',$conn->readXML());
-        $conn->writeXML('<writeXML/>');
+        $this->assertEquals('readXML',$conn->readDocument()->documentElement->tagName);
+
+        $doc = EPPDocumentHelper::createEPPDocument();
+        $doc->loadXML('<writeXML/>');
+        $conn->writeDocument($doc);
 
         $this->assertTrue($conn->isClosed());
         $this->assertTrue($conn->open());
@@ -68,6 +72,10 @@ public function testTCPConnection(){
         $this->assertFalse($conn->isClosed());
         $this->assertTrue($conn->close());
         $this->assertTrue($conn->isClosed());
+
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage('Connection closed');
+        $conn->readXML();
     }
 
 }