Skip to content

Commit 6a46326

Browse files
Merge branch '5.3' into 5.4
* 5.3: [5.3] cs fixes [Cache] Fix saving items with no expiration through ProxyAdapter CS fixes [HttpClient] Fix tracing requests made after calling withOptions() [Cache] disable lock on CLI [VarDumper] add more "transient-on-macos" groups
2 parents 5b06626 + 921ffde commit 6a46326

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Crawler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,11 +1194,11 @@ private function convertToHtmlEntities(string $htmlContent, string $charset = 'U
11941194

11951195
try {
11961196
return mb_convert_encoding($htmlContent, 'HTML-ENTITIES', $charset);
1197-
} catch (\Exception | \ValueError $e) {
1197+
} catch (\Exception|\ValueError $e) {
11981198
try {
11991199
$htmlContent = iconv($charset, 'UTF-8', $htmlContent);
12001200
$htmlContent = mb_convert_encoding($htmlContent, 'HTML-ENTITIES', 'UTF-8');
1201-
} catch (\Exception | \ValueError $e) {
1201+
} catch (\Exception|\ValueError $e) {
12021202
}
12031203

12041204
return $htmlContent;

0 commit comments

Comments
 (0)