Upstream nikic/FastRoute state of the touched files before e76ad24228
This commit is contained in:
1 parent
7ac8857878
commit
5861a25d71
6 files changed
+9
-62
No files matched your search
@@ -8,11 +8,6 @@ use FastRoute\Dispatcher;
|
||||
use FastRoute\Dispatcher\Result\Matched;
|
||||
use FastRoute\Dispatcher\Result\MethodNotAllowed;
|
||||
use FastRoute\Dispatcher\Result\NotMatched;
|
||||
use RuntimeException;
|
||||
|
||||
use function preg_last_error_msg;
|
||||
use function preg_match;
|
||||
use function sprintf;
|
||||
|
||||
/**
|
||||
* @internal
|
||||
@@ -40,26 +35,6 @@ abstract class RegexBasedAbstract implements Dispatcher
|
||||
/** @param DynamicRouteChunks $routeData */
|
||||
abstract protected function dispatchVariableRoute(array $routeData, string $uri): ?Matched;
|
||||
|
||||
/**
|
||||
* Matches a route regex, distinguishing a genuine "no match" (preg_match()
|
||||
* returns 0) from a PCRE engine failure such as PREG_BACKTRACK_LIMIT_ERROR
|
||||
* (returns false), which would otherwise fail unrelated routes sharing the
|
||||
* same combined regex chunk.
|
||||
*
|
||||
* @param array<int|string, mixed>|null $matches
|
||||
*/
|
||||
protected function matchRoute(string $regex, string $subject, ?array &$matches = null): int
|
||||
{
|
||||
$result = preg_match($regex, $subject, $matches);
|
||||
if ($result === false) {
|
||||
throw new RuntimeException(
|
||||
sprintf('Regex matching failed for "%s": %s', $regex, preg_last_error_msg()),
|
||||
);
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
public function dispatch(string $httpMethod, string $uri): Matched|NotMatched|MethodNotAllowed
|
||||
{
|
||||
if (isset($this->staticRouteMap[$httpMethod][$uri])) {
|
||||
|
||||
Reference in new issue
Block a user