Merge pull request #135 from danizord/hotfix/idempotent-validation

Do not mutate command at validation.
guzzle · Feb 20, 2017 · 09f5904 · 09f5904
2 parents 05cb2c6 + 2b191b1
commit 09f5904
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 6 deletions.
diff --git a/src/Handler/ValidatedDescriptionHandler.php b/src/Handler/ValidatedDescriptionHandler.php
@@ -49,10 +49,6 @@ public function __invoke(callable $handler)
 
                 if (! $this->validator->validate($schema, $value)) {
                     $errors = array_merge($errors, $this->validator->getErrors());
-                } elseif ($value !== $command[$name]) {
-                    // Update the config value if it changed and no validation
-                    // errors were encountered
-                    $command[$name] = $value;
                 }
             }
 
@@ -64,8 +60,6 @@ public function __invoke(callable $handler)
                         $params->setName($name);
                         if (! $this->validator->validate($params, $value)) {
                             $errors = array_merge($errors, $this->validator->getErrors());
-                        } elseif ($value !== $command[$name]) {
-                            $command[$name] = $value;
                         }
                     }
                 }

diff --git a/tests/Handler/ValidatedDescriptionHandlerTest.php b/tests/Handler/ValidatedDescriptionHandlerTest.php
@@ -2,6 +2,7 @@
 namespace GuzzleHttp\Tests\Command\Guzzle\Handler;
 
 use GuzzleHttp\Client as HttpClient;
+use GuzzleHttp\Command\Command;
 use GuzzleHttp\Command\Guzzle\Description;
 use GuzzleHttp\Command\Guzzle\GuzzleClient;
 
@@ -109,4 +110,41 @@ public function testFilterBeforeValidate()
         $client = new GuzzleClient(new HttpClient(), $description);
         $client->foo(['bar' => new \DateTimeImmutable()]); // Should not throw any exception
     }
+
+    public function testValidationDoesNotMutateCommand()
+    {
+        $description = new Description([
+            'operations' => [
+                'foo' => [
+                    'uri' => 'http://httpbin.org',
+                    'httpMethod' => 'GET',
+                    'parameters' => [
+                        'bar' => [
+                            'location' => 'query',
+                            'type'     => 'string',
+                            'filters'  => ['json_encode'],
+                            'required' => true,
+                        ]
+                    ]
+                ]
+            ]
+        ]);
+
+        $client  = new GuzzleClient(new HttpClient(), $description);
+        $command = new Command('foo', ['bar' => ['baz' => 'bat']]);
+
+        $paramsBeforeValidation = $command->toArray();
+
+        $client->getHandlerStack()->after('validate_description', function (callable $next) use ($paramsBeforeValidation) {
+            return function (Command $command) use ($next, $paramsBeforeValidation) {
+                $paramsAfterValidation = $command->toArray();
+
+                $this->assertSame($paramsBeforeValidation, $paramsAfterValidation);
+
+                return $next($command);
+            };
+        });
+
+        $client->execute($command);
+    }
 }