Add fromConcat and toArray methods

Author: chdemko

src/BitArray/BitArray.php

@@ -244,13 +244,13 @@ public function count()
 	}
 
 	/**
-	 * Serialize the object
+	 * Transform the object to an array
 	 *
 	 * @return  array  Array of values
 	 *
-	 * @since   1.0.0
+	 * @since   1.1.0
 	 */
-	public function jsonSerialize()
+	public function toArray()
 	{
 		$array = [];
 
@@ -262,6 +262,18 @@ public function jsonSerialize()
 		return $array;
 	}
 
+	/**
+	 * Serialize the object
+	 *
+	 * @return  array  Array of values
+	 *
+	 * @since   1.0.0
+	 */
+	public function jsonSerialize()
+	{
+		return $this->toArray();
+	}
+
 	/**
 	 * Get an iterator
 	 *
@@ -402,7 +414,7 @@ public static function fromJson($json)
 	 *
 	 * @return  BitArray  A new BitArray
 	 *
-	 * @since   1.0.0
+	 * @since   1.1.0
 	 */
 	public static function fromSlice(BitArray $bits, $offset = 0, $size = null)
 	{
@@ -456,6 +468,34 @@ public static function fromSlice(BitArray $bits, $offset = 0, $size = null)
 		return $slice;
 	}
 
+	/**
+	 * Create a new BitArray using the concat operation
+	 *
+	 * @param   BitArray  $bits1  A bitarray
+	 * @param   BitArray  $bits2  A bitarray
+	 *
+	 * @return  BitArray  A new BitArray
+	 *
+	 * @since   1.1.0
+	 */
+	public static function fromConcat(BitArray $bits1, BitArray $bits2)
+	{
+		$size = $bits1->size + $bits2->size;
+		$concat = new BitArray($size);
+
+		for ($i = 0; $i < $bits1->size; $i++)
+		{
+			$concat[$i] = $bits1[$i];
+		}
+
+		for ($i = 0; $i < $bits2->size; $i++)
+		{
+			$concat[$i + $bits1->size] = $bits2[$i];
+		}
+
+		return $concat;
+	}
+
 	/**
 	 * Complement the bit array
 	 *

tests/BitArray/BitArrayTest.php

@@ -292,6 +292,7 @@ public function test___get()
 	 * @return  void
 	 *
 	 * @covers  chdemko\BitArray\BitArray::jsonSerialize
+	 * @covers  chdemko\BitArray\BitArray::toArray
 	 *
 	 * @since   1.0.0
 	 */
@@ -467,7 +468,7 @@ public function test_fromString($string)
 	 * @covers  chdemko\BitArray\BitArray::__construct
 	 * @covers  chdemko\BitArray\BitArray::__toString
 	 *
-	 * @since   1.0.0
+	 * @since   1.1.0
 	 */
 	public function test_fromJson()
 	{
@@ -484,7 +485,7 @@ public function test_fromJson()
 	 *
 	 * @return  array
 	 *
-	 * @since   1.0.0
+	 * @since   1.1.0
 	 */
 	public function cases_fromSlice()
 	{
@@ -580,6 +581,32 @@ public function test_fromSlice($string, $offset, $size, $result)
 		);
 	}
 
+	/**
+	 * Tests  BitArray::fromConcat
+	 *
+	 * @return  void
+	 *
+	 * @covers  chdemko\BitArray\BitArray::fromConcat
+	 * @covers  chdemko\BitArray\BitArray::__construct
+	 * @covers  chdemko\BitArray\BitArray::__toString
+	 *
+	 * @since   1.1.0
+	 */
+	public function test_fromConcat()
+	{
+		$bits1 = BitArray::fromString('1001');
+		$bits2 = BitArray::fromString('111');
+
+		$this->assertEquals(
+			'1001111',
+			(string) BitArray::fromConcat($bits1, $bits2)
+		);
+		$this->assertEquals(
+			'1111001',
+			(string) BitArray::fromConcat($bits2, $bits1)
+		);
+	}
+
 	/**
 	 * Tests  BitArray::applyComplement
 	 *