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
/
Mapping
/
AttributeMetadataInterface.php
diff --git
a/vendor/symfony/serializer/Mapping/AttributeMetadataInterface.php
b/vendor/symfony/serializer/Mapping/AttributeMetadataInterface.php
index d9a15d5ac0de5c74437cfc1a923bf0c2cc0418bc..944a7b3133f358807104f41ff3b13a29b02d6854 100644
(file)
--- a/
vendor/symfony/serializer/Mapping/AttributeMetadataInterface.php
+++ b/
vendor/symfony/serializer/Mapping/AttributeMetadataInterface.php
@@
-60,5
+60,5
@@
interface AttributeMetadataInterface
/**
* Merges an {@see AttributeMetadataInterface} with in the current one.
*/
- public function merge(
self
$attributeMetadata);
+ public function merge(
AttributeMetadataInterface
$attributeMetadata);
}