Symfony\Component\Routing\Route::setRequirements() _method requirement can be an array, no substr on it

This commit is contained in:
Sébastien HOUZE 2010-08-24 13:45:14 +02:00 committed by Fabien Potencier
parent 4c17ce8e5e
commit 179fe8e623

View File

@ -197,12 +197,14 @@ class Route
{
$this->requirements = array();
foreach ($requirements as $key => $regex) {
if ('^' == $regex[0]) {
$regex = substr($regex, 1);
}
if (!is_array($regex)) {
if ('^' == $regex[0]) {
$regex = substr($regex, 1);
}
if ('$' == substr($regex, -1)) {
$regex = substr($regex, 0, -1);
if ('$' == substr($regex, -1)) {
$regex = substr($regex, 0, -1);
}
}
$this->requirements[$key] = $regex;