Skip to content

Commit da70acf

Browse files
Merge branch '2.6' into 2.7
* 2.6: (24 commits) [Form] fixed a maxlength overring on a guessing [Debug] Show only unique class candidates [SecurityBundle] Firewall providers building - code cleaning [Filesystem] symlink use RealPath instead LinkTarget [DependencyInjection] Remove duplicate declaration in PhpDumper terminals are not interactive on Travis Revert "[DependencyInjection] backport perf optim" [WebProfiler] Tweaked ajax requests toolbar css reset [WebProfilerBundle] replaced pattern to path attribute in routes definitions. fix phpdoc's alignment Fix missing addExpressionLanguageProvider (used by service container to add expression providers) Fixed the AuthenticationProviderInterface alignment Fixed the proxy-manager version constraint Fix missing space in label_attr fix DumpDataCollectorTest after CS changes avoid risky tests Fixed typo in SecurityContext PHPDoc [FrameworkBundle][Template name] avoid error message for the shortcut notation. [DependencyInjection] perf optim: call dirname() at most 5x [DependencyInjection] backport perf optim ...
2 parents 7d5ab18 + a58ee01 commit da70acf

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

Encoder/XmlEncoder.php

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -129,21 +129,21 @@ public function decode($data, $format, array $context = array())
129129
return $data;
130130
}
131131

132-
/**
133-
* {@inheritdoc}
134-
*/
135-
public function supportsEncoding($format)
136-
{
137-
return 'xml' === $format;
138-
}
139-
140-
/**
141-
* {@inheritdoc}
142-
*/
143-
public function supportsDecoding($format)
144-
{
145-
return 'xml' === $format;
146-
}
132+
/**
133+
* {@inheritdoc}
134+
*/
135+
public function supportsEncoding($format)
136+
{
137+
return 'xml' === $format;
138+
}
139+
140+
/**
141+
* {@inheritdoc}
142+
*/
143+
public function supportsDecoding($format)
144+
{
145+
return 'xml' === $format;
146+
}
147147

148148
/**
149149
* Sets the root node name.

0 commit comments

Comments
 (0)