Merge branch 'v5' into add_unique_validation

Author: shalvah

src/Extracting/MethodAstParser.php

@@ -5,6 +5,8 @@
 use Exception;
 use PhpParser\Node;
 use PhpParser\NodeFinder;
+use PhpParser\NodeTraverser;
+use PhpParser\NodeVisitor\NameResolver;
 use PhpParser\ParserFactory;
 use ReflectionFunctionAbstract;
 use Throwable;
@@ -50,6 +52,13 @@ protected static function parseClassSourceCode(string $sourceCode): ?array
             throw new Exception("Parse error: {$error->getMessage()}");
         }
 
+        $traverser = new NodeTraverser(new NameResolver(options: ['replaceNodes' => false]));
+        try {
+            $traverser->traverse($ast);
+        } catch (Throwable $error) {
+            throw new Exception("Traverse error: {$error->getMessage()}");
+        }
+
         return $ast;
     }
 

src/Extracting/Shared/ValidationRulesFinders/ValidatorMake.php

@@ -3,10 +3,12 @@
 namespace Knuckles\Scribe\Extracting\Shared\ValidationRulesFinders;
 
 use PhpParser\Node;
+use PhpParser\NodeFinder;
 
 /**
  * This class looks for
  *   $validator = Validator::make($request, ...)
+ *   Validator::make($request, ...)->validate()
  *
  * The variable names (`$validator` and `$request`) don't matter.
  */
@@ -15,20 +17,19 @@ class ValidatorMake
     public static function find(Node $node)
     {
         // Make sure it's an assignment
-        if (!($node instanceof Node\Stmt\Expression)
-            || !($node->expr instanceof Node\Expr\Assign)) {
+        if (! ($node instanceof Node\Stmt\Expression)) {
             return;
         }
 
-        $expr = $node->expr->expr; // Get the expression on the RHS
+        $validatorNode = (new NodeFinder)->findFirst($node, function ($node): bool {
+            return $node instanceof Node\Expr\StaticCall
+                && ! empty($node->class->name)
+                && str_ends_with($node->class->name, 'Validator')
+                && $node->name->name == 'make';
+        });
 
-        if (
-            $expr instanceof Node\Expr\StaticCall
-            && !empty($expr->class->name)
-            && str_ends_with($expr->class->name, "Validator")
-            && $expr->name->name == "make"
-        ) {
-            return $expr->args[1]->value;
+        if ($validatorNode instanceof Node\Expr\StaticCall) {
+            return $validatorNode->args[1]->value;
         }
     }
 }

src/Writing/CustomTranslationsLoader.php

@@ -33,7 +33,6 @@ public function load($locale, $group, $namespace = null)
             } elseif ($this->files->exists($full = "{$this->hints[$namespace]}/scribe.php")) {
                 $this->scribeTranslationsCache = $this->files->getRequire($full);
                 // getRequire() requires the Scribe file, which will return an array
-                // @phpstan-ignore-next-line nullCoalesce.offset
                 $lines = $this->scribeTranslationsCache[$group] ?? [];
             } else {
                 return [];

tests/Fixtures/TestController.php

@@ -646,6 +646,29 @@ public function withInlineValidatorMake(Request $request)
 
         }
     }
+    public function withInlineValidatorMakeValidate(Request $request)
+    {
+        // Some stuff
+        Validator::make($request, [
+            // The id of the user. Example: 9
+            'user_id' => 'int|required',
+            // The id of the room.
+            'room_id' => ['string', 'in:3,5,6'],
+            // Whether to ban the user forever. Example: false
+            'forever' => 'boolean',
+            // Just need something here. No-example
+            'another_one' => 'numeric',
+            'even_more_param' => 'array',
+            'book.name' => 'string',
+            'book.author_id' => 'integer',
+            'book.pages_count' => 'integer',
+            'ids.*' => 'integer',
+            // The first name of the user. Example: John
+            'users.*.first_name' => ['string'],
+            // The last name of the user. Example: Doe
+            'users.*.last_name' => 'string',
+        ])->validate();
+    }
 
     public function withInlineRequestValidateWithBag(Request $request)
     {

tests/Strategies/GetFromInlineValidatorTest.php

@@ -208,6 +208,19 @@ public function can_fetch_from_validator_make()
         $this->assertIsArray($results['ids']['example']);
     }
 
+    /** @test */
+    public function can_fetch_from_validator_make_validate()
+    {
+        $endpoint = $this->endpoint(function (ExtractedEndpointData $e) {
+            $e->method = new \ReflectionMethod(TestController::class, 'withInlineValidatorMakeValidate');
+        });
+
+        $results = $this->fetchViaBodyParams($endpoint);
+
+        $this->assertArraySubset(self::$expected, $results);
+        $this->assertIsArray($results['ids']['example']);
+    }
+
     /** @test */
     public function respects_query_params_comment()
     {