Skip to content

[4.0] J4 Modules should require an element field #33182

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.

Sign up for GitHub

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 3 commits into from
Apr 23, 2021
Merged

[4.0] J4 Modules should require an element field #33182

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f78da31
J4 Modules require an element field
dgrammatiko Apr 18, 2021
c3739e5
CS
dgrammatiko Apr 18, 2021
fbe603a
Update ModuleAdapter.php
dgrammatiko Apr 23, 2021
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
33 changes: 21 additions & 12 deletions libraries/src/Installer/Adapter/ModuleAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,25 +330,34 @@ protected function finaliseUninstall(): bool
*
* @param string $element Optional element name to be converted
*
* @return string The filtered element
* @return string|null The filtered element
*
* @since 3.4
*/
public function getElement($element = null)
{
if (!$element)
if ($element)
{
if (\count($this->getManifest()->files->children()))
{
foreach ($this->getManifest()->files->children() as $file)
{
if ((string) $file->attributes()->module)
{
$element = strtolower((string) $file->attributes()->module);
return $element;
}

break;
}
}
// Joomla 4 Module.
if ((string) $this->getManifest()->element)
{
return (string) $this->getManifest()->element;
}

if (!\count($this->getManifest()->files->children()))
{
return $element;
}

foreach ($this->getManifest()->files->children() as $file)
{
if ((string) $file->attributes()->module)
{
// Joomla 3 (legacy) Module.
return strtolower((string) $file->attributes()->module);
}
}

Expand Down