Skip to content

Fix PHP8.1 tentative return types #2

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 #2

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
2200beb
Fix PHP8.1 tentative return types
ChristophWurst May 23, 2022
cddef79
Merge branch 'master' into fix/php8.1-tentative-return-type
bytestream 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
6 changes: 6 additions & 0 deletions lib/Horde/Support/Array.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,15 @@ public function __unset($key)
*
* @return integer
*/
#[ReturnTypeWillChange]
public function count()
{
return count($this->_array);
}

/**
*/
#[ReturnTypeWillChange]
public function getIterator()
{
return new ArrayIterator($this->_array);
Expand All @@ -163,6 +165,7 @@ public function getIterator()
*
* @see __get()
*/
#[ReturnTypeWillChange]
public function offsetGet($offset)
{
return $this->__get($offset);
Expand All @@ -173,6 +176,7 @@ public function offsetGet($offset)
*
* @see __set()
*/
#[ReturnTypeWillChange]
public function offsetSet($offset, $value)
{
return $this->__set($offset, $value);
Expand All @@ -183,6 +187,7 @@ public function offsetSet($offset, $value)
*
* @see __isset()
*/
#[ReturnTypeWillChange]
public function offsetExists($offset)
{
return $this->__isset($offset);
Expand All @@ -193,6 +198,7 @@ public function offsetExists($offset)
*
* @see __unset()
*/
#[ReturnTypeWillChange]
public function offsetUnset($offset)
{
return $this->__unset($offset);
Expand Down
4 changes: 4 additions & 0 deletions lib/Horde/Support/CaseInsensitiveArray.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class Horde_Support_CaseInsensitiveArray extends ArrayIterator
{
/**
*/
#[ReturnTypeWillChange]
public function offsetGet($offset)
{
return (is_null($offset = $this->_getRealOffset($offset)))
Expand All @@ -33,6 +34,7 @@ public function offsetGet($offset)

/**
*/
#[ReturnTypeWillChange]
public function offsetSet($offset, $value)
{
if (is_null($roffset = $this->_getRealOffset($offset))) {
Expand All @@ -44,13 +46,15 @@ public function offsetSet($offset, $value)

/**
*/
#[ReturnTypeWillChange]
public function offsetExists($offset)
{
return !is_null($offset = $this->_getRealOffset($offset));
}

/**
*/
#[ReturnTypeWillChange]
public function offsetUnset($offset)
{
if (!is_null($offset = $this->_getRealOffset($offset))) {
Expand Down
6 changes: 6 additions & 0 deletions lib/Horde/Support/Stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,26 +95,30 @@ public static function __callStatic($method, $args)

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

/**
*/
#[ReturnTypeWillChange]
public function offsetSet($offset, $value)
{
}

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

/**
*/
#[ReturnTypeWillChange]
public function offsetUnset($offset)
{
}
Expand All @@ -123,6 +127,7 @@ public function offsetUnset($offset)

/**
*/
#[ReturnTypeWillChange]
public function count()
{
return 0;
Expand All @@ -132,6 +137,7 @@ public function count()

/**
*/
#[ReturnTypeWillChange]
public function getIterator()
{
return new ArrayIterator(array());
Expand Down