WIP

Signed-off-by: alexmerlin <alex.merlin.1985@gmail.com>

Author: alexmerlin

src/FileSystem.php

@@ -445,26 +445,21 @@ public function serviceInterface(string $name): File
         );
     }
 
-    public function templateFile(string $subDirectory, string $name): File
+    public function templateDir(string $name): Directory
     {
-        return new File(
-            $this->templatesDir($subDirectory),
-            '',
+        return new Directory(
             $name,
-            'html.twig'
+            sprintf('%s/src/%s/templates', $this->context->getProjectPath(), $this->moduleName)
         );
     }
 
-    public function templates(string $name = 'templates'): Directory
-    {
-        return new Directory($name, sprintf('%s/src/%s', $this->context->getProjectPath(), $this->moduleName));
-    }
-
-    public function templatesDir(string $name): Directory
+    public function templateFile(string $subDirectory, string $name): File
     {
-        return new Directory(
+        return new File(
+            $this->templateDir($subDirectory),
+            '',
             $name,
-            sprintf('%s/src/%s/templates', $this->context->getProjectPath(), $this->moduleName)
+            'html.twig'
         );
     }
 

src/Type/Handler/GetDeleteResourceHandler.php

@@ -119,7 +119,7 @@ public function render(Component $handler, Component $entity, Component $form, C
             \$this->template->render('{$entity->toKebabCase()}::{$entity->toKebabCase()}-delete-form', [
                 'form' => \$this->{$form->toCamelCase()}->prepare(),
                 '{$entity->toKebabCase()}' => {$entity->getVariable()},
-            ]),
+            ])
         );
 BODY);
         // phpcs:enable Generic.Files.LineLength.TooLong

src/Type/Handler/PostDeleteResourceHandler.php

@@ -134,7 +134,7 @@ public function render(Component $handler, Component $entity, Component $form, C
 
             return new HtmlResponse(
                 \$this->template->render('{$entity->toKebabCase()}::{$entity->toKebabCase()}-delete-form', [
-                    'form'  => \$this->{$form->toCamelCase()}->prepare(),
+                    'form' => \$this->{$form->toCamelCase()}->prepare(),
                     '{$entity->toCamelCase()}' => {$entity->getVariable()},
                 ]),
                 StatusCodeInterface::STATUS_UNPROCESSABLE_ENTITY

src/Type/Handler/PostEditResourceHandler.php

@@ -155,13 +155,13 @@ public function render(Component $handler, Component $entity, Component $form, C
                 StatusCodeInterface::STATUS_UNPROCESSABLE_ENTITY
             );
         } catch (Throwable \$exception) {
+            \$this->messenger->addError(Message::AN_ERROR_OCCURRED);
             \$this->logger->err('Update {$entity->getClassName()}', [
                 'error' => \$exception->getMessage(),
                 'file'  => \$exception->getFile(),
                 'line'  => \$exception->getLine(),
                 'trace' => \$exception->getTraceAsString(),
             ]);
-            \$this->messenger->addError(Message::AN_ERROR_OCCURRED);
 
             return new EmptyResponse(StatusCodeInterface::STATUS_INTERNAL_SERVER_ERROR);
         }

test/Type/FormTest.php

@@ -142,7 +142,7 @@ public function testCallToInvokeWillOutputErrorAndWillNotCreateFileWhenNameIsInv
         $this->import     = new Import($this->context);
         $this->module     = new Module($this->fileSystem, $this->context, $this->config);
 
-        $file = $this->fileSystem->inputFilter($this->resourceName);
+        $file = $this->fileSystem->form($this->resourceName);
         $this->assertFalse($file->exists());
         $this->assertFileDoesNotExist($file->getPath());