Allow stringable on methods that return html

Author: riasvdv

src/Element/Element.php

@@ -1311,7 +1311,7 @@ public static function indexHtml(
         bool $includeContainer,
         bool $selectable,
         bool $sortable,
-    ): string {
+    ): string|Stringable {
         $request = Craft::$app->getRequest();
         $static = $viewState['static'] ?? false;
         $variables = [
@@ -3640,7 +3640,7 @@ protected function uiLabel(): ?string
     /**
      * {@inheritdoc}
      */
-    public function getChipLabelHtml(): string
+    public function getChipLabelHtml(): string|Stringable
     {
         return Html::encode($this->getUiLabel());
     }
@@ -3878,7 +3878,7 @@ public function getPostEditUrl(): ?string
     /**
      * {@inheritdoc}
      */
-    public function getAdditionalButtons(): string
+    public function getAdditionalButtons(): string|Stringable
     {
         // Fire a 'defineAdditionalButtons' event
         if ($this->hasEventHandlers(self::EVENT_DEFINE_ADDITIONAL_BUTTONS)) {
@@ -5780,7 +5780,7 @@ public function getAttributeHtml(string $attribute): string|Stringable
     /**
      * {@inheritdoc}
      */
-    public function getInlineAttributeInputHtml(string $attribute): string
+    public function getInlineAttributeInputHtml(string $attribute): string|Stringable
     {
         // Fire a 'defineInlineAttributeInputHtml' event
         if ($this->hasEventHandlers(self::EVENT_DEFINE_INLINE_ATTRIBUTE_INPUT_HTML)) {
@@ -5996,7 +5996,7 @@ protected function attributeHtml(string $attribute): string|Stringable
         }
     }
 
-    private function contentBlockAttributeHtml(string $attribute): string
+    private function contentBlockAttributeHtml(string $attribute): string|Stringable
     {
         $parts = explode('.', $attribute);
         $uid = Str::after(array_shift($parts), 'contentBlock:');
@@ -6021,7 +6021,7 @@ private function contentBlockAttributeHtml(string $attribute): string
         return $block->getAttributeHtml(implode('.', $parts));
     }
 
-    private function generatedFieldAttributeHtml(string $attribute): string
+    private function generatedFieldAttributeHtml(string $attribute): string|Stringable
     {
         $uid = Str::after($attribute, 'generatedField:');
 
@@ -6076,7 +6076,7 @@ private function _getFieldFromAlternativeLayouts($layoutElementUid): ?FieldInter
      * @see getInlineAttributeInputHtml()
      * @since 5.0.0
      */
-    protected function inlineAttributeInputHtml(string $attribute): string
+    protected function inlineAttributeInputHtml(string $attribute): string|Stringable
     {
         // Is this a custom field?
         $field = null;
@@ -6123,7 +6123,7 @@ protected function inlineAttributeInputHtml(string $attribute): string
     /**
      * {@inheritdoc}
      */
-    public function getSidebarHtml(bool $static): string
+    public function getSidebarHtml(bool $static): string|Stringable
     {
         $components = [];
 
@@ -6162,7 +6162,7 @@ public function getSidebarHtml(bool $static): string
      *
      * @since 3.7.0
      */
-    protected function metaFieldsHtml(bool $static): string
+    protected function metaFieldsHtml(bool $static): string|Stringable
     {
         // Fire a 'defineMetaFieldsHtml' event
         if ($this->hasEventHandlers(self::EVENT_DEFINE_META_FIELDS_HTML)) {
@@ -6182,7 +6182,7 @@ protected function metaFieldsHtml(bool $static): string
      *
      * @since 3.7.0
      */
-    protected function slugFieldHtml(bool $static): string
+    protected function slugFieldHtml(bool $static): string|Stringable
     {
         $slug = isset($this->slug) && ! ElementHelper::isTempSlug($this->slug) ? $this->slug : null;
 
@@ -6219,7 +6219,7 @@ protected function showStatusField(): bool
      *
      * @since 4.0.0
      */
-    protected function statusFieldHtml(): string
+    protected function statusFieldHtml(): string|Stringable
     {
         $supportedSites = ElementHelper::supportedSitesForElement($this, true);
         $allEditableSiteIds = Sites::getEditableSiteIds()->all();
@@ -6273,7 +6273,7 @@ protected function statusFieldHtml(): string
      *
      * @since 4.0.0
      */
-    protected function notesFieldHtml(): string
+    protected function notesFieldHtml(): string|Stringable
     {
         // todo: this should accept a $static arg
         return Cp::textareaFieldHtml([

yii2-adapter/legacy/base/ElementInterface.php

@@ -455,7 +455,7 @@ public static function indexHtml(
         bool $includeContainer,
         bool $selectable,
         bool $sortable,
-    ): string;
+    ): string|Stringable;
 
     /**
      * Returns the total number of elements that will be shown on an element index, for the given element query.
@@ -899,7 +899,7 @@ public function setUiLabelPath(array $path): void;
      * @return string
      * @since 5.0.0
      */
-    public function getChipLabelHtml(): string;
+    public function getChipLabelHtml(): string|Stringable;
 
     /**
      * Returns whether chips and cards for this element should include a status indicator.
@@ -1072,7 +1072,7 @@ public function getCpRevisionsUrl(): ?string;
      * @return string
      * @since 4.0.0
      */
-    public function getAdditionalButtons(): string;
+    public function getAdditionalButtons(): string|Stringable;
 
     /**
      * Returns alternative form actions for the element.
@@ -1818,7 +1818,7 @@ public function getAttributeHtml(string $attribute): string|Stringable;
      * @return string The HTML that should be shown for the element input.
      * @since 5.0.0
      */
-    public function getInlineAttributeInputHtml(string $attribute): string;
+    public function getInlineAttributeInputHtml(string $attribute): string|Stringable;
 
     /**
      * Returns the HTML for any fields/info that should be shown within the editor sidebar.
@@ -1827,7 +1827,7 @@ public function getInlineAttributeInputHtml(string $attribute): string;
      * @return string
      * @since 3.7.0
      */
-    public function getSidebarHtml(bool $static): string;
+    public function getSidebarHtml(bool $static): string|Stringable;
 
     /**
      * Returns element metadata that should be shown within the editor sidebar.