From 3c357abdffa97347751ff74df567fc8d5cbd96ab Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 26 Jan 2025 13:45:48 +0100 Subject: [PATCH 1/6] Composer update joomla/database to 3.3.0 --- composer.json | 2 +- composer.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 47ef6159e15a..03dfb4a01952 100644 --- a/composer.json +++ b/composer.json @@ -56,7 +56,7 @@ "joomla/console": "^3.0.1", "joomla/crypt": "^3.0.1", "joomla/data": "^3.0.1", - "joomla/database": "^3.2", + "joomla/database": "^3.3", "joomla/di": "^3.0.1", "joomla/event": "^3.0.1", "joomla/filter": "^3.0.2", diff --git a/composer.lock b/composer.lock index cdb240820a8d..11b6e4b68596 100644 --- a/composer.lock +++ b/composer.lock @@ -1494,16 +1494,16 @@ }, { "name": "joomla/database", - "version": "3.2.1", + "version": "3.3.0", "source": { "type": "git", "url": "https://github.com/joomla-framework/database.git", - "reference": "3927dea8a08927d7d1dd4254bee6c6d66994a202" + "reference": "fabf8842a0fa6de54bf15ec9d4e45c78cd7721e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-framework/database/zipball/3927dea8a08927d7d1dd4254bee6c6d66994a202", - "reference": "3927dea8a08927d7d1dd4254bee6c6d66994a202", + "url": "https://api.github.com/repos/joomla-framework/database/zipball/fabf8842a0fa6de54bf15ec9d4e45c78cd7721e8", + "reference": "fabf8842a0fa6de54bf15ec9d4e45c78cd7721e8", "shasum": "" }, "require": { @@ -1561,7 +1561,7 @@ ], "support": { "issues": "https://github.com/joomla-framework/database/issues", - "source": "https://github.com/joomla-framework/database/tree/3.2.1" + "source": "https://github.com/joomla-framework/database/tree/3.3.0" }, "funding": [ { @@ -1573,7 +1573,7 @@ "type": "github" } ], - "time": "2024-08-19T13:09:59+00:00" + "time": "2025-01-08T18:06:33+00:00" }, { "name": "joomla/di", From 5e8061a8ab90d5a838bca9b3994748c593b99885 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 26 Jan 2025 14:12:36 +0100 Subject: [PATCH 2/6] Revert composer.json change --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 03dfb4a01952..47ef6159e15a 100644 --- a/composer.json +++ b/composer.json @@ -56,7 +56,7 @@ "joomla/console": "^3.0.1", "joomla/crypt": "^3.0.1", "joomla/data": "^3.0.1", - "joomla/database": "^3.3", + "joomla/database": "^3.2", "joomla/di": "^3.0.1", "joomla/event": "^3.0.1", "joomla/filter": "^3.0.2", From 52bef7be8100c21390add92605d36d5889232e7d Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 26 Jan 2025 14:31:46 +0100 Subject: [PATCH 3/6] Composer update joomla/database to 3.3.1 --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 11b6e4b68596..f85bb2dcfdc8 100644 --- a/composer.lock +++ b/composer.lock @@ -1494,16 +1494,16 @@ }, { "name": "joomla/database", - "version": "3.3.0", + "version": "3.3.1", "source": { "type": "git", "url": "https://github.com/joomla-framework/database.git", - "reference": "fabf8842a0fa6de54bf15ec9d4e45c78cd7721e8" + "reference": "d13a7504471b4730a8107e3566c6fe6d476706fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-framework/database/zipball/fabf8842a0fa6de54bf15ec9d4e45c78cd7721e8", - "reference": "fabf8842a0fa6de54bf15ec9d4e45c78cd7721e8", + "url": "https://api.github.com/repos/joomla-framework/database/zipball/d13a7504471b4730a8107e3566c6fe6d476706fc", + "reference": "d13a7504471b4730a8107e3566c6fe6d476706fc", "shasum": "" }, "require": { @@ -1561,7 +1561,7 @@ ], "support": { "issues": "https://github.com/joomla-framework/database/issues", - "source": "https://github.com/joomla-framework/database/tree/3.3.0" + "source": "https://github.com/joomla-framework/database/tree/3.3.1" }, "funding": [ { @@ -1573,7 +1573,7 @@ "type": "github" } ], - "time": "2025-01-08T18:06:33+00:00" + "time": "2025-01-26T13:22:09+00:00" }, { "name": "joomla/di", From ea62127c69b0ee8d0a0be119ccc8aa02551f2024 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 2 Feb 2025 14:42:28 +0100 Subject: [PATCH 4/6] Fix composer.json and content hash in lock --- composer.json | 2 +- composer.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 47ef6159e15a..03dfb4a01952 100644 --- a/composer.json +++ b/composer.json @@ -56,7 +56,7 @@ "joomla/console": "^3.0.1", "joomla/crypt": "^3.0.1", "joomla/data": "^3.0.1", - "joomla/database": "^3.2", + "joomla/database": "^3.3", "joomla/di": "^3.0.1", "joomla/event": "^3.0.1", "joomla/filter": "^3.0.2", diff --git a/composer.lock b/composer.lock index f85bb2dcfdc8..5f50d4e08935 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": "e239d33518fe4b1ce5f63da240447409", + "content-hash": "20df7b48d47113296c7ba47a3abadf73", "packages": [ { "name": "algo26-matthias/idna-convert", From a383c7dfa7bc9ca9e04fd3897c45e6d4ee24437c Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 2 Feb 2025 14:48:17 +0100 Subject: [PATCH 5/6] Fix content hash --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 4e6ce089ceab..d628228d9494 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": "20df7b48d47113296c7ba47a3abadf73", + "content-hash": "6c6f678ed8a808df55171f761d42b5f3", "packages": [ { "name": "algo26-matthias/idna-convert", @@ -10254,7 +10254,7 @@ "ext-gd": "*", "ext-dom": "*" }, - "platform-dev": [], + "platform-dev": {}, "platform-overrides": { "php": "8.1.0" }, From c614cfbe3227eb9b40663a01c78201d1f776c1e4 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Mon, 3 Feb 2025 12:00:14 +0100 Subject: [PATCH 6/6] Update content hash in lock file --- composer.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.lock b/composer.lock index 4cf486f6b1c9..111a2ed5afda 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": "6c6f678ed8a808df55171f761d42b5f3", + "content-hash": "3ffa895c21df7c80f7d28d175671f75c", "packages": [ { "name": "algo26-matthias/idna-convert",