Skip to content

Commit a58ee01

Browse files
Merge branch '2.5' into 2.6
* 2.5: [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" [WebProfilerBundle] replaced pattern to path attribute in routes definitions. fix phpdoc's alignment Fixed the AuthenticationProviderInterface alignment Fixed the proxy-manager version constraint [FrameworkBundle][Template name] avoid error message for the shortcut notation. [DependencyInjection] perf optim: call dirname() at most 5x [DependencyInjection] backport perf optim Fixed #12845 adding a listener to an event that is currently being dispatched will not result into a fatal error in TraceableEventDispatcher [EventDispatcher] [2.5] Remove possible call_user_func() [2.3] Remove possible call_user_func() Conflicts: src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
2 parents e4c9723 + dccce3a commit a58ee01

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)