From 1de332bf968c6c9a1aeeadf41a64bbe35ba9f75a Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 2 Feb 2025 11:43:20 +0100 Subject: [PATCH 1/7] Update and rename debugbar - composer remove maximebf/debugbar - composer require php-debugbar/php-debugbar --- composer.json | 4 +- composer.lock | 142 +++++++++++++++++++++++++------------------------- 2 files changed, 74 insertions(+), 72 deletions(-) diff --git a/composer.json b/composer.json index 2f2b3b63b0677..341eb02e5c567 100644 --- a/composer.json +++ b/composer.json @@ -90,7 +90,6 @@ "symfony/yaml": "^6.4.11", "typo3/phar-stream-wrapper": "^3.1.7", "wamania/php-stemmer": "^4.0.0", - "maximebf/debugbar": "^1.23.0", "tobscure/json-api": "dev-joomla-backports", "willdurand/negotiation": "^3.1.0", "ext-json": "*", @@ -107,7 +106,8 @@ "phpseclib/bcmath_compat": "^2.0.3", "jfcherng/php-diff": "^6.16.2", "voku/portable-utf8": "^6.0.13", - "php-tuf/php-tuf": "^1.0.1" + "php-tuf/php-tuf": "^1.0.1", + "php-debugbar/php-debugbar": "^2.1" }, "require-dev": { "phpunit/phpunit": "^9.6.21", diff --git a/composer.lock b/composer.lock index afaf5b77978db..42b7ee737efb0 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": "68cb46ab32a1db1fe2152c1c756e2568", + "content-hash": "31a60ae47059baa1c3d30957e9bd41f8", "packages": [ { "name": "algo26-matthias/idna-convert", @@ -2862,74 +2862,6 @@ ], "time": "2023-01-02T13:28:00+00:00" }, - { - "name": "maximebf/debugbar", - "version": "v1.23.0", - "source": { - "type": "git", - "url": "https://github.com/maximebf/php-debugbar.git", - "reference": "0143b7c17daad5336ebd406c279333c84723cc41" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/0143b7c17daad5336ebd406c279333c84723cc41", - "reference": "0143b7c17daad5336ebd406c279333c84723cc41", - "shasum": "" - }, - "require": { - "php": "^7.2|^8", - "psr/log": "^1|^2|^3", - "symfony/var-dumper": "^4|^5|^6|^7" - }, - "require-dev": { - "dbrekelmans/bdi": "^1", - "phpunit/phpunit": "^8|^9", - "symfony/panther": "^1|^2.1", - "twig/twig": "^1.38|^2.7|^3.0" - }, - "suggest": { - "kriswallsmith/assetic": "The best way to manage assets", - "monolog/monolog": "Log using Monolog", - "predis/predis": "Redis storage" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.23-dev" - } - }, - "autoload": { - "psr-4": { - "DebugBar\\": "src/DebugBar/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Maxime Bouroumeau-Fuseau", - "email": "maxime.bouroumeau@gmail.com", - "homepage": "http://maximebf.com" - }, - { - "name": "Barry vd. Heuvel", - "email": "barryvdh@gmail.com" - } - ], - "description": "Debug bar in the browser for php application", - "homepage": "https://github.com/maximebf/php-debugbar", - "keywords": [ - "debug", - "debugbar" - ], - "support": { - "issues": "https://github.com/maximebf/php-debugbar/issues", - "source": "https://github.com/maximebf/php-debugbar/tree/v1.23.0" - }, - "time": "2024-09-10T17:28:47+00:00" - }, { "name": "paragonie/constant_time_encoding", "version": "v2.7.0", @@ -3083,6 +3015,76 @@ }, "time": "2024-04-22T22:05:04+00:00" }, + { + "name": "php-debugbar/php-debugbar", + "version": "v2.1.0", + "source": { + "type": "git", + "url": "https://github.com/php-debugbar/php-debugbar.git", + "reference": "35e7209b9f77e27ee12edb2203d0f8116080ec95" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-debugbar/php-debugbar/zipball/35e7209b9f77e27ee12edb2203d0f8116080ec95", + "reference": "35e7209b9f77e27ee12edb2203d0f8116080ec95", + "shasum": "" + }, + "require": { + "php": "^8", + "psr/log": "^1|^2|^3", + "symfony/var-dumper": "^4|^5|^6|^7" + }, + "require-dev": { + "dbrekelmans/bdi": "^1", + "phpunit/phpunit": "^8|^9", + "symfony/panther": "^1|^2.1", + "twig/twig": "^1.38|^2.7|^3.0" + }, + "suggest": { + "kriswallsmith/assetic": "The best way to manage assets", + "monolog/monolog": "Log using Monolog", + "predis/predis": "Redis storage" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "psr-4": { + "DebugBar\\": "src/DebugBar/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Maxime Bouroumeau-Fuseau", + "email": "maxime.bouroumeau@gmail.com", + "homepage": "http://maximebf.com" + }, + { + "name": "Barry vd. Heuvel", + "email": "barryvdh@gmail.com" + } + ], + "description": "Debug bar in the browser for php application", + "homepage": "https://github.com/php-debugbar/php-debugbar", + "keywords": [ + "debug", + "debug bar", + "debugbar", + "dev" + ], + "support": { + "issues": "https://github.com/php-debugbar/php-debugbar/issues", + "source": "https://github.com/php-debugbar/php-debugbar/tree/v2.1.0" + }, + "time": "2025-02-01T16:26:14+00:00" + }, { "name": "php-tuf/php-tuf", "version": "1.0.1", @@ -10254,7 +10256,7 @@ "ext-gd": "*", "ext-dom": "*" }, - "platform-dev": [], + "platform-dev": {}, "platform-overrides": { "php": "8.1.0" }, From bffc8229d82a9719512926d30acdb56f29f968c8 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 2 Feb 2025 12:04:14 +0100 Subject: [PATCH 2/7] Adapt media build to changed package name --- build/build-modules-js/init/cleanup-media.mjs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/build-modules-js/init/cleanup-media.mjs b/build/build-modules-js/init/cleanup-media.mjs index cf30316d100b7..5c7f5a81428d6 100644 --- a/build/build-modules-js/init/cleanup-media.mjs +++ b/build/build-modules-js/init/cleanup-media.mjs @@ -24,7 +24,7 @@ export const cleanVendors = async () => { // eslint-disable-next-line no-console console.log('Cleanup the Vendor '); - const mediaFolder = await stat(join(RootPath, 'libraries/vendor/maximebf/debugbar/src/DebugBar/Resources')); + const mediaFolder = await stat(join(RootPath, 'libraries/vendor/php-debugbar/php-debugbar/src/DebugBar/Resources')); if (await mediaFolder.isDirectory()) { // Remove the vendor folder @@ -36,7 +36,7 @@ export const cleanVendors = async () => { await mkdir(join(RootPath, 'media/vendor/debugbar'), { recursive: true, mode: 0o755 }); // Copy some assets from a PHP package - await copy(join(RootPath, 'libraries/vendor/maximebf/debugbar/src/DebugBar/Resources'), join(RootPath, 'media/vendor/debugbar'), { preserveTimestamps: true }); + await copy(join(RootPath, 'libraries/vendor/php-debugbar/php-debugbar/src/DebugBar/Resources'), join(RootPath, 'media/vendor/debugbar'), { preserveTimestamps: true }); await remove(join(RootPath, 'media/vendor/debugbar/vendor/font-awesome')); await remove(join(RootPath, 'media/vendor/debugbar/vendor/jquery')); } else { From dc8711cab0675eaf7ef1000deb6b5974064190e9 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 2 Feb 2025 12:31:04 +0100 Subject: [PATCH 3/7] Remove obsolete clean up of debugbar dev artifacts --- build/build.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/build/build.php b/build/build.php index 4a8e7c67b5750..84d485d938b08 100644 --- a/build/build.php +++ b/build/build.php @@ -149,20 +149,11 @@ function clean_checkout(string $dir) system('rm -rf libraries/vendor/joomla/*/Tests'); system('rm -rf libraries/vendor/joomla/*/ruleset.xml'); - // maximebf/debugbar - system('rm -f libraries/vendor/maximebf/debugbar/chromedriver'); - // testing sampledata system('rm -rf plugins/sampledata/testing'); system('rm -rf images/sampledata/parks'); system('rm -rf images/sampledata/fruitshop'); - // maximebf/debugbar - system('rm -rf libraries/vendor/maximebf/debugbar/build'); - system('rm -rf libraries/vendor/maximebf/debugbar/demo'); - system('rm -rf libraries/vendor/maximebf/debugbar/docs'); - system('rm -rf libraries/vendor/maximebf/debugbar/tests'); - // paragonie/sodium_compat system('rm -rf libraries/vendor/paragonie/sodium_compat/build-phar.sh'); From 894b288c530dee2f0348baf18156880b809d6e5c Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 2 Feb 2025 12:31:22 +0100 Subject: [PATCH 4/7] Add deleted files and folders to script.php --- administrator/components/com_admin/script.php | 106 +++++++++++++++++- 1 file changed, 105 insertions(+), 1 deletion(-) diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index 830b89bc87fdb..8a844d6c0049c 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -2368,6 +2368,84 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/media/system/css/system-site-offline_rtl.min.css', '/media/system/css/system-site-offline_rtl.min.css.gz', '/media/system/scss/system-site-offline_rtl.scss', + // From 5.3.0-alpha3 to 5.3.0-beta1 + '/libraries/vendor/maximebf/debugbar/LICENSE', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/CacheCacheCollector.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/DoctrineCollector.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/MonologCollector.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/NamespacedTwigProfileCollector.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/Propel2Collector.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/PropelCollector.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/SlimCollector.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/SwiftMailer/SwiftLogCollector.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/SwiftMailer/SwiftMailCollector.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/Symfony/SymfonyMailCollector.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/Twig/DebugTwigExtension.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/Twig/DumpTwigExtension.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/Twig/MeasureTwigExtension.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/Twig/MeasureTwigNode.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/Twig/MeasureTwigTokenParser.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/Twig/TimeableTwigExtensionProfiler.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/Twig/TraceableTwigEnvironment.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/Twig/TraceableTwigTemplate.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/Twig/TwigCollector.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/TwigProfileCollector.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/AggregatedCollector.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/AssetProvider.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/ConfigCollector.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/DataCollector.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/DataCollectorInterface.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/ExceptionsCollector.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/LocalizationCollector.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/MemoryCollector.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/MessagesAggregateInterface.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/MessagesCollector.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/ObjectCountCollector.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/PDO/PDOCollector.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/PDO/TraceablePDO.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/PDO/TraceablePDOStatement.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/PDO/TracedStatement.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/PhpInfoCollector.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/Renderable.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/RequestDataCollector.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/TimeDataCollector.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataFormatter/DataFormatter.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataFormatter/DataFormatterInterface.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataFormatter/DebugBarVarDumper.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataFormatter/HasDataFormatter.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataFormatter/HasXdebugLinks.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataFormatter/VarDumper/DebugBarHtmlDumper.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DebugBar.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DebugBarException.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/HttpDriverInterface.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/JavascriptRenderer.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/OpenHandler.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/PhpHttpDriver.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/RequestIdGenerator.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/RequestIdGeneratorInterface.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/debugbar.css', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/debugbar.js', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/openhandler.css', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/openhandler.js', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/css/font-awesome.min.css', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/highlightjs/highlight.pack.js', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/highlightjs/styles/github.css', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/jquery/dist/jquery.min.js', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets.css', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets.js', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets/mails/widget.css', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets/mails/widget.js', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets/sqlqueries/widget.css', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets/sqlqueries/widget.js', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets/templates/widget.css', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets/templates/widget.js', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/StandardDebugBar.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Storage/FileStorage.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Storage/MemcachedStorage.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Storage/pdo_storage_schema.sql', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Storage/PdoStorage.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Storage/RedisStorage.php', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Storage/StorageInterface.php', ]; $folders = [ @@ -2634,6 +2712,32 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) '/libraries/vendor/cweagans', // From 5.2.0-alpha2 to 5.2.0-alpha3 '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts', + // From 5.3.0-alpha3 to 5.3.0-beta1 + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Storage', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets/templates', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets/sqlqueries', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets/mails', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/jquery/dist', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/jquery', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/highlightjs/styles', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/highlightjs', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/css', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataFormatter/VarDumper', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataFormatter', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/PDO', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/Twig', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/Symfony', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/SwiftMailer', + '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge', + '/libraries/vendor/maximebf/debugbar/src/DebugBar', + '/libraries/vendor/maximebf/debugbar/src', + '/libraries/vendor/maximebf/debugbar', + '/libraries/vendor/maximebf', ]; $status['files_checked'] = $files; @@ -3585,4 +3689,4 @@ protected function fixFilesystemPermissions() } } } -} +} \ No newline at end of file From ff37d72165e776a500935178644c026da7fbda09 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 2 Feb 2025 13:09:57 +0100 Subject: [PATCH 5/7] Add back line feed at end of file --- administrator/components/com_admin/script.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index 8a844d6c0049c..502b447811ffb 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -3689,4 +3689,4 @@ protected function fixFilesystemPermissions() } } } -} \ No newline at end of file +} From 94201a72fe7324bfb6d2473f4123a3207b6a6328 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Mon, 3 Feb 2025 11:55:19 +0100 Subject: [PATCH 6/7] 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 8f5cf8666e80b..996739e363429 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": "31a60ae47059baa1c3d30957e9bd41f8", + "content-hash": "34ad10004c39ed2fd978b3505f248694", "packages": [ { "name": "algo26-matthias/idna-convert", From fdcedfcd42c228a95b68626e7debb60c9bc93999 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Mon, 3 Feb 2025 16:24:20 +0100 Subject: [PATCH 7/7] Update content hash --- composer.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.lock b/composer.lock index ed8cd689b7074..a4470852f5d5d 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": "34ad10004c39ed2fd978b3505f248694", + "content-hash": "23c4946020050711c1b730b2ec892780", "packages": [ { "name": "algo26-matthias/idna-convert",