[Serializer] Replace BadMethodCallException by UnexpectedValueException
This commit is contained in:
parent
2b036ecbb5
commit
469b8e7017
@ -13,6 +13,7 @@ namespace Symfony\Component\Serializer\Mapping\Loader;
|
|||||||
|
|
||||||
use Doctrine\Common\Annotations\Reader;
|
use Doctrine\Common\Annotations\Reader;
|
||||||
use Symfony\Component\Serializer\Annotation\Groups;
|
use Symfony\Component\Serializer\Annotation\Groups;
|
||||||
|
use Symfony\Component\Serializer\Exception\MappingException;
|
||||||
use Symfony\Component\Serializer\Mapping\ClassMetadata;
|
use Symfony\Component\Serializer\Mapping\ClassMetadata;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -45,7 +46,7 @@ class AnnotationLoader implements LoaderInterface
|
|||||||
$loaded = false;
|
$loaded = false;
|
||||||
|
|
||||||
foreach ($reflClass->getProperties() as $property) {
|
foreach ($reflClass->getProperties() as $property) {
|
||||||
if ($property->getDeclaringClass()->name == $className) {
|
if ($property->getDeclaringClass()->name === $className) {
|
||||||
foreach ($this->reader->getPropertyAnnotations($property) as $groups) {
|
foreach ($this->reader->getPropertyAnnotations($property) as $groups) {
|
||||||
if ($groups instanceof Groups) {
|
if ($groups instanceof Groups) {
|
||||||
foreach ($groups->getGroups() as $group) {
|
foreach ($groups->getGroups() as $group) {
|
||||||
@ -59,7 +60,7 @@ class AnnotationLoader implements LoaderInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
foreach ($reflClass->getMethods() as $method) {
|
foreach ($reflClass->getMethods() as $method) {
|
||||||
if ($method->getDeclaringClass()->name == $className) {
|
if ($method->getDeclaringClass()->name === $className) {
|
||||||
foreach ($this->reader->getMethodAnnotations($method) as $groups) {
|
foreach ($this->reader->getMethodAnnotations($method) as $groups) {
|
||||||
if ($groups instanceof Groups) {
|
if ($groups instanceof Groups) {
|
||||||
if (preg_match('/^(get|is)(.+)$/i', $method->name, $matches)) {
|
if (preg_match('/^(get|is)(.+)$/i', $method->name, $matches)) {
|
||||||
@ -67,7 +68,7 @@ class AnnotationLoader implements LoaderInterface
|
|||||||
$metadata->addAttributeGroup(lcfirst($matches[2]), $group);
|
$metadata->addAttributeGroup(lcfirst($matches[2]), $group);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
throw new \BadMethodCallException(sprintf('Groups on "%s::%s" cannot be added. Groups can only be added on methods beginning with "get" or "is".', $className, $method->name));
|
throw new MappingException(sprintf('Groups on "%s::%s" cannot be added. Groups can only be added on methods beginning with "get" or "is".', $className, $method->name));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user