Skip to content

Commit 4b0c3c2

Browse files
committed
Merge branch '2.6' into 2.7
* 2.6: [2.3] [HttpFoundation] [MimeTypeGuesser] Removed dead code and various cleaning Removed dead code and various cleaning [FrameworkBundle][xsd] added missing logging attribute. [Console] Make it clear that the second argument is not about command options. Added the '-' character for spaceless on tag start and end to be consistent for block, if, set and for nodes [Yaml] fixed parse shortcut Key after unindented collection. [Console] fixed #10531 Make the container considered non-fresh if the environment parameters are changed
2 parents 13476f8 + 6846dd2 commit 4b0c3c2

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

Caster/DOMCaster.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,6 @@ public static function castNode(\DOMNode $dom, array $a, Stub $stub, $isNested)
115115

116116
public static function castNameSpaceNode(\DOMNameSpaceNode $dom, array $a, Stub $stub, $isNested)
117117
{
118-
// Commented lines denote properties that exist but are better not dumped for clarity.
119-
120118
$a += array(
121119
'nodeName' => $dom->nodeName,
122120
'nodeValue' => new CutStub($dom->nodeValue),

0 commit comments

Comments
 (0)