Skip to content

Commit 3cff588

Browse files
Merge branch '3.1' into 3.2
* 3.1: (28 commits) Fix merge [Validator] add class name to the cache key [Serializer] Remove AbstractObjectNormalizer::isAttributeToNormalize Throw less misleading exception when property access not found [Twig] Fix deprecations with Twig 1.29 Fixed typo [FrameworkBundle] Removed the kernel.debug parameter from the cache pool namespace seed Fix email address fix the docblock in regard to the role argument Don't use the "app" global variable in the profiler [VarDumper] fix tests when xdebug is enabled Fix merge FIXED NON EXISTING TYPE DECLARATION [Cache] Fix dumping SplDoublyLinkedList iter mode [Console] fixed PHP7 Errors when not using Dispatcher Regression test for missing controller arguments (3.1) Regression test for missing controller arguments fix a test checking for a value [Form][DX] FileType "multiple" fixes fixed CS ...
2 parents 349a96e + 2b5427d commit 3cff588

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

Normalizer/AbstractObjectNormalizer.php

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -208,20 +208,6 @@ public function denormalize($data, $class, $format = null, array $context = arra
208208
*/
209209
abstract protected function setAttributeValue($object, $attribute, $value, $format = null, array $context = array());
210210

211-
/**
212-
* Should this attribute be normalized?
213-
*
214-
* @param mixed $object
215-
* @param string $attributeName
216-
* @param array $context
217-
*
218-
* @return bool
219-
*/
220-
protected function isAttributeToNormalize($object, $attributeName, &$context)
221-
{
222-
return !in_array($attributeName, $this->ignoredAttributes) && !$this->isMaxDepthReached(get_class($object), $attributeName, $context);
223-
}
224-
225211
/**
226212
* Validates the submitted data and denormalizes it.
227213
*

0 commit comments

Comments
 (0)