From ff77273df60cbb4144d15c12948ce06e602b4126 Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Wed, 11 May 2022 16:16:46 +0200
Subject: [PATCH] [TASK] Raise lolli42/finediff:^1.0.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Brings a multibyte fix when dealing with word-based
diffs, which is our default usage.
composer req lolli42/finediff:^1.0.1
Resolves: #97611
Releases: main, 11.5, 10.4
Change-Id: I601842ed75917f9a6d438191273e602238d3edda
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/74606
Tested-by: core-ci <typo3@b13.com>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
---
composer.json | 2 +-
composer.lock | 14 +++++++-------
typo3/sysext/core/composer.json | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/composer.json b/composer.json
index 95dc66210d32..08b8c3ae1ada 100644
--- a/composer.json
+++ b/composer.json
@@ -57,7 +57,7 @@
"guzzlehttp/guzzle": "^7.3.0",
"guzzlehttp/promises": "^1.4.0",
"guzzlehttp/psr7": "^1.8.5 || ^2.1.2",
- "lolli42/finediff": "^1.0",
+ "lolli42/finediff": "^1.0.1",
"masterminds/html5": "^2.7.5",
"nikic/php-parser": "^4.13.2",
"phpdocumentor/reflection-docblock": "^5.2",
diff --git a/composer.lock b/composer.lock
index 69845544b874..bb312c837289 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": "225b029f1a0aa959d21df0fa4adc8cfe",
+ "content-hash": "aac55230e30ec3527d715e22ffe69c12",
"packages": [
{
"name": "bacon/bacon-qr-code",
@@ -1096,16 +1096,16 @@
},
{
"name": "lolli42/finediff",
- "version": "1.0.0",
+ "version": "1.0.1",
"source": {
"type": "git",
"url": "https://github.com/lolli42/FineDiff.git",
- "reference": "249e4965bb6b7efe4c198021f38d6b31d93c4152"
+ "reference": "72b57e1355c6bbe2f51921e6a3a5bb7441471a7a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/lolli42/FineDiff/zipball/249e4965bb6b7efe4c198021f38d6b31d93c4152",
- "reference": "249e4965bb6b7efe4c198021f38d6b31d93c4152",
+ "url": "https://api.github.com/repos/lolli42/FineDiff/zipball/72b57e1355c6bbe2f51921e6a3a5bb7441471a7a",
+ "reference": "72b57e1355c6bbe2f51921e6a3a5bb7441471a7a",
"shasum": ""
},
"require": {
@@ -1155,9 +1155,9 @@
],
"support": {
"issues": "https://github.com/lolli42/FineDiff/issues",
- "source": "https://github.com/lolli42/FineDiff/tree/1.0.0"
+ "source": "https://github.com/lolli42/FineDiff/tree/1.0.1"
},
- "time": "2021-10-23T16:02:24+00:00"
+ "time": "2022-05-11T13:15:52+00:00"
},
{
"name": "masterminds/html5",
diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json
index 5888228ad8fd..3291fff6ccde 100644
--- a/typo3/sysext/core/composer.json
+++ b/typo3/sysext/core/composer.json
@@ -39,7 +39,7 @@
"enshrined/svg-sanitize": "^0.15.4",
"guzzlehttp/guzzle": "^7.3.0",
"guzzlehttp/psr7": "^1.8.5 || ^2.1.2",
- "lolli42/finediff": "^1.0",
+ "lolli42/finediff": "^1.0.1",
"masterminds/html5": "^2.7.5",
"nikic/php-parser": "^4.13.2",
"psr/container": "^1.1 || ^2.0",
--
GitLab