dotkernel · alexmerlin · Aug 22, 2025 · Aug 22, 2025 · Aug 22, 2025 · Aug 22, 2025
diff --git a/.roave-backward-compatibility-check.xml b/.roave-backward-compatibility-check.xml
@@ -3,7 +3,7 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="vendor/roave/backward-compatibility-check/resources/schema.xsd">
     <baseline>
-        <ignored-regex>#\[BC\] SKIPPED: An enum expression Dot\Maker\\VisibilityEnum\:\:Public is not supported in class Dot\\Maker\\Component\\Method in file /src/Component/Method.php#</ignored-regex>
-        <ignored-regex>#\[BC\] SKIPPED: An enum expression Dot\Maker\\VisibilityEnum\:\:Protected is not supported in class Dot\\Maker\\Component\\Property in file /src/Component/Property.php#</ignored-regex>
+        <ignored-regex>#\[BC\] SKIPPED: An enum expression Dot\\Maker\\VisibilityEnum::Public is not supported in class Dot\\Maker\\Component\\Method in file \/src\/Component\/Method\.php \(line 20\)#</ignored-regex>
+        <ignored-regex>#\[BC\] SKIPPED: An enum expression Dot\\Maker\\VisibilityEnum::Protected is not supported in class Dot\\Maker\\Component\\Property in file \/src\/Component\/Property\.php \(line 15\)#</ignored-regex>
     </baseline>
 </roave-bc-check>
diff --git a/src/Component/InterfaceFile.php b/src/Component/InterfaceFile.php
@@ -153,7 +153,7 @@ public function render(): string
         }
 
         if ($this->comment !== '') {
-            $interface .= PHP_EOL . $this->comment . PHP_EOL;
+            $interface .= PHP_EOL . $this->comment;
         }
 
         $interface .= PHP_EOL;

diff --git a/src/Type/InputFilter/DeleteResourceInputFilter.php b/src/Type/InputFilter/DeleteResourceInputFilter.php
@@ -31,18 +31,11 @@ public function create(string $name): File
             throw DuplicateFileException::create($inputFilter);
         }
 
-        if ($this->context->isApi()) {
-            $content = $this->renderApi(
-                $name,
-                $inputFilter->getComponent(),
-            );
-        } else {
-            $content = $this->render(
-                $name,
-                $inputFilter->getComponent(),
-                $this->fileSystem->confirmDeleteInput($name)->getComponent(),
-            );
-        }
+        $content = $this->render(
+            $name,
+            $inputFilter->getComponent(),
+            $this->fileSystem->confirmDeleteInput($name)->getComponent(),
+        );
 
         $inputFilter->create($content);
 
@@ -77,25 +70,4 @@ public function render(string $name, Component $inputFilter, Component $input):
 
         return $class->render();
     }
-
-    public function renderApi(string $name, Component $inputFilter): string
-    {
-        $class = (new ClassFile($inputFilter->getNamespace(), $inputFilter->getClassName()))
-            ->setExtends('AbstractInputFilter')
-            ->useClass($this->import->getAbstractInputFilterFqcn())
-            ->setComment(<<<COMM
-/**
- * @phpstan-type Delete{$name}DataType array{}
- * @extends AbstractInputFilter<Delete{$name}DataType>
- */
-COMM);
-
-        $init = (new Constructor())
-            ->setBody(<<<BODY
-        // chain inputs here
-BODY);
-        $class->addMethod($init);
-
-        return $class->render();
-    }
 }
diff --git a/test/ColorEnumTest.php b/test/ColorEnumTest.php
@@ -0,0 +1,65 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DotTest\Maker;
+
+use Dot\Maker\ColorEnum;
+use Dot\Maker\IO\Output;
+use PHPUnit\Framework\TestCase;
+
+use function fclose;
+use function fopen;
+use function rewind;
+use function stream_get_contents;
+
+class ColorEnumTest extends TestCase
+{
+    /** @var resource $outputStream */
+    private $outputStream;
+
+    protected function setUp(): void
+    {
+        $this->outputStream = fopen('php://memory', 'w+');
+        Output::setOutputStream($this->outputStream);
+    }
+
+    protected function tearDown(): void
+    {
+        fclose($this->outputStream);
+    }
+
+    public function testWillRenderMessageWithBackgroundColor(): void
+    {
+        Output::write(
+            ColorEnum::colorize('Test Message', ColorEnum::BackgroundBlack)
+        );
+
+        rewind($this->outputStream);
+        $this->assertSame("\033[40mTest Message\033[0m", stream_get_contents($this->outputStream));
+    }
+
+    public function testWillRenderMessageWithForegroundColor(): void
+    {
+        Output::write(
+            ColorEnum::colorize('Test Message', ColorEnum::ForegroundBrightGreen)
+        );
+
+        rewind($this->outputStream);
+        $this->assertSame("\033[92mTest Message\033[0m", stream_get_contents($this->outputStream));
+    }
+
+    public function testWillRenderMessageWithBackgroundAndForegroundColor(): void
+    {
+        Output::write(
+            ColorEnum::colorize(
+                'Test Message',
+                ColorEnum::ForegroundBrightGreen,
+                ColorEnum::BackgroundBlack
+            )
+        );
+
+        rewind($this->outputStream);
+        $this->assertSame("\033[92;40mTest Message\033[0m", stream_get_contents($this->outputStream));
+    }
+}
diff --git a/test/Component/ClassFileTest.php b/test/Component/ClassFileTest.php
@@ -111,6 +111,9 @@ public function testWillRenderClass(): void
             ->addInject(
                 (new Inject('CustomInjector'))->addArgument('true', 'param')
             )
+            ->setAbstract(true)
+            ->setFinal(true)
+            ->setReadonly(true)
             ->useClass('App\\Module\\OtherClassName')
             ->useClass('App\\Module\\InterfaceName')
             ->useFunction('sprintf')
@@ -158,7 +161,7 @@ public function testWillRenderClass(): void
                     ->appendBody('// add logic')
             );
 
-        $this->assertSame($this->dataProviderRenderedClass(), $actual->render());
+        $this->assertSame($this->dataProviderRenderedClass(), (string) $actual);
     }
 
     private function dataProviderRenderedClass(): string
@@ -178,7 +181,7 @@ private function dataProviderRenderedClass(): string
 use const PHP_EOL;
 
 #[CustomInjector(param: true)]
-class ClassName extends OtherClassName implements InterfaceName
+final readonly abstract class ClassName extends OtherClassName implements InterfaceName
 {
     protected bool \$propertyName = true;
 

diff --git a/test/Component/DeclarationTest.php b/test/Component/DeclarationTest.php
@@ -59,6 +59,41 @@ public function testWillSetReturnType(): void
         $this->assertSame('self', $declaration->getReturnType());
     }
 
+    public function testWillRenderParameters(): void
+    {
+        $declaration = new Declaration($this->declarationName);
+        $this->assertSame('', $declaration->renderParameters());
+
+        $declaration->addParameter(
+            new Parameter('param', 'string')
+        );
+        $this->assertSame('        string $param,', $declaration->renderParameters());
+
+        $declaration->addParameter(
+            new Parameter('other', 'string')
+        );
+        $this->assertSame(<<<BODY
+        string \$param,
+        string \$other,
+BODY, $declaration->renderParameters());
+    }
+
+    public function testWillRenderSignature(): void
+    {
+        $declaration = new Declaration($this->declarationName);
+        $this->assertSame(': void', $declaration->renderSignature());
+
+        $declaration->setReturnType('');
+        $this->assertSame('', $declaration->renderSignature());
+
+        $declaration->setReturnType('self');
+        $this->assertSame(': self', $declaration->renderSignature());
+
+        $declaration->setReturnType('string');
+        $declaration->setNullable(true);
+        $this->assertSame(': ?string', $declaration->renderSignature());
+    }
+
     public function testWillRender(): void
     {
         $comment = <<<COMM
@@ -74,7 +109,7 @@ public function testWillRender(): void
             ->addParameter(
                 new Parameter('param', 'string')
             );
-        $this->assertSame($this->dataProviderRenderedDeclaration(), $declaration->render());
+        $this->assertSame($this->dataProviderRenderedDeclaration(), (string) $declaration);
     }
 
     private function dataProviderRenderedDeclaration(): string

diff --git a/test/Component/InterfaceFileTest.php b/test/Component/InterfaceFileTest.php
@@ -73,9 +73,14 @@ public function testWillRenderInterface(): void
             ->useClass('App\\Module\\OtherInterface')
             ->useFunction('sprintf')
             ->useConstant('PHP_EOL')
+            ->setComment(<<<COMM
+/**
+ * Comment
+ */
+COMM)
             ->addDeclaration((new Declaration('getResource'))->setReturnType('Resource'));
 
-        $this->assertSame($this->dataProviderRenderedClass(), $actual->render());
+        $this->assertSame($this->dataProviderRenderedClass(), (string) $actual);
     }
 
     private function dataProviderRenderedClass(): string
@@ -93,6 +98,9 @@ private function dataProviderRenderedClass(): string
 
 use const PHP_EOL;
 
+/**
+ * Comment
+ */
 interface ClassName extends OtherInterface
 {
     public function getResource(): Resource;

diff --git a/test/Component/MethodTest.php b/test/Component/MethodTest.php
@@ -108,7 +108,15 @@ public function testWillSetVisibility(): void
         $this->assertSame(VisibilityEnum::Private, $method->getVisibility());
     }
 
-    public function testWillRender(): void
+    public function testWillRenderMethodWithoutBody(): void
+    {
+        $method = (new Method($this->methodName))
+            ->setVisibility(VisibilityEnum::Private)
+            ->setNullable(false);
+        $this->assertSame($this->dataProviderRenderedMethodWithoutBody(), (string) $method);
+    }
+
+    public function testWillRenderMethod(): void
     {
         $method = (new Method($this->methodName))
             ->setVisibility(VisibilityEnum::Private)
@@ -121,7 +129,16 @@ public function testWillRender(): void
 COMM)
             ->addParameter(new Parameter('param', 'string', true, 'null'))
             ->setBody('        return $this;');
-        $this->assertSame($this->dataProviderRenderedMethod(), $method->render());
+        $this->assertSame($this->dataProviderRenderedMethod(), (string) $method);
+    }
+
+    private function dataProviderRenderedMethodWithoutBody(): string
+    {
+        return <<<BODY
+private function someMethod(): void
+    {
+    }
+BODY;
     }
 
     private function dataProviderRenderedMethod(): string

diff --git a/test/Component/ParameterTest.php b/test/Component/ParameterTest.php
@@ -69,6 +69,6 @@ public function testWillSetNullable(): void
     public function testWillRender(): void
     {
         $parameter = new Parameter('param', 'string', true, '"test"');
-        $this->assertSame('?string $param = "test"', $parameter->render());
+        $this->assertSame('?string $param = "test"', (string) $parameter);
     }
 }
diff --git a/test/ComponentTest.php b/test/ComponentTest.php
@@ -269,4 +269,15 @@ public function testWillRenderInputServiceInterface(): void
         $this->assertSame('BOOK_STORE_SERVICE_INTERFACE', $component->toUpperCase(false));
         $this->assertSame('BOOK_STORE_SERVICE', $component->toUpperCase());
     }
+
+    public function testWillPluralize(): void
+    {
+        $this->assertSame('buses', Component::pluralize('bus'));
+        $this->assertSame('boxes', Component::pluralize('box'));
+        $this->assertSame('jazzes', Component::pluralize('jazz'));
+        $this->assertSame('fishes', Component::pluralize('fish'));
+        $this->assertSame('watches', Component::pluralize('watch'));
+        $this->assertSame('candies', Component::pluralize('candy'));
+        $this->assertSame('books', Component::pluralize('book'));
+    }
 }
diff --git a/test/IO/InputTest.php b/test/IO/InputTest.php
@@ -111,4 +111,16 @@ public function testConfirmWillOutputMessageAndReadNegativeAnswer(string $input)
         fclose($inputStream);
         fclose($outputStream);
     }
+
+    public function testWillAlwaysGetInputStream(): void
+    {
+        Input::setStream(fopen('php://memory', 'w+'));
+
+        $stream = Input::getStream();
+        $this->assertIsResource($stream);
+        fclose($stream);
+
+        $stream = Input::getStream();
+        $this->assertIsResource($stream);
+    }
 }
diff --git a/test/IO/OutputTest.php b/test/IO/OutputTest.php
@@ -169,4 +169,28 @@ public function testWillWriteLine(): void
 
         fclose($stream);
     }
+
+    public function testWillAlwaysGetErrorStream(): void
+    {
+        Output::setErrorStream(fopen('php://memory', 'w+'));
+
+        $stream = Output::getErrorStream();
+        $this->assertIsResource($stream);
+        fclose($stream);
+
+        $stream = Output::getErrorStream();
+        $this->assertIsResource($stream);
+    }
+
+    public function testWillAlwaysGetOutputStream(): void
+    {
+        Output::setOutputStream(fopen('php://memory', 'w+'));
+
+        $stream = Output::getOutputStream();
+        $this->assertIsResource($stream);
+        fclose($stream);
+
+        $stream = Output::getOutputStream();
+        $this->assertIsResource($stream);
+    }
 }