1
0

refactor: extract shared code from bin/ scripts and remove legacy scheduler runner

- Extract ModuleManifestLoader for standalone manifest loading (used by
  module-deactivate and ValidateCommand)
- Extract SqlStatementParser, ModuleMigrationRepository, and
  ModuleMigrationService from bin/module-migrate.php to enforce strict
  layering (SQL in repository, orchestration in service)
- Delete bin/scheduler-run.php (fully superseded by bin/console scheduler:run)
- Update docs and test fixtures to reference bin/console

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-03-22 13:45:16 +01:00
parent e06e5bde03
commit 141f0a0155
14 changed files with 487 additions and 300 deletions

View File

@@ -37,20 +37,10 @@ function moduleDeactivateRun(): int
}
$projectRoot = moduleCliProjectRoot();
$manifestFile = $projectRoot . '/modules/' . $moduleId . '/module.php';
if (!is_file($manifestFile)) {
fwrite(STDERR, "Error: module manifest not found at {$manifestFile}\n");
return 1;
}
$raw = require $manifestFile;
if (!is_array($raw)) {
fwrite(STDERR, "Error: manifest must return an array.\n");
return 1;
}
$manifest = \MintyPHP\App\Module\ModuleManifest::fromArray($raw, dirname($manifestFile));
$manifest = \MintyPHP\App\Module\ModuleManifestLoader::loadFromDisk(
$projectRoot . '/modules',
$moduleId
);
$handlerClass = $manifest->deactivationHandler;
if ($handlerClass === null) {

View File

@@ -18,7 +18,8 @@
declare(strict_types=1);
use MintyPHP\App\Module\ModuleRegistry;
use MintyPHP\DB;
use MintyPHP\Repository\Module\ModuleMigrationRepository;
use MintyPHP\Service\Module\ModuleMigrationService;
require_once __DIR__ . '/module-cli-bootstrap.php';
@@ -31,220 +32,17 @@ function moduleMigrateRun(): int
$lockFile,
'module-migrate: another migration run is in progress, skipping.',
static function (): int {
$totalApplied = 0;
$registry = app(ModuleRegistry::class);
$modules = $registry->getModules();
$hasModules = count($modules) > 0;
if (!$hasModules) {
fwrite(STDOUT, "module-migrate: no modules enabled, nothing to do.\n");
return 0;
}
// Ensure tracking table exists (safe if already created by db/updates/ script)
DB::query(
'CREATE TABLE IF NOT EXISTS `module_migrations` (
`id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
`module_id` VARCHAR(64) NOT NULL,
`filename` VARCHAR(255) NOT NULL,
`applied_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`id`),
UNIQUE KEY `uq_module_migration` (`module_id`, `filename`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci'
$service = new ModuleMigrationService(
app(ModuleRegistry::class),
new ModuleMigrationRepository()
);
foreach ($modules as $manifest) {
$migrationsPath = $manifest->migrationsPath;
if ($migrationsPath === null || !is_dir($migrationsPath)) {
continue;
}
// Discover SQL files
$files = glob($migrationsPath . '/*.sql');
if ($files === false || count($files) === 0) {
continue;
}
sort($files); // alphabetical order
// Get already-applied filenames
$applied = [];
$rows = DB::select('SELECT filename FROM module_migrations WHERE module_id = ?', (string) $manifest->id);
foreach ((array) $rows as $row) {
if (!is_array($row)) {
continue;
}
$filename = trim((string) (($row['module_migrations']['filename'] ?? $row['filename'] ?? '')));
if ($filename !== '') {
$applied[$filename] = true;
}
}
foreach ($files as $file) {
$filename = basename($file);
if (isset($applied[$filename])) {
continue;
}
$sql = file_get_contents($file);
if ($sql === false || trim($sql) === '') {
fwrite(STDERR, sprintf("module-migrate: WARNING skipping empty file %s/%s\n", $manifest->id, $filename));
continue;
}
fwrite(STDOUT, sprintf("module-migrate: applying %s/%s ... ", $manifest->id, $filename));
// Execute migration inside a transaction so partial failures don't leave the DB inconsistent.
DB::query('START TRANSACTION');
try {
$statements = moduleMigrateSplitSqlStatements($sql);
foreach ($statements as $statement) {
DB::query($statement);
}
// Record as applied
DB::query(
'INSERT INTO module_migrations (module_id, filename) VALUES (?, ?)',
(string) $manifest->id,
$filename
);
DB::query('COMMIT');
} catch (\Throwable $migrationError) {
DB::query('ROLLBACK');
throw new \RuntimeException(
sprintf("Migration %s/%s failed: %s", $manifest->id, $filename, $migrationError->getMessage()),
0,
$migrationError
);
}
fwrite(STDOUT, "OK\n");
$totalApplied++;
}
}
if ($totalApplied === 0) {
fwrite(STDOUT, "module-migrate: all modules up to date, 0 new migrations.\n");
} else {
fwrite(STDOUT, sprintf("module-migrate: applied %d migration(s).\n", $totalApplied));
}
return 0;
$result = $service->applyPendingMigrations();
return $result['ok'] ? 0 : 1;
}
);
});
}
/**
* @return list<string>
*/
function moduleMigrateSplitSqlStatements(string $sql): array
{
if (preg_match('/^\s*DELIMITER\s+/mi', $sql) === 1) {
throw new RuntimeException('DELIMITER directives are not supported in module migration SQL files.');
}
$statements = [];
$buffer = '';
$length = strlen($sql);
$inSingleQuote = false;
$inDoubleQuote = false;
$inBacktick = false;
$inLineComment = false;
$inBlockComment = false;
$escapeNext = false;
for ($i = 0; $i < $length; $i++) {
$char = $sql[$i];
$next = $i + 1 < $length ? $sql[$i + 1] : '';
if ($inLineComment) {
$buffer .= $char;
if ($char === "\n") {
$inLineComment = false;
}
continue;
}
if ($inBlockComment) {
$buffer .= $char;
if ($char === '*' && $next === '/') {
$buffer .= $next;
$i++;
$inBlockComment = false;
}
continue;
}
if (!$inSingleQuote && !$inDoubleQuote && !$inBacktick) {
if ($char === '-' && $next === '-' && ($i + 2 >= $length || ctype_space($sql[$i + 2]))) {
$buffer .= $char . $next;
$i++;
$inLineComment = true;
continue;
}
if ($char === '#') {
$buffer .= $char;
$inLineComment = true;
continue;
}
if ($char === '/' && $next === '*') {
$buffer .= $char . $next;
$i++;
$inBlockComment = true;
continue;
}
}
if ($escapeNext) {
$buffer .= $char;
$escapeNext = false;
continue;
}
if (($inSingleQuote || $inDoubleQuote) && $char === '\\') {
$buffer .= $char;
$escapeNext = true;
continue;
}
if (!$inDoubleQuote && !$inBacktick && $char === '\'') {
$inSingleQuote = !$inSingleQuote;
$buffer .= $char;
continue;
}
if (!$inSingleQuote && !$inBacktick && $char === '"') {
$inDoubleQuote = !$inDoubleQuote;
$buffer .= $char;
continue;
}
if (!$inSingleQuote && !$inDoubleQuote && $char === '`') {
$inBacktick = !$inBacktick;
$buffer .= $char;
continue;
}
if (!$inSingleQuote && !$inDoubleQuote && !$inBacktick && $char === ';') {
$statement = trim($buffer);
if ($statement !== '') {
$statements[] = $statement;
}
$buffer = '';
continue;
}
$buffer .= $char;
}
$tail = trim($buffer);
if ($tail !== '') {
$statements[] = $tail;
}
return $statements;
}
if (PHP_SAPI === 'cli' && realpath((string) ($_SERVER['SCRIPT_FILENAME'] ?? '')) === __FILE__) {
fwrite(STDERR, "Hint: prefer `php bin/console module:migrate` instead.\n");
exit(moduleMigrateRun());

View File

@@ -1,58 +0,0 @@
#!/usr/bin/env php
<?php
declare(strict_types=1);
use MintyPHP\DB;
use MintyPHP\Service\Audit\SystemAuditService;
use MintyPHP\Service\Scheduler\SchedulerServicesFactory;
require_once __DIR__ . '/cli-bootstrap.php';
fwrite(STDERR, "Hint: prefer `php bin/console scheduler:run` instead.\n");
$exitCode = 0;
$startedAt = microtime(true);
try {
cliBootstrapApp('scheduler', 'bin/scheduler-run.php');
$factory = app(SchedulerServicesFactory::class);
$result = $factory->createSchedulerRunService()->runDueJobs();
if (!($result['ok'] ?? false)) {
$error = (string) ($result['error'] ?? 'unexpected_error');
fwrite(STDERR, sprintf("scheduler run failed: %s\n", $error));
$exitCode = 1;
} else {
$line = sprintf(
"scheduler completed: processed=%d success=%d failed=%d skipped=%d duration_ms=%d\n",
(int) ($result['processed'] ?? 0),
(int) ($result['success'] ?? 0),
(int) ($result['failed'] ?? 0),
(int) ($result['skipped'] ?? 0),
(int) ($result['duration_ms'] ?? 0)
);
fwrite(STDOUT, $line);
}
} catch (Throwable $exception) {
try {
app(SystemAuditService::class)->record('scheduler.run', 'failed', [
'error_code' => 'unexpected_error',
'metadata' => [
'trigger_type' => 'scheduler',
'run_status' => 'failed',
'processed' => 0,
'success_count' => 0,
'failed_count' => 0,
'skipped_count' => 0,
'duration_ms' => max(0, (int) round((microtime(true) - $startedAt) * 1000)),
'bootstrap_error' => true,
],
]);
} catch (Throwable) {
// fail-open
}
fwrite(STDERR, sprintf("scheduler run failed: unexpected_error: %s\n", $exception->getMessage()));
$exitCode = 1;
} finally {
DB::close();
}
exit($exitCode);