From ce2624cee2d730abb9ab0115c494a190b1776d3a Mon Sep 17 00:00:00 2001 From: hanming5 Date: Thu, 12 Nov 2026 14:21:01 +0900 Subject: [PATCH] Make field item stub properties nullable Stored field item properties are NULL on items from appendItem() and on unsaved entities. Core's isEmpty() implementations check for NULL, so the stubs now declare these properties as nullable, matching the PathItem, TextItemBase and TelephoneItem stubs. - StringItemBase, EmailItem, DecimalItem, LanguageItem: ?string $value - IntegerItem, BooleanItem, TimestampItem: ?int $value - FloatItem: ?float $value - LinkItem: ?string $uri, ?string $title - FileItem: ?string $description, ?bool $display Fixes #1078 --- .../Plugin/Field/FieldType/BooleanItem.stub | 2 +- .../Plugin/Field/FieldType/DecimalItem.stub | 2 +- .../Plugin/Field/FieldType/EmailItem.stub | 2 +- .../Plugin/Field/FieldType/FloatItem.stub | 2 +- .../Plugin/Field/FieldType/IntegerItem.stub | 2 +- .../Plugin/Field/FieldType/LanguageItem.stub | 2 +- .../Field/FieldType/StringItemBase.stub | 2 +- .../Plugin/Field/FieldType/TimestampItem.stub | 2 +- .../file/Plugin/Field/FieldType/FileItem.stub | 4 +-- .../link/Plugin/Field/FieldType/LinkItem.stub | 4 +-- tests/src/Type/data/field-types.php | 36 +++++++++---------- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/stubs/Drupal/Core/Field/Plugin/Field/FieldType/BooleanItem.stub b/stubs/Drupal/Core/Field/Plugin/Field/FieldType/BooleanItem.stub index 595e1fe8..459bea87 100644 --- a/stubs/Drupal/Core/Field/Plugin/Field/FieldType/BooleanItem.stub +++ b/stubs/Drupal/Core/Field/Plugin/Field/FieldType/BooleanItem.stub @@ -6,7 +6,7 @@ use Drupal\Core\Field\FieldItemBase; use Drupal\Core\TypedData\OptionsProviderInterface; /** - * @property int $value + * @property ?int $value */ class BooleanItem extends FieldItemBase implements OptionsProviderInterface { } diff --git a/stubs/Drupal/Core/Field/Plugin/Field/FieldType/DecimalItem.stub b/stubs/Drupal/Core/Field/Plugin/Field/FieldType/DecimalItem.stub index 9a6e72e6..a73f762a 100644 --- a/stubs/Drupal/Core/Field/Plugin/Field/FieldType/DecimalItem.stub +++ b/stubs/Drupal/Core/Field/Plugin/Field/FieldType/DecimalItem.stub @@ -3,7 +3,7 @@ namespace Drupal\Core\Field\Plugin\Field\FieldType; /** - * @property string $value + * @property ?string $value */ class DecimalItem extends NumericItemBase { } diff --git a/stubs/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.stub b/stubs/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.stub index 0b03b47b..a7b69f59 100644 --- a/stubs/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.stub +++ b/stubs/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.stub @@ -5,7 +5,7 @@ namespace Drupal\Core\Field\Plugin\Field\FieldType; use Drupal\Core\Field\FieldItemBase; /** - * @property string $value + * @property ?string $value */ class EmailItem extends FieldItemBase { } diff --git a/stubs/Drupal/Core/Field/Plugin/Field/FieldType/FloatItem.stub b/stubs/Drupal/Core/Field/Plugin/Field/FieldType/FloatItem.stub index c2cc2798..9d23ecaf 100644 --- a/stubs/Drupal/Core/Field/Plugin/Field/FieldType/FloatItem.stub +++ b/stubs/Drupal/Core/Field/Plugin/Field/FieldType/FloatItem.stub @@ -3,7 +3,7 @@ namespace Drupal\Core\Field\Plugin\Field\FieldType; /** - * @property float $value + * @property ?float $value */ class FloatItem extends NumericItemBase { } diff --git a/stubs/Drupal/Core/Field/Plugin/Field/FieldType/IntegerItem.stub b/stubs/Drupal/Core/Field/Plugin/Field/FieldType/IntegerItem.stub index 5f85710e..22f01b28 100644 --- a/stubs/Drupal/Core/Field/Plugin/Field/FieldType/IntegerItem.stub +++ b/stubs/Drupal/Core/Field/Plugin/Field/FieldType/IntegerItem.stub @@ -3,7 +3,7 @@ namespace Drupal\Core\Field\Plugin\Field\FieldType; /** - * @property int $value + * @property ?int $value */ class IntegerItem extends NumericItemBase { } diff --git a/stubs/Drupal/Core/Field/Plugin/Field/FieldType/LanguageItem.stub b/stubs/Drupal/Core/Field/Plugin/Field/FieldType/LanguageItem.stub index ed28fa3a..58933cd3 100644 --- a/stubs/Drupal/Core/Field/Plugin/Field/FieldType/LanguageItem.stub +++ b/stubs/Drupal/Core/Field/Plugin/Field/FieldType/LanguageItem.stub @@ -6,7 +6,7 @@ use Drupal\Core\Field\FieldItemBase; use Drupal\Core\TypedData\OptionsProviderInterface; /** - * @property string $value + * @property ?string $value * @property \Drupal\Core\Language\LanguageInterface $language */ class LanguageItem extends FieldItemBase implements OptionsProviderInterface { diff --git a/stubs/Drupal/Core/Field/Plugin/Field/FieldType/StringItemBase.stub b/stubs/Drupal/Core/Field/Plugin/Field/FieldType/StringItemBase.stub index 45e807f3..86a51e2c 100644 --- a/stubs/Drupal/Core/Field/Plugin/Field/FieldType/StringItemBase.stub +++ b/stubs/Drupal/Core/Field/Plugin/Field/FieldType/StringItemBase.stub @@ -5,7 +5,7 @@ namespace Drupal\Core\Field\Plugin\Field\FieldType; use Drupal\Core\Field\FieldItemBase; /** - * @property string $value + * @property ?string $value */ abstract class StringItemBase extends FieldItemBase { } diff --git a/stubs/Drupal/Core/Field/Plugin/Field/FieldType/TimestampItem.stub b/stubs/Drupal/Core/Field/Plugin/Field/FieldType/TimestampItem.stub index 1b7b0e6c..9d9bee67 100644 --- a/stubs/Drupal/Core/Field/Plugin/Field/FieldType/TimestampItem.stub +++ b/stubs/Drupal/Core/Field/Plugin/Field/FieldType/TimestampItem.stub @@ -5,7 +5,7 @@ namespace Drupal\Core\Field\Plugin\Field\FieldType; use Drupal\Core\Field\FieldItemBase; /** - * @property int $value + * @property ?int $value */ class TimestampItem extends FieldItemBase { } diff --git a/stubs/Drupal/file/Plugin/Field/FieldType/FileItem.stub b/stubs/Drupal/file/Plugin/Field/FieldType/FileItem.stub index f639d8b8..49830079 100644 --- a/stubs/Drupal/file/Plugin/Field/FieldType/FileItem.stub +++ b/stubs/Drupal/file/Plugin/Field/FieldType/FileItem.stub @@ -7,8 +7,8 @@ use Drupal\file\FileInterface; /** * @extends EntityReferenceItem - * @property bool $display - * @property string $description + * @property ?bool $display + * @property ?string $description */ class FileItem extends EntityReferenceItem { diff --git a/stubs/Drupal/link/Plugin/Field/FieldType/LinkItem.stub b/stubs/Drupal/link/Plugin/Field/FieldType/LinkItem.stub index a8327b6f..1bddfbdf 100644 --- a/stubs/Drupal/link/Plugin/Field/FieldType/LinkItem.stub +++ b/stubs/Drupal/link/Plugin/Field/FieldType/LinkItem.stub @@ -6,8 +6,8 @@ use Drupal\Core\Field\FieldItemBase; use Drupal\link\LinkItemInterface; /** - * @property string $uri - * @property string $title + * @property ?string $uri + * @property ?string $title * @property array $options */ class LinkItem extends FieldItemBase implements LinkItemInterface { diff --git a/tests/src/Type/data/field-types.php b/tests/src/Type/data/field-types.php index b3afbf25..e832e4f4 100644 --- a/tests/src/Type/data/field-types.php +++ b/tests/src/Type/data/field-types.php @@ -48,39 +48,39 @@ $link_field = $node->get('field_link')->first(); assert($link_field instanceof LinkItem); assertType(LinkItem::class, $link_field); -assertType('string', $link_field->title); -assertType('string', $link_field->uri); +assertType('string|null', $link_field->title); +assertType('string|null', $link_field->uri); assertType('array', $link_field->options); // BooleanItem. $boolean_field = $node->get('field_boolean')->first(); assert($boolean_field instanceof BooleanItem); assertType(BooleanItem::class, $boolean_field); -assertType('int', $boolean_field->value); +assertType('int|null', $boolean_field->value); // ChangedItem. $changed_field = $node->get('field_changed')->first(); assert($changed_field instanceof ChangedItem); assertType(ChangedItem::class, $changed_field); -assertType('int', $changed_field->value); +assertType('int|null', $changed_field->value); // CreatedItem. $created_field = $node->get('field_created')->first(); assert($created_field instanceof CreatedItem); assertType(CreatedItem::class, $created_field); -assertType('int', $created_field->value); +assertType('int|null', $created_field->value); // DecimalItem. $decimal_field = $node->get('field_decimal')->first(); assert($decimal_field instanceof DecimalItem); assertType(DecimalItem::class, $decimal_field); -assertType('string', $decimal_field->value); +assertType('string|null', $decimal_field->value); // EmailItem. $email_field = $node->get('field_email')->first(); assert($email_field instanceof EmailItem); assertType(EmailItem::class, $email_field); -assertType('string', $email_field->value); +assertType('string|null', $email_field->value); // EntityReferenceItem. $entity_reference_field = $node->get('field_entity_reference')->first(); @@ -93,19 +93,19 @@ $float_field = $node->get('field_float')->first(); assert($float_field instanceof FloatItem); assertType(FloatItem::class, $float_field); -assertType('float', $float_field->value); +assertType('float|null', $float_field->value); // IntegerItem. $integer_field = $node->get('field_integer')->first(); assert($integer_field instanceof IntegerItem); assertType(IntegerItem::class, $integer_field); -assertType('int', $integer_field->value); +assertType('int|null', $integer_field->value); // LanguageItem. $language_field = $node->get('field_language')->first(); assert($language_field instanceof LanguageItem); assertType(LanguageItem::class, $language_field); -assertType('string', $language_field->value); +assertType('string|null', $language_field->value); assertType('Drupal\Core\Language\LanguageInterface', $language_field->language); // MapItem. @@ -118,7 +118,7 @@ $password_field = $node->get('field_password')->first(); assert($password_field instanceof PasswordItem); assertType(PasswordItem::class, $password_field); -assertType('string', $password_field->value); +assertType('string|null', $password_field->value); assertType('string|null', $password_field->existing); assertType('bool', $password_field->pre_hashed); @@ -126,31 +126,31 @@ $string_field = $node->get('field_string')->first(); assert($string_field instanceof StringItem); assertType(StringItem::class, $string_field); -assertType('string', $string_field->value); +assertType('string|null', $string_field->value); // StringItemLong. $string_long_field = $node->get('field_string_long')->first(); assert($string_long_field instanceof StringLongItem); assertType(StringLongItem::class, $string_long_field); -assertType('string', $string_long_field->value); +assertType('string|null', $string_long_field->value); // TimestampItem. $timestamp_field = $node->get('field_timestamp')->first(); assert($timestamp_field instanceof TimestampItem); assertType(TimestampItem::class, $timestamp_field); -assertType('int', $timestamp_field->value); +assertType('int|null', $timestamp_field->value); // UriItem. $uri_field = $node->get('field_uri')->first(); assert($uri_field instanceof UriItem); assertType(UriItem::class, $uri_field); -assertType('string', $uri_field->value); +assertType('string|null', $uri_field->value); // UuidItem. $uuid_field = $node->get('field_uuid')->first(); assert($uuid_field instanceof UuidItem); assertType(UuidItem::class, $uuid_field); -assertType('string', $uuid_field->value); +assertType('string|null', $uuid_field->value); // DateTimeItem. $datetime_field = $node->get('field_datetime')->first(); @@ -173,8 +173,8 @@ $file_field = $node->get('field_file')->first(); assert($file_field instanceof FileItem); assertType(FileItem::class, $file_field); -assertType('bool', $file_field->display); -assertType('string', $file_field->description); +assertType('bool|null', $file_field->display); +assertType('string|null', $file_field->description); // FileUriItem. $file_uri_field = $node->get('field_file')->first();