Merge branch '5.1' into 5.2

nicolas-grekas · nicolas-grekas · commit 5d0f633f9bbf · 2021-01-27T13:56:27.000+01:00
* 5.1:
  Use import instead of FQCN
diff --git a/Tests/OptionsResolverTest.php b/Tests/OptionsResolverTest.php
@@ -2404,7 +2404,7 @@ public function testAccessToParentOptionFromNestedNormalizerAndLazyOption()
 
     public function testFailsIfOptionIsAlreadyDefined()
     {
-        $this->expectException(\Symfony\Component\OptionsResolver\Exception\OptionDefinitionException::class);
+        $this->expectException(OptionDefinitionException::class);
         $this->expectExceptionMessage('The option "foo" is already defined.');
         $this->resolver->define('foo');
         $this->resolver->define('foo');

Original file line number	Diff line number	Diff line change
`@@ -2404,7 +2404,7 @@ public function testAccessToParentOptionFromNestedNormalizerAndLazyOption()`
`2404`	`2404`
`2405`	`2405`	`public function testFailsIfOptionIsAlreadyDefined()`
`2406`	`2406`	`{`
`2407`		`- $this->expectException(\Symfony\Component\OptionsResolver\Exception\OptionDefinitionException::class);`
	`2407`	`+ $this->expectException(OptionDefinitionException::class);`
`2408`	`2408`	`$this->expectExceptionMessage('The option "foo" is already defined.');`
`2409`	`2409`	`$this->resolver->define('foo');`
`2410`	`2410`	`$this->resolver->define('foo');`