Skip to content

Commit 3e93cd9

Browse files
Merge branch '4.0'
* 4.0: [Bridge/Twig] fix composer.json bug #26086 [FrameworkBundle] Fix using annotation_reader in compiler pass to inject configured cache provider [WebProfilerBundle] Fix anchor CSS [HttpKernel] Send new session cookie from AbstractTestSessionListener after session invalidation [WebProfilerBundle] Tweak default route name updated StopwatchEvent phpdoc due to the additional of optional float precision introduced in 0db8d7fb6a5396f84f2907e5e595c114982772ff Retro-fit proxy code to make it deterministic for older proxy manager implementations [Serializer] remove unneeded php doc line Yaml parser regression with comments and non-strings Fixed broken tests [TwigBridge] Apply some changes to support Bootstrap4-stable
2 parents 80dcdaf + 64106b8 commit 3e93cd9

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

Encoder/XmlEncoder.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ class XmlEncoder implements EncoderInterface, DecoderInterface, NormalizationAwa
4141
/**
4242
* Construct new XmlEncoder and allow to change the root node element name.
4343
*
44-
* @param string $rootNodeName
45-
* @param int|null $loadOptions A bit field of LIBXML_* constants
44+
* @param int|null $loadOptions A bit field of LIBXML_* constants
4645
*/
4746
public function __construct(string $rootNodeName = 'response', int $loadOptions = null)
4847
{
@@ -346,7 +345,6 @@ private function parseXmlValue(\DOMNode $node, array $context = array())
346345
/**
347346
* Parse the data and convert it to DOMElements.
348347
*
349-
* @param \DOMNode $parentNode
350348
* @param array|object $data
351349
*
352350
* @throws NotEncodableValueException
@@ -412,7 +410,6 @@ private function buildXml(\DOMNode $parentNode, $data, string $xmlRootNodeName =
412410
/**
413411
* Selects the type of node to create and appends it to the parent.
414412
*
415-
* @param \DOMNode $parentNode
416413
* @param array|object $data
417414
*/
418415
private function appendNode(\DOMNode $parentNode, $data, string $nodeName, string $key = null): bool
@@ -441,8 +438,7 @@ private function needsCdataWrapping(string $val): bool
441438
/**
442439
* Tests the value being passed and decide what sort of element to create.
443440
*
444-
* @param \DOMNode $node
445-
* @param mixed $val
441+
* @param mixed $val
446442
*
447443
* @throws NotEncodableValueException
448444
*/

0 commit comments

Comments
 (0)