Update to Drupal 8.0-dev-2015-11-17. Commits through da81cd220, Tue Nov 17 15:53:49 2015 +0000, Issue #2617224 by Wim Leers: Move around/fix some documentation.
This commit is contained in:
parent
4afb23bbd3
commit
7784f4c23d
929 changed files with 19798 additions and 5304 deletions
|
@ -49,7 +49,7 @@ class AnnotationLoader implements LoaderInterface
|
|||
$attributesMetadata = $classMetadata->getAttributesMetadata();
|
||||
|
||||
foreach ($reflectionClass->getProperties() as $property) {
|
||||
if (!isset($attributeMetadata[$property->name])) {
|
||||
if (!isset($attributesMetadata[$property->name])) {
|
||||
$attributesMetadata[$property->name] = new AttributeMetadata($property->name);
|
||||
$classMetadata->addAttributeMetadata($attributesMetadata[$property->name]);
|
||||
}
|
||||
|
|
|
@ -105,7 +105,7 @@ abstract class AbstractNormalizer extends SerializerAwareNormalizer implements N
|
|||
/**
|
||||
* Set normalization callbacks.
|
||||
*
|
||||
* @param array $callbacks help normalize the result
|
||||
* @param callable[] $callbacks help normalize the result
|
||||
*
|
||||
* @return self
|
||||
*
|
||||
|
|
1
vendor/symfony/serializer/composer.json
vendored
1
vendor/symfony/serializer/composer.json
vendored
|
@ -19,7 +19,6 @@
|
|||
"php": ">=5.3.9"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/phpunit-bridge": "~2.7",
|
||||
"symfony/yaml": "~2.0,>=2.0.5",
|
||||
"symfony/config": "~2.2",
|
||||
"symfony/property-access": "~2.3",
|
||||
|
|
Reference in a new issue