Skip to content

Commit 39cb2a9

Browse files
committed
improve deprecation messages
1 parent 1da4252 commit 39cb2a9

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

src/Symfony/Bundle/TwigBundle/Extension/ActionsExtension.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ public function __construct($handler)
3838
if ($handler instanceof FragmentHandler) {
3939
$this->handler = $handler;
4040
} elseif ($handler instanceof ContainerInterface) {
41-
@trigger_error('The ability to pass a ContainerInterface instance as a first argument to '.__METHOD__.' method is deprecated since Symfony 2.7 and will be removed in 3.0. Pass a FragmentHandler instance instead.', E_USER_DEPRECATED);
42-
4341
$this->handler = $handler->get('fragment.handler');
4442
} else {
4543
throw new \BadFunctionCallException(sprintf('%s takes a FragmentHandler or a ContainerInterface object as its first argument.', __METHOD__));

src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public function setIgnoredAttributes(array $ignoredAttributes)
158158
*/
159159
public function setCamelizedAttributes(array $camelizedAttributes)
160160
{
161-
@trigger_error(sprintf('%s is deprecated since Symfony 2.7 and will be removed in 3.0. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.', __METHOD__), E_USER_DEPRECATED);
161+
@trigger_error(sprintf('The "%s()" method is deprecated since Symfony 2.7 and will be removed in 3.0. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.', __METHOD__), E_USER_DEPRECATED);
162162

163163
if ($this->nameConverter && !$this->nameConverter instanceof CamelCaseToSnakeCaseNameConverter) {
164164
throw new LogicException(sprintf('%s cannot be called if a custom Name Converter is defined.', __METHOD__));
@@ -237,7 +237,7 @@ protected function handleCircularReference($object)
237237
*/
238238
protected function formatAttribute($attributeName)
239239
{
240-
@trigger_error(sprintf('%s is deprecated since Symfony 2.7 and will be removed in 3.0. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.', __METHOD__), E_USER_DEPRECATED);
240+
@trigger_error(sprintf('The "%s()" method is deprecated since Symfony 2.7 and will be removed in 3.0. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.', __METHOD__), E_USER_DEPRECATED);
241241

242242
return $this->nameConverter ? $this->nameConverter->normalize($attributeName) : $attributeName;
243243
}

0 commit comments

Comments
 (0)