holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename "readonly" policy to "readonlys", as "readonly" is a reserved word from PHP 8.1 on

Browse Source
This commit is contained in:
ralf 2022-04-22 00:41:22 +02:00
parent ecf15cf982
commit 12b3d9016c
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
admin/inc/class.admin_cmd.inc.php
View File

@ -474,6 +474,12 @@ abstract class admin_cmd
{ {
$data['data'] = json_php_unserialize($data['data']); $data['data'] = json_php_unserialize($data['data']);
} }
// "Readonly" policy need to be renamed (to "Readonlys") as readonly is a reserved word in PHP 8.1+
if ($data['type'] === 'Policy\\Policies\\Readonly')
{
$data['type'] .= 's';
$data['policy'] .= 's';
}
if (!(class_exists($class = 'EGroupware\\'.$data['type']) || // namespaced class if (!(class_exists($class = 'EGroupware\\'.$data['type']) || // namespaced class
class_exists($class = $data['type'])) || $data['type'] == 'admin_cmd') class_exists($class = $data['type'])) || $data['type'] == 'admin_cmd')
{ {
@ -601,7 +607,9 @@ abstract class admin_cmd
{ {
$label = $class::name(); $label = $class::name();
} }
elseif (class_exists('EGroupware\\' . $class)) elseif (class_exists('EGroupware\\' . $class) ||
// "Readonly" policy need to be renamed (to "Readonlys") as readonly is a reserved word in PHP 8.1+
class_exists('EGroupware\\' . ($class .= 's')))
{ {
$class = 'EGroupware\\' . $class; $class = 'EGroupware\\' . $class;
$label = $class::name(); $label = $class::name();