From 85342760218833030272d5136122ae30efb0cf69 Mon Sep 17 00:00:00 2001
From: Oliver Hader <oliver@typo3.org>
Date: Tue, 10 Aug 2021 22:00:35 +0200
Subject: [PATCH] Revert "[TASK] Declare core as replacement for
t3g/svg-sanitizer"
This reverts commit c35316f690306ba10c6013b8b3e4371ab244b81c.
Not defining replaced version of `t3g/svg-sanitizer` leads to
problems with `roave/security-advisories`. Overall it seems to
be better, to completely revert previous change.
Resolves: #94782
Reverts: #94719
Releases: master, 11.3, 10.4, 9.5
Change-Id: I43c2ea986ffec72bc0c8eb740a84daad33e9257f
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/70433
Tested-by: core-ci <typo3@b13.com>
Tested-by: Oliver Hader <oliver.hader@typo3.org>
Reviewed-by: Oliver Hader <oliver.hader@typo3.org>
---
composer.json | 3 +--
composer.lock | 2 +-
typo3/sysext/core/composer.json | 3 +--
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/composer.json b/composer.json
index 102e4a88c194..671fd269889c 100644
--- a/composer.json
+++ b/composer.json
@@ -188,8 +188,7 @@
"typo3/cms-t3editor": "self.version",
"typo3/cms-tstemplate": "self.version",
"typo3/cms-viewpage": "self.version",
- "typo3/cms-workspaces": "self.version",
- "t3g/svg-sanitizer": "*"
+ "typo3/cms-workspaces": "self.version"
},
"autoload": {
"psr-4": {
diff --git a/composer.lock b/composer.lock
index 2b2363d281ec..7c6307350e47 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": "642d3345779cb3c32f93967f26984507",
+ "content-hash": "1e0baecbfdf22928e416514c8e739dd6",
"packages": [
{
"name": "bacon/bacon-qr-code",
diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json
index f5b788b85db4..9980a40fb922 100644
--- a/typo3/sysext/core/composer.json
+++ b/typo3/sysext/core/composer.json
@@ -87,8 +87,7 @@
"replace": {
"typo3/cms-lang": "*",
"typo3/cms-saltedpasswords": "*",
- "typo3/cms-sv": "*",
- "t3g/svg-sanitizer": "*"
+ "typo3/cms-sv": "*"
},
"provide": {
"psr/http-factory-implementation": "1.0",
--
GitLab