Skip to content

Commit c1189d6

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.4' into 5.1
* 4.4: Use createMock() and use import instead of FQCN
2 parents 8fcfb1d + cd8c6a2 commit c1189d6

File tree

2 files changed

+36
-28
lines changed

2 files changed

+36
-28
lines changed

‎Tests/Debug/OptionsResolverIntrospectorTest.php

+16-14
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Component\OptionsResolver\Debug\OptionsResolverIntrospector;
16+
use Symfony\Component\OptionsResolver\Exception\NoConfigurationException;
17+
use Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException;
1618
use Symfony\Component\OptionsResolver\Options;
1719
use Symfony\Component\OptionsResolver\OptionsResolver;
1820

@@ -38,7 +40,7 @@ public function testGetDefaultNull()
3840

3941
public function testGetDefaultThrowsOnNoConfiguredValue()
4042
{
41-
$this->expectException(\Symfony\Component\OptionsResolver\Exception\NoConfigurationException::class);
43+
$this->expectException(NoConfigurationException::class);
4244
$this->expectExceptionMessage('No default value was set for the "foo" option.');
4345
$resolver = new OptionsResolver();
4446
$resolver->setDefined($option = 'foo');
@@ -49,7 +51,7 @@ public function testGetDefaultThrowsOnNoConfiguredValue()
4951

5052
public function testGetDefaultThrowsOnNotDefinedOption()
5153
{
52-
$this->expectException(\Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException::class);
54+
$this->expectException(UndefinedOptionsException::class);
5355
$this->expectExceptionMessage('The option "foo" does not exist.');
5456
$resolver = new OptionsResolver();
5557

@@ -69,7 +71,7 @@ public function testGetLazyClosures()
6971

7072
public function testGetLazyClosuresThrowsOnNoConfiguredValue()
7173
{
72-
$this->expectException(\Symfony\Component\OptionsResolver\Exception\NoConfigurationException::class);
74+
$this->expectException(NoConfigurationException::class);
7375
$this->expectExceptionMessage('No lazy closures were set for the "foo" option.');
7476
$resolver = new OptionsResolver();
7577
$resolver->setDefined($option = 'foo');
@@ -80,7 +82,7 @@ public function testGetLazyClosuresThrowsOnNoConfiguredValue()
8082

8183
public function testGetLazyClosuresThrowsOnNotDefinedOption()
8284
{
83-
$this->expectException(\Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException::class);
85+
$this->expectException(UndefinedOptionsException::class);
8486
$this->expectExceptionMessage('The option "foo" does not exist.');
8587
$resolver = new OptionsResolver();
8688

@@ -100,7 +102,7 @@ public function testGetAllowedTypes()
100102

101103
public function testGetAllowedTypesThrowsOnNoConfiguredValue()
102104
{
103-
$this->expectException(\Symfony\Component\OptionsResolver\Exception\NoConfigurationException::class);
105+
$this->expectException(NoConfigurationException::class);
104106
$this->expectExceptionMessage('No allowed types were set for the "foo" option.');
105107
$resolver = new OptionsResolver();
106108
$resolver->setDefined($option = 'foo');
@@ -111,7 +113,7 @@ public function testGetAllowedTypesThrowsOnNoConfiguredValue()
111113

112114
public function testGetAllowedTypesThrowsOnNotDefinedOption()
113115
{
114-
$this->expectException(\Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException::class);
116+
$this->expectException(UndefinedOptionsException::class);
115117
$this->expectExceptionMessage('The option "foo" does not exist.');
116118
$resolver = new OptionsResolver();
117119

@@ -131,7 +133,7 @@ public function testGetAllowedValues()
131133

132134
public function testGetAllowedValuesThrowsOnNoConfiguredValue()
133135
{
134-
$this->expectException(\Symfony\Component\OptionsResolver\Exception\NoConfigurationException::class);
136+
$this->expectException(NoConfigurationException::class);
135137
$this->expectExceptionMessage('No allowed values were set for the "foo" option.');
136138
$resolver = new OptionsResolver();
137139
$resolver->setDefined($option = 'foo');
@@ -142,7 +144,7 @@ public function testGetAllowedValuesThrowsOnNoConfiguredValue()
142144

143145
public function testGetAllowedValuesThrowsOnNotDefinedOption()
144146
{
145-
$this->expectException(\Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException::class);
147+
$this->expectException(UndefinedOptionsException::class);
146148
$this->expectExceptionMessage('The option "foo" does not exist.');
147149
$resolver = new OptionsResolver();
148150

@@ -162,7 +164,7 @@ public function testGetNormalizer()
162164

163165
public function testGetNormalizerThrowsOnNoConfiguredValue()
164166
{
165-
$this->expectException(\Symfony\Component\OptionsResolver\Exception\NoConfigurationException::class);
167+
$this->expectException(NoConfigurationException::class);
166168
$this->expectExceptionMessage('No normalizer was set for the "foo" option.');
167169
$resolver = new OptionsResolver();
168170
$resolver->setDefined($option = 'foo');
@@ -173,7 +175,7 @@ public function testGetNormalizerThrowsOnNoConfiguredValue()
173175

174176
public function testGetNormalizerThrowsOnNotDefinedOption()
175177
{
176-
$this->expectException(\Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException::class);
178+
$this->expectException(UndefinedOptionsException::class);
177179
$this->expectExceptionMessage('The option "foo" does not exist.');
178180
$resolver = new OptionsResolver();
179181

@@ -194,7 +196,7 @@ public function testGetNormalizers()
194196

195197
public function testGetNormalizersThrowsOnNoConfiguredValue()
196198
{
197-
$this->expectException(\Symfony\Component\OptionsResolver\Exception\NoConfigurationException::class);
199+
$this->expectException(NoConfigurationException::class);
198200
$this->expectExceptionMessage('No normalizer was set for the "foo" option.');
199201
$resolver = new OptionsResolver();
200202
$resolver->setDefined('foo');
@@ -205,7 +207,7 @@ public function testGetNormalizersThrowsOnNoConfiguredValue()
205207

206208
public function testGetNormalizersThrowsOnNotDefinedOption()
207209
{
208-
$this->expectException(\Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException::class);
210+
$this->expectException(UndefinedOptionsException::class);
209211
$this->expectExceptionMessage('The option "foo" does not exist.');
210212
$resolver = new OptionsResolver();
211213

@@ -269,7 +271,7 @@ public function testGetClosureDeprecation()
269271

270272
public function testGetDeprecationMessageThrowsOnNoConfiguredValue()
271273
{
272-
$this->expectException(\Symfony\Component\OptionsResolver\Exception\NoConfigurationException::class);
274+
$this->expectException(NoConfigurationException::class);
273275
$this->expectExceptionMessage('No deprecation was set for the "foo" option.');
274276
$resolver = new OptionsResolver();
275277
$resolver->setDefined('foo');
@@ -280,7 +282,7 @@ public function testGetDeprecationMessageThrowsOnNoConfiguredValue()
280282

281283
public function testGetDeprecationMessageThrowsOnNotDefinedOption()
282284
{
283-
$this->expectException(\Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException::class);
285+
$this->expectException(UndefinedOptionsException::class);
284286
$this->expectExceptionMessage('The option "foo" does not exist.');
285287
$resolver = new OptionsResolver();
286288

‎Tests/OptionsResolverTest.php

+20-14
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,13 @@
1616
use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
1717
use Symfony\Component\OptionsResolver\Debug\OptionsResolverIntrospector;
1818
use Symfony\Component\OptionsResolver\Exception\AccessException;
19+
use Symfony\Component\OptionsResolver\Exception\AccessException;
20+
use Symfony\Component\OptionsResolver\Exception\InvalidArgumentException;
21+
use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
1922
use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
23+
use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
24+
use Symfony\Component\OptionsResolver\Exception\NoSuchOptionException;
25+
use Symfony\Component\OptionsResolver\Exception\OptionDefinitionException;
2026
use Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException;
2127
use Symfony\Component\OptionsResolver\Options;
2228
use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -235,7 +241,7 @@ public function testFailIfSetRequiredFromLazyOption()
235241

236242
public function testResolveFailsIfRequiredOptionMissing()
237243
{
238-
$this->expectException(\Symfony\Component\OptionsResolver\Exception\MissingOptionsException::class);
244+
$this->expectException(MissingOptionsException::class);
239245
$this->resolver->setRequired('foo');
240246

241247
$this->resolver->resolve();
@@ -462,7 +468,7 @@ public function testSetDeprecatedFailsIfUnknownOption()
462468

463469
public function testSetDeprecatedFailsIfInvalidDeprecationMessageType()
464470
{
465-
$this->expectException(\Symfony\Component\OptionsResolver\Exception\InvalidArgumentException::class);
471+
$this->expectException(InvalidArgumentException::class);
466472
$this->expectExceptionMessage('Invalid type for deprecation message argument, expected string or \Closure, but got "bool".');
467473
$this->resolver
468474
->setDefined('foo')
@@ -472,7 +478,7 @@ public function testSetDeprecatedFailsIfInvalidDeprecationMessageType()
472478

473479
public function testLazyDeprecationFailsIfInvalidDeprecationMessageType()
474480
{
475-
$this->expectException(\Symfony\Component\OptionsResolver\Exception\InvalidArgumentException::class);
481+
$this->expectException(InvalidArgumentException::class);
476482
$this->expectExceptionMessage('Invalid type for deprecation message, expected string but got "bool", return an empty string to ignore.');
477483
$this->resolver
478484
->setDefined('foo')
@@ -485,7 +491,7 @@ public function testLazyDeprecationFailsIfInvalidDeprecationMessageType()
485491

486492
public function testFailsIfCyclicDependencyBetweenDeprecation()
487493
{
488-
$this->expectException(\Symfony\Component\OptionsResolver\Exception\OptionDefinitionException::class);
494+
$this->expectException(OptionDefinitionException::class);
489495
$this->expectExceptionMessage('The options "foo", "bar" have a cyclic dependency.');
490496
$this->resolver
491497
->setDefined(['foo', 'bar'])
@@ -1364,7 +1370,7 @@ public function testNormalizerCanAccessLazyOptions()
13641370

13651371
public function testFailIfCyclicDependencyBetweenNormalizers()
13661372
{
1367-
$this->expectException(\Symfony\Component\OptionsResolver\Exception\OptionDefinitionException::class);
1373+
$this->expectException(OptionDefinitionException::class);
13681374
$this->resolver->setDefault('norm1', 'bar');
13691375
$this->resolver->setDefault('norm2', 'baz');
13701376

@@ -1381,7 +1387,7 @@ public function testFailIfCyclicDependencyBetweenNormalizers()
13811387

13821388
public function testFailIfCyclicDependencyBetweenNormalizerAndLazyOption()
13831389
{
1384-
$this->expectException(\Symfony\Component\OptionsResolver\Exception\OptionDefinitionException::class);
1390+
$this->expectException(OptionDefinitionException::class);
13851391
$this->resolver->setDefault('lazy', function (Options $options) {
13861392
$options['norm'];
13871393
});
@@ -1805,7 +1811,7 @@ public function testArrayAccessUnsetNotSupported()
18051811

18061812
public function testFailIfGetNonExisting()
18071813
{
1808-
$this->expectException(\Symfony\Component\OptionsResolver\Exception\NoSuchOptionException::class);
1814+
$this->expectException(NoSuchOptionException::class);
18091815
$this->expectExceptionMessage('The option "undefined" does not exist. Defined options are: "foo", "lazy".');
18101816
$this->resolver->setDefault('foo', 'bar');
18111817

@@ -1818,7 +1824,7 @@ public function testFailIfGetNonExisting()
18181824

18191825
public function testFailIfGetDefinedButUnset()
18201826
{
1821-
$this->expectException(\Symfony\Component\OptionsResolver\Exception\NoSuchOptionException::class);
1827+
$this->expectException(NoSuchOptionException::class);
18221828
$this->expectExceptionMessage('The optional option "defined" has no value set. You should make sure it is set with "isset" before reading it.');
18231829
$this->resolver->setDefined('defined');
18241830

@@ -1831,7 +1837,7 @@ public function testFailIfGetDefinedButUnset()
18311837

18321838
public function testFailIfCyclicDependency()
18331839
{
1834-
$this->expectException(\Symfony\Component\OptionsResolver\Exception\OptionDefinitionException::class);
1840+
$this->expectException(OptionDefinitionException::class);
18351841
$this->resolver->setDefault('lazy1', function (Options $options) {
18361842
$options['lazy2'];
18371843
});
@@ -2031,7 +2037,7 @@ public function testFailsIfUndefinedNestedOption()
20312037

20322038
public function testFailsIfMissingRequiredNestedOption()
20332039
{
2034-
$this->expectException(\Symfony\Component\OptionsResolver\Exception\MissingOptionsException::class);
2040+
$this->expectException(MissingOptionsException::class);
20352041
$this->expectExceptionMessage('The required option "database[host]" is missing.');
20362042
$this->resolver->setDefaults([
20372043
'name' => 'default',
@@ -2270,7 +2276,7 @@ public function testNormalizeNestedValue()
22702276

22712277
public function testFailsIfCyclicDependencyBetweenSameNestedOption()
22722278
{
2273-
$this->expectException(\Symfony\Component\OptionsResolver\Exception\OptionDefinitionException::class);
2279+
$this->expectException(OptionDefinitionException::class);
22742280
$this->resolver->setDefault('database', function (OptionsResolver $resolver, Options $parent) {
22752281
$resolver->setDefault('replicas', $parent['database']);
22762282
});
@@ -2279,7 +2285,7 @@ public function testFailsIfCyclicDependencyBetweenSameNestedOption()
22792285

22802286
public function testFailsIfCyclicDependencyBetweenNestedOptionAndParentLazyOption()
22812287
{
2282-
$this->expectException(\Symfony\Component\OptionsResolver\Exception\OptionDefinitionException::class);
2288+
$this->expectException(OptionDefinitionException::class);
22832289
$this->resolver->setDefaults([
22842290
'version' => function (Options $options) {
22852291
return $options['database']['server_version'];
@@ -2293,7 +2299,7 @@ public function testFailsIfCyclicDependencyBetweenNestedOptionAndParentLazyOptio
22932299

22942300
public function testFailsIfCyclicDependencyBetweenNormalizerAndNestedOption()
22952301
{
2296-
$this->expectException(\Symfony\Component\OptionsResolver\Exception\OptionDefinitionException::class);
2302+
$this->expectException(OptionDefinitionException::class);
22972303
$this->resolver
22982304
->setDefault('name', 'default')
22992305
->setDefault('database', function (OptionsResolver $resolver, Options $parent) {
@@ -2307,7 +2313,7 @@ public function testFailsIfCyclicDependencyBetweenNormalizerAndNestedOption()
23072313

23082314
public function testFailsIfCyclicDependencyBetweenNestedOptions()
23092315
{
2310-
$this->expectException(\Symfony\Component\OptionsResolver\Exception\OptionDefinitionException::class);
2316+
$this->expectException(OptionDefinitionException::class);
23112317
$this->resolver->setDefault('database', function (OptionsResolver $resolver, Options $parent) {
23122318
$resolver->setDefault('host', $parent['replica']['host']);
23132319
});

0 commit comments

Comments
 (0)