symfony · tgalopin · tgalopin · tgalopin · Dec 16, 2021 · carsonbot
diff --git a/src/Symfony/Component/HtmlSanitizer/HtmlSanitizer.php b/src/Symfony/Component/HtmlSanitizer/HtmlSanitizer.php
+    {
+        $this->config = clone $config;
+        $this->maxInputLength = $maxInputLength;
+        $this->parser = $parser ?: new MastermindsParser();
-        $this->parser = $parser ?: new MastermindsParser();
+        $this->parser = $parser ?? new MastermindsParser();
diff --git a/src/Symfony/Component/HtmlSanitizer/HtmlSanitizer.php b/src/Symfony/Component/HtmlSanitizer/HtmlSanitizer.php
+        if (!isset($this->domVisitors[$context])) {
+            $this->domVisitors[$context] = $this->createDomVisitorForContext($context);
+        }
-        if (!isset($this->domVisitors[$context])) {
-            $this->domVisitors[$context] = $this->createDomVisitorForContext($context);
-        }
+        $this->domVisitors[$context] ??= $this->createDomVisitorForContext($context);
diff --git a/src/Symfony/Component/HtmlSanitizer/HtmlSanitizer.php b/src/Symfony/Component/HtmlSanitizer/HtmlSanitizer.php
+
+        try {
+            $parsed = $this->parser->parse($input);
+        } catch (\Exception) {
diff --git a/src/Symfony/Component/HtmlSanitizer/HtmlSanitizerConfig.php b/src/Symfony/Component/HtmlSanitizer/HtmlSanitizerConfig.php
+        if (isset($self->blockedElements[$element])) {
+            unset($self->blockedElements[$element]);
+        }
-        if (isset($self->blockedElements[$element])) {
-            unset($self->blockedElements[$element]);
-        }
+        unset($self->blockedElements[$element]);
diff --git a/src/Symfony/Component/HtmlSanitizer/HtmlSanitizerConfig.php b/src/Symfony/Component/HtmlSanitizer/HtmlSanitizerConfig.php
+ */
+class HtmlSanitizerConfig
+{
+    // Elements that should be removed but their children should be retained
diff --git a/src/Symfony/Component/HtmlSanitizer/HtmlSanitizerConfig.php b/src/Symfony/Component/HtmlSanitizer/HtmlSanitizerConfig.php
+class HtmlSanitizerConfig
+{
+    // Elements that should be removed but their children should be retained
+    private array $blockedElements = [];
diff --git a/src/Symfony/Component/HtmlSanitizer/Parser/Exception/ParsingFailedException.php b/src/Symfony/Component/HtmlSanitizer/Parser/Exception/ParsingFailedException.php
+
+    public function __construct(ParserInterface $parser, \Throwable $previous = null)
+    {
+        parent::__construct('HTML parsing failed using parser '.\get_class($parser), 0, $previous);
-        parent::__construct('HTML parsing failed using parser '.\get_class($parser), 0, $previous);
+        parent::__construct('HTML parsing failed using parser '.\get_debug_type($parser), 0, $previous);
diff --git a/src/Symfony/Component/HtmlSanitizer/composer.json b/src/Symfony/Component/HtmlSanitizer/composer.json
+        "league/uri": "^6.5",
+        "masterminds/html5": "^2.4",
+        "psr/log": "^1.0|^2.0|^3.0",
+        "symfony/string": "^5.0|^6.0"
-        "symfony/string": "^5.0|^6.0"
+        "symfony/string": "^5.4|^6.0"
diff --git a/src/Symfony/Component/HtmlSanitizer/Visitor/Node/TextNode.php b/src/Symfony/Component/HtmlSanitizer/Visitor/Node/TextNode.php
+    private NodeInterface $parentNode;
+    private string $text;
+
+    public function __construct(NodeInterface $parentNode, string $text)
+    {
+        $this->parentNode = $parentNode;
+        $this->text = $text;
+    }
-    private NodeInterface $parentNode;
-    private string $text;
-
-    public function __construct(NodeInterface $parentNode, string $text)
-    {
-        $this->parentNode = $parentNode;
-        $this->text = $text;
-    }
+    public function __construct(
+        private NodeInterface $parentNode,
+        private string $text
+    ) {
+    }
diff --git a/src/Symfony/Component/HtmlSanitizer/TextSanitizer/UrlSanitizer.php b/src/Symfony/Component/HtmlSanitizer/TextSanitizer/UrlSanitizer.php
+        try {
+            $parsed = parse($url);
+        } catch (Exception) {
+            return null;
+        }
+
+        return $parsed;
-        try {
-            $parsed = parse($url);
-        } catch (Exception) {
-            return null;
-        }
-
-        return $parsed;
+        try {
+            return parse($url);
+        } catch (Exception) {
+            return null;
+        }
diff --git a/src/Symfony/Component/HtmlSanitizer/Parser/MastermindsParser.php b/src/Symfony/Component/HtmlSanitizer/Parser/MastermindsParser.php
+ *
+ * @final
+ */
+class MastermindsParser implements ParserInterface
diff --git a/src/Symfony/Component/HtmlSanitizer/Visitor/DomVisitor.php b/src/Symfony/Component/HtmlSanitizer/Visitor/DomVisitor.php
+
+    private function visitNode(\DOMNode $domNode, Cursor $cursor)
+    {
+        $nodeName = u($domNode->nodeName)->lower()->toString();
diff --git a/src/Symfony/Component/HtmlSanitizer/Visitor/AttributeSanitizer/AttributeSanitizerInterface.php b/src/Symfony/Component/HtmlSanitizer/Visitor/AttributeSanitizer/AttributeSanitizerInterface.php
+
+interface AttributeSanitizerInterface
+{
+    public function getSupportedElements(): array;
diff --git a/src/Symfony/Component/HtmlSanitizer/TextSanitizer/UrlSanitizer.php b/src/Symfony/Component/HtmlSanitizer/TextSanitizer/UrlSanitizer.php
+
+use function League\Uri\build;
+use League\Uri\Exception;
+use function League\Uri\parse;
diff --git a/src/Symfony/Component/HtmlSanitizer/README.md b/src/Symfony/Component/HtmlSanitizer/README.md
@@ -0,0 +1,91 @@
+Example usage:
diff --git a/src/Symfony/Component/HtmlSanitizer/HtmlSanitizerConfig.php b/src/Symfony/Component/HtmlSanitizer/HtmlSanitizerConfig.php
+    // Should the URL in the sanitized document be transformed to HTTPS if they are using HTTP
+    private bool $forceHttpsUrls = false;
+
+    // Sanitizers that should be applied to specific attributes in addition to standard sanitation
diff --git a/src/Symfony/Component/HtmlSanitizer/HtmlSanitizerConfig.php b/src/Symfony/Component/HtmlSanitizer/HtmlSanitizerConfig.php
+    // Should the URL in the sanitized document be transformed to HTTPS if they are using HTTP
+    private bool $forceHttpsUrls = false;
+
+    // Sanitizers that should be applied to specific attributes in addition to standard sanitation
diff --git a/src/Symfony/Component/HtmlSanitizer/Parser/Exception/ParsingFailedException.php b/src/Symfony/Component/HtmlSanitizer/Parser/Exception/ParsingFailedException.php
+        $this->parser = $parser;
+    }
+
+    public function getParser(): ParserInterface
diff --git a/src/Symfony/Component/HtmlSanitizer/CHANGELOG.md b/src/Symfony/Component/HtmlSanitizer/CHANGELOG.md
+6.1.0
+-----
+
+ * added the component as experimental
- * added the component as experimental
+ * Add the component as experimental
diff --git a/src/Symfony/Component/HtmlSanitizer/Parser/MastermindsParser.php b/src/Symfony/Component/HtmlSanitizer/Parser/MastermindsParser.php
+ */
+class MastermindsParser implements ParserInterface
+{
+    public function parse(string $html): \DOMNode
diff --git a/src/Symfony/Component/HtmlSanitizer/Tests/HtmlSanitizerCustomTest.php b/src/Symfony/Component/HtmlSanitizer/Tests/HtmlSanitizerCustomTest.php
+use Symfony\Component\HtmlSanitizer\HtmlSanitizerConfig;
+use Symfony\Component\HtmlSanitizer\Visitor\AttributeSanitizer\AttributeSanitizerInterface;
+
+class HtmlSanitizerCustomTest extends TestCase
diff --git a/src/Symfony/Component/HtmlSanitizer/Tests/HtmlSanitizerConfigTest.php b/src/Symfony/Component/HtmlSanitizer/Tests/HtmlSanitizerConfigTest.php
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HtmlSanitizer\HtmlSanitizerConfig;
+
+class HtmlSanitizerConfigTest extends TestCase
diff --git a/src/Symfony/Component/HtmlSanitizer/Tests/HtmlSanitizerStandardTest.php b/src/Symfony/Component/HtmlSanitizer/Tests/HtmlSanitizerStandardTest.php
+use Symfony\Component\HtmlSanitizer\HtmlSanitizer;
+use Symfony\Component\HtmlSanitizer\HtmlSanitizerConfig;
+
+class HtmlSanitizerStandardTest extends TestCase
diff --git a/src/Symfony/Component/HtmlSanitizer/Visitor/DomVisitor.php b/src/Symfony/Component/HtmlSanitizer/Visitor/DomVisitor.php
+
+    private function visitNode(\DOMNode $domNode, Cursor $cursor)
+    {
+        $nodeName = u($domNode->nodeName)->lower()->toString();
diff --git a/src/Symfony/Component/HtmlSanitizer/Visitor/Model/Cursor.php b/src/Symfony/Component/HtmlSanitizer/Visitor/Model/Cursor.php
+ *
+ * @final
+ */
+class Cursor
diff --git a/src/Symfony/Component/HtmlSanitizer/Visitor/DomVisitor.php b/src/Symfony/Component/HtmlSanitizer/Visitor/DomVisitor.php
+use function Symfony\Component\String\u;
+
+/**
+ * The DomVisitor iterate over the parsed DOM tree and visit nodes using the NodeVisitor.
- * The DomVisitor iterate over the parsed DOM tree and visit nodes using the NodeVisitor.
+ * The DomVisitor iterates over the parsed DOM tree and visits nodes using the NodeVisitor.
diff --git a/src/Symfony/Component/HtmlSanitizer/Visitor/Node/NodeInterface.php b/src/Symfony/Component/HtmlSanitizer/Visitor/Node/NodeInterface.php
+ */
+interface NodeInterface
+{
+    public function addChild(self $node): void;
diff --git a/src/Symfony/Component/HtmlSanitizer/phpunit.xml.dist b/src/Symfony/Component/HtmlSanitizer/phpunit.xml.dist
+    </php>
+
+    <testsuites>
+        <testsuite name="Symfony String Component Test Suite">
	$this->parser = $parser ?: new MastermindsParser();
	$this->parser = $parser ?? new MastermindsParser();
	parent::__construct('HTML parsing failed using parser '.\get_class($parser), 0, $previous);
	parent::__construct('HTML parsing failed using parser '.\get_debug_type($parser), 0, $previous);
	* added the component as experimental
	* Add the component as experimental
	* The DomVisitor iterate over the parsed DOM tree and visit nodes using the NodeVisitor.
	* The DomVisitor iterates over the parsed DOM tree and visits nodes using the NodeVisitor.