Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 0 additions & 23 deletions administrator/modules/mod_menu/mod_menu.php

This file was deleted.

2 changes: 1 addition & 1 deletion administrator/modules/mod_menu/mod_menu.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<description>MOD_MENU_XML_DESCRIPTION</description>
<namespace path="src">Joomla\Module\Menu</namespace>
<files>
<filename module="mod_menu">mod_menu.php</filename>
<folder module="mod_menu">services</folder>
<folder>src</folder>
<folder>tmpl</folder>
</files>
Expand Down
39 changes: 39 additions & 0 deletions administrator/modules/mod_menu/services/provider.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?php

/**
* @package Joomla.Administrator
* @subpackage mod_menu
*
* @copyright (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

\defined('_JEXEC') or die;

use Joomla\CMS\Extension\Service\Provider\Module;
use Joomla\CMS\Extension\Service\Provider\ModuleDispatcherFactory;
use Joomla\DI\Container;
use Joomla\DI\ServiceProviderInterface;

/**
* The administrator menu module service provider.
*
* @since __DEPLOY_VERSION__
*/
return new class () implements ServiceProviderInterface {
/**
* Registers the service provider with a DI container.
*
* @param Container $container The DI container.
*
* @return void
*
* @since __DEPLOY_VERSION__
*/
public function register(Container $container)
{
$container->registerServiceProvider(new ModuleDispatcherFactory('\\Joomla\\Module\\Menu'));

$container->registerServiceProvider(new Module());
}
};
46 changes: 46 additions & 0 deletions administrator/modules/mod_menu/src/Dispatcher/Dispatcher.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?php

/**
* @package Joomla.Administrator
* @subpackage mod_menu
*
* @copyright (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

namespace Joomla\Module\Menu\Administrator\Dispatcher;

use Joomla\CMS\Dispatcher\AbstractModuleDispatcher;
use Joomla\Module\Menu\Administrator\Menu\CssMenu;

// phpcs:disable PSR1.Files.SideEffects
\defined('_JEXEC') or die;
// phpcs:enable PSR1.Files.SideEffects

/**
* Dispatcher class for mod_menu
*
* @since __DEPLOY_VERSION__
*/
class Dispatcher extends AbstractModuleDispatcher
{
/**
* Returns the layout data.
*
* @return array
*
* @since __DEPLOY_VERSION__
*/
protected function getLayoutData()
{
$data = parent::getLayoutData();

$data['enabled'] = !$data['app']->getInput()->getBool('hidemainmenu');

$data['menu'] = new CssMenu($data['app']);
$data['root'] = $data['menu']->load($data['params'], $data['enabled']);
$data['root']->level = 0;

return $data;
}
}
3 changes: 1 addition & 2 deletions administrator/modules/mod_menu/src/Menu/CssMenu.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
use Joomla\CMS\Language\Associations;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Menu\AdministratorMenuItem;
use Joomla\CMS\Table\Table;
use Joomla\CMS\Uri\Uri;
use Joomla\Component\Menus\Administrator\Helper\MenusHelper;
use Joomla\Registry\Registry;
Expand Down Expand Up @@ -231,7 +230,7 @@ protected function check($node, Registry $params)
$uri = clone Uri::getInstance();
$uri->setVar('recover_menu', 1);

$table = Table::getInstance('MenuType');
$table = $this->application->bootComponent('com_menu')->getMVCFactory()->createTable('MenuType');
$menutype = $params->get('menutype');

$table->load(['menutype' => $menutype]);
Expand Down
Loading