Skip to content

Commit fa7b760

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.8' into 3.3
* 2.8: [HttpFoundation] fixed return type of method HeaderBag::get [HttpFoundation] Added "resource" type on Request::create docblock Revert "bug #25789 Enableable ArrayNodeDefinition is disabled for empty configuration (kejwmen)" Formatting fix in upgrade 3.0 document Revert "bug #25851 [Validator] Conflict with egulias/email-validator 2.0 (emodric)" [Validator] add missing parent isset and add test
2 parents f33382d + 7589493 commit fa7b760

File tree

7 files changed

+35
-51
lines changed

7 files changed

+35
-51
lines changed

‎src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -283,9 +283,7 @@ public function canBeEnabled()
283283
->beforeNormalization()
284284
->ifArray()
285285
->then(function ($v) {
286-
if (!isset($v['enabled'])) {
287-
$v['enabled'] = !empty($v);
288-
}
286+
$v['enabled'] = isset($v['enabled']) ? $v['enabled'] : true;
289287

290288
return $v;
291289
})

‎src/Symfony/Component/Config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php

-15
Original file line numberDiff line numberDiff line change
@@ -207,20 +207,6 @@ public function testCanBeDisabled()
207207
$this->assertTrue($this->getField($enabledNode, 'defaultValue'));
208208
}
209209

210-
public function testEnableableNodeIsDisabledForEmptyConfigurationWhenNormalized()
211-
{
212-
$config = array();
213-
214-
$node = new ArrayNodeDefinition('root');
215-
$node->canBeEnabled();
216-
217-
$this->assertEquals(
218-
array('enabled' => false),
219-
$node->getNode()->normalize($config),
220-
'An enableable node is disabled by default'
221-
);
222-
}
223-
224210
public function testIgnoreExtraKeys()
225211
{
226212
$node = new ArrayNodeDefinition('root');
@@ -296,7 +282,6 @@ public function getEnableableNodeFixtures()
296282
array(array('enabled' => true, 'foo' => 'baz'), array(array('foo' => 'baz')), 'any configuration enables an enableable node'),
297283
array(array('enabled' => false, 'foo' => 'baz'), array(array('foo' => 'baz', 'enabled' => false)), 'An enableable node can be disabled'),
298284
array(array('enabled' => false, 'foo' => 'bar'), array(false), 'false disables an enableable node'),
299-
array(array('enabled' => false, 'foo' => 'bar'), array(), 'enableable node is disabled by default'),
300285
);
301286
}
302287

‎src/Symfony/Component/Config/Tests/Definition/Builder/TreeBuilderTest.php

-19
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\Config\Tests\Definition\Builder;
1313

1414
use PHPUnit\Framework\TestCase;
15-
use Symfony\Component\Config\Definition\Processor;
1615
use Symfony\Component\Config\Tests\Fixtures\Builder\NodeBuilder as CustomNodeBuilder;
1716
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
1817

@@ -132,22 +131,4 @@ public function testDefinitionExampleGetsTransferredToNode()
132131
$this->assertInternalType('array', $tree->getExample());
133132
$this->assertEquals('example', $children['child']->getExample());
134133
}
135-
136-
public function testRootNodeThatCanBeEnabledIsDisabledByDefault()
137-
{
138-
$builder = new TreeBuilder();
139-
140-
$builder->root('test')
141-
->canBeEnabled();
142-
143-
$tree = $builder->buildTree();
144-
$children = $tree->getChildren();
145-
146-
$this->assertFalse($children['enabled']->getDefaultValue());
147-
148-
$processor = new Processor();
149-
$result = $processor->process($tree, array());
150-
151-
$this->assertEquals(array('enabled' => false), $result);
152-
}
153134
}

‎src/Symfony/Component/HttpFoundation/HeaderBag.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,11 @@ public function add(array $headers)
101101
/**
102102
* Returns a header value by name.
103103
*
104-
* @param string $key The header name
105-
* @param mixed $default The default value
106-
* @param bool $first Whether to return the first value or all header values
104+
* @param string $key The header name
105+
* @param string|string[] $default The default value
106+
* @param bool $first Whether to return the first value or all header values
107107
*
108-
* @return string|array The first header value if $first is true, an array of values otherwise
108+
* @return string|string[] The first header value or default value if $first is true, an array of values otherwise
109109
*/
110110
public function get($key, $default = null, $first = true)
111111
{
@@ -130,9 +130,9 @@ public function get($key, $default = null, $first = true)
130130
/**
131131
* Sets a header by name.
132132
*
133-
* @param string $key The key
134-
* @param string|array $values The value or an array of values
135-
* @param bool $replace Whether to replace the actual value or not (true by default)
133+
* @param string $key The key
134+
* @param string|string[] $values The value or an array of values
135+
* @param bool $replace Whether to replace the actual value or not (true by default)
136136
*/
137137
public function set($key, $values, $replace = true)
138138
{

‎src/Symfony/Component/HttpFoundation/Request.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -329,13 +329,13 @@ public static function createFromGlobals()
329329
* The information contained in the URI always take precedence
330330
* over the other information (server and parameters).
331331
*
332-
* @param string $uri The URI
333-
* @param string $method The HTTP method
334-
* @param array $parameters The query (GET) or request (POST) parameters
335-
* @param array $cookies The request cookies ($_COOKIE)
336-
* @param array $files The request files ($_FILES)
337-
* @param array $server The server parameters ($_SERVER)
338-
* @param string $content The raw body data
332+
* @param string $uri The URI
333+
* @param string $method The HTTP method
334+
* @param array $parameters The query (GET) or request (POST) parameters
335+
* @param array $cookies The request cookies ($_COOKIE)
336+
* @param array $files The request files ($_FILES)
337+
* @param array $server The server parameters ($_SERVER)
338+
* @param string|resource $content The raw body data
339339
*
340340
* @return static
341341
*/

‎src/Symfony/Component/Validator/Constraint.php

+10
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,16 @@ public function __get($option)
214214
throw new InvalidOptionsException(sprintf('The option "%s" does not exist in constraint %s', $option, get_class($this)), array($option));
215215
}
216216

217+
/**
218+
* @param string $option The option name
219+
*
220+
* @return bool
221+
*/
222+
public function __isset($option)
223+
{
224+
return 'groups' === $option;
225+
}
226+
217227
/**
218228
* Adds the given group if this constraint is in the Default group.
219229
*

‎src/Symfony/Component/Validator/Tests/Constraints/FileTest.php

+10
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,16 @@ public function testMaxSize($maxSize, $bytes, $binaryFormat)
2626

2727
$this->assertSame($bytes, $file->maxSize);
2828
$this->assertSame($binaryFormat, $file->binaryFormat);
29+
$this->assertTrue($file->__isset('maxSize'));
30+
}
31+
32+
public function testMagicIsset()
33+
{
34+
$file = new File(array('maxSize' => 1));
35+
36+
$this->assertTrue($file->__isset('maxSize'));
37+
$this->assertTrue($file->__isset('groups'));
38+
$this->assertFalse($file->__isset('toto'));
2939
}
3040

3141
/**

0 commit comments

Comments
 (0)