Merge branch '7.0-dev' into 6.0-deprecated-components

Author: laoneo

.drone.yml

@@ -5,6 +5,13 @@ name: package
 steps:
   - name: packager
     image: joomlaprojects/docker-images:packager
+    volumes:
+      - name: composer-cache
+        path: /tmp/composer-cache
+      - name: npm-cache
+        path: /tmp/npm-cache
+      - name: fido-cache
+        path: /drone/src/build/fido/
     environment:
       HTTP_ROOT: "https://artifacts.joomla.org/drone"
       DRONE_PULL_REQUEST: DRONE_PULL_REQUEST
@@ -36,6 +43,17 @@ steps:
       - rclone copy ./upload/ package:$package_root/$DRONE_REPO/$DRONE_BRANCH/$DRONE_PULL_REQUEST/downloads/$DRONE_BUILD_NUMBER
       - /bin/add_github_status.sh "Download" "Prebuilt packages are available for download." "https://artifacts.joomla.org/drone/${DRONE_REPO}/${DRONE_BRANCH}/${DRONE_PULL_REQUEST}/downloads/${DRONE_BUILD_NUMBER}"
 
+volumes:
+  - name: composer-cache
+    host:
+      path: /tmp/composer-cache
+  - name: fido-cache
+    host:
+      path: /tmp/fido-cache
+  - name: npm-cache
+    host:
+      path: /tmp/npm-cache
+
 trigger:
   repo:
     - joomla/joomla-cms
@@ -47,6 +65,13 @@ name: nightly_build
 steps:
   - name: prepare
     image: joomlaprojects/docker-images:packager
+    volumes:
+      - name: composer-cache
+        path: /tmp/composer-cache
+      - name: npm-cache
+        path: /tmp/npm-cache
+      - name: fido-cache
+        path: /drone/src/build/fido/
     commands:
       - composer --version
       - mkdir -p transfer
@@ -92,6 +117,17 @@ steps:
       status:
         - failure
 
+volumes:
+  - name: composer-cache
+    host:
+      path: /tmp/composer-cache
+  - name: fido-cache
+    host:
+      path: /tmp/fido-cache
+  - name: npm-cache
+    host:
+      path: /tmp/npm-cache
+
 trigger:
   event:
     - cron
@@ -101,6 +137,6 @@ trigger:
 
 ---
 kind: signature
-hmac: b62009a5a3a1303955cdf02e0d38850e7065febe2e8b06731f6c740a89dfd6e9
+hmac: b35a8a70b20200d91799b8251df1cae7313c8ca78bd2ccc889c29fb10940d5c8
 
 ...

.php-cs-fixer.dist.php

@@ -57,10 +57,7 @@
     ->notPath('/atum/')
     // Ingore cache and logs
     ->notPath('/cache/')
-    ->notPath('/logs/')
-    // Ignore psr12 scripts because they contain invalid syntax
-    ->notPath('/psr12/')
-    ->notName('github_rebase.php');
+    ->notPath('/logs/');
 
 $config = new PhpCsFixer\Config();
 $config

administrator/components/com_admin/script.php

@@ -287,8 +287,8 @@ protected function uninstallExtensions()
              * ['type' => 'plugin', 'element' => 'demotasks', 'folder' => 'task', 'client_id' => 0, 'pre_function' => null],
              * ['type' => 'plugin', 'element' => 'compat', 'folder' => 'system', 'client_id' => 0, 'pre_function' => 'migrateCompatPlugin'],
              */
-            // Uninstall the old joomla 5 compatibility plugin
-            ['type' => 'plugin', 'element' => 'compat', 'folder' => 'behaviour', 'client_id' => 0, 'pre_function' => null],
+            // Uninstall the old joomla 6 compatibility plugin
+            ['type' => 'plugin', 'element' => 'compat6', 'folder' => 'behaviour', 'client_id' => 0, 'pre_function' => null],
         ];
 
         $db = Factory::getDbo();

administrator/components/com_admin/sql/updates/mysql/7.0.0-2026-03-18.sql

@@ -2,5 +2,5 @@
 -- Insert compat7 plugin
 --
 INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`, `ordering`, `state`)
-SELECT 0, 'plg_behaviour_compat7', 'plugin', 'compat7', 'behaviour', 0, 0, 1, 0, 1, '', '{"legacy_classes":"1"}', '', 1, 0
+SELECT 0, 'plg_behaviour_compat7', 'plugin', 'compat7', 'behaviour', 0, 0, 1, 0, 1, '', '{"classes_aliases":"0","legacy_classes":"1","removed_asset":"1"}', '', 1, 0
 WHERE NOT EXISTS (SELECT * FROM `#__extensions` e WHERE e.`type` = 'plugin' AND e.`element` = 'compat7' AND e.`folder` = 'behaviour' AND e.`client_id` = 0);

administrator/components/com_admin/sql/updates/postgresql/7.0.0-2026-03-18.sql

@@ -2,5 +2,5 @@
 -- Insert compat7 plugin
 --
 INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "locked", "manifest_cache", "params", "custom_data", "ordering", "state")
-SELECT 0, 'plg_behaviour_compat7', 'plugin', 'compat7', 'behaviour', 0, 0, 1, 0, 1, '', '{"legacy_classes":"1"}', '', 1, 0
+SELECT 0, 'plg_behaviour_compat7', 'plugin', 'compat7', 'behaviour', 0, 0, 1, 0, 1, '', '{"classes_aliases":"0","legacy_classes":"1","removed_asset":"1"}', '', 1, 0
 WHERE NOT EXISTS (SELECT * FROM "#__extensions" e WHERE e."type" = 'plugin' AND e."element" = 'compat7' AND e."folder" = 'behaviour' AND e."client_id" = 0);

administrator/components/com_admin/src/Model/SysinfoModel.php

@@ -314,7 +314,7 @@ public function &getInfo(): array
 
         $this->info = [
             'version'                => (new Version())->getLongVersion(),
-            'compatpluginenabled'    => PluginHelper::isEnabled('behaviour', 'compat6'),
+            'compatpluginenabled'    => PluginHelper::isEnabled('behaviour', 'compat' . Version::MAJOR_VERSION),
             'compatpluginparameters' => $this->getCompatPluginParameters(),
             'phpversion'             => PHP_VERSION,
             'php'                    => php_uname(),
@@ -334,7 +334,7 @@ public function &getInfo(): array
 
     private function getCompatPluginParameters()
     {
-        $record = ExtensionHelper::getExtensionRecord('compat6', 'plugin', 0, 'behaviour');
+        $record = ExtensionHelper::getExtensionRecord('compat' . Version::MAJOR_VERSION, 'plugin', 0, 'behaviour');
 
         if ($record) {
             $params = new Registry($record->params);