Menüleiste am Handy, Updater in zwei Schritten, Absturzerkennung ohne Merkdateien (0.62.0)
Some checks failed
CI / PHP 8.4 / mariadb:10.6 (pull_request) Successful in 11m34s
CI / PHP 8.3 / mariadb:10.6 (pull_request) Successful in 12m8s
CI / PHP 8.4 / mariadb:11.4 (pull_request) Successful in 15m14s
CI / PHP 8.3 / mariadb:11.4 (pull_request) Successful in 15m47s
CI / PHP 8.4 / mysql:8.0 (pull_request) Failing after 13m48s
CI / PHP 8.3 / mysql:8.0 (pull_request) Failing after 14m15s
CI / PHP 8.4 / mysql:8.4 (pull_request) Failing after 16m38s
CI / PHP 8.3 / mysql:8.4 (pull_request) Failing after 17m2s
CI / Bekannte Sicherheitslücken in Paketen (pull_request) Successful in 1m16s
CI / Build-Artefakte aktuell (pull_request) Successful in 1m53s
Some checks failed
CI / PHP 8.4 / mariadb:10.6 (pull_request) Successful in 11m34s
CI / PHP 8.3 / mariadb:10.6 (pull_request) Successful in 12m8s
CI / PHP 8.4 / mariadb:11.4 (pull_request) Successful in 15m14s
CI / PHP 8.3 / mariadb:11.4 (pull_request) Successful in 15m47s
CI / PHP 8.4 / mysql:8.0 (pull_request) Failing after 13m48s
CI / PHP 8.3 / mysql:8.0 (pull_request) Failing after 14m15s
CI / PHP 8.4 / mysql:8.4 (pull_request) Failing after 16m38s
CI / PHP 8.3 / mysql:8.4 (pull_request) Failing after 17m2s
CI / Bekannte Sicherheitslücken in Paketen (pull_request) Successful in 1m16s
CI / Build-Artefakte aktuell (pull_request) Successful in 1m53s
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
623d423ad8
commit
c275db4dce
147 changed files with 760 additions and 498 deletions
|
|
@ -42,6 +42,7 @@ class PluginSystemTest extends TestCase
|
|||
{
|
||||
Filesystem::deleteDirectory($this->dir);
|
||||
Schema::dropIfExists('beispiel_eintraege');
|
||||
self::$whileLoading = null;
|
||||
|
||||
parent::tearDown();
|
||||
}
|
||||
|
|
@ -227,47 +228,86 @@ class PluginSystemTest extends TestCase
|
|||
$this->assertSame(['ablage'], array_keys($manager->loaded()));
|
||||
}
|
||||
|
||||
public function test_fatal_error_during_previous_load_is_detected(): void
|
||||
/** Wird von Test-Plugins in register() aufgerufen – simuliert einen schweren Fehler mitten im Laden */
|
||||
public static ?\Closure $whileLoading = null;
|
||||
|
||||
private function crashingPlugin(string $slug): void
|
||||
{
|
||||
$this->makePlugin('absturz', base: 'core');
|
||||
$marker = storage_path('framework/plugins/booting-absturz');
|
||||
@mkdir(dirname($marker), 0777, true);
|
||||
@unlink(storage_path('framework/plugins/strike-absturz'));
|
||||
|
||||
// Erster Abbruch: bleibt aktiv (kann von außen kommen, z. B. beendeter PHP-Prozess)
|
||||
file_put_contents($marker, (string) (time() - 120));
|
||||
$manager = $this->manager();
|
||||
$manager->registerAll();
|
||||
$this->assertTrue($manager->isEnabled('absturz'));
|
||||
$this->assertFileDoesNotExist($marker);
|
||||
|
||||
// Zweiter Abbruch binnen einer Stunde: abgeschaltet
|
||||
file_put_contents($marker, (string) (time() - 120));
|
||||
$manager = $this->manager();
|
||||
$manager->registerAll();
|
||||
$this->assertFalse($manager->isEnabled('absturz'));
|
||||
$this->assertStringContainsString('Schwerer Fehler', $manager->problem('absturz'));
|
||||
$this->assertFileDoesNotExist($marker);
|
||||
$this->assertFileDoesNotExist(storage_path('framework/plugins/strike-absturz'));
|
||||
$this->makePlugin($slug, register: '($c = \\'.self::class.'::$whileLoading) && $c();', base: 'core');
|
||||
}
|
||||
|
||||
public function test_fresh_marker_with_old_file_time_is_not_a_crash(): void
|
||||
public function test_fatal_error_while_loading_disables_the_plugin_on_the_second_strike(): void
|
||||
{
|
||||
// Netzlaufwerk mit nachgehender Uhr: Dateizeit alt, Inhalt aktuell – lädt gerade parallel
|
||||
$this->makePlugin('parallel', base: 'core');
|
||||
$marker = storage_path('framework/plugins/booting-parallel');
|
||||
@mkdir(dirname($marker), 0777, true);
|
||||
@unlink(storage_path('framework/plugins/strike-parallel'));
|
||||
$this->crashingPlugin('absturz');
|
||||
$fatal = ['type' => E_ERROR, 'message' => "Allowed memory size exhausted\nStack trace", 'file' => 'x.php', 'line' => 1];
|
||||
|
||||
// Erster Abbruch: bleibt aktiv (kann z. B. eine überschrittene Laufzeit sein)
|
||||
$manager = $this->manager();
|
||||
self::$whileLoading = fn () => $manager->handleFatalError($fatal);
|
||||
$manager->registerAll();
|
||||
$this->assertTrue($manager->isEnabled('absturz'));
|
||||
$this->assertNotNull((new PluginState($this->dir.'/state.json'))->crashedAt('absturz'));
|
||||
|
||||
// Warnungen und Fehler außerhalb des Ladens zählen nicht
|
||||
$manager->handleFatalError($fatal);
|
||||
$manager = $this->manager();
|
||||
self::$whileLoading = fn () => $manager->handleFatalError(['type' => E_WARNING, 'message' => 'egal']);
|
||||
$manager->registerAll();
|
||||
$this->assertTrue($manager->isEnabled('absturz'));
|
||||
|
||||
// Zweiter Abbruch binnen einer Stunde: abgeschaltet, mit Grund
|
||||
$manager = $this->manager();
|
||||
self::$whileLoading = fn () => $manager->handleFatalError($fatal);
|
||||
$manager->registerAll();
|
||||
self::$whileLoading = null;
|
||||
|
||||
$manager = $this->manager();
|
||||
$this->assertFalse($manager->isEnabled('absturz'));
|
||||
$this->assertSame('Schwerer Fehler beim Laden: Allowed memory size exhausted', (new PluginState($this->dir.'/state.json'))->disabledReason('absturz'));
|
||||
}
|
||||
|
||||
public function test_fatal_error_during_an_update_keeps_the_plugin(): void
|
||||
{
|
||||
$this->crashingPlugin('absturz');
|
||||
app(MaintenanceFlag::class)->activate(300);
|
||||
|
||||
foreach ([1, 2] as $round) {
|
||||
file_put_contents($marker, (string) time());
|
||||
touch($marker, time() - 600);
|
||||
$manager = $this->manager();
|
||||
self::$whileLoading = fn () => $manager->handleFatalError(['type' => E_COMPILE_ERROR, 'message' => 'Cannot redeclare class']);
|
||||
$manager->registerAll();
|
||||
$this->assertTrue($manager->isEnabled('parallel'), "Runde {$round}");
|
||||
$this->assertTrue($manager->isEnabled('absturz'), "Runde {$round}");
|
||||
}
|
||||
|
||||
$this->assertFileDoesNotExist(storage_path('framework/plugins/strike-parallel'));
|
||||
self::$whileLoading = null;
|
||||
$this->assertNull((new PluginState($this->dir.'/state.json'))->crashedAt('absturz'));
|
||||
}
|
||||
|
||||
public function test_crash_note_does_not_change_the_default_state(): void
|
||||
{
|
||||
$this->makePlugin('kern', base: 'core');
|
||||
$this->makePlugin('kunde');
|
||||
$state = new PluginState($this->dir.'/state.json');
|
||||
$state->recordCrash('kern');
|
||||
$state->recordCrash('kunde');
|
||||
|
||||
$manager = $this->manager();
|
||||
$this->assertTrue($manager->isEnabled('kern'));
|
||||
$this->assertFalse($manager->isEnabled('kunde'));
|
||||
}
|
||||
|
||||
public function test_marker_files_of_older_versions_are_removed_without_disabling(): void
|
||||
{
|
||||
$this->makePlugin('alt', base: 'core');
|
||||
$dir = storage_path('framework/plugins');
|
||||
@mkdir($dir, 0777, true);
|
||||
file_put_contents($dir.'/booting-alt', (string) (time() - 3000));
|
||||
file_put_contents($dir.'/strike-alt', (string) (time() - 60));
|
||||
|
||||
$manager = $this->manager();
|
||||
$manager->registerAll();
|
||||
|
||||
$this->assertTrue($manager->isEnabled('alt'));
|
||||
$this->assertDirectoryDoesNotExist($dir);
|
||||
}
|
||||
|
||||
public function test_customer_plugins_are_inactive_until_activated(): void
|
||||
|
|
@ -459,7 +499,6 @@ class PluginSystemTest extends TestCase
|
|||
$manager->registerAll();
|
||||
$this->assertTrue($manager->isEnabled('wackelig'));
|
||||
$this->assertArrayNotHasKey('wackelig', $manager->loaded());
|
||||
$this->assertFileDoesNotExist(storage_path('framework/plugins/booting-wackelig'));
|
||||
|
||||
$flag->deactivate();
|
||||
$this->assertTrue($flag->isUpdating());
|
||||
|
|
@ -475,17 +514,11 @@ class PluginSystemTest extends TestCase
|
|||
$this->assertFalse($manager->isEnabled('wackelig'));
|
||||
}
|
||||
|
||||
public function test_crash_markers_from_an_update_keep_the_plugin_and_old_victims_come_back(): void
|
||||
public function test_plugins_disabled_by_older_versions_during_an_update_come_back(): void
|
||||
{
|
||||
$this->makePlugin('absturz', base: 'core');
|
||||
$this->makePlugin('opfer', base: 'core');
|
||||
file_put_contents($this->dir.'/.maintenance-last', json_encode(['since' => time() - 200, 'until' => time() - 100]));
|
||||
|
||||
// Absturz mitten im Update (Markierung aus dem Update-Zeitraum)
|
||||
$marker = storage_path('framework/plugins/booting-absturz');
|
||||
@mkdir(dirname($marker), 0777, true);
|
||||
file_put_contents($marker, (string) (time() - 150));
|
||||
|
||||
// Von einer älteren Version während des Updates abgeschaltet
|
||||
$state = new PluginState($this->dir.'/state.json');
|
||||
$state->setEnabled('opfer', false, 'Schwerer Fehler beim Laden (das Portal wurde dadurch unterbrochen).');
|
||||
|
|
@ -496,8 +529,6 @@ class PluginSystemTest extends TestCase
|
|||
$manager = $this->manager();
|
||||
$manager->registerAll();
|
||||
|
||||
$this->assertTrue($manager->isEnabled('absturz'));
|
||||
$this->assertFileDoesNotExist($marker);
|
||||
$this->assertTrue($manager->isEnabled('opfer'));
|
||||
$this->assertArrayHasKey('opfer', $manager->loaded());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -95,11 +95,27 @@ class UpdaterTest extends TestCase
|
|||
|
||||
$result = $this->updater($target)->installUpdate($admin->id);
|
||||
|
||||
// Schritt 1: Dateien getauscht, Datenbank folgt in der nächsten Anfrage (mit dem neuen Code)
|
||||
$this->assertSame(self::SHA, $result['sha']);
|
||||
$this->assertSame(0, $result['migrations']);
|
||||
$this->assertTrue($result['pending']);
|
||||
$this->assertFileExists($target.'/app/Neu.php');
|
||||
$this->assertSame('APP_KEY=geheim', file_get_contents($target.'/.env'));
|
||||
$this->assertSame(self::SHA, app(InstalledVersion::class)->current());
|
||||
$this->assertSame('finalize', app(UpdateProgress::class)->get()['step']);
|
||||
$this->assertTrue(app(MaintenanceFlag::class)->isActive());
|
||||
$this->assertTrue(app(UpdateProgress::class)->isRunning());
|
||||
$this->assertSame(0, AuditLog::query()->where('action', 'update.installed')->count());
|
||||
|
||||
// Eine Anfrage, die schon vor dem Austausch lief, darf Schritt 2 nicht ausführen
|
||||
$this->assertNull($this->updater($target)->finishPending(microtime(true) - 60));
|
||||
$this->assertFileExists(Updater::pendingPath());
|
||||
|
||||
// Schritt 2
|
||||
$finished = $this->updater($target)->finishPending(microtime(true) + 1);
|
||||
$this->assertSame(0, $finished['migrations']);
|
||||
$this->assertSame(1, $finished['files']);
|
||||
$this->assertFileDoesNotExist(Updater::pendingPath());
|
||||
$this->assertNull($this->updater($target)->finishPending(microtime(true) + 1));
|
||||
$this->assertSame('done', app(UpdateProgress::class)->get()['step']);
|
||||
$this->assertSame(100, app(UpdateProgress::class)->get()['pct']);
|
||||
$this->assertFalse(app(MaintenanceFlag::class)->isActive());
|
||||
|
|
@ -110,6 +126,20 @@ class UpdaterTest extends TestCase
|
|||
$this->assertEquals(['channel' => 'stable', 'sha' => self::SHA, 'migrations' => 0, 'files' => 1], $audit->data);
|
||||
}
|
||||
|
||||
public function test_next_request_finishes_a_pending_update(): void
|
||||
{
|
||||
app(MaintenanceFlag::class)->activate(300);
|
||||
app(UpdateProgress::class)->set(75, 'finalize', 'Datenbank folgt …');
|
||||
file_put_contents(Updater::pendingPath(), json_encode(['channel' => 'stable', 'sha' => self::SHA, 'files' => 3, 'user_id' => null, 'ready_at' => $_SERVER['REQUEST_TIME_FLOAT'] - 1]));
|
||||
|
||||
$this->get('/login')->assertOk();
|
||||
|
||||
$this->assertFileDoesNotExist(Updater::pendingPath());
|
||||
$this->assertFalse(app(MaintenanceFlag::class)->isActive());
|
||||
$this->assertSame('done', app(UpdateProgress::class)->get()['step']);
|
||||
$this->assertSame(1, AuditLog::query()->where('action', 'update.installed')->count());
|
||||
}
|
||||
|
||||
public function test_error_page_instead_of_zip_is_rejected(): void
|
||||
{
|
||||
Http::fake([
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue