fix(generation): ClassManipulator now make replacements before simplifies classnames (#876)

Co-authored-by: Brent Roose <[email protected]>

Author: gturpin-dev

src/Tempest/Generation/src/ManipulatesPhpClasses.php

@@ -184,14 +184,16 @@ public function print(): string
         $namespace = $file->addNamespace($this->namespace);
         $namespace->add($this->classType);
 
-        $this->simplifyClassNames($file);
-
+        $file = $this->simplifyClassNames($file);
         $code = $printer->printFile($file);
 
         foreach ($this->manipulations as $manipulation) {
             $code = (string) $manipulation(str($code));
         }
 
-        return $code;
+        $updatedFile = $file->fromCode($code);
+        $updatedFile = $this->simplifyClassNames($updatedFile);
+
+        return $printer->printFile($updatedFile);
     }
 }

src/Tempest/Generation/tests/ClassManipulatorTest.php

@@ -6,10 +6,12 @@
 
 use PHPUnit\Framework\Attributes\Test;
 use Tempest\Generation\ClassManipulator;
+use Tempest\Generation\Tests\Fixtures\ClassWithDummyStringToBeReplacedByFqcn;
 use Tempest\Generation\Tests\Fixtures\ClassWithMethodParameterAttributes;
 use Tempest\Generation\Tests\Fixtures\ClassWithTraitInAnotherNamespace;
 use Tempest\Generation\Tests\Fixtures\CreateMigrationsTable;
 use Tempest\Generation\Tests\Fixtures\Database\MigrationModel;
+use Tempest\Generation\Tests\Fixtures\SampleNamespace\DummyFqcn;
 use Tempest\Generation\Tests\Fixtures\TestAttribute;
 use Tempest\Generation\Tests\Fixtures\WelcomeController;
 use Tempest\Support\StringHelper;
@@ -179,4 +181,13 @@ public function simplifies_method_parameter_attributes(): void
 
         $this->assertMatchesSnapshot($class->print());
     }
+
+    #[Test]
+    public function make_replacements_before_converting_fqcn(): void
+    {
+        $class = new ClassManipulator(ClassWithDummyStringToBeReplacedByFqcn::class);
+        $class->manipulate(fn (StringHelper $string) => $string->replace("'fqcn-to-be-replaced'", sprintf('%s::class', DummyFqcn::class)));
+
+        $this->assertMatchesSnapshot($class->print());
+    }
 }

src/Tempest/Generation/tests/Fixtures/ClassWithDummyStringToBeReplacedByFqcn.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tempest\Generation\Tests\Fixtures;
+
+final class ClassWithDummyStringToBeReplacedByFqcn
+{
+    public function dummy(): string
+    {
+        return 'fqcn-to-be-replaced';
+    }
+}

src/Tempest/Generation/tests/Fixtures/SampleNamespace/DummyFqcn.php

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tempest\Generation\Tests\Fixtures\SampleNamespace;
+
+final class DummyFqcn
+{
+}

src/Tempest/Generation/tests/__snapshots__/ClassManipulatorTest__make_replacements_before_converting_fqcn__1.txt

@@ -0,0 +1,13 @@
+<?php
+
+namespace Tempest\Generation\Tests\Fixtures;
+
+use Tempest\Generation\Tests\Fixtures\Tempest\Generation\Tests\Fixtures\SampleNamespace\DummyFqcn;
+
+final class ClassWithDummyStringToBeReplacedByFqcn
+{
+    public function dummy(): string
+    {
+        return DummyFqcn::class;
+    }
+}