From 05d43206ca449acad7d47dc0c04a14ad817e3fa3 Mon Sep 17 00:00:00 2001 From: Harald Leithner Date: Wed, 20 Nov 2024 10:50:50 +0100 Subject: [PATCH 1/3] Switch voku/portable-utf8 to joomla-backport for php8.4 bc --- composer.json | 7 +++++- composer.lock | 64 ++++++++++++++++++++------------------------------- 2 files changed, 31 insertions(+), 40 deletions(-) diff --git a/composer.json b/composer.json index b0689ad9e7298..075601e710705 100644 --- a/composer.json +++ b/composer.json @@ -35,6 +35,11 @@ "type": "vcs", "url": "https://github.com/joomla-backports/php-tuf.git", "no-api": true + }, + { + "type": "vcs", + "url": "https://github.com/joomla-backports/portable-utf8.git", + "no-api": true } ], "autoload": { @@ -106,7 +111,7 @@ "web-token/jwt-library": "^3.4.6", "phpseclib/bcmath_compat": "^2.0.3", "jfcherng/php-diff": "^6.16.2", - "voku/portable-utf8": "^6.0.13", + "voku/portable-utf8": "dev-joomla-5.3 as 6.0.13", "php-tuf/php-tuf": "^1.0.1" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 8fdae5799e8f2..5f2d48a360059 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": "0f1f9d337d9ee7e6f717bf13b606a359", + "content-hash": "310c294f5e132265e9653b362c02226b", "packages": [ { "name": "algo26-matthias/idna-convert", @@ -6054,16 +6054,16 @@ }, { "name": "voku/portable-utf8", - "version": "6.0.13", + "version": "dev-joomla-5.3", "source": { "type": "git", - "url": "https://github.com/voku/portable-utf8.git", - "reference": "b8ce36bf26593e5c2e81b1850ef0ffb299d2043f" + "url": "https://github.com/joomla-backports/portable-utf8.git", + "reference": "eeb3d9e390411cd31af808caa7f7de337ea3a24c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/voku/portable-utf8/zipball/b8ce36bf26593e5c2e81b1850ef0ffb299d2043f", - "reference": "b8ce36bf26593e5c2e81b1850ef0ffb299d2043f", + "url": "https://api.github.com/repos/joomla-backports/portable-utf8/zipball/eeb3d9e390411cd31af808caa7f7de337ea3a24c", + "reference": "eeb3d9e390411cd31af808caa7f7de337ea3a24c", "shasum": "" }, "require": { @@ -6092,14 +6092,18 @@ }, "type": "library", "autoload": { + "psr-4": { + "voku\\": "src/voku/" + }, "files": [ "bootstrap.php" - ], + ] + }, + "autoload-dev": { "psr-4": { - "voku\\": "src/voku/" + "voku\\tests\\": "tests/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "(Apache-2.0 or GPL-2.0)" ], @@ -6120,40 +6124,14 @@ "description": "Portable UTF-8 library - performance optimized (unicode) string functions for php.", "homepage": "https://github.com/voku/portable-utf8", "keywords": [ - "UTF", "clean", "php", "unicode", + "utf", "utf-8", "utf8" ], - "support": { - "issues": "https://github.com/voku/portable-utf8/issues", - "source": "https://github.com/voku/portable-utf8/tree/6.0.13" - }, - "funding": [ - { - "url": "https://www.paypal.me/moelleken", - "type": "custom" - }, - { - "url": "https://github.com/voku", - "type": "github" - }, - { - "url": "https://opencollective.com/portable-utf8", - "type": "open_collective" - }, - { - "url": "https://www.patreon.com/voku", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/voku/portable-utf8", - "type": "tidelift" - } - ], - "time": "2023-03-08T08:35:38+00:00" + "time": "2024-11-20T09:42:04+00:00" }, { "name": "wamania/php-stemmer", @@ -10240,10 +10218,18 @@ "time": "2024-03-03T12:36:25+00:00" } ], - "aliases": [], + "aliases": [ + { + "package": "voku/portable-utf8", + "version": "dev-joomla-5.3", + "alias": "6.0.13", + "alias_normalized": "6.0.13.0" + } + ], "minimum-stability": "stable", "stability-flags": { - "tobscure/json-api": 20 + "tobscure/json-api": 20, + "voku/portable-utf8": 20 }, "prefer-stable": false, "prefer-lowest": false, From 45ce31f03298ab8dad40d166a46fc03056dfc135 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Mon, 3 Feb 2025 14:18:19 +0100 Subject: [PATCH 2/3] Update content hash in lock file --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 7ef48a17680f9..56c7982b72afd 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": "310c294f5e132265e9653b362c02226b", + "content-hash": "c041a1287987424de5bb64fc0d63881a", "packages": [ { "name": "algo26-matthias/idna-convert", @@ -10165,7 +10165,7 @@ "ext-gd": "*", "ext-dom": "*" }, - "platform-dev": [], + "platform-dev": {}, "platform-overrides": { "php": "8.1.0" }, From 12ad7fd2358b493af9e1fbf9b4599b7daf294981 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Mon, 3 Feb 2025 15:30:56 +0100 Subject: [PATCH 3/3] Update content hash again --- composer.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.lock b/composer.lock index 4d0662f3727d5..9e89564256bf1 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": "c041a1287987424de5bb64fc0d63881a", + "content-hash": "23f8e4d191f1f6b63d9fb5e6eac8119b", "packages": [ { "name": "algo26-matthias/idna-convert",