Skip to content
Snippets Groups Projects
Commit 34b47010 authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms
Browse files

fixes #3709, fixes #3710, fixes #3712, fixes #3713

Closes #3709, #3710, #3712, and #3713

Merge request studip/studip!2610
parent d40e6154
No related branches found
No related tags found
No related merge requests found
...@@ -184,6 +184,7 @@ class StudipPDO extends PDO ...@@ -184,6 +184,7 @@ class StudipPDO extends PDO
* @param mixed ...$fetch_args fetch mode parameters (see PDOStatement::setFetchMode) * @param mixed ...$fetch_args fetch mode parameters (see PDOStatement::setFetchMode)
* @return object PDOStatement object * @return object PDOStatement object
*/ */
#[ReturnTypeWillChange]
public function query($statement, $fetch_mode = NULL, ...$fetch_args) public function query($statement, $fetch_mode = NULL, ...$fetch_args)
{ {
$this->verify($statement); $this->verify($statement);
......
...@@ -108,7 +108,7 @@ abstract class Base extends \SimpleORMap ...@@ -108,7 +108,7 @@ abstract class Base extends \SimpleORMap
$statement = DBManager::get()->query($query); $statement = DBManager::get()->query($query);
$ids = $statement->fetchAll(PDO::FETCH_COLUMN); $ids = $statement->fetchAll(PDO::FETCH_COLUMN);
return array_map('self::find', $ids); return array_map([self::class, 'find'], $ids);
} }
/** /**
......
...@@ -107,7 +107,7 @@ class PersonalNotifications extends SimpleORMap ...@@ -107,7 +107,7 @@ class PersonalNotifications extends SimpleORMap
$user_ids = [$user_ids]; $user_ids = [$user_ids];
} }
$user_ids = array_filter($user_ids, 'self::isActivated'); $user_ids = array_filter($user_ids, [self::class, 'isActivated']);
if (!count($user_ids)) { if (!count($user_ids)) {
return false; return false;
......
...@@ -154,7 +154,7 @@ class SimpleCollection extends StudipArrayObject ...@@ -154,7 +154,7 @@ class SimpleCollection extends StudipArrayObject
case '%=': case '%=':
$comp_func = function ($a) use ($args) { $comp_func = function ($a) use ($args) {
$a = mb_strtolower(static::translitLatin1($a)); $a = mb_strtolower(static::translitLatin1($a));
$args = array_map('static::translitLatin1', $args); $args = array_map([static::class, 'translitLatin1'], $args);
$args = array_map('mb_strtolower', $args); $args = array_map('mb_strtolower', $args);
return in_array($a, $args); return in_array($a, $args);
}; };
...@@ -256,7 +256,10 @@ class SimpleCollection extends StudipArrayObject ...@@ -256,7 +256,10 @@ class SimpleCollection extends StudipArrayObject
*/ */
public function exchangeArray($input) public function exchangeArray($input)
{ {
return parent::exchangeArray(array_map('static::arrayToArrayObject', $input)); return parent::exchangeArray(array_map(
[static::class, 'arrayToArrayObject'],
$input
));
} }
/** /**
......
...@@ -184,7 +184,10 @@ class StudipNews extends SimpleORMap implements PrivacyObject ...@@ -184,7 +184,10 @@ class StudipNews extends SimpleORMap implements PrivacyObject
public static function GetNewsObjects($news_result) public static function GetNewsObjects($news_result)
{ {
return array_map('static::buildExisting', (array) $news_result); return array_map(
[static::class, 'buildExisting'],
(array) $news_result
);
} }
/** /**
......
...@@ -644,7 +644,7 @@ class PluginManager ...@@ -644,7 +644,7 @@ class PluginManager
$plugin_info = $this->getPluginInfos($type); $plugin_info = $this->getPluginInfos($type);
$plugins = []; $plugins = [];
usort($plugin_info, ['self', 'positionCompare']); usort($plugin_info, [self::class, 'positionCompare']);
foreach ($plugin_info as $info) { foreach ($plugin_info as $info) {
$activated = $context == null $activated = $context == null
......
...@@ -997,11 +997,13 @@ class Trails_Flash implements ArrayAccess { ...@@ -997,11 +997,13 @@ class Trails_Flash implements ArrayAccess {
} }
#[ReturnTypeWillChange]
function offsetExists($offset) { function offsetExists($offset) {
return isset($this->flash[$offset]); return isset($this->flash[$offset]);
} }
#[ReturnTypeWillChange]
function offsetGet($offset) { function offsetGet($offset) {
return $this->get($offset); return $this->get($offset);
} }
...@@ -1012,6 +1014,7 @@ class Trails_Flash implements ArrayAccess { ...@@ -1012,6 +1014,7 @@ class Trails_Flash implements ArrayAccess {
} }
#[ReturnTypeWillChange]
function offsetUnset($offset) { function offsetUnset($offset) {
unset($this->flash[$offset], $this->used[$offset]); unset($this->flash[$offset], $this->used[$offset]);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment