OSDN Git Service

Merge pull request #68 from duylecampos/hotfix-1.1.2
authorJefersson Nathan <admin@phpse.net>
Tue, 22 Dec 2015 15:49:13 +0000 (12:49 -0300)
committerJefersson Nathan <admin@phpse.net>
Tue, 22 Dec 2015 15:49:13 +0000 (12:49 -0300)
Refactor route to check number of parameters received

1  2 
src/PHPRouter/Router.php

@@@ -108,13 -103,14 +108,14 @@@ class Route
  
              $currentDir = dirname($_SERVER['SCRIPT_NAME']);
              if ($currentDir != '/') {
 -                $requestUrl = str_replace($currentDir, '', $requestUrl);    
 -            }           
 +                $requestUrl = str_replace($currentDir, '', $requestUrl);
 +            }
  
              // check if request _url matches route regex. if not, return false.
 -            if (! preg_match("@^" . $this->basePath . $routes->getRegex() . "*$@i", $requestUrl, $matches)) {
 +            if (!preg_match("@^" . $this->basePath . $routes->getRegex() . "*$@i", $requestUrl, $matches)) {
                  continue;
              }
+             $matchedText = array_shift($matches);
  
              $params = array();