Removed intval() from toInteger() and minor fix

Author: Ekman

LuhnAlgorithm.php

@@ -65,7 +65,7 @@ public function isValid() {
 	 * @return int Checksum
 	 */
 	public static function calculateChecksum($number, $length = 0) {
-		$number = strval(self::stringToInteger($number));
+		$number = strval(self::toInteger($number));
 
 		if ($length === 0) {
 			$length = strlen($number);
@@ -80,7 +80,7 @@ public static function calculateChecksum($number, $length = 0) {
 
 			// If a 2 digit number, split and add togheter
 			if ($tmp > 9) {
-				$tmp = intval($tmp / 10) + intval($tmp % 10);
+				$tmp = ($tmp / 10) + ($tmp % 10);
 			}
 
 			// Sum it upp
@@ -147,12 +147,13 @@ public function getCheckDigit() {
 	}
 
 	/**
-	 * Fix a string so that it only contains numbers
-	 * @param string $integer String to convert to integer
-	 * @return int An integer
+	 * Remove all but numbers from a string
+	 * 
+	 * @param string $string String to "convert" to integer
+	 * @return string String containing only numbers
 	 */
-	public static function stringToInteger($integer) {
-		return intval(preg_replace("/[^0-9]/", "", $integer));
+	public static function toInteger($string) {
+		return preg_replace("/[^\d]/", "", $string);
 	}
 
 	/**
@@ -162,7 +163,7 @@ public static function stringToInteger($integer) {
 	 * included in $number?
 	 */
 	public function setNumber($number, $withCheckDigit = true) {
-		$number = strval(self::stringToInteger($number));
+		$number = strval(self::toInteger($number));
 		$length = strlen($number);
 
 		// If number does not include checkdigit, calculate it!

tests/LuhnAlgorithmTest.php

@@ -50,7 +50,7 @@ public function testIsValid($number) {
 	 * @dataProvider provider
 	 */
 	public function testCalculateChecksum($number) {
-		$number = \LuhnAlgorithm::stringToInteger($number);
+		$number = \LuhnAlgorithm::toInteger($number);
 		$checkSum = \LuhnAlgorithm::calculateChecksum($number);
 		$this->assertEquals(0, $checkSum % 10);
 	}
@@ -60,7 +60,7 @@ public function testCalculateChecksum($number) {
 	 * @dataProvider provider
 	 */
 	public function testCalculcateCheckDigit($number) {
-		$number = strval(\LuhnAlgorithm::stringToInteger($number));
+		$number = strval(\LuhnAlgorithm::toInteger($number));
 		$last = strlen($number) - 1;
 
 		// Check digit is the last number
@@ -95,7 +95,7 @@ public function testIsCompletelyValid($number) {
 	 */
 	public function testGetNumber($number) {
 		$this->object->setNumber($number, true);
-		$number = \LuhnAlgorithm::stringToInteger($number);
+		$number = \LuhnAlgorithm::toInteger($number);
 		$this->assertEquals($number, $this->object->getNumber());
 	}
 
@@ -115,7 +115,7 @@ public function testGetCheckDigit($number) {
 	 * @dataProvider provider
 	 */
 	public function testStringToInteger($number) {
-		$int = \LuhnAlgorithm::stringToInteger($number);
+		$int = \LuhnAlgorithm::toInteger($number);
 		$this->assertTrue(is_int($int));
 	}