bug #36915 [DomCrawler] Catch expected ValueError (derrabus)

nicolas-grekas · nicolas-grekas · commit 5d7b7e96166e · 2020-05-23T09:22:08.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [DomCrawler] Catch expected ValueError | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | #36872 | License | MIT | Doc PR | N/A This is #36906 ported to the 4.4 branch. Commits ------- 32691e5 [DomCrawler] Catch expected ValueError.
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -1204,11 +1204,11 @@ private function convertToHtmlEntities(string $htmlContent, string $charset = 'U
 
         try {
             return mb_convert_encoding($htmlContent, 'HTML-ENTITIES', $charset);
-        } catch (\Exception $e) {
+        } catch (\Exception | \ValueError $e) {
             try {
                 $htmlContent = iconv($charset, 'UTF-8', $htmlContent);
                 $htmlContent = mb_convert_encoding($htmlContent, 'HTML-ENTITIES', 'UTF-8');
-            } catch (\Exception $e) {
+            } catch (\Exception | \ValueError $e) {
             }
 
             return $htmlContent;
