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
/
lib
/
Drupal
/
Core
/
TypedData
/
DataDefinition.php
diff --git
a/web/core/lib/Drupal/Core/TypedData/DataDefinition.php
b/web/core/lib/Drupal/Core/TypedData/DataDefinition.php
index 7eec1a90c457736e8ec2a1e3017ae124578633b0..52a4394cd78e95d9e78837530e69cd78e1a54aa0 100644
(file)
--- a/
web/core/lib/Drupal/Core/TypedData/DataDefinition.php
+++ b/
web/core/lib/Drupal/Core/TypedData/DataDefinition.php
@@
-7,6
+7,8
@@
namespace Drupal\Core\TypedData;
*/
class DataDefinition implements DataDefinitionInterface, \ArrayAccess {
*/
class DataDefinition implements DataDefinitionInterface, \ArrayAccess {
+ use TypedDataTrait;
+
/**
* The array holding values for all definition keys.
*
/**
* The array holding values for all definition keys.
*
@@
-258,7
+260,7
@@
class DataDefinition implements DataDefinitionInterface, \ArrayAccess {
*/
public function getConstraints() {
$constraints = isset($this->definition['constraints']) ? $this->definition['constraints'] : [];
*/
public function getConstraints() {
$constraints = isset($this->definition['constraints']) ? $this->definition['constraints'] : [];
- $constraints +=
\Drupal::t
ypedDataManager()->getDefaultConstraints($this);
+ $constraints +=
$this->getT
ypedDataManager()->getDefaultConstraints($this);
return $constraints;
}
return $constraints;
}
@@
-340,4
+342,14
@@
class DataDefinition implements DataDefinitionInterface, \ArrayAccess {
return $this->definition;
}
return $this->definition;
}
+ /**
+ * {@inheritdoc}
+ */
+ public function __sleep() {
+ // Never serialize the typed data manager.
+ $vars = get_object_vars($this);
+ unset($vars['typedDataManager']);
+ return array_keys($vars);
+ }
+
}
}