Fixed structure of project. Changed autoloading in composer

Author: Ekman

.gitignore

@@ -1,4 +1,5 @@
 index.php
+nbproject/
 
 # Created by http://www.gitignore.io
 

README.md

@@ -6,17 +6,17 @@ More information on the algorithm can be found at [Wikipedia](http://en.wikipedi
 ## Usage
 Use the class like this:
 
-	$luhn = new LuhnAlgorithm('123456789');
+	$luhn = new \Nekman\LuhnAlgorithm\LuhnAlgorithm('123456789');
 	$luhn->isCompletelyValid();
 
 
 The class contains some static functions as well. This will return the Luhn
 checksum of a number:
 
 	$number = '123456789';
-	$luhnCheckSum = LuhnAlgorithm::calculateChecksum($number);
+	$luhnCheckSum = \Nekman\LuhnAlgorithm\LuhnAlgorithm::calculateChecksum($number);
 
 ### Personnummer
 If you'd like to validate the input to the class, extend it and do a regex check.
 In the file **Personnummer.php**, I have extended the class to make sure that the
-input is a valid Swedish national security id.
+input is a valid Swedish national security id.

composer.json

@@ -8,6 +8,9 @@
 		"identification number",
 		"validation"
 	],
+	"require-dev": {
+		"phpunit/phpunit": "4.1.*"
+	},
 	"license": "MIT",
 	"authors": [
 		{
@@ -20,13 +23,12 @@
 		"issues": "https://github.com/Ekman/Luhn-Algorithm/issues",
 		"source": "https://github.com/Ekman/Luhn-Algorithm"
 	},
-	"require": {
-		"php": ">=4.0.0"
-	},
 	"require-dev": {
 		"phpunit/phpunit": "3.7.*"
 	},
 	"autoload": {
-		"files": ["LuhnAlgorithm.php"]
+		"psr-4": {
+			"Nekman\\LuhnAlgorithm\\": "src"
+		}
 	}
 }

Personnummer.example.php renamed to example/Personnummer.example.php

@@ -23,7 +23,9 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-require_once(dirname(__FILE__) . "/LuhnAlgorithm.php");
+require_once(dirname(__FILE__) . '../vendor/autoload.php');
+
+use Nekman\LuhnAlgorithm\LuhnAlgorithm as LuhnAlgorithm;
 
 /**
  * Extends LuhnAlgorithm and makes sure that the number supplied is a valid
@@ -32,15 +34,15 @@
  * @author Niklas Ekman <nikl.ekman@gmail.com>
  * @version 2014-02-07
  */
-class Personnumer extends \LuhnAlgorithm {
+class Personnumer extends LuhnAlgorithm {
 
 	/**
 	 * Validate an input and see if it can be a valid personnumer
 	 * @param type $input
 	 * @return type
 	 */
 	public static function isValid($input) {
-		return preg_match("/^\d{2}[0-1]\d[0-3]\d\s?-?\s?\d{4}$/", trim($input)) !== false;
+		return preg_match("/^\d{2}[0-1]\d[0-3]\d\s?-?\s?\d{4}$/", trim($input)) === 1;
 	}
 
 	/**

phpunit.xml

@@ -0,0 +1,10 @@
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	 xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/3.7/phpunit.xsd"
+	 bootstrap="vendor/autoload.php">
+	
+	<testsuites>
+		<testsuite name="Luhn Algorithm tests">
+			<directory>tests/</directory>
+		</testsuite>
+	</testsuites>
+</phpunit>

LuhnAlgorithm.php renamed to src/LuhnAlgorithm.php

@@ -23,6 +23,8 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+namespace Nekman\LuhnAlgorithm;
+
 /**
  * Apply the Luhn Algorithm to a number
  *  

tests/LuhnAlgorithmTest.php

@@ -1,5 +1,7 @@
 <?php
 
+use \Nekman\LuhnAlgorithm\LuhnAlgorithm as LuhnAlgorithm;
+
 /**
  * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-02-04 at 21:57:34.
  */
@@ -48,8 +50,8 @@ public function testIsValid($number) {
 	 * @dataProvider provider
 	 */
 	public function testCalculateChecksum($number) {
-		$number = \LuhnAlgorithm::toInteger($number);
-		$checkSum = \LuhnAlgorithm::calculateChecksum($number);
+		$number = LuhnAlgorithm::toInteger($number);
+		$checkSum = LuhnAlgorithm::calculateChecksum($number);
 		$this->assertEquals(0, $checkSum % 10);
 	}
 
@@ -58,14 +60,14 @@ public function testCalculateChecksum($number) {
 	 * @dataProvider provider
 	 */
 	public function testCalculcateCheckDigit($number) {
-		$number = strval(\LuhnAlgorithm::toInteger($number));
+		$number = strval(LuhnAlgorithm::toInteger($number));
 		$last = strlen($number) - 1;
 
 		// Check digit is the last number
 		$checkDigit = $number[$last];
 		$number = substr($number, 0, $last);
 
-		$calcCheckDigit = \LuhnAlgorithm::calculcateCheckDigit($number);
+		$calcCheckDigit = LuhnAlgorithm::calculcateCheckDigit($number);
 		$this->assertEquals($checkDigit, $calcCheckDigit);
 	}
 
@@ -93,7 +95,7 @@ public function testIsCompletelyValid($number) {
 	 */
 	public function testGetNumber($number) {
 		$this->object->setNumber($number, true);
-		$number = \LuhnAlgorithm::toInteger($number);
+		$number = LuhnAlgorithm::toInteger($number);
 		$this->assertEquals($number, $this->object->getNumber());
 	}
 
@@ -113,7 +115,7 @@ public function testGetCheckDigit($number) {
 	 * @dataProvider provider
 	 */
 	public function testStringToInteger($number) {
-		$int = \LuhnAlgorithm::toInteger($number);
+		$int = LuhnAlgorithm::toInteger($number);
 		$this->assertTrue(is_numeric($int));
 	}