WIP

tgalopin · tgalopin · commit f069b068cd55 · 2021-12-23T22:42:11.000+01:00
diff --git a/src/Symfony/Component/HtmlSanitizer/Parser/MastermindsParser.php b/src/Symfony/Component/HtmlSanitizer/Parser/MastermindsParser.php
@@ -20,14 +20,12 @@
  */
 final class MastermindsParser implements ParserInterface
 {
-    public function __construct(private ?HTML5 $parser = null)
+    public function __construct(private array $defaultOptions = [])
     {
     }
 
     public function parse(string $html): ?\DOMNode
     {
-        $this->parser ??= new HTML5();
-
-        return $this->parser->loadHTMLFragment($html);
+        return (new HTML5($this->defaultOptions))->loadHTMLFragment($html);
     }
 }
diff --git a/src/Symfony/Component/HtmlSanitizer/TextSanitizer/UrlSanitizer.php b/src/Symfony/Component/HtmlSanitizer/TextSanitizer/UrlSanitizer.php
@@ -102,7 +102,7 @@ public static function parse(string $url): ?array
 
     private static function isHostlessScheme(?string $scheme): bool
     {
-        return \in_array($scheme, ['data', 'mailto', 'tel', 'file', 'view-source', 'maps', 'chrome', 'blob'], true);
+        return \in_array($scheme, ['blob', 'chrome', 'data', 'file', 'geo', 'mailto', 'maps', 'tel', 'view-source'], true);
     }
 
     private static function isAllowedHost(?string $host, array $allowedHosts): bool

Original file line number	Diff line number	Diff line change
`@@ -20,14 +20,12 @@`
`20`	`20`	`*/`
`21`	`21`	`final class MastermindsParser implements ParserInterface`
`22`	`22`	`{`
`23`		`- public function __construct(private ?HTML5 $parser = null)`
	`23`	`+ public function __construct(private array $defaultOptions = [])`
`24`	`24`	`{`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public function parse(string $html): ?\DOMNode`
`28`	`28`	`{`
`29`		`- $this->parser ??= new HTML5();`
`30`		`-`
`31`		`- return $this->parser->loadHTMLFragment($html);`
	`29`	`+ return (new HTML5($this->defaultOptions))->loadHTMLFragment($html);`
`32`	`30`	`}`
`33`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public static function parse(string $url): ?array`
`102`	`102`
`103`	`103`	`private static function isHostlessScheme(?string $scheme): bool`
`104`	`104`	`{`
`105`		`- return \in_array($scheme, ['data', 'mailto', 'tel', 'file', 'view-source', 'maps', 'chrome', 'blob'], true);`
	`105`	`+ return \in_array($scheme, ['blob', 'chrome', 'data', 'file', 'geo', 'mailto', 'maps', 'tel', 'view-source'], true);`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`private static function isAllowedHost(?string $host, array $allowedHosts): bool`