Merge branch '5.2' into 5.3

nicolas-grekas · nicolas-grekas · commit 0e8cada4de5a · 2021-06-11T11:57:35.000+02:00
* 5.2:
  [HttpClient] throw exception when AsyncDecoratorTrait gets an already consumed response
  [Validator] Fix tests by making constraint options dumps order consistent
diff --git a/Command/DebugCommand.php b/Command/DebugCommand.php
@@ -166,6 +166,8 @@ private function getConstraintOptions(Constraint $constraint): array
             $options[$propertyName] = $constraint->$propertyName;
         }
 
+        ksort($options);
+
         return $options;
     }
 
diff --git a/Tests/Command/DebugCommandTest.php b/Tests/Command/DebugCommandTest.php
@@ -72,8 +72,8 @@ public function testOutputWithClassArgument()
 | Property      | Name                                             | Groups  | Options                                                    |
 +---------------+--------------------------------------------------+---------+------------------------------------------------------------+
 | firstArgument | Symfony\Component\Validator\Constraints\NotBlank | Default | [                                                          |
-|               |                                                  |         |   "message" => "This value should not be blank.",          |
 |               |                                                  |         |   "allowNull" => false,                                    |
+|               |                                                  |         |   "message" => "This value should not be blank.",          |
 |               |                                                  |         |   "normalizer" => null,                                    |
 |               |                                                  |         |   "payload" => null                                        |
 |               |                                                  |         | ]                                                          |
@@ -133,8 +133,8 @@ public function testOutputWithPathArgument()
 | Property      | Name                                             | Groups  | Options                                                    |
 +---------------+--------------------------------------------------+---------+------------------------------------------------------------+
 | firstArgument | Symfony\Component\Validator\Constraints\NotBlank | Default | [                                                          |
-|               |                                                  |         |   "message" => "This value should not be blank.",          |
 |               |                                                  |         |   "allowNull" => false,                                    |
+|               |                                                  |         |   "message" => "This value should not be blank.",          |
 |               |                                                  |         |   "normalizer" => null,                                    |
 |               |                                                  |         |   "payload" => null                                        |
 |               |                                                  |         | ]                                                          |
@@ -153,8 +153,8 @@ public function testOutputWithPathArgument()
 | Property      | Name                                             | Groups  | Options                                                    |
 +---------------+--------------------------------------------------+---------+------------------------------------------------------------+
 | firstArgument | Symfony\Component\Validator\Constraints\NotBlank | Default | [                                                          |
-|               |                                                  |         |   "message" => "This value should not be blank.",          |
 |               |                                                  |         |   "allowNull" => false,                                    |
+|               |                                                  |         |   "message" => "This value should not be blank.",          |
 |               |                                                  |         |   "normalizer" => null,                                    |
 |               |                                                  |         |   "payload" => null                                        |
 |               |                                                  |         | ]                                                          |

Original file line number	Diff line number	Diff line change
`@@ -166,6 +166,8 @@ private function getConstraintOptions(Constraint $constraint): array`
`166`	`166`	`$options[$propertyName] = $constraint->$propertyName;`
`167`	`167`	`}`
`168`	`168`
	`169`	`+ ksort($options);`
	`170`	`+`
`169`	`171`	`return $options;`
`170`	`172`	`}`
`171`	`173`