-
-
Notifications
You must be signed in to change notification settings - Fork 3.7k
[5.1] Convert mod_wrapper to service provider #42792
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
Merged
Merged
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
59b4a62
Convert mod_wrapper to service provider
joomlaweby c5183bd
Merge branch '5.1-dev' of https://github.com/joomla/joomla-cms into m…
joomlaweby c74906e
Folder instead of file in mod_wrapper.xml
joomlaweby 62151be
getParams function non-static and code style
joomlaweby c9ca161
Static function getParams deprecated
joomlaweby 4706e0b
Change since version to __DEPLOY_VERSION__
joomlaweby 0302f09
Merge branch '5.1-dev' into mod_wrapper
LadySolveig File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| <?php | ||
|
|
||
| /** | ||
| * @package Joomla.Site | ||
| * @subpackage mod_wrapper | ||
| * | ||
| * @copyright (C) 2024 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\HelperFactory; | ||
| use Joomla\CMS\Extension\Service\Provider\Module; | ||
| use Joomla\CMS\Extension\Service\Provider\ModuleDispatcherFactory; | ||
| use Joomla\DI\Container; | ||
| use Joomla\DI\ServiceProviderInterface; | ||
|
|
||
| /** | ||
| * The wrapper 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\\Wrapper')); | ||
| $container->registerServiceProvider(new HelperFactory('\\Joomla\\Module\\Wrapper\\Site\\Helper')); | ||
|
|
||
| $container->registerServiceProvider(new Module()); | ||
| } | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| <?php | ||
|
|
||
| /** | ||
| * @package Joomla.Site | ||
| * @subpackage mod_wrapper | ||
| * | ||
| * @copyright (C) 2024 Open Source Matters, Inc. <https://www.joomla.org> | ||
| * @license GNU General Public License version 2 or later; see LICENSE.txt | ||
| */ | ||
|
|
||
| namespace Joomla\Module\Wrapper\Site\Dispatcher; | ||
|
|
||
| use Joomla\CMS\Dispatcher\AbstractModuleDispatcher; | ||
| use Joomla\CMS\Helper\HelperFactoryAwareInterface; | ||
| use Joomla\CMS\Helper\HelperFactoryAwareTrait; | ||
|
|
||
| // phpcs:disable PSR1.Files.SideEffects | ||
| \defined('_JEXEC') or die; | ||
| // phpcs:enable PSR1.Files.SideEffects | ||
|
|
||
| /** | ||
| * Dispatcher class for mod_wrapper | ||
| * | ||
| * @since __DEPLOY_VERSION__ | ||
| */ | ||
| class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareInterface | ||
| { | ||
| use HelperFactoryAwareTrait; | ||
|
|
||
| /** | ||
| * Returns the layout data. | ||
| * | ||
| * @return array | ||
| * | ||
| * @since __DEPLOY_VERSION__ | ||
| */ | ||
| protected function getLayoutData() | ||
| { | ||
| $data = parent::getLayoutData(); | ||
|
|
||
| $params = $this->getHelperFactory()->getHelper('WrapperHelper')->getParams($data['params']); | ||
|
|
||
| $data['load'] = $params->get('load'); | ||
| $data['url'] = htmlspecialchars($params->get('url', ''), ENT_COMPAT, 'UTF-8'); | ||
| $data['target'] = htmlspecialchars($params->get('target', ''), ENT_COMPAT, 'UTF-8'); | ||
| $data['width'] = htmlspecialchars($params->get('width', ''), ENT_COMPAT, 'UTF-8'); | ||
| $data['height'] = htmlspecialchars($params->get('height', ''), ENT_COMPAT, 'UTF-8'); | ||
| $data['ititle'] = $this->module->title; | ||
| $data['id'] = $this->module->id; | ||
| $data['lazyloading'] = $params->get('lazyloading', 'lazy'); | ||
|
|
||
| return $data; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.