From d3b2a45a4a929be76eca9f9f5d538e7b84b5e57a Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sat, 24 Oct 2026 13:34:59 +0100
Subject: [PATCH] manual re-sync; also fix the build again, again

---
 generated/8.6/functionsList.php            |   2 -
 generated/8.6/rector-migrate.php           |   2 -
 generated/8.6/session.php                  | 292 +++++++++++++++++++++
 generated/8.6/var.php                      |  18 ++
 generated/session.php                      |   2 +-
 generated/var.php                          |   2 +-
 generator/src/Commands/GenerateCommand.php |  16 ++
 tests/DateTimeImmutableTest.php            |   4 +-
 tests/DateTimeTest.php                     |   2 +-
 9 files changed, 331 insertions(+), 9 deletions(-)
 create mode 100644 generated/8.6/session.php
 create mode 100644 generated/8.6/var.php

diff --git a/generated/8.6/functionsList.php b/generated/8.6/functionsList.php
index 03ac5199..e24f69f5 100644
--- a/generated/8.6/functionsList.php
+++ b/generated/8.6/functionsList.php
@@ -893,8 +893,6 @@
     'session_save_path',
     'session_start',
     'session_unset',
-    'session_write_close',
-    'settype',
     'set_include_path',
     'set_time_limit',
     'sha1_file',
diff --git a/generated/8.6/rector-migrate.php b/generated/8.6/rector-migrate.php
index f6035d2d..a9e9b053 100644
--- a/generated/8.6/rector-migrate.php
+++ b/generated/8.6/rector-migrate.php
@@ -901,8 +901,6 @@
             'session_save_path' => 'Safe\session_save_path',
             'session_start' => 'Safe\session_start',
             'session_unset' => 'Safe\session_unset',
-            'session_write_close' => 'Safe\session_write_close',
-            'settype' => 'Safe\settype',
             'set_include_path' => 'Safe\set_include_path',
             'set_time_limit' => 'Safe\set_time_limit',
             'sha1_file' => 'Safe\sha1_file',
diff --git a/generated/8.6/session.php b/generated/8.6/session.php
new file mode 100644
index 00000000..fc15c1e1
--- /dev/null
+++ b/generated/8.6/session.php
@@ -0,0 +1,292 @@
+<?php
+
+namespace Safe;
+
+use Safe\Exceptions\SessionException;
+
+/**
+ * @throws SessionException
+ *
+ */
+function session_abort(): void
+{
+    error_clear_last();
+    $safeResult = \session_abort();
+    if ($safeResult === false) {
+        throw SessionException::createFromPhpError();
+    }
+}
+
+
+/**
+ * @param int|null $value
+ * @return int
+ * @throws SessionException
+ *
+ */
+function session_cache_expire(?int $value = null): int
+{
+    error_clear_last();
+    if ($value !== null) {
+        $safeResult = \session_cache_expire($value);
+    } else {
+        $safeResult = \session_cache_expire();
+    }
+    if ($safeResult === false) {
+        throw SessionException::createFromPhpError();
+    }
+    return $safeResult;
+}
+
+
+/**
+ * @param null|string $value
+ * @return string
+ * @throws SessionException
+ *
+ */
+function session_cache_limiter(?string $value = null): string
+{
+    error_clear_last();
+    if ($value !== null) {
+        $safeResult = \session_cache_limiter($value);
+    } else {
+        $safeResult = \session_cache_limiter();
+    }
+    if ($safeResult === false) {
+        throw SessionException::createFromPhpError();
+    }
+    return $safeResult;
+}
+
+
+/**
+ * @param string $prefix
+ * @return string
+ * @throws SessionException
+ *
+ */
+function session_create_id(string $prefix = ""): string
+{
+    error_clear_last();
+    $safeResult = \session_create_id($prefix);
+    if ($safeResult === false) {
+        throw SessionException::createFromPhpError();
+    }
+    return $safeResult;
+}
+
+
+/**
+ * @param string $data
+ * @throws SessionException
+ *
+ */
+function session_decode(string $data): void
+{
+    error_clear_last();
+    $safeResult = \session_decode($data);
+    if ($safeResult === false) {
+        throw SessionException::createFromPhpError();
+    }
+}
+
+
+/**
+ * @throws SessionException
+ *
+ */
+function session_destroy(): void
+{
+    error_clear_last();
+    $safeResult = \session_destroy();
+    if ($safeResult === false) {
+        throw SessionException::createFromPhpError();
+    }
+}
+
+
+/**
+ * @return string
+ * @throws SessionException
+ *
+ */
+function session_encode(): string
+{
+    error_clear_last();
+    $safeResult = \session_encode();
+    if ($safeResult === false) {
+        throw SessionException::createFromPhpError();
+    }
+    return $safeResult;
+}
+
+
+/**
+ * @return int
+ * @throws SessionException
+ *
+ */
+function session_gc(): int
+{
+    error_clear_last();
+    $safeResult = \session_gc();
+    if ($safeResult === false) {
+        throw SessionException::createFromPhpError();
+    }
+    return $safeResult;
+}
+
+
+/**
+ * @param null|string $id
+ * @return string
+ * @throws SessionException
+ *
+ */
+function session_id(?string $id = null): string
+{
+    error_clear_last();
+    if ($id !== null) {
+        $safeResult = \session_id($id);
+    } else {
+        $safeResult = \session_id();
+    }
+    if ($safeResult === false) {
+        throw SessionException::createFromPhpError();
+    }
+    return $safeResult;
+}
+
+
+/**
+ * @param null|string $module
+ * @return string
+ * @throws SessionException
+ *
+ */
+function session_module_name(?string $module = null): string
+{
+    error_clear_last();
+    if ($module !== null) {
+        $safeResult = \session_module_name($module);
+    } else {
+        $safeResult = \session_module_name();
+    }
+    if ($safeResult === false) {
+        throw SessionException::createFromPhpError();
+    }
+    return $safeResult;
+}
+
+
+/**
+ * @param null|string $name
+ * @return non-falsy-string
+ * @throws SessionException
+ *
+ */
+function session_name(?string $name = null): string
+{
+    error_clear_last();
+    if ($name !== null) {
+        $safeResult = \session_name($name);
+    } else {
+        $safeResult = \session_name();
+    }
+    if ($safeResult === false) {
+        throw SessionException::createFromPhpError();
+    }
+    return $safeResult;
+}
+
+
+/**
+ * @param bool $delete_old_session
+ * @throws SessionException
+ *
+ */
+function session_regenerate_id(bool $delete_old_session = false): void
+{
+    error_clear_last();
+    $safeResult = \session_regenerate_id($delete_old_session);
+    if ($safeResult === false) {
+        throw SessionException::createFromPhpError();
+    }
+}
+
+
+/**
+ * @throws SessionException
+ *
+ */
+function session_reset(): void
+{
+    error_clear_last();
+    $safeResult = \session_reset();
+    if ($safeResult === false) {
+        throw SessionException::createFromPhpError();
+    }
+}
+
+
+/**
+ * @param null|string $path
+ * @return string
+ * @throws SessionException
+ *
+ */
+function session_save_path(?string $path = null): string
+{
+    error_clear_last();
+    if ($path !== null) {
+        $safeResult = \session_save_path($path);
+    } else {
+        $safeResult = \session_save_path();
+    }
+    if ($safeResult === false) {
+        throw SessionException::createFromPhpError();
+    }
+    return $safeResult;
+}
+
+
+/**
+ * @param array $options
+ * @throws SessionException
+ *
+ */
+function session_start(array $options = []): void
+{
+    error_clear_last();
+    $safeResult = \session_start($options);
+    if ($safeResult === false) {
+        throw SessionException::createFromPhpError();
+    }
+}
+
+
+/**
+ * @throws SessionException
+ *
+ */
+function session_unset(): void
+{
+    error_clear_last();
+    $safeResult = \session_unset();
+    if ($safeResult === false) {
+        throw SessionException::createFromPhpError();
+    }
+}
+
+
+/**
+ * @return bool
+ *
+ */
+function session_write_close(): bool
+{
+    error_clear_last();
+    $safeResult = \session_write_close();
+    return $safeResult;
+}
diff --git a/generated/8.6/var.php b/generated/8.6/var.php
new file mode 100644
index 00000000..0f76de77
--- /dev/null
+++ b/generated/8.6/var.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Safe;
+
+use Safe\Exceptions\VarException;
+
+/**
+ * @param mixed $var
+ * @param string $type
+ * @return bool
+ *
+ */
+function settype(&$var, string $type): bool
+{
+    error_clear_last();
+    $safeResult = \settype($var, $type);
+    return $safeResult;
+}
diff --git a/generated/session.php b/generated/session.php
index 74b44bf9..ab397e8e 100644
--- a/generated/session.php
+++ b/generated/session.php
@@ -16,5 +16,5 @@
     require_once __DIR__ . '/8.1/session.php';
 }
 if (str_starts_with(PHP_VERSION, "8.6.")) {
-    require_once __DIR__ . '/8.1/session.php';
+    require_once __DIR__ . '/8.6/session.php';
 }
diff --git a/generated/var.php b/generated/var.php
index da1872ce..969299cf 100644
--- a/generated/var.php
+++ b/generated/var.php
@@ -16,5 +16,5 @@
     require_once __DIR__ . '/8.1/var.php';
 }
 if (str_starts_with(PHP_VERSION, "8.6.")) {
-    require_once __DIR__ . '/8.1/var.php';
+    require_once __DIR__ . '/8.6/var.php';
 }
diff --git a/generator/src/Commands/GenerateCommand.php b/generator/src/Commands/GenerateCommand.php
index e915f76b..68db4cd6 100644
--- a/generator/src/Commands/GenerateCommand.php
+++ b/generator/src/Commands/GenerateCommand.php
@@ -112,6 +112,12 @@ protected function execute(
         \ksort($modules);
         ComposerJsonEditor::editComposerFileForGeneration(\array_keys($modules));
 
+        // Regenerate the autoloader to account for any generated/*.php files being
+        // added or removed (files can get removed if you for example only generate
+        // for a subset of versions), otherwise phpcbf will fail
+        $output->writeln('Running composer install');
+        $this->runComposerInstall();
+
         // Format the generated files
         $this->runCsFix($output);
 
@@ -148,6 +154,16 @@ private function rmGenerated(): void
         }
     }
 
+    private function runComposerInstall(): void
+    {
+        $process = new Process(['composer', 'install'], FileCreator::getSafeRootDir());
+        $process->setTimeout(10);
+        $code = $process->run();
+        if ($code !== 0) {
+            throw new \RuntimeException("Failed to run composer install in " . FileCreator::getSafeRootDir() . " (exit $code):\n{$process->getErrorOutput()}");
+        }
+    }
+
     private function runCsFix(OutputInterface $output): void
     {
         $process = new Process(['vendor/bin/phpcbf'], FileCreator::getSafeRootDir());
diff --git a/tests/DateTimeImmutableTest.php b/tests/DateTimeImmutableTest.php
index a6c27cfd..698c0368 100644
--- a/tests/DateTimeImmutableTest.php
+++ b/tests/DateTimeImmutableTest.php
@@ -45,7 +45,7 @@ public static function createFromInterfaces(): array
     public function testCreateFromFormatCrashOnError(): void
     {
         $this->expectException(\Safe\Exceptions\DatetimeException::class);
-        $datetime = \Safe\DateTimeImmutable::createFromFormat('lol', 'super');
+        \Safe\DateTimeImmutable::createFromFormat('lol', 'super');
     }
 
     public function testConstructorPreserveTimeAndTimezone(): void
@@ -109,7 +109,7 @@ public function testSetTimestamp(): void
     {
         $datetime = new \DateTimeImmutable('2000-01-01');
         $safeDatime = new \Safe\DateTimeImmutable('2000-01-01');
-        $datetime = $datetime = $datetime->setTimestamp(12);
+        $datetime = $datetime->setTimestamp(12);
         $safeDatime = $safeDatime->setTimestamp(12);
 
         $this->assertEquals($datetime->getTimestamp(), $safeDatime->getTimestamp());
diff --git a/tests/DateTimeTest.php b/tests/DateTimeTest.php
index 2d950584..69c8a246 100644
--- a/tests/DateTimeTest.php
+++ b/tests/DateTimeTest.php
@@ -12,7 +12,7 @@ class DateTimeTest extends TestCase
     public function testSafeDatetimeCrashOnError(): void
     {
         $this->expectException(DatetimeException::class);
-        $datetime = \Safe\DateTime::createFromFormat('lol', 'super');
+        \Safe\DateTime::createFromFormat('lol', 'super');
     }
 
     public function testCreateFromFormatPreserveTimeAndTimezone(): void