From f8d767b411c4317b37435ceb13673c37edd1cee6 Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Mon, 9 Sep 2024 18:30:26 +0200
Subject: [PATCH] [TASK] Raise enshrined/svg-sanitize:^0.20.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This obsoletes one manual PHP 8.4 related patch.
> composer req enshrined/svg-sanitize:^0.20.0
> composer req enshrined/svg-sanitize:^0.20.0 -d typo3/sysext/core --no-update
Resolves: #104863
Related: #104604
Releases: main
Change-Id: I28b0ed578c76eeef227f59456c8dfc2b1980f6d0
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/85929
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: core-ci <typo3@b13.com>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
---
.../darylldoyle-svg-sanitizer-php-8.4.diff | 13 -------------
Build/patches/patches.json | 3 ---
composer.json | 2 +-
composer.lock | 18 +++++++++---------
typo3/sysext/core/composer.json | 2 +-
5 files changed, 11 insertions(+), 27 deletions(-)
delete mode 100644 Build/patches/darylldoyle-svg-sanitizer-php-8.4.diff
diff --git a/Build/patches/darylldoyle-svg-sanitizer-php-8.4.diff b/Build/patches/darylldoyle-svg-sanitizer-php-8.4.diff
deleted file mode 100644
index a4c0cef6770c..000000000000
--- a/Build/patches/darylldoyle-svg-sanitizer-php-8.4.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/Exceptions/NestingException.php b/src/Exceptions/NestingException.php
-index 474b987..7acc842 100644
---- a/src/Exceptions/NestingException.php
-+++ b/src/Exceptions/NestingException.php
-@@ -18,7 +18,7 @@ class NestingException extends \Exception
- * @param Exception|null $previous
- * @param \DOMElement|null $element
- */
-- public function __construct($message = "", $code = 0, Exception $previous = null, \DOMElement $element = null)
-+ public function __construct($message = "", $code = 0, ?Exception $previous = null, ?\DOMElement $element = null)
- {
- $this->element = $element;
- parent::__construct($message, $code, $previous);
diff --git a/Build/patches/patches.json b/Build/patches/patches.json
index 0fb273ef95f1..0b9a3d85d706 100644
--- a/Build/patches/patches.json
+++ b/Build/patches/patches.json
@@ -2,9 +2,6 @@
"patches": {
"firebase/php-jwt": {
"firebase/php-jwt PHP 8.4": "Build/patches/firebase-php-jwt-572-php-8.4.diff"
- },
- "enshrined/svg-sanitize": {
- "darylldoyle/svg-sanitize PHP 8.4": "Build/patches/darylldoyle-svg-sanitizer-php-8.4.diff"
}
}
}
diff --git a/composer.json b/composer.json
index cce40dbf5cbd..62dd12e9cd4c 100644
--- a/composer.json
+++ b/composer.json
@@ -61,7 +61,7 @@
"doctrine/instantiator": "^1.5 || ^2.0",
"doctrine/lexer": "^3.0",
"egulias/email-validator": "^4.0",
- "enshrined/svg-sanitize": "^0.19.0",
+ "enshrined/svg-sanitize": "^0.20.0",
"firebase/php-jwt": "^6.10.1",
"guzzlehttp/guzzle": "^7.9.2",
"guzzlehttp/promises": "^2.0.3",
diff --git a/composer.lock b/composer.lock
index 74dadc8834f5..bc1c63861102 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": "319d3c34b42cf544c8ccd6794ece6d8f",
+ "content-hash": "67d99b99ea287aab5cd6becd58ba97d6",
"packages": [
{
"name": "bacon/bacon-qr-code",
@@ -707,25 +707,25 @@
},
{
"name": "enshrined/svg-sanitize",
- "version": "0.19.0",
+ "version": "0.20.0",
"source": {
"type": "git",
"url": "https://github.com/darylldoyle/svg-sanitizer.git",
- "reference": "e95cd17be68e45f523cbfb0fe50cdd891b0cf20e"
+ "reference": "068d9fcf912c88a0471d101d95a2caa87c50aee7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/darylldoyle/svg-sanitizer/zipball/e95cd17be68e45f523cbfb0fe50cdd891b0cf20e",
- "reference": "e95cd17be68e45f523cbfb0fe50cdd891b0cf20e",
+ "url": "https://api.github.com/repos/darylldoyle/svg-sanitizer/zipball/068d9fcf912c88a0471d101d95a2caa87c50aee7",
+ "reference": "068d9fcf912c88a0471d101d95a2caa87c50aee7",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-libxml": "*",
- "php": "^5.6 || ^7.0 || ^8.0"
+ "php": "^7.1 || ^8.0"
},
"require-dev": {
- "phpunit/phpunit": "^5.7 || ^6.5 || ^8.5"
+ "phpunit/phpunit": "^6.5 || ^8.5"
},
"type": "library",
"autoload": {
@@ -746,9 +746,9 @@
"description": "An SVG sanitizer for PHP",
"support": {
"issues": "https://github.com/darylldoyle/svg-sanitizer/issues",
- "source": "https://github.com/darylldoyle/svg-sanitizer/tree/0.19.0"
+ "source": "https://github.com/darylldoyle/svg-sanitizer/tree/0.20.0"
},
- "time": "2024-06-18T10:27:15+00:00"
+ "time": "2024-09-05T10:18:12+00:00"
},
{
"name": "firebase/php-jwt",
diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json
index 5c8b34d88da4..9a1890327b67 100644
--- a/typo3/sysext/core/composer.json
+++ b/typo3/sysext/core/composer.json
@@ -38,7 +38,7 @@
"doctrine/event-manager": "^2.0",
"doctrine/lexer": "^3.0",
"egulias/email-validator": "^4.0",
- "enshrined/svg-sanitize": "^0.19.0",
+ "enshrined/svg-sanitize": "^0.20.0",
"firebase/php-jwt": "^6.10.1",
"guzzlehttp/guzzle": "^7.9.2",
"guzzlehttp/psr7": "^2.7.0",
--
GitLab