manual re-sync; also fix the build again, again

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());

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());