Better code.

src/Responses/ChannelsResponse.php

@@ -46,14 +46,8 @@ public function __construct(public string $data, public bool $status, public arr
      */
     public static function fromBytes(string $data, ValueSize $size): ChannelsResponse|null
     {
-        $valueSize = $size->value;
         $offset = 0;
 
-        // Less than 1 byte? not enough for status.
-        if (strlen($data) < 1) {
-            return null;
-        }
-
         $status = ord($data[$offset]) === 1;
         $offset++;
 

src/Responses/ConnectionsResponse.php

@@ -74,11 +74,6 @@ public static function fromBytes(string $data, ValueSize $size): ConnectionsResp
     {
         $offset = 0;
 
-        // Less than 1 byte? not enough for status.
-        if (strlen($data) < 1) {
-            return null;
-        }
-
         $status = ord($data[$offset]) === 1;
         $offset++;
 

src/Responses/GetResponse.php

@@ -51,41 +51,26 @@ public static function fromBytes(string $data, ValueSize $size): GetResponse|nul
         $valueSize = $size->value;
         $offset = 0;
 
-        // Less than 1 byte? not enough for status.
-        if (strlen($data) < 1) {
-            return null;
-        }
-
         $status = ord($data[$offset]) === 1;
         $offset++;
 
         if ($status) {
             // Less than 2 bytes? not enough for ttl type.
-            if (strlen($data) < 2) {
+            if (strlen($data) < $offset + 1 + $valueSize * 2) {
                 return null;
             }
 
             $ttl_type = TTLType::from(ord($data[$offset]));
             $offset++;
 
-            // Less than 2 + N bytes? not enough for ttl.
-            if (strlen($data) < 2 + $valueSize) {
-                return null;
-            }
-
             $ttl = unpack(BaseRequest::pack($size), substr($data, $offset, $valueSize))[1];
             $offset += $valueSize;
 
-            // Less than 2 + 2 * N bytes? not enough for value size.
-            if (strlen($data) < 2 + ($valueSize * 2)) {
-                return null;
-            }
-
             $value_sized = unpack(BaseRequest::pack($size), substr($data, $offset, $valueSize))[1];
             $offset += $valueSize;
 
             // Less than 2 + 2 * N + O bytes? not enough for value.
-            if (strlen($data) < 2 + ($valueSize * 2) + $value_sized) {
+            if (strlen($data) < $offset + $value_sized) {
                 return null;
             }
 

src/Responses/ListResponse.php

@@ -49,11 +49,6 @@ public static function fromBytes(string $data, ValueSize $size): ListResponse|nu
     {
         $offset = 0;
 
-        // Less than 1 byte? not enough for status.
-        if (strlen($data) < 1) {
-            return null;
-        }
-
         $status = ord($data[$offset]) === 1;
         $offset++;
 

src/Responses/QueryResponse.php

@@ -51,36 +51,23 @@ public static function fromBytes(string $data, ValueSize $size): QueryResponse|n
         $valueSize = $size->value;
         $offset = 0;
 
-        // Less than 1 byte? not enough for status.
-        if (strlen($data) < 1) {
-            return null;
-        }
-
         $status = ord($data[$offset]) === 1;
         $offset++;
 
         if ($status) {
-            // Less than 1 + N bytes? not enough for quota.
-            if (strlen($data) < 1 + $valueSize) {
+            if (strlen($data) < $offset +
+                $valueSize * 2 + // quota and ttl
+                1 // ttl type
+            ) {
                 return null;
             }
 
             $quota = unpack(BaseRequest::pack($size), substr($data, $offset, $valueSize))[1];
             $offset += $size->value;
 
-            // Less than 2 + N bytes? not enough for ttl type.
-            if (strlen($data) < 2 + $valueSize) {
-                return null;
-            }
-
             $ttl_type = TTLType::from(ord($data[$offset]));
             $offset++;
 
-            // Less than 2 + 2N bytes? not enough for ttl.
-            if (strlen($data) < 2 + ($valueSize * 2)) {
-                return null;
-            }
-
             $ttl = unpack(BaseRequest::pack($size), substr($data, $offset, $valueSize))[1];
             return new QueryResponse($data, true, $quota, $ttl_type, $ttl);
         }

src/Responses/StatResponse.php

@@ -46,14 +46,8 @@ public function __construct(public string $data, public bool $status, public arr
      */
     public static function fromBytes(string $data, ValueSize $size): StatResponse|null
     {
-        $valueSize = $size->value;
         $offset = 0;
 
-        // Less than 1 byte? not enough for status.
-        if (strlen($data) < 1) {
-            return null;
-        }
-
         $status = ord($data[$offset]) === 1;
 
         $offset++;

src/Responses/StatsResponse.php

@@ -48,7 +48,6 @@ public function __construct(public string $data, public bool $status, public arr
      */
     public static function fromBytes(string $data, ValueSize $size): StatsResponse|null
     {
-        $valueSize = $size->value;
         $offset = 0;
 
         // Less than 1 byte? not enough for status.
@@ -80,7 +79,6 @@ public static function fromBytes(string $data, ValueSize $size): StatsResponse|n
                     return null;
                 }
 
-                $fragment = unpack(BaseRequest::pack(ValueSize::UINT64), substr($data, $offset, ValueSize::UINT64->value))[1];
                 $offset += ValueSize::UINT64->value;
 
                 // Less than offset + 8 bytes? not enough for fragment keys count.

src/Responses/StatusResponse.php

@@ -40,14 +40,6 @@ public function __construct(public string $data, public bool $status)
      */
     public static function fromBytes(string $data, ValueSize $size): StatusResponse|null
     {
-        $offset = 0;
-
-        // Less than 1 byte? not enough for status.
-        if (strlen($data) < 1) {
-            return null;
-        }
-
-        $status = ord($data[$offset]) === 1;
-        return new StatusResponse($data, $status);
+        return new StatusResponse($data, ord($data[0]) === 1);
     }
 }

tests/ServiceTest.php

@@ -432,7 +432,7 @@ public function testWhoami() {
         $this->prepares(function (Service $service) {
             $whoami = $service->whoami();
             $this->assertTrue($whoami->status);
-            $this->assertTrue(strlen($whoami->id) == 32);
+            $this->assertEquals(32, strlen($whoami->id));
         });
     }