Explorar o código

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

Sébastien HOUZE %!s(int64=14) %!d(string=hai) anos
pai
achega
179fe8e623
Modificáronse 1 ficheiros con 8 adicións e 6 borrados
  1. 8 6
      src/Symfony/Component/Routing/Route.php

+ 8 - 6
src/Symfony/Component/Routing/Route.php

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