handle curly routes

apioo · Jan 1, 2025 · 77904f8 · 77904f8
1 parent 7323ffa
commit 77904f8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/src/Generator/Server/PHP.php b/src/Generator/Server/PHP.php
@@ -22,6 +22,7 @@
 
 use PSX\Api\Generator\Server\Dto\File;
 use PSX\Api\OperationInterface;
+use PSX\Api\Util\Inflection;
 use PSX\Schema\ContentType;
 use PSX\Schema\Generator;
 use PSX\Schema\GeneratorInterface as SchemaGeneratorInterface;
@@ -169,7 +170,9 @@ protected function generateMethod(string $operationName, OperationInterface $ope
             $type = 'Model\\' . $type;
         }
 
-        $method = '    #[Route(\'' . $operation->getPath() . '\', methods: [\'' . $operation->getMethod() . '\'])]' . "\n";
+        $path = Inflection::convertPlaceholderToCurly($operation->getPath());
+
+        $method = '    #[Route(\'' . $path . '\', methods: [\'' . $operation->getMethod() . '\'])]' . "\n";
         $method.= '    #[StatusCode(' . $operation->getReturn()->getCode() . ')]' . "\n";
         $method.= '    public function ' . $operationName . '(' . implode(', ', $arguments) . '): ' . $type . "\n";
         $method.= '    {' . "\n";

diff --git a/tests/Generator/Server/resource/php/src/Controller/App.php b/tests/Generator/Server/resource/php/src/Controller/App.php
@@ -17,35 +17,35 @@
 
 class App extends AbstractController
 {
-    #[Route('/foo/:name/:type', methods: ['GET'])]
+    #[Route('/foo/{name}/{type}', methods: ['GET'])]
     #[StatusCode(200)]
     public function get(#[Param] string $name, #[Param] string $type, #[Query] int $startIndex, #[Query] float $float, #[Query] bool $boolean, #[Query] \PSX\DateTime\LocalDate $date, #[Query] \PSX\DateTime\LocalDateTime $datetime, #[Query] Model\Entry $args): Model\EntryCollection
     {
         // @TODO implement method
     }
 
-    #[Route('/foo/:name/:type', methods: ['POST'])]
+    #[Route('/foo/{name}/{type}', methods: ['POST'])]
     #[StatusCode(201)]
     public function create(#[Param] string $name, #[Param] string $type, #[Body] Model\EntryCreate $payload): Model\EntryMessage
     {
         // @TODO implement method
     }
 
-    #[Route('/foo/:name/:type', methods: ['PUT'])]
+    #[Route('/foo/{name}/{type}', methods: ['PUT'])]
     #[StatusCode(200)]
     public function update(#[Param] string $name, #[Param] string $type, #[Body] \PSX\Record\Record $payload): \PSX\Record\Record
     {
         // @TODO implement method
     }
 
-    #[Route('/foo/:name/:type', methods: ['DELETE'])]
+    #[Route('/foo/{name}/{type}', methods: ['DELETE'])]
     #[StatusCode(204)]
     public function delete(#[Param] string $name, #[Param] string $type, #[Body] Model\EntryDelete $payload): Model\EntryMessage
     {
         // @TODO implement method
     }
 
-    #[Route('/foo/:name/:type', methods: ['PATCH'])]
+    #[Route('/foo/{name}/{type}', methods: ['PATCH'])]
     #[StatusCode(200)]
     public function patch(#[Param] string $name, #[Param] string $type, #[Body] array $payload): array
     {

diff --git a/tests/Generator/Server/resource/php_complex/src/Controller/Bar.php b/tests/Generator/Server/resource/php_complex/src/Controller/Bar.php
@@ -17,14 +17,14 @@
 
 class Bar extends AbstractController
 {
-    #[Route('/bar/:foo', methods: ['GET'])]
+    #[Route('/bar/{foo}', methods: ['GET'])]
     #[StatusCode(200)]
     public function find(#[Param] string $foo): Model\EntryCollection
     {
         // @TODO implement method
     }
 
-    #[Route('/bar/:foo', methods: ['POST'])]
+    #[Route('/bar/{foo}', methods: ['POST'])]
     #[StatusCode(201)]
     public function put(#[Body] Model\EntryCreate $payload): Model\EntryMessage
     {

diff --git a/tests/Generator/Server/resource/php_complex/src/Controller/Foo/Baz.php b/tests/Generator/Server/resource/php_complex/src/Controller/Foo/Baz.php
@@ -17,14 +17,14 @@
 
 class Baz extends AbstractController
 {
-    #[Route('/bar/$year<[0-9]+>', methods: ['GET'])]
+    #[Route('/bar/{year}', methods: ['GET'])]
     #[StatusCode(200)]
     public function get(#[Param] string $year): Model\EntryCollection
     {
         // @TODO implement method
     }
 
-    #[Route('/bar/$year<[0-9]+>', methods: ['POST'])]
+    #[Route('/bar/{year}', methods: ['POST'])]
     #[StatusCode(201)]
     public function create(#[Body] Model\EntryCreate $payload): Model\EntryMessage
     {