Use imported types for return type of getValueOptions

doctrine · Jan 14, 2024 · cb29c8b · cb29c8b
1 parent d8dd89f
commit cb29c8b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/Form/Element/ObjectMultiCheckbox.php b/src/Form/Element/ObjectMultiCheckbox.php
@@ -11,6 +11,7 @@
 use function array_map;
 use function is_array;
 
+/** @psalm-import-type ValueOptionSpec from MultiCheckbox */
 class ObjectMultiCheckbox extends MultiCheckbox
 {
  use GetProxy;
@@ -54,7 +55,7 @@ public function setValue($value)
  /**
  * {@inheritDoc}
  *
- * @return array<int<0, max>|string, array{attributes?: array<string, scalar|null>, disabled?: bool, label: non-empty-string, label_attributes?: array<string, scalar|null>, selected?: bool, value: non-empty-string}|string>
+ * @return ValueOptionSpec
  */
  public function getValueOptions(): array
  {

diff --git a/src/Form/Element/ObjectRadio.php b/src/Form/Element/ObjectRadio.php
@@ -4,8 +4,10 @@
 
 namespace DoctrineModule\Form\Element;
 
+use Laminas\Form\Element\MultiCheckbox;
 use Laminas\Form\Element\Radio as RadioElement;
 
+/** @psalm-import-type ValueOptionSpec from MultiCheckbox */
 class ObjectRadio extends RadioElement
 {
  use GetProxy;
@@ -41,7 +43,7 @@ public function setValue($value)
  /**
  * {@inheritDoc}
  *
- * @return array<int<0, max>|string, array{attributes?: array<string, scalar|null>, disabled?: bool, label: non-empty-string, label_attributes?: array<string, scalar|null>, selected?: bool, value: non-empty-string}|string>
+ * @return ValueOptionSpec
  */
  public function getValueOptions(): array
  {