projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Security update for Core, with self-updated composer
[yaffs-website]
/
web
/
core
/
modules
/
serialization
/
src
/
Normalizer
/
NormalizerBase.php
diff --git
a/web/core/modules/serialization/src/Normalizer/NormalizerBase.php
b/web/core/modules/serialization/src/Normalizer/NormalizerBase.php
index 90d9b752581649e90c35e251f3fff3daf5bfa688..5e829f65e701a0b7b3f2c2a24713fbe1cc0e9691 100644
(file)
--- a/
web/core/modules/serialization/src/Normalizer/NormalizerBase.php
+++ b/
web/core/modules/serialization/src/Normalizer/NormalizerBase.php
@@
-17,6
+17,13
@@
abstract class NormalizerBase extends SerializerAwareNormalizer implements Norma
*/
protected $supportedInterfaceOrClass;
*/
protected $supportedInterfaceOrClass;
+ /**
+ * List of formats which supports (de-)normalization.
+ *
+ * @var string|string[]
+ */
+ protected $format;
+
/**
* {@inheritdoc}
*/
/**
* {@inheritdoc}
*/
@@
-29,7
+36,7
@@
abstract class NormalizerBase extends SerializerAwareNormalizer implements Norma
$supported = (array) $this->supportedInterfaceOrClass;
$supported = (array) $this->supportedInterfaceOrClass;
- return (bool) array_filter($supported, function($name) use ($data) {
+ return (bool) array_filter($supported, function
($name) use ($data) {
return $data instanceof $name;
});
}
return $data instanceof $name;
});
}
@@
-49,7
+56,7
@@
abstract class NormalizerBase extends SerializerAwareNormalizer implements Norma
$supported = (array) $this->supportedInterfaceOrClass;
$supported = (array) $this->supportedInterfaceOrClass;
- $subclass_check = function($name) use ($type) {
+ $subclass_check = function
($name) use ($type) {
return (class_exists($name) || interface_exists($name)) && is_subclass_of($type, $name, TRUE);
};
return (class_exists($name) || interface_exists($name)) && is_subclass_of($type, $name, TRUE);
};
@@
-71,7
+78,7
@@
abstract class NormalizerBase extends SerializerAwareNormalizer implements Norma
return TRUE;
}
return TRUE;
}
- return in_array($format, (array) $this->format);
+ return in_array($format, (array) $this->format
, TRUE
);
}
}
}
}