Skip to content
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.

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

Rebuild mod_custom with new Joomla 4 structure #39931

Merged
merged 47 commits into from
Apr 17, 2023
Merged
Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
b5128b9
Rebuild mod_custom with new Joomla 4 structure
sergeytolkachyov Feb 24, 2023
1b1105e
Delete mod_custom.php
sergeytolkachyov Feb 24, 2023
e8ecde4
Merge branch '4.3-dev' into 4.3-dev
sergeytolkachyov Feb 25, 2023
4ed8f26
Update provider.php
sergeytolkachyov Feb 25, 2023
cc1c854
Update provider.php
sergeytolkachyov Feb 25, 2023
052d030
Update provider.php
sergeytolkachyov Feb 25, 2023
1170c51
Update provider.php
sergeytolkachyov Feb 25, 2023
da9109a
Update modules/mod_custom/src/Dispatcher/Dispatcher.php
sergeytolkachyov Feb 25, 2023
f993409
Update mod_custom.xml
sergeytolkachyov Feb 25, 2023
b3052c2
Update provider.php
sergeytolkachyov Feb 27, 2023
59476ad
Update mod_custom.xml
sergeytolkachyov Feb 27, 2023
6861cb6
Update Dispatcher.php
sergeytolkachyov Feb 27, 2023
5d985bb
Update default.php
sergeytolkachyov Feb 27, 2023
9990148
Update default.php
sergeytolkachyov Feb 27, 2023
00c00fa
Merge branch '4.3-dev' into 4.3-dev
sergeytolkachyov Feb 27, 2023
b8367bb
Update provider.php
sergeytolkachyov Feb 27, 2023
3f2474b
Update Dispatcher.php
sergeytolkachyov Feb 27, 2023
a2ebc17
Update default.php
sergeytolkachyov Feb 27, 2023
dd05121
Update provider.php
sergeytolkachyov Mar 1, 2023
abdfe0b
Update Dispatcher.php
sergeytolkachyov Mar 1, 2023
887cea8
Update default.php
sergeytolkachyov Mar 1, 2023
6b581b6
Merge branch '4.3-dev' into 4.3-dev
sergeytolkachyov Mar 2, 2023
6413147
Update provider.php
sergeytolkachyov Mar 5, 2023
c0e1432
Update Dispatcher.php
sergeytolkachyov Mar 5, 2023
0421433
Update default.php
sergeytolkachyov Mar 5, 2023
6923868
Merge branch '4.3-dev' into 4.3-dev
sergeytolkachyov Mar 5, 2023
22d73f4
Update mod_custom.xml
sergeytolkachyov Mar 5, 2023
bfb5683
Update Dispatcher.php
sergeytolkachyov Mar 5, 2023
85d8acd
Update mod_custom.xml
sergeytolkachyov Mar 5, 2023
f1ce9ce
Update modules/mod_custom/src/Dispatcher/Dispatcher.php
sergeytolkachyov Mar 5, 2023
1bd41d9
Update modules/mod_custom/services/provider.php
sergeytolkachyov Mar 5, 2023
05cd43c
Update modules/mod_custom/services/provider.php
sergeytolkachyov Mar 5, 2023
f4e77d2
Merge branch '4.3-dev' into 4.3-dev
sergeytolkachyov Mar 5, 2023
fadced3
Update Dispatcher.php
sergeytolkachyov Mar 11, 2023
ae4bcbf
Update provider.php
sergeytolkachyov Mar 11, 2023
50d9d7c
Merge branch '4.4-dev' into 4.3-dev
sergeytolkachyov Mar 11, 2023
6e0815c
Update modules/mod_custom/src/Dispatcher/Dispatcher.php
Quy Mar 11, 2023
fc493de
Merge branch '4.4-dev' into 4.3-dev
sergeytolkachyov Mar 15, 2023
04e218d
Merge branch '4.4-dev' into 4.3-dev
sergeytolkachyov Mar 17, 2023
f5e5489
Merge branch '4.4-dev' into 4.3-dev
laoneo Mar 18, 2023
e3a72ae
Merge branch '4.4-dev' into 4.3-dev
laoneo Mar 22, 2023
aef6281
Merge branch '4.4-dev' into 4.3-dev
laoneo Mar 29, 2023
0046fd5
Update default.php
laoneo Apr 14, 2023
6e27478
Update default.php
laoneo Apr 14, 2023
b68c3d7
Update provider.php
laoneo Apr 14, 2023
c3e00c2
Merge branch '4.4-dev' into 4.3-dev
laoneo Apr 14, 2023
7932897
Merge branch '4.4-dev' into 4.3-dev
laoneo Apr 14, 2023
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
22 changes: 0 additions & 22 deletions modules/mod_custom/mod_custom.php

This file was deleted.

7 changes: 3 additions & 4 deletions modules/mod_custom/mod_custom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,17 @@
<authorUrl>www.joomla.org</authorUrl>
<version>3.0.0</version>
<description>MOD_CUSTOM_XML_DESCRIPTION</description>

<namespace path="src">Joomla\Module\Custom</namespace>
<customContent />

<files>
<filename module="mod_custom">mod_custom.php</filename>
<folder module="mod_custom">services</folder>
<folder>src</folder>
<folder>tmpl</folder>
</files>
<languages>
<language tag="en-GB">language/en-GB/mod_custom.ini</language>
<language tag="en-GB">language/en-GB/mod_custom.sys.ini</language>
</languages>

<help key="Site_Modules:_Custom" />
<config>
<fields name="params">
Expand Down
41 changes: 41 additions & 0 deletions modules/mod_custom/services/provider.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?php

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

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

use Joomla\CMS\Extension\Service\Provider\HelperFactory;
use Joomla\CMS\Extension\Service\Provider\Module;
use Joomla\CMS\Extension\Service\Provider\ModuleDispatcherFactory;
use Joomla\DI\Container;
use Joomla\DI\ServiceProviderInterface;
sergeytolkachyov marked this conversation as resolved.
Show resolved Hide resolved

/**
* The module Custom HTML service provider.
*
* @since 1.0.0
sergeytolkachyov marked this conversation as resolved.
Show resolved Hide resolved
*/
return new class () implements ServiceProviderInterface {
/**
* Registers the service provider with a DI container.
*
* @param Container $container The DI container.
*
* @return void
*
* @since 4.0.0
sergeytolkachyov marked this conversation as resolved.
Show resolved Hide resolved
*/
public function register(Container $container)
{
$container->registerServiceProvider(new ModuleDispatcherFactory('\\Joomla\\Module\\Custom'));
$container->registerServiceProvider(new Module());
}
};
44 changes: 44 additions & 0 deletions modules/mod_custom/src/Dispatcher/Dispatcher.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?php

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

namespace Joomla\Module\Custom\Site\Dispatcher;

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

Quy marked this conversation as resolved.
Show resolved Hide resolved
use Joomla\CMS\Dispatcher\AbstractModuleDispatcher;
use Joomla\CMS\HTML\HTMLHelper;
sergeytolkachyov marked this conversation as resolved.
Show resolved Hide resolved

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

if (($data['params'])->get('prepare_content', 1)) {
($data['module'])->content = HTMLHelper::_('content.prepare', ($data['module'])->content, '', 'mod_custom.content');
}

return $data;
}
}
4 changes: 3 additions & 1 deletion modules/mod_custom/tmpl/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

defined('_JEXEC') or die;
// phpcs:disable PSR1.Files.SideEffects
laoneo marked this conversation as resolved.
Show resolved Hide resolved
\defined('_JEXEC') or die;
// phpcs:enable PSR1.Files.SideEffects

use Joomla\CMS\Factory;
use Joomla\CMS\HTML\HTMLHelper;
sergeytolkachyov marked this conversation as resolved.
Show resolved Hide resolved
Expand Down