From b042077543211f7fedc0692533d189e16de6bce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Sun, 17 Nov 2024 13:26:31 +0100 Subject: [PATCH] run fixer on PHP 8.3 to fix attributes --- plugins/acl/acl.php | 2 +- .../additional_message_headers.php | 2 +- plugins/archive/archive.php | 2 +- .../attachment_reminder.php | 2 +- plugins/autologon/autologon.php | 2 +- plugins/autologout/autologout.php | 2 +- .../database_attachments.php | 12 +- plugins/debug_logger/debug_logger.php | 2 +- plugins/emoticons/emoticons.php | 2 +- plugins/enigma/enigma.php | 2 +- plugins/enigma/lib/enigma_driver_gnupg.php | 28 ++-- plugins/enigma/lib/enigma_driver_phpssl.php | 26 ++-- plugins/enigma/lib/enigma_mime_message.php | 6 +- .../example_addressbook.php | 2 +- .../example_addressbook_backend.php | 36 ++--- .../filesystem_attachments.php | 2 +- plugins/help/help.php | 2 +- plugins/hide_blockquote/hide_blockquote.php | 2 +- .../http_authentication.php | 2 +- plugins/identicon/identicon.php | 2 +- plugins/identity_select/identity_select.php | 2 +- plugins/jqueryui/jqueryui.php | 2 +- .../krb_authentication/krb_authentication.php | 2 +- .../lib/Roundcube/rcube_sieve_forward.php | 6 +- .../lib/Roundcube/rcube_sieve_vacation.php | 6 +- plugins/managesieve/managesieve.php | 2 +- plugins/markasjunk/markasjunk.php | 2 +- plugins/new_user_dialog/new_user_dialog.php | 2 +- .../new_user_identity/new_user_identity.php | 2 +- plugins/newmail_notifier/newmail_notifier.php | 2 +- plugins/password/drivers/ldap_exop.php | 2 +- plugins/password/drivers/ldap_samba_ad.php | 2 +- plugins/password/password.php | 2 +- plugins/reconnect/reconnect.php | 2 +- .../redundant_attachments.php | 12 +- .../show_additional_headers.php | 2 +- .../squirrelmail_usercopy.php | 2 +- .../subscriptions_option.php | 2 +- plugins/userinfo/userinfo.php | 2 +- .../vcard_attachments/vcard_attachments.php | 2 +- plugins/virtuser_file/virtuser_file.php | 2 +- plugins/virtuser_query/virtuser_query.php | 2 +- plugins/zipdownload/zipdownload.php | 6 +- program/actions/contacts/copy.php | 2 +- program/actions/contacts/delete.php | 2 +- program/actions/contacts/edit.php | 4 +- program/actions/contacts/export.php | 2 +- program/actions/contacts/group_addmembers.php | 2 +- program/actions/contacts/group_create.php | 2 +- program/actions/contacts/group_delete.php | 2 +- program/actions/contacts/group_delmembers.php | 2 +- program/actions/contacts/group_rename.php | 2 +- program/actions/contacts/import.php | 2 +- program/actions/contacts/index.php | 2 +- program/actions/contacts/list.php | 2 +- program/actions/contacts/mailto.php | 2 +- program/actions/contacts/move.php | 2 +- program/actions/contacts/photo.php | 2 +- program/actions/contacts/print.php | 2 +- program/actions/contacts/qrcode.php | 2 +- program/actions/contacts/save.php | 2 +- program/actions/contacts/search.php | 2 +- program/actions/contacts/search_create.php | 2 +- program/actions/contacts/search_delete.php | 2 +- program/actions/contacts/show.php | 2 +- program/actions/contacts/undo.php | 2 +- program/actions/contacts/upload_photo.php | 2 +- program/actions/login/oauth.php | 2 +- program/actions/login/oauth_backchannel.php | 2 +- program/actions/mail/addcontact.php | 2 +- program/actions/mail/attachment_delete.php | 2 +- program/actions/mail/attachment_display.php | 2 +- program/actions/mail/attachment_rename.php | 2 +- program/actions/mail/attachment_upload.php | 2 +- program/actions/mail/autocomplete.php | 2 +- program/actions/mail/bounce.php | 2 +- program/actions/mail/check_recent.php | 2 +- program/actions/mail/compose.php | 2 +- program/actions/mail/copy.php | 2 +- program/actions/mail/delete.php | 2 +- program/actions/mail/folder_expunge.php | 2 +- program/actions/mail/folder_purge.php | 2 +- program/actions/mail/get.php | 2 +- program/actions/mail/getunread.php | 2 +- program/actions/mail/group_expand.php | 2 +- program/actions/mail/headers.php | 2 +- program/actions/mail/import.php | 2 +- program/actions/mail/index.php | 2 +- program/actions/mail/list.php | 2 +- program/actions/mail/list_contacts.php | 2 +- program/actions/mail/mark.php | 2 +- program/actions/mail/move.php | 2 +- program/actions/mail/pagenav.php | 2 +- program/actions/mail/search.php | 2 +- program/actions/mail/search_contacts.php | 2 +- program/actions/mail/send.php | 2 +- program/actions/mail/sendmdn.php | 2 +- program/actions/mail/show.php | 2 +- program/actions/mail/viewsource.php | 2 +- program/actions/settings/about.php | 2 +- program/actions/settings/folder_delete.php | 2 +- program/actions/settings/folder_edit.php | 2 +- program/actions/settings/folder_purge.php | 2 +- program/actions/settings/folder_rename.php | 2 +- program/actions/settings/folder_save.php | 2 +- program/actions/settings/folder_size.php | 2 +- program/actions/settings/folder_subscribe.php | 2 +- .../actions/settings/folder_unsubscribe.php | 2 +- program/actions/settings/folders.php | 2 +- program/actions/settings/identities.php | 2 +- program/actions/settings/identity_delete.php | 2 +- program/actions/settings/identity_edit.php | 2 +- program/actions/settings/identity_save.php | 2 +- program/actions/settings/index.php | 2 +- program/actions/settings/prefs_edit.php | 2 +- program/actions/settings/prefs_save.php | 2 +- program/actions/settings/response_delete.php | 2 +- program/actions/settings/response_edit.php | 2 +- program/actions/settings/response_get.php | 2 +- program/actions/settings/response_save.php | 2 +- program/actions/settings/responses.php | 2 +- program/actions/settings/upload.php | 2 +- program/actions/settings/upload_display.php | 2 +- program/actions/utils/error.php | 2 +- program/actions/utils/html2text.php | 2 +- program/actions/utils/killcache.php | 2 +- program/actions/utils/modcss.php | 2 +- program/actions/utils/save_pref.php | 2 +- program/actions/utils/spell.php | 2 +- program/actions/utils/spell_html.php | 2 +- program/actions/utils/text2html.php | 2 +- program/include/rcmail.php | 10 +- program/include/rcmail_html_page.php | 2 +- program/include/rcmail_output.php | 2 +- program/include/rcmail_output_cli.php | 10 +- program/include/rcmail_output_html.php | 18 +-- program/include/rcmail_output_json.php | 20 +-- program/include/rcmail_resend_mail.php | 12 +- program/include/rcmail_string_replacer.php | 2 +- program/lib/Roundcube/cache/apc.php | 10 +- program/lib/Roundcube/cache/db.php | 16 +- program/lib/Roundcube/cache/memcache.php | 10 +- program/lib/Roundcube/cache/memcached.php | 10 +- program/lib/Roundcube/cache/redis.php | 10 +- program/lib/Roundcube/db/mysql.php | 14 +- program/lib/Roundcube/db/param.php | 2 +- program/lib/Roundcube/db/pgsql.php | 22 +-- program/lib/Roundcube/db/sqlite.php | 16 +- program/lib/Roundcube/html.php | 14 +- program/lib/Roundcube/rcube_addresses.php | 20 +-- program/lib/Roundcube/rcube_contacts.php | 48 +++--- .../lib/Roundcube/rcube_content_filter.php | 6 +- program/lib/Roundcube/rcube_imap.php | 138 +++++++++--------- program/lib/Roundcube/rcube_ldap.php | 56 +++---- program/lib/Roundcube/rcube_ldap_generic.php | 4 +- program/lib/Roundcube/rcube_result_set.php | 26 ++-- program/lib/Roundcube/rcube_session.php | 24 +-- program/lib/Roundcube/session/db.php | 12 +- program/lib/Roundcube/session/memcache.php | 12 +- program/lib/Roundcube/session/memcached.php | 12 +- program/lib/Roundcube/session/php.php | 16 +- program/lib/Roundcube/session/redis.php | 12 +- program/lib/Roundcube/spellchecker/atd.php | 8 +- .../lib/Roundcube/spellchecker/enchant.php | 8 +- program/lib/Roundcube/spellchecker/googie.php | 8 +- program/lib/Roundcube/spellchecker/pspell.php | 8 +- 166 files changed, 501 insertions(+), 501 deletions(-) diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php index a915b023e36..3e4afad9373 100644 --- a/plugins/acl/acl.php +++ b/plugins/acl/acl.php @@ -46,7 +46,7 @@ class acl extends rcube_plugin /** * Plugin initialization */ - #[Override] + #[\Override] public function init() { $this->rc = rcmail::get_instance(); diff --git a/plugins/additional_message_headers/additional_message_headers.php b/plugins/additional_message_headers/additional_message_headers.php index dc5c0dade59..49c0724bb4b 100644 --- a/plugins/additional_message_headers/additional_message_headers.php +++ b/plugins/additional_message_headers/additional_message_headers.php @@ -21,7 +21,7 @@ class additional_message_headers extends rcube_plugin /** * Plugin initialization */ - #[Override] + #[\Override] public function init() { $this->add_hook('message_before_send', [$this, 'message_headers']); diff --git a/plugins/archive/archive.php b/plugins/archive/archive.php index df3423c6ada..84908dbd137 100644 --- a/plugins/archive/archive.php +++ b/plugins/archive/archive.php @@ -33,7 +33,7 @@ class archive extends rcube_plugin /** * Plugin initialization. */ - #[Override] + #[\Override] public function init() { $rcmail = rcmail::get_instance(); diff --git a/plugins/attachment_reminder/attachment_reminder.php b/plugins/attachment_reminder/attachment_reminder.php index 6e6de7e920b..16322fcc2a4 100644 --- a/plugins/attachment_reminder/attachment_reminder.php +++ b/plugins/attachment_reminder/attachment_reminder.php @@ -39,7 +39,7 @@ class attachment_reminder extends rcube_plugin /** * Plugin initialization */ - #[Override] + #[\Override] public function init() { $rcmail = rcmail::get_instance(); diff --git a/plugins/autologon/autologon.php b/plugins/autologon/autologon.php index a3e02d357cd..c0f6ba9f896 100644 --- a/plugins/autologon/autologon.php +++ b/plugins/autologon/autologon.php @@ -16,7 +16,7 @@ class autologon extends rcube_plugin /** * Plugin initialization */ - #[Override] + #[\Override] public function init() { $this->add_hook('startup', [$this, 'startup']); diff --git a/plugins/autologout/autologout.php b/plugins/autologout/autologout.php index bc67683acef..777cb4a4dd9 100644 --- a/plugins/autologout/autologout.php +++ b/plugins/autologout/autologout.php @@ -34,7 +34,7 @@ class autologout extends rcube_plugin /** * Plugin initialization */ - #[Override] + #[\Override] public function init() { $this->add_hook('startup', [$this, 'startup']); diff --git a/plugins/database_attachments/database_attachments.php b/plugins/database_attachments/database_attachments.php index b24f81245c1..b7b30923919 100644 --- a/plugins/database_attachments/database_attachments.php +++ b/plugins/database_attachments/database_attachments.php @@ -45,7 +45,7 @@ class database_attachments extends filesystem_attachments /** * Save a newly uploaded attachment */ - #[Override] + #[\Override] public function upload($args) { $args['status'] = false; @@ -73,7 +73,7 @@ public function upload($args) /** * Save an attachment from a non-upload source (draft or forward) */ - #[Override] + #[\Override] public function save($args) { $args['status'] = false; @@ -106,7 +106,7 @@ public function save($args) * Remove an attachment from storage * This is triggered by the remove attachment button on the compose screen */ - #[Override] + #[\Override] public function remove($args) { $cache = $this->get_cache(); @@ -122,7 +122,7 @@ public function remove($args) * For this plugin, $this->get() will check the file and * return it's contents */ - #[Override] + #[\Override] public function display($args) { return $this->get($args); @@ -132,7 +132,7 @@ public function display($args) * When displaying or sending the attachment the file contents are fetched * using this method. This is also called by the attachment_display hook. */ - #[Override] + #[\Override] public function get($args) { $cache = $this->get_cache(); @@ -151,7 +151,7 @@ public function get($args) /** * Delete all temp files associated with this user */ - #[Override] + #[\Override] public function cleanup($args) { // check if cache object exist, it may be empty on session_destroy (#1489726) diff --git a/plugins/debug_logger/debug_logger.php b/plugins/debug_logger/debug_logger.php index e39a2e229fa..a4de42560be 100644 --- a/plugins/debug_logger/debug_logger.php +++ b/plugins/debug_logger/debug_logger.php @@ -67,7 +67,7 @@ class debug_logger extends rcube_plugin { protected $runlog; - #[Override] + #[\Override] public function init() { require_once __DIR__ . '/runlog/runlog.php'; diff --git a/plugins/emoticons/emoticons.php b/plugins/emoticons/emoticons.php index c5a44763fad..b412e14b094 100644 --- a/plugins/emoticons/emoticons.php +++ b/plugins/emoticons/emoticons.php @@ -25,7 +25,7 @@ class emoticons extends rcube_plugin /** * Plugin initialization. */ - #[Override] + #[\Override] public function init() { $rcube = rcmail::get_instance(); diff --git a/plugins/enigma/enigma.php b/plugins/enigma/enigma.php index 3334003a3c7..a6d4528238f 100644 --- a/plugins/enigma/enigma.php +++ b/plugins/enigma/enigma.php @@ -41,7 +41,7 @@ class enigma extends rcube_plugin /** * Plugin initialization. */ - #[Override] + #[\Override] public function init() { $this->rc = rcmail::get_instance(); diff --git a/plugins/enigma/lib/enigma_driver_gnupg.php b/plugins/enigma/lib/enigma_driver_gnupg.php index ec3c6792523..c128739c3d1 100644 --- a/plugins/enigma/lib/enigma_driver_gnupg.php +++ b/plugins/enigma/lib/enigma_driver_gnupg.php @@ -41,7 +41,7 @@ class enigma_driver_gnupg extends enigma_driver * * @param rcube_user $user User object */ - #[Override] + #[\Override] public function __construct($user) { $this->rc = rcmail::get_instance(); @@ -54,7 +54,7 @@ public function __construct($user) * * @return enigma_error|null NULL on success, enigma_error on failure */ - #[Override] + #[\Override] public function init() { $homedir = $this->rc->config->get('enigma_pgp_homedir'); @@ -136,7 +136,7 @@ public function init() * * @return string|enigma_error Encrypted message or enigma_error on failure */ - #[Override] + #[\Override] public function encrypt($text, $keys, $sign_key = null) { try { @@ -170,7 +170,7 @@ public function encrypt($text, $keys, $sign_key = null) * * @return mixed Decrypted message or enigma_error on failure */ - #[Override] + #[\Override] public function decrypt($text, $keys = [], &$signature = null) { try { @@ -209,7 +209,7 @@ public function decrypt($text, $keys = [], &$signature = null) * * @return mixed True on success or enigma_error on failure */ - #[Override] + #[\Override] public function sign($text, $key, $mode = null) { try { @@ -234,7 +234,7 @@ public function sign($text, $key, $mode = null) * * @return enigma_signature|enigma_error Signature information or enigma_error */ - #[Override] + #[\Override] public function verify($text, $signature) { try { @@ -254,7 +254,7 @@ public function verify($text, $signature) * * @return mixed Import status array or enigma_error */ - #[Override] + #[\Override] public function import($content, $isfile = false, $passwords = []) { try { @@ -286,7 +286,7 @@ public function import($content, $isfile = false, $passwords = []) * * @return string|enigma_error Key content or enigma_error */ - #[Override] + #[\Override] public function export($keyid, $with_private = false, $passwords = []) { try { @@ -315,7 +315,7 @@ public function export($keyid, $with_private = false, $passwords = []) * * @return enigma_key[]|enigma_error Array of keys or enigma_error */ - #[Override] + #[\Override] public function list_keys($pattern = '') { try { @@ -339,7 +339,7 @@ public function list_keys($pattern = '') * * @return enigma_key|enigma_error Key object or enigma_error */ - #[Override] + #[\Override] public function get_key($keyid) { $list = $this->list_keys($keyid); @@ -359,7 +359,7 @@ public function get_key($keyid) * * @return mixed Key (enigma_key) object or enigma_error */ - #[Override] + #[\Override] public function gen_key($data) { try { @@ -388,7 +388,7 @@ public function gen_key($data) * * @return mixed True on success or enigma_error */ - #[Override] + #[\Override] public function delete_key($keyid) { // delete public key @@ -423,7 +423,7 @@ public function delete_key($keyid) * * @return string Hash algorithm name e.g. sha1 */ - #[Override] + #[\Override] public function signature_algorithm() { return $this->last_sig_algorithm; @@ -434,7 +434,7 @@ public function signature_algorithm() * * @return array Capabilities list */ - #[Override] + #[\Override] public function capabilities() { $caps = [enigma_driver::SUPPORT_RSA]; diff --git a/plugins/enigma/lib/enigma_driver_phpssl.php b/plugins/enigma/lib/enigma_driver_phpssl.php index cb8a5e2e56d..c9a7c0a8325 100644 --- a/plugins/enigma/lib/enigma_driver_phpssl.php +++ b/plugins/enigma/lib/enigma_driver_phpssl.php @@ -25,7 +25,7 @@ class enigma_driver_phpssl extends enigma_driver private $homedir; // @phpstan-ignore-line private $user; - #[Override] + #[\Override] public function __construct($user) { $rcmail = rcmail::get_instance(); @@ -39,7 +39,7 @@ public function __construct($user) * * @return enigma_error|null NULL on success, enigma_error on failure */ - #[Override] + #[\Override] public function init() { $homedir = $this->rc->config->get('enigma_smime_homedir', INSTALL_PATH . '/plugins/enigma/home'); @@ -80,25 +80,25 @@ public function init() return null; } - #[Override] + #[\Override] public function encrypt($text, $keys, $sign_key = null) { return new enigma_error(enigma_error::INTERNAL, 'Not implemented'); } - #[Override] + #[\Override] public function decrypt($text, $keys = [], &$signature = null) { return new enigma_error(enigma_error::INTERNAL, 'Not implemented'); } - #[Override] + #[\Override] public function sign($text, $key, $mode = null) { return new enigma_error(enigma_error::INTERNAL, 'Not implemented'); } - #[Override] + #[\Override] public function verify($struct, $message) { /* @@ -142,37 +142,37 @@ public function verify($struct, $message) return new enigma_error(enigma_error::INTERNAL, 'Not implemented'); } - #[Override] + #[\Override] public function import($content, $isfile = false, $passwords = []) { return new enigma_error(enigma_error::INTERNAL, 'Not implemented'); } - #[Override] + #[\Override] public function export($key, $with_private = false, $passwords = []) { return new enigma_error(enigma_error::INTERNAL, 'Not implemented'); } - #[Override] + #[\Override] public function list_keys($pattern = '') { return new enigma_error(enigma_error::INTERNAL, 'Not implemented'); } - #[Override] + #[\Override] public function get_key($keyid) { return new enigma_error(enigma_error::INTERNAL, 'Not implemented'); } - #[Override] + #[\Override] public function gen_key($data) { return new enigma_error(enigma_error::INTERNAL, 'Not implemented'); } - #[Override] + #[\Override] public function delete_key($keyid) { return new enigma_error(enigma_error::INTERNAL, 'Not implemented'); @@ -184,7 +184,7 @@ public function delete_key($keyid) * * @return string Hash algorithm name e.g. sha1 */ - #[Override] + #[\Override] public function signature_algorithm() { return ''; // TODO diff --git a/plugins/enigma/lib/enigma_mime_message.php b/plugins/enigma/lib/enigma_mime_message.php index d6c9587c4a5..0c95bc7901e 100644 --- a/plugins/enigma/lib/enigma_mime_message.php +++ b/plugins/enigma/lib/enigma_mime_message.php @@ -58,7 +58,7 @@ public function __construct($message, $type) * * @return bool True if it is multipart, otherwise False */ - #[Override] + #[\Override] public function isMultipart() { return $this->message instanceof self @@ -166,7 +166,7 @@ public function setPGPEncryptedBody($body) * * @return mixed The MIME message content string, null or PEAR error object */ - #[Override] + #[\Override] public function get($params = null, $filename = null, $skip_head = false) { if (!empty($params)) { @@ -281,7 +281,7 @@ public function get($params = null, $filename = null, $skip_head = false) * * @return array Headers array */ - #[Override] + #[\Override] protected function contentHeaders() { $this->checkParams(); diff --git a/plugins/example_addressbook/example_addressbook.php b/plugins/example_addressbook/example_addressbook.php index d2cdca1888e..72fbb85be0a 100644 --- a/plugins/example_addressbook/example_addressbook.php +++ b/plugins/example_addressbook/example_addressbook.php @@ -18,7 +18,7 @@ class example_addressbook extends rcube_plugin private $abook_id = 'static'; private $abook_name = 'Static List'; - #[Override] + #[\Override] public function init() { $this->add_hook('addressbooks_list', [$this, 'address_sources']); diff --git a/plugins/example_addressbook/example_addressbook_backend.php b/plugins/example_addressbook/example_addressbook_backend.php index f37268dcecf..61ba157e5dc 100644 --- a/plugins/example_addressbook/example_addressbook_backend.php +++ b/plugins/example_addressbook/example_addressbook_backend.php @@ -63,7 +63,7 @@ public function __construct($name) * * @return ?array group properties as hash array, null in case of error */ - #[Override] + #[\Override] public function get_group($group_id) { foreach ($this->db_groups as $group) { @@ -75,32 +75,32 @@ public function get_group($group_id) return null; } - #[Override] + #[\Override] public function get_name() { return $this->name; } - #[Override] + #[\Override] public function set_search_set($filter): void { $this->filter = $filter; } - #[Override] + #[\Override] public function get_search_set() { return $this->filter; } - #[Override] + #[\Override] public function reset(): void { $this->result = null; $this->filter = null; } - #[Override] + #[\Override] public function list_groups($search = null, $mode = 0) { if (is_string($search) && strlen($search)) { @@ -118,7 +118,7 @@ public function list_groups($search = null, $mode = 0) return $this->db_groups; } - #[Override] + #[\Override] public function list_records($cols = null, $subset = 0, $nocount = false) { // Note: Paging is not implemented @@ -126,7 +126,7 @@ public function list_records($cols = null, $subset = 0, $nocount = false) return $this->result = $this->count(); } - #[Override] + #[\Override] public function search($fields, $value, $mode = 0, $select = true, $nocount = false, $required = []) { // Note: we do not implement all possible search request modes and variants. @@ -154,7 +154,7 @@ public function search($fields, $value, $mode = 0, $select = true, $nocount = fa return $result; } - #[Override] + #[\Override] public function count() { // Note: Paging is not implemented @@ -178,13 +178,13 @@ public function count() return $result; } - #[Override] + #[\Override] public function get_result() { return $this->result; } - #[Override] + #[\Override] public function get_record($id, $assoc = false) { $result = new rcube_result_set(0); @@ -210,7 +210,7 @@ public function get_record($id, $assoc = false) * * @return array List of assigned groups, indexed by group ID */ - #[Override] + #[\Override] public function get_record_groups($id) { $result = []; @@ -231,13 +231,13 @@ public function get_record_groups($id) /** * Setter for the current group */ - #[Override] + #[\Override] public function set_group($gid) { $this->group_id = $gid; } - #[Override] + #[\Override] public function create_group($name) { $result = false; @@ -245,25 +245,25 @@ public function create_group($name) return $result; } - #[Override] + #[\Override] public function delete_group($gid) { return false; } - #[Override] + #[\Override] public function rename_group($gid, $newname, &$newid) { return $newname; } - #[Override] + #[\Override] public function add_to_group($group_id, $ids) { return 0; } - #[Override] + #[\Override] public function remove_from_group($group_id, $ids) { return 0; diff --git a/plugins/filesystem_attachments/filesystem_attachments.php b/plugins/filesystem_attachments/filesystem_attachments.php index f6e810807b9..9181ed35a7e 100644 --- a/plugins/filesystem_attachments/filesystem_attachments.php +++ b/plugins/filesystem_attachments/filesystem_attachments.php @@ -33,7 +33,7 @@ class filesystem_attachments extends rcube_plugin public $task = '?(?!login).*'; public $initialized = false; - #[Override] + #[\Override] public function init() { // Find filesystem_attachments-based plugins, we can use only one diff --git a/plugins/help/help.php b/plugins/help/help.php index 8a6903eebdd..8ddf5a4b4b8 100644 --- a/plugins/help/help.php +++ b/plugins/help/help.php @@ -23,7 +23,7 @@ class help extends rcube_plugin // we've got no ajax handlers public $noajax = true; - #[Override] + #[\Override] public function init() { $this->load_config(); diff --git a/plugins/hide_blockquote/hide_blockquote.php b/plugins/hide_blockquote/hide_blockquote.php index 167eb291e16..3d0c0032fb4 100644 --- a/plugins/hide_blockquote/hide_blockquote.php +++ b/plugins/hide_blockquote/hide_blockquote.php @@ -26,7 +26,7 @@ class hide_blockquote extends rcube_plugin /** * Plugin initialization */ - #[Override] + #[\Override] public function init() { $rcmail = rcmail::get_instance(); diff --git a/plugins/http_authentication/http_authentication.php b/plugins/http_authentication/http_authentication.php index c73135e6501..ea4ea613dcd 100644 --- a/plugins/http_authentication/http_authentication.php +++ b/plugins/http_authentication/http_authentication.php @@ -24,7 +24,7 @@ class http_authentication extends rcube_plugin { private $redirect_query; - #[Override] + #[\Override] public function init() { $this->add_hook('startup', [$this, 'startup']); diff --git a/plugins/identicon/identicon.php b/plugins/identicon/identicon.php index 96c25cd9814..f5e7de2f010 100644 --- a/plugins/identicon/identicon.php +++ b/plugins/identicon/identicon.php @@ -30,7 +30,7 @@ class identicon extends rcube_plugin /** * Plugin initialization. */ - #[Override] + #[\Override] public function init() { $this->add_hook('contact_photo', [$this, 'contact_photo']); diff --git a/plugins/identity_select/identity_select.php b/plugins/identity_select/identity_select.php index ea32acfba1d..30a50a728b9 100644 --- a/plugins/identity_select/identity_select.php +++ b/plugins/identity_select/identity_select.php @@ -26,7 +26,7 @@ class identity_select extends rcube_plugin { public $task = 'mail'; - #[Override] + #[\Override] public function init() { $this->add_hook('identity_select', [$this, 'select']); diff --git a/plugins/jqueryui/jqueryui.php b/plugins/jqueryui/jqueryui.php index 4cdc982c8f5..4e715cbadbf 100644 --- a/plugins/jqueryui/jqueryui.php +++ b/plugins/jqueryui/jqueryui.php @@ -32,7 +32,7 @@ class jqueryui extends rcube_plugin /** * Plugin initialization */ - #[Override] + #[\Override] public function init() { $rcmail = rcmail::get_instance(); diff --git a/plugins/krb_authentication/krb_authentication.php b/plugins/krb_authentication/krb_authentication.php index 6c0aa6f9595..d8b1be723aa 100644 --- a/plugins/krb_authentication/krb_authentication.php +++ b/plugins/krb_authentication/krb_authentication.php @@ -23,7 +23,7 @@ class krb_authentication extends rcube_plugin /** * Plugin initialization */ - #[Override] + #[\Override] public function init() { $this->add_hook('startup', [$this, 'startup']); diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_forward.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_forward.php index 2badee202f5..4b3e223ea23 100644 --- a/plugins/managesieve/lib/Roundcube/rcube_sieve_forward.php +++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_forward.php @@ -35,7 +35,7 @@ class rcube_sieve_forward extends rcube_sieve_engine protected $script_name; protected $forward = []; - #[Override] + #[\Override] public function actions() { $error = $this->start('forward'); @@ -62,7 +62,7 @@ public function actions() * * @return int Connection status: 0 on success, >0 on failure */ - #[Override] + #[\Override] protected function load_script($script_name = null) { if ($this->script_name !== null) { @@ -398,7 +398,7 @@ public function set_forward($data) /** * API: connect to managesieve server */ - #[Override] + #[\Override] public function connect($username, $password) { $error = parent::connect($username, $password); diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php index f2f22d53c52..0c419ca1681 100644 --- a/plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php +++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php @@ -39,7 +39,7 @@ class rcube_sieve_vacation extends rcube_sieve_engine protected $script_name; protected $vacation = []; - #[Override] + #[\Override] public function actions() { $error = $this->start('vacation'); @@ -66,7 +66,7 @@ public function actions() * * @return int Connection status: 0 on success, >0 on failure */ - #[Override] + #[\Override] protected function load_script($script_name = null) { if ($this->script_name !== null) { @@ -878,7 +878,7 @@ public function set_vacation($data) /** * API: connect to managesieve server */ - #[Override] + #[\Override] public function connect($username, $password) { $error = parent::connect($username, $password); diff --git a/plugins/managesieve/managesieve.php b/plugins/managesieve/managesieve.php index 9bdd36ad2d2..fe070100a34 100644 --- a/plugins/managesieve/managesieve.php +++ b/plugins/managesieve/managesieve.php @@ -47,7 +47,7 @@ class managesieve extends rcube_plugin /** * Plugin initialization */ - #[Override] + #[\Override] public function init() { $this->rc = rcube::get_instance(); diff --git a/plugins/markasjunk/markasjunk.php b/plugins/markasjunk/markasjunk.php index fdddc289dee..c525fb23229 100644 --- a/plugins/markasjunk/markasjunk.php +++ b/plugins/markasjunk/markasjunk.php @@ -53,7 +53,7 @@ class markasjunk extends rcube_plugin /** * Plugin initialization */ - #[Override] + #[\Override] public function init() { $this->register_action('plugin.markasjunk.junk', [$this, 'mark_message']); diff --git a/plugins/new_user_dialog/new_user_dialog.php b/plugins/new_user_dialog/new_user_dialog.php index 40df71b6180..c74b15c7e9f 100644 --- a/plugins/new_user_dialog/new_user_dialog.php +++ b/plugins/new_user_dialog/new_user_dialog.php @@ -23,7 +23,7 @@ class new_user_dialog extends rcube_plugin public $task = ''; public $noframe = true; - #[Override] + #[\Override] public function init() { $this->add_hook('identity_create', [$this, 'create_identity']); diff --git a/plugins/new_user_identity/new_user_identity.php b/plugins/new_user_identity/new_user_identity.php index f32981c484a..31dda5ba247 100644 --- a/plugins/new_user_identity/new_user_identity.php +++ b/plugins/new_user_identity/new_user_identity.php @@ -25,7 +25,7 @@ class new_user_identity extends rcube_plugin /** * Plugin initialization. API hooks binding. */ - #[Override] + #[\Override] public function init() { $this->rc = rcmail::get_instance(); diff --git a/plugins/newmail_notifier/newmail_notifier.php b/plugins/newmail_notifier/newmail_notifier.php index 1f7e1e0af0f..af03f951af6 100644 --- a/plugins/newmail_notifier/newmail_notifier.php +++ b/plugins/newmail_notifier/newmail_notifier.php @@ -46,7 +46,7 @@ class newmail_notifier extends rcube_plugin /** * Plugin initialization */ - #[Override] + #[\Override] public function init() { $this->rc = rcmail::get_instance(); diff --git a/plugins/password/drivers/ldap_exop.php b/plugins/password/drivers/ldap_exop.php index 3a05c863fe1..30bc541feec 100644 --- a/plugins/password/drivers/ldap_exop.php +++ b/plugins/password/drivers/ldap_exop.php @@ -35,7 +35,7 @@ class rcube_ldap_exop_password extends rcube_ldap_simple_password { - #[Override] + #[\Override] public function save($curpass, $passwd) { if (!function_exists('ldap_exop_passwd')) { diff --git a/plugins/password/drivers/ldap_samba_ad.php b/plugins/password/drivers/ldap_samba_ad.php index 7c64fab08de..32d3a32f5cf 100644 --- a/plugins/password/drivers/ldap_samba_ad.php +++ b/plugins/password/drivers/ldap_samba_ad.php @@ -36,7 +36,7 @@ class rcube_ldap_samba_ad_password extends rcube_ldap_simple_password { - #[Override] + #[\Override] public function save($curpass, $passwd) { if (!function_exists('ldap_mod_replace')) { diff --git a/plugins/password/password.php b/plugins/password/password.php index eb877084810..dc6108abdbd 100644 --- a/plugins/password/password.php +++ b/plugins/password/password.php @@ -61,7 +61,7 @@ class password extends rcube_plugin private $drivers = []; private $rc; - #[Override] + #[\Override] public function init() { $this->rc = rcmail::get_instance(); diff --git a/plugins/reconnect/reconnect.php b/plugins/reconnect/reconnect.php index f1787e8c80f..d1c86022589 100644 --- a/plugins/reconnect/reconnect.php +++ b/plugins/reconnect/reconnect.php @@ -19,7 +19,7 @@ class reconnect extends rcube_plugin /** * Plugin initialization */ - #[Override] + #[\Override] public function init() { $this->add_hook('storage_connect', [$this, 'storage_connect']); diff --git a/plugins/redundant_attachments/redundant_attachments.php b/plugins/redundant_attachments/redundant_attachments.php index aeb78601392..f846ce28ac4 100644 --- a/plugins/redundant_attachments/redundant_attachments.php +++ b/plugins/redundant_attachments/redundant_attachments.php @@ -101,7 +101,7 @@ private function _key($args) /** * Save a newly uploaded attachment */ - #[Override] + #[\Override] public function upload($args) { $args = parent::upload($args); @@ -128,7 +128,7 @@ public function upload($args) /** * Save an attachment from a non-upload source (draft or forward) */ - #[Override] + #[\Override] public function save($args) { $args = parent::save($args); @@ -160,7 +160,7 @@ public function save($args) * Remove an attachment from storage * This is triggered by the remove attachment button on the compose screen */ - #[Override] + #[\Override] public function remove($args) { parent::remove($args); @@ -185,7 +185,7 @@ public function remove($args) * For this plugin, $this->get() will check the file and * return it's contents */ - #[Override] + #[\Override] public function display($args) { return $this->get($args); @@ -195,7 +195,7 @@ public function display($args) * When displaying or sending the attachment the file contents are fetched * using this method. This is also called by the attachment_display hook. */ - #[Override] + #[\Override] public function get($args) { // attempt to get file from local file system @@ -226,7 +226,7 @@ public function get($args) /** * Delete all temp files associated with this user */ - #[Override] + #[\Override] public function cleanup($args) { $this->_load_drivers(); diff --git a/plugins/show_additional_headers/show_additional_headers.php b/plugins/show_additional_headers/show_additional_headers.php index 7d8cb08fa78..9341f373203 100644 --- a/plugins/show_additional_headers/show_additional_headers.php +++ b/plugins/show_additional_headers/show_additional_headers.php @@ -22,7 +22,7 @@ class show_additional_headers extends rcube_plugin /** * Plugin initialization */ - #[Override] + #[\Override] public function init() { $rcmail = rcmail::get_instance(); diff --git a/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php b/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php index 76134983ece..a7caaf06908 100644 --- a/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php +++ b/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php @@ -21,7 +21,7 @@ class squirrelmail_usercopy extends rcube_plugin private $identities_level = 0; private $abook = []; - #[Override] + #[\Override] public function init() { $this->add_hook('user_create', [$this, 'create_user']); diff --git a/plugins/subscriptions_option/subscriptions_option.php b/plugins/subscriptions_option/subscriptions_option.php index 3df170cc2b1..29a64a4cd96 100644 --- a/plugins/subscriptions_option/subscriptions_option.php +++ b/plugins/subscriptions_option/subscriptions_option.php @@ -36,7 +36,7 @@ class subscriptions_option extends rcube_plugin /** * Plugin initialization */ - #[Override] + #[\Override] public function init() { $dont_override = rcmail::get_instance()->config->get('dont_override', []); diff --git a/plugins/userinfo/userinfo.php b/plugins/userinfo/userinfo.php index fb4421cb3dc..a9f9aa7d3ba 100644 --- a/plugins/userinfo/userinfo.php +++ b/plugins/userinfo/userinfo.php @@ -16,7 +16,7 @@ class userinfo extends rcube_plugin public $noajax = true; public $noframe = true; - #[Override] + #[\Override] public function init() { $this->add_texts('localization/', ['userinfo']); diff --git a/plugins/vcard_attachments/vcard_attachments.php b/plugins/vcard_attachments/vcard_attachments.php index ea39c20cdc6..1e6007bf6f0 100644 --- a/plugins/vcard_attachments/vcard_attachments.php +++ b/plugins/vcard_attachments/vcard_attachments.php @@ -30,7 +30,7 @@ class vcard_attachments extends rcube_plugin /** * Plugin initialization */ - #[Override] + #[\Override] public function init() { $rcmail = rcmail::get_instance(); diff --git a/plugins/virtuser_file/virtuser_file.php b/plugins/virtuser_file/virtuser_file.php index 2c982f5e832..2a2c195bd63 100644 --- a/plugins/virtuser_file/virtuser_file.php +++ b/plugins/virtuser_file/virtuser_file.php @@ -23,7 +23,7 @@ class virtuser_file extends rcube_plugin /** * Plugin initialization */ - #[Override] + #[\Override] public function init() { $this->app = rcmail::get_instance(); diff --git a/plugins/virtuser_query/virtuser_query.php b/plugins/virtuser_query/virtuser_query.php index ec9b088f423..63abf43c1c1 100644 --- a/plugins/virtuser_query/virtuser_query.php +++ b/plugins/virtuser_query/virtuser_query.php @@ -36,7 +36,7 @@ class virtuser_query extends rcube_plugin private $app; private $db; - #[Override] + #[\Override] public function init() { $this->app = rcmail::get_instance(); diff --git a/plugins/zipdownload/zipdownload.php b/plugins/zipdownload/zipdownload.php index fd647298f5c..8847503084c 100644 --- a/plugins/zipdownload/zipdownload.php +++ b/plugins/zipdownload/zipdownload.php @@ -37,7 +37,7 @@ class zipdownload extends rcube_plugin /** * Plugin initialization */ - #[Override] + #[\Override] public function init() { // check requirements first @@ -398,8 +398,8 @@ private function _filename_from_subject($str) class zipdownload_mbox_filter extends \php_user_filter { - #[Override] - #[ReturnTypeWillChange] + #[\Override] + #[\ReturnTypeWillChange] public function filter($in, $out, &$consumed, $closing) { while ($bucket = stream_bucket_make_writeable($in)) { diff --git a/program/actions/contacts/copy.php b/program/actions/contacts/copy.php index 84a72d6a702..8cbf0c54849 100644 --- a/program/actions/contacts/copy.php +++ b/program/actions/contacts/copy.php @@ -33,7 +33,7 @@ class rcmail_action_contacts_copy extends rcmail_action_contacts_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/contacts/delete.php b/program/actions/contacts/delete.php index 1da3cde2a43..e3a6c4ccf83 100644 --- a/program/actions/contacts/delete.php +++ b/program/actions/contacts/delete.php @@ -35,7 +35,7 @@ class rcmail_action_contacts_delete extends rcmail_action_contacts_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/contacts/edit.php b/program/actions/contacts/edit.php index 803a2dab150..be6b8793c8d 100644 --- a/program/actions/contacts/edit.php +++ b/program/actions/contacts/edit.php @@ -31,7 +31,7 @@ class rcmail_action_contacts_edit extends rcmail_action_contacts_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); @@ -217,7 +217,7 @@ public static function upload_photo_form($attrib) * * @todo: Use rcmail_action::get_form_tags() */ - #[Override] + #[\Override] public static function get_form_tags($attrib, $action = null, $id = null, $hidden = null) { static $edit_form; diff --git a/program/actions/contacts/export.php b/program/actions/contacts/export.php index 5b983cf428a..d20408dc2fb 100644 --- a/program/actions/contacts/export.php +++ b/program/actions/contacts/export.php @@ -34,7 +34,7 @@ class rcmail_action_contacts_export extends rcmail_action_contacts_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/contacts/group_addmembers.php b/program/actions/contacts/group_addmembers.php index 94c98d7f542..f3e93e5f50d 100644 --- a/program/actions/contacts/group_addmembers.php +++ b/program/actions/contacts/group_addmembers.php @@ -32,7 +32,7 @@ class rcmail_action_contacts_group_addmembers extends rcmail_action_contacts_ind * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/contacts/group_create.php b/program/actions/contacts/group_create.php index 9a6fa35c37e..1fb67e48822 100644 --- a/program/actions/contacts/group_create.php +++ b/program/actions/contacts/group_create.php @@ -32,7 +32,7 @@ class rcmail_action_contacts_group_create extends rcmail_action_contacts_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/contacts/group_delete.php b/program/actions/contacts/group_delete.php index 4b9fb02e623..09e0b25edfc 100644 --- a/program/actions/contacts/group_delete.php +++ b/program/actions/contacts/group_delete.php @@ -32,7 +32,7 @@ class rcmail_action_contacts_group_delete extends rcmail_action_contacts_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/contacts/group_delmembers.php b/program/actions/contacts/group_delmembers.php index 28c545dd69a..51a4e88f862 100644 --- a/program/actions/contacts/group_delmembers.php +++ b/program/actions/contacts/group_delmembers.php @@ -32,7 +32,7 @@ class rcmail_action_contacts_group_delmembers extends rcmail_action_contacts_ind * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/contacts/group_rename.php b/program/actions/contacts/group_rename.php index 7c955384149..47a80ee58df 100644 --- a/program/actions/contacts/group_rename.php +++ b/program/actions/contacts/group_rename.php @@ -32,7 +32,7 @@ class rcmail_action_contacts_group_rename extends rcmail_action_contacts_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/contacts/import.php b/program/actions/contacts/import.php index 8072306a4ef..e378c9f9e16 100644 --- a/program/actions/contacts/import.php +++ b/program/actions/contacts/import.php @@ -44,7 +44,7 @@ class rcmail_action_contacts_import extends rcmail_action_contacts_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/contacts/index.php b/program/actions/contacts/index.php index d7376a75a0a..cfe453bad56 100644 --- a/program/actions/contacts/index.php +++ b/program/actions/contacts/index.php @@ -263,7 +263,7 @@ class rcmail_action_contacts_index extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/contacts/list.php b/program/actions/contacts/list.php index 15fa248a929..f6a217a6353 100644 --- a/program/actions/contacts/list.php +++ b/program/actions/contacts/list.php @@ -32,7 +32,7 @@ class rcmail_action_contacts_list extends rcmail_action_contacts_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/contacts/mailto.php b/program/actions/contacts/mailto.php index 9f17717e886..23909278876 100644 --- a/program/actions/contacts/mailto.php +++ b/program/actions/contacts/mailto.php @@ -33,7 +33,7 @@ class rcmail_action_contacts_mailto extends rcmail_action_contacts_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/contacts/move.php b/program/actions/contacts/move.php index f9b28b21773..3eb6950aeb8 100644 --- a/program/actions/contacts/move.php +++ b/program/actions/contacts/move.php @@ -34,7 +34,7 @@ class rcmail_action_contacts_move extends rcmail_action_contacts_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $cids = self::get_cids(); diff --git a/program/actions/contacts/photo.php b/program/actions/contacts/photo.php index e974da6906e..a050b703c5e 100644 --- a/program/actions/contacts/photo.php +++ b/program/actions/contacts/photo.php @@ -34,7 +34,7 @@ class rcmail_action_contacts_photo extends rcmail_action_contacts_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/contacts/print.php b/program/actions/contacts/print.php index bb84da839ec..43f9d76f59e 100644 --- a/program/actions/contacts/print.php +++ b/program/actions/contacts/print.php @@ -33,7 +33,7 @@ class rcmail_action_contacts_print extends rcmail_action_contacts_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/contacts/qrcode.php b/program/actions/contacts/qrcode.php index 584bbb19888..391167b0d80 100644 --- a/program/actions/contacts/qrcode.php +++ b/program/actions/contacts/qrcode.php @@ -36,7 +36,7 @@ class rcmail_action_contacts_qrcode extends rcmail_action_contacts_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { // Get contact ID and source ID from request diff --git a/program/actions/contacts/save.php b/program/actions/contacts/save.php index 2f5ed68dd0f..6ab59b22aaf 100644 --- a/program/actions/contacts/save.php +++ b/program/actions/contacts/save.php @@ -34,7 +34,7 @@ class rcmail_action_contacts_save extends rcmail_action_contacts_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/contacts/search.php b/program/actions/contacts/search.php index 6d6124ab038..02145a5e217 100644 --- a/program/actions/contacts/search.php +++ b/program/actions/contacts/search.php @@ -37,7 +37,7 @@ class rcmail_action_contacts_search extends rcmail_action_contacts_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/contacts/search_create.php b/program/actions/contacts/search_create.php index decb34fca1b..b24b631282f 100644 --- a/program/actions/contacts/search_create.php +++ b/program/actions/contacts/search_create.php @@ -36,7 +36,7 @@ class rcmail_action_contacts_search_create extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/contacts/search_delete.php b/program/actions/contacts/search_delete.php index 14a8bb8644f..5f0f78f595d 100644 --- a/program/actions/contacts/search_delete.php +++ b/program/actions/contacts/search_delete.php @@ -35,7 +35,7 @@ class rcmail_action_contacts_search_delete extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/contacts/show.php b/program/actions/contacts/show.php index 2b0c8330888..3f82c3f29e3 100644 --- a/program/actions/contacts/show.php +++ b/program/actions/contacts/show.php @@ -37,7 +37,7 @@ class rcmail_action_contacts_show extends rcmail_action_contacts_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/contacts/undo.php b/program/actions/contacts/undo.php index bf9abc7727d..88a575073ad 100644 --- a/program/actions/contacts/undo.php +++ b/program/actions/contacts/undo.php @@ -30,7 +30,7 @@ class rcmail_action_contacts_undo extends rcmail_action_contacts_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/contacts/upload_photo.php b/program/actions/contacts/upload_photo.php index c5fc6978671..e8dacf678e4 100644 --- a/program/actions/contacts/upload_photo.php +++ b/program/actions/contacts/upload_photo.php @@ -38,7 +38,7 @@ class rcmail_action_contacts_upload_photo extends rcmail_action_contacts_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/login/oauth.php b/program/actions/login/oauth.php index 637bc1328c4..143ffb3fe7b 100644 --- a/program/actions/login/oauth.php +++ b/program/actions/login/oauth.php @@ -29,7 +29,7 @@ class rcmail_action_login_oauth extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/login/oauth_backchannel.php b/program/actions/login/oauth_backchannel.php index 69bdfff0365..ceb49036306 100644 --- a/program/actions/login/oauth_backchannel.php +++ b/program/actions/login/oauth_backchannel.php @@ -34,7 +34,7 @@ class rcmail_action_login_oauth_backchannel extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/mail/addcontact.php b/program/actions/mail/addcontact.php index 26036c76396..266170d448a 100644 --- a/program/actions/mail/addcontact.php +++ b/program/actions/mail/addcontact.php @@ -34,7 +34,7 @@ class rcmail_action_mail_addcontact extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/mail/attachment_delete.php b/program/actions/mail/attachment_delete.php index cfcba18ffda..f15e1820798 100644 --- a/program/actions/mail/attachment_delete.php +++ b/program/actions/mail/attachment_delete.php @@ -31,7 +31,7 @@ class rcmail_action_mail_attachment_delete extends rcmail_action_mail_attachment * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { self::init(); diff --git a/program/actions/mail/attachment_display.php b/program/actions/mail/attachment_display.php index 5ed03baa8ee..1b906106bdd 100644 --- a/program/actions/mail/attachment_display.php +++ b/program/actions/mail/attachment_display.php @@ -30,7 +30,7 @@ class rcmail_action_mail_attachment_display extends rcmail_action_mail_attachmen * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { self::init(); diff --git a/program/actions/mail/attachment_rename.php b/program/actions/mail/attachment_rename.php index 421d6ef1d4e..fb6ebf25932 100644 --- a/program/actions/mail/attachment_rename.php +++ b/program/actions/mail/attachment_rename.php @@ -32,7 +32,7 @@ class rcmail_action_mail_attachment_rename extends rcmail_action_mail_attachment * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/mail/attachment_upload.php b/program/actions/mail/attachment_upload.php index 135ac813416..a3f6a28c90e 100644 --- a/program/actions/mail/attachment_upload.php +++ b/program/actions/mail/attachment_upload.php @@ -43,7 +43,7 @@ class rcmail_action_mail_attachment_upload extends rcmail_action_mail_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/mail/autocomplete.php b/program/actions/mail/autocomplete.php index 62f9349882c..78c5af6865e 100644 --- a/program/actions/mail/autocomplete.php +++ b/program/actions/mail/autocomplete.php @@ -34,7 +34,7 @@ class rcmail_action_mail_autocomplete extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/mail/bounce.php b/program/actions/mail/bounce.php index ef9efd037f5..ed559324a6b 100644 --- a/program/actions/mail/bounce.php +++ b/program/actions/mail/bounce.php @@ -37,7 +37,7 @@ class rcmail_action_mail_bounce extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/mail/check_recent.php b/program/actions/mail/check_recent.php index 4c8834f4518..c3ca7ad5382 100644 --- a/program/actions/mail/check_recent.php +++ b/program/actions/mail/check_recent.php @@ -32,7 +32,7 @@ class rcmail_action_mail_check_recent extends rcmail_action_mail_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/mail/compose.php b/program/actions/mail/compose.php index 47b37d17233..b2ae1a5f15a 100644 --- a/program/actions/mail/compose.php +++ b/program/actions/mail/compose.php @@ -55,7 +55,7 @@ class rcmail_action_mail_compose extends rcmail_action_mail_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/mail/copy.php b/program/actions/mail/copy.php index e30978a7127..ecd1592c958 100644 --- a/program/actions/mail/copy.php +++ b/program/actions/mail/copy.php @@ -32,7 +32,7 @@ class rcmail_action_mail_copy extends rcmail_action_mail_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/mail/delete.php b/program/actions/mail/delete.php index 2604fee8032..c2f16022a60 100644 --- a/program/actions/mail/delete.php +++ b/program/actions/mail/delete.php @@ -32,7 +32,7 @@ class rcmail_action_mail_delete extends rcmail_action_mail_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/mail/folder_expunge.php b/program/actions/mail/folder_expunge.php index 162c1829186..9ab10edf1db 100644 --- a/program/actions/mail/folder_expunge.php +++ b/program/actions/mail/folder_expunge.php @@ -32,7 +32,7 @@ class rcmail_action_mail_folder_expunge extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/mail/folder_purge.php b/program/actions/mail/folder_purge.php index bc7c9d7c109..be6f984e0e2 100644 --- a/program/actions/mail/folder_purge.php +++ b/program/actions/mail/folder_purge.php @@ -32,7 +32,7 @@ class rcmail_action_mail_folder_purge extends rcmail_action_mail_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/mail/get.php b/program/actions/mail/get.php index eef81feee14..faf7662009a 100644 --- a/program/actions/mail/get.php +++ b/program/actions/mail/get.php @@ -39,7 +39,7 @@ class rcmail_action_mail_get extends rcmail_action_mail_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/mail/getunread.php b/program/actions/mail/getunread.php index b958aa66e4a..6ddc209d8bd 100644 --- a/program/actions/mail/getunread.php +++ b/program/actions/mail/getunread.php @@ -31,7 +31,7 @@ class rcmail_action_mail_getunread extends rcmail_action_mail_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/mail/group_expand.php b/program/actions/mail/group_expand.php index c200ea48309..543dc29c422 100644 --- a/program/actions/mail/group_expand.php +++ b/program/actions/mail/group_expand.php @@ -33,7 +33,7 @@ class rcmail_action_mail_group_expand extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/mail/headers.php b/program/actions/mail/headers.php index c248618d8d1..3b20154a49c 100644 --- a/program/actions/mail/headers.php +++ b/program/actions/mail/headers.php @@ -34,7 +34,7 @@ class rcmail_action_mail_headers extends rcmail_action_mail_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/mail/import.php b/program/actions/mail/import.php index 6df555a7a7e..bc683108675 100644 --- a/program/actions/mail/import.php +++ b/program/actions/mail/import.php @@ -35,7 +35,7 @@ class rcmail_action_mail_import extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/mail/index.php b/program/actions/mail/index.php index 702f8b66bcc..93278e854dc 100644 --- a/program/actions/mail/index.php +++ b/program/actions/mail/index.php @@ -63,7 +63,7 @@ class rcmail_action_mail_index extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/mail/list.php b/program/actions/mail/list.php index 44cf777cb0a..d14c318a9b0 100644 --- a/program/actions/mail/list.php +++ b/program/actions/mail/list.php @@ -31,7 +31,7 @@ class rcmail_action_mail_list extends rcmail_action_mail_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/mail/list_contacts.php b/program/actions/mail/list_contacts.php index eec7fbb575f..a004169450c 100644 --- a/program/actions/mail/list_contacts.php +++ b/program/actions/mail/list_contacts.php @@ -36,7 +36,7 @@ class rcmail_action_mail_list_contacts extends rcmail_action_mail_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/mail/mark.php b/program/actions/mail/mark.php index 6a17443614c..d525c4617ab 100644 --- a/program/actions/mail/mark.php +++ b/program/actions/mail/mark.php @@ -31,7 +31,7 @@ class rcmail_action_mail_mark extends rcmail_action_mail_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/mail/move.php b/program/actions/mail/move.php index c8d63de4735..faa6609876e 100644 --- a/program/actions/mail/move.php +++ b/program/actions/mail/move.php @@ -32,7 +32,7 @@ class rcmail_action_mail_move extends rcmail_action_mail_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/mail/pagenav.php b/program/actions/mail/pagenav.php index 56e9f8b8377..aab2078994d 100644 --- a/program/actions/mail/pagenav.php +++ b/program/actions/mail/pagenav.php @@ -31,7 +31,7 @@ class rcmail_action_mail_pagenav extends rcmail_action_mail_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/mail/search.php b/program/actions/mail/search.php index e6e11c63fd9..f19e20002f0 100644 --- a/program/actions/mail/search.php +++ b/program/actions/mail/search.php @@ -33,7 +33,7 @@ class rcmail_action_mail_search extends rcmail_action_mail_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/mail/search_contacts.php b/program/actions/mail/search_contacts.php index 1a293f45a5e..93317d74711 100644 --- a/program/actions/mail/search_contacts.php +++ b/program/actions/mail/search_contacts.php @@ -35,7 +35,7 @@ class rcmail_action_mail_search_contacts extends rcmail_action_mail_list_contact * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/mail/send.php b/program/actions/mail/send.php index 547e8d70bf7..c89f122d684 100644 --- a/program/actions/mail/send.php +++ b/program/actions/mail/send.php @@ -33,7 +33,7 @@ class rcmail_action_mail_send extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/mail/sendmdn.php b/program/actions/mail/sendmdn.php index fb612b4f642..35ba1641c0e 100644 --- a/program/actions/mail/sendmdn.php +++ b/program/actions/mail/sendmdn.php @@ -35,7 +35,7 @@ class rcmail_action_mail_sendmdn extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/mail/show.php b/program/actions/mail/show.php index 7a7c55c55af..8d9cc029fe6 100644 --- a/program/actions/mail/show.php +++ b/program/actions/mail/show.php @@ -43,7 +43,7 @@ class rcmail_action_mail_show extends rcmail_action_mail_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/mail/viewsource.php b/program/actions/mail/viewsource.php index 3b6017c5470..5c64b73fc97 100644 --- a/program/actions/mail/viewsource.php +++ b/program/actions/mail/viewsource.php @@ -32,7 +32,7 @@ class rcmail_action_mail_viewsource extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/settings/about.php b/program/actions/settings/about.php index dba89534bda..bcf107ba992 100644 --- a/program/actions/settings/about.php +++ b/program/actions/settings/about.php @@ -34,7 +34,7 @@ class rcmail_action_settings_about extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/settings/folder_delete.php b/program/actions/settings/folder_delete.php index a47009bed78..b4a620db46a 100644 --- a/program/actions/settings/folder_delete.php +++ b/program/actions/settings/folder_delete.php @@ -32,7 +32,7 @@ class rcmail_action_settings_folder_delete extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/settings/folder_edit.php b/program/actions/settings/folder_edit.php index a85ffbd081a..e88fe8d0917 100644 --- a/program/actions/settings/folder_edit.php +++ b/program/actions/settings/folder_edit.php @@ -40,7 +40,7 @@ class rcmail_action_settings_folder_edit extends rcmail_action_settings_folders * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/settings/folder_purge.php b/program/actions/settings/folder_purge.php index 3d2e8b8fc5c..68ca5aef866 100644 --- a/program/actions/settings/folder_purge.php +++ b/program/actions/settings/folder_purge.php @@ -32,7 +32,7 @@ class rcmail_action_settings_folder_purge extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/settings/folder_rename.php b/program/actions/settings/folder_rename.php index 11d2c335934..ee22ccd6f64 100644 --- a/program/actions/settings/folder_rename.php +++ b/program/actions/settings/folder_rename.php @@ -32,7 +32,7 @@ class rcmail_action_settings_folder_rename extends rcmail_action_settings_folder * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/settings/folder_save.php b/program/actions/settings/folder_save.php index 3001f867e3c..2894d3d2ede 100644 --- a/program/actions/settings/folder_save.php +++ b/program/actions/settings/folder_save.php @@ -33,7 +33,7 @@ class rcmail_action_settings_folder_save extends rcmail_action_settings_folder_e * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { // WARNING: folder names in UI are encoded with RCUBE_CHARSET diff --git a/program/actions/settings/folder_size.php b/program/actions/settings/folder_size.php index a218b6cecc5..bdad9b04124 100644 --- a/program/actions/settings/folder_size.php +++ b/program/actions/settings/folder_size.php @@ -32,7 +32,7 @@ class rcmail_action_settings_folder_size extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/settings/folder_subscribe.php b/program/actions/settings/folder_subscribe.php index 48070ec44cb..569836f995a 100644 --- a/program/actions/settings/folder_subscribe.php +++ b/program/actions/settings/folder_subscribe.php @@ -33,7 +33,7 @@ class rcmail_action_settings_folder_subscribe extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/settings/folder_unsubscribe.php b/program/actions/settings/folder_unsubscribe.php index 1014a4a4db0..87275a59bd5 100644 --- a/program/actions/settings/folder_unsubscribe.php +++ b/program/actions/settings/folder_unsubscribe.php @@ -32,7 +32,7 @@ class rcmail_action_settings_folder_unsubscribe extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/settings/folders.php b/program/actions/settings/folders.php index d5926502ecf..eef87d857c4 100644 --- a/program/actions/settings/folders.php +++ b/program/actions/settings/folders.php @@ -38,7 +38,7 @@ class rcmail_action_settings_folders extends rcmail_action_settings_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/settings/identities.php b/program/actions/settings/identities.php index 0b6191c6b75..b0206eaf4d3 100644 --- a/program/actions/settings/identities.php +++ b/program/actions/settings/identities.php @@ -31,7 +31,7 @@ class rcmail_action_settings_identities extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/settings/identity_delete.php b/program/actions/settings/identity_delete.php index 62926276957..2920b99889f 100644 --- a/program/actions/settings/identity_delete.php +++ b/program/actions/settings/identity_delete.php @@ -31,7 +31,7 @@ class rcmail_action_settings_identity_delete extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/settings/identity_edit.php b/program/actions/settings/identity_edit.php index 4c4eb69f8d1..fe785009742 100644 --- a/program/actions/settings/identity_edit.php +++ b/program/actions/settings/identity_edit.php @@ -36,7 +36,7 @@ class rcmail_action_settings_identity_edit extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/settings/identity_save.php b/program/actions/settings/identity_save.php index b19c4d0e878..87245c8a717 100644 --- a/program/actions/settings/identity_save.php +++ b/program/actions/settings/identity_save.php @@ -33,7 +33,7 @@ class rcmail_action_settings_identity_save extends rcmail_action_settings_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/settings/index.php b/program/actions/settings/index.php index 918fd684bf8..82d45dce122 100644 --- a/program/actions/settings/index.php +++ b/program/actions/settings/index.php @@ -65,7 +65,7 @@ class rcmail_action_settings_index extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/settings/prefs_edit.php b/program/actions/settings/prefs_edit.php index 3d414f62229..655cf90064b 100644 --- a/program/actions/settings/prefs_edit.php +++ b/program/actions/settings/prefs_edit.php @@ -35,7 +35,7 @@ class rcmail_action_settings_prefs_edit extends rcmail_action_settings_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/settings/prefs_save.php b/program/actions/settings/prefs_save.php index 9ccfd5d5848..7b40f34d64a 100644 --- a/program/actions/settings/prefs_save.php +++ b/program/actions/settings/prefs_save.php @@ -33,7 +33,7 @@ class rcmail_action_settings_prefs_save extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/settings/response_delete.php b/program/actions/settings/response_delete.php index 9d60fb3f7d4..a2221618a60 100644 --- a/program/actions/settings/response_delete.php +++ b/program/actions/settings/response_delete.php @@ -31,7 +31,7 @@ class rcmail_action_settings_response_delete extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/settings/response_edit.php b/program/actions/settings/response_edit.php index de2286fb157..1d98265137e 100644 --- a/program/actions/settings/response_edit.php +++ b/program/actions/settings/response_edit.php @@ -36,7 +36,7 @@ class rcmail_action_settings_response_edit extends rcmail_action_settings_respon * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/settings/response_get.php b/program/actions/settings/response_get.php index ea594125122..0a0c6efc955 100644 --- a/program/actions/settings/response_get.php +++ b/program/actions/settings/response_get.php @@ -32,7 +32,7 @@ class rcmail_action_settings_response_get extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/settings/response_save.php b/program/actions/settings/response_save.php index bf189aa2ef6..64b9746718e 100644 --- a/program/actions/settings/response_save.php +++ b/program/actions/settings/response_save.php @@ -32,7 +32,7 @@ class rcmail_action_settings_response_save extends rcmail_action_settings_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/settings/responses.php b/program/actions/settings/responses.php index 43b2dc66880..f7fae0532e0 100644 --- a/program/actions/settings/responses.php +++ b/program/actions/settings/responses.php @@ -30,7 +30,7 @@ class rcmail_action_settings_responses extends rcmail_action_settings_index * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/settings/upload.php b/program/actions/settings/upload.php index 734dd60a05e..b7ae3777d62 100644 --- a/program/actions/settings/upload.php +++ b/program/actions/settings/upload.php @@ -33,7 +33,7 @@ class rcmail_action_settings_upload extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/settings/upload_display.php b/program/actions/settings/upload_display.php index 817b4ba1704..4ee74da60f0 100644 --- a/program/actions/settings/upload_display.php +++ b/program/actions/settings/upload_display.php @@ -30,7 +30,7 @@ class rcmail_action_settings_upload_display extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { if (!empty($_GET['_file']) && preg_match('/^rcmfile(\w+)$/', $_GET['_file'], $regs)) { diff --git a/program/actions/utils/error.php b/program/actions/utils/error.php index 6fa1956ad02..c0eee987536 100644 --- a/program/actions/utils/error.php +++ b/program/actions/utils/error.php @@ -30,7 +30,7 @@ class rcmail_action_utils_error extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/utils/html2text.php b/program/actions/utils/html2text.php index 1b2d10dcd49..716160a995f 100644 --- a/program/actions/utils/html2text.php +++ b/program/actions/utils/html2text.php @@ -31,7 +31,7 @@ class rcmail_action_utils_html2text extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $html = file_get_contents(self::$source); diff --git a/program/actions/utils/killcache.php b/program/actions/utils/killcache.php index 8ff455e2bf4..e97dc335a92 100644 --- a/program/actions/utils/killcache.php +++ b/program/actions/utils/killcache.php @@ -28,7 +28,7 @@ class rcmail_action_utils_killcache extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/utils/modcss.php b/program/actions/utils/modcss.php index ddb0d22cdaf..f87c137af2f 100644 --- a/program/actions/utils/modcss.php +++ b/program/actions/utils/modcss.php @@ -31,7 +31,7 @@ class rcmail_action_utils_modcss extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/utils/save_pref.php b/program/actions/utils/save_pref.php index c3db93bc257..e8e446bfb50 100644 --- a/program/actions/utils/save_pref.php +++ b/program/actions/utils/save_pref.php @@ -33,7 +33,7 @@ class rcmail_action_utils_save_pref extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/utils/spell.php b/program/actions/utils/spell.php index cd7ca157af8..95e00a6ae5d 100644 --- a/program/actions/utils/spell.php +++ b/program/actions/utils/spell.php @@ -33,7 +33,7 @@ class rcmail_action_utils_spell extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { // read input diff --git a/program/actions/utils/spell_html.php b/program/actions/utils/spell_html.php index 121b6462d4f..b911e549a1b 100644 --- a/program/actions/utils/spell_html.php +++ b/program/actions/utils/spell_html.php @@ -34,7 +34,7 @@ class rcmail_action_utils_spell_html extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $rcmail = rcmail::get_instance(); diff --git a/program/actions/utils/text2html.php b/program/actions/utils/text2html.php index 74177de52d2..70c8c386ba6 100644 --- a/program/actions/utils/text2html.php +++ b/program/actions/utils/text2html.php @@ -31,7 +31,7 @@ class rcmail_action_utils_text2html extends rcmail_action * * @param array $args Arguments from the previous step(s) */ - #[Override] + #[\Override] public function run($args = []) { $text = file_get_contents(self::$source); diff --git a/program/include/rcmail.php b/program/include/rcmail.php index 755f7f406da..bac79a1adfb 100644 --- a/program/include/rcmail.php +++ b/program/include/rcmail.php @@ -95,7 +95,7 @@ class rcmail extends rcube * * @return rcmail The one and only instance */ - #[Override] + #[\Override] public static function get_instance($mode = 0, $env = '') { if (!self::$instance || !is_a(self::$instance, 'rcmail')) { @@ -214,7 +214,7 @@ public function set_task($task) * * @param rcube_user $user Current user instance */ - #[Override] + #[\Override] public function set_user($user) { parent::set_user($user); @@ -655,7 +655,7 @@ public function json_init() /** * Create session object and start the session. */ - #[Override] + #[\Override] public function session_init() { parent::session_init(); @@ -1085,7 +1085,7 @@ public function logout_actions() * * @return string Valid application URL */ - #[Override] + #[\Override] public function url($p, $absolute = false, $full = false, $secure = false) { if (!is_array($p)) { @@ -1186,7 +1186,7 @@ protected function get_request_path() /** * Function to be executed in script shutdown */ - #[Override] + #[\Override] public function shutdown() { parent::shutdown(); diff --git a/program/include/rcmail_html_page.php b/program/include/rcmail_html_page.php index b40244d0e2b..50dcbfa0663 100644 --- a/program/include/rcmail_html_page.php +++ b/program/include/rcmail_html_page.php @@ -34,7 +34,7 @@ class rcmail_html_page extends rcmail_output_html * * @param string $contents HTML page content */ - #[Override] + #[\Override] public function write($contents = '') { self::reset(true); diff --git a/program/include/rcmail_output.php b/program/include/rcmail_output.php index d29673fc987..80ebf53595b 100644 --- a/program/include/rcmail_output.php +++ b/program/include/rcmail_output.php @@ -97,7 +97,7 @@ public function get_skin_info($name = null) /** * Delete all stored env variables and commands */ - #[Override] + #[\Override] public function reset() { parent::reset(); diff --git a/program/include/rcmail_output_cli.php b/program/include/rcmail_output_cli.php index 5ccf6eb4680..2f590f0428f 100644 --- a/program/include/rcmail_output_cli.php +++ b/program/include/rcmail_output_cli.php @@ -32,7 +32,7 @@ class rcmail_output_cli extends rcmail_output * * @see rcube_output::command() */ - #[Override] + #[\Override] public function command($cmd, ...$args) { // NOP @@ -43,7 +43,7 @@ public function command($cmd, ...$args) * * @see rcube_output::add_label() */ - #[Override] + #[\Override] public function add_label(...$args) { // NOP @@ -54,7 +54,7 @@ public function add_label(...$args) * * @see rcube_output::show_message() */ - #[Override] + #[\Override] public function show_message($message, $type = 'notice', $vars = null, $override = true, $timeout = 0) { if ($this->app->text_exists($message)) { @@ -69,7 +69,7 @@ public function show_message($message, $type = 'notice', $vars = null, $override * * @see rcube_output::redirect() */ - #[Override] + #[\Override] public function redirect($p = [], $delay = 1) { // NOP @@ -78,7 +78,7 @@ public function redirect($p = [], $delay = 1) /** * Send output to the client. */ - #[Override] + #[\Override] public function send() { // NOP diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php index a095e8813fe..17d0a178a8f 100644 --- a/program/include/rcmail_output_html.php +++ b/program/include/rcmail_output_html.php @@ -189,7 +189,7 @@ protected function init($framed = false) * @param bool $addtojs True if this property should be added * to client environment */ - #[Override] + #[\Override] public function set_env($name, $value, $addtojs = true) { $this->env[$name] = $value; @@ -292,7 +292,7 @@ protected function get_pagetitle($full = true) /** * Getter for the current skin path property */ - #[Override] + #[\Override] public function get_skin_path() { return $this->skin_paths[0]; @@ -513,7 +513,7 @@ public function add_gui_object($obj, $id) * @param string $cmd Method to call * @param mixed ...$args Method arguments */ - #[Override] + #[\Override] public function command($cmd, ...$args) { if (strpos($cmd, 'plugin.') !== false) { @@ -530,7 +530,7 @@ public function command($cmd, ...$args) * * @param mixed ...$args Labels (an array of strings, or many string arguments) */ - #[Override] + #[\Override] public function add_label(...$args) { if (count($args) == 1 && is_array($args[0])) { @@ -553,7 +553,7 @@ public function add_label(...$args) * * @uses self::command() */ - #[Override] + #[\Override] public function show_message($message, $type = 'notice', $vars = null, $override = true, $timeout = 0) { if ($override || !$this->message) { @@ -577,7 +577,7 @@ public function show_message($message, $type = 'notice', $vars = null, $override * * @param bool $all Reset all env variables (including internal) */ - #[Override] + #[\Override] public function reset($all = false) { $framed = $this->framed; @@ -634,7 +634,7 @@ public function reset($all = false) * @param int $delay Delay in seconds * @param bool $secure Redirect to secure location (see rcmail::url()) */ - #[Override] + #[\Override] public function redirect($p = [], $delay = 1, $secure = false) { if (!empty($this->env['extwin']) && !(is_string($p) && preg_match('#^https?://#', $p))) { @@ -657,7 +657,7 @@ public function redirect($p = [], $delay = 1, $secure = false) * @param string $templ Template name * @param bool $exit True if script should terminate (default) */ - #[Override] + #[\Override] public function send($templ = null, $exit = true) { if ($templ != 'iframe') { @@ -952,7 +952,7 @@ public function abs_url($str, $search_path = false) * @param int $code Error code * @param string $message Error message */ - #[Override] + #[\Override] public function raise_error($code, $message) { $args = [ diff --git a/program/include/rcmail_output_json.php b/program/include/rcmail_output_json.php index 0efd018b5e9..fc8133dd865 100644 --- a/program/include/rcmail_output_json.php +++ b/program/include/rcmail_output_json.php @@ -59,7 +59,7 @@ public function __construct() * * @param string $title New page title */ - #[Override] + #[\Override] public function set_pagetitle($title) { if ($this->config->get('devel_mode') && !empty($_SESSION['username'])) { @@ -77,7 +77,7 @@ public function set_pagetitle($title) * @param string $obj Object name * @param callable $func Function name to call */ - #[Override] + #[\Override] public function add_handler($obj, $func) { // ignore @@ -88,7 +88,7 @@ public function add_handler($obj, $func) * * @param array $arr Hash array with object=>handler pairs */ - #[Override] + #[\Override] public function add_handlers($arr) { // ignore @@ -100,7 +100,7 @@ public function add_handlers($arr) * @param string $cmd Method to call * @param mixed ...$args Additional arguments */ - #[Override] + #[\Override] public function command($cmd, ...$args) { array_unshift($args, $cmd); @@ -117,7 +117,7 @@ public function command($cmd, ...$args) * * @param mixed ...$args Labels (an array of strings, or many string arguments) */ - #[Override] + #[\Override] public function add_label(...$args) { if (count($args) == 1 && is_array($args[0])) { @@ -140,7 +140,7 @@ public function add_label(...$args) * * @uses self::command() */ - #[Override] + #[\Override] public function show_message($message, $type = 'notice', $vars = null, $override = true, $timeout = 0) { if ($override || !$this->message) { @@ -161,7 +161,7 @@ public function show_message($message, $type = 'notice', $vars = null, $override /** * Delete all stored env variables and commands */ - #[Override] + #[\Override] public function reset() { parent::reset(); @@ -177,7 +177,7 @@ public function reset() * * @see rcmail::url() */ - #[Override] + #[\Override] public function redirect($p = [], $delay = 1) { $location = $this->app->url($p); @@ -189,7 +189,7 @@ public function redirect($p = [], $delay = 1) /** * Send an AJAX response to the client. */ - #[Override] + #[\Override] public function send() { $this->remote_response(); @@ -202,7 +202,7 @@ public function send() * @param int $code Error code * @param string $message Error message */ - #[Override] + #[\Override] public function raise_error($code, $message) { if ($code == 403) { diff --git a/program/include/rcmail_resend_mail.php b/program/include/rcmail_resend_mail.php index 26a40c8741e..7fa83bb048e 100644 --- a/program/include/rcmail_resend_mail.php +++ b/program/include/rcmail_resend_mail.php @@ -54,7 +54,7 @@ public function __construct($params = []) /** * Returns/Sets message headers */ - #[Override] + #[\Override] public function headers($headers = [], $overwrite = false, $skip_content = false) { // headers() wrapper that returns Resent-Cc, Resent-Bcc instead of Cc,Bcc @@ -74,7 +74,7 @@ public function headers($headers = [], $overwrite = false, $skip_content = false /** * Returns all message headers as string */ - #[Override] + #[\Override] public function txtHeaders($headers = [], $overwrite = false, $skip_content = false) { // i.e. add Resent-* headers on top of the original message head @@ -108,7 +108,7 @@ public function txtHeaders($headers = [], $overwrite = false, $skip_content = fa /** * Save the message body to a file (if delay_file_io=true) */ - #[Override] + #[\Override] public function saveMessageBody($file, $params = null) { $this->init_message(); @@ -168,7 +168,7 @@ class rcmail_bounce_stream_filter extends \php_user_filter protected $in_body = false; - #[Override] + #[\Override] public function onCreate(): bool { self::$headers = ''; @@ -176,8 +176,8 @@ public function onCreate(): bool return true; } - #[Override] - #[ReturnTypeWillChange] + #[\Override] + #[\ReturnTypeWillChange] public function filter($in, $out, &$consumed, $closing) { while ($bucket = stream_bucket_make_writeable($in)) { diff --git a/program/include/rcmail_string_replacer.php b/program/include/rcmail_string_replacer.php index ba8cc7070df..239ffac1c3e 100644 --- a/program/include/rcmail_string_replacer.php +++ b/program/include/rcmail_string_replacer.php @@ -41,7 +41,7 @@ class rcmail_string_replacer extends rcube_string_replacer * * @see rcube_string_replacer::mailto_callback() */ - #[Override] + #[\Override] protected function mailto_callback($matches) { $href = $matches[1]; diff --git a/program/lib/Roundcube/cache/apc.php b/program/lib/Roundcube/cache/apc.php index 9a8c36fccde..89df2a5afda 100644 --- a/program/lib/Roundcube/cache/apc.php +++ b/program/lib/Roundcube/cache/apc.php @@ -49,7 +49,7 @@ public function __construct($userid, $prefix = '', $ttl = 0, $packed = true, $in /** * Remove cache records older than ttl */ - #[Override] + #[\Override] public function expunge() { // No need for GC, entries are expunged automatically @@ -58,7 +58,7 @@ public function expunge() /** * Remove expired records of all caches */ - #[Override] + #[\Override] public static function gc() { // No need for GC, entries are expunged automatically @@ -71,7 +71,7 @@ public static function gc() * * @return mixed Cached value */ - #[Override] + #[\Override] protected function get_item($key) { if (!$this->enabled) { @@ -95,7 +95,7 @@ protected function get_item($key) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] protected function add_item($key, $data) { if (!$this->enabled) { @@ -122,7 +122,7 @@ protected function add_item($key, $data) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] protected function delete_item($key) { if (!$this->enabled) { diff --git a/program/lib/Roundcube/cache/db.php b/program/lib/Roundcube/cache/db.php index 884a469edc8..4daad882e8f 100644 --- a/program/lib/Roundcube/cache/db.php +++ b/program/lib/Roundcube/cache/db.php @@ -59,7 +59,7 @@ public function __construct($userid, $prefix = '', $ttl = 0, $packed = true, $in /** * Remove cache records older than ttl */ - #[Override] + #[\Override] public function expunge() { if ($this->ttl) { @@ -75,7 +75,7 @@ public function expunge() /** * Remove expired records of all caches */ - #[Override] + #[\Override] public static function gc() { $rcube = rcube::get_instance(); @@ -92,7 +92,7 @@ public static function gc() * * @return mixed Cached value */ - #[Override] + #[\Override] protected function read_record($key) { $sql_result = $this->db->query( @@ -127,7 +127,7 @@ protected function read_record($key) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] protected function store_record($key, $data, $ts = null) { $value = $this->serialize($data); @@ -175,7 +175,7 @@ protected function store_record($key, $data, $ts = null) * @param bool $prefix_mode Enable it to clear all keys starting * with prefix specified in $key */ - #[Override] + #[\Override] protected function remove_record($key = null, $prefix_mode = false) { // Remove all keys (in specified cache) @@ -207,7 +207,7 @@ protected function remove_record($key = null, $prefix_mode = false) /** * Serializes data for storing */ - #[Override] + #[\Override] protected function serialize($data) { return $this->db->encode($data, $this->packed); @@ -216,7 +216,7 @@ protected function serialize($data) /** * Unserializes serialized data */ - #[Override] + #[\Override] protected function unserialize($data) { return $this->db->decode($data, $this->packed); @@ -225,7 +225,7 @@ protected function unserialize($data) /** * Determine the maximum size for cache data to be written */ - #[Override] + #[\Override] protected function max_packet_size() { if ($this->max_packet < 0) { diff --git a/program/lib/Roundcube/cache/memcache.php b/program/lib/Roundcube/cache/memcache.php index b0ad7b621a4..6dce4228049 100644 --- a/program/lib/Roundcube/cache/memcache.php +++ b/program/lib/Roundcube/cache/memcache.php @@ -121,7 +121,7 @@ public static function engine() /** * Remove cache records older than ttl */ - #[Override] + #[\Override] public function expunge() { // No need for GC, entries are expunged automatically @@ -130,7 +130,7 @@ public function expunge() /** * Remove expired records of all caches */ - #[Override] + #[\Override] public static function gc() { // No need for GC, entries are expunged automatically @@ -143,7 +143,7 @@ public static function gc() * * @return mixed Cached value */ - #[Override] + #[\Override] protected function get_item($key) { if (!self::$memcache) { @@ -167,7 +167,7 @@ protected function get_item($key) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] protected function add_item($key, $data) { if (!self::$memcache) { @@ -194,7 +194,7 @@ protected function add_item($key, $data) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] protected function delete_item($key) { if (!self::$memcache) { diff --git a/program/lib/Roundcube/cache/memcached.php b/program/lib/Roundcube/cache/memcached.php index 97ecae5a480..4a588435c33 100644 --- a/program/lib/Roundcube/cache/memcached.php +++ b/program/lib/Roundcube/cache/memcached.php @@ -123,7 +123,7 @@ public static function engine() /** * Remove cache records older than ttl */ - #[Override] + #[\Override] public function expunge() { // No need for GC, entries are expunged automatically @@ -132,7 +132,7 @@ public function expunge() /** * Remove expired records of all caches */ - #[Override] + #[\Override] public static function gc() { // No need for GC, entries are expunged automatically @@ -145,7 +145,7 @@ public static function gc() * * @return mixed Cached value */ - #[Override] + #[\Override] protected function get_item($key) { if (!self::$memcache) { @@ -169,7 +169,7 @@ protected function get_item($key) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] protected function add_item($key, $data) { if (!self::$memcache) { @@ -192,7 +192,7 @@ protected function add_item($key, $data) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] protected function delete_item($key) { if (!self::$memcache) { diff --git a/program/lib/Roundcube/cache/redis.php b/program/lib/Roundcube/cache/redis.php index 79b2a656cb5..fe8acde7579 100644 --- a/program/lib/Roundcube/cache/redis.php +++ b/program/lib/Roundcube/cache/redis.php @@ -151,7 +151,7 @@ public static function engine() /** * Remove cache records older than ttl */ - #[Override] + #[\Override] public function expunge() { // No need for GC, entries are expunged automatically @@ -160,7 +160,7 @@ public function expunge() /** * Remove expired records */ - #[Override] + #[\Override] public static function gc() { // No need for GC, entries are expunged automatically @@ -173,7 +173,7 @@ public static function gc() * * @return mixed Cached value */ - #[Override] + #[\Override] protected function get_item($key) { if (!self::$redis) { @@ -202,7 +202,7 @@ protected function get_item($key) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] protected function add_item($key, $data) { if (!self::$redis) { @@ -230,7 +230,7 @@ protected function add_item($key, $data) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] protected function delete_item($key) { if (!self::$redis) { diff --git a/program/lib/Roundcube/db/mysql.php b/program/lib/Roundcube/db/mysql.php index 92a29a2c41d..11b797732a8 100644 --- a/program/lib/Roundcube/db/mysql.php +++ b/program/lib/Roundcube/db/mysql.php @@ -46,7 +46,7 @@ public function __construct($db_dsnw, $db_dsnr = '', $pconn = false) * * @return string ...$args Values to concatenate */ - #[Override] + #[\Override] public function concat(...$args) { if (count($args) == 1 && is_array($args[0])) { @@ -63,7 +63,7 @@ public function concat(...$args) * * @return string Connection string */ - #[Override] + #[\Override] protected function dsn_string($dsn) { $params = []; @@ -96,7 +96,7 @@ protected function dsn_string($dsn) * * @return array Connection options */ - #[Override] + #[\Override] protected function dsn_options($dsn) { $result = parent::dsn_options($dsn); @@ -146,7 +146,7 @@ protected function dsn_options($dsn) * * @return array List of all tables of the current database */ - #[Override] + #[\Override] public function list_tables() { // get tables if not cached @@ -168,7 +168,7 @@ public function list_tables() * * @return array List of table cols */ - #[Override] + #[\Override] public function list_cols($table) { $q = $this->query('SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS' @@ -190,7 +190,7 @@ public function list_cols($table) * * @return mixed Variable value or default */ - #[Override] + #[\Override] public function get_variable($varname, $default = null) { if (!isset($this->variables)) { @@ -235,7 +235,7 @@ public function get_variable($varname, $default = null) * * @todo Multi-insert support */ - #[Override] + #[\Override] public function insert_or_update($table, $keys, $columns, $values) { $columns = array_map(static function ($i) { diff --git a/program/lib/Roundcube/db/param.php b/program/lib/Roundcube/db/param.php index 094f1845cbb..e6f73edff42 100644 --- a/program/lib/Roundcube/db/param.php +++ b/program/lib/Roundcube/db/param.php @@ -46,7 +46,7 @@ public function __construct($db, $value, $type = null) /** * Returns the value as string for inlining into SQL query */ - #[Override] + #[\Override] public function __toString() { if ($this->type === rcube_db::TYPE_SQL) { diff --git a/program/lib/Roundcube/db/pgsql.php b/program/lib/Roundcube/db/pgsql.php index cfbdada4e12..88ec13b7db6 100644 --- a/program/lib/Roundcube/db/pgsql.php +++ b/program/lib/Roundcube/db/pgsql.php @@ -56,7 +56,7 @@ public function __construct($db_dsnw, $db_dsnr = '', $pconn = false) * @param array $dsn DSN for DB connections * @param \PDO $dbh Connection handler */ - #[Override] + #[\Override] protected function conn_configure($dsn, $dbh) { $dbh->query("SET NAMES 'utf8'"); @@ -75,7 +75,7 @@ protected function conn_configure($dsn, $dbh) * * @return mixed ID or false on failure */ - #[Override] + #[\Override] public function insert_id($table = null) { if (!$this->db_connected || $this->db_mode == 'r') { @@ -119,7 +119,7 @@ protected function sequence_name($table) * * @deprecated */ - #[Override] + #[\Override] public function unixtimestamp($field) { return "EXTRACT (EPOCH FROM {$field})"; @@ -132,7 +132,7 @@ public function unixtimestamp($field) * * @return string SQL function to use in query */ - #[Override] + #[\Override] public function now($interval = 0) { $result = 'now()'; @@ -154,7 +154,7 @@ public function now($interval = 0) * * @return string SQL statement to use in query */ - #[Override] + #[\Override] public function ilike($column, $value) { return $this->quote_identifier($column) . ' ILIKE ' . $this->quote($value); @@ -168,7 +168,7 @@ public function ilike($column, $value) * * @return mixed Variable value or default */ - #[Override] + #[\Override] public function get_variable($varname, $default = null) { // There's a known case when max_allowed_packet is queried @@ -206,7 +206,7 @@ public function get_variable($varname, $default = null) * * @todo Multi-insert support */ - #[Override] + #[\Override] public function insert_or_update($table, $keys, $columns, $values) { // Check if version >= 9.5, otherwise use fallback @@ -234,7 +234,7 @@ public function insert_or_update($table, $keys, $columns, $values) * * @return array List of all tables of the current database */ - #[Override] + #[\Override] public function list_tables() { // get tables if not cached @@ -262,7 +262,7 @@ public function list_tables() * * @return array List of table cols */ - #[Override] + #[\Override] public function list_cols($table) { $args = [$table]; @@ -291,7 +291,7 @@ public function list_cols($table) * * @return string DSN string */ - #[Override] + #[\Override] protected function dsn_string($dsn) { $params = []; @@ -327,7 +327,7 @@ protected function dsn_string($dsn) /** * Parse SQL file and fix table names according to table prefix */ - #[Override] + #[\Override] protected function fix_table_names($sql) { if (!$this->options['table_prefix']) { diff --git a/program/lib/Roundcube/db/sqlite.php b/program/lib/Roundcube/db/sqlite.php index be40b7268ac..36a69df5932 100644 --- a/program/lib/Roundcube/db/sqlite.php +++ b/program/lib/Roundcube/db/sqlite.php @@ -33,7 +33,7 @@ class rcube_db_sqlite extends rcube_db /** * Prepare connection */ - #[Override] + #[\Override] protected function conn_prepare($dsn) { // Create database file, required by PDO to exist on connection @@ -50,7 +50,7 @@ protected function conn_prepare($dsn) /** * Configure connection, create database if not exists */ - #[Override] + #[\Override] protected function conn_configure($dsn, $dbh) { // Initialize database structure in file is empty @@ -92,7 +92,7 @@ protected function conn_configure($dsn, $dbh) * * @deprecated */ - #[Override] + #[\Override] public function unixtimestamp($field) { return "strftime('%s', {$field})"; @@ -105,7 +105,7 @@ public function unixtimestamp($field) * * @return string SQL function to use in query */ - #[Override] + #[\Override] public function now($interval = 0) { $add = ''; @@ -122,7 +122,7 @@ public function now($interval = 0) * * @return array List of all tables of the current database */ - #[Override] + #[\Override] public function list_tables() { if ($this->tables === null) { @@ -142,7 +142,7 @@ public function list_tables() * * @return array List of table cols */ - #[Override] + #[\Override] public function list_cols($table) { $q = $this->query('PRAGMA table_info(?)', $table); @@ -153,7 +153,7 @@ public function list_cols($table) /** * Build DSN string for PDO constructor */ - #[Override] + #[\Override] protected function dsn_string($dsn) { return $dsn['phptype'] . ':' . $dsn['database']; @@ -166,7 +166,7 @@ protected function dsn_string($dsn) * * @return array Connection options */ - #[Override] + #[\Override] protected function dsn_options($dsn) { $result = parent::dsn_options($dsn); diff --git a/program/lib/Roundcube/html.php b/program/lib/Roundcube/html.php index eb99def4563..1df536e8cd8 100644 --- a/program/lib/Roundcube/html.php +++ b/program/lib/Roundcube/html.php @@ -441,7 +441,7 @@ public function __construct($attrib = []) * * @return string HTML output */ - #[Override] + #[\Override] public function show($value = null, $attrib = null) { // overwrite object attributes @@ -507,7 +507,7 @@ public function add($attrib) * * @return string Final HTML code */ - #[Override] + #[\Override] public function show() { $out = ''; @@ -535,7 +535,7 @@ class html_checkbox extends html_inputfield * * @return string HTML output */ - #[Override] + #[\Override] public function show($value = '', $attrib = null) { // overwrite object attributes @@ -574,7 +574,7 @@ class html_button extends html_inputfield * * @return string HTML output */ - #[Override] + #[\Override] public function show($content = '', $attrib = null) { // overwrite object attributes @@ -605,7 +605,7 @@ class html_textarea extends html * * @return string HTML output */ - #[Override] + #[\Override] public function show($value = '', $attrib = null) { // overwrite object attributes @@ -671,7 +671,7 @@ public function add($names, $values = null, $attrib = []) * * @return string HTML output */ - #[Override] + #[\Override] public function show($select = [], $attrib = null) { // overwrite object attributes @@ -894,7 +894,7 @@ public function get_row_attribs($index = null) * * @return string The final table HTML code */ - #[Override] + #[\Override] public function show($attrib = null) { if (is_array($attrib)) { diff --git a/program/lib/Roundcube/rcube_addresses.php b/program/lib/Roundcube/rcube_addresses.php index f39eebb59b0..247ffe4bfe3 100644 --- a/program/lib/Roundcube/rcube_addresses.php +++ b/program/lib/Roundcube/rcube_addresses.php @@ -63,7 +63,7 @@ public function __construct($dbconn, $user, $type) * * @return string */ - #[Override] + #[\Override] public function get_name() { if ($this->type == self::TYPE_RECIPIENT) { @@ -86,7 +86,7 @@ public function get_name() * * @return rcube_result_set Indexed list of contact records, each a hash array */ - #[Override] + #[\Override] public function list_records($cols = null, $subset = 0, $nocount = false) { if ($nocount || $this->list_page <= 1) { @@ -146,7 +146,7 @@ public function list_records($cols = null, $subset = 0, $nocount = false) * * @return rcube_result_set Contact records and 'count' value */ - #[Override] + #[\Override] public function search($fields, $value, $mode = 0, $select = true, $nocount = false, $required = []) { if (!is_array($required) && !empty($required)) { @@ -226,7 +226,7 @@ public function search($fields, $value, $mode = 0, $select = true, $nocount = fa * * @return int Contacts count */ - #[Override] + #[\Override] protected function _count() { // count contacts for this user @@ -254,7 +254,7 @@ protected function _count() * * @return rcube_result_set|array|null Result object with all record fields */ - #[Override] + #[\Override] public function get_record($id, $assoc = false) { // return cached result @@ -289,7 +289,7 @@ public function get_record($id, $assoc = false) * * @return bool true if input is valid, False if not */ - #[Override] + #[\Override] public function validate(&$save_data, $autofix = false) { $email = array_filter($this->get_col_values('email', $save_data, true)); @@ -321,7 +321,7 @@ public function validate(&$save_data, $autofix = false) * * @return mixed The created record ID on success, False on error */ - #[Override] + #[\Override] public function insert($save_data, $check = false) { if ($check) { @@ -354,7 +354,7 @@ public function insert($save_data, $check = false) * * @return bool True on success, False on error */ - #[Override] + #[\Override] public function update($id, $save_cols) { return false; @@ -368,7 +368,7 @@ public function update($id, $save_cols) * * @return int|false Number of removed records */ - #[Override] + #[\Override] public function delete($ids, $force = true) { if (!is_array($ids)) { @@ -396,7 +396,7 @@ public function delete($ids, $force = true) * * @return int Number of removed records */ - #[Override] + #[\Override] public function delete_all($with_groups = false) { $this->db->query('DELETE FROM ' . $this->db->table_name($this->db_name, true) diff --git a/program/lib/Roundcube/rcube_contacts.php b/program/lib/Roundcube/rcube_contacts.php index 5037cd0e9a0..35fe2d276c2 100644 --- a/program/lib/Roundcube/rcube_contacts.php +++ b/program/lib/Roundcube/rcube_contacts.php @@ -86,7 +86,7 @@ public function __construct($dbconn, $user) * * @return string */ - #[Override] + #[\Override] public function get_name() { return $this->name; @@ -97,7 +97,7 @@ public function get_name() * * @param mixed $filter SQL params to use in listing method */ - #[Override] + #[\Override] public function set_search_set($filter): void { $this->filter = $filter; @@ -109,7 +109,7 @@ public function set_search_set($filter): void * * @return mixed Search properties used by this class */ - #[Override] + #[\Override] public function get_search_set() { return $this->filter; @@ -119,7 +119,7 @@ public function get_search_set() * Setter for the current group * (empty, has to be re-implemented by extending class) */ - #[Override] + #[\Override] public function set_group($gid) { $this->group_id = $gid; @@ -129,7 +129,7 @@ public function set_group($gid) /** * Reset all saved results and search parameters */ - #[Override] + #[\Override] public function reset(): void { $this->result = null; @@ -145,7 +145,7 @@ public function reset(): void * * @return array Indexed list of contact groups, each a hash array */ - #[Override] + #[\Override] public function list_groups($search = null, $mode = 0) { $results = []; @@ -190,7 +190,7 @@ public function list_groups($search = null, $mode = 0) * * @return ?array group properties as hash array, null in case of error */ - #[Override] + #[\Override] public function get_group($group_id) { $sql_result = $this->db->query( @@ -216,7 +216,7 @@ public function get_group($group_id) * * @return rcube_result_set Indexed list of contact records, each a hash array */ - #[Override] + #[\Override] public function list_records($cols = null, $subset = 0, $nocount = false) { if ($nocount || $this->list_page <= 1) { @@ -309,7 +309,7 @@ public function list_records($cols = null, $subset = 0, $nocount = false) * * @return rcube_result_set Contact records and 'count' value */ - #[Override] + #[\Override] public function search($fields, $value, $mode = 0, $select = true, $nocount = false, $required = []) { if (!is_array($required) && !empty($required)) { @@ -490,7 +490,7 @@ protected function fulltext_sql_where($value, $mode, $col = 'words', $bool = 'AN * * @return rcube_result_set Result object */ - #[Override] + #[\Override] public function count() { $count = $this->cache['count'] ?? $this->_count(); @@ -537,7 +537,7 @@ protected function _count() * * @return rcube_result_set|null Result array or NULL if nothing selected yet */ - #[Override] + #[\Override] public function get_result() { return $this->result; @@ -551,7 +551,7 @@ public function get_result() * * @return rcube_result_set|array|null Result object with all record fields */ - #[Override] + #[\Override] public function get_record($id, $assoc = false) { // return cached result @@ -586,7 +586,7 @@ public function get_record($id, $assoc = false) * * @return array List of assigned groups, indexed by a group ID */ - #[Override] + #[\Override] public function get_record_groups($id) { $results = []; @@ -620,7 +620,7 @@ public function get_record_groups($id) * * @return bool true if input is valid, False if not */ - #[Override] + #[\Override] public function validate(&$save_data, $autofix = false) { // validate e-mail addresses @@ -649,7 +649,7 @@ public function validate(&$save_data, $autofix = false) * * @return mixed The created record ID on success, False on error */ - #[Override] + #[\Override] public function insert($save_data, $check = false) { $insert_id = $existing = false; @@ -698,7 +698,7 @@ public function insert($save_data, $check = false) * * @return bool True on success, False on error */ - #[Override] + #[\Override] public function update($id, $save_cols) { $updated = false; @@ -832,7 +832,7 @@ private function convert_save_data($save_data, $record = []) * * @return int|false Number of removed records, False on failure */ - #[Override] + #[\Override] public function delete($ids, $force = true) { if (!is_array($ids)) { @@ -862,7 +862,7 @@ public function delete($ids, $force = true) * * @return int Number of undeleted contact records */ - #[Override] + #[\Override] public function undelete($ids) { if (!is_array($ids)) { @@ -892,7 +892,7 @@ public function undelete($ids) * * @return int Number of removed records */ - #[Override] + #[\Override] public function delete_all($with_groups = false) { $this->cache = null; @@ -923,7 +923,7 @@ public function delete_all($with_groups = false) * * @return array|false False on error, array with record props in success */ - #[Override] + #[\Override] public function create_group($name) { $result = false; @@ -951,7 +951,7 @@ public function create_group($name) * * @return bool True on success, false if no data was changed */ - #[Override] + #[\Override] public function delete_group($gid) { // flag group record as deleted @@ -977,7 +977,7 @@ public function delete_group($gid) * * @return string|false New name on success, false if no data was changed */ - #[Override] + #[\Override] public function rename_group($gid, $name, &$new_gid) { // make sure we have a unique name @@ -1002,7 +1002,7 @@ public function rename_group($gid, $name, &$new_gid) * * @return int Number of contacts added */ - #[Override] + #[\Override] public function add_to_group($group_id, $ids) { if (!is_array($ids)) { @@ -1054,7 +1054,7 @@ public function add_to_group($group_id, $ids) * * @return int Number of deleted group members */ - #[Override] + #[\Override] public function remove_from_group($group_id, $ids) { if (!is_array($ids)) { diff --git a/program/lib/Roundcube/rcube_content_filter.php b/program/lib/Roundcube/rcube_content_filter.php index ef54c25e514..d344e71f8ff 100644 --- a/program/lib/Roundcube/rcube_content_filter.php +++ b/program/lib/Roundcube/rcube_content_filter.php @@ -27,15 +27,15 @@ class rcube_content_filter extends \php_user_filter private $buffer = ''; private $cutoff = 2048; - #[Override] + #[\Override] public function onCreate(): bool { $this->cutoff = rand(2048, 3027); return true; } - #[Override] - #[ReturnTypeWillChange] + #[\Override] + #[\ReturnTypeWillChange] public function filter($in, $out, &$consumed, $closing) { while ($bucket = stream_bucket_make_writeable($in)) { diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php index f411dbc7e11..b5d19cdbda3 100644 --- a/program/lib/Roundcube/rcube_imap.php +++ b/program/lib/Roundcube/rcube_imap.php @@ -118,7 +118,7 @@ public function __get($name) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] public function connect($host, $user, $pass, $port = 143, $use_ssl = null) { // check for OpenSSL support in PHP build @@ -226,7 +226,7 @@ public function connect($host, $user, $pass, $port = 143, $use_ssl = null) * Close IMAP connection. * Usually done on script shutdown */ - #[Override] + #[\Override] public function close() { $this->connect_done = false; @@ -242,7 +242,7 @@ public function close() * * @return bool connection state */ - #[Override] + #[\Override] public function check_connection() { // Establish connection if it wasn't done yet @@ -264,7 +264,7 @@ public function check_connection() * * @return bool True on success, False on failure */ - #[Override] + #[\Override] public function is_connected() { return $this->conn->connected(); @@ -275,7 +275,7 @@ public function is_connected() * * @return int Error code */ - #[Override] + #[\Override] public function get_error_code() { return $this->conn->errornum; @@ -286,7 +286,7 @@ public function get_error_code() * * @return string Error string */ - #[Override] + #[\Override] public function get_error_str() { return $this->conn->error; @@ -297,7 +297,7 @@ public function get_error_str() * * @return int Response code */ - #[Override] + #[\Override] public function get_response_code() { switch ($this->conn->resultcode) { @@ -327,7 +327,7 @@ public function get_response_code() * * @param bool $dbg True if IMAP conversation should be logged */ - #[Override] + #[\Override] public function set_debug($dbg = true) { $this->options['debug'] = $dbg; @@ -340,7 +340,7 @@ public function set_debug($dbg = true) * * @param string $folder Folder name */ - #[Override] + #[\Override] public function set_folder($folder) { $this->folder = $folder; @@ -356,7 +356,7 @@ public function set_folder($folder) * 3 - sorting field, string * 4 - true if sorted, bool */ - #[Override] + #[\Override] public function set_search_set($set) { $set = (array) $set; @@ -378,7 +378,7 @@ public function set_search_set($set) * * @return array|null Search set */ - #[Override] + #[\Override] public function get_search_set() { if (empty($this->search_set)) { @@ -401,7 +401,7 @@ public function get_search_set() * * @return mixed Capability value or TRUE if supported, FALSE if not */ - #[Override] + #[\Override] public function get_capability($cap) { $cap = strtoupper($cap); @@ -430,7 +430,7 @@ public function get_capability($cap) * * @return bool True if this flag is supported */ - #[Override] + #[\Override] public function check_permflag($flag) { $flag = strtoupper($flag); @@ -475,7 +475,7 @@ public function get_permflags($folder) * * @return string Delimiter string */ - #[Override] + #[\Override] public function get_hierarchy_delimiter() { return $this->delimiter; @@ -488,7 +488,7 @@ public function get_hierarchy_delimiter() * * @return string|array|null Namespace data */ - #[Override] + #[\Override] public function get_namespace($name = null) { $ns = $this->namespace; @@ -641,7 +641,7 @@ protected function set_env() * * @since 1.2 */ - #[Override] + #[\Override] public function get_vendor() { if (isset($_SESSION['imap_vendor'])) { @@ -697,7 +697,7 @@ public function get_vendor() * * @return int Number of messages */ - #[Override] + #[\Override] public function count($folder = null, $mode = 'ALL', $force = false, $status = true) { if (!is_string($folder) || !strlen($folder)) { @@ -835,7 +835,7 @@ protected function countmessages($folder, $mode = 'ALL', $force = false, $status * * @return array Indexed array with message flags */ - #[Override] + #[\Override] public function list_flags($folder, $uids, $mod_seq = null) { if (!is_string($folder) || !strlen($folder)) { @@ -872,7 +872,7 @@ public function list_flags($folder, $uids, $mod_seq = null) * * @return array Indexed array with message header objects */ - #[Override] + #[\Override] public function list_messages($folder = null, $page = null, $sort_field = null, $sort_order = null, $slice = 0) { if (!is_string($folder) || !strlen($folder)) { @@ -1292,7 +1292,7 @@ protected function list_search_thread_messages($folder, $page, $slice = 0) * * @return array Messages headers indexed by UID */ - #[Override] + #[\Override] public function fetch_headers($folder, $msgs, $sort = true, $force = false) { if (empty($msgs)) { @@ -1340,7 +1340,7 @@ public function fetch_headers($folder, $msgs, $sort = true, $force = false) * * @return int Folder status */ - #[Override] + #[\Override] public function folder_status($folder = null, &$diff = []) { if (!is_string($folder) || !strlen($folder)) { @@ -1420,7 +1420,7 @@ protected function get_folder_stats($folder) * * @return rcube_result_index|rcube_result_thread List of messages (UIDs) */ - #[Override] + #[\Override] public function index($folder = null, $sort_field = null, $sort_order = null, $no_threads = false, $no_search = false ) { @@ -1618,7 +1618,7 @@ protected function sort_threads($threads) * * @todo: Search criteria should be provided in non-IMAP format, e.g. array */ - #[Override] + #[\Override] public function search($folder = '', $search = 'ALL', $charset = null, $sort_field = null) { if (!$search) { @@ -1691,7 +1691,7 @@ public function search($folder = '', $search = 'ALL', $charset = null, $sort_fie * * @return rcube_result_index|rcube_result_multifolder Search result (UIDs) */ - #[Override] + #[\Override] public function search_once($folder = null, $str = 'ALL') { if (!$this->check_connection()) { @@ -1838,7 +1838,7 @@ public static function convert_criteria($str, $charset, $dest_charset = 'US-ASCI * * @return array Current search set */ - #[Override] + #[\Override] public function refresh_search() { if (!empty($this->search_string)) { @@ -1875,7 +1875,7 @@ protected function set_search_dirty($folder) * * @return rcube_message_header|false Message headers, False on error */ - #[Override] + #[\Override] public function get_message_headers($uid, $folder = null, $force = false) { // decode combined UID-folder identifier @@ -1913,7 +1913,7 @@ public function get_message_headers($uid, $folder = null, $force = false) * * @return rcube_message_header|false Message data, False on error */ - #[Override] + #[\Override] public function get_message($uid, $folder = null) { if (!is_string($folder) || !strlen($folder)) { @@ -2345,7 +2345,7 @@ protected function structure_charset($structure) * * @return string|bool Message/part body if not printed */ - #[Override] + #[\Override] public function get_message_part($uid, $part, $o_part = null, $print = null, $fp = null, $skip_charset_conv = false, $max_bytes = 0, $formatted = true) { @@ -2416,7 +2416,7 @@ public function get_message_part($uid, $part, $o_part = null, $print = null, $fp * * @return string|false Message source string */ - #[Override] + #[\Override] public function get_raw_body($uid, $fp = null, $part = null) { if (!$this->check_connection()) { @@ -2435,7 +2435,7 @@ public function get_raw_body($uid, $fp = null, $part = null) * * @return string|false Message headers string */ - #[Override] + #[\Override] public function get_raw_headers($uid, $part = null) { if (!$this->check_connection()) { @@ -2451,7 +2451,7 @@ public function get_raw_headers($uid, $part = null) * @param int $uid Message UID * @param bool $formatted Enables line-ending formatting */ - #[Override] + #[\Override] public function print_raw_body($uid, $formatted = true) { if (!$this->check_connection()) { @@ -2471,7 +2471,7 @@ public function print_raw_body($uid, $formatted = true) * * @return bool Operation status */ - #[Override] + #[\Override] public function set_flag($uids, $flag, $folder = null, $skip_cache = false) { if (!is_string($folder) || !strlen($folder)) { @@ -2532,7 +2532,7 @@ public function set_flag($uids, $flag, $folder = null, $skip_cache = false) * * @return int|bool Appended message UID or True on success, False on error */ - #[Override] + #[\Override] public function save_message($folder, &$message, $headers = '', $is_file = false, $flags = [], $date = null, $binary = false) { if (!is_string($folder) || !strlen($folder)) { @@ -2584,7 +2584,7 @@ public function save_message($folder, &$message, $headers = '', $is_file = false * * @return bool True on success, False on error */ - #[Override] + #[\Override] public function move_message($uids, $to_mbox, $from_mbox = '') { if (!strlen($from_mbox)) { @@ -2667,7 +2667,7 @@ public function move_message($uids, $to_mbox, $from_mbox = '') * * @return bool True on success, False on error */ - #[Override] + #[\Override] public function copy_message($uids, $to_mbox, $from_mbox = '') { if (!strlen($from_mbox)) { @@ -2703,7 +2703,7 @@ public function copy_message($uids, $to_mbox, $from_mbox = '') * * @return bool True on success, False on error */ - #[Override] + #[\Override] public function delete_message($uids, $folder = null) { if (!is_string($folder) || !strlen($folder)) { @@ -2765,7 +2765,7 @@ public function delete_message($uids, $folder = null) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] public function expunge_message($uids, $folder = null, $clear_cache = true) { if ($uids && $this->get_capability('UIDPLUS')) { @@ -2820,7 +2820,7 @@ public function expunge_message($uids, $folder = null, $clear_cache = true) * * @return array List of folders */ - #[Override] + #[\Override] public function list_folders_subscribed($root = '', $name = '*', $filter = null, $rights = null, $skip_sort = false) { $cache_key = rcube_cache::key_name('mailboxes', [$root, $name, $filter, $rights]); @@ -2956,7 +2956,7 @@ public function list_folders_subscribed_direct($root = '', $name = '*') * * @return array Indexed array with folder names */ - #[Override] + #[\Override] public function list_folders($root = '', $name = '*', $filter = null, $rights = null, $skip_sort = false) { $cache_key = rcube_cache::key_name('mailboxes.list', [$root, $name, $filter, $rights]); @@ -3158,7 +3158,7 @@ protected function filter_rights($a_folders, $rights) * * @return mixed Quota info or False if not supported */ - #[Override] + #[\Override] public function get_quota($folder = null) { if ($this->get_capability('QUOTA') && $this->check_connection()) { @@ -3175,7 +3175,7 @@ public function get_quota($folder = null) * * @return int|false Folder size in bytes, False on error */ - #[Override] + #[\Override] public function folder_size($folder) { if (!strlen($folder)) { @@ -3220,7 +3220,7 @@ public function folder_size($folder) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] public function subscribe($folders) { // let this common function do the main work @@ -3234,7 +3234,7 @@ public function subscribe($folders) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] public function unsubscribe($folders) { // let this common function do the main work @@ -3253,7 +3253,7 @@ public function unsubscribe($folders) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] public function create_folder($folder, $subscribe = false, $type = null, $noselect = false) { if (!$this->check_connection()) { @@ -3293,7 +3293,7 @@ public function create_folder($folder, $subscribe = false, $type = null, $nosele * * @return bool True on success, False on failure */ - #[Override] + #[\Override] public function rename_folder($folder, $new_name) { if (!strlen($new_name)) { @@ -3351,7 +3351,7 @@ public function rename_folder($folder, $new_name) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] public function delete_folder($folder) { if (!$this->check_connection()) { @@ -3394,7 +3394,7 @@ public function delete_folder($folder) /** * Detect special folder associations stored in storage backend */ - #[Override] + #[\Override] public function get_special_folders($forced = false) { $result = parent::get_special_folders(); @@ -3451,7 +3451,7 @@ public function get_special_folders($forced = false) /** * Set special folder associations stored in storage backend */ - #[Override] + #[\Override] public function set_special_folders($specials) { if (!$this->get_capability('SPECIAL-USE') || !$this->get_capability('METADATA')) { @@ -3495,7 +3495,7 @@ public function set_special_folders($specials) * * @return bool True or False */ - #[Override] + #[\Override] public function folder_exists($folder, $subscription = false) { if ($folder == 'INBOX') { @@ -3545,7 +3545,7 @@ public function folder_exists($folder, $subscription = false) * * @return string One of 'personal', 'other' or 'shared' */ - #[Override] + #[\Override] public function folder_namespace($folder) { if ($folder == 'INBOX') { @@ -3580,7 +3580,7 @@ public function folder_namespace($folder) * * @return string Folder name */ - #[Override] + #[\Override] public function mod_folder($folder, $mode = 'out') { $prefix = $this->namespace['prefix_' . $mode] ?? null; @@ -3612,7 +3612,7 @@ public function mod_folder($folder, $mode = 'out') * * @return array Options list */ - #[Override] + #[\Override] public function folder_attributes($folder, $force = false) { // get attributes directly from LIST command @@ -3653,7 +3653,7 @@ public function folder_attributes($folder, $force = false) * * @return array Folder properties */ - #[Override] + #[\Override] public function folder_data($folder) { if (!strlen((string) $folder)) { @@ -3701,7 +3701,7 @@ public function folder_data($folder) * * @return array Data */ - #[Override] + #[\Override] public function folder_info($folder) { if (!empty($this->icache['options']) && $this->icache['options']['name'] == $folder) { @@ -3792,7 +3792,7 @@ public function folder_info($folder) * * @param string $folder Folder name */ - #[Override] + #[\Override] public function folder_sync($folder) { if ($mcache = $this->get_mcache_engine()) { @@ -3808,7 +3808,7 @@ public function folder_sync($folder) * * @return bool True if the name is valid, False otherwise */ - #[Override] + #[\Override] public function folder_validate($folder, &$char = null) { if (parent::folder_validate($folder, $char)) { @@ -3865,7 +3865,7 @@ protected function get_fetch_headers() * * @since 0.5-beta */ - #[Override] + #[\Override] public function set_acl($folder, $user, $acl) { if (!$this->get_capability('ACL')) { @@ -3893,7 +3893,7 @@ public function set_acl($folder, $user, $acl) * * @since 0.5-beta */ - #[Override] + #[\Override] public function delete_acl($folder, $user) { if (!$this->get_capability('ACL')) { @@ -3916,7 +3916,7 @@ public function delete_acl($folder, $user) * * @since 0.5-beta */ - #[Override] + #[\Override] public function get_acl($folder) { if (!$this->get_capability('ACL')) { @@ -3941,7 +3941,7 @@ public function get_acl($folder) * * @since 0.5-beta */ - #[Override] + #[\Override] public function list_rights($folder, $user) { if (!$this->get_capability('ACL')) { @@ -3965,7 +3965,7 @@ public function list_rights($folder, $user) * * @since 0.5-beta */ - #[Override] + #[\Override] public function my_rights($folder) { if (!$this->get_capability('ACL')) { @@ -3989,7 +3989,7 @@ public function my_rights($folder) * * @since 0.5-beta */ - #[Override] + #[\Override] public function set_metadata($folder, $entries) { if (!$this->check_connection()) { @@ -4026,7 +4026,7 @@ public function set_metadata($folder, $entries) * * @since 0.5-beta */ - #[Override] + #[\Override] public function delete_metadata($folder, $entries) { if (!$this->check_connection()) { @@ -4065,7 +4065,7 @@ public function delete_metadata($folder, $entries) * * @since 0.5-beta */ - #[Override] + #[\Override] public function get_metadata($folder, $entries, $options = [], $force = false) { $entries = (array) $entries; @@ -4156,7 +4156,7 @@ protected function md2annotate($entry) * * @param string $type Cache type (@see rcube::get_cache) */ - #[Override] + #[\Override] public function set_caching($type) { if ($type) { @@ -4193,7 +4193,7 @@ protected function get_cache_engine() * * @return mixed */ - #[Override] + #[\Override] public function get_cache($key) { if ($cache = $this->get_cache_engine()) { @@ -4223,7 +4223,7 @@ public function update_cache($key, $data) * @param bool $prefix_mode Enable it to clear all keys starting * with prefix specified in $key */ - #[Override] + #[\Override] public function clear_cache($key = null, $prefix_mode = false) { if ($cache = $this->get_cache_engine()) { @@ -4241,7 +4241,7 @@ public function clear_cache($key = null, $prefix_mode = false) * @param bool $set Flag * @param int $mode Cache mode */ - #[Override] + #[\Override] public function set_messages_caching($set, $mode = null) { if ($set) { @@ -4294,7 +4294,7 @@ protected function clear_message_cache($folder = null, $uids = null) /** * Delete outdated cache entries */ - #[Override] + #[\Override] public function cache_gc() { rcube_imap_cache::gc(); diff --git a/program/lib/Roundcube/rcube_ldap.php b/program/lib/Roundcube/rcube_ldap.php index 33915a01f7b..adfd449ba82 100644 --- a/program/lib/Roundcube/rcube_ldap.php +++ b/program/lib/Roundcube/rcube_ldap.php @@ -516,7 +516,7 @@ private function _connect() /** * Close connection to LDAP server */ - #[Override] + #[\Override] public function close() { if ($this->ldap) { @@ -529,7 +529,7 @@ public function close() * * @return string Address book name */ - #[Override] + #[\Override] public function get_name() { return $this->prop['name']; @@ -540,7 +540,7 @@ public function get_name() * * @param int $page Page number to list */ - #[Override] + #[\Override] public function set_page($page) { $this->list_page = (int) $page; @@ -552,7 +552,7 @@ public function set_page($page) * * @param int $size Number of records to display on one page */ - #[Override] + #[\Override] public function set_pagesize($size) { $this->page_size = (int) $size; @@ -565,7 +565,7 @@ public function set_pagesize($size) * @param ?string $sort_col Sort column * @param ?string $sort_order Sort order */ - #[Override] + #[\Override] public function set_sort_order($sort_col = null, $sort_order = null) { if (!empty($this->coltypes[$sort_col]['attributes'])) { @@ -578,7 +578,7 @@ public function set_sort_order($sort_col = null, $sort_order = null) * * @param mixed $filter Filter string */ - #[Override] + #[\Override] public function set_search_set($filter): void { $this->filter = $filter; @@ -589,7 +589,7 @@ public function set_search_set($filter): void * * @return mixed Search properties used by this class */ - #[Override] + #[\Override] public function get_search_set() { return $this->filter; @@ -598,7 +598,7 @@ public function get_search_set() /** * Reset all saved results and search parameters */ - #[Override] + #[\Override] public function reset(): void { $this->result = null; @@ -615,7 +615,7 @@ public function reset(): void * * @return rcube_result_set Indexed list of contact records, each a hash array */ - #[Override] + #[\Override] public function list_records($cols = null, $subset = 0, $nocount = false) { if (!empty($this->prop['searchonly']) && empty($this->filter) && !$this->group_id) { @@ -820,7 +820,7 @@ public function _entry_sort_cmp($a, $b) * * @return rcube_result_set List of contact records */ - #[Override] + #[\Override] public function search($fields, $value, $mode = 0, $select = true, $nocount = false, $required = []) { $mode = intval($mode); @@ -986,7 +986,7 @@ public function search($fields, $value, $mode = 0, $select = true, $nocount = fa * * @return rcube_result_set Resultset with values for 'count' and 'first' */ - #[Override] + #[\Override] public function count() { $count = 0; @@ -1093,7 +1093,7 @@ protected function extended_search($count = false) * * @return rcube_result_set Current resultset or NULL if nothing selected yet */ - #[Override] + #[\Override] public function get_result() { return $this->result; @@ -1107,7 +1107,7 @@ public function get_result() * * @return array|rcube_result_set|null Hash array or rcube_result_set with all record fields */ - #[Override] + #[\Override] public function get_record($dn, $assoc = false) { $res = $this->result = null; @@ -1146,7 +1146,7 @@ public function get_record($dn, $assoc = false) * * @return array Hash array with the following fields: type, message */ - #[Override] + #[\Override] public function get_error() { $err = $this->error; @@ -1168,7 +1168,7 @@ public function get_error() * * @return bool true if input is valid, False if not */ - #[Override] + #[\Override] public function validate(&$save_data, $autofix = false) { // validate e-mail addresses @@ -1243,7 +1243,7 @@ public function validate(&$save_data, $autofix = false) * * @return mixed The created record ID on success, False on error */ - #[Override] + #[\Override] public function insert($save_cols, $check = false) { // Map out the column names to their LDAP ones to build the new entry. @@ -1315,7 +1315,7 @@ public function insert($save_cols, $check = false) * * @return bool True on success, False on error */ - #[Override] + #[\Override] public function update($id, $save_cols) { $record = $this->get_record($id, true); @@ -1497,7 +1497,7 @@ public function update($id, $save_cols) * * @return int|false Number of deleted records on success, False on error */ - #[Override] + #[\Override] public function delete($ids, $force = true) { if (!is_array($ids)) { @@ -1545,7 +1545,7 @@ public function delete($ids, $force = true) * * @param bool $with_groups Delete also groups if enabled */ - #[Override] + #[\Override] public function delete_all($with_groups = false) { // searching for contact entries @@ -1836,7 +1836,7 @@ public function set_debug($dbg = true) * * @param mixed $group_id Group identifier */ - #[Override] + #[\Override] public function set_group($group_id) { if ($group_id) { @@ -1856,7 +1856,7 @@ public function set_group($group_id) * * @return array Indexed list of contact groups, each a hash array */ - #[Override] + #[\Override] public function list_groups($search = null, $mode = 0) { if (!$this->groups) { @@ -2057,7 +2057,7 @@ private function get_group_entry($group_id) * * @return array Group properties as hash array */ - #[Override] + #[\Override] public function get_group($group_id) { $group_data = $this->get_group_entry($group_id); @@ -2073,7 +2073,7 @@ public function get_group($group_id) * * @return array|false False on error, array with record props in success */ - #[Override] + #[\Override] public function create_group($group_name) { $new_dn = 'cn=' . rcube_ldap_generic::quote_string($group_name, true) . ',' . $this->groups_base_dn; @@ -2105,7 +2105,7 @@ public function create_group($group_name) * * @return bool True on success, false if no data was changed */ - #[Override] + #[\Override] public function delete_group($group_id) { $group_cache = $this->_fetch_groups(); @@ -2133,7 +2133,7 @@ public function delete_group($group_id) * * @return string|false New name on success, false if no data was changed */ - #[Override] + #[\Override] public function rename_group($group_id, $new_name, &$new_gid) { $group_cache = $this->_fetch_groups(); @@ -2161,7 +2161,7 @@ public function rename_group($group_id, $new_name, &$new_gid) * * @return int Number of contacts added */ - #[Override] + #[\Override] public function add_to_group($group_id, $contact_ids) { $group_cache = $this->_fetch_groups(); @@ -2197,7 +2197,7 @@ public function add_to_group($group_id, $contact_ids) * * @return int Number of deleted group members */ - #[Override] + #[\Override] public function remove_from_group($group_id, $contact_ids) { $group_cache = $this->_fetch_groups(); @@ -2234,7 +2234,7 @@ public function remove_from_group($group_id, $contact_ids) * * @since 0.5-beta */ - #[Override] + #[\Override] public function get_record_groups($contact_id) { if (!$this->groups) { diff --git a/program/lib/Roundcube/rcube_ldap_generic.php b/program/lib/Roundcube/rcube_ldap_generic.php index 4de50a12bde..df3a1f6f678 100644 --- a/program/lib/Roundcube/rcube_ldap_generic.php +++ b/program/lib/Roundcube/rcube_ldap_generic.php @@ -49,7 +49,7 @@ public function __construct($config = null) /** * Establish a connection to the LDAP server */ - #[Override] + #[\Override] public function connect($host = null) { // Net_LDAP3 does not support IDNA yet @@ -281,7 +281,7 @@ public function read_entries($dn, $filter, $attributes = null) * * @return array Hash array with attributes as keys */ - #[Override] + #[\Override] public static function normalize_entry($entry, $flat = false) { if (!isset($entry['count'])) { diff --git a/program/lib/Roundcube/rcube_result_set.php b/program/lib/Roundcube/rcube_result_set.php index 0ae77784c86..21bf0809d89 100644 --- a/program/lib/Roundcube/rcube_result_set.php +++ b/program/lib/Roundcube/rcube_result_set.php @@ -86,7 +86,7 @@ public function seek($i): void // Implement PHP ArrayAccess interface - #[Override] + #[\Override] public function offsetSet($offset, $value): void { if ($offset === null) { @@ -97,20 +97,20 @@ public function offsetSet($offset, $value): void } } - #[Override] + #[\Override] public function offsetExists($offset): bool { return isset($this->records[$offset]); } - #[Override] + #[\Override] public function offsetUnset($offset): void { unset($this->records[$offset]); } - #[Override] - #[ReturnTypeWillChange] + #[\Override] + #[\ReturnTypeWillChange] public function offsetGet($offset) { return $this->records[$offset]; @@ -118,34 +118,34 @@ public function offsetGet($offset) // PHP 5 Iterator interface - #[Override] + #[\Override] public function rewind(): void { $this->current = 0; } - #[Override] - #[ReturnTypeWillChange] + #[\Override] + #[\ReturnTypeWillChange] public function current() { return $this->records[$this->current] ?? null; } - #[Override] - #[ReturnTypeWillChange] + #[\Override] + #[\ReturnTypeWillChange] public function key() { return $this->current; } - #[Override] - #[ReturnTypeWillChange] + #[\Override] + #[\ReturnTypeWillChange] public function next() { $this->current++; } - #[Override] + #[\Override] public function valid(): bool { return isset($this->records[$this->current]); diff --git a/program/lib/Roundcube/rcube_session.php b/program/lib/Roundcube/rcube_session.php index a7f1ffdf7c2..16784034fed 100644 --- a/program/lib/Roundcube/rcube_session.php +++ b/program/lib/Roundcube/rcube_session.php @@ -135,20 +135,20 @@ public function start() /** * Abstract methods should be implemented by driver classes */ - #[Override] - #[ReturnTypeWillChange] + #[\Override] + #[\ReturnTypeWillChange] abstract public function open($save_path, $session_name); - #[Override] - #[ReturnTypeWillChange] + #[\Override] + #[\ReturnTypeWillChange] abstract public function close(); - #[Override] - #[ReturnTypeWillChange] + #[\Override] + #[\ReturnTypeWillChange] abstract public function destroy($key); - #[Override] - #[ReturnTypeWillChange] + #[\Override] + #[\ReturnTypeWillChange] abstract public function read($key); /** @@ -180,8 +180,8 @@ abstract protected function update($key, $newvars, $oldvars); * * @return bool True on success, False on failure */ - #[Override] - #[ReturnTypeWillChange] + #[\Override] + #[\ReturnTypeWillChange] public function write($key, $vars) { if ($this->nowrite) { @@ -207,8 +207,8 @@ public function write($key, $vars) * * @return int|false Number of deleted sessions on success, False on failure */ - #[Override] - #[ReturnTypeWillChange] + #[\Override] + #[\ReturnTypeWillChange] public function gc($maxlifetime) { // move gc execution to the script shutdown function diff --git a/program/lib/Roundcube/session/db.php b/program/lib/Roundcube/session/db.php index 2c413295ca8..d6a6430d897 100644 --- a/program/lib/Roundcube/session/db.php +++ b/program/lib/Roundcube/session/db.php @@ -67,7 +67,7 @@ public function __construct($config) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] public function open($save_path, $session_name) { return true; @@ -78,7 +78,7 @@ public function open($save_path, $session_name) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] public function close() { return true; @@ -91,7 +91,7 @@ public function close() * * @return bool True on success, False on failure */ - #[Override] + #[\Override] public function destroy($key) { if ($key) { @@ -108,7 +108,7 @@ public function destroy($key) * * @return string Session vars (serialized string) */ - #[Override] + #[\Override] public function read($key) { if ($this->lifetime) { @@ -152,7 +152,7 @@ public function read($key) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] protected function save($key, $vars) { if ($this->ignore_write) { @@ -179,7 +179,7 @@ protected function save($key, $vars) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] protected function update($key, $newvars, $oldvars) { $now = $this->db->now(); diff --git a/program/lib/Roundcube/session/memcache.php b/program/lib/Roundcube/session/memcache.php index cbb1a9e6ac8..55b61b84cba 100644 --- a/program/lib/Roundcube/session/memcache.php +++ b/program/lib/Roundcube/session/memcache.php @@ -68,7 +68,7 @@ public function __construct($config) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] public function open($save_path, $session_name) { return true; @@ -79,7 +79,7 @@ public function open($save_path, $session_name) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] public function close() { return true; @@ -92,7 +92,7 @@ public function close() * * @return bool True on success, False on failure */ - #[Override] + #[\Override] public function destroy($key) { if ($key) { @@ -114,7 +114,7 @@ public function destroy($key) * * @return string Serialized data string */ - #[Override] + #[\Override] public function read($key) { if ($value = $this->memcache->get($key)) { @@ -140,7 +140,7 @@ public function read($key) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] protected function save($key, $vars) { if ($this->ignore_write) { @@ -166,7 +166,7 @@ protected function save($key, $vars) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] protected function update($key, $newvars, $oldvars) { $ts = microtime(true); diff --git a/program/lib/Roundcube/session/memcached.php b/program/lib/Roundcube/session/memcached.php index b0b7599bd75..08bb31f84e4 100644 --- a/program/lib/Roundcube/session/memcached.php +++ b/program/lib/Roundcube/session/memcached.php @@ -68,7 +68,7 @@ public function __construct($config) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] public function open($save_path, $session_name) { return true; @@ -79,7 +79,7 @@ public function open($save_path, $session_name) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] public function close() { return true; @@ -92,7 +92,7 @@ public function close() * * @return bool True on success, False on failure */ - #[Override] + #[\Override] public function destroy($key) { if ($key) { @@ -114,7 +114,7 @@ public function destroy($key) * * @return string Serialized data string */ - #[Override] + #[\Override] public function read($key) { if ($arr = $this->memcache->get($key)) { @@ -139,7 +139,7 @@ public function read($key) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] protected function save($key, $vars) { if ($this->ignore_write) { @@ -165,7 +165,7 @@ protected function save($key, $vars) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] protected function update($key, $newvars, $oldvars) { $ts = microtime(true); diff --git a/program/lib/Roundcube/session/php.php b/program/lib/Roundcube/session/php.php index 648eb97b73c..9cee562bcd3 100644 --- a/program/lib/Roundcube/session/php.php +++ b/program/lib/Roundcube/session/php.php @@ -33,37 +33,37 @@ class rcube_session_php extends rcube_session * Native php sessions don't need a save handler. * We do need to define abstract function implementations but they are not used. */ - #[Override] + #[\Override] public function open($save_path, $session_name) { return true; } - #[Override] + #[\Override] public function close() { return true; } - #[Override] + #[\Override] public function destroy($key) { return true; } - #[Override] + #[\Override] public function read($key) { return ''; } - #[Override] + #[\Override] protected function save($key, $vars) { return true; } - #[Override] + #[\Override] protected function update($key, $newvars, $oldvars) { return true; @@ -82,7 +82,7 @@ public function __construct($config) /** * Wrapper for session_write_close() */ - #[Override] + #[\Override] public function write_close() { $_SESSION['__IP'] = $this->ip; @@ -94,7 +94,7 @@ public function write_close() /** * Wrapper for session_start() */ - #[Override] + #[\Override] public function start() { parent::start(); diff --git a/program/lib/Roundcube/session/redis.php b/program/lib/Roundcube/session/redis.php index f517add2ef0..2b4b47ad730 100644 --- a/program/lib/Roundcube/session/redis.php +++ b/program/lib/Roundcube/session/redis.php @@ -66,7 +66,7 @@ public function __construct($config) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] public function open($save_path, $session_name) { return true; @@ -77,7 +77,7 @@ public function open($save_path, $session_name) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] public function close() { return true; @@ -90,7 +90,7 @@ public function close() * * @return bool True on success, False on failure */ - #[Override] + #[\Override] public function destroy($key) { if ($key) { @@ -116,7 +116,7 @@ public function destroy($key) * * @return string Serialized data string */ - #[Override] + #[\Override] public function read($key) { $value = null; @@ -151,7 +151,7 @@ public function read($key) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] protected function update($key, $newvars, $oldvars) { $ts = microtime(true); @@ -184,7 +184,7 @@ protected function update($key, $newvars, $oldvars) * * @return bool True on success, False on failure */ - #[Override] + #[\Override] protected function save($key, $vars) { if ($this->ignore_write) { diff --git a/program/lib/Roundcube/spellchecker/atd.php b/program/lib/Roundcube/spellchecker/atd.php index f258f18cb00..2435814baa8 100644 --- a/program/lib/Roundcube/spellchecker/atd.php +++ b/program/lib/Roundcube/spellchecker/atd.php @@ -43,7 +43,7 @@ class rcube_spellchecker_atd extends rcube_spellchecker_engine * * @see rcube_spellchecker_engine::languages() */ - #[Override] + #[\Override] public function languages() { $langs = array_values($this->langhosts); @@ -57,7 +57,7 @@ public function languages() * * @see rcube_spellchecker_engine::check() */ - #[Override] + #[\Override] public function check($text) { $this->content = $text; @@ -174,7 +174,7 @@ public function check($text) * * @see rcube_spellchecker_engine::get_words() */ - #[Override] + #[\Override] public function get_suggestions($word) { $this->check($word); @@ -191,7 +191,7 @@ public function get_suggestions($word) * * @see rcube_spellchecker_engine::get_suggestions() */ - #[Override] + #[\Override] public function get_words($text = null) { if ($text) { diff --git a/program/lib/Roundcube/spellchecker/enchant.php b/program/lib/Roundcube/spellchecker/enchant.php index 0f7728787d3..9b4c15c7c7d 100644 --- a/program/lib/Roundcube/spellchecker/enchant.php +++ b/program/lib/Roundcube/spellchecker/enchant.php @@ -45,7 +45,7 @@ public function __destruct() * * @see rcube_spellchecker_engine::languages() */ - #[Override] + #[\Override] public function languages() { $this->init(); @@ -91,7 +91,7 @@ private function init() * * @see rcube_spellchecker_engine::check() */ - #[Override] + #[\Override] public function check($text) { $this->init(); @@ -136,7 +136,7 @@ public function check($text) * * @see rcube_spellchecker_engine::get_words() */ - #[Override] + #[\Override] public function get_suggestions($word) { $this->init(); @@ -159,7 +159,7 @@ public function get_suggestions($word) * * @see rcube_spellchecker_engine::get_suggestions() */ - #[Override] + #[\Override] public function get_words($text = null) { $result = []; diff --git a/program/lib/Roundcube/spellchecker/googie.php b/program/lib/Roundcube/spellchecker/googie.php index 890adebbf4c..f5cd83d8d21 100644 --- a/program/lib/Roundcube/spellchecker/googie.php +++ b/program/lib/Roundcube/spellchecker/googie.php @@ -36,7 +36,7 @@ class rcube_spellchecker_googie extends rcube_spellchecker_engine * * @see rcube_spellchecker_engine::languages() */ - #[Override] + #[\Override] public function languages() { return [ @@ -54,7 +54,7 @@ public function languages() * * @see rcube_spellchecker_engine::check() */ - #[Override] + #[\Override] public function check($text) { $this->content = $text; @@ -129,7 +129,7 @@ public function check($text) * * @see rcube_spellchecker_engine::get_words() */ - #[Override] + #[\Override] public function get_suggestions($word) { $this->check($word); @@ -151,7 +151,7 @@ public function get_suggestions($word) * * @see rcube_spellchecker_engine::get_suggestions() */ - #[Override] + #[\Override] public function get_words($text = null) { if ($text) { diff --git a/program/lib/Roundcube/spellchecker/pspell.php b/program/lib/Roundcube/spellchecker/pspell.php index 8e1a87eb0e8..a29508ee7b6 100644 --- a/program/lib/Roundcube/spellchecker/pspell.php +++ b/program/lib/Roundcube/spellchecker/pspell.php @@ -33,7 +33,7 @@ class rcube_spellchecker_pspell extends rcube_spellchecker_engine * * @see rcube_spellchecker_engine::languages() */ - #[Override] + #[\Override] public function languages() { $defaults = ['en']; @@ -85,7 +85,7 @@ private function init() * * @see rcube_spellchecker_engine::check() */ - #[Override] + #[\Override] public function check($text) { $this->init(); @@ -130,7 +130,7 @@ public function check($text) * * @see rcube_spellchecker_engine::get_words() */ - #[Override] + #[\Override] public function get_suggestions($word) { $this->init(); @@ -153,7 +153,7 @@ public function get_suggestions($word) * * @see rcube_spellchecker_engine::get_suggestions() */ - #[Override] + #[\Override] public function get_words($text = null) { $result = [];