From 4a3f5abfa5cdbff1bbe5dd87b9101a66aea438ba Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sun, 19 Jan 2025 23:46:11 +0000
Subject: [PATCH 1/3] [docker] exit early if build fails

If the build fails, don't then attempt to run the container-which-wasn't-built
---
 .devcontainer/build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.devcontainer/build.sh b/.devcontainer/build.sh
index f7b640c0..10f8b69a 100755
--- a/.devcontainer/build.sh
+++ b/.devcontainer/build.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
+set -eu
 cd $(dirname $0)/../
 docker run --rm -v ${PWD}:/app $(docker build -q -f .devcontainer/Dockerfile .)

From cc0feeed4c0176c12e557b9afe2e415acce7b3b4 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sun, 19 Jan 2025 23:46:19 +0000
Subject: [PATCH 2/3] [docker] mark doc directories as safe for git to use

docker mounting can cause the doc directory to be owned by a different user to the one running inside the container, which git complains about, but is fine for our use-case
---
 .devcontainer/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index cea8fa13..11b726c0 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -3,6 +3,8 @@ ARG DEBIAN_FRONTEND=noninteractive
 ARG XDEBUG_MODE=coverage
 RUN apt update -y && apt install -y git composer php-cli php-dom php-curl php-xdebug vim
 WORKDIR /app
+RUN git config --global --add safe.directory /app/generator/doc/doc-en/en && \
+    git config --global --add safe.directory /app/generator/doc/doc-en/doc-base
 CMD cd /app/generator/doc && ./update.sh && \
     cd /app && composer install && \
     cd /app/generator && composer install && php ./safe.php generate

From f3df8317259a546af3ad7497fa9bba36bfe0d582 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sun, 19 Jan 2025 23:46:24 +0000
Subject: [PATCH 3/3] [generator] make import tests into a unit test

When we run safe with multiple different PHP versions, we want to make sure importing the library works under all versions - not just the version we generate with
---
 generator/src/GenerateCommand.php | 20 ---------------
 tests/GeneratedFilesTest.php      | 42 +++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 20 deletions(-)
 create mode 100644 tests/GeneratedFilesTest.php

diff --git a/generator/src/GenerateCommand.php b/generator/src/GenerateCommand.php
index 572e5bd4..6c21416b 100644
--- a/generator/src/GenerateCommand.php
+++ b/generator/src/GenerateCommand.php
@@ -53,26 +53,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $this->runCsFix($output);
 
-        // Let's require the generated file to check there is no error.
-        $files = \glob(__DIR__.'/../../generated/*.php');
-        if ($files === false) {
-            throw new \RuntimeException('Failed to require the generated file');
-        }
-
-        foreach ($files as $file) {
-            require($file);
-        }
-
-        $files = \glob(__DIR__.'/../../generated/Exceptions/*.php');
-        if ($files === false) {
-            throw new \RuntimeException('Failed to require the generated exception file');
-        }
-
-        require_once __DIR__.'/../../lib/Exceptions/SafeExceptionInterface.php';
-        foreach ($files as $file) {
-            require($file);
-        }
-
         // Finally, let's edit the composer.json file
         $output->writeln('Editing composer.json');
         ComposerJsonEditor::editComposerFileForGeneration(\array_values($modules));
diff --git a/tests/GeneratedFilesTest.php b/tests/GeneratedFilesTest.php
new file mode 100644
index 00000000..8c4c9499
--- /dev/null
+++ b/tests/GeneratedFilesTest.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+use PHPUnit\Framework\TestCase;
+
+final class GeneratedFilesTest extends TestCase
+{
+    public function testRequireModules(): void
+    {
+        self::expectNotToPerformAssertions();
+
+        $files = \glob(__DIR__.'/../generated/*.php');
+        if ($files === false) {
+            throw new \RuntimeException('Failed to require the generated file');
+        }
+
+        foreach ($files as $file) {
+            require_once($file);
+        }
+    }
+
+    public function testRequireExceptions(): void
+    {
+        self::expectNotToPerformAssertions();
+
+        $files = \glob(__DIR__.'/../generated/Exceptions/*.php');
+        if ($files === false) {
+            throw new \RuntimeException('Failed to require the generated exception file');
+        }
+        foreach ($files as $file) {
+            require_once($file);
+        }
+    }
+
+    public function testRequireExceptionInterface(): void
+    {
+        self::expectNotToPerformAssertions();
+
+        require_once __DIR__.'/../lib/Exceptions/SafeExceptionInterface.php';
+    }
+}