Introduce Packer\PacketLength

tarantool-php · May 16, 2019 · f1b1fc7 · f1b1fc7
1 parent 197b267
commit f1b1fc7
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 21 deletions.
diff --git a/src/Connection/StreamConnection.php b/src/Connection/StreamConnection.php
@@ -16,8 +16,7 @@
 use Tarantool\Client\Exception\CommunicationFailed;
 use Tarantool\Client\Exception\ConnectionFailed;
 use Tarantool\Client\Greeting;
-use Tarantool\Client\Packer\PackUtils;
-use Tarantool\Client\Response;
+use Tarantool\Client\Packer\PacketLength;
 
 final class StreamConnection implements Connection
 {
@@ -112,8 +111,8 @@ public function send(string $data) : string
             throw new CommunicationFailed('Unable to write request.');
         }
 
-        $length = $this->read(Response::LENGTH_SIZE_BYTES, 'Unable to read response length.');
-        $length = PackUtils::unpackLength($length);
+        $length = $this->read(PacketLength::SIZE_BYTES, 'Unable to read response length.');
+        $length = PacketLength::unpack($length);
 
         return $this->read($length, 'Unable to read response.');
     }

diff --git a/src/Packer/PackUtils.php → src/Packer/PacketLength.php b/src/Packer/PackUtils.php → src/Packer/PacketLength.php
@@ -15,23 +15,25 @@
 
 use Tarantool\Client\Exception\UnpackingFailed;
 
-final class PackUtils
+final class PacketLength
 {
+    public const SIZE_BYTES = 5;
+
     private function __construct()
     {
     }
 
-    public static function packLength(int $length) : string
+    public static function pack(int $length) : string
     {
         return \pack('CN', 0xce, $length);
     }
 
-    public static function unpackLength(string $data) : int
+    public static function unpack(string $data) : int
     {
-        if (false === $data = @\unpack('C_/Nlength', $data)) {
+        if (false === $data = @\unpack('C/N', $data)) {
             throw new UnpackingFailed('Unable to unpack length value.');
         }
 
-        return $data['length'];
+        return $data[1];
     }
 }
diff --git a/src/Packer/PeclPacker.php b/src/Packer/PeclPacker.php
@@ -36,7 +36,7 @@ public function pack(Request $request, ?int $sync = null) : string
             $this->packer->pack($sync ?: 0).
             $this->packer->pack($request->getBody());
 
-        return PackUtils::packLength(\strlen($content)).$content;
+        return PacketLength::pack(\strlen($content)).$content;
     }
 
     public function unpack(string $data) : Response

diff --git a/src/Packer/PurePacker.php b/src/Packer/PurePacker.php
@@ -42,7 +42,7 @@ public function pack(Request $request, ?int $sync = null) : string
             $this->packer->packInt($sync ?: 0).
             $this->packer->packMap($request->getBody());
 
-        return PackUtils::packLength(\strlen($content)).$content;
+        return PacketLength::pack(\strlen($content)).$content;
     }
 
     public function unpack(string $data) : Response

diff --git a/src/Response.php b/src/Response.php
@@ -15,7 +15,6 @@
 
 final class Response
 {
-    public const LENGTH_SIZE_BYTES = 5;
     public const TYPE_ERROR = 0x8000;
 
     private $header;

diff --git a/tests/Integration/Connection/ReadTest.php b/tests/Integration/Connection/ReadTest.php
@@ -14,7 +14,7 @@
 namespace Tarantool\Client\Tests\Integration\Connection;
 
 use Tarantool\Client\Exception\CommunicationFailed;
-use Tarantool\Client\Packer\PackUtils;
+use Tarantool\Client\Packer\PacketLength;
 use Tarantool\Client\Tests\GreetingDataProvider;
 use Tarantool\Client\Tests\Integration\ClientBuilder;
 use Tarantool\Client\Tests\Integration\FakeServer\FakeServerBuilder;
@@ -93,7 +93,7 @@ public function testUnableToReadResponse() : void
 
         FakeServerBuilder::create(
             new WriteHandler(GreetingDataProvider::generateGreeting()),
-            new WriteHandler(PackUtils::packLength(42)),
+            new WriteHandler(PacketLength::pack(42)),
             new SleepHandler(1)
         )
             ->setUri($clientBuilder->getUri())

diff --git a/tests/Integration/Connection/WriteTest.php b/tests/Integration/Connection/WriteTest.php
@@ -14,7 +14,7 @@
 namespace Tarantool\Client\Tests\Integration\Connection;
 
 use Tarantool\Client\Keys;
-use Tarantool\Client\Packer\PackUtils;
+use Tarantool\Client\Packer\PacketLength;
 use Tarantool\Client\Tests\Integration\TestCase;
 
 final class WriteTest extends TestCase
@@ -25,7 +25,7 @@ public function testSendMalformedRequest() : void
         $conn = $handler->getConnection();
 
         $data = 'malformed';
-        $data = PackUtils::packLength(strlen($data)).$data;
+        $data = PacketLength::pack(strlen($data)).$data;
 
         $conn->open();
         $data = $conn->send($data);

diff --git a/tests/Unit/Packer/PackUtilsTest.php → tests/Unit/Packer/PacketLengthTest.php b/tests/Unit/Packer/PackUtilsTest.php → tests/Unit/Packer/PacketLengthTest.php
@@ -15,23 +15,23 @@
 
 use PHPUnit\Framework\TestCase;
 use Tarantool\Client\Exception\UnpackingFailed;
-use Tarantool\Client\Packer\PackUtils;
+use Tarantool\Client\Packer\PacketLength;
 
-final class PackUtilsTest extends TestCase
+final class PacketLengthTest extends TestCase
 {
     public function testPackUnpackLength() : void
     {
-        $packed = PackUtils::packLength(42);
+        $packed = PacketLength::pack(42);
 
         self::assertIsString($packed);
-        self::assertSame(42, PackUtils::unpackLength($packed));
+        self::assertSame(42, PacketLength::unpack($packed));
     }
 
     public function testUnpackLengthFromMalformedData() : void
     {
         $this->expectException(UnpackingFailed::class);
         $this->expectExceptionMessage('Unable to unpack length value.');
 
-        PackUtils::unpackLength('foo');
+        PacketLength::unpack('foo');
     }
 }