Skip to content

Fix PHP8.1 tentative return types #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 23, 2022
Merged

Fix PHP8.1 tentative return types #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a46311
Fix PHP8.1 tentative return types
ChristophWurst May 23, 2022
43dab56
Enable E_ALL error reporting on CI
ChristophWurst May 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
ini-values: error_reporting=E_ALL
tools: composer:v2
coverage: pcov

Expand Down
3 changes: 2 additions & 1 deletion lib/Horde/Imap/Client/Base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ abstract class Horde_Imap_Client_Base
* DEFAULT: 30 seconds
* - username: (string) [REQUIRED] The username.
* - authusername (string) The username used for SASL authentication.
* If specified this is the user name whose password is used
* If specified this is the user name whose password is used
* (e.g. administrator).
* Only valid for RFC 2595/4616 - PLAIN SASL mechanism.
* DEFAULT: the same value provided in the username parameter.
Expand Down Expand Up @@ -346,6 +346,7 @@ public function __clone()

/**
*/
#[ReturnTypeWillChange]
public function update(SplSubject $subject)
{
if (($subject instanceof Horde_Imap_Client_Data_Capability) ||
Expand Down
3 changes: 3 additions & 0 deletions lib/Horde/Imap/Client/Base/Alerts.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ public function getLast()

/**
*/
#[ReturnTypeWillChange]
public function attach(SplObserver $observer)
{
$this->detach($observer);
Expand All @@ -81,6 +82,7 @@ public function attach(SplObserver $observer)

/**
*/
#[ReturnTypeWillChange]
public function detach(SplObserver $observer)
{
if (($key = array_search($observer, $this->_observers, true)) !== false) {
Expand All @@ -92,6 +94,7 @@ public function detach(SplObserver $observer)
* Notification is triggered internally whenever the object's internal
* data storage is altered.
*/
#[ReturnTypeWillChange]
public function notify()
{
foreach ($this->_observers as $val) {
Expand Down
5 changes: 5 additions & 0 deletions lib/Horde/Imap/Client/Data/Acl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,20 +100,23 @@ protected function _normalize()

/**
*/
#[ReturnTypeWillChange]
public function offsetExists($offset)
{
return $this[$offset];
}

/**
*/
#[ReturnTypeWillChange]
public function offsetGet($offset)
{
return in_array($offset, $this->_rights);
}

/**
*/
#[ReturnTypeWillChange]
public function offsetSet($offset, $value)
{
if ($value) {
Expand All @@ -133,13 +136,15 @@ public function offsetSet($offset, $value)

/**
*/
#[ReturnTypeWillChange]
public function offsetUnset($offset)
{
$this->_rights = array_values(array_diff($this->_rights, array($offset)));
}

/* IteratorAggregate method. */

#[ReturnTypeWillChange]
public function getIterator()
{
return new ArrayIterator($this->_rights);
Expand Down
9 changes: 9 additions & 0 deletions lib/Horde/Imap/Client/Data/AclRights.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,15 @@ protected function _normalize()

/**
*/
#[ReturnTypeWillChange]
public function offsetExists($offset)
{
return (bool)$this[$offset];
}

/**
*/
#[ReturnTypeWillChange]
public function offsetGet($offset)
{
if (isset($this->_optional[$offset])) {
Expand All @@ -116,6 +118,7 @@ public function offsetGet($offset)

/**
*/
#[ReturnTypeWillChange]
public function offsetSet($offset, $value)
{
$this->_optional[$offset] = $value;
Expand All @@ -124,6 +127,7 @@ public function offsetSet($offset, $value)

/**
*/
#[ReturnTypeWillChange]
public function offsetUnset($offset)
{
unset($this->_optional[$offset]);
Expand All @@ -140,6 +144,7 @@ public function offsetUnset($offset)

/**
*/
#[ReturnTypeWillChange]
public function current()
{
$val = current($this->_required);
Expand All @@ -150,6 +155,7 @@ public function current()

/**
*/
#[ReturnTypeWillChange]
public function key()
{
$key = key($this->_required);
Expand All @@ -160,6 +166,7 @@ public function key()

/**
*/
#[ReturnTypeWillChange]
public function next()
{
if (key($this->_required) === null) {
Expand All @@ -171,6 +178,7 @@ public function next()

/**
*/
#[ReturnTypeWillChange]
public function rewind()
{
reset($this->_required);
Expand All @@ -179,6 +187,7 @@ public function rewind()

/**
*/
#[ReturnTypeWillChange]
public function valid()
{
return ((key($this->_required) !== null) ||
Expand Down
3 changes: 3 additions & 0 deletions lib/Horde/Imap/Client/Data/Capability.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ public function toArray()

/**
*/
#[ReturnTypeWillChange]
public function attach(SplObserver $observer)
{
$this->detach($observer);
Expand All @@ -177,6 +178,7 @@ public function attach(SplObserver $observer)

/**
*/
#[ReturnTypeWillChange]
public function detach(SplObserver $observer)
{
if (($key = array_search($observer, $this->_observers, true)) !== false) {
Expand All @@ -188,6 +190,7 @@ public function detach(SplObserver $observer)
* Notification is triggered internally whenever the object's internal
* data storage is altered.
*/
#[ReturnTypeWillChange]
public function notify()
{
foreach ($this->_observers as $val) {
Expand Down
2 changes: 2 additions & 0 deletions lib/Horde/Imap/Client/Data/Format/Filter/Quote.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ class Horde_Imap_Client_Data_Format_Filter_Quote extends php_user_filter

/**
*/
#[ReturnTypeWillChange]
public function onCreate()
{
$this->_prepend = false;
Expand All @@ -39,6 +40,7 @@ public function onCreate()
/**
* @see stream_filter_register()
*/
#[ReturnTypeWillChange]
public function filter($in, $out, &$consumed, $closing)
{
if (!$this->_prepend) {
Expand Down
2 changes: 2 additions & 0 deletions lib/Horde/Imap/Client/Data/Format/Filter/String.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ class Horde_Imap_Client_Data_Format_Filter_String extends php_user_filter
/**
* @see stream_filter_register()
*/
#[ReturnTypeWillChange]
public function onCreate()
{
$this->params->binary = false;
Expand All @@ -47,6 +48,7 @@ public function onCreate()
/**
* @see stream_filter_register()
*/
#[ReturnTypeWillChange]
public function filter($in, $out, &$consumed, $closing)
{
$p = $this->params;
Expand Down
2 changes: 2 additions & 0 deletions lib/Horde/Imap/Client/Data/Format/List.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ public function __toString()

/**
*/
#[ReturnTypeWillChange]
public function count()
{
return count($this->_data);
Expand All @@ -98,6 +99,7 @@ public function count()
/**
* Iterator loops through the data elements contained in this list.
*/
#[ReturnTypeWillChange]
public function getIterator()
{
return new ArrayIterator($this->_data);
Expand Down
3 changes: 3 additions & 0 deletions lib/Horde/Imap/Client/Data/SearchCharset.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ public function setValid($charset, $valid = true)

/**
*/
#[ReturnTypeWillChange]
public function attach(SplObserver $observer)
{
$this->detach($observer);
Expand All @@ -141,6 +142,7 @@ public function attach(SplObserver $observer)

/**
*/
#[ReturnTypeWillChange]
public function detach(SplObserver $observer)
{
if (($key = array_search($observer, $this->_observers, true)) !== false) {
Expand All @@ -152,6 +154,7 @@ public function detach(SplObserver $observer)
* Notification is triggered internally whenever the object's internal
* data storage is altered.
*/
#[ReturnTypeWillChange]
public function notify()
{
foreach ($this->_observers as $val) {
Expand Down
1 change: 1 addition & 0 deletions lib/Horde/Imap/Client/Data/Thread.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ public function getThreads()

/**
*/
#[ReturnTypeWillChange]
public function count()
{
return count($this->_getAllIndices());
Expand Down
10 changes: 10 additions & 0 deletions lib/Horde/Imap/Client/Fetch/Query.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,13 +302,15 @@ public function hash()

/**
*/
#[ReturnTypeWillChange]
public function offsetExists($offset)
{
return isset($this->_data[$offset]);
}

/**
*/
#[ReturnTypeWillChange]
public function offsetGet($offset)
{
return isset($this->_data[$offset])
Expand All @@ -318,13 +320,15 @@ public function offsetGet($offset)

/**
*/
#[ReturnTypeWillChange]
public function offsetSet($offset, $value)
{
$this->_data[$offset] = $value;
}

/**
*/
#[ReturnTypeWillChange]
public function offsetUnset($offset)
{
unset($this->_data[$offset]);
Expand All @@ -334,6 +338,7 @@ public function offsetUnset($offset)

/**
*/
#[ReturnTypeWillChange]
public function count()
{
return count($this->_data);
Expand All @@ -343,6 +348,7 @@ public function count()

/**
*/
#[ReturnTypeWillChange]
public function current()
{
$opts = current($this->_data);
Expand All @@ -354,27 +360,31 @@ public function current()

/**
*/
#[ReturnTypeWillChange]
public function key()
{
return key($this->_data);
}

/**
*/
#[ReturnTypeWillChange]
public function next()
{
next($this->_data);
}

/**
*/
#[ReturnTypeWillChange]
public function rewind()
{
reset($this->_data);
}

/**
*/
#[ReturnTypeWillChange]
public function valid()
{
return !is_null($this->key());
Expand Down
6 changes: 6 additions & 0 deletions lib/Horde/Imap/Client/Fetch/Results.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,15 @@ public function clear()

/**
*/
#[ReturnTypeWillChange]
public function offsetExists($offset)
{
return isset($this->_data[$offset]);
}

/**
*/
#[ReturnTypeWillChange]
public function offsetGet($offset)
{
return isset($this->_data[$offset])
Expand All @@ -148,13 +150,15 @@ public function offsetGet($offset)

/**
*/
#[ReturnTypeWillChange]
public function offsetSet($offset, $value)
{
$this->_data[$offset] = $value;
}

/**
*/
#[ReturnTypeWillChange]
public function offsetUnset($offset)
{
unset($this->_data[$offset]);
Expand All @@ -164,6 +168,7 @@ public function offsetUnset($offset)

/**
*/
#[ReturnTypeWillChange]
public function count()
{
return count($this->_data);
Expand All @@ -173,6 +178,7 @@ public function count()

/**
*/
#[ReturnTypeWillChange]
public function getIterator()
{
ksort($this->_data);
Expand Down
Loading