Commit f61ad20b authored by alexpott's avatar alexpott

Issue #2332885 by cs_shadow, Berdir, fago: Rename AllowedValuesInterface to...

Issue #2332885 by cs_shadow, Berdir, fago: Rename AllowedValuesInterface to OptionsProviderInterface.
parent fb6c562c
......@@ -263,7 +263,7 @@ public static function defaultFieldSettings();
*
* An example of a conversion between representations might be an
* "allowed_values" setting that's structured by the field type as a
* \Drupal\Core\TypedData\AllowedValuesInterface::getPossibleOptions()
* \Drupal\Core\TypedData\OptionsProviderInterface::getPossibleOptions()
* result (i.e., values as keys and labels as values). For such a use case,
* in order to comply with the above, this method could convert that
* representation to a numerically indexed array whose values are sub-arrays
......
......@@ -12,7 +12,7 @@
use Drupal\Core\Field\FieldStorageDefinitionInterface;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Session\AccountInterface;
use Drupal\Core\TypedData\AllowedValuesInterface;
use Drupal\Core\TypedData\OptionsProviderInterface;
use Drupal\Core\TypedData\DataDefinition;
/**
......@@ -26,7 +26,7 @@
* default_formatter = "boolean",
* )
*/
class BooleanItem extends FieldItemBase implements AllowedValuesInterface {
class BooleanItem extends FieldItemBase implements OptionsProviderInterface {
/**
* {@inheritdoc}
......
......@@ -2,7 +2,7 @@
/**
* @file
* Contains \Drupal\Core\TypedData\AllowedValuesInterface.
* Contains \Drupal\Core\TypedData\OptionsProviderInterface.
*/
namespace Drupal\Core\TypedData;
......@@ -31,7 +31,7 @@
*
* @see \Drupal\options\Plugin\Field\FieldWidget\OptionsWidgetBase
*/
interface AllowedValuesInterface {
interface OptionsProviderInterface {
/**
* Returns an array of possible values.
......
......@@ -377,7 +377,7 @@ public function getDefaultConstraints(DataDefinitionInterface $definition) {
$constraints['NotNull'] = array();
}
// Check if the class provides allowed values.
if (is_subclass_of($definition->getClass(),'Drupal\Core\TypedData\AllowedValuesInterface')) {
if (is_subclass_of($definition->getClass(),'Drupal\Core\TypedData\OptionsProviderInterface')) {
$constraints['AllowedValues'] = array();
}
// Add any constraints about referenced data.
......
......@@ -17,7 +17,7 @@
* label = @Translation("Allowed values", context = "Validation")
* )
*
* @see \Drupal\Core\TypedData\AllowedValuesInterface
* @see \Drupal\Core\TypedData\OptionsProviderInterface
*/
class AllowedValuesConstraint extends Choice {
......
......@@ -7,7 +7,7 @@
namespace Drupal\Core\Validation\Plugin\Validation\Constraint;
use Drupal\Core\TypedData\AllowedValuesInterface;
use Drupal\Core\TypedData\OptionsProviderInterface;
use Drupal\Core\TypedData\ComplexDataInterface;
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\Constraints\ChoiceValidator;
......@@ -23,7 +23,7 @@ class AllowedValuesConstraintValidator extends ChoiceValidator {
public function validate($value, Constraint $constraint) {
$typed_data = $this->context->getMetadata()->getTypedData();
if ($typed_data instanceof AllowedValuesInterface) {
if ($typed_data instanceof OptionsProviderInterface) {
$account = \Drupal::currentUser();
$allowed_values = $typed_data->getSettableValues($account);
$constraint->choices = $allowed_values;
......
......@@ -13,7 +13,7 @@
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Form\OptGroup;
use Drupal\Core\Session\AccountInterface;
use Drupal\Core\TypedData\AllowedValuesInterface;
use Drupal\Core\TypedData\OptionsProviderInterface;
use Drupal\Core\TypedData\DataDefinition;
use Drupal\Core\Validation\Plugin\Validation\Constraint\AllowedValuesConstraint;
use Drupal\field\FieldStorageConfigInterface;
......@@ -29,7 +29,7 @@
*
* @see entity_reference_field_info_alter().
*/
class ConfigurableEntityReferenceItem extends EntityReferenceItem implements AllowedValuesInterface {
class ConfigurableEntityReferenceItem extends EntityReferenceItem implements OptionsProviderInterface {
/**
* {@inheritdoc}
......
......@@ -8,7 +8,7 @@
namespace Drupal\filter\Plugin\DataType;
use Drupal\Core\Session\AccountInterface;
use Drupal\Core\TypedData\AllowedValuesInterface;
use Drupal\Core\TypedData\OptionsProviderInterface;
use Drupal\Core\TypedData\Plugin\DataType\String;
/**
......@@ -19,7 +19,7 @@
* label = @Translation("Filter format")
* )
*/
class FilterFormat extends String implements AllowedValuesInterface {
class FilterFormat extends String implements OptionsProviderInterface {
/**
* {@inheritdoc}
......
......@@ -8,7 +8,7 @@
namespace Drupal\filter\Tests;
use Drupal\Core\Session\AnonymousUserSession;
use Drupal\Core\TypedData\AllowedValuesInterface;
use Drupal\Core\TypedData\OptionsProviderInterface;
use Drupal\Core\TypedData\DataDefinition;
use Drupal\filter\Plugin\DataType\FilterFormat;
use Drupal\filter\Plugin\FilterInterface;
......@@ -267,7 +267,7 @@ function testTypedDataAPI() {
$definition = DataDefinition::create('filter_format');
$data = \Drupal::typedDataManager()->create($definition);
$this->assertTrue($data instanceof AllowedValuesInterface, 'Typed data object implements \Drupal\Core\TypedData\AllowedValuesInterface');
$this->assertTrue($data instanceof OptionsProviderInterface, 'Typed data object implements \Drupal\Core\TypedData\OptionsProviderInterface');
$filtered_html_user = $this->createUser(array('uid' => 2), array(
entity_load('filter_format', 'filtered_html')->getPermissionName(),
......
......@@ -12,7 +12,7 @@
*
* @param array $options
* The array of options for the field, as returned by
* \Drupal\Core\TypedData\AllowedValuesInterface::getSettableOptions(). An
* \Drupal\Core\TypedData\OptionsProviderInterface::getSettableOptions(). An
* empty option (_none) might have been added, depending on the field
* properties.
*
......
......@@ -13,12 +13,12 @@
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Form\OptGroup;
use Drupal\Core\Session\AccountInterface;
use Drupal\Core\TypedData\AllowedValuesInterface;
use Drupal\Core\TypedData\OptionsProviderInterface;
/**
* Plugin base class inherited by the options field types.
*/
abstract class ListItemBase extends FieldItemBase implements AllowedValuesInterface {
abstract class ListItemBase extends FieldItemBase implements OptionsProviderInterface {
use AllowedTagsXssTrait;
......
......@@ -18,10 +18,10 @@
*
* Field types willing to enable one or several of the widgets defined in
* options.module (select, radios/checkboxes, on/off checkbox) need to
* implement the AllowedValuesInterface to specify the list of options to
* implement the OptionsProviderInterface to specify the list of options to
* display in the widgets.
*
* @see \Drupal\Core\TypedData\AllowedValuesInterface
* @see \Drupal\Core\TypedData\OptionsProviderInterface
*/
abstract class OptionsWidgetBase extends WidgetBase {
......
......@@ -12,7 +12,7 @@
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Form\OptGroup;
use Drupal\Core\Session\AccountInterface;
use Drupal\Core\TypedData\AllowedValuesInterface;
use Drupal\Core\TypedData\OptionsProviderInterface;
/**
* Plugin implementation of the 'term_reference' field type.
......@@ -26,7 +26,7 @@
* list_class = "\Drupal\Core\Field\EntityReferenceFieldItemList"
* )
*/
class TaxonomyTermReferenceItem extends EntityReferenceItem implements AllowedValuesInterface {
class TaxonomyTermReferenceItem extends EntityReferenceItem implements OptionsProviderInterface {
/**
* {@inheritdoc}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment