projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated Drupal to 8.6. This goes with the following updates because it's possible...
[yaffs-website]
/
vendor
/
symfony
/
serializer
/
Normalizer
/
ObjectToPopulateTrait.php
diff --git
a/vendor/symfony/serializer/Normalizer/ObjectToPopulateTrait.php
b/vendor/symfony/serializer/Normalizer/ObjectToPopulateTrait.php
index ac647889168bdb7e22a169fdd67f9c72416c8954..7150a6e6ee383426e6542460cb38d9dfa592d63b 100644
(file)
--- a/
vendor/symfony/serializer/Normalizer/ObjectToPopulateTrait.php
+++ b/
vendor/symfony/serializer/Normalizer/ObjectToPopulateTrait.php
@@
-28,7
+28,7
@@
trait ObjectToPopulateTrait
{
$key = $key ?: 'object_to_populate';
{
$key = $key ?: 'object_to_populate';
- if (isset($context[$key]) && is_object($context[$key]) && $context[$key] instanceof $class) {
+ if (isset($context[$key]) &&
\
is_object($context[$key]) && $context[$key] instanceof $class) {
return $context[$key];
}
return $context[$key];
}