fix psr-0 compliance

Author: dannyvankooten

README.md

@@ -8,31 +8,31 @@ A simple Rails inspired PHP router class.
 * Dynamic URL's: use URL segments as parameters.
 
 ## Usage
+```php
+<?php
+require 'Router.php';
+require 'Route.php';
 
-    <?php
-    require 'Router.php';
-    require 'Route.php';
+$router = new Router();
 
-    $router = new Router();
+$router->setBasePath('/PHP-Router');
 
-    $router->setBasePath('/PHP-Router');
+// defining routes can be as simple as this
+$router->map('/', 'users#index');
 
-    // defining routes can be as simple as this
-    $router->map('/', 'users#index');
+// or somewhat more complicated
+$router->map('/users/:id/edit/', array('controller' => 'SomeController', 'action' => 'someAction'), array('methods' => 'GET,PUT', 'name' => 'users_edit', 'filters' => array('id' => '(\d+)')));
 
-    // or somewhat more complicated
-    $router->map('/users/:id/edit/', array('controller' => 'SomeController', 'action' => 'someAction'), array('methods' => 'GET,PUT', 'name' => 'users_edit', 'filters' => array('id' => '(\d+)')));
+// You can even specify closures as the Route's target
+$router->map('/hello/:name', function($name) { echo "Hello $name."; });
 
-    // You can even specify closures as the Route's target
-    $router->map('/hello/:name', function($name) { echo "Hello $name."; });
-
-    // match current request URL & http method
-    $target = $router->matchCurrentRequest();
-    var_dump($target);
-
-    // generate an URL 
-    $router->generate('users_edit', array('id' => 5));
+// match current request URL & http method
+$target = $router->matchCurrentRequest();
+var_dump($target);
 
+// generate an URL
+$router->generate('users_edit', array('id' => 5));
+```
 
 ## More information
 Have a look at the example.php file or read trough the class' documentation for a better understanding on how to use this class.

Route.php

@@ -1,20 +1,26 @@
-{
-   "name": "dannyvankooten/php-router",
-   "description": "Simple PHP Router, supports REST and reverse routing.",
-   "keywords": ["router", "routing", "php", "rest"],
-   "homepage": "https://github.com/dannyvankooten/PHP-Router",
-   "license": "MIT",
-   "authors": [
-      {
-         "name": "Danny van Kooten",
-         "email": "[email protected]",
-         "homepage": "http://dannyvankooten.com/"
-      }
-   ],
-   "require": {
-      "php": ">=5.3.0"
-   },
-   "autoload": {
-      "classmap": ["Router.php", "Route.php"]
-   }
+{
+    "name": "dannyvankooten/php-router",
+    "description": "Simple PHP Router, supports REST and reverse routing.",
+    "keywords": ["router", "routing", "php", "rest"],
+    "homepage": "https://github.com/dannyvankooten/PHP-Router",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Danny van Kooten",
+            "email": "[email protected]",
+            "homepage": "http://dannyvankooten.com/"
+        },
+        {
+            "name": "Jefersson Nathan",
+            "email": "[email protected]"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.0"
+    },
+    "autoload": {
+        "psr-0": {
+            "PHProuter": "src/"
+        }
+    }
 }

composer.json

@@ -0,0 +1,115 @@
+<?php
+namespace PHPRouter;
+
+class Route
+{
+	/**
+	* URL of this Route
+	* @var string
+	*/
+	private $_url;
+
+	/**
+	* Accepted HTTP methods for this route
+	* @var array
+	*/
+	private $_methods = array('GET','POST','PUT','DELETE');
+
+	/**
+	* Target for this route, can be anything.
+	* @var mixed
+	*/
+	private $_target;
+
+	/**
+	* The name of this route, used for reversed routing
+	* @var string
+	*/
+	private $_name;
+
+	/**
+	* Custom parameter filters for this route
+	* @var array
+	*/
+	private $_filters = array();
+
+	/**
+	* Array containing parameters passed through request URL
+	* @var array
+	*/
+	private $_parameters = array();
+
+	public function getUrl()
+    {
+		return $this->_url;
+	}
+
+	public function setUrl($url)
+    {
+		$url = (string) $url;
+
+		// make sure that the URL is suffixed with a forward slash
+		if(substr($url,-1) !== '/') $url .= '/';
+		
+		$this->_url = $url;
+	}
+
+	public function getTarget()
+    {
+		return $this->_target;
+	}
+
+	public function setTarget($target)
+    {
+		$this->_target = $target;
+	}
+
+	public function getMethods()
+    {
+		return $this->_methods;
+	}
+
+	public function setMethods(array $methods)
+    {
+		$this->_methods = $methods;
+	}
+
+	public function getName()
+    {
+		return $this->_name;
+	}
+
+	public function setName($name)
+    {
+		$this->_name = (string) $name;
+	}
+
+	public function setFilters(array $filters)
+    {
+		$this->_filters = $filters;
+	}
+
+	public function getRegex()
+    {
+		return preg_replace_callback("/:(\w+)/", array(&$this, 'substituteFilter'), $this->_url);
+	}
+
+	private function substituteFilter($matches)
+    {
+		if (isset($matches[1]) && isset($this->_filters[$matches[1]])) {
+       		return $this->_filters[$matches[1]];
+       	}
+        
+       	return "([\w-]+)";
+	}
+
+	public function getParameters()
+    {
+		return $this->_parameters;
+	}
+
+	public function setParameters(array $parameters)
+    {
+		$this->_parameters = $parameters;
+	}
+}