Skip to content

[5.3] Composer update debug bar to v2.1.0 and adapt to renamed package #44806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
laoneo merged 9 commits into from
Feb 3, 2025
Merged

[5.3] Composer update debug bar to v2.1.0 and adapt to renamed package #44806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1de332b
Update and rename debugbar
richard67 Feb 2, 2025
bffc822
Adapt media build to changed package name
richard67 Feb 2, 2025
dc8711c
Remove obsolete clean up of debugbar dev artifacts
richard67 Feb 2, 2025
894b288
Add deleted files and folders to script.php
richard67 Feb 2, 2025
ff37d72
Add back line feed at end of file
richard67 Feb 2, 2025
ae7df64
Merge branch '5.3-dev' into 5.3-dev-composer-update-php-debugbar
richard67 Feb 3, 2025
94201a7
Update content hash in lock file
richard67 Feb 3, 2025
a924385
Merge branch '5.3-dev' into 5.3-dev-composer-update-php-debugbar
richard67 Feb 3, 2025
fdcedfc
Update content hash
richard67 Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 104 additions & 0 deletions administrator/components/com_admin/script.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions build/build-modules-js/init/cleanup-media.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 {
Expand Down
9 changes: 0 additions & 9 deletions build/build.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@
"symfony/yaml": "^6.4.11",
"typo3/phar-stream-wrapper": "^4.0.0",
"wamania/php-stemmer": "^4.0.0",
"maximebf/debugbar": "^1.23.0",
"tobscure/json-api": "dev-joomla-backports",
"willdurand/negotiation": "^3.1.0",
"ext-json": "*",
Expand All @@ -109,7 +108,8 @@
"phpseclib/bcmath_compat": "^2.0.3",
"jfcherng/php-diff": "^6.16.2",
"voku/portable-utf8": "dev-joomla-5.3 as 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",
Expand Down
140 changes: 71 additions & 69 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.