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

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

Browse source
This commit is contained in:
Pantheon Automation 2016-11-02 11:43:31 -07:00 • committed by Greg Anderson
parent 23ffed3665
commit 507b45a0ed
378 changed files with 11434 additions and 5542 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/modules/options/options.api.php
View file

@ -20,7 +20,7 @@ use Drupal\Core\Field\FieldStorageDefinitionInterface;
* properties.
* @param array $context
* An associative array containing:
* - field_definition: The field definition
* - fieldDefinition: The field definition
* (\Drupal\Core\Field\FieldDefinitionInterface).
* - entity: The entity object the field is attached to
* (\Drupal\Core\Entity\EntityInterface).
@ -30,7 +30,7 @@ use Drupal\Core\Field\FieldStorageDefinitionInterface;
*/
function hook_options_list_alter(array &$options, array $context) {
// Check if this is the field we want to change.
if ($context['field']->id() == 'field_option') {
if ($context['fieldDefinition']->id() == 'field_option') {
// Change the label of the empty option.
$options['_none'] = t('== Empty ==');
}

6
core/modules/options/src/Plugin/Field/FieldType/ListItemBase.php
View file

@ -168,7 +168,7 @@ abstract class ListItemBase extends FieldItemBase implements OptionsProviderInte
* @return array|null
* The array of extracted key/value pairs, or NULL if the string is invalid.
*
* @see \Drupal\options\Plugin\Field\FieldType\ListTextItem::allowedValuesString()
* @see \Drupal\options\Plugin\Field\FieldType\ListItemBase::allowedValuesString()
*/
protected static function extractAllowedValues($string, $has_data) {
$values = array();
@ -277,7 +277,7 @@ abstract class ListItemBase extends FieldItemBase implements OptionsProviderInte
* Allowed values were the array key is the 'value' value, the value is
* the 'label' value.
*
* @see Drupal\options\Plugin\Field\FieldType\ListItemBase::structureAllowedValues()
* @see \Drupal\options\Plugin\Field\FieldType\ListItemBase::structureAllowedValues()
*/
protected static function simplifyAllowedValues(array $structured_values) {
$values = array();
@ -302,7 +302,7 @@ abstract class ListItemBase extends FieldItemBase implements OptionsProviderInte
* Array of items with a 'value' and 'label' key each for the allowed
* values.
*
* @see Drupal\options\Plugin\Field\FieldType\ListItemBase::simplifyAllowedValues()
* @see \Drupal\options\Plugin\Field\FieldType\ListItemBase::simplifyAllowedValues()
*/
protected static function structureAllowedValues(array $values) {
$structured_values = array();