WIP version 3

Author: Martin Brecht-Precht

src/SimpleStringBuilder.php

@@ -111,17 +111,20 @@ public function replace($position, $length, $string)
 			$type = is_object($position) ? get_class($position) : gettype($position);
 			throw new \InvalidArgumentException('Position invalid. Expected integer. Got ' . $type . '.');
 		}
+		if ($position > $this->length()) {
+			throw new \InvalidArgumentException('Position invalid.');
+		}
 		if (!is_int($length)) {
 			$type = is_object($length) ? get_class($length) : gettype($length);
 			throw new \InvalidArgumentException('Length invalid. Expected integer. Got ' . $type . '.');
 		}
+		if ($position + $length > $this->length()) {
+			throw new \InvalidArgumentException('Length invalid.');
+		}
 		if (!is_scalar($string)) {
 			$type = is_object($string) ? get_class($string) : gettype($string);
 			throw new \InvalidArgumentException('Expected a scalar value. Got ' . $type . '.');
 		}
-		if ($position > $this->length()) {
-			$position = $this->length();
-		}
 		$this->string = mb_substr($this->string, 0, $position) . (string)$string . mb_substr($this->string, $position + $length);
 		return $this;
 	}
@@ -269,7 +272,7 @@ public function length()
 	 */
 	public function buildSubstring($startPosition, $length = null)
 	{
-		if ($this->length() > $startPosition) {
+		if ($startPosition > $this->length()) {
 			throw new \InvalidArgumentException('Start position ' . (string)$startPosition . ' invalid.');
 		}
 		if (!is_int($length) && !is_null($length)) {

test/SimpleStringBuilderTest.php

@@ -20,18 +20,14 @@ public function testBuilder()
 			->append(12)
 			->append(false)
 			->prepend('b')
-			->remove(1)
-			->replace(0, 'ab')
 			->append(true);
-		$this->assertEquals('ab121', $builder->build());
-		$this->assertEquals('121', $builder->buildSubstring(1));
-		$this->assertEquals('ab12', $builder->buildSubstring(0, 2));
-		$this->assertEquals(4, $builder->size());
+		$this->assertEquals('a12b1', $builder->build());
+		$this->assertEquals('12b1', $builder->buildSubstring(1));
+		$this->assertEquals('a1', $builder->buildSubstring(0, 2));
+		$this->assertEquals(5, $builder->size());
 		$this->assertEquals(5, $builder->length());
-		$this->assertTrue($builder->contains('ab'));
+		$this->assertTrue($builder->contains('12b'));
 		$this->assertFalse($builder->contains('abc'));
-		$this->assertTrue($builder->stringContains('ab1'));
-		$this->assertFalse($builder->stringContains('abc'));
 	}
 
 	public function testBuilderAppendFail()
@@ -45,14 +41,14 @@ public function testBuilderPrependFail()
 	{
 		$this->setExpectedException(get_class(new \InvalidArgumentException()));
 		$builder = new SimpleStringBuilder();
-		$builder->prepend(new \DateTime());
+		$builder->prepend(new \DateTimeZone('Europe/Berlin'));
 	}
 
 	public function testBuilderReplaceFail1()
 	{
 		$this->setExpectedException(get_class(new \InvalidArgumentException()));
 		$builder = new SimpleStringBuilder();
-		$builder->replace(0, 'a');
+		$builder->replace(0, 1, 'a');
 	}
 
 	public function testBuilderReplaceFail2()
@@ -61,14 +57,16 @@ public function testBuilderReplaceFail2()
 		$builder = new SimpleStringBuilder();
 		$builder
 			->append('a')
-			->replace(0, new \DateTime());
+			->replace(0, 2, 'a');
 	}
 
-	public function testBuilderRemoveFail()
+	public function testBuilderReplaceFail3()
 	{
 		$this->setExpectedException(get_class(new \InvalidArgumentException()));
 		$builder = new SimpleStringBuilder();
-		$builder->remove(0);
+		$builder
+			->append('a')
+			->replace(0, 1, new \DateTimeZone('Europe/Berlin'));
 	}
 
 	public function testBuilderContainsFail()
@@ -78,13 +76,6 @@ public function testBuilderContainsFail()
 		$builder->contains(array());
 	}
 
-	public function testBuilderStringContainsFail()
-	{
-		$this->setExpectedException(get_class(new \InvalidArgumentException()));
-		$builder = new SimpleStringBuilder();
-		$builder->stringContains(array());
-	}
-
 	public function testBuilderBuildSubstringFail1()
 	{
 		$this->setExpectedException(get_class(new \InvalidArgumentException()));