opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Drupal 8.2.6. For more information, see https://www.drupal.org/project/drupal/releases/8.2.6

Browse source
This commit is contained in:
Pantheon Automation 2017-02-02 16:28:38 -08:00 • committed by Greg Anderson
parent db56c09587
commit f1e72395cb
588 changed files with 26857 additions and 2777 deletions
Download patch file Download diff file Expand all files Collapse all files

2
vendor/symfony/validator/Mapping/CascadingStrategy.php vendored
View file

@ -27,8 +27,6 @@ namespace Symfony\Component\Validator\Mapping;
* Although the constants currently represent a boolean switch, they are
* implemented as bit mask in order to allow future extensions.
*
* @since 2.5
*
* @author Bernhard Schussek <bschussek@gmail.com>
*
* @see TraversalStrategy

18
vendor/symfony/validator/Mapping/ClassMetadata.php vendored
View file

@ -261,7 +261,7 @@ class ClassMetadata extends ElementMetadata implements ClassMetadataInterface
* @param string $property The name of the property
* @param Constraint $constraint The constraint
*
* @return ClassMetadata This object
* @return $this
*/
public function addPropertyConstraint($property, Constraint $constraint)
{
@ -282,7 +282,7 @@ class ClassMetadata extends ElementMetadata implements ClassMetadataInterface
* @param string $property
* @param Constraint[] $constraints
*
* @return ClassMetadata
* @return $this
*/
public function addPropertyConstraints($property, array $constraints)
{
@ -302,7 +302,7 @@ class ClassMetadata extends ElementMetadata implements ClassMetadataInterface
* @param string $property The name of the property
* @param Constraint $constraint The constraint
*
* @return ClassMetadata This object
* @return $this
*/
public function addGetterConstraint($property, Constraint $constraint)
{
@ -323,7 +323,7 @@ class ClassMetadata extends ElementMetadata implements ClassMetadataInterface
* @param string $property
* @param Constraint[] $constraints
*
* @return ClassMetadata
* @return $this
*/
public function addGetterConstraints($property, array $constraints)
{
@ -346,10 +346,18 @@ class ClassMetadata extends ElementMetadata implements ClassMetadataInterface
}
foreach ($source->getConstrainedProperties() as $property) {
if ($this->hasPropertyMetadata($property)) {
continue;
}
foreach ($source->getPropertyMetadata($property) as $member) {
$member = clone $member;
foreach ($member->getConstraints() as $constraint) {
if (in_array($constraint::DEFAULT_GROUP, $constraint->groups, true)) {
$member->constraintsByGroup[$this->getDefaultGroup()][] = $constraint;
}
$constraint->addImplicitGroupName($this->getDefaultGroup());
}
@ -447,7 +455,7 @@ class ClassMetadata extends ElementMetadata implements ClassMetadataInterface
*
* @param array $groupSequence An array of group names
*
* @return ClassMetadata
* @return $this
*
* @throws GroupDefinitionException
*/

2
vendor/symfony/validator/Mapping/ClassMetadataInterface.php vendored
View file

@ -24,8 +24,6 @@ use Symfony\Component\Validator\PropertyMetadataContainerInterface as LegacyProp
* by a group sequence for that class and whether instances of that class
* should be traversed or not.
*
* @since 2.5
*
* @author Bernhard Schussek <bschussek@gmail.com>
*
* @see MetadataInterface

57
vendor/symfony/validator/Mapping/Factory/LazyLoadingMetadataFactory.php vendored
View file

@ -101,8 +101,11 @@ class LazyLoadingMetadataFactory implements MetadataFactoryInterface
return $this->loadedClasses[$class];
}
if (null !== $this->cache && false !== ($this->loadedClasses[$class] = $this->cache->read($class))) {
return $this->loadedClasses[$class];
if (null !== $this->cache && false !== ($metadata = $this->cache->read($class))) {
// Include constraints from the parent class
$this->mergeConstraints($metadata);
return $this->loadedClasses[$class] = $metadata;
}
if (!class_exists($class) && !interface_exists($class)) {
@ -111,19 +114,6 @@ class LazyLoadingMetadataFactory implements MetadataFactoryInterface
$metadata = new ClassMetadata($class);
// Include constraints from the parent class
if ($parent = $metadata->getReflectionClass()->getParentClass()) {
$metadata->mergeConstraints($this->getMetadataFor($parent->name));
}
// Include constraints from all implemented interfaces
foreach ($metadata->getReflectionClass()->getInterfaces() as $interface) {
if ('Symfony\Component\Validator\GroupSequenceProviderInterface' === $interface->name) {
continue;
}
$metadata->mergeConstraints($this->getMetadataFor($interface->name));
}
if (null !== $this->loader) {
$this->loader->loadClassMetadata($metadata);
}
@ -132,9 +122,46 @@ class LazyLoadingMetadataFactory implements MetadataFactoryInterface
$this->cache->write($metadata);
}
// Include constraints from the parent class
$this->mergeConstraints($metadata);
return $this->loadedClasses[$class] = $metadata;
}
private function mergeConstraints(ClassMetadata $metadata)
{
// Include constraints from the parent class
if ($parent = $metadata->getReflectionClass()->getParentClass()) {
$metadata->mergeConstraints($this->getMetadataFor($parent->name));
}
$interfaces = $metadata->getReflectionClass()->getInterfaces();
$interfaces = array_filter($interfaces, function ($interface) use ($parent, $interfaces) {
$interfaceName = $interface->getName();
if ($parent && $parent->implementsInterface($interfaceName)) {
return false;
}
foreach ($interfaces as $i) {
if ($i !== $interface && $i->implementsInterface($interfaceName)) {
return false;
}
}
return true;
});
// Include constraints from all directly implemented interfaces
foreach ($interfaces as $interface) {
if ('Symfony\Component\Validator\GroupSequenceProviderInterface' === $interface->name) {
continue;
}
$metadata->mergeConstraints($this->getMetadataFor($interface->name));
}
}
/**
* {@inheritdoc}
*/

2
vendor/symfony/validator/Mapping/Factory/MetadataFactoryInterface.php vendored
View file

@ -16,8 +16,6 @@ use Symfony\Component\Validator\MetadataFactoryInterface as LegacyMetadataFactor
/**
* Returns {@link \Symfony\Component\Validator\Mapping\MetadataInterface} instances for values.
*
* @since 2.5
*
* @author Bernhard Schussek <bschussek@gmail.com>
*/
interface MetadataFactoryInterface extends LegacyMetadataFactoryInterface

6
vendor/symfony/validator/Mapping/GenericMetadata.php vendored
View file

@ -23,8 +23,6 @@ use Symfony\Component\Validator\ValidationVisitorInterface;
*
* This class supports serialization and cloning.
*
* @since 2.5
*
* @author Bernhard Schussek <bschussek@gmail.com>
*/
class GenericMetadata implements MetadataInterface
@ -123,7 +121,7 @@ class GenericMetadata implements MetadataInterface
*
* @param Constraint $constraint The constraint to add
*
* @return GenericMetadata This object
* @return $this
*
* @throws ConstraintDefinitionException When trying to add the
* {@link Traverse} constraint
@ -169,7 +167,7 @@ class GenericMetadata implements MetadataInterface
*
* @param Constraint[] $constraints The constraints to add
*
* @return GenericMetadata This object
* @return $this
*/
public function addConstraints(array $constraints)
{

10
vendor/symfony/validator/Mapping/Loader/XmlFileLoader.php vendored
View file

@ -84,7 +84,7 @@ class XmlFileLoader extends FileLoader
$options = array();
}
} elseif (strlen((string) $node) > 0) {
$options = trim($node);
$options = XmlUtils::phpize(trim($node));
} else {
$options = null;
}
@ -182,13 +182,7 @@ class XmlFileLoader extends FileLoader
return simplexml_import_dom($dom);
}
/**
* Loads the validation metadata from the given XML class description.
*
* @param ClassMetadata $metadata The metadata to load
* @param array $classDescription The XML class description
*/
private function loadClassMetadataFromXml(ClassMetadata $metadata, $classDescription)
private function loadClassMetadataFromXml(ClassMetadata $metadata, \SimpleXMLElement $classDescription)
{
if (count($classDescription->{'group-sequence-provider'}) > 0) {
$metadata->setGroupSequenceProvider(true);

12
vendor/symfony/validator/Mapping/Loader/YamlFileLoader.php vendored
View file

@ -46,13 +46,7 @@ class YamlFileLoader extends FileLoader
$this->yamlParser = new YamlParser();
}
// This method may throw an exception. Do not modify the class'
// state before it completes
if (false === ($classes = $this->parseFile($this->file))) {
return false;
}
$this->classes = $classes;
$this->classes = $this->parseFile($this->file);
if (isset($this->classes['namespaces'])) {
foreach ($this->classes['namespaces'] as $alias => $namespace) {
@ -111,7 +105,7 @@ class YamlFileLoader extends FileLoader
*
* @param string $path The path of the YAML file
*
* @return array|null The class descriptions or null, if the file was empty
* @return array The class descriptions
*
* @throws \InvalidArgumentException If the file could not be loaded or did
* not contain a YAML array
@ -126,7 +120,7 @@ class YamlFileLoader extends FileLoader
// empty file
if (null === $classes) {
return;
return array();
}
// not an array

2
vendor/symfony/validator/Mapping/MetadataInterface.php vendored
View file

@ -24,8 +24,6 @@ use Symfony\Component\Validator\MetadataInterface as LegacyMetadataInterface;
* against their class' metadata and whether traversable objects should be
* traversed or not.
*
* @since 2.5
*
* @author Bernhard Schussek <bschussek@gmail.com>
*
* @see CascadingStrategy

8
vendor/symfony/validator/Mapping/PropertyMetadata.php vendored
View file

@ -39,7 +39,7 @@ class PropertyMetadata extends MemberMetadata
public function __construct($class, $name)
{
if (!property_exists($class, $name)) {
throw new ValidatorException(sprintf('Property %s does not exist in class %s', $name, $class));
throw new ValidatorException(sprintf('Property "%s" does not exist in class "%s"', $name, $class));
}
parent::__construct($class, $name, $name);
@ -58,8 +58,14 @@ class PropertyMetadata extends MemberMetadata
*/
protected function newReflectionMember($objectOrClassName)
{
$originalClass = is_string($objectOrClassName) ? $objectOrClassName : get_class($objectOrClassName);
while (!property_exists($objectOrClassName, $this->getName())) {
$objectOrClassName = get_parent_class($objectOrClassName);
if (false === $objectOrClassName) {
throw new ValidatorException(sprintf('Property "%s" does not exist in class "%s".', $this->getName(), $originalClass));
}
}
$member = new \ReflectionProperty($objectOrClassName, $this->getName());

2
vendor/symfony/validator/Mapping/PropertyMetadataInterface.php vendored
View file

@ -24,8 +24,6 @@ use Symfony\Component\Validator\PropertyMetadataInterface as LegacyPropertyMetad
* should be validated against their class' metadata and whether traversable
* objects should be traversed or not.
*
* @since 2.5
*
* @author Bernhard Schussek <bschussek@gmail.com>
*
* @see MetadataInterface

2
vendor/symfony/validator/Mapping/TraversalStrategy.php vendored
View file

@ -23,8 +23,6 @@ namespace Symfony\Component\Validator\Mapping;
*
* The traversal strategy is ignored for arrays. Arrays are always iterated.
*
* @since 2.1
*
* @author Bernhard Schussek <bschussek@gmail.com>
*
* @see CascadingStrategy