Skip to content

Match route to request #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mytuny wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Match route to request #9

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cdfc136
Match route to request
Jun 11, 2019
0d9dd7a
Match URIs with query params ex: '?v=abc'
Jun 12, 2019
071224d
Fix unhandled parse_url
Jun 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 29 additions & 3 deletions src/WP_Route.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,25 @@ private function getRouteParams($route){
}

return $return;
}
}

private function matchRouteToRequest($route, $request) {
$routes = $this->tokenize($route);
$requests = $this->tokenize($request);

$diff = array_diff($routes, $requests);

$matched = true;

if( !empty($diff) ) {
foreach($diff as $k => $param) {
if( preg_match('/\{\s*.+?\s*\}/', $param) && !empty($requests[$k]) ) continue;
$matched = false;
}
}

return $matched;
}


// -----------------------------------------------------
Expand All @@ -141,7 +159,9 @@ public static function routes(){
}

public function tokenize($url){
return array_filter(explode('/', ltrim($url, '/')));
extract( parse_url($url) );
if( !isset($path) ) $path = '';
return array_filter(explode('/', ltrim($path, '/')));
}

public function requestURI(){
Expand All @@ -162,7 +182,13 @@ public function handle(){
if(count($this->tokenize($route->route)) !== count($tokenizedRequestURI)){
unset($routes[$key]);
continue;
}
}

// Filter routes that do not match the request
if( ! $this->matchRouteToRequest($route->route, $requestURI) ) {
unset($routes[$key]);
continue;
}

// Add more filtering here as routing gets more complex.
}
Expand Down