bug #33863 [Routing] gracefully handle docref_root ini setting (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit b92d944e6cc2 · 2019-10-05T13:36:02.000+02:00
This PR was merged into the 4.3 branch. Discussion ---------- [Routing] gracefully handle docref_root ini setting | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #33833 | License | MIT | Doc PR | - Commits ------- 4d5530f [Routing] gracefully handle docref_root ini setting
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php
@@ -91,7 +91,7 @@ public function getCompiledRoutes(bool $forDump = false): array
 
         while (true) {
             try {
-                $this->signalingException = new \RuntimeException('preg_match(): Compilation failed: regular expression is too large');
+                $this->signalingException = new \RuntimeException('Compilation failed: regular expression is too large');
                 $compiledRoutes = array_merge($compiledRoutes, $this->compileDynamicRoutes($dynamicRoutes, $matchHost, $chunkLimit, $conditions));
 
                 break;
@@ -349,7 +349,7 @@ private function compileDynamicRoutes(RouteCollection $collection, bool $matchHo
             $state->markTail = 0;
 
             // if the regex is too large, throw a signaling exception to recompute with smaller chunk size
-            set_error_handler(function ($type, $message) { throw 0 === strpos($message, $this->signalingException->getMessage()) ? $this->signalingException : new \ErrorException($message); });
+            set_error_handler(function ($type, $message) { throw false !== strpos($message, $this->signalingException->getMessage()) ? $this->signalingException : new \ErrorException($message); });
             try {
                 preg_match($state->regex, '');
             } finally {
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/StaticPrefixCollection.php b/src/Symfony/Component/Routing/Matcher/Dumper/StaticPrefixCollection.php
@@ -197,6 +197,6 @@ private function getCommonPrefix(string $prefix, string $anotherPrefix): array
 
     public static function handleError($type, $msg)
     {
-        return 0 === strpos($msg, 'preg_match(): Compilation failed: lookbehind assertion is not fixed length');
+        return false !== strpos($msg, 'Compilation failed: lookbehind assertion is not fixed length');
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -197,6 +197,6 @@ private function getCommonPrefix(string $prefix, string $anotherPrefix): array`
`197`	`197`
`198`	`198`	`public static function handleError($type, $msg)`
`199`	`199`	`{`
`200`		`- return 0 === strpos($msg, 'preg_match(): Compilation failed: lookbehind assertion is not fixed length');`
	`200`	`+ return false !== strpos($msg, 'Compilation failed: lookbehind assertion is not fixed length');`
`201`	`201`	`}`
`202`	`202`	`}`