comparison vendor/symfony/validator/Constraints/Collection.php @ 14:1fec387a4317

Update Drupal core to 8.5.2 via Composer
author Chris Cannam
date Mon, 23 Apr 2018 09:46:53 +0100
parents 4c8ae668cc8c
children 129ea1e6d783
comparison
equal deleted inserted replaced
13:5fb285c0d0e3 14:1fec387a4317
61 } 61 }
62 62
63 foreach ($this->fields as $fieldName => $field) { 63 foreach ($this->fields as $fieldName => $field) {
64 // the XmlFileLoader and YamlFileLoader pass the field Optional 64 // the XmlFileLoader and YamlFileLoader pass the field Optional
65 // and Required constraint as an array with exactly one element 65 // and Required constraint as an array with exactly one element
66 if (is_array($field) && count($field) == 1) { 66 if (is_array($field) && 1 == count($field)) {
67 $this->fields[$fieldName] = $field = $field[0]; 67 $this->fields[$fieldName] = $field = $field[0];
68 } 68 }
69 69
70 if (!$field instanceof Optional && !$field instanceof Required) { 70 if (!$field instanceof Optional && !$field instanceof Required) {
71 $this->fields[$fieldName] = $field = new Required($field); 71 $this->fields[$fieldName] = $field = new Required($field);