projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Updating Media dependent modules to versions compatible with core Media.
[yaffs-website]
/
vendor
/
symfony
/
serializer
/
Mapping
/
ClassMetadataInterface.php
diff --git
a/vendor/symfony/serializer/Mapping/ClassMetadataInterface.php
b/vendor/symfony/serializer/Mapping/ClassMetadataInterface.php
index 3811e56548a0c35c3d0fda8cbcb50c03b48008bb..a0765861643bb1221ba7f336466c1313e9ae230c 100644
(file)
--- a/
vendor/symfony/serializer/Mapping/ClassMetadataInterface.php
+++ b/
vendor/symfony/serializer/Mapping/ClassMetadataInterface.php
@@
-46,7
+46,7
@@
interface ClassMetadataInterface
/**
* Merges a {@link ClassMetadataInterface} in the current one.
*/
- public function merge(
ClassMetadataInterface
$classMetadata);
+ public function merge(
self
$classMetadata);
/**
* Returns a {@link \ReflectionClass} instance for this class.