Skip to content

Commit a2ba555

Browse files
committed
Merge branch '2.8' into 3.4
* 2.8: removed unneeded comments in tests Change PHPDoc in ResponseHeaderBag::getCookies() to help IDEs [HttpKernel] Set first trusted proxy as REMOTE_ADDR in InlineFragmentRenderer. [Process] Consider \"executable\" suffixes first on Windows Triggering RememberMe's loginFail() when token cannot be created
2 parents f3109a6 + d9077ee commit a2ba555

File tree

1 file changed

+0
-60
lines changed

1 file changed

+0
-60
lines changed

Tests/OptionsResolverTest.php

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@ protected function setUp()
2929
$this->resolver = new OptionsResolver();
3030
}
3131

32-
////////////////////////////////////////////////////////////////////////////
33-
// resolve()
34-
////////////////////////////////////////////////////////////////////////////
35-
3632
/**
3733
* @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
3834
* @expectedExceptionMessage The option "foo" does not exist. Defined options are: "a", "z".
@@ -69,10 +65,6 @@ public function testResolveFailsFromLazyOption()
6965
$this->resolver->resolve();
7066
}
7167

72-
////////////////////////////////////////////////////////////////////////////
73-
// setDefault()/hasDefault()
74-
////////////////////////////////////////////////////////////////////////////
75-
7668
public function testSetDefaultReturnsThis()
7769
{
7870
$this->assertSame($this->resolver, $this->resolver->setDefault('foo', 'bar'));
@@ -115,10 +107,6 @@ public function testHasDefaultWithNullValue()
115107
$this->assertTrue($this->resolver->hasDefault('foo'));
116108
}
117109

118-
////////////////////////////////////////////////////////////////////////////
119-
// lazy setDefault()
120-
////////////////////////////////////////////////////////////////////////////
121-
122110
public function testSetLazyReturnsThis()
123111
{
124112
$this->assertSame($this->resolver, $this->resolver->setDefault('foo', function (Options $options) {}));
@@ -232,10 +220,6 @@ public function testInvokeEachLazyOptionOnlyOnce()
232220
$this->assertSame(2, $calls);
233221
}
234222

235-
////////////////////////////////////////////////////////////////////////////
236-
// setRequired()/isRequired()/getRequiredOptions()
237-
////////////////////////////////////////////////////////////////////////////
238-
239223
public function testSetRequiredReturnsThis()
240224
{
241225
$this->assertSame($this->resolver, $this->resolver->setRequired('foo'));
@@ -330,10 +314,6 @@ public function testGetRequiredOptions()
330314
$this->assertSame(array('foo', 'bar'), $this->resolver->getRequiredOptions());
331315
}
332316

333-
////////////////////////////////////////////////////////////////////////////
334-
// isMissing()/getMissingOptions()
335-
////////////////////////////////////////////////////////////////////////////
336-
337317
public function testIsMissingIfNotSet()
338318
{
339319
$this->assertFalse($this->resolver->isMissing('foo'));
@@ -373,10 +353,6 @@ public function testGetMissingOptions()
373353
$this->assertSame(array('bar'), $this->resolver->getMissingOptions());
374354
}
375355

376-
////////////////////////////////////////////////////////////////////////////
377-
// setDefined()/isDefined()/getDefinedOptions()
378-
////////////////////////////////////////////////////////////////////////////
379-
380356
/**
381357
* @expectedException \Symfony\Component\OptionsResolver\Exception\AccessException
382358
*/
@@ -474,10 +450,6 @@ public function testClearedOptionsAreNotDefined()
474450
$this->assertFalse($this->resolver->isDefined('foo'));
475451
}
476452

477-
////////////////////////////////////////////////////////////////////////////
478-
// setAllowedTypes()
479-
////////////////////////////////////////////////////////////////////////////
480-
481453
/**
482454
* @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
483455
*/
@@ -748,10 +720,6 @@ public function testAddAllowedTypesDoesNotOverwrite2()
748720
$this->assertNotEmpty($this->resolver->resolve());
749721
}
750722

751-
////////////////////////////////////////////////////////////////////////////
752-
// setAllowedValues()
753-
////////////////////////////////////////////////////////////////////////////
754-
755723
/**
756724
* @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
757725
*/
@@ -903,10 +871,6 @@ function () { return false; },
903871
$this->assertEquals(array('foo' => 'bar'), $this->resolver->resolve());
904872
}
905873

906-
////////////////////////////////////////////////////////////////////////////
907-
// addAllowedValues()
908-
////////////////////////////////////////////////////////////////////////////
909-
910874
/**
911875
* @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
912876
*/
@@ -1023,10 +987,6 @@ public function testResolveSucceedsIfAnyAddedClosureReturnsTrue2()
1023987
$this->assertEquals(array('foo' => 'bar'), $this->resolver->resolve());
1024988
}
1025989

1026-
////////////////////////////////////////////////////////////////////////////
1027-
// setNormalizer()
1028-
////////////////////////////////////////////////////////////////////////////
1029-
1030990
public function testSetNormalizerReturnsThis()
1031991
{
1032992
$this->resolver->setDefault('foo', 'bar');
@@ -1278,10 +1238,6 @@ public function testNormalizerNotCalledForUnsetOptions()
12781238
$this->assertEmpty($this->resolver->resolve());
12791239
}
12801240

1281-
////////////////////////////////////////////////////////////////////////////
1282-
// setDefaults()
1283-
////////////////////////////////////////////////////////////////////////////
1284-
12851241
public function testSetDefaultsReturnsThis()
12861242
{
12871243
$this->assertSame($this->resolver, $this->resolver->setDefaults(array('foo', 'bar')));
@@ -1316,10 +1272,6 @@ public function testFailIfSetDefaultsFromLazyOption()
13161272
$this->resolver->resolve();
13171273
}
13181274

1319-
////////////////////////////////////////////////////////////////////////////
1320-
// remove()
1321-
////////////////////////////////////////////////////////////////////////////
1322-
13231275
public function testRemoveReturnsThis()
13241276
{
13251277
$this->resolver->setDefault('foo', 'bar');
@@ -1408,10 +1360,6 @@ public function testRemoveUnknownOptionIgnored()
14081360
$this->assertNotNull($this->resolver->remove('foo'));
14091361
}
14101362

1411-
////////////////////////////////////////////////////////////////////////////
1412-
// clear()
1413-
////////////////////////////////////////////////////////////////////////////
1414-
14151363
public function testClearReturnsThis()
14161364
{
14171365
$this->assertSame($this->resolver, $this->resolver->clear());
@@ -1498,10 +1446,6 @@ public function testClearOptionAndNormalizer()
14981446
$this->assertEmpty($this->resolver->resolve());
14991447
}
15001448

1501-
////////////////////////////////////////////////////////////////////////////
1502-
// ArrayAccess
1503-
////////////////////////////////////////////////////////////////////////////
1504-
15051449
public function testArrayAccess()
15061450
{
15071451
$this->resolver->setDefault('default1', 0);
@@ -1616,10 +1560,6 @@ public function testFailIfCyclicDependency()
16161560
$this->resolver->resolve();
16171561
}
16181562

1619-
////////////////////////////////////////////////////////////////////////////
1620-
// Countable
1621-
////////////////////////////////////////////////////////////////////////////
1622-
16231563
public function testCount()
16241564
{
16251565
$this->resolver->setDefault('default', 0);

0 commit comments

Comments
 (0)