Fix the mechanism that matches routes against the request method.

Closes #118
proem · Aug 17, 2012 · 711f479 · 711f479
1 parent 611baa3
commit 711f479
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/lib/Proem/Routing/Route/Standard.php b/lib/Proem/Routing/Route/Standard.php
@@ -116,12 +116,17 @@ public function process(Request $request)
         $rule               = $this->options['rule'];
         $target             = isset($this->options['targets']) ? $this->options['targets'] : [];
         $custom_filters     = isset($this->options['filters']) ? $this->options['filters'] : [];
-        $method             = isset($this->options['method']) ? $this->options['method'] : 'GET';
+        $method             = isset($this->options['method']) ? $this->options['method'] : false;
+
+        $requestMethod      = $request->getMethod();
+
+        if ($method && (strtoupper($method) !== strtoupper($requestMethod))) {
+            return false;
+        }
 
         $default_tokens     = $this->default_tokens;
         $default_filters    = $this->default_filters;
         $uri                = $request->getRequestUri();
-        $requestMethod      = $request->getMethod();
 
         $keys   = [];
         $values = [];
@@ -150,7 +155,7 @@ function($matches) use ($custom_filters, $default_tokens, $default_filters)
             $rule
         ) . '/?';
 
-        if (preg_match('@^' . $regex . '$@', $request->getRequestUri(), $values) && $requestMethod == $method) {
+        if (preg_match('@^' . $regex . '$@', $request->getRequestUri(), $values)) {
             array_shift($values);
 
             foreach ($keys as $index => $value) {