Request 3122 (accepted)

roundcubemail.spec Changed

@@ -80,13 +80,17 @@
 Source106:      plesk.kolab_folders.inc.php
 Source107:      plesk.libkolab.inc.php
 Source108:      plesk.acl.inc.php
-Source109:      plesk.tasklist.inc.php
 
 Source200:      2017111400.sql
 
 Patch201:       default-configuration.patch
 Patch202:       roundcubemail-1.4-beta86-plugin-enigma-homedir.patch
-Patch203:       0001-On-mysql-5.6-191-bytes-length-is-the-best-we-can-do-.patch
+Patch203:       0001-Enigma-WOAT-Support-8626.patch
+Patch204:       0002-Update-changelog.patch
+Patch205:       0003-Introduce-optional-support-to-inject-PROXY-protocol-.patch
+Patch206:       0004-Use-rcube_utils-remote_addr-to-take-HTTP_X_FORWARDED.patch
+Patch207:       0005-Add-a-warning-regarding-implicit-ssl.patch
+Patch208:       0006-CS-fixes-update-changelog.patch
 
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
@@ -306,7 +310,6 @@
 cp -vf %{SOURCE106} plugins/kolab_folders/config.inc.php.dist
 cp -vf %{SOURCE107} plugins/libkolab/config.inc.php.dist
 cp -vf %{SOURCE108} plugins/acl/config.inc.php.dist
-cp -vf %{SOURCE109} plugins/tasklist/config.inc.php.dist
 rm -rvf skins/kolab/ plugins/libkolab/skins/kolab/ public_html/assets/skins/kolab/
 %else
 rm -rvf skins/plesk/ plugins/libkolab/skins/plesk/ public_html/assets/skins/plesk/
@@ -317,10 +320,12 @@
 %if 0%{?plesk} < 1
 %patch202 -p1
 %endif
-
-%if 0%{?plesk} > 0 && 0%{?rhel} == 7
 %patch203 -p1
-%endif
+%patch204 -p1
+%patch205 -p1
+%patch206 -p1
+%patch207 -p1
+%patch208 -p1
 
 # Remove the results of patching when there's an incidental offset
 find . -type f -name "*.orig" | while read file; do
@@ -563,19 +568,15 @@
 
 %if 0%{?plesk} > 0 && 0%{?rhel} == 7
 php="/opt/plesk/php/7.4/bin/php"
-# Process all sql updates (requires the php-mysqlnd package for the pdo driver for the system php)
-${php} %{_datadir}/roundcubemail/bin/updatedb.sh \
-    --dir %{_datadir}/doc/roundcubemail-%{version}/SQL/ \
-    --package roundcube || : \
-    >/dev/null 2>&1
 %else
 php="/usr/bin/php"
+%endif
+
+# Process all sql updates (requires the php-mysqlnd package for the pdo driver for the system php)
 ${php} %{_datadir}/roundcubemail/bin/updatedb.sh \
     --dir %{_datadir}/doc/roundcubemail/SQL/ \
     --package roundcube || : \
     >/dev/null 2>&1
-%endif
-
 
 for plugin in $(find /usr/share/roundcubemail/plugins -mindepth 1 -maxdepth 1 -type d | sort); do
     if  ! -z "$(find ${plugin} -type d -name SQL)" ; then

0001-Enigma-WOAT-Support-8626.patch Added

@@ -0,0 +1,240 @@
+From 4f25da4f006bbf5bec15a88a08dca68df2bebdbe Mon Sep 17 00:00:00 2001
+From: Christian Mollekopf <cmollekopf@gmail.com>
+Date: Mon, 1 Aug 2022 11:51:32 +0200
+Subject: PATCH 1/6 Enigma: WOAT Support (#8626)
+
+* Enigma: WOAT Support
+* Fixed public key extraction from dns record
+
+Co-authored-by: Aleksander Machniak <alec@alec.pl>
+Co-authored-by: Christian Mollekopf <mollekopf@apheleia-it.ch>
+---
+ plugins/enigma/config.inc.php.dist      |  5 ++
+ plugins/enigma/lib/enigma_engine.php    | 93 +++++++++++++++++++++++--
+ plugins/enigma/lib/enigma_subkey.php    | 12 +++-
+ program/lib/Roundcube/rcube_message.php | 10 +--
+ 4 files changed, 108 insertions(+), 12 deletions(-)
+
+diff --git a/plugins/enigma/config.inc.php.dist b/plugins/enigma/config.inc.php.dist
+index a5a5233c2..d654c764d 100644
+--- a/plugins/enigma/config.inc.php.dist
++++ b/plugins/enigma/config.inc.php.dist
+@@ -78,3 +78,8 @@ $config'enigma_passwordless' = false;
+ //     - enigma_options_lock = 'sign'
+ //     - dont_override       = 'enigma_sign_all'
+ $config'enigma_options_lock' = ;
++
++// Enable Kolab's Web Of Anti-Trust feature
++// Fetches public keys from DNS. Default: false
++// To enable set it to True or an array of domain names.
++$config'enigma_woat' = false;
+diff --git a/plugins/enigma/lib/enigma_engine.php b/plugins/enigma/lib/enigma_engine.php
+index 113030db1..1717d41da 100644
+--- a/plugins/enigma/lib/enigma_engine.php
++++ b/plugins/enigma/lib/enigma_engine.php
+@@ -28,6 +28,7 @@ class enigma_engine
+     private $pgp_driver;
+     private $smime_driver;
+     private $password_time;
++    private $sender;
+     private $cache = ;
+ 
+     public $decryptions     = ;
+@@ -272,6 +273,9 @@ class enigma_engine
+ 
+         $recipients = array_unique($recipients);
+ 
++        // Fetch keys from external sources, if configured
++        $this->sync_keys($recipients);
++
+         // find recipient public keys
+         foreach ((array) $recipients as $email) {
+             if ($email == $from && $sign_key) {
+@@ -380,6 +384,17 @@ class enigma_engine
+             return;
+         }
+ 
++        // Get the message/part sender
++        if (!empty($p'object'->sender) && !empty($p'object'->sender'mailto')) {
++            $this->sender = $p'object'->sender'mailto';
++        }
++        if (!empty($p'structure'->headers) && !empty($p'structure'->headers'from')) {
++            $from = rcube_mime::decode_address_list($p'structure'->headers'from', 1, false);
++            if (($from = current($from)) && !empty($from'mailto')) {
++                $this->sender = $from'mailto';
++            }
++        }
++
+         // Don't be tempted to support encryption in text/html parts
+         // Because of EFAIL vulnerability we should never support this (#6289)
+ 
+@@ -881,6 +896,11 @@ class enigma_engine
+     {
+         // @TODO: Handle big bodies using (temp) files
+ 
++        // Import sender's key from external sources, if configured
++        if ($this->sender) {
++            $this->sync_keys($this->sender);
++        }
++
+         // Get rid of possible non-ascii characters (#5962)
+         $sig_body = preg_replace('/^\x00-\x7F/', '', $sig_body);
+ 
+@@ -905,6 +925,11 @@ class enigma_engine
+     {
+         // @TODO: Handle big bodies using (temp) files
+ 
++        // Import sender's key from external sources, if configured
++        if ($this->sender) {
++            $this->sync_keys($this->sender);
++        }
++
+         // Get rid of possible non-ascii characters (#5962)
+         $msg_body = preg_replace('/^\x00-\x7F/', '', $msg_body);
+ 
+@@ -1020,19 +1045,25 @@ class enigma_engine
+             return;
+         }
+ 
+-        $mode = $can_sign ? enigma_key::CAN_SIGN : enigma_key::CAN_ENCRYPT;
+-        $ret  = null;
++        $mode  = $can_sign ? enigma_key::CAN_SIGN : enigma_key::CAN_ENCRYPT;
++        $found = ;
+ 
+         // check key validity and type
+         foreach ($result as $key) {
+             if (($subkey = $key->find_subkey($email, $mode))
+                 && (!$can_sign || $key->get_type() == enigma_key::TYPE_KEYPAIR)
+             ) {
+-                $ret = $key;
+-                break;
++                $found$subkey->get_creation_date(true) = $key;
+             }
+         }
+ 
++        // Use the most recent one
++        if (count($found) > 1) {
++            ksort($found, SORT_NUMERIC);
++        }
++
++        $ret = count($found) > 0 ? array_pop($found) : null;
++
+         // cache private key info for better performance
+         // we can skip one list_keys() call when signing and attaching a key
+         if ($can_sign) {
+@@ -1442,4 +1473,58 @@ class enigma_engine
+             );
+         }
+     }
++
++    /**
++     * Import public keys from DNS according to Kolab Web-Of-Anti-Trust
++     *
++     * @param array $recipients List of email addresses
++     */
++    protected function sync_keys($recipients)
++    {
++        $import = ;
++        $woat = $this->rc->config->get('enigma_woat');
++
++        if (empty($woat)) {
++            return;
++        }
++
++        foreach ($recipients as $recipient) {
++            if (!strpos($recipient, '@')) {
++                continue;
++            }
++
++            list($local, $domain) = explode('@', $recipient);
++
++            // Do this for configured domains only
++            if (is_array($woat) && !in_array_nocase($domain, $woat)) {
++                continue;
++            }
++
++            // remove parts behind a recipient delimiter ("jeroen+Trash" => "jeroen")
++            $local = preg_replace('/\+.*$/', '', $local);
++
++            $fqdn = sha1($local) . '._woat.' . $domain;
++
++            // Fetch the TXT record(s)
++            if (($records = dns_get_record($fqdn, DNS_TXT)) === false) {
++                continue;
++            }
++
++            foreach ($records as $record) {
++                if (strpos($record'txt', 'v=woat1,') === 0) {
++                    $entry = explode('public_key=', $record'txt');
++                    if (count($entry) == 2) {
++                        $import = $entry1;
++                        // For now we support only one key
++                        break;
++                    }
++                }
++            }
++        }
++
++        // Import the fetched keys
++        if (!empty($import)) {
++            $this->import_key(implode("\n", $import));
++        }
++    }
+ }
+diff --git a/plugins/enigma/lib/enigma_subkey.php b/plugins/enigma/lib/enigma_subkey.php
+index ffdb3e8ce..014ab7de3 100644
+--- a/plugins/enigma/lib/enigma_subkey.php
++++ b/plugins/enigma/lib/enigma_subkey.php
+@@ -93,12 +93,18 @@ class enigma_subkey
+     /**
+      * Returns subkey creation date-time string
+      *
+-     * @return string|null
++     * @param bool $asInt Return the date as an integer
++     *
++     * @return string|null|int
+      */
+-    function get_creation_date()
++    function get_creation_date($asInt = false)
+     {
+         if (empty($this->created)) {
+-            return null;
++            return $asInt ? 0 : null;
++        }
++
++        if ($asInt) {
++            return (int) $this->created->format('U');
+         }
+ 
+         $date_format = rcube::get_instance()->config->get('date_format', 'Y-m-d');
+diff --git a/program/lib/Roundcube/rcube_message.php b/program/lib/Roundcube/rcube_message.php
+index e81df1b2f..7a2f7d96a 100644
+--- a/program/lib/Roundcube/rcube_message.php
++++ b/program/lib/Roundcube/rcube_message.php
+@@ -126,6 +126,11 @@ class rcube_message
+             )
+         ;
+ 
++        $this->mime    = new rcube_mime($this->headers->charset);
++        $this->subject = str_replace("\n", '', $this->headers->get('subject'));
++        $from          = $this->mime->decode_address_list($this->headers->from, 1);
++        $this->sender  = current($from);
++
+         if (!empty($this->headers->structure)) {
+             $this->get_mime_numbers($this->headers->structure);
+             $this->parse_structure($this->headers->structure);
+@@ -134,11 +139,6 @@ class rcube_message
+             $this->body = $this->storage->get_body($uid);
+         }
+ 
+-        $this->mime    = new rcube_mime($this->headers->charset);
+-        $this->subject = str_replace("\n", '', $this->headers->get('subject'));
+-        $from          = $this->mime->decode_address_list($this->headers->from, 1);
+-        $this->sender  = current($from);
+-
+         // notify plugins and let them analyze this structured message object
+         $this->app->plugins->exec_hook('message_load', 'object' => $this);
+     }
+-- 
+2.37.1
+

0001-On-mysql-5.6-191-bytes-length-is-the-best-we-can-do-.patch Deleted

@@ -1,66 +0,0 @@
-From 1afa0ac29bb2478ca527c68cc72825d11121c922 Mon Sep 17 00:00:00 2001
-From: Christian Mollekopf <mollekopf@apheleia-it.ch>
-Date: Mon, 20 Mar 2023 10:54:43 +0100
-Subject: PATCH On mysql 5.6 191 bytes length is the best we can do with
- utf8mb4
-
-https://stackoverflow.com/questions/1814532/mysql-error-1071-specified-key-was-too-long-max-key-length-is-767-bytes
-
-These changes are only required on centos 7
----
- SQL/mysql/2020020101.sql | 16 +++++++++-------
- SQL/mysql/2020091000.sql |  4 ++--
- 2 files changed, 11 insertions(+), 9 deletions(-)
-
-diff --git a/SQL/mysql/2020020101.sql b/SQL/mysql/2020020101.sql
-index 0a0402ba5..ec9620e93 100644
---- a/SQL/mysql/2020020101.sql
-+++ b/SQL/mysql/2020020101.sql
-@@ -26,6 +26,15 @@ ALTER TABLE `searches` ROW_FORMAT=DYNAMIC;
- ALTER TABLE `filestore` ROW_FORMAT=DYNAMIC;
- ALTER TABLE `system` ROW_FORMAT=DYNAMIC;
- 
-+
-+ALTER TABLE `users` CHANGE `username` `username` varchar(128) BINARY NOT NULL;
-+ALTER TABLE `cache` CHANGE `cache_key` `cache_key` varchar(128) BINARY NOT NULL;
-+ALTER TABLE `cache_shared` CHANGE `cache_key` `cache_key` varchar(191) BINARY NOT NULL;
-+ALTER TABLE `cache_index` CHANGE `mailbox` `mailbox` varchar(191) BINARY NOT NULL;
-+ALTER TABLE `cache_thread` CHANGE `mailbox` `mailbox` varchar(191) BINARY NOT NULL;
-+ALTER TABLE `cache_messages` CHANGE `mailbox` `mailbox` varchar(191) BINARY NOT NULL;
-+
-+
- ALTER TABLE `session` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
- ALTER TABLE `users` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
- ALTER TABLE `cache` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
-@@ -41,13 +50,6 @@ ALTER TABLE `searches` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_
- ALTER TABLE `filestore` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
- ALTER TABLE `system` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
- 
--ALTER TABLE `users` CHANGE `username` `username` varchar(128) BINARY NOT NULL;
--ALTER TABLE `cache` CHANGE `cache_key` `cache_key` varchar(128) BINARY NOT NULL;
--ALTER TABLE `cache_shared` CHANGE `cache_key` `cache_key` varchar(255) BINARY NOT NULL;
--ALTER TABLE `cache_index` CHANGE `mailbox` `mailbox` varchar(255) BINARY NOT NULL;
--ALTER TABLE `cache_thread` CHANGE `mailbox` `mailbox` varchar(255) BINARY NOT NULL;
--ALTER TABLE `cache_messages` CHANGE `mailbox` `mailbox` varchar(255) BINARY NOT NULL;
--
- ALTER TABLE `cache`
-   ADD CONSTRAINT `user_id_fk_cache` FOREIGN KEY (`user_id`) REFERENCES `users` (`user_id`) ON DELETE CASCADE ON UPDATE CASCADE;
- ALTER TABLE `cache_index`
-diff --git a/SQL/mysql/2020091000.sql b/SQL/mysql/2020091000.sql
-index aa098e35d..fd5698c35 100644
---- a/SQL/mysql/2020091000.sql
-+++ b/SQL/mysql/2020091000.sql
-@@ -1,8 +1,8 @@
- CREATE TABLE `collected_addresses` (
-  `address_id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
-- `name` varchar(255) NOT NULL DEFAULT '',
-- `email` varchar(255) NOT NULL,
-+ `name` varchar(191) NOT NULL DEFAULT '',
-+ `email` varchar(191) NOT NULL,
-  `user_id` int(10) UNSIGNED NOT NULL,
-  `type` int(10) UNSIGNED NOT NULL,
-  PRIMARY KEY(`address_id`),
--- 
-2.39.2
-

0002-Update-changelog.patch Added

0003-Introduce-optional-support-to-inject-PROXY-protocol-.patch Added

@@ -0,0 +1,153 @@
+From 70e23efafae75b5604fd5206e64571cee59ba71a Mon Sep 17 00:00:00 2001
+From: Christian Mollekopf <mollekopf@apheleia-it.ch>
+Date: Thu, 14 Jul 2022 15:04:16 +0200
+Subject: PATCH 3/6 Introduce optional support to inject PROXY protocol
+ headers after opening IMAP TCP streams.
+
+Version 1 (text based) and version 2 (binary) protocol header types are
+supported. Supports both IPv4 and IPv6 style headers.
+
+http://www.haproxy.org/download/1.6/doc/proxy-protocol.txt
+---
+ config/defaults.inc.php                      | 10 +++
+ program/lib/Roundcube/rcube_imap_generic.php |  8 ++
+ program/lib/Roundcube/rcube_utils.php        | 79 ++++++++++++++++++++
+ 3 files changed, 97 insertions(+)
+
+diff --git a/config/defaults.inc.php b/config/defaults.inc.php
+index 018ad9af3..a6cd3b9a5 100644
+--- a/config/defaults.inc.php
++++ b/config/defaults.inc.php
+@@ -157,12 +157,22 @@ $config'imap_auth_type' = null;
+ // IMAP socket context options
+ // See http://php.net/manual/en/context.ssl.php
+ // The example below enables server certificate validation
++//
++// proxy_protocol is used to inject HAproxy style headers in the TCP stream
++// See http://www.haproxy.org/download/1.6/doc/proxy-protocol.txt
+ //$config'imap_conn_options' = 
+ //  'ssl'         => 
+ //     'verify_peer'  => true,
+ //     'verify_depth' => 3,
+ //     'cafile'       => '/etc/openssl/certs/ca.crt',
+ //   ,
++//  'proxy_protocol' => 1 | 2 |  // required (either version number (1|2) or array with 'version' key)
++//       'version'       => 1 | 2, // required, if array
++//       'remote_addr'   => $_SERVER'REMOTE_ADDR',
++//       'remote_port'   => $_SERVER'REMOTE_PORT',
++//       'local_addr'    => $_SERVER'SERVER_ADDR',
++//       'local_port'    => $_SERVER'SERVER_PORT',
++//   ,
+ // ;
+ // Note: These can be also specified as an array of options indexed by hostname
+ $config'imap_conn_options' = null;
+diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php
+index 8f1285368..d2f5cf410 100644
+--- a/program/lib/Roundcube/rcube_imap_generic.php
++++ b/program/lib/Roundcube/rcube_imap_generic.php
+@@ -1070,6 +1070,14 @@ class rcube_imap_generic
+             return false;
+         }
+ 
++        // insert proxy protocol header, if enabled
++        if (!empty($this->prefs'socket_options')) {
++            $proxy_protocol_header = rcube_utils::proxy_protocol_header($this->prefs'socket_options', $this->fp);
++            if (strlen($proxy_protocol_header) > 0) {
++                fwrite($this->fp, $proxy_protocol_header);
++            }
++        }
++        
+         if ($this->prefs'timeout' > 0) {
+             stream_set_timeout($this->fp, $this->prefs'timeout');
+         }
+diff --git a/program/lib/Roundcube/rcube_utils.php b/program/lib/Roundcube/rcube_utils.php
+index eb51f98ed..ec31fa11b 100644
+--- a/program/lib/Roundcube/rcube_utils.php
++++ b/program/lib/Roundcube/rcube_utils.php
+@@ -1645,4 +1645,83 @@ class rcube_utils
+ 
+         return trim($subject);
+     }
++
++    /**
++     * When proxy_protocol is configured for a connection type,
++     * generate the HAproxy style PROXY protocol header for injection
++     * into the TCP stream.
++     * http://www.haproxy.org/download/1.6/doc/proxy-protocol.txt
++     * 
++     * PROXY protocol headers must be sent before any other data is sent on the TCP socket.
++     *
++     * @param array $conn_options preferences array which may contain proxy_protocol (generally {driver}_conn_options)
++     *
++     * @return string proxy protocol header data, if enabled, otherwise empty string
++     */
++    public static function proxy_protocol_header($conn_options = null)
++    {
++        if ($conn_options === null)
++        {
++            return "";
++        }
++        // verify that proxy_protocol option is present
++        if (is_array($conn_options) && array_key_exists('proxy_protocol', $conn_options)) {
++            if (is_array($conn_options'proxy_protocol')) {
++                $proxy_protocol_version = $conn_options'proxy_protocol''version';
++                $proxy_protocol_options = $conn_options'proxy_protocol';
++            }
++            else {
++                $proxy_protocol_version = $conn_options'proxy_protocol';
++                $proxy_protocol_options = null;
++            }
++
++            $proxy_protocol_remote_addr = (array_key_exists('remote_addr', $proxy_protocol_options) ? $proxy_protocol_options'remote_addr' : $_SERVER'REMOTE_ADDR' );
++            $proxy_protocol_remote_port = (array_key_exists('remote_port', $proxy_protocol_options) ? $proxy_protocol_options'remote_port' : $_SERVER'REMOTE_PORT' );
++            $proxy_protocol_local_addr = (array_key_exists('local_addr' ,$proxy_protocol_options) ? $proxy_protocol_options'local_addr' : $_SERVER'SERVER_ADDR' );
++            $proxy_protocol_local_port = (array_key_exists('local_port', $proxy_protocol_options) ? $proxy_protocol_options'local_port' : $_SERVER'SERVER_PORT' );
++            $proxy_protocol_ip_version = (strpos($proxy_protocol_remote_addr, ":") === false ? 4 : 6);
++
++            if ($proxy_protocol_version === 1) {
++                // text based PROXY protocol
++
++                // PROXY protocol does not support dual IPv6+IPv4 type addresses, e.g. ::127.0.0.1
++                if ($proxy_protocol_ip_version === 6 && strpos($proxy_protocol_remote_addr, ".") !== false) {
++                    $proxy_protocol_remote_addr = inet_ntop(inet_pton($proxy_protocol_remote_addr));
++                }
++                if ($proxy_protocol_ip_version === 6 && strpos($proxy_protocol_local_addr, ".") !== false) {
++                    $proxy_protocol_local_addr = inet_ntop(inet_pton($proxy_protocol_local_addr));
++                }
++
++                $proxy_protocol_text = "PROXY " . // protocol header
++                    ($proxy_protocol_ip_version === 6 ? "TCP6 " : "TCP4 ") . // IP version type
++                    $proxy_protocol_remote_addr .
++                    " " .
++                    $proxy_protocol_local_addr .
++                    " " .
++                    $proxy_protocol_remote_port .
++                    " " .
++                    $proxy_protocol_local_port .
++                    "\r\n";
++                return $proxy_protocol_text;
++            }
++            else if ($proxy_protocol_version === 2) {
++                // binary PROXY protocol
++                $proxy_protocol_bin = pack("H*", "0D0A0D0A000D0A515549540A" . // protocol header
++                    "21" . // protocol version and command
++                    ($proxy_protocol_ip_version === 6 ? "2" : "1") . // IP version type
++                    "1"); // TCP
++                $proxy_protocol_addr = inet_pton($proxy_protocol_remote_addr) .
++                    inet_pton($proxy_protocol_local_addr) .
++                    pack("n", $proxy_protocol_remote_port) .
++                    pack("n", $proxy_protocol_local_port);
++                $proxy_protocol_bin .= pack("n", strlen($proxy_protocol_addr)) . $proxy_protocol_addr;
++                return $proxy_protocol_bin;
++            }
++            else {
++                // unknown proxy protocol version
++                return "";
++            }
++        }
++        return "";
++    }
+ }
+-- 
+2.37.1
+

0004-Use-rcube_utils-remote_addr-to-take-HTTP_X_FORWARDED.patch Added

@@ -0,0 +1,26 @@
+From 9616178e5d8a62dca3cc77c1a287a29460530fe6 Mon Sep 17 00:00:00 2001
+From: Christian Mollekopf <mollekopf@apheleia-it.ch>
+Date: Thu, 21 Jul 2022 20:16:11 +0200
+Subject: PATCH 4/6 Use rcube_utils::remote_addr() to take
+ HTTP_X_FORWARDED_FOR into account
+
+---
+ program/lib/Roundcube/rcube_utils.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/program/lib/Roundcube/rcube_utils.php b/program/lib/Roundcube/rcube_utils.php
+index ec31fa11b..49eb1c06e 100644
+--- a/program/lib/Roundcube/rcube_utils.php
++++ b/program/lib/Roundcube/rcube_utils.php
+@@ -1675,7 +1675,7 @@ class rcube_utils
+                 $proxy_protocol_options = null;
+             }
+ 
+-            $proxy_protocol_remote_addr = (array_key_exists('remote_addr', $proxy_protocol_options) ? $proxy_protocol_options'remote_addr' : $_SERVER'REMOTE_ADDR' );
++            $proxy_protocol_remote_addr = (array_key_exists('remote_addr', $proxy_protocol_options) ? $proxy_protocol_options'remote_addr' : self::remote_addr() );
+             $proxy_protocol_remote_port = (array_key_exists('remote_port', $proxy_protocol_options) ? $proxy_protocol_options'remote_port' : $_SERVER'REMOTE_PORT' );
+             $proxy_protocol_local_addr = (array_key_exists('local_addr' ,$proxy_protocol_options) ? $proxy_protocol_options'local_addr' : $_SERVER'SERVER_ADDR' );
+             $proxy_protocol_local_port = (array_key_exists('local_port', $proxy_protocol_options) ? $proxy_protocol_options'local_port' : $_SERVER'SERVER_PORT' );
+-- 
+2.37.1
+

0005-Add-a-warning-regarding-implicit-ssl.patch Added

0006-CS-fixes-update-changelog.patch Added

@@ -0,0 +1,195 @@
+From b5b2e2043be22105987b369c935b259ea4421c73 Mon Sep 17 00:00:00 2001
+From: Aleksander Machniak <alec@alec.pl>
+Date: Mon, 1 Aug 2022 12:25:00 +0200
+Subject: PATCH 6/6 CS fixes, update changelog
+
+---
+ CHANGELOG.md                          |   1 +
+ config/defaults.inc.php               |  26 +++---
+ program/lib/Roundcube/rcube_utils.php | 109 +++++++++++---------------
+ 3 files changed, 60 insertions(+), 76 deletions(-)
+
+diff --git a/CHANGELOG.md b/CHANGELOG.md
+index da04ede39..81c5d3572 100644
+--- a/CHANGELOG.md
++++ b/CHANGELOG.md
+@@ -2,6 +2,7 @@
+ 
+ ## Release 1.5.3
+ 
++- Support for HAproxy protocol header in IMAP connections (#8625)
+ - Enigma: Support Kolab's Web Of Anti-Trust feature (#8626)
+ - Enigma: Fix initial synchronization of private keys
+ - Enigma: Fix double quoted-printable encoding of pgp-signed messages with no attachments (#8413)
+diff --git a/config/defaults.inc.php b/config/defaults.inc.php
+index b25b419bf..ae1d1862d 100644
+--- a/config/defaults.inc.php
++++ b/config/defaults.inc.php
+@@ -163,19 +163,19 @@ $config'imap_auth_type' = null;
+ // WARNING: Please note this is currently incompatible with implicit ssl,
+ // since the proxy protocol preamble is expected before the ssl handshake.
+ //$config'imap_conn_options' = 
+-//  'ssl'         => 
+-//     'verify_peer'  => true,
+-//     'verify_depth' => 3,
+-//     'cafile'       => '/etc/openssl/certs/ca.crt',
+-//   ,
+-//  'proxy_protocol' => 1 | 2 |  // required (either version number (1|2) or array with 'version' key)
+-//       'version'       => 1 | 2, // required, if array
+-//       'remote_addr'   => $_SERVER'REMOTE_ADDR',
+-//       'remote_port'   => $_SERVER'REMOTE_PORT',
+-//       'local_addr'    => $_SERVER'SERVER_ADDR',
+-//       'local_port'    => $_SERVER'SERVER_PORT',
+-//   ,
+-// ;
++//    'ssl' => 
++//        'verify_peer'  => true,
++//        'verify_depth' => 3,
++//        'cafile'       => '/etc/openssl/certs/ca.crt',
++//    ,
++//    'proxy_protocol' => 1 | 2 |  // required (either version number (1|2) or array with 'version' key)
++//        'version'       => 1 | 2, // required, if array
++//        'remote_addr'   => $_SERVER'REMOTE_ADDR', // optional
++//        'remote_port'   => $_SERVER'REMOTE_PORT', // optional
++//        'local_addr'    => $_SERVER'SERVER_ADDR', // optional
++//        'local_port'    => $_SERVER'SERVER_PORT', // optional
++//    ,
++//;
+ // Note: These can be also specified as an array of options indexed by hostname
+ $config'imap_conn_options' = null;
+ 
+diff --git a/program/lib/Roundcube/rcube_utils.php b/program/lib/Roundcube/rcube_utils.php
+index 49eb1c06e..392c338c0 100644
+--- a/program/lib/Roundcube/rcube_utils.php
++++ b/program/lib/Roundcube/rcube_utils.php
+@@ -1647,81 +1647,64 @@ class rcube_utils
+     }
+ 
+     /**
+-     * When proxy_protocol is configured for a connection type,
+-     * generate the HAproxy style PROXY protocol header for injection
+-     * into the TCP stream.
++     * Generates the HAproxy style PROXY protocol header for injection
++     * into the TCP stream, if configured.
++     *
+      * http://www.haproxy.org/download/1.6/doc/proxy-protocol.txt
+      * 
+      * PROXY protocol headers must be sent before any other data is sent on the TCP socket.
+      *
+-     * @param array $conn_options preferences array which may contain proxy_protocol (generally {driver}_conn_options)
++     * @param array $options Preferences array which may contain proxy_protocol (generally {driver}_conn_options)
+      *
+-     * @return string proxy protocol header data, if enabled, otherwise empty string
++     * @return string Proxy protocol header data, if enabled, otherwise empty string
+      */
+-    public static function proxy_protocol_header($conn_options = null)
++    public static function proxy_protocol_header($options = null)
+     {
+-        if ($conn_options === null)
+-        {
+-            return "";
+-        }
+-        // verify that proxy_protocol option is present
+-        if (is_array($conn_options) && array_key_exists('proxy_protocol', $conn_options)) {
+-            if (is_array($conn_options'proxy_protocol')) {
+-                $proxy_protocol_version = $conn_options'proxy_protocol''version';
+-                $proxy_protocol_options = $conn_options'proxy_protocol';
+-            }
+-            else {
+-                $proxy_protocol_version = $conn_options'proxy_protocol';
+-                $proxy_protocol_options = null;
+-            }
+-
+-            $proxy_protocol_remote_addr = (array_key_exists('remote_addr', $proxy_protocol_options) ? $proxy_protocol_options'remote_addr' : self::remote_addr() );
+-            $proxy_protocol_remote_port = (array_key_exists('remote_port', $proxy_protocol_options) ? $proxy_protocol_options'remote_port' : $_SERVER'REMOTE_PORT' );
+-            $proxy_protocol_local_addr = (array_key_exists('local_addr' ,$proxy_protocol_options) ? $proxy_protocol_options'local_addr' : $_SERVER'SERVER_ADDR' );
+-            $proxy_protocol_local_port = (array_key_exists('local_port', $proxy_protocol_options) ? $proxy_protocol_options'local_port' : $_SERVER'SERVER_PORT' );
+-            $proxy_protocol_ip_version = (strpos($proxy_protocol_remote_addr, ":") === false ? 4 : 6);
++        if (empty($options) || !is_array($options) || !array_key_exists('proxy_protocol', $options)) {
++            return '';
++        }
+ 
+-            if ($proxy_protocol_version === 1) {
+-                // text based PROXY protocol
++        if (is_array($options'proxy_protocol')) {
++            $version = $options'proxy_protocol''version';
++            $options = $options'proxy_protocol';
++        }
++        else {
++            $version = (int) $options'proxy_protocol';
++            $options = ;
++        }
+ 
+-                // PROXY protocol does not support dual IPv6+IPv4 type addresses, e.g. ::127.0.0.1
+-                if ($proxy_protocol_ip_version === 6 && strpos($proxy_protocol_remote_addr, ".") !== false) {
+-                    $proxy_protocol_remote_addr = inet_ntop(inet_pton($proxy_protocol_remote_addr));
+-                }
+-                if ($proxy_protocol_ip_version === 6 && strpos($proxy_protocol_local_addr, ".") !== false) {
+-                    $proxy_protocol_local_addr = inet_ntop(inet_pton($proxy_protocol_local_addr));
+-                }
++        $remote_addr = array_key_exists('remote_addr', $options) ? $options'remote_addr' : self::remote_addr();
++        $remote_port = array_key_exists('remote_port', $options) ? $options'remote_port' : $_SERVER'REMOTE_PORT';
++        $local_addr  = array_key_exists('local_addr', $options) ? $options'local_addr' : $_SERVER'SERVER_ADDR';
++        $local_port  = array_key_exists('local_port', $options) ? $options'local_port' : $_SERVER'SERVER_PORT';
++        $ip_version  = strpos($remote_addr, ':') === false ? 4 : 6;
+ 
+-                $proxy_protocol_text = "PROXY " . // protocol header
+-                    ($proxy_protocol_ip_version === 6 ? "TCP6 " : "TCP4 ") . // IP version type
+-                    $proxy_protocol_remote_addr .
+-                    " " .
+-                    $proxy_protocol_local_addr .
+-                    " " .
+-                    $proxy_protocol_remote_port .
+-                    " " .
+-                    $proxy_protocol_local_port .
+-                    "\r\n";
+-                return $proxy_protocol_text;
++        // Text based PROXY protocol
++        if ($version == 1) {
++            // PROXY protocol does not support dual IPv6+IPv4 type addresses, e.g. ::127.0.0.1
++            if ($ip_version === 6 && strpos($remote_addr, '.') !== false) {
++                $remote_addr = inet_ntop(inet_pton($remote_addr));
+             }
+-            else if ($proxy_protocol_version === 2) {
+-                // binary PROXY protocol
+-                $proxy_protocol_bin = pack("H*", "0D0A0D0A000D0A515549540A" . // protocol header
+-                    "21" . // protocol version and command
+-                    ($proxy_protocol_ip_version === 6 ? "2" : "1") . // IP version type
+-                    "1"); // TCP
+-                $proxy_protocol_addr = inet_pton($proxy_protocol_remote_addr) .
+-                    inet_pton($proxy_protocol_local_addr) .
+-                    pack("n", $proxy_protocol_remote_port) .
+-                    pack("n", $proxy_protocol_local_port);
+-                $proxy_protocol_bin .= pack("n", strlen($proxy_protocol_addr)) . $proxy_protocol_addr;
+-                return $proxy_protocol_bin;
+-            }
+-            else {
+-                // unknown proxy protocol version
+-                return "";
++            if ($ip_version === 6 && strpos($local_addr, '.') !== false) {
++                $local_addr = inet_ntop(inet_pton($local_addr));
+             }
++
++            return "PROXY TCP{$ip_version} {$remote_addr} {$local_addr} {$remote_port} {$local_port}\r\n";
+         }
+-        return "";
++
++        // Binary PROXY protocol
++        if ($version == 2) {
++            $addr = inet_pton($remote_addr) . inet_pton($local_addr) . pack('n', $remote_port) . pack('n', $local_port);
++            $head = implode(
++                    '0D0A0D0A000D0A515549540A',     // protocol header
++                    '21',                           // protocol version and command
++                    $ip_version === 6 ? '2' : '1',  // IP version type
++                    '1'                             // TCP
++            );
++
++            return pack('H*', $head) . pack('n', strlen($addr)) . $addr;
++        }
++
++        return '';
+     }
+ }
+-- 
+2.37.1
+

buildroundcubemailtarball.sh Changed

@@ -1,14 +1,25 @@
 #!/bin/bash
 
 set -e
-set -x
 
 VERSION=1.5.3
-GIT_REF=dev/kolab-1.5
+GIT_REF=release-1.5
 PLUGINS_GIT_REF=master
 NAME=roundcubemail-$VERSION
 source buildroundcubemailtarball.config
 
+if  -x "/usr/local/bin/lessc" ; then
+    LESSC=/usr/local/bin/lessc
+else
+    LESSC=~/node_modules/less/bin/lessc
+fi
+
+if  ! -f $LESSC ; then
+    echo "Missing lessc"
+    exit 1
+fi
+
+
 ROOT_DIR=$(pwd)
 
 rm -Rf /tmp/$NAME
@@ -195,7 +206,7 @@
 
 rm -f $NAME.tar.gz
  -d "$NAME"  && rm -rf "$NAME"
-git clone --branch dev/kolab-1.5 https://github.com/cmollekopf/roundcubemail.git $NAME
+git clone --branch release-1.5 https://github.com/roundcube/roundcubemail.git $NAME
 pushd $NAME
 git reset --hard $GIT_REF
 popd
@@ -216,10 +227,6 @@
 composer install
 bin/install-jsdeps.sh
 
-# Install build deps
-npm install less less-plugin-clean-css --save-dev
-LESSC="$(pwd)/node_modules/less/bin/lessc"
-
 # May require an "npm install less" and "npm install less-plugin-clean-css"
 pushd skins/elastic
 $LESSC -x styles/styles.less > styles/styles.css
@@ -286,11 +293,9 @@
     bin/updatecss.sh --dir skins/$skin
 done
 
-# Cleanup
-npm uninstall --save-dev less less-plugin-clean-css
-
 popd
 
+
 # Uncomment to run phpstan
 # pushd $NAME

debian.changelog Changed

debian.rules Changed

debian.series Changed

plesk.config.inc.php Changed

plesk.tasklist.inc.php Deleted

roundcubemail-1.5.3.tar.gz/CHANGELOG.md Changed

roundcubemail-1.5.3.tar.gz/composer.lock Changed

@@ -298,16 +298,16 @@
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "1.5.3",
+            "version": "1.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e"
+                "reference": "b94b2807d85443f9719887892882d0329d1e2598"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e",
-                "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598",
+                "reference": "b94b2807d85443f9719887892882d0329d1e2598",
                 "shasum": ""
             },
             "require": {
@@ -317,6 +317,11 @@
                 "symfony/phpunit-bridge": "^4.4 || ^5.1"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.5-dev"
+                }
+            },
             "autoload": {
                 "files": 
                     "src/functions_include.php"
@@ -357,7 +362,7 @@
             ,
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/1.5.3"
+                "source": "https://github.com/guzzle/promises/tree/1.5.2"
             },
             "funding": 
                 {
@@ -373,20 +378,20 @@
                     "type": "tidelift"
                 }
             ,
-            "time": "2023-05-21T12:31:43+00:00"
+            "time": "2022-08-28T14:55:35+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.9.1",
+            "version": "1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b"
+                "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/e4490cabc77465aaee90b20cfc9a770f8c04be6b",
-                "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
+                "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
                 "shasum": ""
             },
             "require": {
@@ -405,6 +410,11 @@
                 "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.9-dev"
+                }
+            },
             "autoload": {
                 "files": 
                     "src/functions_include.php"
@@ -462,7 +472,7 @@
             ,
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/1.9.1"
+                "source": "https://github.com/guzzle/psr7/tree/1.9.0"
             },
             "funding": 
                 {
@@ -478,7 +488,7 @@
                     "type": "tidelift"
                 }
             ,
-            "time": "2023-04-17T16:00:37+00:00"
+            "time": "2022-06-20T21:43:03+00:00"
         },
         {
             "name": "johndoh/contextmenu",
@@ -1311,16 +1321,16 @@
         },
         {
             "name": "pear/console_commandline",
-            "version": "v1.2.6",
+            "version": "v1.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Console_CommandLine.git",
-                "reference": "611c5bff2e47ec5a184748cb5fedc2869098ff28"
+                "reference": "cce06166765c5da31f3e8c1acf42512c64344cdb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Console_CommandLine/zipball/611c5bff2e47ec5a184748cb5fedc2869098ff28",
-                "reference": "611c5bff2e47ec5a184748cb5fedc2869098ff28",
+                "url": "https://api.github.com/repos/pear/Console_CommandLine/zipball/cce06166765c5da31f3e8c1acf42512c64344cdb",
+                "reference": "cce06166765c5da31f3e8c1acf42512c64344cdb",
                 "shasum": ""
             },
             "require": {
@@ -1367,7 +1377,7 @@
                 "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name=Console_CommandLine",
                 "source": "https://github.com/pear/Console_CommandLine"
             },
-            "time": "2023-04-02T18:49:53+00:00"
+            "time": "2021-11-15T19:53:25+00:00"
         },
         {
             "name": "pear/console_getopt",
@@ -1907,16 +1917,16 @@
         },
         {
             "name": "pear/pear-core-minimal",
-            "version": "v1.10.13",
+            "version": "v1.10.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/pear-core-minimal.git",
-                "reference": "aed862e95fd286c53cc546734868dc38ff4b5b1d"
+                "reference": "68d0d32ada737153b7e93b8d3c710ebe70ac867d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/aed862e95fd286c53cc546734868dc38ff4b5b1d",
-                "reference": "aed862e95fd286c53cc546734868dc38ff4b5b1d",
+                "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/68d0d32ada737153b7e93b8d3c710ebe70ac867d",
+                "reference": "68d0d32ada737153b7e93b8d3c710ebe70ac867d",
                 "shasum": ""
             },
             "require": {
@@ -1951,7 +1961,7 @@
                 "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name=PEAR",
                 "source": "https://github.com/pear/pear-core-minimal"
             },
-            "time": "2023-04-19T19:15:47+00:00"
+            "time": "2021-08-10T22:31:03+00:00"
         },
         {
             "name": "pear/pear_exception",
@@ -2014,25 +2024,25 @@
         },
         {
             "name": "psr/http-message",
-            "version": "1.1",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-message.git",
-                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba"
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
-                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2 || ^8.0"
+                "php": ">=5.3.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1.x-dev"
+                    "dev-master": "1.0.x-dev"
                 }
             },
             "autoload": {
@@ -2061,9 +2071,9 @@
                 "response"
             ,
             "support": {
-                "source": "https://github.com/php-fig/http-message/tree/1.1"
+                "source": "https://github.com/php-fig/http-message/tree/master"
             },
-            "time": "2023-04-04T09:50:52+00:00"
+            "time": "2016-08-06T14:39:51+00:00"
         },
         {
             "name": "psr/log",
@@ -2712,16 +2722,16 @@
         },
         {
             "name": "smarty/smarty",
-            "version": "v3.1.48",
+            "version": "v3.1.47",
             "source": {
                 "type": "git",
                 "url": "https://github.com/smarty-php/smarty.git",
-                "reference": "2fc443806cdcaee4441be4d0bb09f8fa56a17f2c"
+                "reference": "a09364fe1706cb465e910eb040e592053d7effb8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/smarty-php/smarty/zipball/2fc443806cdcaee4441be4d0bb09f8fa56a17f2c",
-                "reference": "2fc443806cdcaee4441be4d0bb09f8fa56a17f2c",
+                "url": "https://api.github.com/repos/smarty-php/smarty/zipball/a09364fe1706cb465e910eb040e592053d7effb8",
+                "reference": "a09364fe1706cb465e910eb040e592053d7effb8",
                 "shasum": ""
             },
             "require": {
@@ -2769,9 +2779,9 @@
                 "forum": "http://www.smarty.net/forums/",
                 "irc": "irc://irc.freenode.org/smarty",
                 "issues": "https://github.com/smarty-php/smarty/issues",
-                "source": "https://github.com/smarty-php/smarty/tree/v3.1.48"
+                "source": "https://github.com/smarty-php/smarty/tree/v3.1.47"
             },
-            "time": "2023-03-28T19:45:54+00:00"
+            "time": "2022-09-14T11:29:00+00:00"
         },
         {
             "name": "symfony/polyfill-intl-idn",
@@ -3721,16 +3731,16 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.11.1",
+            "version": "1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
+                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
-                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614",
+                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614",
                 "shasum": ""
             },
             "require": {
@@ -3768,7 +3778,7 @@
             ,
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0"
             },
             "funding": 
                 {
@@ -3776,7 +3786,7 @@
                     "type": "tidelift"
                 }
             ,
-            "time": "2023-03-08T13:26:56+00:00"
+            "time": "2022-03-03T13:19:32+00:00"
         },
         {
             "name": "phpcompatibility/php-compatibility",
@@ -4069,16 +4079,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.15",
+            "version": "1.9.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "762c4dac4da6f8756eebb80e528c3a47855da9bd"
+                "reference": "204e459e7822f2c586463029f5ecec31bb45a1f2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/762c4dac4da6f8756eebb80e528c3a47855da9bd",
-                "reference": "762c4dac4da6f8756eebb80e528c3a47855da9bd",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/204e459e7822f2c586463029f5ecec31bb45a1f2",
+                "reference": "204e459e7822f2c586463029f5ecec31bb45a1f2",
                 "shasum": ""
             },
             "require": {
@@ -4107,11 +4117,8 @@
                 "static analysis"
             ,
             "support": {
-                "docs": "https://phpstan.org/user-guide/getting-started",
-                "forum": "https://github.com/phpstan/phpstan/discussions",
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "security": "https://github.com/phpstan/phpstan/security/policy",
-                "source": "https://github.com/phpstan/phpstan-src"
+                "source": "https://github.com/phpstan/phpstan/tree/1.9.17"
             },
             "funding": 
                 {
@@ -4127,7 +4134,7 @@
                     "type": "tidelift"
                 }
             ,
-            "time": "2023-05-09T15:28:01+00:00"
+            "time": "2023-02-08T12:25:00+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -5113,16 +5120,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.7.2",
+            "version": "3.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879"
+                "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879",
-                "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1359e176e9307e906dc3d890bcc9603ff6d90619",
+                "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619",
                 "shasum": ""
             },
             "require": {
@@ -5158,15 +5165,14 @@
             "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
             "keywords": 
                 "phpcs",
-                "standards",
-                "static analysis"
+                "standards"
             ,
             "support": {
                 "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
                 "source": "https://github.com/squizlabs/PHP_CodeSniffer",
                 "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
             },
-            "time": "2023-02-22T23:07:41+00:00"
+            "time": "2022-06-18T07:21:10+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",

roundcubemail-1.5.3.tar.gz/config/defaults.inc.php Changed

@@ -157,25 +157,13 @@
 // IMAP socket context options
 // See http://php.net/manual/en/context.ssl.php
 // The example below enables server certificate validation
-//
-// proxy_protocol is used to inject HAproxy style headers in the TCP stream
-// See http://www.haproxy.org/download/1.6/doc/proxy-protocol.txt
-// WARNING: Please note this is currently incompatible with implicit ssl,
-// since the proxy protocol preamble is expected before the ssl handshake.
 //$config'imap_conn_options' = 
-//    'ssl' => 
-//        'verify_peer'  => true,
-//        'verify_depth' => 3,
-//        'cafile'       => '/etc/openssl/certs/ca.crt',
-//    ,
-//    'proxy_protocol' => 1 | 2 |  // required (either version number (1|2) or array with 'version' key)
-//        'version'       => 1 | 2, // required, if array
-//        'remote_addr'   => $_SERVER'REMOTE_ADDR', // optional
-//        'remote_port'   => $_SERVER'REMOTE_PORT', // optional
-//        'local_addr'    => $_SERVER'SERVER_ADDR', // optional
-//        'local_port'    => $_SERVER'SERVER_PORT', // optional
-//    ,
-//;
+//  'ssl'         => 
+//     'verify_peer'  => true,
+//     'verify_depth' => 3,
+//     'cafile'       => '/etc/openssl/certs/ca.crt',
+//   ,
+// ;
 // Note: These can be also specified as an array of options indexed by hostname
 $config'imap_conn_options' = null;

roundcubemail-1.5.3.tar.gz/logs/errors.log Added

@@ -0,0 +1,102 @@
+17-Feb-2023 10:46:24 UTC PHP Deprecated:  substr(): Passing null to parameter #1 ($string) of type string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php on line 837
+17-Feb-2023 10:46:24 UTC PHP Stack trace:
+17-Feb-2023 10:46:24 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/vendor/roundcube/plugin-installer/src/bin/rcubeinitdb.sh:0
+17-Feb-2023 10:46:24 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/vendor/roundcube/plugin-installer/src/bin/rcubeinitdb.sh:6
+17-Feb-2023 10:46:24 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
+17-Feb-2023 10:46:24 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
+17-Feb-2023 10:46:24 UTC PHP   5. rcmail->set_user($user = class rcube_user { public $ID = NULL; public $data = NULL; public $language = NULL; public $prefs = ; private $db = class rcube_db_mysql { public $db_provider = 'mysql'; protected $db_dsnw = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnr = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnw_array = ...; protected $db_dsnr_array = ...; protected $db_connected = FALSE; protected $db_mode = NULL; protected $db_pconn = FALSE; protected $dbh = NULL; protected $dbhs = ...; protected $table_connections = ...; protected $db_error = FALSE; protected $db_error_msg = ''; protected $conn_failure = FALSE; protected $db_index = 0; protected $last_result = NULL; protected $tables = NULL; protected $variables = NULL; protected $options = ... }; private $rc = class rcmail { public $config = class rcube_config { ... }; public $db = class rcube_db_mysql { ... }; public $memcache = NULL; public $memcached = NULL; public $redis = NULL; public $session = NULL; public $smtp = NULL; public $storage = NULL; public $output = NULL; public $plugins = class rcube_plugin_api { ... }; public $user = ...; public $request_status = 0; protected $texts = NULL; protected $caches = ...; protected $shutdown_functions = ...; public $task = NULL; public $action = ''; public $comm_path = './'; public $filename = 'rcubeinitdb.sh'; public $default_skin = 'elastic'; public $login_error = NULL; public $oauth = NULL; private $address_books = ...; private $action_map = ...; private $action_args = ... }; private $identities = ; private $emails = NULL }) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:117
+17-Feb-2023 10:46:24 UTC PHP   6. rcube->language_prop($lang = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:201
+17-Feb-2023 10:46:24 UTC PHP   7. substr($string = NULL, $offset = 0, $length = 2) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php:837
+17-Feb-2023 10:46:24 UTC PHP Deprecated:  preg_replace(): Passing null to parameter #3 ($subject) of type array|string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php on line 329
+17-Feb-2023 10:46:24 UTC PHP Stack trace:
+17-Feb-2023 10:46:24 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/vendor/roundcube/plugin-installer/src/bin/rcubeinitdb.sh:0
+17-Feb-2023 10:46:24 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/vendor/roundcube/plugin-installer/src/bin/rcubeinitdb.sh:6
+17-Feb-2023 10:46:24 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
+17-Feb-2023 10:46:24 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
+17-Feb-2023 10:46:24 UTC PHP   5. asciiwords($str = NULL, $css_id = *uninitialized*, $replace_with = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:121
+17-Feb-2023 10:46:24 UTC PHP   6. preg_replace($pattern = '/^a-z0-9\\_\\-\\.+/i', $replacement = '', $subject = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php:329
+17-Feb-2023 10:46:24 UTC PHP Deprecated:  substr(): Passing null to parameter #1 ($string) of type string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php on line 837
+17-Feb-2023 10:46:24 UTC PHP Stack trace:
+17-Feb-2023 10:46:24 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/vendor/roundcube/plugin-installer/src/bin/rcubeinitdb.sh:0
+17-Feb-2023 10:46:24 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/vendor/roundcube/plugin-installer/src/bin/rcubeinitdb.sh:6
+17-Feb-2023 10:46:24 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
+17-Feb-2023 10:46:24 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
+17-Feb-2023 10:46:24 UTC PHP   5. rcmail->set_user($user = class rcube_user { public $ID = NULL; public $data = NULL; public $language = NULL; public $prefs = ; private $db = class rcube_db_mysql { public $db_provider = 'mysql'; protected $db_dsnw = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnr = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnw_array = ...; protected $db_dsnr_array = ...; protected $db_connected = FALSE; protected $db_mode = NULL; protected $db_pconn = FALSE; protected $dbh = NULL; protected $dbhs = ...; protected $table_connections = ...; protected $db_error = FALSE; protected $db_error_msg = ''; protected $conn_failure = FALSE; protected $db_index = 0; protected $last_result = NULL; protected $tables = NULL; protected $variables = NULL; protected $options = ... }; private $rc = class rcmail { public $config = class rcube_config { ... }; public $db = class rcube_db_mysql { ... }; public $memcache = NULL; public $memcached = NULL; public $redis = NULL; public $session = NULL; public $smtp = NULL; public $storage = NULL; public $output = NULL; public $plugins = class rcube_plugin_api { ... }; public $user = ...; public $request_status = 0; protected $texts = NULL; protected $caches = ...; protected $shutdown_functions = ...; public $task = NULL; public $action = ''; public $comm_path = './'; public $filename = 'rcubeinitdb.sh'; public $default_skin = 'elastic'; public $login_error = NULL; public $oauth = NULL; private $address_books = ...; private $action_map = ...; private $action_args = ... }; private $identities = ; private $emails = NULL }) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:117
+17-Feb-2023 10:46:24 UTC PHP   6. rcube->language_prop($lang = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:201
+17-Feb-2023 10:46:24 UTC PHP   7. substr($string = NULL, $offset = 0, $length = 2) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php:837
+17-Feb-2023 10:46:24 UTC PHP Deprecated:  preg_replace(): Passing null to parameter #3 ($subject) of type array|string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php on line 329
+17-Feb-2023 10:46:24 UTC PHP Stack trace:
+17-Feb-2023 10:46:24 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/vendor/roundcube/plugin-installer/src/bin/rcubeinitdb.sh:0
+17-Feb-2023 10:46:24 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/vendor/roundcube/plugin-installer/src/bin/rcubeinitdb.sh:6
+17-Feb-2023 10:46:24 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
+17-Feb-2023 10:46:24 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
+17-Feb-2023 10:46:24 UTC PHP   5. asciiwords($str = NULL, $css_id = *uninitialized*, $replace_with = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:121
+17-Feb-2023 10:46:24 UTC PHP   6. preg_replace($pattern = '/^a-z0-9\\_\\-\\.+/i', $replacement = '', $subject = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php:329
+17-Feb-2023 10:46:25 UTC PHP Deprecated:  substr(): Passing null to parameter #1 ($string) of type string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php on line 837
+17-Feb-2023 10:46:25 UTC PHP Stack trace:
+17-Feb-2023 10:46:25 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/install-jsdeps.sh:0
+17-Feb-2023 10:46:25 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/install-jsdeps.sh:23
+17-Feb-2023 10:46:25 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
+17-Feb-2023 10:46:25 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
+17-Feb-2023 10:46:25 UTC PHP   5. rcmail->set_user($user = class rcube_user { public $ID = NULL; public $data = NULL; public $language = NULL; public $prefs = ; private $db = class rcube_db_mysql { public $db_provider = 'mysql'; protected $db_dsnw = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnr = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnw_array = ...; protected $db_dsnr_array = ...; protected $db_connected = FALSE; protected $db_mode = NULL; protected $db_pconn = FALSE; protected $dbh = NULL; protected $dbhs = ...; protected $table_connections = ...; protected $db_error = FALSE; protected $db_error_msg = ''; protected $conn_failure = FALSE; protected $db_index = 0; protected $last_result = NULL; protected $tables = NULL; protected $variables = NULL; protected $options = ... }; private $rc = class rcmail { public $config = class rcube_config { ... }; public $db = class rcube_db_mysql { ... }; public $memcache = NULL; public $memcached = NULL; public $redis = NULL; public $session = NULL; public $smtp = NULL; public $storage = NULL; public $output = NULL; public $plugins = class rcube_plugin_api { ... }; public $user = ...; public $request_status = 0; protected $texts = NULL; protected $caches = ...; protected $shutdown_functions = ...; public $task = NULL; public $action = ''; public $comm_path = './'; public $filename = 'install-jsdeps.sh'; public $default_skin = 'elastic'; public $login_error = NULL; public $oauth = NULL; private $address_books = ...; private $action_map = ...; private $action_args = ... }; private $identities = ; private $emails = NULL }) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:117
+17-Feb-2023 10:46:25 UTC PHP   6. rcube->language_prop($lang = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:201
+17-Feb-2023 10:46:25 UTC PHP   7. substr($string = NULL, $offset = 0, $length = 2) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php:837
+17-Feb-2023 10:46:25 UTC PHP Deprecated:  preg_replace(): Passing null to parameter #3 ($subject) of type array|string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php on line 329
+17-Feb-2023 10:46:25 UTC PHP Stack trace:
+17-Feb-2023 10:46:25 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/install-jsdeps.sh:0
+17-Feb-2023 10:46:25 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/install-jsdeps.sh:23
+17-Feb-2023 10:46:25 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
+17-Feb-2023 10:46:25 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
+17-Feb-2023 10:46:25 UTC PHP   5. asciiwords($str = NULL, $css_id = *uninitialized*, $replace_with = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:121
+17-Feb-2023 10:46:25 UTC PHP   6. preg_replace($pattern = '/^a-z0-9\\_\\-\\.+/i', $replacement = '', $subject = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php:329
+17-Feb-2023 10:46:39 UTC PHP Deprecated:  substr(): Passing null to parameter #1 ($string) of type string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php on line 837
+17-Feb-2023 10:46:39 UTC PHP Stack trace:
+17-Feb-2023 10:46:39 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:0
+17-Feb-2023 10:46:39 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:22
+17-Feb-2023 10:46:39 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
+17-Feb-2023 10:46:39 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
+17-Feb-2023 10:46:39 UTC PHP   5. rcmail->set_user($user = class rcube_user { public $ID = NULL; public $data = NULL; public $language = NULL; public $prefs = ; private $db = class rcube_db_mysql { public $db_provider = 'mysql'; protected $db_dsnw = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnr = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnw_array = ...; protected $db_dsnr_array = ...; protected $db_connected = FALSE; protected $db_mode = NULL; protected $db_pconn = FALSE; protected $dbh = NULL; protected $dbhs = ...; protected $table_connections = ...; protected $db_error = FALSE; protected $db_error_msg = ''; protected $conn_failure = FALSE; protected $db_index = 0; protected $last_result = NULL; protected $tables = NULL; protected $variables = NULL; protected $options = ... }; private $rc = class rcmail { public $config = class rcube_config { ... }; public $db = class rcube_db_mysql { ... }; public $memcache = NULL; public $memcached = NULL; public $redis = NULL; public $session = NULL; public $smtp = NULL; public $storage = NULL; public $output = NULL; public $plugins = class rcube_plugin_api { ... }; public $user = ...; public $request_status = 0; protected $texts = NULL; protected $caches = ...; protected $shutdown_functions = ...; public $task = NULL; public $action = ''; public $comm_path = './'; public $filename = 'updatecss.sh'; public $default_skin = 'elastic'; public $login_error = NULL; public $oauth = NULL; private $address_books = ...; private $action_map = ...; private $action_args = ... }; private $identities = ; private $emails = NULL }) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:117
+17-Feb-2023 10:46:39 UTC PHP   6. rcube->language_prop($lang = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:201
+17-Feb-2023 10:46:39 UTC PHP   7. substr($string = NULL, $offset = 0, $length = 2) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php:837
+17-Feb-2023 10:46:39 UTC PHP Deprecated:  preg_replace(): Passing null to parameter #3 ($subject) of type array|string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php on line 329
+17-Feb-2023 10:46:39 UTC PHP Stack trace:
+17-Feb-2023 10:46:39 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:0
+17-Feb-2023 10:46:39 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:22
+17-Feb-2023 10:46:39 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
+17-Feb-2023 10:46:39 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
+17-Feb-2023 10:46:39 UTC PHP   5. asciiwords($str = NULL, $css_id = *uninitialized*, $replace_with = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:121
+17-Feb-2023 10:46:39 UTC PHP   6. preg_replace($pattern = '/^a-z0-9\\_\\-\\.+/i', $replacement = '', $subject = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php:329
+17-Feb-2023 10:46:41 UTC PHP Deprecated:  substr(): Passing null to parameter #1 ($string) of type string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php on line 837
+17-Feb-2023 10:46:41 UTC PHP Stack trace:
+17-Feb-2023 10:46:41 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:0
+17-Feb-2023 10:46:41 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:22
+17-Feb-2023 10:46:41 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
+17-Feb-2023 10:46:41 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
+17-Feb-2023 10:46:41 UTC PHP   5. rcmail->set_user($user = class rcube_user { public $ID = NULL; public $data = NULL; public $language = NULL; public $prefs = ; private $db = class rcube_db_mysql { public $db_provider = 'mysql'; protected $db_dsnw = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnr = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnw_array = ...; protected $db_dsnr_array = ...; protected $db_connected = FALSE; protected $db_mode = NULL; protected $db_pconn = FALSE; protected $dbh = NULL; protected $dbhs = ...; protected $table_connections = ...; protected $db_error = FALSE; protected $db_error_msg = ''; protected $conn_failure = FALSE; protected $db_index = 0; protected $last_result = NULL; protected $tables = NULL; protected $variables = NULL; protected $options = ... }; private $rc = class rcmail { public $config = class rcube_config { ... }; public $db = class rcube_db_mysql { ... }; public $memcache = NULL; public $memcached = NULL; public $redis = NULL; public $session = NULL; public $smtp = NULL; public $storage = NULL; public $output = NULL; public $plugins = class rcube_plugin_api { ... }; public $user = ...; public $request_status = 0; protected $texts = NULL; protected $caches = ...; protected $shutdown_functions = ...; public $task = NULL; public $action = ''; public $comm_path = './'; public $filename = 'updatecss.sh'; public $default_skin = 'elastic'; public $login_error = NULL; public $oauth = NULL; private $address_books = ...; private $action_map = ...; private $action_args = ... }; private $identities = ; private $emails = NULL }) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:117
+17-Feb-2023 10:46:41 UTC PHP   6. rcube->language_prop($lang = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:201
+17-Feb-2023 10:46:41 UTC PHP   7. substr($string = NULL, $offset = 0, $length = 2) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php:837
+17-Feb-2023 10:46:41 UTC PHP Deprecated:  preg_replace(): Passing null to parameter #3 ($subject) of type array|string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php on line 329
+17-Feb-2023 10:46:41 UTC PHP Stack trace:
+17-Feb-2023 10:46:41 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:0
+17-Feb-2023 10:46:41 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:22
+17-Feb-2023 10:46:41 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
+17-Feb-2023 10:46:41 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
+17-Feb-2023 10:46:41 UTC PHP   5. asciiwords($str = NULL, $css_id = *uninitialized*, $replace_with = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:121
+17-Feb-2023 10:46:41 UTC PHP   6. preg_replace($pattern = '/^a-z0-9\\_\\-\\.+/i', $replacement = '', $subject = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php:329
+17-Feb-2023 10:46:44 UTC PHP Deprecated:  substr(): Passing null to parameter #1 ($string) of type string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php on line 837
+17-Feb-2023 10:46:44 UTC PHP Stack trace:
+17-Feb-2023 10:46:44 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:0
+17-Feb-2023 10:46:44 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:22
+17-Feb-2023 10:46:44 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
+17-Feb-2023 10:46:44 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
+17-Feb-2023 10:46:44 UTC PHP   5. rcmail->set_user($user = class rcube_user { public $ID = NULL; public $data = NULL; public $language = NULL; public $prefs = ; private $db = class rcube_db_mysql { public $db_provider = 'mysql'; protected $db_dsnw = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnr = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnw_array = ...; protected $db_dsnr_array = ...; protected $db_connected = FALSE; protected $db_mode = NULL; protected $db_pconn = FALSE; protected $dbh = NULL; protected $dbhs = ...; protected $table_connections = ...; protected $db_error = FALSE; protected $db_error_msg = ''; protected $conn_failure = FALSE; protected $db_index = 0; protected $last_result = NULL; protected $tables = NULL; protected $variables = NULL; protected $options = ... }; private $rc = class rcmail { public $config = class rcube_config { ... }; public $db = class rcube_db_mysql { ... }; public $memcache = NULL; public $memcached = NULL; public $redis = NULL; public $session = NULL; public $smtp = NULL; public $storage = NULL; public $output = NULL; public $plugins = class rcube_plugin_api { ... }; public $user = ...; public $request_status = 0; protected $texts = NULL; protected $caches = ...; protected $shutdown_functions = ...; public $task = NULL; public $action = ''; public $comm_path = './'; public $filename = 'updatecss.sh'; public $default_skin = 'elastic'; public $login_error = NULL; public $oauth = NULL; private $address_books = ...; private $action_map = ...; private $action_args = ... }; private $identities = ; private $emails = NULL }) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:117
+17-Feb-2023 10:46:44 UTC PHP   6. rcube->language_prop($lang = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:201
+17-Feb-2023 10:46:44 UTC PHP   7. substr($string = NULL, $offset = 0, $length = 2) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php:837
+17-Feb-2023 10:46:44 UTC PHP Deprecated:  preg_replace(): Passing null to parameter #3 ($subject) of type array|string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php on line 329
+17-Feb-2023 10:46:44 UTC PHP Stack trace:
+17-Feb-2023 10:46:44 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:0
+17-Feb-2023 10:46:44 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:22
+17-Feb-2023 10:46:44 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
+17-Feb-2023 10:46:44 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
+17-Feb-2023 10:46:44 UTC PHP   5. asciiwords($str = NULL, $css_id = *uninitialized*, $replace_with = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:121
+17-Feb-2023 10:46:44 UTC PHP   6. preg_replace($pattern = '/^a-z0-9\\_\\-\\.+/i', $replacement = '', $subject = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php:329

roundcubemail-1.5.3.tar.gz/node_modules Deleted

roundcubemail-1.5.3.tar.gz/node_modules/.bin Deleted

roundcubemail-1.5.3.tar.gz/node_modules/.package-lock.json Deleted

roundcubemail-1.5.3.tar.gz/package-lock.json Deleted

roundcubemail-1.5.3.tar.gz/package.json Deleted

roundcubemail-1.5.3.tar.gz/phpstan.neon Added

roundcubemail-1.5.3.tar.gz/plugins/calendar/calendar.php Changed

@@ -2116,7 +2116,7 @@
         // check for organizer in attendees list
         $organizer = null;
         foreach ((array) $event'attendees' as $i => $attendee) {
-            if (!empty($attendee'role') && $attendee'role' == 'ORGANIZER') {
+            if ($attendee'role' == 'ORGANIZER') {
                 $organizer = $attendee;
             }
             if (!empty($attendee'status') && $attendee'status' == 'DELEGATED' && empty($attendee'rsvp')) {
@@ -3380,7 +3380,7 @@
                 '_instance' => isset($event'_instance') ? $event'_instance' : null,
                 'changed'   => is_object($event'changed') ? $event'changed'->format('U') : 0,
                 'sequence'  => intval($event'sequence'),
-                'fallback'  => strtoupper((string) $status),
+                'fallback'  => strtoupper($status),
                 'method'    => $event'_method',
                 'task'      => 'calendar',
             ;
@@ -3390,28 +3390,25 @@
                 $organizer = null;
                 $emails = $this->get_user_emails();
                 foreach ($event'attendees' as $i => $attendee) {
-                    $attendee_role = $attendee'role' ?? null;
-                    $attendee_email = $attendee'email' ?? null;
-
-                    if ($attendee_role == 'ORGANIZER') {
+                    if ($attendee'role' == 'ORGANIZER') {
                         $organizer = $attendee;
                     }
-                    else if ($attendee_email && in_array(strtolower($attendee_email), $emails)) {
+                    else if (!empty($attendee'email') && in_array(strtolower($attendee'email'), $emails)) {
                         $event'attendees'$i'status' = strtoupper($status);
                         if (!in_array($event'attendees'$i'status', 'NEEDS-ACTION', 'DELEGATED')) {
                             $event'attendees'$i'rsvp' = false;  // unset RSVP attribute
                         }
 
-                        $metadata'attendee' = $attendee_email;
-                        $metadata'rsvp'     = $attendee_role != 'NON-PARTICIPANT';
+                        $metadata'attendee' = $attendee'email';
+                        $metadata'rsvp'     = $attendee'role' != 'NON-PARTICIPANT';
 
-                        $reply_sender   = $attendee_email;
+                        $reply_sender   = $attendee'email';
                         $event_attendee = $attendee;
                     }
                 }
 
                 // add attendee with this user's default identity if not listed
-                if (empty($reply_sender)) {
+                if (!$reply_sender) {
                     $sender_identity = $this->rc->user->list_emails(true);
                     $event'attendees' = 
                         'name'   => $sender_identity'name',
@@ -3433,9 +3430,6 @@
                     $existing = null;
                 }
 
-                $event_attendee   = null;
-                $update_attendees = ;
-
                 if ($existing) {
                     $calendar = $calendars$existing'calendar';
 
@@ -3446,6 +3440,9 @@
                     if ($event'_method' == 'REPLY') {
                         $existing_attendee_index  = -1;
 
+                        $event_attendee   = null;
+                        $update_attendees = ;
+
                         if ($attendee = $this->itip->find_reply_attendee($event)) {
                             $event_attendee       = $attendee;
                             $update_attendees   = $attendee;
@@ -3540,7 +3537,7 @@
                         // show me as free when declined (#1670)
                         if ($status == 'declined'
                             || (!empty($event'status') && $event'status' == 'CANCELLED')
-                            || ($event_attendee && ($event_attendee'role' ?? '') == 'NON-PARTICIPANT')
+                            || $event_attendee'role' == 'NON-PARTICIPANT'
                         ) {
                             $event'free_busy' = 'free';
                         }
@@ -3549,7 +3546,7 @@
                     }
                     else if (!empty($status)) {
                         $existing'attendees' = $event'attendees';
-                        if ($status == 'declined' || ($event_attendee && ($event_attendee'role' ?? '') == 'NON-PARTICIPANT')) {
+                        if ($status == 'declined' || $event_attendee'role' == 'NON-PARTICIPANT') {
                             // show me as free when declined (#1670)
                             $existing'free_busy' = 'free';
                         }
@@ -3562,7 +3559,7 @@
                 else if (!$existing && ($status != 'declined' || $this->rc->config->get('kolab_invitation_calendars'))) {
                     if ($status == 'declined'
                         || $event'status' == 'CANCELLED'
-                        || ($event_attendee && ($event_attendee'role' ?? '') == 'NON-PARTICIPANT')
+                        || $event_attendee'role' == 'NON-PARTICIPANT'
                     ) {
                         $event'free_busy' = 'free';
                     }
@@ -3599,7 +3596,7 @@
                     }
 
                     // save to the selected/default calendar
-                    if (empty($master)) {
+                    if (!$master) {
                         $event'calendar' = $calendar'id';
                         $success = $this->driver->new_event($event);
                     }

roundcubemail-1.5.3.tar.gz/plugins/calendar/calendar_ui.js Changed

roundcubemail-1.5.3.tar.gz/plugins/calendar/drivers/caldav/SQL/mysql.initial.sql Changed

roundcubemail-1.5.3.tar.gz/plugins/calendar/drivers/caldav/caldav_calendar.php Changed

roundcubemail-1.5.3.tar.gz/plugins/calendar/drivers/database/database_driver.php Changed

roundcubemail-1.5.3.tar.gz/plugins/calendar/drivers/kolab/kolab_calendar.php Changed

roundcubemail-1.5.3.tar.gz/plugins/calendar/drivers/kolab/kolab_driver.php Changed

@@ -596,7 +596,7 @@
     {
         if (is_array($event)) {
             $id  = !empty($event'id') ? $event'id' : $event'uid';
-            $cal = $event'calendar' ?? null;
+            $cal = $event'calendar';
 
             // we're looking for a recurring instance: expand the ID to our internal convention for recurring instances
             if (empty($event'id') && !empty($event'_instance')) {
@@ -1021,12 +1021,17 @@
 
             $old = $fromcalendar->get_event($event'id');
 
-            if (empty($event'_savemode') || $event'_savemode' != 'new') {
+            if ($event'_savemode' != 'new') {
                 if (!$fromcalendar->storage->move($old'uid', $storage->storage)) {
                     return false;
                 }
+
+                $fromcalendar = $storage;
             }
         }
+        else {
+            $fromcalendar = $storage;
+        }
 
         $success  = false;
         $savemode = 'all';
@@ -1804,17 +1809,13 @@
             }
 
             foreach ($candidates as $id => $alarm) {
-                if (!array_key_exists($id, $dbdata)) {
-                    continue;
-                }
-
                 // skip dismissed alarms
-                if (!empty($dbdata$id'dismissed')) {
+                if ($dbdata$id'dismissed') {
                     continue;
                 }
 
                 // snooze function may have shifted alarm time
-                $notifyat = !empty($dbdata$id'notifyat') ? strtotime($dbdata$id'notifyat') : $alarm'notifyat';
+                $notifyat = $dbdata$id'notifyat' ? strtotime($dbdata$id'notifyat') : $alarm'notifyat';
                 if ($notifyat <= $time) {
                     $alarms = $alarm;
                 }
@@ -2256,7 +2257,7 @@
             }
 
             if (in_array($partstat, $partstats)) {
-                $event'className' = trim(($event'className' ?? '') . ' fc-invitation-' . strtolower($partstat));
+                $event'className' = trim($event'className' . ' fc-invitation-' . strtolower($partstat));
             }
         }

roundcubemail-1.5.3.tar.gz/plugins/calendar/drivers/kolab/kolab_invitation_calendar.php Changed

roundcubemail-1.5.3.tar.gz/plugins/enigma/config.inc.php.dist Changed

roundcubemail-1.5.3.tar.gz/plugins/enigma/lib/enigma_engine.php Changed

@@ -28,7 +28,6 @@
     private $pgp_driver;
     private $smime_driver;
     private $password_time;
-    private $sender;
     private $cache = ;
 
     public $decryptions     = ;
@@ -273,9 +272,6 @@
 
         $recipients = array_unique($recipients);
 
-        // Fetch keys from external sources, if configured
-        $this->sync_keys($recipients);
-
         // find recipient public keys
         foreach ((array) $recipients as $email) {
             if ($email == $from && $sign_key) {
@@ -384,17 +380,6 @@
             return;
         }
 
-        // Get the message/part sender
-        if (!empty($p'object'->sender) && !empty($p'object'->sender'mailto')) {
-            $this->sender = $p'object'->sender'mailto';
-        }
-        if (!empty($p'structure'->headers) && !empty($p'structure'->headers'from')) {
-            $from = rcube_mime::decode_address_list($p'structure'->headers'from', 1, false);
-            if (($from = current($from)) && !empty($from'mailto')) {
-                $this->sender = $from'mailto';
-            }
-        }
-
         // Don't be tempted to support encryption in text/html parts
         // Because of EFAIL vulnerability we should never support this (#6289)
 
@@ -896,11 +881,6 @@
     {
         // @TODO: Handle big bodies using (temp) files
 
-        // Import sender's key from external sources, if configured
-        if ($this->sender) {
-            $this->sync_keys($this->sender);
-        }
-
         // Get rid of possible non-ascii characters (#5962)
         $sig_body = preg_replace('/^\x00-\x7F/', '', $sig_body);
 
@@ -925,11 +905,6 @@
     {
         // @TODO: Handle big bodies using (temp) files
 
-        // Import sender's key from external sources, if configured
-        if ($this->sender) {
-            $this->sync_keys($this->sender);
-        }
-
         // Get rid of possible non-ascii characters (#5962)
         $msg_body = preg_replace('/^\x00-\x7F/', '', $msg_body);
 
@@ -1045,25 +1020,19 @@
             return;
         }
 
-        $mode  = $can_sign ? enigma_key::CAN_SIGN : enigma_key::CAN_ENCRYPT;
-        $found = ;
+        $mode = $can_sign ? enigma_key::CAN_SIGN : enigma_key::CAN_ENCRYPT;
+        $ret  = null;
 
         // check key validity and type
         foreach ($result as $key) {
             if (($subkey = $key->find_subkey($email, $mode))
                 && (!$can_sign || $key->get_type() == enigma_key::TYPE_KEYPAIR)
             ) {
-                $found$subkey->get_creation_date(true) = $key;
+                $ret = $key;
+                break;
             }
         }
 
-        // Use the most recent one
-        if (count($found) > 1) {
-            ksort($found, SORT_NUMERIC);
-        }
-
-        $ret = count($found) > 0 ? array_pop($found) : null;
-
         // cache private key info for better performance
         // we can skip one list_keys() call when signing and attaching a key
         if ($can_sign) {
@@ -1473,58 +1442,4 @@
             );
         }
     }
-
-    /**
-     * Import public keys from DNS according to Kolab Web-Of-Anti-Trust
-     *
-     * @param array $recipients List of email addresses
-     */
-    protected function sync_keys($recipients)
-    {
-        $import = ;
-        $woat = $this->rc->config->get('enigma_woat');
-
-        if (empty($woat)) {
-            return;
-        }
-
-        foreach ($recipients as $recipient) {
-            if (!strpos($recipient, '@')) {
-                continue;
-            }
-
-            list($local, $domain) = explode('@', $recipient);
-
-            // Do this for configured domains only
-            if (is_array($woat) && !in_array_nocase($domain, $woat)) {
-                continue;
-            }
-
-            // remove parts behind a recipient delimiter ("jeroen+Trash" => "jeroen")
-            $local = preg_replace('/\+.*$/', '', $local);
-
-            $fqdn = sha1($local) . '._woat.' . $domain;
-
-            // Fetch the TXT record(s)
-            if (($records = dns_get_record($fqdn, DNS_TXT)) === false) {
-                continue;
-            }
-
-            foreach ($records as $record) {
-                if (strpos($record'txt', 'v=woat1,') === 0) {
-                    $entry = explode('public_key=', $record'txt');
-                    if (count($entry) == 2) {
-                        $import = $entry1;
-                        // For now we support only one key
-                        break;
-                    }
-                }
-            }
-        }
-
-        // Import the fetched keys
-        if (!empty($import)) {
-            $this->import_key(implode("\n", $import));
-        }
-    }
 }

roundcubemail-1.5.3.tar.gz/plugins/enigma/lib/enigma_subkey.php Changed

roundcubemail-1.5.3.tar.gz/plugins/kolab_activesync/kolab_activesync_ui.php Changed

roundcubemail-1.5.3.tar.gz/plugins/kolab_addressbook/drivers/carddav/carddav_contacts.php Changed

@@ -524,7 +524,7 @@
             $this->_fetch_groups();
             $count = count($this->distlists$this->gid'member');
         }
-        else if (isset($this->filter'ids') && is_array($this->filter'ids')) {
+        else if (is_array($this->filter'ids')) {
             $count = count($this->filter'ids');
         }
         else {
@@ -728,17 +728,14 @@
                 }
                 else {
                     // remove from distribution lists
-                    if (isset($this->groupmembers$id)) {
-                        foreach ((array) $this->groupmembers$id as $gid) {
-                            if (!$is_mailto || $gid == $this->gid) {
-                                $this->remove_from_group($gid, $id);
-                            }
+                    foreach ((array) $this->groupmembers$id as $gid) {
+                        if (!$is_mailto || $gid == $this->gid) {
+                            $this->remove_from_group($gid, $id);
                         }
-
-                        // clear internal cache
-                        unset($this->groupmembers$id);
                     }
 
+                    // clear internal cache
+                    unset($this->groupmembers$id);
                     $count++;
                 }
             }

roundcubemail-1.5.3.tar.gz/plugins/kolab_addressbook/drivers/kolab/kolab_contacts.php Changed

roundcubemail-1.5.3.tar.gz/plugins/kolab_folders/kolab_folders.php Changed

roundcubemail-1.5.3.tar.gz/plugins/libcalendaring/lib/libcalendaring_itip.php Changed

@@ -564,7 +564,7 @@
                 if ($attendee'email' && in_array(strtolower($attendee'email'), $emails)) {
                     $statusstrtolower($attendee'email') = $attendee'status';
                 }
-                if (!empty($attendee'role') && $attendee'role' == 'ORGANIZER') {
+                if ($attendee'role' == 'ORGANIZER') {
                     $attendee'status' = 'ACCEPTED'; // sometimes is not set for exceptions
                     $existing'attendees'$idx = $attendee;
                 }
@@ -731,10 +731,9 @@
 
             // check my status as an attendee
             foreach ($event'attendees' as $attendee) {
-                $attendee_role = $attendee'role' ?? '';
-                if (!empty($attendee'email') && $attendee_role != 'ORGANIZER' && in_array(strtolower($attendee'email'), $emails)) {
+                if ($attendee'email' && $attendee'role' != 'ORGANIZER' && in_array(strtolower($attendee'email'), $emails)) {
                     $metadata'attendee' = $attendee'email';
-                    $metadata'rsvp'     = $attendee'rsvp' || $attendee_role != 'NON-PARTICIPANT';
+                    $metadata'rsvp'     = $attendee'rsvp' || $attendee'role' != 'NON-PARTICIPANT';
                     $rsvp_status = !empty($attendee'status') ? strtoupper($attendee'status') : 'NEEDS-ACTION';
                     break;
                 }

roundcubemail-1.5.3.tar.gz/plugins/libcalendaring/lib/libcalendaring_vcalendar.php Changed

roundcubemail-1.5.3.tar.gz/plugins/libkolab/lib/kolab_dav_client.php Changed

roundcubemail-1.5.3.tar.gz/plugins/libkolab/lib/kolab_format_contact.php Changed

roundcubemail-1.5.3.tar.gz/plugins/libkolab/lib/kolab_format_xcal.php Changed

roundcubemail-1.5.3.tar.gz/plugins/libkolab/lib/kolab_storage_cache.php Changed

@@ -25,6 +25,7 @@
 class kolab_storage_cache
 {
     const DB_DATE_FORMAT = 'Y-m-d H:i:s';
+    const MAX_RECORDS    = 500;
 
     protected $db;
     protected $imap;
@@ -761,24 +762,29 @@
      * Select Kolab objects filtered by the given query
      *
      * @param array Pseudo-SQL query as list of filter parameter triplets
-     *              triplet: array('<colname>', '<comparator>', '<value>')
-     * @param bool  Set true to only return UIDs instead of complete objects
-     * @param bool  Use fast mode to fetch only minimal set of information
-     *              (no xml fetching and parsing, etc.)
+     *   triplet: array('<colname>', '<comparator>', '<value>')
+     * @param boolean Set true to only return UIDs instead of complete objects
+     * @param boolean Use fast mode to fetch only minimal set of information
+     *                (no xml fetching and parsing, etc.)
      *
-     * @return null|array|kolab_storage_dataset List of Kolab data objects
-     *                                          (each represented as hash array) or UIDs
+     * @return array List of Kolab data objects (each represented as hash array) or UIDs
      */
     public function select($query = array(), $uids = false, $fast = false)
     {
         $result = $uids ? array() : new kolab_storage_dataset($this);
+        $count = null;
 
         // read from local cache DB (assume it to be synchronized)
         if ($this->ready) {
             $this->_read_folder_data();
 
-            // fetch full object data unless only uids are requested
-            $fetchall = !$uids;
+            // fetch full object data on one query if a small result set is expected
+            $fetchall = !$uids && ($this->limit ? $this->limit0 : ($count = $this->count($query))) < self::MAX_RECORDS;
+
+            // skip SELECT if we know it will return nothing
+            if ($count === 0) {
+                return $result;
+            }
 
             $sql_query = "SELECT " . ($fetchall ? '*' : "`msguid` AS `_msguid`, `uid`")
                 . " FROM `{$this->cache_table}` WHERE `folder_id` = ?"
@@ -915,14 +921,6 @@
     }
 
     /**
-     * Reset the sync state, i.e. force sync when synchronize() is called again
-     */
-    public function reset()
-    {
-        $this->synched = null;
-    }
-
-    /**
      * Define ORDER BY clause for cache queries
      */
     public function set_order_by($sortcols)

roundcubemail-1.5.3.tar.gz/plugins/libkolab/lib/kolab_storage_config.php Changed

roundcubemail-1.5.3.tar.gz/plugins/libkolab/lib/kolab_storage_dav.php Changed

roundcubemail-1.5.3.tar.gz/plugins/libkolab/lib/kolab_storage_dav_cache.php Changed

@@ -414,10 +414,19 @@
     public function select($query = , $uids = false, $fast = false)
     {
         $result = $uids ?  : new kolab_storage_dataset($this);
+        $count  = null;
 
         $this->_read_folder_data();
 
-        $sql_query = "SELECT " . ($uids ? "`uid`" : '*')
+        // fetch full object data on one query if a small result set is expected
+        $fetchall = !$uids && ($this->limit ? $this->limit0 : ($count = $this->count($query))) < self::MAX_RECORDS;
+
+        // skip SELECT if we know it will return nothing
+        if ($count === 0) {
+            return $result;
+        }
+
+        $sql_query = "SELECT " . ($fetchall ? '*' : "`uid`")
             . " FROM `{$this->cache_table}` WHERE `folder_id` = ?"
             . $this->_sql_where($query)
             . (!empty($this->order_by) ? " ORDER BY " . $this->order_by : '');
@@ -436,7 +445,13 @@
         }
 
         while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
-            if (!$uids && ($object = $this->_unserialize($sql_arr, true, $fast))) {
+            if ($uids) {
+                $result = $sql_arr'uid';
+            }
+            else if (!$fetchall) {
+                $result = $sql_arr;
+            }
+            else if (($object = $this->_unserialize($sql_arr, true, $fast))) {
                 $result = $object;
             }
             else {

roundcubemail-1.5.3.tar.gz/plugins/libkolab/lib/kolab_storage_dav_folder.php Changed

@@ -24,16 +24,10 @@
 #AllowDynamicProperties
 class kolab_storage_dav_folder extends kolab_storage_folder
 {
-    /** @var kolab_dav_client DAV Client */
     public $dav;
-
-    /** @var string Folder URL */
     public $href;
-
-    /** @var array Folder DAV attributes */
     public $attributes;
 
-
     /**
      * Object constructor
      */
@@ -82,13 +76,6 @@
      */
     public function get_ctag()
     {
-        // Refresh requested, get the current CTag from the DAV server
-        if ($this->attributes'ctag' === false) {
-            if ($fresh = $this->dav->folderInfo($this->href)) {
-                $this->attributes'ctag' = $fresh'ctag';
-            }
-        }
-
         return $this->attributes'ctag';
     }
 
@@ -343,8 +330,6 @@
 
         if ($success) {
             $this->cache->set($uid, false);
-            $target_folder->reset();
-            $this->reset();
         }
 
         return $success;
@@ -478,15 +463,6 @@
     }
 
     /**
-     * Reset the folder status
-     */
-    public function reset()
-    {
-        $this->cache->reset();
-        $this->attributes'ctag' = false;
-    }
-
-    /**
      * Convert DAV object into PHP array
      *
      * @param array Object data in kolab_dav_client::fetchData() format

roundcubemail-1.5.3.tar.gz/plugins/libkolab/lib/kolab_storage_folder.php Changed

@@ -69,7 +69,7 @@
         }
 
         $oldtype = $this->type;
-        list($this->type, $suffix) = array_pad(explode('.', $type_annotation), 2, null);
+        list($this->type, $suffix) = explode('.', $type_annotation);
         $this->default      = $suffix == 'default';
         $this->subtype      = $this->default ? '' : $suffix;
         $this->id           = kolab_storage::folder_id($name);
@@ -266,25 +266,6 @@
     }
 
     /**
-     * Getter for a single Kolab object identified by its UID
-     *
-     * @param string $uid Object UID
-     *
-     * @return array The Kolab object represented as hash array
-     */
-    public function get_object($uid)
-    {
-        if (!$this->valid || !$uid) {
-            return false;
-        }
-
-        // synchronize caches
-        $this->cache->synchronize();
-
-        return $this->cache->get_by_uid($uid);
-    }
-
-    /**
      * List Kolab objects matching the given query
      *
      * @param mixed Pseudo-SQL query as list of filter parameter triplets
@@ -385,6 +366,25 @@
     }
 
     /**
+     * Getter for a single Kolab object identified by its UID
+     *
+     * @param string $uid Object UID
+     *
+     * @return array The Kolab object represented as hash array
+     */
+    public function get_object($uid)
+    {
+        if (!$this->valid || !$uid) {
+            return false;
+        }
+
+        // synchronize caches
+        $this->cache->synchronize();
+
+        return $this->cache->get_by_uid($uid);
+    }
+
+    /**
      * Fetch a Kolab object attachment which is stored in a separate part
      * of the mail MIME message that represents the Kolab record.
      *

roundcubemail-1.5.3.tar.gz/plugins/managesieve/managesieve.js Changed

roundcubemail-1.5.3.tar.gz/plugins/tasklist/config.inc.php Changed

roundcubemail-1.5.3.tar.gz/plugins/tasklist/config.inc.php.dist Changed

roundcubemail-1.5.3.tar.gz/plugins/vcard_attachments/vcard_attachments.php Changed

roundcubemail-1.5.3.tar.gz/program/include/rcmail.php Changed

@@ -300,26 +300,27 @@
      *                          - rcube_addressbook::TYPE_CONTACT (or 'sql') for the SQL addressbook
      *                          - rcube_addressbook::TYPE_DEFAULT for the default addressbook
      * @param bool   $writeable True if the address book needs to be writeable
+     * @param bool   $fallback  Fallback to the first existing source, if the configured default wasn't found
      *
      * @return rcube_contacts|null Address book object
      */
-    public function get_address_book($id, $writeable = false)
+    public function get_address_book($id, $writeable = false, $fallback = true)
     {
         $contacts    = null;
         $ldap_config = (array) $this->config->get('ldap_public');
         $default     = false;
 
+        $id = (string) $id;
+
         // 'sql' is the alias for '0' used by autocomplete
         if ($id == 'sql') {
-            $id = rcube_addressbook::TYPE_CONTACT;
+            $id = (string) rcube_addressbook::TYPE_CONTACT;
         }
-        else if ($id == rcube_addressbook::TYPE_DEFAULT || $id == -1) { // -1 for BC
+        else if ($id === strval(rcube_addressbook::TYPE_DEFAULT) || $id === '-1') { // -1 for BC
             $id = $this->config->get('default_addressbook');
             $default = true;
         }
 
-        $id = (string) $id;
-
         // use existing instance
         if (isset($this->address_books$id) && ($this->address_books$id instanceof rcube_addressbook)) {
             $contacts = $this->address_books$id;
@@ -352,12 +353,13 @@
 
         // Get first addressbook from the list if configured default doesn't exist
         // This can happen when user deleted the addressbook (e.g. Kolab folder)
-        if (!$contacts && (!$id || $default)) {
+        if ($fallback && !$contacts && (!$id || $default)) {
             $source = $this->get_address_sources($writeable, !$default);
             $source = reset($source);
 
             if (!empty($source)) {
-                $contacts = $this->get_address_book($source'id');
+                // Note: No fallback here to prevent from an infinite loop
+                $contacts = $this->get_address_book($source'id', false, false);
                 if ($contacts) {
                     $id = $source'id';
                 }
@@ -1530,7 +1532,7 @@
      * Convert the given date to a human readable form
      * This uses the date formatting properties from config
      *
-     * @param mixed  $date    Date representation (string, timestamp or DateTime object)
+     * @param mixed  $date    Date representation (string, timestamp or DateTimeInterface)
      * @param string $format  Date format to use
      * @param bool   $convert Enables date conversion according to user timezone
      *

roundcubemail-1.5.3.tar.gz/program/js/app.js Changed

@@ -1363,11 +1363,8 @@
           this.list_mailbox(this.env.mailbox, 1);
         }
         else if (s && this.task == 'addressbook') {
-          if (this.env.source == '') {
-            for (n in this.env.address_sources) break;
-            this.env.source = n;
-            this.env.group = '';
-          }
+          this.env.source = this.env.last_source || '';
+          this.env.group = this.env.last_group || '';
           this.list_contacts(this.env.source, this.env.group, 1);
         }
         break;
@@ -4267,7 +4264,7 @@
     var container = $(this.gui_objects.editform).find('.identity-encryption').first();
     var identity_email = $(this.gui_objects.editform).find('.ff_email').val().trim();
 
-    if (!container.length || !identity_email || !this.mailvelope_keyring.createKeyGenContainer)
+    if (!container.length || !identity_email || !this.mailvelope_keyring.createKeyGenContainer)
       return;
 
     var key_fingerprint;
@@ -6359,8 +6356,8 @@
     else if (!this.env.search_request)
       folder = group ? 'G'+src+group : src;
 
-    this.env.source = src;
-    this.env.group = group;
+    this.env.source = this.env.last_source = src;
+    this.env.group = this.env.last_group = group;
 
     // truncate groups listing stack
     $.each(this.env.address_group_stack, function(i, v) {

roundcubemail-1.5.3.tar.gz/program/lib/Roundcube/bootstrap.php Changed

roundcubemail-1.5.3.tar.gz/program/lib/Roundcube/rcube.php Changed

@@ -224,7 +224,7 @@
             $this->caches$name = rcube_cache::factory($type, $userid, $name, $ttl, $packed, $indexed);
         }
 
-        return $this->caches$name ?? null;
+        return $this->caches$name;
     }
 
     /**
@@ -727,8 +727,8 @@
      */
     public function read_localization($dir, $lang = null)
     {
-        if ($lang == null && isset($_SESSION)) {
-            $lang = $_SESSION'language' ?? null;
+        if ($lang == null) {
+            $lang = $_SESSION'language';
         }
         $langs  = array_unique('en_US', $lang);
         $locdir = slashify($dir);
@@ -833,7 +833,7 @@
             $lang = $rcube_language_aliases$lang;
         }
         // try the first two chars
-        else if ($lang && !isset($rcube_languages$lang)) {
+        else if (!isset($rcube_languages$lang)) {
             $short = substr($lang, 0, 2);
 
             // check if we have an alias for the short language code
@@ -968,7 +968,7 @@
     public function get_secure_url_token($generate = false)
     {
         if ($len = $this->config->get('use_secure_urls')) {
-            if (empty($_SESSION'secure_token' ?? null) && $generate) {
+            if (empty($_SESSION'secure_token') && $generate) {
                 // generate x characters long token
                 $length = $len > 1 ? $len : 16;
                 $token  = rcube_utils::random_bytes($length);
@@ -978,7 +978,7 @@
                 $_SESSION'secure_token' = $plugin'value';
             }
 
-            return $_SESSION'secure_token' ?? false;
+            return $_SESSION'secure_token';
         }
 
         return false;

roundcubemail-1.5.3.tar.gz/program/lib/Roundcube/rcube_db.php Changed

roundcubemail-1.5.3.tar.gz/program/lib/Roundcube/rcube_imap_cache.php Changed

roundcubemail-1.5.3.tar.gz/program/lib/Roundcube/rcube_imap_generic.php Changed

@@ -206,7 +206,7 @@
 
         do {
             if ($this->eof()) {
-                return $line;
+                return $line ?: null;
             }
 
             $buffer = fgets($this->fp, $size);
@@ -246,7 +246,7 @@
 
             while (strlen($out) < $bytes) {
                 $out = $this->readBytes($bytes);
-                if ($out === '') {
+                if ($out === null) {
                     break;
                 }
 
@@ -278,7 +278,7 @@
 
             while (strlen($out) < $bytes) {
                 $line = $this->readBytes($bytes);
-                if ($line === '') {
+                if ($line === null) {
                     break;
                 }
 
@@ -1055,7 +1055,7 @@
         }
 
         if (!empty($this->prefs'socket_options')) {
-            $context  = stream_context_create('ssl' => $this->prefs'socket_options''ssl');
+            $context  = stream_context_create($this->prefs'socket_options');
             $this->fp = stream_socket_client($host . ':' . $this->prefs'port', $errno, $errstr,
                 $this->prefs'timeout', STREAM_CLIENT_CONNECT, $context);
         }
@@ -1070,14 +1070,6 @@
             return false;
         }
 
-        // insert proxy protocol header, if enabled
-        if (!empty($this->prefs'socket_options')) {
-            $proxy_protocol_header = rcube_utils::proxy_protocol_header($this->prefs'socket_options', $this->fp);
-            if (strlen($proxy_protocol_header) > 0) {
-                fwrite($this->fp, $proxy_protocol_header);
-            }
-        }
-        
         if ($this->prefs'timeout' > 0) {
             stream_set_timeout($this->fp, $this->prefs'timeout');
         }
@@ -2943,20 +2935,15 @@
                 $bytes = (int) $m1;
                 $prev  = '';
                 $found = true;
-                $chunkSize = 1024 * 1024;
 
                 // empty body
                 if (!$bytes) {
                     $result = '';
                 }
-                // An optimal path for a case when we need the body as-is in a string
-                else if (!$mode && !$file && !$print && !$formatted) {
-                    $result = $this->readBytes($bytes);
-                }
                 else while ($bytes > 0) {
-                    $line = $this->readBytes($bytes > $chunkSize ? $chunkSize : $bytes);
+                    $line = $this->readLine(8192);
 
-                    if ($line === '') {
+                    if ($line === null) {
                         break;
                     }

roundcubemail-1.5.3.tar.gz/program/lib/Roundcube/rcube_ldap.php Changed

@@ -142,7 +142,7 @@
 
         // use fieldmap to advertise supported coltypes to the application
         foreach ($this->fieldmap as $colv => $lfv) {
-            list($col, $type) = array_pad(explode(':', $colv), 2, null);
+            list($col, $type) = explode(':', $colv);
             $params           = explode(':', $lfv);
 
             $lf    = array_shift($params);
@@ -164,7 +164,7 @@
                 }
             }
 
-            if (!is_array($this->coltypes$col ?? null)) {
+            if (!is_array($this->coltypes$col)) {
                 $subtypes = $type ? $type : null;
                 $this->coltypes$col = 'limit' => $limit, 'subtypes' => $subtypes, 'attributes' => $lf;
             }
@@ -227,7 +227,7 @@
         if (
             !empty($this->prop'LDAP_rdn')
             && !in_array($this->prop'LDAP_rdn', $this->prop'required_fields')
-            && !in_array($this->prop'LDAP_rdn', array_keys((array)($this->prop'autovalues' ?? )))
+            && !in_array($this->prop'LDAP_rdn', array_keys((array)$this->prop'autovalues'))
         ) {
             $this->prop'required_fields' = $this->prop'LDAP_rdn';
         }
@@ -315,12 +315,12 @@
             $conf  = $rcube->plugins->exec_hook('ldap_connected', $this->prop + 'host' => $host);
 
             $bind_pass   = $conf'bind_pass';
-            $bind_user   = $conf'bind_user' ?? null;
+            $bind_user   = $conf'bind_user';
             $bind_dn     = $conf'bind_dn';
-            $auth_method = $conf'auth_method' ?? null;
+            $auth_method = $conf'auth_method';
 
             $this->base_dn        = $conf'base_dn';
-            $this->groups_base_dn = $conf'groups''base_dn' ?? $this->base_dn;
+            $this->groups_base_dn = $conf'groups''base_dn' ?: $this->base_dn;
 
             // User specific access, generate the proper values to use.
             if (!empty($conf'user_specific')) {
@@ -641,7 +641,7 @@
         $last_row = $subset != 0 ? $start_row + abs($subset) : $last_row;
 
         // filter entries for this page
-        for ($i = $start_row; $i < min($entries'count' ?? null, $last_row); $i++) {
+        for ($i = $start_row; $i < min($entries'count', $last_row); $i++) {
             if (!empty($entries$i)) {
                 $this->result->add($this->_ldap2result($entries$i));
             }
@@ -1619,7 +1619,7 @@
 
         foreach ($fieldmap as $rf => $lf) {
             // we might be dealing with normalized and non-normalized data
-            $entry = $rec$lf ?? null;
+            $entry = $rec$lf;
             if (!is_array($entry) || !isset($entry'count')) {
                 $entry = (array) $entry;
                 $entry'count' = count($entry);
@@ -1630,7 +1630,7 @@
                     continue;
                 }
 
-                list($col, $subtype) = array_pad(explode(':', $rf), 2, null);
+                list($col, $subtype) = explode(':', $rf);
                 $out'_raw_attrib'$lf$i = $value;
 
                 if ($col == 'email' && $this->mail_domain && !strpos($value, '@')) {
@@ -1652,7 +1652,7 @@
             }
 
             // Make sure name fields aren't arrays (#1488108)
-            if (is_array($out$rf ?? null) && in_array($rf, 'name', 'surname', 'firstname', 'middlename', 'nickname')) {
+            if (is_array($out$rf) && in_array($rf, 'name', 'surname', 'firstname', 'middlename', 'nickname')) {
                 $out$rf = $out'_raw_attrib'$lf = $out$rf0;
             }
         }
@@ -1758,7 +1758,7 @@
             'pkcs9email'    => 'email',
         ;
 
-        list($name, $limit) = array_pad(explode(':', $namev, 2), 2, null);
+        list($name, $limit) = explode(':', $namev, 2);
         $suffix = $limit ? ':'.$limit : '';
         $name   = strtolower($name);
 
@@ -1877,8 +1877,8 @@
         $filter     = $this->prop'groups''filter';
         $scope      = $this->prop'groups''scope';
         $name_attr  = $this->prop'groups''name_attr';
-        $email_attr = $this->prop'groups''email_attr' ?? 'mail';
-        $sort_attrs = (array) (($this->prop'groups''sort' ?? false) ? $this->prop'groups''sort' : $name_attr);
+        $email_attr = $this->prop'groups''email_attr' ?: 'mail';
+        $sort_attrs = (array) ($this->prop'groups''sort' ? $this->prop'groups''sort' : $name_attr);
         $sort_attr  = $sort_attrs0;
         $page_size  = 200;
 
@@ -1895,7 +1895,7 @@
             $ldap->set_vlv_page($vlv_page+1, $page_size);
         }
 
-        $props = 'sort' => $this->prop'groups''sort' ?? null;
+        $props = 'sort' => $this->prop'groups''sort';
         $attrs = array_unique('dn', 'objectClass', $name_attr, $email_attr, $sort_attr);
 
         // add search filter

roundcubemail-1.5.3.tar.gz/program/lib/Roundcube/rcube_ldap_generic.php Changed

roundcubemail-1.5.3.tar.gz/program/lib/Roundcube/rcube_message.php Changed

@@ -126,11 +126,6 @@
             )
         ;
 
-        $this->mime    = new rcube_mime($this->headers->charset);
-        $this->subject = str_replace("\n", '', $this->headers->get('subject'));
-        $from          = $this->mime->decode_address_list($this->headers->from, 1);
-        $this->sender  = current($from);
-
         if (!empty($this->headers->structure)) {
             $this->get_mime_numbers($this->headers->structure);
             $this->parse_structure($this->headers->structure);
@@ -139,6 +134,11 @@
             $this->body = $this->storage->get_body($uid);
         }
 
+        $this->mime    = new rcube_mime($this->headers->charset);
+        $this->subject = str_replace("\n", '', $this->headers->get('subject'));
+        $from          = $this->mime->decode_address_list($this->headers->from, 1);
+        $this->sender  = current($from);
+
         // notify plugins and let them analyze this structured message object
         $this->app->plugins->exec_hook('message_load', 'object' => $this);
     }

roundcubemail-1.5.3.tar.gz/program/lib/Roundcube/rcube_plugin.php Changed

roundcubemail-1.5.3.tar.gz/program/lib/Roundcube/rcube_utils.php Changed

@@ -1645,66 +1645,4 @@
 
         return trim($subject);
     }
-
-    /**
-     * Generates the HAproxy style PROXY protocol header for injection
-     * into the TCP stream, if configured.
-     *
-     * http://www.haproxy.org/download/1.6/doc/proxy-protocol.txt
-     * 
-     * PROXY protocol headers must be sent before any other data is sent on the TCP socket.
-     *
-     * @param array $options Preferences array which may contain proxy_protocol (generally {driver}_conn_options)
-     *
-     * @return string Proxy protocol header data, if enabled, otherwise empty string
-     */
-    public static function proxy_protocol_header($options = null)
-    {
-        if (empty($options) || !is_array($options) || !array_key_exists('proxy_protocol', $options)) {
-            return '';
-        }
-
-        if (is_array($options'proxy_protocol')) {
-            $version = $options'proxy_protocol''version';
-            $options = $options'proxy_protocol';
-        }
-        else {
-            $version = (int) $options'proxy_protocol';
-            $options = ;
-        }
-
-        $remote_addr = array_key_exists('remote_addr', $options) ? $options'remote_addr' : self::remote_addr();
-        $remote_port = array_key_exists('remote_port', $options) ? $options'remote_port' : $_SERVER'REMOTE_PORT';
-        $local_addr  = array_key_exists('local_addr', $options) ? $options'local_addr' : $_SERVER'SERVER_ADDR';
-        $local_port  = array_key_exists('local_port', $options) ? $options'local_port' : $_SERVER'SERVER_PORT';
-        $ip_version  = strpos($remote_addr, ':') === false ? 4 : 6;
-
-        // Text based PROXY protocol
-        if ($version == 1) {
-            // PROXY protocol does not support dual IPv6+IPv4 type addresses, e.g. ::127.0.0.1
-            if ($ip_version === 6 && strpos($remote_addr, '.') !== false) {
-                $remote_addr = inet_ntop(inet_pton($remote_addr));
-            }
-            if ($ip_version === 6 && strpos($local_addr, '.') !== false) {
-                $local_addr = inet_ntop(inet_pton($local_addr));
-            }
-
-            return "PROXY TCP{$ip_version} {$remote_addr} {$local_addr} {$remote_port} {$local_port}\r\n";
-        }
-
-        // Binary PROXY protocol
-        if ($version == 2) {
-            $addr = inet_pton($remote_addr) . inet_pton($local_addr) . pack('n', $remote_port) . pack('n', $local_port);
-            $head = implode(
-                    '0D0A0D0A000D0A515549540A',     // protocol header
-                    '21',                           // protocol version and command
-                    $ip_version === 6 ? '2' : '1',  // IP version type
-                    '1'                             // TCP
-            );
-
-            return pack('H*', $head) . pack('n', strlen($addr)) . $addr;
-        }
-
-        return '';
-    }
 }

roundcubemail-1.5.3.tar.gz/program/lib/Roundcube/rcube_vcard.php Changed

@@ -839,17 +839,22 @@
     {
         $vcard = '';
 
-        foreach ((array)$data as $type => $entries) {
-            // valid N has 5 properties
-            while ($type == "N" && is_array($entries0) && count($entries0) < 5) {
-                $entries0 = "";
-            }
+        // Make sure FN is not empty (required by RFC2426)
+        if (empty($data'FN')) {
+            $data'FN' = !empty($data'EMAIL'00) ? $data'EMAIL'00 : '';
+        }
 
-            // make sure FN is not empty (required by RFC2426)
-            if ($type == "FN" && empty($entries) && !empty($data'EMAIL'00)) {
-                $entries0 = $data'EMAIL'00;
-            }
+        // Make sure N is not empty (required by RFC2426)
+        if (empty($data'N')) {
+            $data'N' = '', '', '', '', '';
+        }
+
+        // Valid N has 5 properties
+        while (isset($data'N'0) && is_array($data'N'0) && count($data'N'0) < 5) {
+            $data'N'0 = '';
+        }
 
+        foreach ((array)$data as $type => $entries) {
             foreach ((array)$entries as $entry) {
                 $attr = '';
                 if (is_array($entry)) {
@@ -884,8 +889,8 @@
                     $value = $entry;
                 }
 
-                // skip empty entries
-                if (self::is_empty($value)) {
+                // Skip empty entries that aren't required by vCard v3 format
+                if (!in_array($type, 'N', 'FN') && self::is_empty($value)) {
                     continue;
                 }

roundcubemail-1.5.3.tar.gz/temp/js_cache/tinymce-langs-5.8.2.zip Changed

roundcubemail-1.5.3.tar.gz/tests/Framework/VCard.php Changed

roundcubemail-1.5.3.tar.gz/tests/src/Csv2vcard/email.vcf Changed

roundcubemail-1.5.3.tar.gz/tests/src/Csv2vcard/outlook.vcf Changed

roundcubemail-1.5.3.tar.gz/vendor/autoload.php Changed

roundcubemail-1.5.3.tar.gz/vendor/composer/autoload_real.php Changed

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit454e4d64ed1e6e11bb59e667f281caeb
+class ComposerAutoloaderInit48f84539c0cad8e9ad682cc3810ae7b5
 {
     private static $loader;
 
@@ -24,9 +24,9 @@
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit454e4d64ed1e6e11bb59e667f281caeb', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit48f84539c0cad8e9ad682cc3810ae7b5', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInit454e4d64ed1e6e11bb59e667f281caeb', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit48f84539c0cad8e9ad682cc3810ae7b5', 'loadClassLoader'));
 
         $includePaths = require __DIR__ . '/include_paths.php';
         $includePaths = get_include_path();
@@ -36,7 +36,7 @@
         if ($useStaticLoader) {
             require __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit454e4d64ed1e6e11bb59e667f281caeb::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit48f84539c0cad8e9ad682cc3810ae7b5::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
@@ -57,19 +57,19 @@
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit454e4d64ed1e6e11bb59e667f281caeb::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit48f84539c0cad8e9ad682cc3810ae7b5::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire454e4d64ed1e6e11bb59e667f281caeb($fileIdentifier, $file);
+            composerRequire48f84539c0cad8e9ad682cc3810ae7b5($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire454e4d64ed1e6e11bb59e667f281caeb($fileIdentifier, $file)
+function composerRequire48f84539c0cad8e9ad682cc3810ae7b5($fileIdentifier, $file)
 {
     if (empty($GLOBALS'__composer_autoload_files'$fileIdentifier)) {
         require $file;

roundcubemail-1.5.3.tar.gz/vendor/composer/autoload_static.php Changed

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit454e4d64ed1e6e11bb59e667f281caeb
+class ComposerStaticInit48f84539c0cad8e9ad682cc3810ae7b5
 {
     public static $files = array (
         '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@@ -1006,11 +1006,11 @@
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit454e4d64ed1e6e11bb59e667f281caeb::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit454e4d64ed1e6e11bb59e667f281caeb::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit454e4d64ed1e6e11bb59e667f281caeb::$prefixesPsr0;
-            $loader->fallbackDirsPsr0 = ComposerStaticInit454e4d64ed1e6e11bb59e667f281caeb::$fallbackDirsPsr0;
-            $loader->classMap = ComposerStaticInit454e4d64ed1e6e11bb59e667f281caeb::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit48f84539c0cad8e9ad682cc3810ae7b5::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit48f84539c0cad8e9ad682cc3810ae7b5::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInit48f84539c0cad8e9ad682cc3810ae7b5::$prefixesPsr0;
+            $loader->fallbackDirsPsr0 = ComposerStaticInit48f84539c0cad8e9ad682cc3810ae7b5::$fallbackDirsPsr0;
+            $loader->classMap = ComposerStaticInit48f84539c0cad8e9ad682cc3810ae7b5::$classMap;
 
         }, null, ClassLoader::class);
     }

roundcubemail-1.5.3.tar.gz/vendor/composer/installed.json Changed

@@ -377,17 +377,17 @@
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "1.5.3",
-            "version_normalized": "1.5.3.0",
+            "version": "1.5.2",
+            "version_normalized": "1.5.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e"
+                "reference": "b94b2807d85443f9719887892882d0329d1e2598"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e",
-                "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598",
+                "reference": "b94b2807d85443f9719887892882d0329d1e2598",
                 "shasum": ""
             },
             "require": {
@@ -396,8 +396,13 @@
             "require-dev": {
                 "symfony/phpunit-bridge": "^4.4 || ^5.1"
             },
-            "time": "2023-05-21T12:31:43+00:00",
+            "time": "2022-08-28T14:55:35+00:00",
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.5-dev"
+                }
+            },
             "installation-source": "dist",
             "autoload": {
                 "files": 
@@ -439,7 +444,7 @@
             ,
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/1.5.3"
+                "source": "https://github.com/guzzle/promises/tree/1.5.2"
             },
             "funding": 
                 {
@@ -459,17 +464,17 @@
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.9.1",
-            "version_normalized": "1.9.1.0",
+            "version": "1.9.0",
+            "version_normalized": "1.9.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b"
+                "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/e4490cabc77465aaee90b20cfc9a770f8c04be6b",
-                "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
+                "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
                 "shasum": ""
             },
             "require": {
@@ -487,8 +492,13 @@
             "suggest": {
                 "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
             },
-            "time": "2023-04-17T16:00:37+00:00",
+            "time": "2022-06-20T21:43:03+00:00",
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.9-dev"
+                }
+            },
             "installation-source": "dist",
             "autoload": {
                 "files": 
@@ -547,7 +557,7 @@
             ,
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/1.9.1"
+                "source": "https://github.com/guzzle/psr7/tree/1.9.0"
             },
             "funding": 
                 {
@@ -1399,17 +1409,17 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.11.1",
-            "version_normalized": "1.11.1.0",
+            "version": "1.11.0",
+            "version_normalized": "1.11.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
+                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
-                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614",
+                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614",
                 "shasum": ""
             },
             "require": {
@@ -1424,7 +1434,7 @@
                 "doctrine/common": "^2.13.3 || ^3.2.2",
                 "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
             },
-            "time": "2023-03-08T13:26:56+00:00",
+            "time": "2022-03-03T13:19:32+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -1449,7 +1459,7 @@
             ,
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0"
             },
             "funding": 
                 {
@@ -1521,17 +1531,17 @@
         },
         {
             "name": "pear/console_commandline",
-            "version": "v1.2.6",
-            "version_normalized": "1.2.6.0",
+            "version": "v1.2.4",
+            "version_normalized": "1.2.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Console_CommandLine.git",
-                "reference": "611c5bff2e47ec5a184748cb5fedc2869098ff28"
+                "reference": "cce06166765c5da31f3e8c1acf42512c64344cdb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Console_CommandLine/zipball/611c5bff2e47ec5a184748cb5fedc2869098ff28",
-                "reference": "611c5bff2e47ec5a184748cb5fedc2869098ff28",
+                "url": "https://api.github.com/repos/pear/Console_CommandLine/zipball/cce06166765c5da31f3e8c1acf42512c64344cdb",
+                "reference": "cce06166765c5da31f3e8c1acf42512c64344cdb",
                 "shasum": ""
             },
             "require": {
@@ -1543,7 +1553,7 @@
             "require-dev": {
                 "phpunit/phpunit": "*"
             },
-            "time": "2023-04-02T18:49:53+00:00",
+            "time": "2021-11-15T19:53:25+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -2147,17 +2157,17 @@
         },
         {
             "name": "pear/pear-core-minimal",
-            "version": "v1.10.13",
-            "version_normalized": "1.10.13.0",
+            "version": "v1.10.11",
+            "version_normalized": "1.10.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/pear-core-minimal.git",
-                "reference": "aed862e95fd286c53cc546734868dc38ff4b5b1d"
+                "reference": "68d0d32ada737153b7e93b8d3c710ebe70ac867d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/aed862e95fd286c53cc546734868dc38ff4b5b1d",
-                "reference": "aed862e95fd286c53cc546734868dc38ff4b5b1d",
+                "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/68d0d32ada737153b7e93b8d3c710ebe70ac867d",
+                "reference": "68d0d32ada737153b7e93b8d3c710ebe70ac867d",
                 "shasum": ""
             },
             "require": {
@@ -2167,7 +2177,7 @@
             "replace": {
                 "rsky/pear-core-min": "self.version"
             },
-            "time": "2023-04-19T19:15:47+00:00",
+            "time": "2021-08-10T22:31:03+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -2564,17 +2574,17 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.15",
-            "version_normalized": "1.10.15.0",
+            "version": "1.9.17",
+            "version_normalized": "1.9.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "762c4dac4da6f8756eebb80e528c3a47855da9bd"
+                "reference": "204e459e7822f2c586463029f5ecec31bb45a1f2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/762c4dac4da6f8756eebb80e528c3a47855da9bd",
-                "reference": "762c4dac4da6f8756eebb80e528c3a47855da9bd",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/204e459e7822f2c586463029f5ecec31bb45a1f2",
+                "reference": "204e459e7822f2c586463029f5ecec31bb45a1f2",
                 "shasum": ""
             },
             "require": {
@@ -2583,7 +2593,7 @@
             "conflict": {
                 "phpstan/phpstan-shim": "*"
             },
-            "time": "2023-05-09T15:28:01+00:00",
+            "time": "2023-02-08T12:25:00+00:00",
             "bin": 
                 "phpstan",
                 "phpstan.phar"
@@ -2605,11 +2615,8 @@
                 "static analysis"
             ,
             "support": {
-                "docs": "https://phpstan.org/user-guide/getting-started",
-                "forum": "https://github.com/phpstan/phpstan/discussions",
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "security": "https://github.com/phpstan/phpstan/security/policy",
-                "source": "https://github.com/phpstan/phpstan-src"
+                "source": "https://github.com/phpstan/phpstan/tree/1.9.17"
             },
             "funding": 
                 {
@@ -3073,27 +3080,27 @@
         },
         {
             "name": "psr/http-message",
-            "version": "1.1",
-            "version_normalized": "1.1.0.0",
+            "version": "1.0.1",
+            "version_normalized": "1.0.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-message.git",
-                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba"
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
-                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2 || ^8.0"
+                "php": ">=5.3.0"
             },
-            "time": "2023-04-04T09:50:52+00:00",
+            "time": "2016-08-06T14:39:51+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1.x-dev"
+                    "dev-master": "1.0.x-dev"
                 }
             },
             "installation-source": "dist",
@@ -3123,7 +3130,7 @@
                 "response"
             ,
             "support": {
-                "source": "https://github.com/php-fig/http-message/tree/1.1"
+                "source": "https://github.com/php-fig/http-message/tree/master"
             },
             "install-path": "../psr/http-message"
         },
@@ -4393,17 +4400,17 @@
         },
         {
             "name": "smarty/smarty",
-            "version": "v3.1.48",
-            "version_normalized": "3.1.48.0",
+            "version": "v3.1.47",
+            "version_normalized": "3.1.47.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/smarty-php/smarty.git",
-                "reference": "2fc443806cdcaee4441be4d0bb09f8fa56a17f2c"
+                "reference": "a09364fe1706cb465e910eb040e592053d7effb8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/smarty-php/smarty/zipball/2fc443806cdcaee4441be4d0bb09f8fa56a17f2c",
-                "reference": "2fc443806cdcaee4441be4d0bb09f8fa56a17f2c",
+                "url": "https://api.github.com/repos/smarty-php/smarty/zipball/a09364fe1706cb465e910eb040e592053d7effb8",
+                "reference": "a09364fe1706cb465e910eb040e592053d7effb8",
                 "shasum": ""
             },
             "require": {
@@ -4413,7 +4420,7 @@
                 "phpunit/phpunit": "^7.5 || ^6.5 || ^5.7 || ^4.8",
                 "smarty/smarty-lexer": "^3.1"
             },
-            "time": "2023-03-28T19:45:54+00:00",
+            "time": "2022-09-14T11:29:00+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -4453,23 +4460,23 @@
                 "forum": "http://www.smarty.net/forums/",
                 "irc": "irc://irc.freenode.org/smarty",
                 "issues": "https://github.com/smarty-php/smarty/issues",
-                "source": "https://github.com/smarty-php/smarty/tree/v3.1.48"
+                "source": "https://github.com/smarty-php/smarty/tree/v3.1.47"
             },
             "install-path": "../smarty/smarty"
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.7.2",
-            "version_normalized": "3.7.2.0",
+            "version": "3.7.1",
+            "version_normalized": "3.7.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879"
+                "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879",
-                "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1359e176e9307e906dc3d890bcc9603ff6d90619",
+                "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619",
                 "shasum": ""
             },
             "require": {
@@ -4481,7 +4488,7 @@
             "require-dev": {
                 "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
             },
-            "time": "2023-02-22T23:07:41+00:00",
+            "time": "2022-06-18T07:21:10+00:00",
             "bin": 
                 "bin/phpcs",
                 "bin/phpcbf"
@@ -4507,8 +4514,7 @@
             "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
             "keywords": 
                 "phpcs",
-                "standards",
-                "static analysis"
+                "standards"
             ,
             "support": {
                 "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",

roundcubemail-1.5.3.tar.gz/vendor/composer/installed.php Changed

@@ -5,7 +5,7 @@
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '0e7dda399d920cb31cf583b64231a5dd1e56d148',
+        'reference' => 'a30206bf6a3cb0f96e197802163399e82f0e44fc',
         'name' => 'roundcube/roundcubemail',
         'dev' => true,
     ),
@@ -56,21 +56,21 @@
             'dev_requirement' => false,
         ),
         'guzzlehttp/promises' => array(
-            'pretty_version' => '1.5.3',
-            'version' => '1.5.3.0',
+            'pretty_version' => '1.5.2',
+            'version' => '1.5.2.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../guzzlehttp/promises',
             'aliases' => array(),
-            'reference' => '67ab6e18aaa14d753cc148911d273f6e6cb6721e',
+            'reference' => 'b94b2807d85443f9719887892882d0329d1e2598',
             'dev_requirement' => false,
         ),
         'guzzlehttp/psr7' => array(
-            'pretty_version' => '1.9.1',
-            'version' => '1.9.1.0',
+            'pretty_version' => '1.9.0',
+            'version' => '1.9.0.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../guzzlehttp/psr7',
             'aliases' => array(),
-            'reference' => 'e4490cabc77465aaee90b20cfc9a770f8c04be6b',
+            'reference' => 'e98e3e6d4f86621a9b75f623996e6bbdeb4b9318',
             'dev_requirement' => false,
         ),
         'johndoh/contextmenu' => array(
@@ -254,12 +254,12 @@
             'dev_requirement' => false,
         ),
         'myclabs/deep-copy' => array(
-            'pretty_version' => '1.11.1',
-            'version' => '1.11.1.0',
+            'pretty_version' => '1.11.0',
+            'version' => '1.11.0.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../myclabs/deep-copy',
             'aliases' => array(),
-            'reference' => '7284c22080590fb39f2ffa3e9057f10a4ddd0e0c',
+            'reference' => '14daed4296fae74d9e3201d2c4925d1acb7aa614',
             'dev_requirement' => true,
         ),
         'pear/auth_sasl' => array(
@@ -272,12 +272,12 @@
             'dev_requirement' => false,
         ),
         'pear/console_commandline' => array(
-            'pretty_version' => 'v1.2.6',
-            'version' => '1.2.6.0',
+            'pretty_version' => 'v1.2.4',
+            'version' => '1.2.4.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pear/console_commandline',
             'aliases' => array(),
-            'reference' => '611c5bff2e47ec5a184748cb5fedc2869098ff28',
+            'reference' => 'cce06166765c5da31f3e8c1acf42512c64344cdb',
             'dev_requirement' => false,
         ),
         'pear/console_getopt' => array(
@@ -362,12 +362,12 @@
             'dev_requirement' => false,
         ),
         'pear/pear-core-minimal' => array(
-            'pretty_version' => 'v1.10.13',
-            'version' => '1.10.13.0',
+            'pretty_version' => 'v1.10.11',
+            'version' => '1.10.11.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pear/pear-core-minimal',
             'aliases' => array(),
-            'reference' => 'aed862e95fd286c53cc546734868dc38ff4b5b1d',
+            'reference' => '68d0d32ada737153b7e93b8d3c710ebe70ac867d',
             'dev_requirement' => false,
         ),
         'pear/pear_exception' => array(
@@ -425,12 +425,12 @@
             'dev_requirement' => true,
         ),
         'phpstan/phpstan' => array(
-            'pretty_version' => '1.10.15',
-            'version' => '1.10.15.0',
+            'pretty_version' => '1.9.17',
+            'version' => '1.9.17.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpstan/phpstan',
             'aliases' => array(),
-            'reference' => '762c4dac4da6f8756eebb80e528c3a47855da9bd',
+            'reference' => '204e459e7822f2c586463029f5ecec31bb45a1f2',
             'dev_requirement' => true,
         ),
         'phpunit/php-code-coverage' => array(
@@ -497,12 +497,12 @@
             'dev_requirement' => true,
         ),
         'psr/http-message' => array(
-            'pretty_version' => '1.1',
-            'version' => '1.1.0.0',
+            'pretty_version' => '1.0.1',
+            'version' => '1.0.1.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/http-message',
             'aliases' => array(),
-            'reference' => 'cb6ce4845ce34a8ad9e68117c10ee90a29919eba',
+            'reference' => 'f6561bf28d520154e4b0ec72be95418abe6d9363',
             'dev_requirement' => false,
         ),
         'psr/http-message-implementation' => array(
@@ -544,7 +544,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '0e7dda399d920cb31cf583b64231a5dd1e56d148',
+            'reference' => 'a30206bf6a3cb0f96e197802163399e82f0e44fc',
             'dev_requirement' => false,
         ),
         'roundcube/rtf-html-php' => array(
@@ -559,7 +559,7 @@
         'rsky/pear-core-min' => array(
             'dev_requirement' => false,
             'replaced' => array(
-                0 => 'v1.10.13',
+                0 => 'v1.10.11',
             ),
         ),
         'sabre/dav' => array(
@@ -707,21 +707,21 @@
             'dev_requirement' => true,
         ),
         'smarty/smarty' => array(
-            'pretty_version' => 'v3.1.48',
-            'version' => '3.1.48.0',
+            'pretty_version' => 'v3.1.47',
+            'version' => '3.1.47.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../smarty/smarty',
             'aliases' => array(),
-            'reference' => '2fc443806cdcaee4441be4d0bb09f8fa56a17f2c',
+            'reference' => 'a09364fe1706cb465e910eb040e592053d7effb8',
             'dev_requirement' => false,
         ),
         'squizlabs/php_codesniffer' => array(
-            'pretty_version' => '3.7.2',
-            'version' => '3.7.2.0',
+            'pretty_version' => '3.7.1',
+            'version' => '3.7.1.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../squizlabs/php_codesniffer',
             'aliases' => array(),
-            'reference' => 'ed8e00df0a83aa96acf703f8c2979ff33341f879',
+            'reference' => '1359e176e9307e906dc3d890bcc9603ff6d90619',
             'dev_requirement' => true,
         ),
         'symfony/polyfill-ctype' => array(

roundcubemail-1.5.3.tar.gz/vendor/guzzlehttp/promises/CHANGELOG.md Changed

roundcubemail-1.5.3.tar.gz/vendor/guzzlehttp/promises/composer.json Changed

roundcubemail-1.5.3.tar.gz/vendor/guzzlehttp/promises/src/Each.php Changed

roundcubemail-1.5.3.tar.gz/vendor/guzzlehttp/promises/src/Utils.php Changed

roundcubemail-1.5.3.tar.gz/vendor/guzzlehttp/psr7/.github/workflows/ci.yml Changed

roundcubemail-1.5.3.tar.gz/vendor/guzzlehttp/psr7/.github/workflows/integration.yml Changed

roundcubemail-1.5.3.tar.gz/vendor/guzzlehttp/psr7/.github/workflows/static.yml Changed

roundcubemail-1.5.3.tar.gz/vendor/guzzlehttp/psr7/CHANGELOG.md Changed

roundcubemail-1.5.3.tar.gz/vendor/guzzlehttp/psr7/composer.json Changed

roundcubemail-1.5.3.tar.gz/vendor/guzzlehttp/psr7/src/MessageTrait.php Changed

@@ -226,9 +226,12 @@
             throw new \InvalidArgumentException('Header name can not be empty.');
         }
 
-        if (! preg_match('/^a-zA-Z0-9\'`#$%&*+.^_|~!-+$/D', $header)) {
+        if (! preg_match('/^a-zA-Z0-9\'`#$%&*+.^_|~!-+$/', $header)) {
             throw new \InvalidArgumentException(
-                sprintf('"%s" is not valid header name.', $header)
+                sprintf(
+                    '"%s" is not valid header name',
+                    $header
+                )
             );
         }
     }
@@ -260,10 +263,8 @@
         // Clients must not send a request with line folding and a server sending folded headers is
         // likely very rare. Line folding is a fairly obscure feature of HTTP/1.1 and thus not accepting
         // folding is not likely to break any legitimate use case.
-        if (! preg_match('/^\x20\x09\x21-\x7E\x80-\xFF*$/D', $value)) {
-            throw new \InvalidArgumentException(
-                sprintf('"%s" is not valid header value.', $value)
-            );
+        if (! preg_match('/^\x20\x09\x21-\x7E\x80-\xFF*$/', $value)) {
+            throw new \InvalidArgumentException(sprintf('"%s" is not valid header value', $value));
         }
     }
 }

roundcubemail-1.5.3.tar.gz/vendor/myclabs/deep-copy/README.md Changed

@@ -186,9 +186,6 @@
 - `DeepCopy\Filter` applies a transformation to the object attribute matched by `DeepCopy\Matcher`
 - `DeepCopy\TypeFilter` applies a transformation to any element matched by `DeepCopy\TypeMatcher`
 
-By design, matching a filter will stop the chain of filters (i.e. the next ones will not be applied).
-Using the (`ChainableFilter`(#chainablefilter-filter)) won't stop the chain of filters.
-
 
 #### `SetNullFilter` (filter)
 
@@ -229,34 +226,6 @@
 ```
 
 
-#### `ChainableFilter` (filter)
-
-If you use cloning on proxy classes, you might want to apply two filters for:
-1. loading the data
-2. applying a transformation
-
-You can use the `ChainableFilter` as a decorator of the proxy loader filter, which won't stop the chain of filters (i.e. 
-the next ones may be applied).
-
-
-```php
-use DeepCopy\DeepCopy;
-use DeepCopy\Filter\ChainableFilter;
-use DeepCopy\Filter\Doctrine\DoctrineProxyFilter;
-use DeepCopy\Filter\SetNullFilter;
-use DeepCopy\Matcher\Doctrine\DoctrineProxyMatcher;
-use DeepCopy\Matcher\PropertyNameMatcher;
-
-$copier = new DeepCopy();
-$copier->addFilter(new ChainableFilter(new DoctrineProxyFilter()), new DoctrineProxyMatcher());
-$copier->addFilter(new SetNullFilter(), new PropertyNameMatcher('id'));
-
-$copy = $copier->copy($object);
-
-echo $copy->id; // null
-```
-
-
 #### `DoctrineCollectionFilter` (filter)
 
 If you use Doctrine and want to copy an entity, you will need to use the `DoctrineCollectionFilter`:
@@ -299,8 +268,6 @@
 You can use the `DoctrineProxyFilter` to load the actual entity behind the Doctrine proxy class.
 **Make sure, though, to put this as one of your very first filters in the filter chain so that the entity is loaded
 before other filters are applied!**
-We recommend to decorate the `DoctrineProxyFilter` with the `ChainableFilter` to allow applying other filters to the
-cloned lazy loaded entities.
 
 ```php
 use DeepCopy\DeepCopy;
@@ -308,7 +275,7 @@
 use DeepCopy\Matcher\Doctrine\DoctrineProxyMatcher;
 
 $copier = new DeepCopy();
-$copier->addFilter(new ChainableFilter(new DoctrineProxyFilter()), new DoctrineProxyMatcher());
+$copier->addFilter(new DoctrineProxyFilter(), new DoctrineProxyMatcher());
 
 $copy = $copier->copy($object);

roundcubemail-1.5.3.tar.gz/vendor/myclabs/deep-copy/src/DeepCopy/DeepCopy.php Changed

roundcubemail-1.5.3.tar.gz/vendor/myclabs/deep-copy/src/DeepCopy/Filter/ChainableFilter.php Deleted

roundcubemail-1.5.3.tar.gz/vendor/pear/console_commandline/.gitignore Changed

roundcubemail-1.5.3.tar.gz/vendor/pear/console_commandline/Console/CommandLine.php Changed

@@ -5,8 +5,8 @@
 /**
  * This file is part of the PEAR Console_CommandLine package.
  *
- * A full featured package for managing command-line options and arguments
- * hightly inspired from python optparse module, it allows the developper to
+ * A full featured package for managing command-line options and arguments 
+ * hightly inspired from python optparse module, it allows the developper to 
  * easily build complex command line interfaces.
  *
  * PHP version 5
@@ -15,11 +15,11 @@
  * through the world-wide-web at the following URI:
  * http://opensource.org/licenses/mit-license.php
  *
- * @category  Console
+ * @category  Console 
  * @package   Console_CommandLine
  * @author    David JEAN LOUIS <izimobil@gmail.com>
  * @copyright 2007 David JEAN LOUIS
- * @license   http://opensource.org/licenses/mit-license.php MIT License
+ * @license   http://opensource.org/licenses/mit-license.php MIT License 
  * @version   CVS: $Id$
  * @link      http://pear.php.net/package/Console_CommandLine
  * @since     Class available since release 0.1.0
@@ -36,7 +36,7 @@
 
 /**
  * Main class for parsing command line options and arguments.
- *
+ * 
  * There are three ways to create parsers with this class:
  * <code>
  * // direct usage
@@ -54,7 +54,7 @@
  * @package   Console_CommandLine
  * @author    David JEAN LOUIS <izimobil@gmail.com>
  * @copyright 2007 David JEAN LOUIS
- * @license   http://opensource.org/licenses/mit-license.php MIT License
+ * @license   http://opensource.org/licenses/mit-license.php MIT License 
  * @version   Release: @package_version@
  * @link      http://pear.php.net/package/Console_CommandLine
  * @since     File available since release 0.1.0
@@ -101,7 +101,7 @@
     public $description = '';
 
     /**
-     * A string that represents the version of the program, if this property is
+     * A string that represents the version of the program, if this property is 
      * not empty and property add_version_option is not set to false, the
      * command line parser will add a --version option, that will display the
      * property content.
@@ -122,8 +122,8 @@
     /**
      * Boolean that determine if the command line parser should add the version
      * (-v, --version) option automatically.
-     * Note that the version option is also generated only if the version
-     * property is not empty, it's up to you to provide a version string of
+     * Note that the version option is also generated only if the version 
+     * property is not empty, it's up to you to provide a version string of 
      * course.
      *
      * @var bool $add_version_option Whether to add a version option or not
@@ -160,7 +160,7 @@
     public $message_provider = false;
 
     /**
-     * Boolean that tells the parser to be POSIX compliant, POSIX demands the
+     * Boolean that tells the parser to be POSIX compliant, POSIX demands the 
      * following behavior: the first non-option stops option processing.
      *
      * @var bool $force_posix Whether to force posix compliance or not
@@ -168,7 +168,7 @@
     public $force_posix = false;
 
     /**
-     * Boolean that tells the parser to set relevant options default values,
+     * Boolean that tells the parser to set relevant options default values, 
      * according to the option action.
      *
      * @see Console_CommandLine_Option::setDefaults()
@@ -176,7 +176,7 @@
      */
     public $force_options_defaults = false;
 
-
+ 
    /**
     * Boolean that tells the parser to treat a single - option as an argument
     * instead of trying to read STDIN.
@@ -207,7 +207,7 @@
     public $commands = array();
 
     /**
-     * Parent, only relevant in Command objects but left here for interface
+     * Parent, only relevant in Command objects but left here for interface 
      * convenience.
      *
      * @var Console_CommandLine The parent instance
@@ -216,7 +216,7 @@
     public $parent = false;
 
     /**
-     * Array of valid actions for an option, this array will also store user
+     * Array of valid actions for an option, this array will also store user 
      * registered actions.
      *
      * The array format is:
@@ -307,7 +307,7 @@
      *
      * @return void
      */
-    public function __construct(array $params = array())
+    public function __construct(array $params = array()) 
     {
         if (isset($params'name')) {
             $this->name = $params'name';
@@ -352,7 +352,7 @@
 
     /**
      * Method to allow Console_CommandLine to accept either:
-     *  + a custom renderer,
+     *  + a custom renderer, 
      *  + a custom outputter,
      *  + or a custom message provider
      *
@@ -361,7 +361,7 @@
      * @return void
      * @throws Console_CommandLine_Exception if wrong argument passed
      */
-    public function accept($instance)
+    public function accept($instance) 
     {
         if ($instance instanceof Console_CommandLine_Renderer) {
             if (property_exists($instance, 'parser') && !$instance->parser) {
@@ -399,7 +399,7 @@
      *
      * @return Console_CommandLine The parser instance
      */
-    public static function fromXmlFile($file)
+    public static function fromXmlFile($file) 
     {
         include_once 'Console/CommandLine/XmlParser.php';
         return Console_CommandLine_XmlParser::parse($file);
@@ -436,7 +436,7 @@
      *
      * @return Console_CommandLine The parser instance
      */
-    public static function fromXmlString($string)
+    public static function fromXmlString($string) 
     {
         include_once 'Console/CommandLine/XmlParser.php';
         return Console_CommandLine_XmlParser::parseString($string);
@@ -451,7 +451,7 @@
      * Adds an argument with the name $name and set its attributes with the
      * array $params, then return the Console_CommandLine_Argument instance
      * created.
-     * The method accepts another form: you can directly pass a
+     * The method accepts another form: you can directly pass a 
      * Console_CommandLine_Argument object as the sole argument, this allows
      * you to contruct the argument separately, in order to reuse it in
      * different command line parsers or commands for example.
@@ -505,7 +505,7 @@
     /**
      * Adds a sub-command to the command line parser.
      *
-     * Adds a command with the given $name to the parser and returns the
+     * Adds a command with the given $name to the parser and returns the 
      * Console_CommandLine_Command instance, you can then populate the command
      * with options, configure it, etc... like you would do for the main parser
      * because the class Console_CommandLine_Command inherits from
@@ -555,9 +555,9 @@
             include_once 'Console/CommandLine/Command.php';
             $params'name' = $name;
             $command        = new Console_CommandLine_Command($params);
-            // some properties must cascade to the child command if not
-            // passed explicitely. This is done only in this case, because if
-            // we have a Command object we have no way to determine if theses
+            // some properties must cascade to the child command if not 
+            // passed explicitely. This is done only in this case, because if 
+            // we have a Command object we have no way to determine if theses 
             // properties have already been set
             $cascade = array(
                 'add_help_option',
@@ -592,7 +592,7 @@
      * Adds an option with the name $name and set its attributes with the
      * array $params, then return the Console_CommandLine_Option instance
      * created.
-     * The method accepts another form: you can directly pass a
+     * The method accepts another form: you can directly pass a 
      * Console_CommandLine_Option object as the sole argument, this allows
      * you to contruct the option separately, in order to reuse it in different
      * command line parsers or commands for example.
@@ -737,7 +737,7 @@
      */
     public function findOption($str)
     {
-        $str = trim((string) $str);
+        $str = trim($str);
         if ($str === '') {
             return false;
         }
@@ -822,7 +822,7 @@
      *
      * @return void
      */
-    public static function registerAction($name, $class)
+    public static function registerAction($name, $class) 
     {
         if (!isset(self::$actions$name)) {
             if (!class_exists($class)) {
@@ -847,11 +847,11 @@
      * @return void
      * @todo remove Console::triggerError() and use exceptions only
      */
-    public static function triggerError($msgId, $level, $params=array())
+    public static function triggerError($msgId, $level, $params=array()) 
     {
         if (isset(self::$errors$msgId)) {
             $msg = str_replace(array_keys($params),
-                array_values($params), self::$errors$msgId);
+                array_values($params), self::$errors$msgId); 
             trigger_error($msg, $level);
         } else {
             trigger_error('unknown error', $level);
@@ -1012,10 +1012,8 @@
     {
         $last  = $argc === 0;
         if (!$this->_stopflag && $this->_lastopt) {
-            if ($token !== null
-                && strlen($token) > ($this->avoid_reading_stdin ? 1 : 0)
-                && substr($token, 0, 1) == '-'
-            ) {
+            if (strlen($token) > ($this->avoid_reading_stdin ? 1 : 0) &&
+                substr($token, 0, 1) == '-') {
                 if ($this->_lastopt->argument_optional) {
                     $this->_dispatchAction($this->_lastopt, '', $result);
                     if ($this->_lastopt->action != 'StoreArray') {
@@ -1055,11 +1053,11 @@
                 return;
             }
         }
-        if ($token !== null && !$this->_stopflag && substr($token, 0, 2) == '--') {
+        if (!$this->_stopflag && substr($token, 0, 2) == '--') {
             // a long option
             $optkv = explode('=', $token, 2);
             if (trim($optkv0) == '--') {
-                // the special argument "--" forces in all cases the end of
+                // the special argument "--" forces in all cases the end of 
                 // option scanning.
                 $this->_stopflag = true;
                 return;
@@ -1083,7 +1081,7 @@
                 );
             }
             if ($opt->expectsArgument() && $value === false) {
-                // maybe the long option argument is separated by a space, if
+                // maybe the long option argument is separated by a space, if 
                 // this is the case it will be the next arg
                 if ($last && !$opt->argument_optional) {
                     throw Console_CommandLine_Exception::factory(
@@ -1101,11 +1099,9 @@
                 $this->_lastopt = $opt;
             }
             $this->_dispatchAction($opt, $value, $result);
-        } else if (!$this->_stopflag
-            && $token !== null
-            && strlen($token) > ($this->avoid_reading_stdin ? 1 : 0)
-            && substr($token, 0, 1) == '-'
-        ) {
+        } else if (!$this->_stopflag &&
+                   strlen($token) > ($this->avoid_reading_stdin ? 1 : 0) &&
+                   substr($token, 0, 1) == '-') {
             // a short option
             $optname = substr($token, 0, 2);
             if ($optname == '-' && !$this->avoid_reading_stdin) {
@@ -1142,7 +1138,7 @@
                 }
                 $value = false;
             } else {
-                if (!$opt->expectsArgument()) {
+                if (!$opt->expectsArgument()) { 
                     if ($nextopt = $this->findOption('-' . $next)) {
                         $this->_dispatchAction($opt, false, $result);
                         $this->parseToken('-' . substr($token, 2), $result,
@@ -1165,7 +1161,7 @@
             $this->_dispatchAction($opt, $value, $result);
         } else {
             // We have an argument.
-            // if we are in POSIX compliant mode, we must set the stop flag to
+            // if we are in POSIX compliant mode, we must set the stop flag to 
             // true in order to stop option parsing.
             if (!$this->_stopflag && $this->force_posix) {
                 $this->_stopflag = true;
@@ -1190,7 +1186,7 @@
             $helpOptionParams = array(
                 'long_name'   => '--help',
                 'description' => 'show this help message and exit',
-                'action'      => 'Help'
+                'action'      => 'Help'   
             );
             if (!($option = $this->findOption('-h')) || $option->action == 'Help') {
                 // short name is available, take it
@@ -1202,7 +1198,7 @@
             $versionOptionParams = array(
                 'long_name'   => '--version',
                 'description' => 'show the program version and exit',
-                'action'      => 'Version'
+                'action'      => 'Version'   
             );
             if (!$this->findOption('-v')) {
                 // short name is available, take it
@@ -1210,7 +1206,7 @@
             }
             $this->addOption('version', $versionOptionParams);
         }
-    }
+    } 
 
     // }}}
     // getArgcArgv() {{{
@@ -1220,7 +1216,7 @@
      * if it fails to get them.
      *
      * @return array The argc/argv array
-     * @throws Console_CommandLine_Exception
+     * @throws Console_CommandLine_Exception 
      */
     protected function getArgcArgv()
     {
@@ -1235,7 +1231,7 @@
                     $opt = $this->findOption($key);
                     if ($opt instanceof Console_CommandLine_Option) {
                         // match a configured option
-                        $argv = $opt->short_name ?
+                        $argv = $opt->short_name ? 
                             $opt->short_name : $opt->long_name;
                         foreach ($value as $v) {
                             if ($opt->expectsArgument()) {

roundcubemail-1.5.3.tar.gz/vendor/pear/console_commandline/phpunit.xml Deleted

roundcubemail-1.5.3.tar.gz/vendor/pear/pear-core-minimal/src/OS/Guess.php Changed

roundcubemail-1.5.3.tar.gz/vendor/pear/pear-core-minimal/src/PEAR.php Changed

roundcubemail-1.5.3.tar.gz/vendor/phpstan/phpstan/README.md Changed

roundcubemail-1.5.3.tar.gz/vendor/phpstan/phpstan/bootstrap.php Changed

roundcubemail-1.5.3.tar.gz/vendor/phpstan/phpstan/composer.json Changed

roundcubemail-1.5.3.tar.gz/vendor/phpstan/phpstan/phpstan.phar Changed

roundcubemail-1.5.3.tar.gz/vendor/phpstan/phpstan/phpstan.phar.asc Changed

@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmRaZmcACgkQUcZzBf/C
-5cAn/Q//fbWiR/qaSvlHpk73KH7iDfoHwNvRrHSQODZdMa4PGiEbL+SXsKnRxFDo
-kEJZwgU5qi3WMflt7Ml3dYDlQDgoDerdaiySYFoBcv1NXDWKoF7+Egy1AHxpfNq+
-FMCkZNR2ulSaYUCofM4GkTNap4yVkPCy289ZU6yUmRnJxF+hh/CFfdVPAPbwh/a6
-UqV3R2ENJZSbtA1pzSTBpUPQGQ9qcsqngKyNyxk1hEd9opdMg2eSFvO1e1ZZm/Tk
-Kgh5wCbsbSJuRPGO4vbiybTeO/qXPDlHV6oA5SHnjJ4H24phCsHdyJHHvLQmrUeR
-BKHgnH1y/b5J9cgr9OgEQJK9TMHHd6dii9//Qp+0rUZIDZ4Ym2lDSA/Vn/D9GoV3
-zo4QYzW3TvE3QMdnLcX/ZtaLliPdDYIaYUXOiyaYwLFGVxSWZWOC5IN0G0bLJb39
-Ca/z839nkWdMqg68q/oHC2Nk/v/KZnKg1RlRjYhj53T6nr0JDEiaYMyETSOIFsVX
-AcCQnLLwMndUAibJAyORDnTk+ipg0SecFoPvvhea1BtlTfhSDIlrT4OPKZ5nExzd
-nR/zGbIH8lCvsBc+hq+Kgodtfs5nauwEOwlVUwet26xL1YKOd0jxz+Zp6tgk0wba
-cMf5L9fm85j83DQYr7Ukaaj81kmMujRWDo/dRojKhUlJUrNnjXA=
-=jTtX
+iQIzBAABCgAdFiEE0yaA1ZV9xxFr4pwUzxoQjQ565yAFAmPjlIQACgkQzxoQjQ56
+5yB1xQ/+Kz+VRo1rx8OsL3lOZhbmGalg8QC1+r9SfoBI2jxi/IqG4olCH1b9yXiE
+xaJU9xC5H+258a1JtfeUszm0zXgt/CHIHSVq3VAMlEajMbOHDSy7i9GrRA9OmG0H
+5AbwB9tql4qZ0cj1SriS2j8VolUjb1C1aSJNAwMbBWbd1QlZqGLJLgo0rvVnN71h
+kK5aYSZzV6XcbrJpNwWNjI9KNhbSlwHfWvsl2oW7Pl/ydyaWY+ZmL+i9MOT+TAuu
+jJFzKY98HQk3ESOpRn2wg0tKU9qzzl5d5/3P03iY/o0VCHnj8aNSdXy+6aBS81n4
+KPvBRclcwsncmBB4HNZxOpExVR2flaUM21ebSnmVv7Zofjcl/W+h49lrEAWFBjgy
+PkdAjlKSPOUYgqSSftKitDHFXtNOYi+qNot0gPEcDezWVOwWY/UorqL0V/PQp4bI
+SCKnkgw4SWDFGFY3R/m7qet0oomOvp6sTJZb/B37GZ6l9KKu4lXLsS8XRXmCGzTW
+Wu/taFkP35LYDQ9Y+HNzYXzNKFalCbJNj1Qdx31OvthBfK3/Jk0gG1YRrE3+0sAa
+J3qJX4nC/Zm7oK9wj5CvKMTS9tewbOBLgYNF1JuI2dlrhnc0VZXCdvg3M8SjI1zH
+5752T9NuxK5ot1i7TPcPHj8ln4t35aUT8c0f9S7ruFS0icobdyE=
+=SwMZ
 -----END PGP SIGNATURE-----

roundcubemail-1.5.3.tar.gz/vendor/psr/http-message/README.md Changed

roundcubemail-1.5.3.tar.gz/vendor/psr/http-message/composer.json Changed

roundcubemail-1.5.3.tar.gz/vendor/psr/http-message/docs Deleted

roundcubemail-1.5.3.tar.gz/vendor/psr/http-message/docs/PSR7-Interfaces.md Deleted

@@ -1,130 +0,0 @@
-# Interfaces
-
-The purpose of this list is to help in finding the methods when working with PSR-7. This can be considered as a cheatsheet for PSR-7 interfaces.
-
-The interfaces defined in PSR-7 are the following:
-
-| Class Name | Description |
-|---|---|
-| Psr\Http\Message\MessageInterface(http://www.php-fig.org/psr/psr-7/#psrhttpmessagemessageinterface) | Representation of a HTTP message |
-| Psr\Http\Message\RequestInterface(http://www.php-fig.org/psr/psr-7/#psrhttpmessagerequestinterface) | Representation of an outgoing, client-side request. |
-| Psr\Http\Message\ServerRequestInterface(http://www.php-fig.org/psr/psr-7/#psrhttpmessageserverrequestinterface) | Representation of an incoming, server-side HTTP request. | 
-| Psr\Http\Message\ResponseInterface(http://www.php-fig.org/psr/psr-7/#psrhttpmessageresponseinterface) | Representation of an outgoing, server-side response. |
-| Psr\Http\Message\StreamInterface(http://www.php-fig.org/psr/psr-7/#psrhttpmessagestreaminterface) | Describes a data stream |
-| Psr\Http\Message\UriInterface(http://www.php-fig.org/psr/psr-7/#psrhttpmessageuriinterface) | Value object representing a URI. |
-| Psr\Http\Message\UploadedFileInterface(http://www.php-fig.org/psr/psr-7/#psrhttpmessageuploadedfileinterface) | Value object representing a file uploaded through an HTTP request. |
-
-## `Psr\Http\Message\MessageInterface` Methods
-
-| Method Name                        | Description | Notes |
-|------------------------------------| ----------- | ----- |
-| `getProtocolVersion()`             | Retrieve HTTP protocol version          |  1.0 or 1.1 |
-| `withProtocolVersion($version)`    | Returns new message instance with given HTTP protocol version          |      |
-| `getHeaders()`                     | Retrieve all HTTP Headers               | Request Header List(https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#Request_fields), Response Header List(https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#Response_fields)      |
-| `hasHeader($name)`                 | Checks if HTTP Header with given name exists  | |
-| `getHeader($name)`                 | Retrieves a array with the values for a single header | |
-| `getHeaderLine($name)`             | Retrieves a comma-separated string of the values for a single header |  |
-| `withHeader($name, $value)`        | Returns new message instance with given HTTP Header | if the header existed in the original instance, replaces the header value from the original message with the value provided when creating the new instance. |
-| `withAddedHeader($name, $value)`   | Returns new message instance with appended value to given header | If header already exists value will be appended, if not a new header will be created |
-| `withoutHeader($name)`             | Removes HTTP Header with given name| |
-| `getBody()`                        | Retrieves the HTTP Message Body | Returns object implementing `StreamInterface`|
-| `withBody(StreamInterface $body)`  | Returns new message instance with given HTTP Message Body | |
-
-
-## `Psr\Http\Message\RequestInterface` Methods
-
-Same methods as `Psr\Http\Message\MessageInterface`  + the following methods:
-
-| Method Name                        | Description | Notes |
-|------------------------------------| ----------- | ----- |
-| `getRequestTarget()`                | Retrieves the message's request target              | origin-form, absolute-form, authority-form, asterisk-form (RFC7230(https://www.rfc-editor.org/rfc/rfc7230.txt)) |
-| `withRequestTarget($requestTarget)` | Return a new message instance with the specific request-target |      |
-| `getMethod()`                       | Retrieves the HTTP method of the request.  |  GET, HEAD, POST, PUT, DELETE, CONNECT, OPTIONS, TRACE (defined in RFC7231(https://tools.ietf.org/html/rfc7231)), PATCH (defined in RFC5789(https://tools.ietf.org/html/rfc5789)) |
-| `withMethod($method)`               | Returns a new message instance with the provided HTTP method  | |
-| `getUri()`                 | Retrieves the URI instance | |
-| `withUri(UriInterface $uri, $preserveHost = false)` | Returns a new message instance with the provided URI |  |
-
-
-## `Psr\Http\Message\ServerRequestInterface` Methods
-
-Same methods as `Psr\Http\Message\RequestInterface`  + the following methods:
-
-| Method Name                        | Description | Notes |
-|------------------------------------| ----------- | ----- |
-| `getServerParams() `               | Retrieve server parameters  | Typically derived from `$_SERVER`  |
-| `getCookieParams()`                | Retrieves cookies sent by the client to the server. | Typically derived from `$_COOKIES` |
-| `withCookieParams(array $cookies)` |  Returns a new request instance with the specified cookies      |   | 
-| `withQueryParams(array $query)` | Returns a new request instance with the specified query string arguments  |  |
-| `getUploadedFiles()` | Retrieve normalized file upload data  |  |
-| `withUploadedFiles(array $uploadedFiles)` | Returns a new request instance with the specified uploaded files  |  |
-| `getParsedBody()` | Retrieve any parameters provided in the request body  |  |
-| `withParsedBody($data)` | Returns a new request instance with the specified body parameters  |  |
-| `getAttributes()` | Retrieve attributes derived from the request  |  |
-| `getAttribute($name, $default = null)` | Retrieve a single derived request attribute  |  |
-| `withAttribute($name, $value)` | Returns a new request instance with the specified derived request attribute  |  |
-| `withoutAttribute($name)` | Returns a new request instance that without the specified derived request attribute  |  |
-
-## `Psr\Http\Message\ResponseInterface` Methods:
-
-Same methods as `Psr\Http\Message\MessageInterface`  + the following methods:
-
-| Method Name                        | Description | Notes |
-|------------------------------------| ----------- | ----- |
-| `getStatusCode()` | Gets the response status code. | |
-| `withStatus($code, $reasonPhrase = '')` | Returns a new response instance with the specified status code and, optionally, reason phrase. | |
-| `getReasonPhrase()` | Gets the response reason phrase associated with the status code. | |
-
-##  `Psr\Http\Message\StreamInterface` Methods
-
-| Method Name                        | Description | Notes |
-|------------------------------------| ----------- | ----- |
-| `__toString()` | Reads all data from the stream into a string, from the beginning to end. | |
-| `close()` | Closes the stream and any underlying resources. | |
-| `detach()` | Separates any underlying resources from the stream. | |
-| `getSize()` | Get the size of the stream if known. | |
-| `eof()` | Returns true if the stream is at the end of the stream.| |
-| `isSeekable()` |  Returns whether or not the stream is seekable. | |
-| `seek($offset, $whence = SEEK_SET)` | Seek to a position in the stream. | |
-| `rewind()` | Seek to the beginning of the stream. | |
-| `isWritable()` | Returns whether or not the stream is writable. | |
-| `write($string)` | Write data to the stream. | |
-| `isReadable()` | Returns whether or not the stream is readable. | |
-| `read($length)` | Read data from the stream. | |
-| `getContents()` | Returns the remaining contents in a string | |
-| `getMetadata($key = null)()` | Get stream metadata as an associative array or retrieve a specific key. | |
-
-## `Psr\Http\Message\UriInterface` Methods
-
-| Method Name                        | Description | Notes |
-|------------------------------------| ----------- | ----- |
-| `getScheme()` | Retrieve the scheme component of the URI. | |
-| `getAuthority()` | Retrieve the authority component of the URI. | |
-| `getUserInfo()` | Retrieve the user information component of the URI. | |
-| `getHost()` | Retrieve the host component of the URI. | |
-| `getPort()` | Retrieve the port component of the URI. | |
-| `getPath()` | Retrieve the path component of the URI. | |
-| `getQuery()` | Retrieve the query string of the URI. | |
-| `getFragment()` | Retrieve the fragment component of the URI. | |
-| `withScheme($scheme)` | Return an instance with the specified scheme. | |
-| `withUserInfo($user, $password = null)` | Return an instance with the specified user information. | |
-| `withHost($host)` | Return an instance with the specified host. | |
-| `withPort($port)` | Return an instance with the specified port. | |
-| `withPath($path)` | Return an instance with the specified path. | |
-| `withQuery($query)` | Return an instance with the specified query string. | |
-| `withFragment($fragment)` | Return an instance with the specified URI fragment. | |
-| `__toString()` | Return the string representation as a URI reference. | |
-
-## `Psr\Http\Message\UploadedFileInterface` Methods
-
-| Method Name                        | Description | Notes |
-|------------------------------------| ----------- | ----- |
-| `getStream()` | Retrieve a stream representing the uploaded file. | |
-| `moveTo($targetPath)` | Move the uploaded file to a new location. | |
-| `getSize()` | Retrieve the file size. | |
-| `getError()` | Retrieve the error associated with the uploaded file. | |
-| `getClientFilename()` | Retrieve the filename sent by the client. | |
-| `getClientMediaType()` | Retrieve the media type sent by the client. | |
-
-> `RequestInterface`, `ServerRequestInterface`, `ResponseInterface` extend `MessageInterface`  because the `Request` and the `Response` are `HTTP Messages`.
-> When using `ServerRequestInterface`, both `RequestInterface` and `Psr\Http\Message\MessageInterface` methods are considered.
-

roundcubemail-1.5.3.tar.gz/vendor/psr/http-message/docs/PSR7-Usage.md Deleted

@@ -1,159 +0,0 @@
-### PSR-7 Usage
-
-All PSR-7 applications comply with these interfaces 
-They were created to establish a standard between middleware implementations.
-
-> `RequestInterface`, `ServerRequestInterface`, `ResponseInterface` extend `MessageInterface`  because the `Request` and the `Response` are `HTTP Messages`.
-> When using `ServerRequestInterface`, both `RequestInterface` and `Psr\Http\Message\MessageInterface` methods are considered.
-
-
-The following examples will illustrate how basic operations are done in PSR-7.
-
-##### Examples
-
-
-For this examples to work (at least) a PSR-7 implementation package is required. (eg: zendframework/zend-diactoros, guzzlehttp/psr7, slim/slim, etc)
-All PSR-7 implementations should have the same behaviour.
-
-The following will be assumed: 
-`$request` is an object of `Psr\Http\Message\RequestInterface` and
-
-`$response` is an object implementing `Psr\Http\Message\RequestInterface`
-
-
-### Working with HTTP Headers
-
-#### Adding headers to response:
-
-```php
-$response->withHeader('My-Custom-Header', 'My Custom Message');
-```
-
-#### Appending values to headers
-
-```php
-$response->withAddedHeader('My-Custom-Header', 'The second message');
-```
-
-#### Checking if header exists:
-
-```php
-$request->hasHeader('My-Custom-Header'); // will return false
-$response->hasHeader('My-Custom-Header'); // will return true
-```
-
-> Note: My-Custom-Header was only added in the Response
-
-#### Getting comma-separated values from a header (also applies to request)
-
-```php
-// getting value from request headers
-$request->getHeaderLine('Content-Type'); // will return: "text/html; charset=UTF-8"
-// getting value from response headers
-$response->getHeaderLine('My-Custom-Header'); // will return:  "My Custom Message; The second message"
-```
-
-#### Getting array of value from a header (also applies to request)
-```php
-// getting value from request headers
-$request->getHeader('Content-Type'); // will return: "text/html", "charset=UTF-8"
-// getting value from response headers
-$response->getHeader('My-Custom-Header'); // will return:  "My Custom Message",  "The second message"
-```
-
-#### Removing headers from HTTP Messages
-```php
-// removing a header from Request, removing deprecated "Content-MD5" header
-$request->withoutHeader('Content-MD5'); 
-
-// removing a header from Response
-// effect: the browser won't know the size of the stream
-// the browser will download the stream till it ends
-$response->withoutHeader('Content-Length');
-```
-
-### Working with HTTP Message Body
-
-When working with the PSR-7 there are two methods of implementation:
-#### 1. Getting the body separately
-
-> This method makes the body handling easier to understand and is useful when repeatedly calling body methods. (You only call `getBody()` once). Using this method mistakes like `$response->write()` are also prevented.
-
-```php
-$body = $response->getBody();
-// operations on body, eg. read, write, seek
-// ...
-// replacing the old body
-$response->withBody($body); 
-// this last statement is optional as we working with objects
-// in this case the "new" body is same with the "old" one
-// the $body variable has the same value as the one in $request, only the reference is passed
-```
-
-#### 2. Working directly on response
-
-> This method is useful when only performing few operations as the `$request->getBody()` statement fragment is required
-
-```php
-$response->getBody()->write('hello');
-```
-
-### Getting the body contents
-
-The following snippet gets the contents of a stream contents.
-> Note: Streams must be rewinded, if content was written into streams, it will be ignored when calling `getContents()` because the stream pointer is set to the last character, which is `\0` - meaning end of stream.
-```php 
-$body = $response->getBody();
-$body->rewind(); // or $body->seek(0);
-$bodyText = $body->getContents();
-```
-> Note: If `$body->seek(1)` is called before `$body->getContents()`, the first character will be ommited as the starting pointer is set to `1`, not `0`. This is why using `$body->rewind()` is recommended.
-
-### Append to body
-
-```php
-$response->getBody()->write('Hello'); // writing directly
-$body = $request->getBody(); // which is a `StreamInterface`
-$body->write('xxxxx');
-```
-
-### Prepend to body
-Prepending is different when it comes to streams. The content must be copied before writing the content to be prepended.
-The following example will explain the behaviour of streams.
-
-```php
-// assuming our response is initially empty
-$body = $repsonse->getBody();
-// writing the string "abcd"
-$body->write('abcd');
-
-// seeking to start of stream
-$body->seek(0);
-// writing 'ef'
-$body->write('ef'); // at this point the stream contains "efcd"
-```
-
-#### Prepending by rewriting separately
-
-```php
-// assuming our response body stream only contains: "abcd"
-$body = $response->getBody();
-$body->rewind();
-$contents = $body->getContents(); // abcd
-// seeking the stream to beginning
-$body->rewind();
-$body->write('ef'); // stream contains "efcd"
-$body->write($contents); // stream contains "efabcd"
-```
-
-> Note: `getContents()` seeks the stream while reading it, therefore if the second `rewind()` method call was not present the stream would have resulted in `abcdefabcd` because the `write()` method appends to stream if not preceeded by `rewind()` or `seek(0)`.
-
-#### Prepending by using contents as a string
-```php
-$body = $response->getBody();
-$body->rewind();
-$contents = $body->getContents(); // efabcd
-$contents = 'ef'.$contents;
-$body->rewind();
-$body->write($contents);
-```

roundcubemail-1.5.3.tar.gz/vendor/psr/http-message/src/MessageInterface.php Changed

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace Psr\Http\Message;
 
 /**
@@ -40,7 +38,7 @@
      * @param string $version HTTP protocol version
      * @return static
      */
-    public function withProtocolVersion(string $version);
+    public function withProtocolVersion($version);
 
     /**
      * Retrieves all message header values.
@@ -77,7 +75,7 @@
      *     name using a case-insensitive string comparison. Returns false if
      *     no matching header name is found in the message.
      */
-    public function hasHeader(string $name);
+    public function hasHeader($name);
 
     /**
      * Retrieves a message header value by the given case-insensitive name.
@@ -93,7 +91,7 @@
      *    header. If the header does not appear in the message, this method MUST
      *    return an empty array.
      */
-    public function getHeader(string $name);
+    public function getHeader($name);
 
     /**
      * Retrieves a comma-separated string of the values for a single header.
@@ -114,7 +112,7 @@
      *    concatenated together using a comma. If the header does not appear in
      *    the message, this method MUST return an empty string.
      */
-    public function getHeaderLine(string $name);
+    public function getHeaderLine($name);
 
     /**
      * Return an instance with the provided value replacing the specified header.
@@ -131,7 +129,7 @@
      * @return static
      * @throws \InvalidArgumentException for invalid header names or values.
      */
-    public function withHeader(string $name, $value);
+    public function withHeader($name, $value);
 
     /**
      * Return an instance with the specified header appended with the given value.
@@ -149,7 +147,7 @@
      * @return static
      * @throws \InvalidArgumentException for invalid header names or values.
      */
-    public function withAddedHeader(string $name, $value);
+    public function withAddedHeader($name, $value);
 
     /**
      * Return an instance without the specified header.
@@ -163,7 +161,7 @@
      * @param string $name Case-insensitive header field name to remove.
      * @return static
      */
-    public function withoutHeader(string $name);
+    public function withoutHeader($name);
 
     /**
      * Gets the body of the message.

roundcubemail-1.5.3.tar.gz/vendor/psr/http-message/src/RequestInterface.php Changed

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace Psr\Http\Message;
 
 /**
@@ -57,10 +55,10 @@
      *
      * @link http://tools.ietf.org/html/rfc7230#section-5.3 (for the various
      *     request-target forms allowed in request messages)
-     * @param string $requestTarget
+     * @param mixed $requestTarget
      * @return static
      */
-    public function withRequestTarget(string $requestTarget);
+    public function withRequestTarget($requestTarget);
 
     /**
      * Retrieves the HTTP method of the request.
@@ -84,7 +82,7 @@
      * @return static
      * @throws \InvalidArgumentException for invalid HTTP methods.
      */
-    public function withMethod(string $method);
+    public function withMethod($method);
 
     /**
      * Retrieves the URI instance.
@@ -127,5 +125,5 @@
      * @param bool $preserveHost Preserve the original state of the Host header.
      * @return static
      */
-    public function withUri(UriInterface $uri, bool $preserveHost = false);
+    public function withUri(UriInterface $uri, $preserveHost = false);
 }

roundcubemail-1.5.3.tar.gz/vendor/psr/http-message/src/ResponseInterface.php Changed

roundcubemail-1.5.3.tar.gz/vendor/psr/http-message/src/ServerRequestInterface.php Changed

roundcubemail-1.5.3.tar.gz/vendor/psr/http-message/src/StreamInterface.php Changed

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace Psr\Http\Message;
 
 /**
@@ -86,7 +84,7 @@
      *     SEEK_END: Set position to end-of-stream plus offset.
      * @throws \RuntimeException on failure.
      */
-    public function seek(int $offset, int $whence = SEEK_SET);
+    public function seek($offset, $whence = SEEK_SET);
 
     /**
      * Seek to the beginning of the stream.
@@ -114,7 +112,7 @@
      * @return int Returns the number of bytes written to the stream.
      * @throws \RuntimeException on failure.
      */
-    public function write(string $string);
+    public function write($string);
 
     /**
      * Returns whether or not the stream is readable.
@@ -133,7 +131,7 @@
      *     if no bytes are available.
      * @throws \RuntimeException if an error occurs.
      */
-    public function read(int $length);
+    public function read($length);
 
     /**
      * Returns the remaining contents in a string
@@ -151,10 +149,10 @@
      * stream_get_meta_data() function.
      *
      * @link http://php.net/manual/en/function.stream-get-meta-data.php
-     * @param string|null $key Specific metadata to retrieve.
+     * @param string $key Specific metadata to retrieve.
      * @return array|mixed|null Returns an associative array if no key is
      *     provided. Returns a specific key value if a key is provided and the
      *     value is found, or null if the key is not found.
      */
-    public function getMetadata(?string $key = null);
+    public function getMetadata($key = null);
 }

roundcubemail-1.5.3.tar.gz/vendor/psr/http-message/src/UploadedFileInterface.php Changed

roundcubemail-1.5.3.tar.gz/vendor/psr/http-message/src/UriInterface.php Changed

@@ -1,7 +1,4 @@
 <?php
-
-declare(strict_types=1);
-
 namespace Psr\Http\Message;
 
 /**
@@ -191,7 +188,7 @@
      * @return static A new instance with the specified scheme.
      * @throws \InvalidArgumentException for invalid or unsupported schemes.
      */
-    public function withScheme(string $scheme);
+    public function withScheme($scheme);
 
     /**
      * Return an instance with the specified user information.
@@ -207,7 +204,7 @@
      * @param null|string $password The password associated with $user.
      * @return static A new instance with the specified user information.
      */
-    public function withUserInfo(string $user, ?string $password = null);
+    public function withUserInfo($user, $password = null);
 
     /**
      * Return an instance with the specified host.
@@ -221,7 +218,7 @@
      * @return static A new instance with the specified host.
      * @throws \InvalidArgumentException for invalid hostnames.
      */
-    public function withHost(string $host);
+    public function withHost($host);
 
     /**
      * Return an instance with the specified port.
@@ -240,7 +237,7 @@
      * @return static A new instance with the specified port.
      * @throws \InvalidArgumentException for invalid ports.
      */
-    public function withPort(?int $port);
+    public function withPort($port);
 
     /**
      * Return an instance with the specified path.
@@ -264,7 +261,7 @@
      * @return static A new instance with the specified path.
      * @throws \InvalidArgumentException for invalid paths.
      */
-    public function withPath(string $path);
+    public function withPath($path);
 
     /**
      * Return an instance with the specified query string.
@@ -281,7 +278,7 @@
      * @return static A new instance with the specified query string.
      * @throws \InvalidArgumentException for invalid query strings.
      */
-    public function withQuery(string $query);
+    public function withQuery($query);
 
     /**
      * Return an instance with the specified URI fragment.
@@ -297,7 +294,7 @@
      * @param string $fragment The fragment to use with the new instance.
      * @return static A new instance with the specified fragment.
      */
-    public function withFragment(string $fragment);
+    public function withFragment($fragment);
 
     /**
      * Return the string representation as a URI reference.

roundcubemail-1.5.3.tar.gz/vendor/smarty/smarty/CHANGELOG.md Changed

roundcubemail-1.5.3.tar.gz/vendor/smarty/smarty/libs/Smarty.class.php Changed

roundcubemail-1.5.3.tar.gz/vendor/smarty/smarty/libs/plugins/modifier.escape.php Changed

roundcubemail-1.5.3.tar.gz/vendor/smarty/smarty/libs/plugins/modifiercompiler.escape.php Changed

roundcubemail-1.5.3.tar.gz/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatebase.php Changed

roundcubemail-1.5.3.tar.gz/vendor/smarty/smarty/run-tests-for-all-php-versions.sh Deleted

@@ -1,46 +0,0 @@
-#!/bin/bash
-Help()
-{
-   # Display Help
-   echo "Runs PHPUnit tests for all PHP versions supported by this version of Smarty."
-   echo
-   echo "Syntax: $0 -e|h"
-   echo "options:"
-   echo "e     Exclude a group of unit tests, e.g. -e 'slow'"
-   echo "h     Print this Help."
-   echo
-}
-
-Exclude=""
-
-# Get the options
-while getopts ":he:" option; do
-   case $option in
-      e) # Exclude
-        echo $OPTARG
-         Exclude=$OPTARG;;
-      h) # display Help
-         Help
-         exit;;
-     \?) # Invalid option
-         echo "Error: Invalid option"
-         exit;;
-   esac
-done
-
-if  -z $Exclude ;
-then
-  Entrypoint="./run-tests.sh"
-else
-   Entrypoint="./run-tests.sh $Exclude"
-fi
-
-# Runs tests for all supported PHP versions
-docker-compose run --entrypoint "$Entrypoint" php54 && \
-docker-compose run --entrypoint "$Entrypoint" php55 && \
-docker-compose run --entrypoint "$Entrypoint" php56 && \
-docker-compose run --entrypoint "$Entrypoint" php70 && \
-docker-compose run --entrypoint "$Entrypoint" php71 && \
-docker-compose run --entrypoint "$Entrypoint" php72 && \
-docker-compose run --entrypoint "$Entrypoint" php73 && \
-docker-compose run --entrypoint "$Entrypoint" php74

roundcubemail-1.5.3.tar.gz/vendor/smarty/smarty/run-tests.sh Deleted

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/composer.json Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Config.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Files/File.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Ruleset.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Runner.php Changed

@@ -53,8 +53,6 @@
      */
     public function runPHPCS()
     {
-        $this->registerOutOfMemoryShutdownMessage('phpcs');
-
         try {
             Util\Timing::startTiming();
             Runner::checkRequirements();
@@ -155,8 +153,6 @@
      */
     public function runPHPCBF()
     {
-        $this->registerOutOfMemoryShutdownMessage('phpcbf');
-
         if (defined('PHP_CODESNIFFER_CBF') === false) {
             define('PHP_CODESNIFFER_CBF', true);
         }
@@ -725,11 +721,6 @@
                 continue;
             }
 
-            $childProcessStatus = pcntl_wexitstatus($status);
-            if ($childProcessStatus !== 0) {
-                $success = false;
-            }
-
             $out = $childProcs$pid;
             unset($childProcs$pid);
             if (file_exists($out) === false) {
@@ -895,42 +886,4 @@
     }//end printProgress()
 
 
-    /**
-     * Registers a PHP shutdown function to provide a more informative out of memory error.
-     *
-     * @param string $command The command which was used to initiate the PHPCS run.
-     *
-     * @return void
-     */
-    private function registerOutOfMemoryShutdownMessage($command)
-    {
-        // Allocate all needed memory beforehand as much as possible.
-        $errorMsg    = PHP_EOL.'The PHP_CodeSniffer "%1$s" command ran out of memory.'.PHP_EOL;
-        $errorMsg   .= 'Either raise the "memory_limit" of PHP in the php.ini file or raise the memory limit at runtime'.PHP_EOL;
-        $errorMsg   .= 'using `%1$s -d memory_limit=512M` (replace 512M with the desired memory limit).'.PHP_EOL;
-        $errorMsg    = sprintf($errorMsg, $command);
-        $memoryError = 'Allowed memory size of';
-        $errorArray  = 
-            'type'    => 42,
-            'message' => 'Some random dummy string to take up memory and take up some more memory and some more',
-            'file'    => 'Another random string, which would be a filename this time. Should be relatively long to allow for deeply nested files',
-            'line'    => 31427,
-        ;
-
-        register_shutdown_function(
-            static function () use (
-                $errorMsg,
-                $memoryError,
-                $errorArray
-            ) {
-                $errorArray = error_get_last();
-                if (is_array($errorArray) === true && strpos($errorArray'message', $memoryError) !== false) {
-                    echo $errorMsg;
-                }
-            }
-        );
-
-    }//end registerOutOfMemoryShutdownMessage()
-
-
 }//end class

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Sniffs/AbstractArraySniff.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Docs/Classes/OpeningBraceSameLineStandard.xml Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Docs/Formatting/SpaceAfterNotStandard.xml Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Docs/WhiteSpace/ArbitraryParenthesesSpacingStandard.xml Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/PHP/DisallowRequestSuperglobalSniff.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/PHP/LowerCaseTypeSniff.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/PHP/UpperCaseConstantSniff.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php Changed

@@ -142,13 +142,12 @@
             }
         }
 
-        $lastOpenTag       = $stackPtr;
-        $lastCloseTag      = null;
-        $openScopes        = ;
-        $adjustments       = ;
-        $setIndents        = ;
-        $disableExactStack = ;
-        $disableExactEnd   = 0;
+        $lastOpenTag     = $stackPtr;
+        $lastCloseTag    = null;
+        $openScopes      = ;
+        $adjustments     = ;
+        $setIndents      = ;
+        $disableExactEnd = 0;
 
         $tokens  = $phpcsFile->getTokens();
         $first   = $phpcsFile->findFirstOnLine(T_INLINE_HTML, $stackPtr);
@@ -233,7 +232,6 @@
             if ($tokens$i'code' === T_OPEN_PARENTHESIS
                 && isset($tokens$i'parenthesis_closer') === true
             ) {
-                $disableExactStack$tokens$i'parenthesis_closer' = $tokens$i'parenthesis_closer';
                 $disableExactEnd = max($disableExactEnd, $tokens$i'parenthesis_closer');
                 if ($this->debug === true) {
                     $line = $tokens$i'line';
@@ -618,11 +616,11 @@
 
             // Scope closers reset the required indent to the same level as the opening condition.
             if (($checkToken !== null
-                && (isset($openScopes$checkToken) === true
+                && isset($openScopes$checkToken) === true
                 || (isset($tokens$checkToken'scope_condition') === true
                 && isset($tokens$checkToken'scope_closer') === true
                 && $tokens$checkToken'scope_closer' === $checkToken
-                && $tokens$checkToken'line' !== $tokens$tokens$checkToken'scope_opener''line')))
+                && $tokens$checkToken'line' !== $tokens$tokens$checkToken'scope_opener''line'))
                 || ($checkToken === null
                 && isset($openScopes$i) === true)
             ) {
@@ -804,17 +802,9 @@
                 && isset($tokens$checkToken'scope_opener') === true
             ) {
                 $exact = true;
-
                 if ($disableExactEnd > $checkToken) {
-                    foreach ($disableExactStack as $disableExactStackEnd) {
-                        if ($disableExactStackEnd < $checkToken) {
-                            continue;
-                        }
-
-                        if ($tokens$checkToken'conditions' === $tokens$disableExactStackEnd'conditions') {
-                            $exact = false;
-                            break;
-                        }
+                    if ($tokens$checkToken'conditions' === $tokens$disableExactEnd'conditions') {
+                        $exact = false;
                     }
                 }
 
@@ -1045,7 +1035,6 @@
 
             // Don't check indents exactly between arrays as they tend to have custom rules.
             if ($tokens$i'code' === T_OPEN_SHORT_ARRAY) {
-                $disableExactStack$tokens$i'bracket_closer' = $tokens$i'bracket_closer';
                 $disableExactEnd = max($disableExactEnd, $tokens$i'bracket_closer');
                 if ($this->debug === true) {
                     $line    = $tokens$i'line';
@@ -1067,6 +1056,7 @@
             ) {
                 if ($this->debug === true) {
                     $line = $tokens$i'line';
+                    $type = $tokens$disableExactEnd'type';
                     echo "Here/nowdoc found on line $line".PHP_EOL;
                 }

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/WhiteSpace/SpreadOperatorSpacingAfterSniff.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.inc.fixed Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.inc.fixed Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/LowerCaseTypeUnitTest.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/LowerCaseTypeUnitTest.inc.fixed Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/LowerCaseTypeUnitTest.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.inc.fixed Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.3.inc Deleted

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.3.inc.fixed Deleted

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.php Changed

@@ -83,7 +83,7 @@
                 92 => 1,
                 93 => 1,
             ;
-
+            break;
         case 'DisallowTabIndentUnitTest.2.inc':
             return 
                 6  => 1,
@@ -96,33 +96,23 @@
                 13 => 1,
                 19 => 1,
             ;
-
-        case 'DisallowTabIndentUnitTest.3.inc':
-            if (\PHP_VERSION_ID >= 70300) {
-                return 
-                    7  => 1,
-                    13 => 1,
-                ;
-            }
-
-            // PHP 7.2 or lower: PHP version which doesn't support flexible heredocs/nowdocs yet.
-            return ;
-
+            break;
         case 'DisallowTabIndentUnitTest.js':
             return 
                 3 => 1,
                 5 => 1,
                 6 => 1,
             ;
-
+            break;
         case 'DisallowTabIndentUnitTest.css':
             return 
                 1 => 1,
                 2 => 1,
             ;
-
+            break;
         default:
             return ;
+            break;
         }//end switch
 
     }//end getErrorList()

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.1.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.1.inc.fixed Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.2.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.2.inc.fixed Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/SpreadOperatorSpacingAfterUnitTest.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/SpreadOperatorSpacingAfterUnitTest.inc.fixed Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.inc.fixed Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Sniffs/Classes/AnonClassDeclarationSniff.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Sniffs/Classes/ClassInstantiationSniff.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Classes/ClassInstantiationUnitTest.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Classes/ClassInstantiationUnitTest.inc.fixed Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Classes/ClassInstantiationUnitTest.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/ControlStructures/ForLoopDeclarationSniff.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/PHP/DisallowComparisonAssignmentSniff.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Scope/StaticThisUsageSniff.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.1.inc.fixed Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.1.js.fixed Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.inc.fixed Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/DisallowComparisonAssignmentUnitTest.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc.fixed Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Tokenizers/PHP.php Changed

@@ -1223,7 +1223,7 @@
 
             /*
                 Tokenize the parameter labels for PHP 8.0 named parameters as a special T_PARAM_NAME
-                token and ensures that the colon after it is always T_COLON.
+                token and ensure that the colon after it is always T_COLON.
             */
 
             if ($tokenIsArray === true
@@ -2688,18 +2688,13 @@
                     }
 
                     if (isset(Util\Tokens::$emptyTokens$this->tokens$x'code') === false) {
-                        // Allow for control structures without braces.
-                        if (($this->tokens$x'code' === T_CLOSE_PARENTHESIS
-                            && isset($this->tokens$x'parenthesis_owner') === true
-                            && isset(Util\Tokens::$scopeOpeners$this->tokens$this->tokens$x'parenthesis_owner''code') === true)
-                            || isset($allowed$this->tokens$x'code') === false
-                        ) {
+                        if (isset($allowed$this->tokens$x'code') === false) {
                             $isShortArray = true;
                         }
 
                         break;
                     }
-                }//end for
+                }
 
                 if ($isShortArray === true) {
                     $this->tokens$i'code' = T_OPEN_SHORT_ARRAY;

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Tokenizers/Tokenizer.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Util/Common.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Util/Tokens.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Autoloader/DetermineLoadedClassTest.php Changed

@@ -1,6 +1,6 @@
 <?php
 /**
- * Tests for the \PHP_CodeSniffer\Autoload::determineLoadedClass method.
+ * Tests for the \PHP_CodeSniffer\Util\Common::isCamelCaps method.
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
@@ -9,7 +9,6 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Autoloader;
 
-use PHP_CodeSniffer\Autoload;
 use PHPUnit\Framework\TestCase;
 
 class DetermineLoadedClassTest extends TestCase
@@ -52,7 +51,7 @@
             'traits'     => ,
         ;
 
-        $className = Autoload::determineLoadedClass($classesBeforeLoad, $classesAfterLoad);
+        $className = \PHP_CodeSniffer\Autoload::determineLoadedClass($classesBeforeLoad, $classesAfterLoad);
         $this->assertEquals('PHP_CodeSniffer\Tests\Core\Autoloader\Sub\C', $className);
 
     }//end testOrdered()
@@ -82,7 +81,7 @@
             'traits'     => ,
         ;
 
-        $className = Autoload::determineLoadedClass($classesBeforeLoad, $classesAfterLoad);
+        $className = \PHP_CodeSniffer\Autoload::determineLoadedClass($classesBeforeLoad, $classesAfterLoad);
         $this->assertEquals('PHP_CodeSniffer\Tests\Core\Autoloader\Sub\C', $className);
 
         $classesAfterLoad = 
@@ -96,7 +95,7 @@
             'traits'     => ,
         ;
 
-        $className = Autoload::determineLoadedClass($classesBeforeLoad, $classesAfterLoad);
+        $className = \PHP_CodeSniffer\Autoload::determineLoadedClass($classesBeforeLoad, $classesAfterLoad);
         $this->assertEquals('PHP_CodeSniffer\Tests\Core\Autoloader\Sub\C', $className);
 
         $classesAfterLoad = 
@@ -110,7 +109,7 @@
             'traits'     => ,
         ;
 
-        $className = Autoload::determineLoadedClass($classesBeforeLoad, $classesAfterLoad);
+        $className = \PHP_CodeSniffer\Autoload::determineLoadedClass($classesBeforeLoad, $classesAfterLoad);
         $this->assertEquals('PHP_CodeSniffer\Tests\Core\Autoloader\Sub\C', $className);
 
     }//end testUnordered()

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/FindEndOfStatementTest.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/FindStartOfStatementTest.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/GetMemberPropertiesTest.php Changed

@@ -211,17 +211,6 @@
                 ,
             ,
             
-                '/* testNoPrefix */',
-                
-                    'scope'           => 'public',
-                    'scope_specified' => false,
-                    'is_static'       => false,
-                    'is_readonly'     => false,
-                    'type'            => '',
-                    'nullable_type'   => false,
-                ,
-            ,
-            
                 '/* testPublicStaticWithDocblock */',
                 
                     'scope'           => 'public',
@@ -299,6 +288,17 @@
                 ,
             ,
             
+                '/* testNoPrefix */',
+                
+                    'scope'           => 'public',
+                    'scope_specified' => false,
+                    'is_static'       => false,
+                    'is_readonly'     => false,
+                    'type'            => '',
+                    'nullable_type'   => false,
+                ,
+            ,
+            
                 '/* testGroupProtectedStatic 1 */',
                 
                     'scope'           => 'protected',

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/GetMethodParametersTest.php Changed

@@ -62,173 +62,173 @@
 
 
     /**
-     * Verify variable.
+     * Verify type hint parsing.
      *
      * @return void
      */
-    public function testVariable()
+    public function testTypeHint()
     {
         $expected    = ;
         $expected0 = 
-            'name'              => '$var',
-            'content'           => '$var',
+            'name'              => '$var1',
+            'content'           => 'foo $var1',
             'has_attributes'    => false,
             'pass_by_reference' => false,
             'variable_length'   => false,
-            'type_hint'         => '',
+            'type_hint'         => 'foo',
+            'nullable_type'     => false,
+        ;
+
+        $expected1 = 
+            'name'              => '$var2',
+            'content'           => 'bar $var2',
+            'has_attributes'    => false,
+            'pass_by_reference' => false,
+            'variable_length'   => false,
+            'type_hint'         => 'bar',
             'nullable_type'     => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
 
-    }//end testVariable()
+    }//end testTypeHint()
 
 
     /**
-     * Verify default value parsing with a single function param.
+     * Verify self type hint parsing.
      *
      * @return void
      */
-    public function testSingleDefaultValue()
+    public function testSelfTypeHint()
     {
         $expected    = ;
         $expected0 = 
-            'name'              => '$var1',
-            'content'           => '$var1=self::CONSTANT',
+            'name'              => '$var',
+            'content'           => 'self $var',
             'has_attributes'    => false,
-            'default'           => 'self::CONSTANT',
             'pass_by_reference' => false,
             'variable_length'   => false,
-            'type_hint'         => '',
+            'type_hint'         => 'self',
             'nullable_type'     => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
 
-    }//end testSingleDefaultValue()
+    }//end testSelfTypeHint()
 
 
     /**
-     * Verify default value parsing.
+     * Verify nullable type hint parsing.
      *
      * @return void
      */
-    public function testDefaultValues()
+    public function testNullableTypeHint()
     {
         $expected    = ;
         $expected0 = 
             'name'              => '$var1',
-            'content'           => '$var1=1',
+            'content'           => '?int $var1',
             'has_attributes'    => false,
-            'default'           => '1',
             'pass_by_reference' => false,
             'variable_length'   => false,
-            'type_hint'         => '',
-            'nullable_type'     => false,
+            'type_hint'         => '?int',
+            'nullable_type'     => true,
         ;
+
         $expected1 = 
             'name'              => '$var2',
-            'content'           => "\$var2='value'",
+            'content'           => '?\bar $var2',
             'has_attributes'    => false,
-            'default'           => "'value'",
             'pass_by_reference' => false,
             'variable_length'   => false,
-            'type_hint'         => '',
-            'nullable_type'     => false,
+            'type_hint'         => '?\bar',
+            'nullable_type'     => true,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
 
-    }//end testDefaultValues()
+    }//end testNullableTypeHint()
 
 
     /**
-     * Verify type hint parsing.
+     * Verify variable.
      *
      * @return void
      */
-    public function testTypeHint()
+    public function testVariable()
     {
         $expected    = ;
         $expected0 = 
-            'name'              => '$var1',
-            'content'           => 'foo $var1',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => 'foo',
-            'nullable_type'     => false,
-        ;
-
-        $expected1 = 
-            'name'              => '$var2',
-            'content'           => 'bar $var2',
+            'name'              => '$var',
+            'content'           => '$var',
             'has_attributes'    => false,
             'pass_by_reference' => false,
             'variable_length'   => false,
-            'type_hint'         => 'bar',
+            'type_hint'         => '',
             'nullable_type'     => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
 
-    }//end testTypeHint()
+    }//end testVariable()
 
 
     /**
-     * Verify self type hint parsing.
+     * Verify default value parsing with a single function param.
      *
      * @return void
      */
-    public function testSelfTypeHint()
+    public function testSingleDefaultValue()
     {
         $expected    = ;
         $expected0 = 
-            'name'              => '$var',
-            'content'           => 'self $var',
+            'name'              => '$var1',
+            'content'           => '$var1=self::CONSTANT',
             'has_attributes'    => false,
+            'default'           => 'self::CONSTANT',
             'pass_by_reference' => false,
             'variable_length'   => false,
-            'type_hint'         => 'self',
+            'type_hint'         => '',
             'nullable_type'     => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
 
-    }//end testSelfTypeHint()
+    }//end testSingleDefaultValue()
 
 
     /**
-     * Verify nullable type hint parsing.
+     * Verify default value parsing.
      *
      * @return void
      */
-    public function testNullableTypeHint()
+    public function testDefaultValues()
     {
         $expected    = ;
         $expected0 = 
             'name'              => '$var1',
-            'content'           => '?int $var1',
+            'content'           => '$var1=1',
             'has_attributes'    => false,
+            'default'           => '1',
             'pass_by_reference' => false,
             'variable_length'   => false,
-            'type_hint'         => '?int',
-            'nullable_type'     => true,
+            'type_hint'         => '',
+            'nullable_type'     => false,
         ;
-
         $expected1 = 
             'name'              => '$var2',
-            'content'           => '?\bar $var2',
+            'content'           => "\$var2='value'",
             'has_attributes'    => false,
+            'default'           => "'value'",
             'pass_by_reference' => false,
             'variable_length'   => false,
-            'type_hint'         => '?\bar',
-            'nullable_type'     => true,
+            'type_hint'         => '',
+            'nullable_type'     => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
 
-    }//end testNullableTypeHint()
+    }//end testDefaultValues()
 
 
     /**

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/GetMethodPropertiesTest.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/IsReferenceTest.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/AttributesTest.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/HeredocNowdocCloserTest.inc Deleted

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/HeredocNowdocCloserTest.php Deleted

@@ -1,150 +0,0 @@
-<?php
-/**
- * Tests the tokenization of goto declarations and statements.
- *
- * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
- * @copyright 2020 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- */
-
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
-
-use PHP_CodeSniffer\Config;
-use PHP_CodeSniffer\Ruleset;
-use PHP_CodeSniffer\Files\DummyFile;
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
-
-/**
- * Heredoc/nowdoc closer token test.
- *
- * @requires PHP 7.3
- */
-class HeredocNowdocCloserTest extends AbstractMethodUnitTest
-{
-
-
-    /**
-     * Initialize & tokenize \PHP_CodeSniffer\Files\File with code from the test case file.
-     *
-     * {@internal This is a near duplicate of the original method. Only difference is that
-     * tab replacement is enabled for this test.}
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        $config            = new Config();
-        $config->standards = 'PSR1';
-        $config->tabWidth  = 4;
-
-        $ruleset = new Ruleset($config);
-
-        // Default to a file with the same name as the test class. Extension is property based.
-        $relativeCN     = str_replace(__NAMESPACE__, '', get_called_class());
-        $relativePath   = str_replace('\\', DIRECTORY_SEPARATOR, $relativeCN);
-        $pathToTestFile = realpath(__DIR__).$relativePath.'.'.static::$fileExtension;
-
-        // Make sure the file gets parsed correctly based on the file type.
-        $contents  = 'phpcs_input_file: '.$pathToTestFile.PHP_EOL;
-        $contents .= file_get_contents($pathToTestFile);
-
-        self::$phpcsFile = new DummyFile($contents, $ruleset, $config);
-        self::$phpcsFile->process();
-
-    }//end setUpBeforeClass()
-
-
-    /**
-     * Verify that leading (indent) whitespace in a heredoc/nowdoc closer token get the tab replacement treatment.
-     *
-     * @param string $testMarker The comment prefacing the target token.
-     * @param array  $expected   Expectations for the token array.
-     *
-     * @dataProvider dataHeredocNowdocCloserTabReplacement
-     * @covers       PHP_CodeSniffer\Tokenizers\Tokenizer::createPositionMap
-     *
-     * @return void
-     */
-    public function testHeredocNowdocCloserTabReplacement($testMarker, $expected)
-    {
-        $tokens = self::$phpcsFile->getTokens();
-
-        $closer = $this->getTargetToken($testMarker, T_END_HEREDOC, T_END_NOWDOC);
-
-        foreach ($expected as $key => $value) {
-            if ($key === 'orig_content' && $value === null) {
-                $this->assertArrayNotHasKey($key, $tokens$closer, "Unexpected 'orig_content' key found in the token array.");
-                continue;
-            }
-
-            $this->assertArrayHasKey($key, $tokens$closer, "Key $key not found in the token array.");
-            $this->assertSame($value, $tokens$closer$key, "Value for key $key does not match expectation.");
-        }
-
-    }//end testHeredocNowdocCloserTabReplacement()
-
-
-    /**
-     * Data provider.
-     *
-     * @see testHeredocNowdocCloserTabReplacement()
-     *
-     * @return array
-     */
-    public function dataHeredocNowdocCloserTabReplacement()
-    {
-        return 
-            
-                'testMarker' => '/* testHeredocCloserNoIndent */',
-                'expected'   => 
-                    'length'       => 3,
-                    'content'      => 'EOD',
-                    'orig_content' => null,
-                ,
-            ,
-            
-                'testMarker' => '/* testNowdocCloserNoIndent */',
-                'expected'   => 
-                    'length'       => 3,
-                    'content'      => 'EOD',
-                    'orig_content' => null,
-                ,
-            ,
-            
-                'testMarker' => '/* testHeredocCloserSpaceIndent */',
-                'expected'   => 
-                    'length'       => 7,
-                    'content'      => '    END',
-                    'orig_content' => null,
-                ,
-            ,
-            
-                'testMarker' => '/* testNowdocCloserSpaceIndent */',
-                'expected'   => 
-                    'length'       => 8,
-                    'content'      => '     END',
-                    'orig_content' => null,
-                ,
-            ,
-            
-                'testMarker' => '/* testHeredocCloserTabIndent */',
-                'expected'   => 
-                    'length'       => 8,
-                    'content'      => '     END',
-                    'orig_content' => '	 END',
-                ,
-            ,
-            
-                'testMarker' => '/* testNowdocCloserTabIndent */',
-                'expected'   => 
-                    'length'       => 7,
-                    'content'      => '    END',
-                    'orig_content' => '	END',
-                ,
-            ,
-        ;
-
-    }//end dataHeredocNowdocCloserTabReplacement()
-
-
-}//end class

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/HeredocStringTest.inc Deleted

@@ -1,193 +0,0 @@
-<?php
-
-// Test source: https://gist.github.com/iluuu1994/72e2154fc4150f2258316b0255b698f2#file-test-php
-
-/* testSimple1 */
-$heredoc = <<<EOD
-$foo
-EOD;
-
-/* testSimple2 */
-$heredoc = <<<"EOD"
-{$foo}
-EOD;
-
-/* testSimple3 */
-$heredoc = <<<EOD
-${foo}
-EOD;
-
-/* testDIM1 */
-$heredoc = <<<"EOD"
-$foobar
-EOD;
-
-/* testDIM2 */
-$heredoc = <<<EOD
-{$foo'bar'}
-EOD;
-
-/* testDIM3 */
-$heredoc = <<<"EOD"
-${foo'bar'}
-EOD;
-
-/* testProperty1 */
-$heredoc = <<<EOD
-$foo->bar
-EOD;
-
-/* testProperty2 */
-$heredoc = <<<"EOD"
-{$foo->bar}
-EOD;
-
-/* testMethod1 */
-$heredoc = <<<EOD
-{$foo->bar()}
-EOD;
-
-/* testClosure1 */
-$heredoc = <<<"EOD"
-{$foo()}
-EOD;
-
-/* testChain1 */
-$heredoc = <<<EOD
-{$foo'bar'->baz()()}
-EOD;
-
-/* testVariableVar1 */
-$heredoc = <<<"EOD"
-${$bar}
-EOD;
-
-/* testVariableVar2 */
-$heredoc = <<<EOD
-${(foo)}
-EOD;
-
-/* testVariableVar3 */
-$heredoc = <<<"EOD"
-${foo->bar}
-EOD;
-
-/* testNested1 */
-$heredoc = <<<EOD
-${foo"${bar}"}
-EOD;
-
-/* testNested2 */
-$heredoc = <<<"EOD"
-${foo"${bar'baz'}"}
-EOD;
-
-/* testNested3 */
-$heredoc = <<<EOD
-${foo->{$baz}}
-EOD;
-
-/* testNested4 */
-$heredoc = <<<"EOD"
-${foo->{${'a'}}}
-EOD;
-
-/* testNested5 */
-$heredoc = <<<EOD
-${foo->{"${'a'}"}}
-EOD;
-
-/* testSimple1Wrapped */
-$heredoc = <<<EOD
-Do $foo Something
-EOD;
-
-/* testSimple2Wrapped */
-$heredoc = <<<"EOD"
-Do {$foo} Something
-EOD;
-
-/* testSimple3Wrapped */
-$heredoc = <<<EOD
-Do ${foo} Something
-EOD;
-
-/* testDIM1Wrapped */
-$heredoc = <<<"EOD"
-Do $foobar Something
-EOD;
-
-/* testDIM2Wrapped */
-$heredoc = <<<EOD
-Do {$foo'bar'} Something
-EOD;
-
-/* testDIM3Wrapped */
-$heredoc = <<<"EOD"
-Do ${foo'bar'} Something
-EOD;
-
-/* testProperty1Wrapped */
-$heredoc = <<<EOD
-Do $foo->bar Something
-EOD;
-
-/* testProperty2Wrapped */
-$heredoc = <<<"EOD"
-Do {$foo->bar} Something
-EOD;
-
-/* testMethod1Wrapped */
-$heredoc = <<<EOD
-Do {$foo->bar()} Something
-EOD;
-
-/* testClosure1Wrapped */
-$heredoc = <<<"EOD"
-Do {$foo()} Something
-EOD;
-
-/* testChain1Wrapped */
-$heredoc = <<<EOD
-Do {$foo'bar'->baz()()} Something
-EOD;
-
-/* testVariableVar1Wrapped */
-$heredoc = <<<"EOD"
-Do ${$bar} Something
-EOD;
-
-/* testVariableVar2Wrapped */
-$heredoc = <<<EOD
-Do ${(foo)} Something
-EOD;
-
-/* testVariableVar3Wrapped */
-$heredoc = <<<"EOD"
-Do ${foo->bar} Something
-EOD;
-
-/* testNested1Wrapped */
-$heredoc = <<<EOD
-Do ${foo"${bar}"} Something
-EOD;
-
-/* testNested2Wrapped */
-$heredoc = <<<"EOD"
-Do ${foo"${bar'baz'}"} Something
-EOD;
-
-/* testNested3Wrapped */
-$heredoc = <<<EOD
-Do ${foo->{$baz}} Something
-EOD;
-
-/* testNested4Wrapped */
-$heredoc = <<<"EOD"
-Do ${foo->{${'a'}}} Something
-EOD;
-
-/* testNested5Wrapped */
-$heredoc = <<<EOD
-Do ${foo->{"${'a'}"}} Something
-EOD;

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/HeredocStringTest.php Deleted

@@ -1,153 +0,0 @@
-<?php
-/**
- * Tests that embedded variables and expressions in heredoc strings are tokenized
- * as one heredoc string token.
- *
- * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
- * @copyright 2022 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- */
-
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
-
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
-
-class HeredocStringTest extends AbstractMethodUnitTest
-{
-
-
-    /**
-     * Test that heredoc strings contain the complete interpolated string.
-     *
-     * @param string $testMarker      The comment which prefaces the target token in the test file.
-     * @param string $expectedContent The expected content of the heredoc string.
-     *
-     * @dataProvider dataHeredocString
-     * @covers       PHP_CodeSniffer\Tokenizers\PHP::tokenize
-     *
-     * @return void
-     */
-    public function testHeredocString($testMarker, $expectedContent)
-    {
-        $tokens = self::$phpcsFile->getTokens();
-
-        $target = $this->getTargetToken($testMarker, T_HEREDOC);
-        $this->assertSame($expectedContent."\n", $tokens$target'content');
-
-    }//end testHeredocString()
-
-
-    /**
-     * Test that heredoc strings contain the complete interpolated string when combined with other texts.
-     *
-     * @param string $testMarker      The comment which prefaces the target token in the test file.
-     * @param string $expectedContent The expected content of the heredoc string.
-     *
-     * @dataProvider dataHeredocString
-     * @covers       PHP_CodeSniffer\Tokenizers\PHP::tokenize
-     *
-     * @return void
-     */
-    public function testHeredocStringWrapped($testMarker, $expectedContent)
-    {
-        $tokens = self::$phpcsFile->getTokens();
-
-        $testMarker = substr($testMarker, 0, -3).'Wrapped */';
-        $target     = $this->getTargetToken($testMarker, T_HEREDOC);
-        $this->assertSame('Do '.$expectedContent." Something\n", $tokens$target'content');
-
-    }//end testHeredocStringWrapped()
-
-
-    /**
-     * Data provider.
-     *
-     * @see testHeredocString()
-     *
-     * @return array
-     */
-    public function dataHeredocString()
-    {
-        return 
-            
-                'testMarker'      => '/* testSimple1 */',
-                'expectedContent' => '$foo',
-            ,
-            
-                'testMarker'      => '/* testSimple2 */',
-                'expectedContent' => '{$foo}',
-            ,
-            
-                'testMarker'      => '/* testSimple3 */',
-                'expectedContent' => '${foo}',
-            ,
-            
-                'testMarker'      => '/* testDIM1 */',
-                'expectedContent' => '$foobar',
-            ,
-            
-                'testMarker'      => '/* testDIM2 */',
-                'expectedContent' => '{$foo\'bar\'}',
-            ,
-            
-                'testMarker'      => '/* testDIM3 */',
-                'expectedContent' => '${foo\'bar\'}',
-            ,
-            
-                'testMarker'      => '/* testProperty1 */',
-                'expectedContent' => '$foo->bar',
-            ,
-            
-                'testMarker'      => '/* testProperty2 */',
-                'expectedContent' => '{$foo->bar}',
-            ,
-            
-                'testMarker'      => '/* testMethod1 */',
-                'expectedContent' => '{$foo->bar()}',
-            ,
-            
-                'testMarker'      => '/* testClosure1 */',
-                'expectedContent' => '{$foo()}',
-            ,
-            
-                'testMarker'      => '/* testChain1 */',
-                'expectedContent' => '{$foo\'bar\'->baz()()}',
-            ,
-            
-                'testMarker'      => '/* testVariableVar1 */',
-                'expectedContent' => '${$bar}',
-            ,
-            
-                'testMarker'      => '/* testVariableVar2 */',
-                'expectedContent' => '${(foo)}',
-            ,
-            
-                'testMarker'      => '/* testVariableVar3 */',
-                'expectedContent' => '${foo->bar}',
-            ,
-            
-                'testMarker'      => '/* testNested1 */',
-                'expectedContent' => '${foo"${bar}"}',
-            ,
-            
-                'testMarker'      => '/* testNested2 */',
-                'expectedContent' => '${foo"${bar\'baz\'}"}',
-            ,
-            
-                'testMarker'      => '/* testNested3 */',
-                'expectedContent' => '${foo->{$baz}}',
-            ,
-            
-                'testMarker'      => '/* testNested4 */',
-                'expectedContent' => '${foo->{${\'a\'}}}',
-            ,
-            
-                'testMarker'      => '/* testNested5 */',
-                'expectedContent' => '${foo->{"${\'a\'}"}}',
-            ,
-        ;
-
-    }//end dataHeredocString()
-
-
-}//end class

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/NamedFunctionCallArgumentsTest.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/NamedFunctionCallArgumentsTest.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/ScopeSettingWithNamespaceOperatorTest.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/ShortArrayTest.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/ShortArrayTest.php Changed

@@ -52,29 +52,29 @@
     public function dataSquareBrackets()
     {
         return 
-            'array access 1'                                => '/* testArrayAccess1 */',
-            'array access 2'                                => '/* testArrayAccess2 */',
-            'array assignment'                              => '/* testArrayAssignment */',
-            'function call dereferencing'                   => '/* testFunctionCallDereferencing */',
-            'method call dereferencing'                     => '/* testMethodCallDereferencing */',
-            'static method call dereferencing'              => '/* testStaticMethodCallDereferencing */',
-            'property dereferencing'                        => '/* testPropertyDereferencing */',
-            'property dereferencing with inaccessable name' => '/* testPropertyDereferencingWithInaccessibleName */',
-            'static property dereferencing'                 => '/* testStaticPropertyDereferencing */',
-            'string dereferencing single quotes'            => '/* testStringDereferencing */',
-            'string dereferencing double quotes'            => '/* testStringDereferencingDoubleQuoted */',
-            'global constant dereferencing'                 => '/* testConstantDereferencing */',
-            'class constant dereferencing'                  => '/* testClassConstantDereferencing */',
-            'magic constant dereferencing'                  => '/* testMagicConstantDereferencing */',
-            'array access with curly braces'                => '/* testArrayAccessCurlyBraces */',
-            'array literal dereferencing'                   => '/* testArrayLiteralDereferencing */',
-            'short array literal dereferencing'             => '/* testShortArrayLiteralDereferencing */',
-            'class member dereferencing on instantiation 1' => '/* testClassMemberDereferencingOnInstantiation1 */',
-            'class member dereferencing on instantiation 2' => '/* testClassMemberDereferencingOnInstantiation2 */',
-            'class member dereferencing on clone'           => '/* testClassMemberDereferencingOnClone */',
-            'nullsafe method call dereferencing'            => '/* testNullsafeMethodCallDereferencing */',
-            'interpolated string dereferencing'             => '/* testInterpolatedStringDereferencing */',
-            'live coding'                                   => '/* testLiveCoding */',
+            '/* testArrayAccess1 */',
+            '/* testArrayAccess2 */',
+            '/* testArrayAssignment */',
+            '/* testFunctionCallDereferencing */',
+            '/* testMethodCallDereferencing */',
+            '/* testStaticMethodCallDereferencing */',
+            '/* testPropertyDereferencing */',
+            '/* testPropertyDereferencingWithInaccessibleName */',
+            '/* testStaticPropertyDereferencing */',
+            '/* testStringDereferencing */',
+            '/* testStringDereferencingDoubleQuoted */',
+            '/* testConstantDereferencing */',
+            '/* testClassConstantDereferencing */',
+            '/* testMagicConstantDereferencing */',
+            '/* testArrayAccessCurlyBraces */',
+            '/* testArrayLiteralDereferencing */',
+            '/* testShortArrayLiteralDereferencing */',
+            '/* testClassMemberDereferencingOnInstantiation1 */',
+            '/* testClassMemberDereferencingOnInstantiation2 */',
+            '/* testClassMemberDereferencingOnClone */',
+            '/* testNullsafeMethodCallDereferencing */',
+            '/* testInterpolatedStringDereferencing */',
+            '/* testLiveCoding */',
         ;
 
     }//end dataSquareBrackets()
@@ -117,16 +117,13 @@
     public function dataShortArrays()
     {
         return 
-            'short array empty'                              => '/* testShortArrayDeclarationEmpty */',
-            'short array with value'                         => '/* testShortArrayDeclarationWithOneValue */',
-            'short array with values'                        => '/* testShortArrayDeclarationWithMultipleValues */',
-            'short array with dereferencing'                 => '/* testShortArrayDeclarationWithDereferencing */',
-            'short list'                                     => '/* testShortListDeclaration */',
-            'short list nested'                              => '/* testNestedListDeclaration */',
-            'short array within function call'               => '/* testArrayWithinFunctionCall */',
-            'short list after braced control structure'      => '/* testShortListDeclarationAfterBracedControlStructure */',
-            'short list after non-braced control structure'  => '/* testShortListDeclarationAfterNonBracedControlStructure */',
-            'short list after alternative control structure' => '/* testShortListDeclarationAfterAlternativeControlStructure */',
+            '/* testShortArrayDeclarationEmpty */',
+            '/* testShortArrayDeclarationWithOneValue */',
+            '/* testShortArrayDeclarationWithMultipleValues */',
+            '/* testShortArrayDeclarationWithDereferencing */',
+            '/* testShortListDeclaration */',
+            '/* testNestedListDeclaration */',
+            '/* testArrayWithinFunctionCall */',
         ;
 
     }//end dataShortArrays()

roundcubemail.dsc Changed

Overview

Request 3122 (accepted)

Request History