Merge pull request #44825 from Bodge-IT/upmerges/2025-02-05

[6.0] Upmerges - 2025-02-05

Author: Bodge-IT

administrator/components/com_finder/src/Indexer/Taxonomy.php

@@ -433,7 +433,7 @@ public static function removeOrphanNodes()
             ->where($db->quoteName('t.parent_id') . ' > 1 ')
             ->where('t.lft + 1 = t.rgt')
             ->where($db->quoteName('m.link_id') . ' IS NULL');
-        $query2->delete($db->quoteName('#__finder_taxonomy', 't'));
+        $query2->delete($db->quoteName('#__finder_taxonomy'));
 
         do {
             $db->setQuery($query);
@@ -443,7 +443,7 @@ public static function removeOrphanNodes()
                 break;
             }
 
-            $query2->clear('where')->where($db->quoteName('t.id') . ' IN (' . implode(',', $nodes) . ')');
+            $query2->clear('where')->whereIn($db->quoteName('id'), $nodes);
             $db->setQuery($query2);
             $db->execute();
             $affectedRows += $db->getAffectedRows();

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 {

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');
 

composer.json

@@ -14,10 +14,7 @@
       "php": "8.1.0"
     },
     "vendor-dir": "libraries/vendor",
-    "github-protocols": ["https"],
-    "allow-plugins": {
-      "dealerdirect/phpcodesniffer-composer-installer": true
-    }
+    "github-protocols": ["https"]
   },
   "support": {
     "issues": "https://issues.joomla.org/",
@@ -35,6 +32,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": {
@@ -88,9 +90,8 @@
     "symfony/polyfill-mbstring": "^1.30.0",
     "symfony/web-link": "^6.4.8",
     "symfony/yaml": "^6.4.11",
-    "typo3/phar-stream-wrapper": "^3.1.7",
+    "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": "*",
@@ -106,14 +107,14 @@
     "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",
-    "php-tuf/php-tuf": "^1.0.1"
+    "voku/portable-utf8": "dev-joomla-5.3 as 6.0.13",
+    "php-tuf/php-tuf": "^1.0.1",
+    "php-debugbar/php-debugbar": "^2.1"
   },
   "require-dev": {
     "phpunit/phpunit": "^9.6.21",
     "friendsofphp/php-cs-fixer": "^3.64.0",
     "squizlabs/php_codesniffer": "^3.10.3",
-    "dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
     "joomla/mediawiki": "^3.0",
     "joomla/test": "~3.0",
     "phpstan/phpstan": "^2.0",