Merge pull request 'fix(installer): gate install-success on real verification' (#120) from fix/installer-success-detection into dev
This commit was merged in pull request #120.
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
# FILE INFORMATION
|
||||
# DEFGROUP: Gitea.Workflow
|
||||
# INGROUP: mokocli.Automation
|
||||
# VERSION: 01.07.03
|
||||
# VERSION: 01.07.05
|
||||
# BRIEF: Auto-create feature branch when an issue is opened
|
||||
|
||||
name: "Universal: Issue Branch"
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@ All notable changes to MokoSuiteOpenGraph will be documented in this file.
|
||||
|
||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
|
||||
|
||||
<!-- VERSION: 01.07.03 -->
|
||||
<!-- VERSION: 01.07.05 -->
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
DEFGROUP: Template-Joomla
|
||||
INGROUP: Template-Joomla.Documentation
|
||||
REPO: https://github.com/mokoconsulting-tech/Template-Joomla/
|
||||
VERSION: 01.07.03
|
||||
VERSION: 01.07.05
|
||||
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.07.03
|
||||
VERSION: 01.07.05
|
||||
PATH: /GOVERNANCE.md
|
||||
BRIEF: Project governance rules, roles, and decision process for Template-Joomla
|
||||
-->
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# MokoSuiteOpenGraph
|
||||
|
||||
<!-- VERSION: 01.07.03 -->
|
||||
<!-- VERSION: 01.07.05 -->
|
||||
|
||||
Open Graph, Twitter Card, and social sharing meta tag management for Joomla 6 and higher.
|
||||
|
||||
|
||||
+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.07.03
|
||||
VERSION: 01.07.05
|
||||
BRIEF: Security vulnerability reporting and handling policy
|
||||
-->
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
-->
|
||||
<extension type="component" method="upgrade">
|
||||
<name>com_mokoog</name>
|
||||
<version>01.07.03</version>
|
||||
<version>01.07.05</version>
|
||||
<creationDate>2026-05-23</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
|
||||
defined('_JEXEC') or die;
|
||||
|
||||
use Joomla\CMS\Factory;
|
||||
use Joomla\CMS\Installer\InstallerAdapter;
|
||||
|
||||
class Com_MokoOGInstallerScript
|
||||
@@ -23,6 +24,25 @@ class Com_MokoOGInstallerScript
|
||||
*/
|
||||
public function install(InstallerAdapter $parent): void
|
||||
{
|
||||
// Be smart: verify EVERY table the component's own install SQL declares is
|
||||
// actually present. If any are missing the install did not complete — say
|
||||
// so instead of showing "installed successfully".
|
||||
$missing = $this->missingTables();
|
||||
|
||||
if ($missing !== []) {
|
||||
$detail = count($missing) > 6
|
||||
? count($missing) . ' expected database tables are missing'
|
||||
: 'missing tables: ' . htmlspecialchars(implode(', ', $missing), ENT_QUOTES, 'UTF-8');
|
||||
|
||||
Factory::getApplication()->enqueueMessage(
|
||||
'<strong>MokoSuiteOpenGraph did not install correctly.</strong> ' . $detail
|
||||
. ' — review the errors above, then reinstall.',
|
||||
'error'
|
||||
);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
echo '<p>MokoSuiteOpenGraph component installed successfully.</p>';
|
||||
}
|
||||
|
||||
@@ -37,4 +57,46 @@ class Com_MokoOGInstallerScript
|
||||
{
|
||||
echo '<p>MokoSuiteOpenGraph component updated successfully.</p>';
|
||||
}
|
||||
|
||||
/**
|
||||
* Smart schema check: parse the component's own installed install SQL for every
|
||||
* CREATE TABLE, then return the ones missing from the database. An empty array
|
||||
* means the full schema installed. Fails open (returns []) if the SQL can't be
|
||||
* read, so a good install is never flagged as failed.
|
||||
*
|
||||
* @return string[] Names (without the #__ prefix) of missing tables.
|
||||
*/
|
||||
private function missingTables(): array
|
||||
{
|
||||
try {
|
||||
$sqlFile = JPATH_ADMINISTRATOR . '/components/com_mokoog/sql/install.mysql.sql';
|
||||
|
||||
if (!is_file($sqlFile)) {
|
||||
return [];
|
||||
}
|
||||
|
||||
$sql = file_get_contents($sqlFile);
|
||||
|
||||
if ($sql === false
|
||||
|| !preg_match_all('/CREATE\s+TABLE\s+(?:IF\s+NOT\s+EXISTS\s+)?[`"\']?(#__[A-Za-z0-9_]+)/i', $sql, $m)) {
|
||||
return [];
|
||||
}
|
||||
|
||||
$db = Factory::getDbo();
|
||||
$prefix = strtolower($db->getPrefix());
|
||||
$have = array_map('strtolower', $db->getTableList());
|
||||
$missing = [];
|
||||
|
||||
foreach (array_unique($m[1]) as $decl) {
|
||||
$bare = substr($decl, 3); // strip "#__"
|
||||
if (!in_array($prefix . strtolower($bare), $have, true)) {
|
||||
$missing[] = $bare;
|
||||
}
|
||||
}
|
||||
|
||||
return $missing;
|
||||
} catch (\Throwable $e) {
|
||||
return [];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
/* 01.07.05 — no schema changes */
|
||||
@@ -8,7 +8,7 @@
|
||||
-->
|
||||
<extension type="plugin" group="content" method="upgrade">
|
||||
<name>Content - MokoSuiteOpenGraph</name>
|
||||
<version>01.07.03</version>
|
||||
<version>01.07.05</version>
|
||||
<creationDate>2026-05-23</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
-->
|
||||
<extension type="plugin" group="system" method="upgrade">
|
||||
<name>System - MokoSuiteOpenGraph</name>
|
||||
<version>01.07.03</version>
|
||||
<version>01.07.05</version>
|
||||
<creationDate>2026-05-23</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
-->
|
||||
<extension type="plugin" group="webservices" method="upgrade">
|
||||
<name>Web Services - MokoSuiteOpenGraph</name>
|
||||
<version>01.07.03</version>
|
||||
<version>01.07.05</version>
|
||||
<creationDate>2026-05-23</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<extension type="package" method="upgrade">
|
||||
<name>Package - MokoSuiteOpenGraph</name>
|
||||
<packagename>mokoog</packagename>
|
||||
<version>01.07.03</version>
|
||||
<version>01.07.05</version>
|
||||
<creationDate>2026-05-23</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
+93
-1
@@ -50,9 +50,10 @@ class Pkg_MokoOGInstallerScript
|
||||
|
||||
public function postflight(string $type, InstallerAdapter $parent): void
|
||||
{
|
||||
// The download key must be restored regardless of the install outcome.
|
||||
$this->restoreDownloadKey();
|
||||
$this->warnMissingLicenseKey();
|
||||
|
||||
// Housekeeping: ensure the bundled plugins are enabled after a fresh install.
|
||||
if ($type === 'install')
|
||||
{
|
||||
$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
|
||||
@@ -69,6 +70,97 @@ class Pkg_MokoOGInstallerScript
|
||||
)->execute();
|
||||
}
|
||||
}
|
||||
|
||||
// Be smart: only run the success path (the licence notice, which implies a
|
||||
// completed install) when every child extension declared in the package
|
||||
// manifest actually registered. If any are missing, the package did NOT
|
||||
// install successfully — surface that instead of implying success.
|
||||
$missing = $this->missingChildExtensions($parent);
|
||||
|
||||
if ($missing !== [])
|
||||
{
|
||||
Factory::getApplication()->enqueueMessage(
|
||||
'<strong>MokoSuiteOpenGraph did not install completely.</strong> '
|
||||
. 'The following extension(s) failed to install: ' . htmlspecialchars(implode(', ', $missing), ENT_QUOTES, 'UTF-8') . '. '
|
||||
. 'Resolve the errors shown above, then uninstall and reinstall the package.',
|
||||
'error'
|
||||
);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
$this->warnMissingLicenseKey();
|
||||
}
|
||||
|
||||
/**
|
||||
* Compare the child extensions the package manifest declares against what is
|
||||
* actually registered in #__extensions after the install/update. Returns the
|
||||
* label of each declared extension that is missing (i.e. failed to install);
|
||||
* an empty array means every child installed and the package succeeded.
|
||||
*
|
||||
* Fails open: any error returns [] so a query problem can never turn a good
|
||||
* install into a false "did not install completely" warning.
|
||||
*
|
||||
* @param InstallerAdapter $parent Installer adapter
|
||||
*
|
||||
* @return string[]
|
||||
*/
|
||||
private function missingChildExtensions(InstallerAdapter $parent): array
|
||||
{
|
||||
$missing = [];
|
||||
|
||||
try
|
||||
{
|
||||
$manifest = $parent->getParent()->getManifest();
|
||||
|
||||
if (!$manifest || !isset($manifest->files) || !isset($manifest->files->file))
|
||||
{
|
||||
return [];
|
||||
}
|
||||
|
||||
$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
|
||||
|
||||
foreach ($manifest->files->file as $file)
|
||||
{
|
||||
$childType = (string) $file['type'];
|
||||
$element = (string) $file['id'];
|
||||
$group = (string) $file['group'];
|
||||
|
||||
if ($element === '')
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
$query = $db->getQuery(true)
|
||||
->select('COUNT(*)')
|
||||
->from($db->quoteName('#__extensions'))
|
||||
->where($db->quoteName('element') . ' = ' . $db->quote($element));
|
||||
|
||||
if ($childType !== '')
|
||||
{
|
||||
$query->where($db->quoteName('type') . ' = ' . $db->quote($childType));
|
||||
}
|
||||
|
||||
// Plugins are only unique by element + folder (the manifest "group").
|
||||
if ($childType === 'plugin' && $group !== '')
|
||||
{
|
||||
$query->where($db->quoteName('folder') . ' = ' . $db->quote($group));
|
||||
}
|
||||
|
||||
$db->setQuery($query);
|
||||
|
||||
if ((int) $db->loadResult() === 0)
|
||||
{
|
||||
$missing[] = $element . ($group !== '' ? ' (' . $group . ')' : '');
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (\Throwable $e)
|
||||
{
|
||||
return [];
|
||||
}
|
||||
|
||||
return $missing;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user