generated from MokoConsulting/Template-Joomla
Merge pull request 'fix: honest installer success' (#15) from fix/honest-install-success into dev
This commit was merged in pull request #15.
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
# FILE INFORMATION
|
||||
# DEFGROUP: Gitea.Workflow
|
||||
# INGROUP: mokocli.Automation
|
||||
# VERSION: 01.00.36
|
||||
# VERSION: 01.00.37
|
||||
# BRIEF: Auto-create feature branch when an issue is opened
|
||||
|
||||
name: "Universal: Issue Branch"
|
||||
|
||||
@@ -9,6 +9,9 @@
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
### Fixed
|
||||
- **Honest install success** — the package installer no longer shows the license / next-steps message when a bundled child extension failed to install. A fail-open manifest verifier confirms every child extension landed in `#__extensions` and reports any that are missing.
|
||||
|
||||
### Added
|
||||
- **Package Manifest** — `pkg_mokosuiterealty.xml` with dlid and updateservers
|
||||
- **Plugin Manifest** — `mokosuiterealty.xml` with config fieldsets (listing defaults, search settings)
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
DEFGROUP: Template-Joomla
|
||||
INGROUP: Template-Joomla.Documentation
|
||||
REPO: https://github.com/mokoconsulting-tech/Template-Joomla/
|
||||
VERSION: 01.00.36
|
||||
VERSION: 01.00.37
|
||||
PATH: ./CODE_OF_CONDUCT.md
|
||||
BRIEF: Community expectations and enforcement guidelines
|
||||
NOTE: Adapted with attribution from the Contributor Covenant v2.1
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@
|
||||
DEFGROUP: mokoconsulting-tech.Template-Joomla
|
||||
INGROUP: MokoStandards.Governance
|
||||
REPO: https://github.com/mokoconsulting-tech/Template-Joomla
|
||||
VERSION: 01.00.36
|
||||
VERSION: 01.00.37
|
||||
PATH: /GOVERNANCE.md
|
||||
BRIEF: Project governance rules, roles, and decision process for Template-Joomla
|
||||
-->
|
||||
|
||||
+1
-1
@@ -23,7 +23,7 @@ DEFGROUP: Template-Joomla
|
||||
INGROUP: Template-Joomla.Documentation
|
||||
REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Joomla
|
||||
PATH: /SECURITY.md
|
||||
VERSION: 01.00.36
|
||||
VERSION: 01.00.37
|
||||
BRIEF: Security vulnerability reporting and handling policy
|
||||
-->
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<creationDate>2026-06-23</creationDate>
|
||||
<copyright>Copyright (C) 2026 Moko Consulting.</copyright>
|
||||
<license>GPL-3.0-or-later</license>
|
||||
<version>01.00.36</version>
|
||||
<version>01.00.37</version>
|
||||
<namespace path="src">Moko\Component\MokoSuiteRealty</namespace>
|
||||
<administration>
|
||||
<files folder="admin"><folder>services</folder><folder>src</folder><folder>tmpl</folder></files>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<license>GPL-3.0-or-later</license>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
<authorUrl>https://mokoconsulting.tech</authorUrl>
|
||||
<version>01.00.36</version>
|
||||
<version>01.00.37</version>
|
||||
<php_minimum>8.3</php_minimum>
|
||||
<description>PLG_SYSTEM_MOKOSUITEREALTY_DESC</description>
|
||||
<namespace path="src">Moko\Plugin\System\MokoSuiteRealty</namespace>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<name>Web Services - MokoSuite Realty</name>
|
||||
<element>mokosuiterealty</element>
|
||||
<author>Moko Consulting</author>
|
||||
<version>01.00.36</version>
|
||||
<version>01.00.37</version>
|
||||
<license>GPL-3.0-or-later</license>
|
||||
<namespace path="src">Moko\Plugin\WebServices\MokoSuiteRealty</namespace>
|
||||
<files><folder>src</folder><folder>services</folder></files>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<extension type="package" method="upgrade">
|
||||
<name>Package - MokoSuite Realty</name>
|
||||
<packagename>mokosuiterealty</packagename>
|
||||
<version>01.00.36</version>
|
||||
<version>01.00.37</version>
|
||||
<creationDate>2026-06-21</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -19,9 +19,104 @@ class Pkg_MokoSuiteRealtyInstallerScript
|
||||
{
|
||||
public function postflight(string $type, InstallerAdapter $adapter): void
|
||||
{
|
||||
// Be honest about success. Joomla's package installer only LOGS a failed child
|
||||
// sub-install but still runs this postflight, so don't show the license /
|
||||
// next-steps message if a bundled extension is actually missing. Fails open
|
||||
// (see missingChildExtensions) so a query/IO glitch never fakes a failure.
|
||||
$missing = $this->missingChildExtensions($adapter);
|
||||
|
||||
if (!empty($missing))
|
||||
{
|
||||
Factory::getApplication()->enqueueMessage(
|
||||
'<h4>MokoSuiteRealty did not install correctly.</h4>'
|
||||
. '<p>The following bundled extensions are missing: '
|
||||
. htmlspecialchars(implode(', ', $missing), ENT_QUOTES) . '</p>'
|
||||
. '<p>Please uninstall MokoSuiteRealty and reinstall the full package.</p>',
|
||||
'error'
|
||||
);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
$this->warnMissingLicenseKey();
|
||||
}
|
||||
|
||||
/**
|
||||
* Verify every child extension declared in the package manifest actually landed in
|
||||
* #__extensions. Returns readable labels of any that are missing.
|
||||
*
|
||||
* Matching per Joomla's #__extensions uniqueness: type = <file> "type"; element =
|
||||
* <file> "id" (for plugins, strip a leading plg_<group>_); plugins also match
|
||||
* folder = <file> "group".
|
||||
*
|
||||
* FAILS OPEN: any error returns [] so a transient glitch never fakes a failure.
|
||||
*/
|
||||
private function missingChildExtensions($adapter): array
|
||||
{
|
||||
try
|
||||
{
|
||||
$manifest = $adapter->getParent()->getManifest();
|
||||
|
||||
if (!$manifest || !isset($manifest->files) || !isset($manifest->files->file))
|
||||
{
|
||||
return [];
|
||||
}
|
||||
|
||||
$db = Factory::getDbo();
|
||||
$missing = [];
|
||||
|
||||
foreach ($manifest->files->file as $file)
|
||||
{
|
||||
$attrs = $file->attributes();
|
||||
$id = isset($attrs['id']) ? (string) $attrs['id'] : '';
|
||||
$exType = isset($attrs['type']) ? (string) $attrs['type'] : '';
|
||||
|
||||
if ($id === '' || $exType === '')
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
$group = isset($attrs['group']) ? (string) $attrs['group'] : '';
|
||||
$element = $id;
|
||||
|
||||
// Plugin element in #__extensions is the id minus any leading plg_<group>_.
|
||||
if ($exType === 'plugin' && $group !== '')
|
||||
{
|
||||
$prefix = 'plg_' . $group . '_';
|
||||
|
||||
if (strpos($element, $prefix) === 0)
|
||||
{
|
||||
$element = substr($element, \strlen($prefix));
|
||||
}
|
||||
}
|
||||
|
||||
$query = $db->getQuery(true)
|
||||
->select('COUNT(*)')
|
||||
->from($db->quoteName('#__extensions'))
|
||||
->where($db->quoteName('element') . ' = ' . $db->quote($element))
|
||||
->where($db->quoteName('type') . ' = ' . $db->quote($exType));
|
||||
|
||||
if ($exType === 'plugin' && $group !== '')
|
||||
{
|
||||
$query->where($db->quoteName('folder') . ' = ' . $db->quote($group));
|
||||
}
|
||||
|
||||
if ((int) $db->setQuery($query)->loadResult() === 0)
|
||||
{
|
||||
$label = trim((string) $file);
|
||||
$missing[] = $label !== '' ? preg_replace('/\.zip$/i', '', $label) : $id;
|
||||
}
|
||||
}
|
||||
|
||||
return $missing;
|
||||
}
|
||||
catch (\Throwable $e)
|
||||
{
|
||||
// Fail open — never fake a failure on a glitch.
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
private function warnMissingLicenseKey(): void
|
||||
{
|
||||
try
|
||||
|
||||
Reference in New Issue
Block a user