diff options
| author | Tim-Hinnerk Heuer <tim@innocraft.com> | 2021-09-28 11:12:50 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-28 11:12:50 +0300 |
| commit | 1bc9fdf55352b61c278d298e9935451394230355 (patch) | |
| tree | bc2e264fb1bbdf93d6fb9d5c5dd650524afc6b8c /libs | |
| parent | 6130619db38b901dfb35f6aeeceedbe6b4e1e0c0 (diff) | |
A few more PHP8.1 fixes (#17989)
* add return type declartions #17686
should not break anything and gets rid of a warning
* add return type to method signature #17686
* annotate return types to avoid warnings
* add more return types
* upgrade phpmailer/phpmailer to 6.5.1
* add return types, avoid deprecated null to string conversion
* fix some deprecation warnings for php 8.1 #17686
* fix in DbHelper::getInstallVersion() instead #17686
* ensure empty(DbHelper::getInstallVersion()) succeed #17686
* force return "0" string and adjust test
Co-authored-by: Justin Velluppillai <justin@innocraft.com>
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/Zend/Db/Statement/Pdo.php | 2 | ||||
| -rw-r--r-- | libs/Zend/Session/Namespace.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/Zend/Db/Statement/Pdo.php b/libs/Zend/Db/Statement/Pdo.php index fb501eaf30..6869582023 100644 --- a/libs/Zend/Db/Statement/Pdo.php +++ b/libs/Zend/Db/Statement/Pdo.php @@ -264,7 +264,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega * * @return IteratorIterator */ - public function getIterator() + public function getIterator(): IteratorIterator { return new IteratorIterator($this->_stmt); } diff --git a/libs/Zend/Session/Namespace.php b/libs/Zend/Session/Namespace.php index dfa680233f..d16ed65e45 100644 --- a/libs/Zend/Session/Namespace.php +++ b/libs/Zend/Session/Namespace.php @@ -207,7 +207,7 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg * * @return ArrayObject - iteratable container of the namespace contents */ - public function getIterator() + public function getIterator(): ArrayObject { return new ArrayObject(parent::_namespaceGetAll($this->_namespace)); } |