chore: installer improvements (#633)

brendt · web-flow · commit 335018ab0876 · 2024-10-27T07:29:31.000+01:00
diff --git a/Nested/Namespace/TestInstallerClass.php b/Nested/Namespace/TestInstallerClass.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace App;
+
+final readonly class TestInstallerClass
+{
+}
diff --git a/src/Tempest/Auth/src/AuthInstaller.php b/src/Tempest/Auth/src/AuthInstaller.php
@@ -4,11 +4,8 @@
 
 namespace Tempest\Auth;
 
-use Tempest\Core\DoNotDiscover;
 use Tempest\Core\Installer;
 use Tempest\Core\PublishesFiles;
-use Tempest\Generation\ClassManipulator;
-use function Tempest\src_namespace;
 use function Tempest\src_path;
 
 final readonly class AuthInstaller implements Installer
@@ -35,12 +32,6 @@ public function install(): void
             $this->publish(
                 source: $source,
                 destination: $destination,
-                callback: function (string $source, string $destination): void {
-                    (new ClassManipulator($source))
-                        ->setNamespace(src_namespace())
-                        ->removeClassAttribute(DoNotDiscover::class)
-                        ->save($destination);
-                },
             );
         }
     }
diff --git a/src/Tempest/Core/src/PublishesFiles.php b/src/Tempest/Core/src/PublishesFiles.php
@@ -5,7 +5,12 @@
 namespace Tempest\Core;
 
 use Closure;
+use Nette\InvalidStateException;
 use Tempest\Console\HasConsole;
+use Tempest\Generation\ClassManipulator;
+use function Tempest\src_namespace;
+use function Tempest\src_path;
+use function Tempest\Support\str;
 
 trait PublishesFiles
 {
@@ -44,10 +49,35 @@ public function publish(
 
         copy($source, $destination);
 
+        $this->updateClass($destination);
+
         if ($callback !== null) {
             $callback($source, $destination);
         }
 
         $this->success("{$destination} created");
     }
+
+    private function updateClass(string $destination): void
+    {
+        try {
+            $class = new ClassManipulator($destination);
+        } catch (InvalidStateException) {
+            return;
+        }
+
+        $namespace = str($destination)
+            ->replaceStart(src_path(), src_namespace())
+            ->replaceEnd('.php', '')
+            ->replace('/', '\\')
+            ->explode('\\')
+            ->pop($value)
+            ->implode('\\')
+            ->toString();
+
+        $class
+            ->setNamespace($namespace)
+            ->removeClassAttribute(DoNotDiscover::class)
+            ->save($destination);
+    }
 }
diff --git a/tests/Fixtures/TestInstaller.php b/tests/Fixtures/TestInstaller.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Tempest\Fixtures;
+
+use Tempest\Core\Installer;
+use Tempest\Core\PublishesFiles;
+use function Tempest\src_path;
+
+final readonly class TestInstaller implements Installer
+{
+    use PublishesFiles;
+
+    public function getName(): string
+    {
+        return 'test';
+    }
+
+    public function install(): void
+    {
+        $this->publish(
+            __DIR__ . '/TestInstallerClass.php',
+            src_path('Foo/Bar/TestInstallerClass.php')
+        );
+
+        $this->publish(
+            __DIR__ . '/TestInstallerFile.html',
+            src_path('View/TestInstallerFile.html')
+        );
+    }
+}
diff --git a/tests/Fixtures/TestInstallerClass.php b/tests/Fixtures/TestInstallerClass.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Tempest\Fixtures;
+
+use Tempest\Core\DoNotDiscover;
+
+#[DoNotDiscover]
+final readonly class TestInstallerClass
+{
+}
diff --git a/tests/Fixtures/TestInstallerFile.html b/tests/Fixtures/TestInstallerFile.html
@@ -0,0 +1 @@
+<html></html>
diff --git a/tests/Integration/Core/InstallCommandTest.php b/tests/Integration/Core/InstallCommandTest.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Tempest\Integration\Core;
+
+use Tempest\Core\ComposerNamespace;
+use Tests\Tempest\Integration\FrameworkIntegrationTestCase;
+
+/**
+ * @internal
+ */
+final class InstallCommandTest extends FrameworkIntegrationTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->installer
+            ->configure(
+                __DIR__ . '/install',
+                new ComposerNamespace('App\\', __DIR__ . '/install/App'),
+            )
+            ->setRoot(__DIR__ . '/install');
+    }
+
+    protected function tearDown(): void
+    {
+        $this->installer->clean();
+
+        parent::tearDown();
+    }
+
+    public function test_class_is_adjusted(): void
+    {
+        $this->console
+            ->call('install test --force');
+
+        $this->installer
+            ->assertFileExists(
+                path: 'App/Foo/Bar/TestInstallerClass.php',
+            )
+            ->assertFileNotContains(
+                path: 'App/Foo/Bar/TestInstallerClass.php',
+                search: 'DoNotDiscover',
+            )
+            ->assertFileContains(
+                path: 'App/Foo/Bar/TestInstallerClass.php',
+                search: 'namespace App\Foo\Bar;',
+            )
+            ->assertFileExists(
+                path: 'App/View/TestInstallerFile.html',
+                content: '<html></html>',
+            );
+    }
+}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +<?php
++
 +namespace App;
++
 +final readonly class TestInstallerClass
 +{
 +}