From 8a2fcd3f3ada853a6d26db740b5619767a7d9d8c Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Fri, 12 Apr 2024 12:30:34 -0500 Subject: [PATCH] Vendor: Replace tgalopin/html-sanitizer-bundle with symfony/html-sanitizer --- composer.json | 2 +- composer.lock | 329 +++++++++++++++++----------- config/bundles.php | 1 - config/packages/html_sanitizer.yaml | 17 -- symfony.lock | 9 - 5 files changed, 203 insertions(+), 155 deletions(-) delete mode 100644 config/packages/html_sanitizer.yaml diff --git a/composer.json b/composer.json index 9e4dde78bb..281421028f 100755 --- a/composer.json +++ b/composer.json @@ -124,6 +124,7 @@ "symfony/flex": "^2.4", "symfony/form": "6.4.*", "symfony/framework-bundle": "6.4.*", + "symfony/html-sanitizer": "6.4.*", "symfony/http-client": "6.4.*", "symfony/intl": "6.4.*", "symfony/mailer": "6.4.*", @@ -149,7 +150,6 @@ "symfony/yaml": "6.4.*", "symfonycasts/reset-password-bundle": "^1.8", "szymach/c-pchart": "^3.0", - "tgalopin/html-sanitizer-bundle": "^1.3", "twig/cssinliner-extra": "^3.3", "twig/extra-bundle": "^3.0", "twig/inky-extra": "^3.3", diff --git a/composer.lock b/composer.lock index 14b5f1c2c3..5eaef1d41b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "fb35d4e651e88b5caedf35cf5594124f", + "content-hash": "8be93b7ac9882d05daa1f10526d5a3b1", "packages": [ { "name": "a2lix/auto-form-bundle", @@ -5471,45 +5471,45 @@ "time": "2023-04-16T18:19:15+00:00" }, { - "name": "league/uri-parser", - "version": "1.4.1", + "name": "league/uri", + "version": "7.4.1", "source": { "type": "git", - "url": "https://github.com/thephpleague/uri-parser.git", - "reference": "671548427e4c932352d9b9279fdfa345bf63fa00" + "url": "https://github.com/thephpleague/uri.git", + "reference": "bedb6e55eff0c933668addaa7efa1e1f2c417cc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/uri-parser/zipball/671548427e4c932352d9b9279fdfa345bf63fa00", - "reference": "671548427e4c932352d9b9279fdfa345bf63fa00", + "url": "https://api.github.com/repos/thephpleague/uri/zipball/bedb6e55eff0c933668addaa7efa1e1f2c417cc4", + "reference": "bedb6e55eff0c933668addaa7efa1e1f2c417cc4", "shasum": "" }, "require": { - "php": ">=7.0.0" + "league/uri-interfaces": "^7.3", + "php": "^8.1" }, - "require-dev": { - "friendsofphp/php-cs-fixer": "^2.0", - "phpstan/phpstan": "^0.9.2", - "phpstan/phpstan-phpunit": "^0.9.4", - "phpstan/phpstan-strict-rules": "^0.9.0", - "phpunit/phpunit": "^6.0" + "conflict": { + "league/uri-schemes": "^1.0" }, "suggest": { - "ext-intl": "Allow parsing RFC3987 compliant hosts", - "league/uri-schemes": "Allow validating and normalizing URI parsing results" + "ext-bcmath": "to improve IPV4 host parsing", + "ext-fileinfo": "to create Data URI from file contennts", + "ext-gmp": "to improve IPV4 host parsing", + "ext-intl": "to handle IDN host with the best performance", + "jeremykendall/php-domain-parser": "to resolve Public Suffix and Top Level Domain", + "league/uri-components": "Needed to easily manipulate URI objects components", + "php-64bit": "to improve IPV4 host parsing", + "symfony/polyfill-intl-idn": "to handle IDN host via the Symfony polyfill if ext-intl is not present" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.x-dev" + "dev-master": "7.x-dev" } }, "autoload": { - "files": [ - "src/functions_include.php" - ], "psr-4": { - "League\\Uri\\": "src" + "League\\Uri\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -5523,22 +5523,126 @@ "homepage": "https://nyamsprod.com" } ], - "description": "userland URI parser RFC 3986 compliant", - "homepage": "https://github.com/thephpleague/uri-parser", + "description": "URI manipulation library", + "homepage": "https://uri.thephpleague.com", "keywords": [ + "data-uri", + "file-uri", + "ftp", + "hostname", + "http", + "https", + "middleware", + "parse_str", "parse_url", - "parser", + "psr-7", + "query-string", + "querystring", "rfc3986", "rfc3987", + "rfc6570", "uri", - "url" + "uri-template", + "url", + "ws" ], "support": { - "issues": "https://github.com/thephpleague/uri-parser/issues", - "source": "https://github.com/thephpleague/uri-parser/tree/master" + "docs": "https://uri.thephpleague.com", + "forum": "https://thephpleague.slack.com", + "issues": "https://github.com/thephpleague/uri-src/issues", + "source": "https://github.com/thephpleague/uri/tree/7.4.1" }, - "abandoned": true, - "time": "2018-11-22T07:55:51+00:00" + "funding": [ + { + "url": "https://github.com/sponsors/nyamsprod", + "type": "github" + } + ], + "time": "2024-03-23T07:42:40+00:00" + }, + { + "name": "league/uri-interfaces", + "version": "7.4.1", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/uri-interfaces.git", + "reference": "8d43ef5c841032c87e2de015972c06f3865ef718" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/8d43ef5c841032c87e2de015972c06f3865ef718", + "reference": "8d43ef5c841032c87e2de015972c06f3865ef718", + "shasum": "" + }, + "require": { + "ext-filter": "*", + "php": "^8.1", + "psr/http-factory": "^1", + "psr/http-message": "^1.1 || ^2.0" + }, + "suggest": { + "ext-bcmath": "to improve IPV4 host parsing", + "ext-gmp": "to improve IPV4 host parsing", + "ext-intl": "to handle IDN host with the best performance", + "php-64bit": "to improve IPV4 host parsing", + "symfony/polyfill-intl-idn": "to handle IDN host via the Symfony polyfill if ext-intl is not present" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "7.x-dev" + } + }, + "autoload": { + "psr-4": { + "League\\Uri\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ignace Nyamagana Butera", + "email": "nyamsprod@gmail.com", + "homepage": "https://nyamsprod.com" + } + ], + "description": "Common interfaces and classes for URI representation and interaction", + "homepage": "https://uri.thephpleague.com", + "keywords": [ + "data-uri", + "file-uri", + "ftp", + "hostname", + "http", + "https", + "parse_str", + "parse_url", + "psr-7", + "query-string", + "querystring", + "rfc3986", + "rfc3987", + "rfc6570", + "uri", + "url", + "ws" + ], + "support": { + "docs": "https://uri.thephpleague.com", + "forum": "https://thephpleague.slack.com", + "issues": "https://github.com/thephpleague/uri-src/issues", + "source": "https://github.com/thephpleague/uri-interfaces/tree/7.4.1" + }, + "funding": [ + { + "url": "https://github.com/sponsors/nyamsprod", + "type": "github" + } + ], + "time": "2024-03-23T07:42:40+00:00" }, { "name": "lexik/jwt-authentication-bundle", @@ -10580,6 +10684,75 @@ ], "time": "2024-03-23T16:06:09+00:00" }, + { + "name": "symfony/html-sanitizer", + "version": "v6.4.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/html-sanitizer.git", + "reference": "83e1dc8b49345e078cfa21bd4c563dfa99c5ed63" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/html-sanitizer/zipball/83e1dc8b49345e078cfa21bd4c563dfa99c5ed63", + "reference": "83e1dc8b49345e078cfa21bd4c563dfa99c5ed63", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "league/uri": "^6.5|^7.0", + "masterminds/html5": "^2.7.2", + "php": ">=8.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\HtmlSanitizer\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Titouan Galopin", + "email": "galopintitouan@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides an object-oriented API to sanitize untrusted HTML input for safe insertion into a document's DOM.", + "homepage": "https://symfony.com", + "keywords": [ + "Purifier", + "html", + "sanitizer" + ], + "support": { + "source": "https://github.com/symfony/html-sanitizer/tree/v6.4.4" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-02-13T16:25:19+00:00" + }, { "name": "symfony/http-client", "version": "v6.4.6", @@ -14519,104 +14692,6 @@ }, "time": "2023-05-27T11:12:02+00:00" }, - { - "name": "tgalopin/html-sanitizer", - "version": "1.5.0", - "source": { - "type": "git", - "url": "https://github.com/tgalopin/html-sanitizer.git", - "reference": "5d02dcb6f2ea4f505731eac440798caa1b3b0913" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/tgalopin/html-sanitizer/zipball/5d02dcb6f2ea4f505731eac440798caa1b3b0913", - "reference": "5d02dcb6f2ea4f505731eac440798caa1b3b0913", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "league/uri-parser": "^1.4.1", - "masterminds/html5": "^2.4", - "php": ">=7.1", - "psr/log": "^1.0|^2.0|^3.0" - }, - "require-dev": { - "phpunit/phpunit": "^7.4", - "symfony/var-dumper": "^4.1" - }, - "type": "library", - "autoload": { - "psr-4": { - "HtmlSanitizer\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Titouan Galopin", - "email": "galopintitouan@gmail.com" - } - ], - "description": "Sanitize untrustworthy HTML user input", - "support": { - "issues": "https://github.com/tgalopin/html-sanitizer/issues", - "source": "https://github.com/tgalopin/html-sanitizer/tree/1.5.0" - }, - "abandoned": "symfony/html-sanitizer", - "time": "2021-09-14T08:27:50+00:00" - }, - { - "name": "tgalopin/html-sanitizer-bundle", - "version": "1.4.0", - "source": { - "type": "git", - "url": "https://github.com/tgalopin/html-sanitizer-bundle.git", - "reference": "d5a59d214c6e8eeebd67c103288e3659027144a7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/tgalopin/html-sanitizer-bundle/zipball/d5a59d214c6e8eeebd67c103288e3659027144a7", - "reference": "d5a59d214c6e8eeebd67c103288e3659027144a7", - "shasum": "" - }, - "require": { - "php": ">=7.1", - "symfony/framework-bundle": "^3.4|^4.0|^5.0|^6.0", - "tgalopin/html-sanitizer": "^1.1" - }, - "require-dev": { - "phpunit/phpunit": "^7.4", - "symfony/form": "^4.1|^5.0|^6.0", - "symfony/twig-bundle": "^4.1|^5.0|^6.0", - "symfony/var-dumper": "^4.1|^5.0|^6.0" - }, - "type": "symfony-bundle", - "autoload": { - "psr-4": { - "HtmlSanitizer\\Bundle\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Titouan Galopin", - "email": "galopintitouan@gmail.com" - } - ], - "description": "Symfony Bundle for https://github.com/tgalopin/html-sanitizer", - "support": { - "issues": "https://github.com/tgalopin/html-sanitizer-bundle/issues", - "source": "https://github.com/tgalopin/html-sanitizer-bundle/tree/1.4.0" - }, - "abandoned": "symfony/html-sanitizer", - "time": "2021-11-25T21:37:14+00:00" - }, { "name": "tijsverkoyen/css-to-inline-styles", "version": "v2.2.7", diff --git a/config/bundles.php b/config/bundles.php index 240a4e5763..88c5a4b90c 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -20,7 +20,6 @@ return [ A2lix\AutoFormBundle\A2lixAutoFormBundle::class => ['all' => true], A2lix\TranslationFormBundle\A2lixTranslationFormBundle::class => ['all' => true], Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true], - HtmlSanitizer\Bundle\HtmlSanitizerBundle::class => ['all' => true], Vich\UploaderBundle\VichUploaderBundle::class => ['all' => true], Cocur\Slugify\Bridge\Symfony\CocurSlugifyBundle::class => ['all' => true], KnpU\OAuth2ClientBundle\KnpUOAuth2ClientBundle::class => ['all' => true], diff --git a/config/packages/html_sanitizer.yaml b/config/packages/html_sanitizer.yaml deleted file mode 100644 index a5be19251a..0000000000 --- a/config/packages/html_sanitizer.yaml +++ /dev/null @@ -1,17 +0,0 @@ -html_sanitizer: - default_sanitizer: 'default' - sanitizers: - default: - # Read https://github.com/tgalopin/html-sanitizer/blob/master/docs/1-getting-started.md#extensions - # to learn more about which extensions you would like to enable. - extensions: - - 'basic' - # - 'list' - # - 'table' - # - 'image' - # - 'code' - # - 'iframe' - # - 'extra' - - # Read https://github.com/tgalopin/html-sanitizer/blob/master/docs/3-configuration-reference.md - # to discover all the available options for each extension. diff --git a/symfony.lock b/symfony.lock index 5ca47ebaf6..cb338b452c 100644 --- a/symfony.lock +++ b/symfony.lock @@ -486,15 +486,6 @@ "config/packages/reset_password.yaml" ] }, - "tgalopin/html-sanitizer-bundle": { - "version": "1.4", - "recipe": { - "repo": "github.com/symfony/recipes-contrib", - "branch": "main", - "version": "1.0", - "ref": "95b935177db9abb65356fe19e57fe5abd908b5b8" - } - }, "theofidry/alice-data-fixtures": { "version": "1.6", "recipe": {