Fix signedness of high/low part getters

olafkryus · Apr 4, 2020 · 0baaf70 · 0baaf70
1 parent 46b20eb
commit 0baaf70
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 68 deletions.
diff --git a/src/DataType/Byte.php b/src/DataType/Byte.php
@@ -19,24 +19,4 @@ public function __construct(string $value, int $endianness = BinaryValue::ENDIAN
 
         parent::__construct($value, $endianness);
     }
-
-    /**
-     * @return int
-     */
-    public function getHighNibble(): int
-    {
-        $value = $this->toInt();
-
-        return ($value >> 4) % 16;
-    }
-
-    /**
-     * @return int
-     */
-    public function getLowNibble(): int
-    {
-        $value = $this->toInt();
-
-        return $value % 16;
-    }
 }
diff --git a/src/DataType/Dword.php b/src/DataType/Dword.php
@@ -19,28 +19,4 @@ public function __construct(string $value, int $endianness = BinaryValue::ENDIAN
 
         parent::__construct($value, $endianness);
     }
-
-    /**
-     * @return Word
-     * @throws \Exception
-     */
-    public function getHighWord(): Word
-    {
-        $value = $this->__toString();
-        $endianness = $this->getEndianness();
-
-        return new Word(substr($value, $endianness === BinaryValue::ENDIANNESS_LITTLE_ENDIAN ? 2 : 0, 2), $endianness);
-    }
-
-    /**
-     * @return Word
-     * @throws \Exception
-     */
-    public function getLowWord(): Word
-    {
-        $value = $this->__toString();
-        $endianness = $this->getEndianness();
-
-        return new Word(substr($value, $endianness === BinaryValue::ENDIANNESS_LITTLE_ENDIAN ? 0 : 2, 2), $endianness);
-    }
 }
diff --git a/src/DataType/UnsignedByte.php b/src/DataType/UnsignedByte.php
@@ -19,4 +19,24 @@ public function __construct(string $value, int $endianness = BinaryValue::ENDIAN
 
         parent::__construct($value, $endianness, false);
     }
+
+    /**
+     * @return int
+     */
+    public function getHighNibble(): int
+    {
+        $value = $this->toInt();
+
+        return ($value >> 4) % 16;
+    }
+
+    /**
+     * @return int
+     */
+    public function getLowNibble(): int
+    {
+        $value = $this->toInt();
+
+        return $value % 16;
+    }
 }
diff --git a/src/DataType/UnsignedDword.php b/src/DataType/UnsignedDword.php
@@ -19,4 +19,28 @@ public function __construct(string $value, int $endianness = BinaryValue::ENDIAN
 
         parent::__construct($value, $endianness, false);
     }
+
+    /**
+     * @return UnsignedWord
+     * @throws \Exception
+     */
+    public function getHighWord(): UnsignedWord
+    {
+        $value = $this->__toString();
+        $endianness = $this->getEndianness();
+
+        return new UnsignedWord(substr($value, $endianness === BinaryValue::ENDIANNESS_LITTLE_ENDIAN ? 2 : 0, 2), $endianness);
+    }
+
+    /**
+     * @return UnsignedWord
+     * @throws \Exception
+     */
+    public function getLowWord(): UnsignedWord
+    {
+        $value = $this->__toString();
+        $endianness = $this->getEndianness();
+
+        return new UnsignedWord(substr($value, $endianness === BinaryValue::ENDIANNESS_LITTLE_ENDIAN ? 0 : 2, 2), $endianness);
+    }
 }
diff --git a/src/DataType/UnsignedWord.php b/src/DataType/UnsignedWord.php
@@ -19,4 +19,28 @@ public function __construct(string $value, int $endianness = BinaryValue::ENDIAN
 
         parent::__construct($value, $endianness, false);
     }
+
+    /**
+     * @return UnsignedByte
+     * @throws \Exception
+     */
+    public function getHighByte(): UnsignedByte
+    {
+        $value = $this->__toString();
+        $endianness = $this->getEndianness();
+
+        return new UnsignedByte($value[$endianness === BinaryValue::ENDIANNESS_LITTLE_ENDIAN ? 1 : 0], $endianness);
+    }
+
+    /**
+     * @return UnsignedByte
+     * @throws \Exception
+     */
+    public function getLowByte(): UnsignedByte
+    {
+        $value = $this->__toString();
+        $endianness = $this->getEndianness();
+
+        return new UnsignedByte($value[$endianness === BinaryValue::ENDIANNESS_LITTLE_ENDIAN ? 0 : 1], $endianness);
+    }
 }
diff --git a/src/DataType/Word.php b/src/DataType/Word.php
@@ -19,28 +19,4 @@ public function __construct(string $value, int $endianness = BinaryValue::ENDIAN
 
         parent::__construct($value, $endianness);
     }
-
-    /**
-     * @return Byte
-     * @throws \Exception
-     */
-    public function getHighByte(): Byte
-    {
-        $value = $this->__toString();
-        $endianness = $this->getEndianness();
-
-        return new Byte($value[$endianness === BinaryValue::ENDIANNESS_LITTLE_ENDIAN ? 1 : 0], $endianness);
-    }
-
-    /**
-     * @return Byte
-     * @throws \Exception
-     */
-    public function getLowByte(): Byte
-    {
-        $value = $this->__toString();
-        $endianness = $this->getEndianness();
-
-        return new Byte($value[$endianness === BinaryValue::ENDIANNESS_LITTLE_ENDIAN ? 0 : 1], $endianness);
-    }
 }