[6.0] Upmerges - 2025-07-09

Bodge-IT · web-flow · commit 763db2d8faf4 · 2025-07-09T08:34:14.000+01:00
Merge pull request #45709 from Bodge-IT/upmerges/2025-07-09
diff --git a/administrator/components/com_installer/src/View/Update/HtmlView.php b/administrator/components/com_installer/src/View/Update/HtmlView.php
@@ -100,7 +100,7 @@ public function display($tpl = null)
 
         // Find if there are any updates which require but are missing a Download Key
         if (!class_exists('Joomla\Component\Installer\Administrator\Helper\InstallerHelper')) {
-            require_once JPATH_COMPONENT_ADMINISTRATOR . '/Helper/InstallerHelper.php';
+            require_once JPATH_ADMINISTRATOR . '/components/com_installer/src/Helper/InstallerHelper.php';
         }
 
         $mappingCallback = function ($item) {
diff --git a/administrator/components/com_media/src/View/Media/HtmlView.php b/administrator/components/com_media/src/View/Media/HtmlView.php
@@ -106,7 +106,7 @@ protected function prepareToolbar()
             $toolbar->divider();
 
             // Add the create folder button
-            $layout = new FileLayout('toolbar.create-folder', JPATH_COMPONENT_ADMINISTRATOR . '/layouts');
+            $layout = new FileLayout('toolbar.create-folder', JPATH_ADMINISTRATOR . '/components/com_media/layouts');
 
             $toolbar->customButton('new')
                 ->html($layout->render([]));
diff --git a/api/components/com_config/src/Controller/ApplicationController.php b/api/components/com_config/src/Controller/ApplicationController.php
@@ -113,7 +113,7 @@ public function edit()
         $data    = array_replace($oldData, $data);
 
         // @todo: Not the cleanest thing ever but it works...
-        Form::addFormPath(JPATH_COMPONENT_ADMINISTRATOR . '/forms');
+        Form::addFormPath(JPATH_ADMINISTRATOR . '/components/com_config/forms');
 
         // Must load after serving service-requests
         $form = $model->getForm();
diff --git a/api/components/com_contact/src/Controller/ContactController.php b/api/components/com_contact/src/Controller/ContactController.php
@@ -126,7 +126,7 @@ public function submitForm($id = null)
         // Contact plugins
         PluginHelper::importPlugin('contact');
 
-        Form::addFormPath(JPATH_COMPONENT_SITE . '/forms');
+        Form::addFormPath(JPATH_SITE . '/components/com_contact/forms');
 
         // Validate the posted data.
         $form = $model->getForm();
diff --git a/api/components/com_languages/src/Controller/OverridesController.php b/api/components/com_languages/src/Controller/OverridesController.php
@@ -100,7 +100,7 @@ protected function save($recordKey = null)
         $data = $this->input->get('data', json_decode($this->input->json->getRaw(), true), 'array');
 
         // @todo: Not the cleanest thing ever but it works...
-        Form::addFormPath(JPATH_COMPONENT_ADMINISTRATOR . '/forms');
+        Form::addFormPath(JPATH_ADMINISTRATOR . '/components/com_languages/forms');
 
         // Validate the posted data.
         $form = $model->getForm($data, false);
diff --git a/installation/src/Model/ChecksModel.php b/installation/src/Model/ChecksModel.php
@@ -233,7 +233,7 @@ public function getForm($view = null)
         }
 
         // Get the form.
-        Form::addFormPath(JPATH_COMPONENT . '/forms');
+        Form::addFormPath(JPATH_BASE . '/forms');
 
         try {
             $form = Form::getInstance('jform', $view, ['control' => 'jform']);
diff --git a/installation/src/Model/LanguagesModel.php b/installation/src/Model/LanguagesModel.php
@@ -507,9 +507,7 @@ public function getForm($view = null)
         }
 
         // Get the form.
-        Form::addFormPath(JPATH_COMPONENT . '/forms');
-        Form::addFieldPath(JPATH_COMPONENT . '/model/fields');
-        Form::addRulePath(JPATH_COMPONENT . '/model/rules');
+        Form::addFormPath(JPATH_BASE . '/forms');
 
         try {
             $form = Form::getInstance('jform', $view, ['control' => 'jform']);
diff --git a/installation/src/Model/SetupModel.php b/installation/src/Model/SetupModel.php
@@ -85,7 +85,7 @@ public function getForm($view = null)
         }
 
         // Get the form.
-        Form::addFormPath(JPATH_COMPONENT . '/forms');
+        Form::addFormPath(JPATH_BASE . '/forms');
 
         try {
             $form = Form::getInstance('jform', $view, ['control' => 'jform']);
diff --git a/libraries/src/Dispatcher/ApiDispatcher.php b/libraries/src/Dispatcher/ApiDispatcher.php
@@ -33,7 +33,7 @@ protected function loadLanguage()
         // Load common and local language files.
         $this->app->getLanguage()->load($this->option, JPATH_BASE) ||
         $this->app->getLanguage()->load($this->option, JPATH_ADMINISTRATOR) ||
-        $this->app->getLanguage()->load($this->option, JPATH_COMPONENT_ADMINISTRATOR);
+        $this->app->getLanguage()->load($this->option, JPATH_ADMINISTRATOR . '/components/' . $this->option);
     }
 
     /**
diff --git a/libraries/src/Dispatcher/ComponentDispatcher.php b/libraries/src/Dispatcher/ComponentDispatcher.php
@@ -85,7 +85,7 @@ protected function loadLanguage()
     {
         // Load common and local language files.
         $this->app->getLanguage()->load($this->option, JPATH_BASE) ||
-        $this->app->getLanguage()->load($this->option, JPATH_COMPONENT);
+        $this->app->getLanguage()->load($this->option, JPATH_BASE . '/components/' . $this->option);
     }
 
     /**
diff --git a/libraries/src/Dispatcher/LegacyComponentDispatcher.php b/libraries/src/Dispatcher/LegacyComponentDispatcher.php
@@ -54,7 +54,7 @@ public function __construct(CMSApplication $app)
      */
     public function dispatch()
     {
-        $path = JPATH_COMPONENT . '/' . substr($this->app->scope, 4) . '.php';
+        $path = JPATH_BASE . '/components/' . $this->app->scope . '/' . substr($this->app->scope, 4) . '.php';
 
         // If component file doesn't exist throw error
         if (!is_file($path)) {
@@ -64,7 +64,7 @@ public function dispatch()
         $lang = $this->app->getLanguage();
 
         // Load common and local language files.
-        $lang->load($this->app->scope, JPATH_BASE) || $lang->load($this->app->scope, JPATH_COMPONENT);
+        $lang->load($this->app->scope, JPATH_BASE) || $lang->load($this->app->scope, JPATH_BASE . '/components/' . $this->app->scope);
 
         // Execute the component
         $loader = static function ($path) {
diff --git a/libraries/src/MVC/Controller/ApiController.php b/libraries/src/MVC/Controller/ApiController.php
@@ -422,7 +422,7 @@ protected function save($recordKey = null)
         $data = $this->preprocessSaveData($data);
 
         // @todo: Not the cleanest thing ever but it works...
-        Form::addFormPath(JPATH_COMPONENT_ADMINISTRATOR . '/forms');
+        Form::addFormPath(JPATH_ADMINISTRATOR . '/components/' . $this->option . '/forms');
 
         // Needs to be set because com_fields needs the data in jform to determine the assigned catid
         $this->input->set('jform', $data);
diff --git a/libraries/src/MVC/Model/BaseDatabaseModel.php b/libraries/src/MVC/Model/BaseDatabaseModel.php
@@ -114,8 +114,8 @@ public function __construct($config = [], ?MVCFactoryInterface $factory = null)
         if (\array_key_exists('table_path', $config)) {
             static::addTablePath($config['table_path']);
         } elseif (\defined('JPATH_COMPONENT_ADMINISTRATOR')) {
-            static::addTablePath(JPATH_COMPONENT_ADMINISTRATOR . '/tables');
-            static::addTablePath(JPATH_COMPONENT_ADMINISTRATOR . '/table');
+            static::addTablePath(JPATH_ADMINISTRATOR . '/components/' . $this->option . '/tables');
+            static::addTablePath(JPATH_ADMINISTRATOR . '/components/' . $this->option . '/table');
         }
 
         // Set the clean cache event
diff --git a/plugins/sampledata/blog/src/Extension/Blog.php b/plugins/sampledata/blog/src/Extension/Blog.php
@@ -1809,8 +1809,8 @@ public function onAjaxSampledataApplyStep3(AjaxEvent $event): void
                     'cache_time'     => 900,
                     'cachemode'      => 'static',
                     'module_tag'     => 'div',
-                    'bootstrap_size' => 0,
-                    'header_tag'     => 'h3',
+                    'bootstrap_size' => 12,
+                    'header_tag'     => 'h2',
                     'style'          => 0,
                 ],
             ],

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public function display($tpl = null)`
`100`	`100`
`101`	`101`	`// Find if there are any updates which require but are missing a Download Key`
`102`	`102`	`if (!class_exists('Joomla\Component\Installer\Administrator\Helper\InstallerHelper')) {`
`103`		`- require_once JPATH_COMPONENT_ADMINISTRATOR . '/Helper/InstallerHelper.php';`
	`103`	`+ require_once JPATH_ADMINISTRATOR . '/components/com_installer/src/Helper/InstallerHelper.php';`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`$mappingCallback = function ($item) {`
Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ public function getForm($view = null)`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`// Get the form.`
`236`		`- Form::addFormPath(JPATH_COMPONENT . '/forms');`
	`236`	`+ Form::addFormPath(JPATH_BASE . '/forms');`
`237`	`237`
`238`	`238`	`try {`
`239`	`239`	`$form = Form::getInstance('jform', $view, ['control' => 'jform']);`
Original file line number	Diff line number	Diff line change
`@@ -507,9 +507,7 @@ public function getForm($view = null)`
`507`	`507`	`}`
`508`	`508`
`509`	`509`	`// Get the form.`
`510`		`- Form::addFormPath(JPATH_COMPONENT . '/forms');`
`511`		`- Form::addFieldPath(JPATH_COMPONENT . '/model/fields');`
`512`		`- Form::addRulePath(JPATH_COMPONENT . '/model/rules');`
	`510`	`+ Form::addFormPath(JPATH_BASE . '/forms');`
`513`	`511`
`514`	`512`	`try {`
`515`	`513`	`$form = Form::getInstance('jform', $view, ['control' => 'jform']);`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public function getForm($view = null)`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`// Get the form.`
`88`		`- Form::addFormPath(JPATH_COMPONENT . '/forms');`
	`88`	`+ Form::addFormPath(JPATH_BASE . '/forms');`
`89`	`89`
`90`	`90`	`try {`
`91`	`91`	`$form = Form::getInstance('jform', $view, ['control' => 'jform']);`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ protected function loadLanguage()`
`33`	`33`	`// Load common and local language files.`
`34`	`34`	`$this->app->getLanguage()->load($this->option, JPATH_BASE) \|\|`
`35`	`35`	`$this->app->getLanguage()->load($this->option, JPATH_ADMINISTRATOR) \|\|`
`36`		`- $this->app->getLanguage()->load($this->option, JPATH_COMPONENT_ADMINISTRATOR);`
	`36`	`+ $this->app->getLanguage()->load($this->option, JPATH_ADMINISTRATOR . '/components/' . $this->option);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ protected function loadLanguage()`
`85`	`85`	`{`
`86`	`86`	`// Load common and local language files.`
`87`	`87`	`$this->app->getLanguage()->load($this->option, JPATH_BASE) \|\|`
`88`		`- $this->app->getLanguage()->load($this->option, JPATH_COMPONENT);`
	`88`	`+ $this->app->getLanguage()->load($this->option, JPATH_BASE . '/components/' . $this->option);`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`/**`