From 9ff20ae3d6a7b3fbe56b36f21911d6c395b0de8b Mon Sep 17 00:00:00 2001
From: Jack Worman <66142217+jack-worman@users.noreply.github.com>
Date: Fri, 7 Jul 2023 16:04:52 -0500
Subject: [PATCH] Fix getLabel() return type (#16)

---
 .../zend-dojo/library/Zend/Dojo/Form/Element/Button.php    | 4 +---
 packages/zend-form/library/Zend/Form/Element.php           | 7 +------
 packages/zend-form/library/Zend/Form/Element/Hash.php      | 6 ++----
 packages/zend-form/library/Zend/Form/Element/Submit.php    | 4 +---
 4 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/packages/zend-dojo/library/Zend/Dojo/Form/Element/Button.php b/packages/zend-dojo/library/Zend/Dojo/Form/Element/Button.php
index 7692e06d7..4c788e578 100644
--- a/packages/zend-dojo/library/Zend/Dojo/Form/Element/Button.php
+++ b/packages/zend-dojo/library/Zend/Dojo/Form/Element/Button.php
@@ -62,10 +62,8 @@ public function __construct($spec, $options = null)
      * If no label is present, returns the currently set name.
      *
      * If a translator is present, returns the translated label.
-     *
-     * @return string
      */
-    public function getLabel()
+    public function getLabel(): string|null
     {
         $value = parent::getLabel();
 
diff --git a/packages/zend-form/library/Zend/Form/Element.php b/packages/zend-form/library/Zend/Form/Element.php
index f3f670d5b..d5c40ff99 100644
--- a/packages/zend-form/library/Zend/Form/Element.php
+++ b/packages/zend-form/library/Zend/Form/Element.php
@@ -636,12 +636,7 @@ public function setLabel($label)
         return $this;
     }
 
-    /**
-     * Retrieve element label
-     *
-     * @return string
-     */
-    public function getLabel()
+    public function getLabel(): string|null
     {
         $translator = $this->getTranslator();
         if (null !== $translator) {
diff --git a/packages/zend-form/library/Zend/Form/Element/Hash.php b/packages/zend-form/library/Zend/Form/Element/Hash.php
index 0894b93a7..577d54e3b 100644
--- a/packages/zend-form/library/Zend/Form/Element/Hash.php
+++ b/packages/zend-form/library/Zend/Form/Element/Hash.php
@@ -208,10 +208,8 @@ public function getTimeout()
 
     /**
      * Override getLabel() to always be empty
-     *
-     * @return null
      */
-    public function getLabel()
+    public function getLabel(): string|null
     {
         return null;
     }
@@ -251,7 +249,7 @@ public function render(Zend_View_Interface $view = null)
      */
     protected function _generateHash()
     {
-        $this->_hash = md5((string) 
+        $this->_hash = md5((string)
             Zend_Crypt_Math::randBytes(32)
         );
         $this->setValue($this->_hash);
diff --git a/packages/zend-form/library/Zend/Form/Element/Submit.php b/packages/zend-form/library/Zend/Form/Element/Submit.php
index b8561ca9a..58362fa78 100644
--- a/packages/zend-form/library/Zend/Form/Element/Submit.php
+++ b/packages/zend-form/library/Zend/Form/Element/Submit.php
@@ -66,10 +66,8 @@ public function __construct($spec, $options = null)
      * If no label is present, returns the currently set name.
      *
      * If a translator is present, returns the translated label.
-     *
-     * @return string
      */
-    public function getLabel()
+    public function getLabel(): string|null
     {
         $value = parent::getLabel();