Clean code generator (#1505)

* Remove unhandled nullable type for namespace parts

* Fix variable usage

* Fix invalid type annotation

* Split the recursion protection from the collection of Method objects

This avoids first assigning a boolean in the array before overriding it,
which gets rejected by static analysis.

Author: stof

src/Generator/CodeGenerator/TypeGenerator.php

@@ -99,7 +99,7 @@ public function generateDocblock(StructureShape $shape, ClassName $shapeClassNam
                     $classNames[] = $className = $this->namespaceRegistry->getEnum($memberShape);
                     $param = $className->getName() . '::*';
                 } else {
-                    $param = $this->getNativePhpType($param);
+                    $param = $this->getNativePhpType($memberShape->getType());
                 }
             }
 

src/Generator/Naming/NamespaceRegistry.php

@@ -51,7 +51,7 @@ final class NamespaceRegistry
      */
     private $exceptionNamespace;
 
-    public function __construct(string $baseNamespace, ?string $inputNamespace = '\\Input', ?string $resultNamespace = '\\Result', ?string $testNamespace = '\\Tests', ?string $enumNamespace = '\\Enum', ?string $objectNamespace = '\\ValueObject', ?string $exceptionNamespace = '\\Exception')
+    public function __construct(string $baseNamespace, string $inputNamespace = '\\Input', string $resultNamespace = '\\Result', string $testNamespace = '\\Tests', string $enumNamespace = '\\Enum', string $objectNamespace = '\\ValueObject', string $exceptionNamespace = '\\Exception')
     {
         $this->baseNamespace = $baseNamespace;
         $this->inputNamespace = '\\' === $inputNamespace[0] ? $baseNamespace . $inputNamespace : $inputNamespace;

src/Generator/OperationGenerator.php

@@ -72,7 +72,7 @@ class OperationGenerator
     private $exceptionGenerator;
 
     /**
-     * @var ClassName[]
+     * @var array<string, true>
      */
     private $generated = [];
 

src/Generator/ResponseParser/RestJsonParser.php

@@ -45,6 +45,11 @@ class RestJsonParser implements Parser
      */
     private $functions = [];
 
+    /**
+     * @var array<string, true>
+     */
+    private $generatedFunctions = [];
+
     /**
      * @var list<ClassName>
      */
@@ -65,6 +70,7 @@ public function generate(StructureShape $shape, bool $throwOnError = true): Pars
 
         $properties = [];
         $this->functions = [];
+        $this->generatedFunctions = [];
         $this->imports = [];
         foreach ($shape->getMembers() as $member) {
             if (\in_array($member->getLocation(), ['header', 'headers'])) {
@@ -205,9 +211,9 @@ private function parseElement(string $input, Shape $shape, bool $required, bool
     private function parseResponseStructure(StructureShape $shape, string $input, bool $required): string
     {
         $functionName = 'populateResult' . ucfirst($shape->getName());
-        if (!isset($this->functions[$functionName])) {
+        if (!isset($this->generatedFunctions[$functionName])) {
             // prevent recursion
-            $this->functions[$functionName] = true;
+            $this->generatedFunctions[$functionName] = true;
 
             $properties = [];
             foreach ($shape->getMembers() as $member) {
@@ -287,9 +293,9 @@ private function parseResponseList(ListShape $shape, string $input, bool $requir
     {
         $shapeMember = $shape->getMember();
         $functionName = 'populateResult' . ucfirst($shape->getName());
-        if (!isset($this->functions[$functionName])) {
+        if (!isset($this->generatedFunctions[$functionName])) {
             // prevent recursion
-            $this->functions[$functionName] = true;
+            $this->generatedFunctions[$functionName] = true;
 
             if ($shapeMember->getShape() instanceof StructureShape || $shapeMember->getShape() instanceof ListShape || $shapeMember->getShape() instanceof MapShape) {
                 $listAccessorRequired = true;
@@ -332,9 +338,9 @@ private function parseResponseMap(MapShape $shape, string $input, bool $required
     {
         $shapeValue = $shape->getValue();
         $functionName = 'populateResult' . ucfirst($shape->getName());
-        if (!isset($this->functions[$functionName])) {
+        if (!isset($this->generatedFunctions[$functionName])) {
             // prevent recursion
-            $this->functions[$functionName] = true;
+            $this->generatedFunctions[$functionName] = true;
 
             if (null === $locationName = $shape->getKey()->getLocationName()) {
                 // We need to use array keys