Mercurial > hg > isophonics-drupal-site
diff vendor/symfony/validator/Mapping/ClassMetadata.php @ 17:129ea1e6d783
Update, including to Drupal core 8.6.10
author | Chris Cannam |
---|---|
date | Thu, 28 Feb 2019 13:21:36 +0000 |
parents | c2387f117808 |
children | af1871eacc83 |
line wrap: on
line diff
--- a/vendor/symfony/validator/Mapping/ClassMetadata.php Tue Jul 10 15:07:59 2018 +0100 +++ b/vendor/symfony/validator/Mapping/ClassMetadata.php Thu Feb 28 13:21:36 2019 +0000 @@ -53,7 +53,7 @@ * class' serialized representation. Do not access it. Use * {@link getPropertyMetadata()} instead. */ - public $members = array(); + public $members = []; /** * @var PropertyMetadata[] @@ -62,7 +62,7 @@ * class' serialized representation. Do not access it. Use * {@link getPropertyMetadata()} instead. */ - public $properties = array(); + public $properties = []; /** * @var GetterMetadata[] @@ -71,7 +71,7 @@ * class' serialized representation. Do not access it. Use * {@link getPropertyMetadata()} instead. */ - public $getters = array(); + public $getters = []; /** * @var array @@ -80,7 +80,7 @@ * class' serialized representation. Do not access it. Use * {@link getGroupSequence()} instead. */ - public $groupSequence = array(); + public $groupSequence = []; /** * @var bool @@ -135,7 +135,7 @@ // Don't store the cascading strategy. Classes never cascade. unset($parentProperties[array_search('cascadingStrategy', $parentProperties)]); - return array_merge($parentProperties, array( + return array_merge($parentProperties, [ 'getters', 'groupSequence', 'groupSequenceProvider', @@ -143,7 +143,7 @@ 'name', 'properties', 'defaultGroup', - )); + ]); } /** @@ -179,18 +179,12 @@ */ public function addConstraint(Constraint $constraint) { - if (!in_array(Constraint::CLASS_CONSTRAINT, (array) $constraint->getTargets())) { - throw new ConstraintDefinitionException(sprintf( - 'The constraint "%s" cannot be put on classes.', - get_class($constraint) - )); + if (!\in_array(Constraint::CLASS_CONSTRAINT, (array) $constraint->getTargets())) { + throw new ConstraintDefinitionException(sprintf('The constraint "%s" cannot be put on classes.', \get_class($constraint))); } if ($constraint instanceof Valid) { - throw new ConstraintDefinitionException(sprintf( - 'The constraint "%s" cannot be put on classes.', - get_class($constraint) - )); + throw new ConstraintDefinitionException(sprintf('The constraint "%s" cannot be put on classes.', \get_class($constraint))); } if ($constraint instanceof Traverse) { @@ -350,7 +344,7 @@ $member = clone $member; foreach ($member->getConstraints() as $constraint) { - if (in_array($constraint::DEFAULT_GROUP, $constraint->groups, true)) { + if (\in_array($constraint::DEFAULT_GROUP, $constraint->groups, true)) { $member->constraintsByGroup[$this->getDefaultGroup()][] = $constraint; } @@ -386,7 +380,7 @@ public function getPropertyMetadata($property) { if (!isset($this->members[$property])) { - return array(); + return []; } return $this->members[$property]; @@ -403,7 +397,7 @@ /** * Sets the default group sequence for this class. * - * @param array $groupSequence An array of group names + * @param string[]|GroupSequence $groupSequence An array of group names * * @return $this * @@ -415,15 +409,15 @@ throw new GroupDefinitionException('Defining a static group sequence is not allowed with a group sequence provider'); } - if (is_array($groupSequence)) { + if (\is_array($groupSequence)) { $groupSequence = new GroupSequence($groupSequence); } - if (in_array(Constraint::DEFAULT_GROUP, $groupSequence->groups, true)) { + if (\in_array(Constraint::DEFAULT_GROUP, $groupSequence->groups, true)) { throw new GroupDefinitionException(sprintf('The group "%s" is not allowed in group sequences', Constraint::DEFAULT_GROUP)); } - if (!in_array($this->getDefaultGroup(), $groupSequence->groups, true)) { + if (!\in_array($this->getDefaultGroup(), $groupSequence->groups, true)) { throw new GroupDefinitionException(sprintf('The group "%s" is missing in the group sequence', $this->getDefaultGroup())); } @@ -437,7 +431,7 @@ */ public function hasGroupSequence() { - return $this->groupSequence && count($this->groupSequence->groups) > 0; + return $this->groupSequence && \count($this->groupSequence->groups) > 0; } /**