Correct foreach and count but due to complement issue

Author: chdemko

.travis.yml

@@ -1,8 +1,8 @@
 language: php
 
 php:
-  - 5.4
   - 5.5
+  - 7.0
 
 before_install:
   - composer self-update

examples/BitArray.php

@@ -17,17 +17,16 @@
 
 use chdemko\BitArray\BitArray;
 
-$bits = BitArray::fromString('10010');
-
 // Print 10010
+$bits = BitArray::fromString('10010');
 echo $bits . PHP_EOL;
 
 // Print 01101
 $bits->applyComplement();
 echo $bits . PHP_EOL;
 
 // Print 11100
-$bits->applyXor(BitArray::fromIterable([true, false, false, false, true]));
+$bits->applyXor(BitArray::fromTraversable([true, false, false, false, true]));
 echo $bits . PHP_EOL;
 
 // Print 11101

src/BitArray/BitArray.php

@@ -45,6 +45,20 @@ class BitArray implements \ArrayAccess, \Countable, \IteratorAggregate, \JsonSer
 		4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8
 	];
 
+	/**
+	 * @var  integer[]  Mask for restricting complements
+	 */
+	private static $restrict = [
+		1 << 0 | 1 << 1 | 1 << 2 | 1 << 3 | 1 << 4 | 1 << 5 | 1 << 6 | 1 << 7,
+		1 << 0,
+		1 << 0 | 1 << 1,
+		1 << 0 | 1 << 1 | 1 << 2,
+		1 << 0 | 1 << 1 | 1 << 2 | 1 << 3,
+		1 << 0 | 1 << 1 | 1 << 2 | 1 << 3 | 1 << 4,
+		1 << 0 | 1 << 1 | 1 << 2 | 1 << 3 | 1 << 4 | 1 << 5,
+		1 << 0 | 1 << 1 | 1 << 2 | 1 << 3 | 1 << 4 | 1 << 5 | 1 << 6,
+	];
+
 	/**
 	 * @var     string  Underlying data
 	 *
@@ -123,13 +137,10 @@ public function __get($property)
 		{
 			case 'size':
 				return $this->size;
-			break;
 			case 'count':
 				return $this->count();
-			break;
 			default:
 				throw new \RuntimeException('Undefined property');
-			break;
 		}
 	}
 
@@ -400,6 +411,12 @@ public function applyComplement()
 			$this->data[$i] = chr(~ ord($this->data[$i]));
 		}
 
+		// Remove useless bits
+		if ($length > 0)
+		{
+			$this->data[$length - 1] = chr(ord($this->data[$length - 1]) & self::$restrict[$this->size % 8]);
+		}
+
 		return $this;
 	}
 

src/BitArray/Iterator.php

@@ -107,6 +107,6 @@ public function next()
 	 */
 	public function valid()
 	{
-		return $this->index < count($this->bits);
+		return $this->index < $this->bits->size;
 	}
 }

tests/BitArray/BitArrayTest.php

@@ -496,6 +496,14 @@ public function test_applyComplement()
 			'01100',
 			(string) $bits->applyComplement()
 		);
+		$this->assertEquals(
+			2,
+			count($bits)
+		);
+		$this->assertEquals(
+			5,
+			$bits->size
+		);
 	}
 
 	/**