Skip to content

Commit 9e472b4

Browse files
Merge branch '4.3' into 4.4
* 4.3: [travis] Fix build-packages script [HttpClient] bugfix exploding values of headers Remove useless testCanCheckIfTerminalIsInteractive test case [Validator] Add the missing translations for the Thai (\"th\") locale [Routing] gracefully handle docref_root ini setting [Validator] Fix ValidValidator group cascading usage
2 parents e381f6c + 3b174ef commit 9e472b4

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Matcher/Dumper/CompiledUrlMatcherDumper.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public function getCompiledRoutes(bool $forDump = false): array
9191

9292
while (true) {
9393
try {
94-
$this->signalingException = new \RuntimeException('preg_match(): Compilation failed: regular expression is too large');
94+
$this->signalingException = new \RuntimeException('Compilation failed: regular expression is too large');
9595
$compiledRoutes = array_merge($compiledRoutes, $this->compileDynamicRoutes($dynamicRoutes, $matchHost, $chunkLimit, $conditions));
9696

9797
break;
@@ -349,7 +349,7 @@ private function compileDynamicRoutes(RouteCollection $collection, bool $matchHo
349349
$state->markTail = 0;
350350

351351
// if the regex is too large, throw a signaling exception to recompute with smaller chunk size
352-
set_error_handler(function ($type, $message) { throw 0 === strpos($message, $this->signalingException->getMessage()) ? $this->signalingException : new \ErrorException($message); });
352+
set_error_handler(function ($type, $message) { throw false !== strpos($message, $this->signalingException->getMessage()) ? $this->signalingException : new \ErrorException($message); });
353353
try {
354354
preg_match($state->regex, '');
355355
} finally {

Matcher/Dumper/StaticPrefixCollection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,6 @@ private function getCommonPrefix(string $prefix, string $anotherPrefix): array
197197

198198
public static function handleError($type, $msg)
199199
{
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');
201201
}
202202
}

0 commit comments

Comments
 (0)