TLN-7688_Fix_deprecations (#10)

jack-worman · Apr 18, 2022 · 05b8d27 · 05b8d27
1 parent 46158a4
commit 05b8d27
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 11 deletions.
diff --git a/packages/zend-config/library/Zend/Config.php b/packages/zend-config/library/Zend/Config.php
@@ -306,8 +306,7 @@ public function next()
     }
 
     /**
-     * Defined by Iterator interface
-     *
+     * @return void
      */
     #[\ReturnTypeWillChange]
     public function rewind()

diff --git a/packages/zend-db/library/Zend/Db/Adapter/Pdo/Abstract.php b/packages/zend-db/library/Zend/Db/Adapter/Pdo/Abstract.php
@@ -284,16 +284,16 @@ public function exec($sql)
     /**
      * Quote a raw string.
      *
-     * @param string $value     Raw string
-     * @return string           Quoted string
+     * @param string|int|float|null $value
+     * @return string|int|float
      */
     protected function _quote($value)
     {
         if (is_int($value) || is_float($value)) {
             return $value;
         }
         $this->_connect();
-        return $this->_connection->quote($value);
+        return $this->_connection->quote((string) $value);
     }
 
     /**

diff --git a/packages/zend-db/library/Zend/Db/Adapter/Pdo/Mysql.php b/packages/zend-db/library/Zend/Db/Adapter/Pdo/Mysql.php
@@ -77,8 +77,7 @@ class Zend_Db_Adapter_Pdo_Mysql extends Zend_Db_Adapter_Pdo_Abstract
     );
 
     /**
-     * Override _dsn() and ensure that charset is incorporated in mysql
-     * @see Zend_Db_Adapter_Pdo_Abstract::_dsn()
+     * @return string
      */
     protected function _dsn()
     {
@@ -88,7 +87,7 @@ protected function _dsn()
         }
         return $dsn;
     }
-    
+
     /**
      * Creates a PDO object and connects to the database.
      *

diff --git a/packages/zend-filter/library/Zend/Filter/Word/CamelCaseToSeparator.php b/packages/zend-filter/library/Zend/Filter/Word/CamelCaseToSeparator.php
@@ -32,7 +32,10 @@
  */
 class Zend_Filter_Word_CamelCaseToSeparator extends Zend_Filter_Word_Separator_Abstract
 {
-
+    /**
+     * @param string $value
+     * @return string
+     */
     public function filter($value)
     {
         if (self::isUnicodeSupportEnabled()) {

diff --git a/packages/zend-form/library/Zend/Form/Element.php b/packages/zend-form/library/Zend/Form/Element.php
@@ -890,8 +890,8 @@ public function setAttribs(array $attribs)
     /**
      * Retrieve element attribute
      *
-     * @param  string $name
-     * @return string
+     * @param string $name
+     * @return string|null
      */
     public function getAttrib($name)
     {

diff --git a/packages/zend-layout/library/Zend/Layout/Controller/Action/Helper/Layout.php b/packages/zend-layout/library/Zend/Layout/Controller/Action/Helper/Layout.php
@@ -78,6 +78,9 @@ public function __construct(Zend_Layout $layout = null)
         }
     }
 
+    /**
+     * @return void
+     */
     public function init()
     {
         $this->_isActionControllerSuccessful = false;
-Original file line number
+Diff line change
@@ Expand Up / @@ -78,6 +78,9 @@ public function __construct(Zend_Layout $layout = null) @@
             }
         }
+        /**
+         * @return void
+         */
         public function init()
         {
             $this->_isActionControllerSuccessful = false;
@@ Expand Down @@