Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit 5ab677ddf6f1 · 2023-07-27T09:02:19.000+02:00
* 6.4:
  More short closures + isset instead of null checks + etc.
diff --git a/Crawler.php b/Crawler.php
@@ -1084,7 +1084,7 @@ private function parseXhtml(string $htmlContent, string $charset = 'UTF-8'): \DO
      */
     private function convertToHtmlEntities(string $htmlContent, string $charset = 'UTF-8'): string
     {
-        set_error_handler(function () { throw new \Exception(); });
+        set_error_handler(static fn () => throw new \Exception());
 
         try {
             return mb_encode_numericentity($htmlContent, [0x80, 0x10FFFF, 0, 0x1FFFFF], $charset);

Original file line number	Diff line number	Diff line change
`@@ -1084,7 +1084,7 @@ private function parseXhtml(string $htmlContent, string $charset = 'UTF-8'): \DO`
`1084`	`1084`	`*/`
`1085`	`1085`	`private function convertToHtmlEntities(string $htmlContent, string $charset = 'UTF-8'): string`
`1086`	`1086`	`{`
`1087`		`- set_error_handler(function () { throw new \Exception(); });`
	`1087`	`+ set_error_handler(static fn () => throw new \Exception());`
`1088`	`1088`
`1089`	`1089`	`try {`
`1090`	`1090`	`return mb_encode_numericentity($htmlContent, [0x80, 0x10FFFF, 0, 0x1FFFFF], $charset);`