diff --git a/core/modules/options/lib/Drupal/options/Plugin/Field/FieldType/ListBooleanItem.php b/core/modules/options/lib/Drupal/options/Plugin/Field/FieldType/ListBooleanItem.php index 558a103..b283d7f 100644 --- a/core/modules/options/lib/Drupal/options/Plugin/Field/FieldType/ListBooleanItem.php +++ b/core/modules/options/lib/Drupal/options/Plugin/Field/FieldType/ListBooleanItem.php @@ -29,13 +29,6 @@ class ListBooleanItem extends ListItemBase { /** - * Definitions of the contained properties. - * - * @var array - */ - static $propertyDefinitions; - - /** * {@inheritdoc} */ public static function schema(FieldDefinitionInterface $field_definition) { @@ -52,12 +45,11 @@ public static function schema(FieldDefinitionInterface $field_definition) { /** * {@inheritdoc} */ - public function getPropertyDefinitions() { - if (!isset(static::$propertyDefinitions)) { - static::$propertyDefinitions['value'] = DataDefinition::create('boolean') - ->setLabel(t('Boolean value')); - } - return static::$propertyDefinitions; + public static function propertyDefinitions(FieldDefinitionInterface $field_definition) { + $properties['value'] = DataDefinition::create('boolean') + ->setLabel(t('Boolean value')); + + return $properties; } } diff --git a/core/modules/options/lib/Drupal/options/Plugin/Field/FieldType/ListFloatItem.php b/core/modules/options/lib/Drupal/options/Plugin/Field/FieldType/ListFloatItem.php index f8d0adb..cfd9251 100644 --- a/core/modules/options/lib/Drupal/options/Plugin/Field/FieldType/ListFloatItem.php +++ b/core/modules/options/lib/Drupal/options/Plugin/Field/FieldType/ListFloatItem.php @@ -29,13 +29,6 @@ class ListFloatItem extends ListItemBase { /** - * Definitions of the contained properties. - * - * @var array - */ - static $propertyDefinitions; - - /** * {@inheritdoc} */ public static function schema(FieldDefinitionInterface $field_definition) { @@ -52,12 +45,11 @@ public static function schema(FieldDefinitionInterface $field_definition) { /** * {@inheritdoc} */ - public function getPropertyDefinitions() { - if (!isset(static::$propertyDefinitions)) { - static::$propertyDefinitions['value'] = DataDefinition::create('float') - ->setLabel(t('Float value')); - } - return static::$propertyDefinitions; + public static function propertyDefinitions(FieldDefinitionInterface $field_definition) { + $properties['value'] = DataDefinition::create('float') + ->setLabel(t('Float value')); + + return $properties; } } diff --git a/core/modules/options/lib/Drupal/options/Plugin/Field/FieldType/ListIntegerItem.php b/core/modules/options/lib/Drupal/options/Plugin/Field/FieldType/ListIntegerItem.php index 9c6e7d7..ea28a94 100644 --- a/core/modules/options/lib/Drupal/options/Plugin/Field/FieldType/ListIntegerItem.php +++ b/core/modules/options/lib/Drupal/options/Plugin/Field/FieldType/ListIntegerItem.php @@ -29,13 +29,6 @@ class ListIntegerItem extends ListItemBase { /** - * Definitions of the contained properties. - * - * @var array - */ - static $propertyDefinitions; - - /** * {@inheritdoc} */ public static function schema(FieldDefinitionInterface $field_definition) { @@ -52,12 +45,11 @@ public static function schema(FieldDefinitionInterface $field_definition) { /** * {@inheritdoc} */ - public function getPropertyDefinitions() { - if (!isset(static::$propertyDefinitions)) { - static::$propertyDefinitions['value'] = DataDefinition::create('integer') - ->setLabel(t('Integer value')); - } - return static::$propertyDefinitions; + public static function propertyDefinitions(FieldDefinitionInterface $field_definition) { + $properties['value'] = DataDefinition::create('integer') + ->setLabel(t('Integer value')); + + return $properties; } } diff --git a/core/modules/options/lib/Drupal/options/Plugin/Field/FieldType/ListTextItem.php b/core/modules/options/lib/Drupal/options/Plugin/Field/FieldType/ListTextItem.php index 1e27eac..11757d2 100644 --- a/core/modules/options/lib/Drupal/options/Plugin/Field/FieldType/ListTextItem.php +++ b/core/modules/options/lib/Drupal/options/Plugin/Field/FieldType/ListTextItem.php @@ -29,13 +29,6 @@ class ListTextItem extends ListItemBase { /** - * Definitions of the contained properties. - * - * @var array - */ - static $propertyDefinitions; - - /** * {@inheritdoc} */ public static function schema(FieldDefinitionInterface $field_definition) { @@ -53,13 +46,13 @@ public static function schema(FieldDefinitionInterface $field_definition) { /** * {@inheritdoc} */ - public function getPropertyDefinitions() { - if (!isset(static::$propertyDefinitions)) { - $constraints = array('Length' => array('max' => 255)); - static::$propertyDefinitions['value'] = DataDefinition::create('string') - ->setLabel(t('Text value')) - ->setConstraints($constraints); - } - return static::$propertyDefinitions; + public static function propertyDefinitions(FieldDefinitionInterface $field_definition) { + $constraints = array('Length' => array('max' => 255)); + $properties['value'] = DataDefinition::create('string') + ->setLabel(t('Text value')) + ->setConstraints($constraints); + + return $properties; } + }