Kolab Groupware OBS

roundcubemail.spec Changed

debian.changelog Changed

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

roundcubemail-1.5.tar.gz/INSTALL Changed

@@ -13,7 +13,8 @@
 * .htaccess support allowing overrides for DirectoryIndex
 * PHP Version 5.5 or greater including:
    - PCRE, DOM, JSON, Session, Sockets, OpenSSL, Mbstring, Filter, Ctype, Intl (required)
-   - PHP PDO with driver for either MySQL, PostgreSQL, SQL Server, Oracle or SQLite (required)
+   - PHP PDO with driver for either MySQL (MariaDB), PostgreSQL, SQL Server, Oracle or 
+   SQLite (required)
    - Iconv, Zip, Fileinfo, Exif (recommended)
    - LDAP for LDAP addressbook support (optional)
    - GD, Imagick (optional thumbnails generation, QR-code)
@@ -27,7 +28,7 @@
    - suhosin.session.encrypt disabled
    - mbstring.func_overload disabled
    - pcre.backtrack_limit >= 100000
-* A MySQL, PostgreSQL, MS SQL Server (2005 or newer), Oracle database
+* A MariaDB, MySQL, PostgreSQL, MS SQL Server (2005 or newer), Oracle database
   or SQLite v3 support in PHP - with permission to create tables
 * Composer installed either locally or globally (https://getcomposer.org)
 
@@ -93,13 +94,13 @@
 Note: Database for Roundcube must use UTF-8 character set.
 Note: See defaults.inc.php file for examples of DSN configuration.
 
-* MySQL
+* MariaDB / MySQL
 -------
-Setting up the mysql database can be done by creating an empty database,
+Setting up the mariadb / mysql database can be done by creating an empty database,
 importing the table layout and granting the proper permissions to the
 roundcube user. Here is an example of that procedure:
 
-# mysql
+# mariadb / mysql
 > CREATE DATABASE roundcubemail CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 > CREATE USER roundcube@localhost IDENTIFIED BY 'password';
 > GRANT ALL PRIVILEGES ON roundcubemail.* TO roundcube@localhost;

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

@@ -2991,23 +2991,23 @@
 },
 {
 "name": "sabre/event",
- "version": "5.1.6",
+ "version": "5.1.7",
 "source": {
 "type": "git",
 "url": "https://github.com/sabre-io/event.git",
- "reference": "e0e1ccbff1965083de9a6530182b8b70819e1347"
+ "reference": "86d57e305c272898ba3c28e9bd3d65d5464587c2"
 },
 "dist": {
 "type": "zip",
- "url": "https://api.github.com/repos/sabre-io/event/zipball/e0e1ccbff1965083de9a6530182b8b70819e1347",
- "reference": "e0e1ccbff1965083de9a6530182b8b70819e1347",
+ "url": "https://api.github.com/repos/sabre-io/event/zipball/86d57e305c272898ba3c28e9bd3d65d5464587c2",
+ "reference": "86d57e305c272898ba3c28e9bd3d65d5464587c2",
 "shasum": ""
 },
 "require": {
 "php": "^7.1 || ^8.0"
 },
 "require-dev": {
- "friendsofphp/php-cs-fixer": "~2.17.1",
+ "friendsofphp/php-cs-fixer": "~2.17.1||^3.63",
 "phpstan/phpstan": "^0.12",
 "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6"
 },
@@ -3053,20 +3053,20 @@
 "issues": "https://github.com/sabre-io/event/issues",
 "source": "https://github.com/fruux/sabre-event"
 },
- "time": "2024-07-26T05:09:47+00:00"
+ "time": "2024-08-27T11:23:05+00:00"
 },
 {
 "name": "sabre/http",
- "version": "5.1.11",
+ "version": "5.1.12",
 "source": {
 "type": "git",
 "url": "https://github.com/sabre-io/http.git",
- "reference": "abb019d9415d8c6c39c377e212ef34ad727b711f"
+ "reference": "dedff73f3995578bc942fa4c8484190cac14f139"
 },
 "dist": {
 "type": "zip",
- "url": "https://api.github.com/repos/sabre-io/http/zipball/abb019d9415d8c6c39c377e212ef34ad727b711f",
- "reference": "abb019d9415d8c6c39c377e212ef34ad727b711f",
+ "url": "https://api.github.com/repos/sabre-io/http/zipball/dedff73f3995578bc942fa4c8484190cac14f139",
+ "reference": "dedff73f3995578bc942fa4c8484190cac14f139",
 "shasum": ""
 },
 "require": {
@@ -3078,7 +3078,7 @@
 "sabre/uri": "^2.0"
 },
 "require-dev": {
- "friendsofphp/php-cs-fixer": "~2.17.1",
+ "friendsofphp/php-cs-fixer": "~2.17.1||^3.63",
 "phpstan/phpstan": "^0.12",
 "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6"
 },
@@ -3116,7 +3116,7 @@
 "issues": "https://github.com/sabre-io/http/issues",
 "source": "https://github.com/fruux/sabre-http"
 },
- "time": "2024-07-26T06:15:25+00:00"
+ "time": "2024-08-27T16:07:41+00:00"
 },
 {
 "name": "sabre/uri",
@@ -3281,16 +3281,16 @@
 },
 {
 "name": "sabre/xml",
- "version": "2.2.9",
+ "version": "2.2.11",
 "source": {
 "type": "git",
 "url": "https://github.com/sabre-io/xml.git",
- "reference": "88288712d45f694be3679a0db7dfb3770f08d4f0"
+ "reference": "01a7927842abf3e10df3d9c2d9b0cc9d813a3fcc"
 },
 "dist": {
 "type": "zip",
- "url": "https://api.github.com/repos/sabre-io/xml/zipball/88288712d45f694be3679a0db7dfb3770f08d4f0",
- "reference": "88288712d45f694be3679a0db7dfb3770f08d4f0",
+ "url": "https://api.github.com/repos/sabre-io/xml/zipball/01a7927842abf3e10df3d9c2d9b0cc9d813a3fcc",
+ "reference": "01a7927842abf3e10df3d9c2d9b0cc9d813a3fcc",
 "shasum": ""
 },
 "require": {
@@ -3302,7 +3302,7 @@
 "sabre/uri": ">=1.0,<3.0.0"
 },
 "require-dev": {
- "friendsofphp/php-cs-fixer": "~2.17.1",
+ "friendsofphp/php-cs-fixer": "~2.17.1||3.63.2",
 "phpstan/phpstan": "^0.12",
 "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6"
 },
@@ -3346,7 +3346,7 @@
 "issues": "https://github.com/sabre-io/xml/issues",
 "source": "https://github.com/fruux/sabre-xml"
 },
- "time": "2024-07-26T12:32:40+00:00"
+ "time": "2024-09-06T07:37:46+00:00"
 },
 {
 "name": "smarty/smarty",
@@ -3488,22 +3488,21 @@
 },
 {
 "name": "symfony/polyfill-intl-idn",
- "version": "v1.30.0",
+ "version": "v1.31.0",
 "source": {
 "type": "git",
 "url": "https://github.com/symfony/polyfill-intl-idn.git",
- "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c"
+ "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773"
 },
 "dist": {
 "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a6e83bdeb3c84391d1dfe16f42e40727ce524a5c",
- "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/c36586dcf89a12315939e00ec9b4474adcb1d773",
+ "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773",
 "shasum": ""
 },
 "require": {
- "php": ">=7.1",
- "symfony/polyfill-intl-normalizer": "^1.10",
- "symfony/polyfill-php72": "^1.10"
+ "php": ">=7.2",
+ "symfony/polyfill-intl-normalizer": "^1.10"
 },
 "suggest": {
 "ext-intl": "For best performance"
@@ -3552,7 +3551,7 @@
 "shim"
 ,
 "support": {
- "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.30.0"
+ "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.31.0"
 },
 "funding": 
 {
@@ -3568,24 +3567,24 @@
 "type": "tidelift"
 }
 ,
- "time": "2024-05-31T15:07:36+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
 },
 {
 "name": "symfony/polyfill-intl-normalizer",
- "version": "v1.30.0",
+ "version": "v1.31.0",
 "source": {
 "type": "git",
 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
- "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb"
+ "reference": "3833d7255cc303546435cb650316bff708a1c75c"
 },
 "dist": {
 "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/a95281b0be0d9ab48050ebd988b967875cdb9fdb",
- "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c",
+ "reference": "3833d7255cc303546435cb650316bff708a1c75c",
 "shasum": ""
 },
 "require": {
- "php": ">=7.1"
+ "php": ">=7.2"
 },
 "suggest": {
 "ext-intl": "For best performance"
@@ -3633,7 +3632,7 @@
 "shim"
 ,
 "support": {
- "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.30.0"
+ "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0"
 },
 "funding": 
 {
@@ -3649,24 +3648,24 @@
 "type": "tidelift"
 }
 ,
- "time": "2024-05-31T15:07:36+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
 },
 {
 "name": "symfony/polyfill-mbstring",
- "version": "v1.30.0",

roundcubemail-1.5.tar.gz/logs/errors.log Changed

@@ -1,4 +1,4 @@
-19-Aug-2024 14:12:37 UTC PHP Fatal error:  Uncaught Error: Class 'PDO' not found in /tmp/roundcubemail-1.5/roundcubemail-1.5/program/lib/Roundcube/db/mysql.php:134
+25-Sep-2024 12:24:00 UTC PHP Fatal error:  Uncaught Error: Class 'PDO' not found in /tmp/roundcubemail-1.5/roundcubemail-1.5/program/lib/Roundcube/db/mysql.php:134
 Stack trace:
 #0 /tmp/roundcubemail-1.5/roundcubemail-1.5/program/lib/Roundcube/rcube_db.php(167): rcube_db_mysql->dsn_options(Array)
 #1 /tmp/roundcubemail-1.5/roundcubemail-1.5/program/lib/Roundcube/rcube_db.php(153): rcube_db->conn_create(Array)
@@ -7,7 +7,7 @@
 #4 /tmp/roundcubemail-1.5/roundcubemail-1.5/vendor/bin/rcubeinitdb.sh(115): include('/tmp/roundcubem...')
 #5 {main}
   thrown in /tmp/roundcubemail-1.5/roundcubemail-1.5/program/lib/Roundcube/db/mysql.php on line 134
-19-Aug-2024 14:12:37 UTC PHP Fatal error:  Uncaught Error: Class 'PDO' not found in /tmp/roundcubemail-1.5/roundcubemail-1.5/program/lib/Roundcube/db/mysql.php:134
+25-Sep-2024 12:24:01 UTC PHP Fatal error:  Uncaught Error: Class 'PDO' not found in /tmp/roundcubemail-1.5/roundcubemail-1.5/program/lib/Roundcube/db/mysql.php:134
 Stack trace:
 #0 /tmp/roundcubemail-1.5/roundcubemail-1.5/program/lib/Roundcube/rcube_db.php(167): rcube_db_mysql->dsn_options(Array)
 #1 /tmp/roundcubemail-1.5/roundcubemail-1.5/program/lib/Roundcube/rcube_db.php(153): rcube_db->conn_create(Array)

roundcubemail-1.5.tar.gz/node_modules/tslib/package.json Changed

roundcubemail-1.5.tar.gz/node_modules/tslib/tslib.es6.js Changed

@@ -12,7 +12,7 @@
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
-/* global Reflect, Promise, SuppressedError, Symbol */
+/* global Reflect, Promise, SuppressedError, Symbol, Iterator */
 
 var extendStatics = function(d, b) {
     extendStatics = Object.setPrototypeOf ||
@@ -123,8 +123,8 @@
 }
 
 export function __generator(thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t0 & 1) throw t1; return t1; }, trys: , ops:  }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (gSymbol.iterator = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t0 & 1) throw t1; return t1; }, trys: , ops:  }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g"throw" = verb(1), g"return" = verb(2), typeof Symbol === "function" && (gSymbol.iterator = function() { return this; }), g;
     function verb(n) { return function (v) { return step(n, v); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -228,7 +228,7 @@
 export function __asyncGenerator(thisArg, _arguments, generator) {
     if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
     var g = generator.apply(thisArg, _arguments || ), i, q = ;
-    return i = {}, verb("next"), verb("throw"), verb("return", awaitReturn), iSymbol.asyncIterator = function () { return this; }, i;
+    return i = Object.create((typeof AsyncIterator === "function" ? AsyncIterator : Object).prototype), verb("next"), verb("throw"), verb("return", awaitReturn), iSymbol.asyncIterator = function () { return this; }, i;
     function awaitReturn(f) { return function (v) { return Promise.resolve(v).then(f, reject); }; }
     function verb(n, f) { if (gn) { in = function (v) { return new Promise(function (a, b) { q.push(n, v, a, b) > 1 || resume(n, v); }); }; if (f) in = f(in); } }
     function resume(n, v) { try { step(gn(v)); } catch (e) { settle(q03, e); } }
@@ -327,17 +327,22 @@
         env.error = env.hasError ? new _SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
         env.hasError = true;
     }
+    var r, s = 0;
     function next() {
-        while (env.stack.length) {
-            var rec = env.stack.pop();
+        while (r = env.stack.pop()) {
             try {
-                var result = rec.dispose && rec.dispose.call(rec.value);
-                if (rec.async) return Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
+                if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next);
+                if (r.dispose) {
+                    var result = r.dispose.call(r.value);
+                    if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
+                }
+                else s |= 1;
             }
             catch (e) {
                 fail(e);
             }
         }
+        if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve();
         if (env.hasError) throw env.error;
     }
     return next();

roundcubemail-1.5.tar.gz/node_modules/tslib/tslib.es6.mjs Changed

@@ -12,7 +12,7 @@
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
-/* global Reflect, Promise, SuppressedError, Symbol */
+/* global Reflect, Promise, SuppressedError, Symbol, Iterator */
 
 var extendStatics = function(d, b) {
   extendStatics = Object.setPrototypeOf ||
@@ -123,8 +123,8 @@
 }
 
 export function __generator(thisArg, body) {
-  var _ = { label: 0, sent: function() { if (t0 & 1) throw t1; return t1; }, trys: , ops:  }, f, y, t, g;
-  return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (gSymbol.iterator = function() { return this; }), g;
+  var _ = { label: 0, sent: function() { if (t0 & 1) throw t1; return t1; }, trys: , ops:  }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+  return g.next = verb(0), g"throw" = verb(1), g"return" = verb(2), typeof Symbol === "function" && (gSymbol.iterator = function() { return this; }), g;
   function verb(n) { return function (v) { return step(n, v); }; }
   function step(op) {
       if (f) throw new TypeError("Generator is already executing.");
@@ -228,7 +228,7 @@
 export function __asyncGenerator(thisArg, _arguments, generator) {
   if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
   var g = generator.apply(thisArg, _arguments || ), i, q = ;
-  return i = {}, verb("next"), verb("throw"), verb("return", awaitReturn), iSymbol.asyncIterator = function () { return this; }, i;
+  return i = Object.create((typeof AsyncIterator === "function" ? AsyncIterator : Object).prototype), verb("next"), verb("throw"), verb("return", awaitReturn), iSymbol.asyncIterator = function () { return this; }, i;
   function awaitReturn(f) { return function (v) { return Promise.resolve(v).then(f, reject); }; }
   function verb(n, f) { if (gn) { in = function (v) { return new Promise(function (a, b) { q.push(n, v, a, b) > 1 || resume(n, v); }); }; if (f) in = f(in); } }
   function resume(n, v) { try { step(gn(v)); } catch (e) { settle(q03, e); } }
@@ -326,17 +326,22 @@
     env.error = env.hasError ? new _SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
     env.hasError = true;
   }
+  var r, s = 0;
   function next() {
-    while (env.stack.length) {
-      var rec = env.stack.pop();
+    while (r = env.stack.pop()) {
       try {
-        var result = rec.dispose && rec.dispose.call(rec.value);
-        if (rec.async) return Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
+        if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next);
+        if (r.dispose) {
+          var result = r.dispose.call(r.value);
+          if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
+        }
+        else s |= 1;
       }
       catch (e) {
-          fail(e);
+        fail(e);
       }
     }
+    if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve();
     if (env.hasError) throw env.error;
   }
   return next();

roundcubemail-1.5.tar.gz/node_modules/tslib/tslib.js Changed

@@ -12,7 +12,7 @@
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
-/* global global, define, Symbol, Reflect, Promise, SuppressedError */
+/* global global, define, Symbol, Reflect, Promise, SuppressedError, Iterator */
 var __extends;
 var __assign;
 var __rest;
@@ -171,8 +171,8 @@
     };
 
     __generator = function (thisArg, body) {
-        var _ = { label: 0, sent: function() { if (t0 & 1) throw t1; return t1; }, trys: , ops:  }, f, y, t, g;
-        return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (gSymbol.iterator = function() { return this; }), g;
+        var _ = { label: 0, sent: function() { if (t0 & 1) throw t1; return t1; }, trys: , ops:  }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+        return g.next = verb(0), g"throw" = verb(1), g"return" = verb(2), typeof Symbol === "function" && (gSymbol.iterator = function() { return this; }), g;
         function verb(n) { return function (v) { return step(n, v); }; }
         function step(op) {
             if (f) throw new TypeError("Generator is already executing.");
@@ -276,7 +276,7 @@
     __asyncGenerator = function (thisArg, _arguments, generator) {
         if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
         var g = generator.apply(thisArg, _arguments || ), i, q = ;
-        return i = {}, verb("next"), verb("throw"), verb("return", awaitReturn), iSymbol.asyncIterator = function () { return this; }, i;
+        return i = Object.create((typeof AsyncIterator === "function" ? AsyncIterator : Object).prototype), verb("next"), verb("throw"), verb("return", awaitReturn), iSymbol.asyncIterator = function () { return this; }, i;
         function awaitReturn(f) { return function (v) { return Promise.resolve(v).then(f, reject); }; }
         function verb(n, f) { if (gn) { in = function (v) { return new Promise(function (a, b) { q.push(n, v, a, b) > 1 || resume(n, v); }); }; if (f) in = f(in); } }
         function resume(n, v) { try { step(gn(v)); } catch (e) { settle(q03, e); } }
@@ -374,17 +374,22 @@
             env.error = env.hasError ? new _SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
             env.hasError = true;
         }
+        var r, s = 0;
         function next() {
-            while (env.stack.length) {
-                var rec = env.stack.pop();
+            while (r = env.stack.pop()) {
                 try {
-                    var result = rec.dispose && rec.dispose.call(rec.value);
-                    if (rec.async) return Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
+                    if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next);
+                    if (r.dispose) {
+                        var result = r.dispose.call(r.value);
+                        if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
+                    }
+                    else s |= 1;
                 }
                 catch (e) {
                     fail(e);
                 }
             }
+            if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve();
             if (env.hasError) throw env.error;
         }
         return next();

roundcubemail-1.5.tar.gz/package-lock.json Changed

roundcubemail-1.5.tar.gz/plugins/kolab_2fa/bin Added

roundcubemail-1.5.tar.gz/plugins/kolab_2fa/bin/fixprefs.sh Added

@@ -0,0 +1,77 @@
+#!/usr/bin/env php
+<?php
+
+/**
+ * User preferences update script for migration of second factor configuration.
+ *
+ * @author Aleksander Machniak <machniak@apheleia-it.ch>
+ *
+ * Copyright (C) 2024, Apheleia IT AG <contact@apheleia-it.ch>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALL_PATH', __DIR__ . '/../../../');
+ini_set('display_errors', 1);
+
+require_once INSTALL_PATH . 'program/include/clisetup.php';
+
+// connect to database
+$db = $rcmail->get_dbh();
+$db->db_connect('w');
+
+if (!$db->is_connected() || $db->is_error()) {
+ die("No DB connection\n");
+}
+
+// Load the plugin to load its configuration
+$rcmail->plugins->load_plugin('kolab_2fa', true, true);
+$plugin = $rcmail->plugins->get_plugin('kolab_2fa');
+
+$config = 
+ 'totp' => 'digest' => 'sha1', 'digits' => 6,
+ 'hotp' => 'digest' => 'sha1', 'digits' => 6,
+;
+
+foreach ($config as $driver => $conf) {
+ $driver_config = $rcmail->config->get('kolab_2fa_' . $driver);
+ if (!empty($driver_config)) {
+ $config$driver = array_merge($conf, array_intersect_key($driver_config, $conf));
+ }
+}
+
+$sql_result = $db->query('SELECT * FROM ' . $db->table_name('users', true) . ' ORDER BY user_id');
+
+while ($sql_result && ($sql_arr = $db->fetch_assoc($sql_result))) {
+ $user = new rcube_user($sql_arr'user_id', $sql_arr);
+ $prefs = $user->get_prefs();
+
+ if (!empty($prefs'kolab_2fa_blob')) {
+ echo 'Updating prefs for user ' . $sql_arr'user_id' . '...';
+
+ foreach ($prefs'kolab_2fa_blob' as $key => $value) {
+ $driver = explode(':', $key);
+ if (!empty($config$driver)) {
+ $prefs'kolab_2fa_blob'$key += $config$driver;
+ }
+ }
+
+ if ($user->save_prefs($prefs, true)) {
+ echo " DONE\n";
+ } else {
+ echo " FAILED\n";
+ exit;
+ }
+ }
+}

roundcubemail-1.5.tar.gz/plugins/kolab_2fa/kolab_2fa.php Changed

@@ -82,6 +82,11 @@
 return $args;
 }
 
+ // Single Sign On authentication, disable 2FA (Roundcube > 1.6)
+ if (!empty($args'sso')) {
+ return $args;
+ }
+
 $rcmail = rcmail::get_instance();
 
 // parse $host URL
@@ -242,10 +247,7 @@
 */
 protected function verify_factor_auth($method, $code, $username)
 {
- if (strlen($code) && ($driver = $this->get_driver($method))) {
- // set properties from login
- $driver->username = $username;
-
+ if (strlen($code) && ($driver = $this->get_driver($method, $username))) {
 try {
 // verify the submitted code
 return $driver->verify($code, $_SESSION'kolab_2fa_time');
@@ -335,10 +337,12 @@
 /**
 * Load driver class for the given authentication factor
 *
- * @param string $factor Factor identifier (<method>:<id>)
+ * @param string $factor Factor identifier (<method>:<id>)
+ * @param string $username Username (email)
+ *
 * @return Kolab2FA\Driver\Base|false
 */
- public function get_driver($factor)
+ public function get_driver($factor, $username = null)
 {
 $method = explode(':', $factor, 2);
 
@@ -350,22 +354,20 @@
 
 $config = $rcmail->config->get('kolab_2fa_' . $method, );
 
- // use product name as "issuer""
+ // use product name as "issuer"
 if (empty($config'issuer')) {
 $config'issuer' = $rcmail->config->get('product_name');
 }
 
+ if (empty($username) && $rcmail->user->ID) {
+ $username = $rcmail->get_user_name();
+ }
+
 try {
- // TODO: use external auth service if configured
 
- $driver = \Kolab2FA\Driver\Base::factory($factor, $config);
+ $storage = $this->get_storage($username);
 
- // attach storage
- $driver->storage = $this->get_storage();
-
- if ($rcmail->user->ID) {
- $driver->username = $rcmail->get_user_name();
- }
+ $driver = \Kolab2FA\Driver\Base::factory($storage, $factor, $config);
 
 $this->drivers$factor = $driver;
 return $driver;
@@ -734,6 +736,10 @@
 try {
 $uri = $driver->get_provisioning_uri();
 
+ // Some OTP apps have an issue with algorithm character case
+ // So we make sure we use upper-case per the spec.
+ $uri = str_replace('algorithm=sha', 'algorithm=SHA', $uri);
+
 $qr = new Endroid\QrCode\QrCode();
 $qr->setText($uri)
 ->setSize(240)
@@ -767,7 +773,7 @@
 if (is_array($data)) {
 foreach ($data as $key => $value) {
 if ($value !== '******') {
- $driver->$key = $value;
+ $driver->set($key, $value, false);
 }
 }
 }

roundcubemail-1.5.tar.gz/plugins/kolab_2fa/lib/Kolab2FA/Driver/Base.php Changed

@@ -25,9 +25,6 @@
 
 /**
  * Kolab 2-Factor-Authentication Driver base class
- *
- * @property string $username
- * @property string $secret
  */
 abstract class Base
 {
@@ -36,6 +33,7 @@
     public $storage;
 
     protected $config          = ;
+    protected $config_keys     = ;
     protected $props           = ;
     protected $user_props      = ;
     protected $pending_changes = false;
@@ -67,7 +65,7 @@
     /**
      * Static factory method
      */
-    public static function factory($id, $config)
+    public static function factory($storage, $id, $config)
     {
         $method = explode(':', $id);
 
@@ -79,7 +77,7 @@
 
         $cls = $classmapstrtolower($method);
         if ($cls && class_exists($cls)) {
-            return new $cls($config, $id);
+            return new $cls($storage, $config, $id);
         }
 
         throw new Exception("Unknown 2FA driver '$method'");
@@ -88,30 +86,41 @@
     /**
      * Default constructor
      */
-    public function __construct($config = null, $id = null)
+    public function __construct($storage, $config = null, $id = null)
     {
-        $this->init($config);
+        if (!is_array($config)) {
+            $config = ;
+        }
+
+        $this->storage = $storage;
+        $this->props'username' = (string) $storage->username;
 
         if (!empty($id) && $id != $this->method) {
             $this->id = $id;
+            if ($this->storage) {
+                $this->user_props = (array) $this->storage->read($this->id);
+                foreach ($this->config_keys as $key) {
+                    if (isset($this->user_props$key)) {
+                        $config$key = $this->user_props$key;
+                    }
+                }
+            }
         } else { // generate random ID
             $this->id = $this->method . ':' . bin2hex(openssl_random_pseudo_bytes(12));
             $this->temporary = true;
         }
+
+        $this->init($config);
     }
 
     /**
      * Initialize the driver with the given config options
      */
-    public function init($config)
+    protected function init($config)
     {
         if (is_array($config)) {
             $this->config = array_merge($this->config, $config);
         }
-
-        if (!empty($config'storage')) {
-            $this->storage = \Kolab2FA\Storage\Base::factory($config'storage', $config'storage_config');
-        }
     }
 
     /**
@@ -125,6 +134,11 @@
     abstract public function verify($code, $timestamp = null);
 
     /**
+     * Implement this method if the driver can be provisioned via QR code
+     */
+    /* abstract function get_provisioning_uri(); */
+
+    /**
      * Getter for user-visible properties
      */
     public function props($force = false)
@@ -167,11 +181,6 @@
     }
 
     /**
-     * Implement this method if the driver can be provisioned via QR code
-     */
-    /* abstract function get_provisioning_uri(); */
-
-    /**
      * Generate a random secret string
      */
     public function generate_secret($length = 16)
@@ -227,7 +236,11 @@
                 }
             }
         } else {
-            $value = $this->props$key ?? null;
+            $value = $this->get_user_prop($key);
+
+            if ($value === null) {
+                $value = $this->props$key ?? null;
+            }
         }
 
         return $value;
@@ -262,7 +275,17 @@
     public function commit()
     {
         if (!empty($this->user_props) && $this->storage && $this->pending_changes) {
-            if ($this->storage->write($this->id, $this->user_props)) {
+            $props = $this->user_props;
+
+            // Remamber the driver config too. It will be used to verify the code.
+            // The configured one may be different than the one used on code creation.
+            foreach ($this->config_keys as $key) {
+                if (isset($this->config$key)) {
+                    $props$key = $this->config$key;
+                }
+            }
+
+            if ($this->storage->write($this->id, $props)) {
                 $this->pending_changes = false;
                 $this->temporary = false;
             }
@@ -272,20 +295,6 @@
     }
 
     /**
-     * Dedicated setter for the username property
-     */
-    public function set_username($username)
-    {
-        $this->props'username' = $username;
-
-        if ($this->storage) {
-            $this->storage->set_username($username);
-        }
-
-        return true;
-    }
-
-    /**
      * Clear data stored for this driver
      */
     public function clear()
@@ -326,33 +335,4 @@
         $this->user_props$key = $value;
         return true;
     }
-
-    /**
-     * Magic getter for read-only access to driver properties
-     */
-    public function __get($key)
-    {
-        // this is a per-user property: get from persistent storage
-        if (isset($this->user_settings$key)) {
-            return $this->get_user_prop($key);
-        }
-
-        return $this->props$key;
-    }
-
-    /**
-     * Magic setter for restricted access to driver properties
-     */
-    public function __set($key, $value)
-    {
-        $this->set($key, $value, false);
-    }
-
-    /**
-     * Magic check if driver property is defined
-     */
-    public function __isset($key)
-    {
-        return isset($this->props$key);
-    }
 }

roundcubemail-1.5.tar.gz/plugins/kolab_2fa/lib/Kolab2FA/Driver/HOTP.php Changed

@@ -33,6 +33,7 @@
         'digest'   => 'sha1',
     ;
 
+    protected $config_keys = 'digits', 'digest';
     protected $backend;
 
     /**
@@ -88,31 +89,24 @@
     {
         // get my secret from the user storage
         $secret  = $this->get('secret');
-        $counter = $this->get('counter');
 
         if (!strlen($secret)) {
-            // LOG: "no secret set for user $this->username"
-            // rcube::console("VERIFY HOTP: no secret set for user $this->username");
             return false;
         }
 
         try {
-            $this->backend->setLabel($this->username);
+            $this->backend->setLabel($this->get('username'));
             $this->backend->setSecret($secret);
-            $this->backend->setCounter(intval($this->get('counter')));
 
-            $pass = $this->backend->verify($code, $counter, (int) $this->config'window');
+            $pass = $this->backend->verify($code, $this->get('counter'), (int) $this->config'window');
 
             // store incremented counter value
             $this->set('counter', $this->backend->getCounter());
             $this->commit();
         } catch (\Exception $e) {
-            // LOG: exception
-            // rcube::console("VERIFY HOTP: $this->id, " . strval($e));
             $pass = false;
         }
 
-        // rcube::console('VERIFY HOTP', $this->username, $secret, $counter, $code, $pass);
         return $pass;
     }
 
@@ -121,7 +115,7 @@
      */
     public function get_provisioning_uri()
     {
-        if (!$this->secret) {
+        if (!$this->get('secret')) {
             // generate new secret and store it
             $this->set('secret', $this->get('secret', true));
             $this->set('counter', $this->get('counter', true));
@@ -131,8 +125,8 @@
 
         // TODO: deny call if already active?
 
-        $this->backend->setLabel($this->username);
-        $this->backend->setSecret($this->secret);
+        $this->backend->setLabel($this->get('username'));
+        $this->backend->setSecret($this->get('secret'));
         $this->backend->setCounter(intval($this->get('counter')));
 
         return $this->backend->getProvisioningUri();

roundcubemail-1.5.tar.gz/plugins/kolab_2fa/lib/Kolab2FA/Driver/TOTP.php Changed

@@ -33,6 +33,7 @@
         'digest'   => 'sha1',
     ;
 
+    protected $config_keys = 'digits', 'digest';
     protected $backend;
 
     /**
@@ -88,12 +89,10 @@
         $secret = $this->get('secret');
 
         if (!strlen($secret)) {
-            // LOG: "no secret set for user $this->username"
-            // rcube::console("VERIFY TOTP: no secret set for user $this->username");
             return false;
         }
 
-        $this->backend->setLabel($this->username);
+        $this->backend->setLabel($this->get('username'));
         $this->backend->setSecret($secret);
 
         // Pass a window to indicate the maximum timeslip between client (mobile
@@ -109,7 +108,6 @@
             }
         }
 
-        // rcube::console('VERIFY TOTP', $this->username, $secret, $code, $timestamp, $pass);
         return $pass;
     }
 
@@ -118,19 +116,17 @@
      */
     public function get_provisioning_uri()
     {
-        // rcube::console('PROV', $this->secret);
-        if (!$this->secret) {
+        if (!$this->get('secret')) {
             // generate new secret and store it
             $this->set('secret', $this->get('secret', true));
             $this->set('created', $this->get('created', true));
-            // rcube::console('PROV2', $this->secret);
             $this->commit();
         }
 
         // TODO: deny call if already active?
 
-        $this->backend->setLabel($this->username);
-        $this->backend->setSecret($this->secret);
+        $this->backend->setLabel($this->get('username'));
+        $this->backend->setSecret($this->get('secret'));
 
         return $this->backend->getProvisioningUri();
     }

roundcubemail-1.5.tar.gz/plugins/kolab_2fa/lib/Kolab2FA/Driver/Yubikey.php Changed

roundcubemail-1.5.tar.gz/plugins/kolab_2fa/lib/Kolab2FA/Storage/Base.php Changed

roundcubemail-1.5.tar.gz/plugins/kolab_2fa/lib/Kolab2FA/Storage/RcubeUser.php Changed

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

@@ -429,15 +429,18 @@
 */
 public function folderCreate($location, $component, $properties = )
 {
- $ns = 'xmlns:d="DAV:"';
- $props = '';
+ $props, $ns = $this->folderPropertiesToXml($properties, 'xmlns:d="DAV:"');
 
 if ($component == 'VCARD') {
 $ns .= ' xmlns:c="urn:ietf:params:xml:ns:carddav"';
- $props = '<d:resourcetype><d:collection/><c:addressbook/></d:resourcetype>';
+ $props .= '<d:resourcetype><d:collection/><c:addressbook/></d:resourcetype>';
 } else {
 $ns .= ' xmlns:c="urn:ietf:params:xml:ns:caldav"';
- $props = '<d:resourcetype><d:collection/><c:calendar/></d:resourcetype>';
+ $props .= '<d:resourcetype><d:collection/><c:calendar/></d:resourcetype>'
+ // Note: Some clients, but also Cyrus by default allows everything in calendar folders,
+ // i.e. VEVENT, VTODO, VJOURNAL, VFREEBUSY, VAVAILABILITY, but we prefer a single-type folders,
+ // to keep tasks and event separated
+ . '<c:supported-calendar-component-set><c:comp name="' . $component . '"/></c:supported-calendar-component-set>';
 }
 
 $body = '<?xml version="1.0" encoding="utf-8"?>'
@@ -450,12 +453,7 @@
 // Create the collection
 $response = $this->request($location, 'MKCOL', $body);
 
- if (empty($response)) {
- return false;
- }
-
- // Update collection properties
- return $this->folderUpdate($location, $component, $properties);
+ return $response !== false;
 }
 
 /**
@@ -483,29 +481,35 @@
 */
 public function folderUpdate($location, $component, $properties = )
 {
- $ns = 'xmlns:d="DAV:"';
- $props = '';
+ // Note: Changing resourcetype property is forbidden (at least by Cyrus)
 
- if ($component == 'VCARD') {
- $ns .= ' xmlns:c="urn:ietf:params:xml:ns:carddav"';
- // Resourcetype property is protected
- // $props = '<d:resourcetype><d:collection/><c:addressbook/></d:resourcetype>';
- } else {
- $ns .= ' xmlns:c="urn:ietf:params:xml:ns:caldav"';
- // Resourcetype property is protected
- // $props = '<d:resourcetype><d:collection/><c:calendar/></d:resourcetype>';
- /*
- // Note: These are set by Cyrus automatically for calendars
- . '<c:supported-calendar-component-set>'
- . '<c:comp name="VEVENT"/>'
- . '<c:comp name="VTODO"/>'
- . '<c:comp name="VJOURNAL"/>'
- . '<c:comp name="VFREEBUSY"/>'
- . '<c:comp name="VAVAILABILITY"/>'
- . '</c:supported-calendar-component-set>';
- */
+ $props, $ns = $this->folderPropertiesToXml($properties, 'xmlns:d="DAV:"');
+
+ if (empty($props)) {
+ return true;
 }
 
+ $body = '<?xml version="1.0" encoding="utf-8"?>'
+ . '<d:propertyupdate ' . $ns . '>'
+ . '<d:set>'
+ . '<d:prop>' . $props . '</d:prop>'
+ . '</d:set>'
+ . '</d:propertyupdate>';
+
+ $response = $this->request($location, 'PROPPATCH', $body);
+
+ // TODO: Should we make sure "200 OK" status is set for all requested properties?
+
+ return $response !== false;
+ }
+
+ /**
+ * Parse folder properties input into XML string to use in a request
+ */
+ protected function folderPropertiesToXml($properties, $ns = '')
+ {
+ $props = '';
+
 foreach ($properties as $name => $value) {
 if ($name == 'name') {
 $props .= '<d:displayname>' . htmlspecialchars($value, ENT_XML1, 'UTF-8') . '</d:displayname>';
@@ -525,22 +529,7 @@
 }
 }
 
- if (empty($props)) {
- return true;
- }
-
- $body = '<?xml version="1.0" encoding="utf-8"?>'
- . '<d:propertyupdate ' . $ns . '>'
- . '<d:set>'
- . '<d:prop>' . $props . '</d:prop>'
- . '</d:set>'
- . '</d:propertyupdate>';
-
- $response = $this->request($location, 'PROPPATCH', $body);
-
- // TODO: Should we make sure "200 OK" status is set for all requested properties?
-
- return $response !== false;
+ return $props, $ns;
 }
 
 /**

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

roundcubemail-1.5.tar.gz/plugins/managesieve/Changelog Changed

roundcubemail-1.5.tar.gz/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php Changed

roundcubemail-1.5.tar.gz/vendor/composer/autoload_files.php Changed

roundcubemail-1.5.tar.gz/vendor/composer/autoload_psr4.php Changed

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

@@ -19,7 +19,6 @@
         '7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php',
         '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
         'e69f7f6ee287b969198c3c9d6777bd38' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/bootstrap.php',
-        '25072dd6e2470089de65ae7bf11d3109' => __DIR__ . '/..' . '/symfony/polyfill-php72/bootstrap.php',
         '51fcf4e06c07cc00c920b44bcd900e7a' => __DIR__ . '/..' . '/thecodingmachine/safe/deprecated/apc.php',
         '47f619d9197b36cf5ab70738d7743fe2' => __DIR__ . '/..' . '/thecodingmachine/safe/deprecated/libevent.php',
         'ea6bb8a12ef9b68f6ada99058e530760' => __DIR__ . '/..' . '/thecodingmachine/safe/deprecated/mssql.php',
@@ -133,7 +132,6 @@
         ),
         'S' => 
         array (
-            'Symfony\\Polyfill\\Php72\\' => 23,
             'Symfony\\Polyfill\\Mbstring\\' => 26,
             'Symfony\\Polyfill\\Intl\\Normalizer\\' => 33,
             'Symfony\\Polyfill\\Intl\\Idn\\' => 26,
@@ -208,10 +206,6 @@
         array (
             0 => __DIR__ . '/..' . '/webmozart/assert/src',
         ),
-        'Symfony\\Polyfill\\Php72\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/symfony/polyfill-php72',
-        ),
         'Symfony\\Polyfill\\Mbstring\\' => 
         array (
             0 => __DIR__ . '/..' . '/symfony/polyfill-mbstring',

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

@@ -3187,17 +3187,17 @@
 },
 {
 "name": "phpstan/phpstan",
- "version": "1.11.10",
- "version_normalized": "1.11.10.0",
+ "version": "1.12.4",
+ "version_normalized": "1.12.4.0",
 "source": {
 "type": "git",
 "url": "https://github.com/phpstan/phpstan.git",
- "reference": "640410b32995914bde3eed26fa89552f9c2c082f"
+ "reference": "ffa517cb918591b93acc9b95c0bebdcd0e4538bd"
 },
 "dist": {
 "type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/640410b32995914bde3eed26fa89552f9c2c082f",
- "reference": "640410b32995914bde3eed26fa89552f9c2c082f",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ffa517cb918591b93acc9b95c0bebdcd0e4538bd",
+ "reference": "ffa517cb918591b93acc9b95c0bebdcd0e4538bd",
 "shasum": ""
 },
 "require": {
@@ -3206,7 +3206,7 @@
 "conflict": {
 "phpstan/phpstan-shim": "*"
 },
- "time": "2024-08-08T09:02:50+00:00",
+ "time": "2024-09-19T07:58:01+00:00",
 "bin": 
 "phpstan",
 "phpstan.phar"
@@ -4101,28 +4101,28 @@
 },
 {
 "name": "sabre/event",
- "version": "5.1.6",
- "version_normalized": "5.1.6.0",
+ "version": "5.1.7",
+ "version_normalized": "5.1.7.0",
 "source": {
 "type": "git",
 "url": "https://github.com/sabre-io/event.git",
- "reference": "e0e1ccbff1965083de9a6530182b8b70819e1347"
+ "reference": "86d57e305c272898ba3c28e9bd3d65d5464587c2"
 },
 "dist": {
 "type": "zip",
- "url": "https://api.github.com/repos/sabre-io/event/zipball/e0e1ccbff1965083de9a6530182b8b70819e1347",
- "reference": "e0e1ccbff1965083de9a6530182b8b70819e1347",
+ "url": "https://api.github.com/repos/sabre-io/event/zipball/86d57e305c272898ba3c28e9bd3d65d5464587c2",
+ "reference": "86d57e305c272898ba3c28e9bd3d65d5464587c2",
 "shasum": ""
 },
 "require": {
 "php": "^7.1 || ^8.0"
 },
 "require-dev": {
- "friendsofphp/php-cs-fixer": "~2.17.1",
+ "friendsofphp/php-cs-fixer": "~2.17.1||^3.63",
 "phpstan/phpstan": "^0.12",
 "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6"
 },
- "time": "2024-07-26T05:09:47+00:00",
+ "time": "2024-08-27T11:23:05+00:00",
 "type": "library",
 "installation-source": "dist",
 "autoload": {
@@ -4170,17 +4170,17 @@
 },
 {
 "name": "sabre/http",
- "version": "5.1.11",
- "version_normalized": "5.1.11.0",
+ "version": "5.1.12",
+ "version_normalized": "5.1.12.0",
 "source": {
 "type": "git",
 "url": "https://github.com/sabre-io/http.git",
- "reference": "abb019d9415d8c6c39c377e212ef34ad727b711f"
+ "reference": "dedff73f3995578bc942fa4c8484190cac14f139"
 },
 "dist": {
 "type": "zip",
- "url": "https://api.github.com/repos/sabre-io/http/zipball/abb019d9415d8c6c39c377e212ef34ad727b711f",
- "reference": "abb019d9415d8c6c39c377e212ef34ad727b711f",
+ "url": "https://api.github.com/repos/sabre-io/http/zipball/dedff73f3995578bc942fa4c8484190cac14f139",
+ "reference": "dedff73f3995578bc942fa4c8484190cac14f139",
 "shasum": ""
 },
 "require": {
@@ -4192,14 +4192,14 @@
 "sabre/uri": "^2.0"
 },
 "require-dev": {
- "friendsofphp/php-cs-fixer": "~2.17.1",
+ "friendsofphp/php-cs-fixer": "~2.17.1||^3.63",
 "phpstan/phpstan": "^0.12",
 "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6"
 },
 "suggest": {
 "ext-curl": " to make http requests with the Client class"
 },
- "time": "2024-07-26T06:15:25+00:00",
+ "time": "2024-08-27T16:07:41+00:00",
 "type": "library",
 "installation-source": "dist",
 "autoload": {
@@ -4403,17 +4403,17 @@
 },
 {
 "name": "sabre/xml",
- "version": "2.2.9",
- "version_normalized": "2.2.9.0",
+ "version": "2.2.11",
+ "version_normalized": "2.2.11.0",
 "source": {
 "type": "git",
 "url": "https://github.com/sabre-io/xml.git",
- "reference": "88288712d45f694be3679a0db7dfb3770f08d4f0"
+ "reference": "01a7927842abf3e10df3d9c2d9b0cc9d813a3fcc"
 },
 "dist": {
 "type": "zip",
- "url": "https://api.github.com/repos/sabre-io/xml/zipball/88288712d45f694be3679a0db7dfb3770f08d4f0",
- "reference": "88288712d45f694be3679a0db7dfb3770f08d4f0",
+ "url": "https://api.github.com/repos/sabre-io/xml/zipball/01a7927842abf3e10df3d9c2d9b0cc9d813a3fcc",
+ "reference": "01a7927842abf3e10df3d9c2d9b0cc9d813a3fcc",
 "shasum": ""
 },
 "require": {
@@ -4425,11 +4425,11 @@
 "sabre/uri": ">=1.0,<3.0.0"
 },
 "require-dev": {
- "friendsofphp/php-cs-fixer": "~2.17.1",
+ "friendsofphp/php-cs-fixer": "~2.17.1||3.63.2",
 "phpstan/phpstan": "^0.12",
 "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6"
 },
- "time": "2024-07-26T12:32:40+00:00",
+ "time": "2024-09-06T07:37:46+00:00",
 "type": "library",
 "installation-source": "dist",
 "autoload": {
@@ -5208,17 +5208,17 @@
 },
 {
 "name": "squizlabs/php_codesniffer",
- "version": "3.10.2",
- "version_normalized": "3.10.2.0",
+ "version": "3.10.3",
+ "version_normalized": "3.10.3.0",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
- "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017"
+ "reference": "62d32998e820bddc40f99f8251958aed187a5c9c"
 },
 "dist": {
 "type": "zip",
- "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/86e5f5dd9a840c46810ebe5ff1885581c42a3017",
- "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017",
+ "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/62d32998e820bddc40f99f8251958aed187a5c9c",
+ "reference": "62d32998e820bddc40f99f8251958aed187a5c9c",
 "shasum": ""
 },
 "require": {
@@ -5230,7 +5230,7 @@
 "require-dev": {
 "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4"
 },
- "time": "2024-07-21T23:26:44+00:00",
+ "time": "2024-09-18T10:38:58+00:00",
 "bin": 
 "bin/phpcbf",
 "bin/phpcs"
@@ -5291,21 +5291,21 @@
 },
 {
 "name": "symfony/polyfill-ctype",
- "version": "v1.30.0",
- "version_normalized": "1.30.0.0",
+ "version": "v1.31.0",
+ "version_normalized": "1.31.0.0",
 "source": {
 "type": "git",
 "url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "0424dff1c58f028c451efff2045f5d92410bd540"
+ "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
 },
 "dist": {
 "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540",
- "reference": "0424dff1c58f028c451efff2045f5d92410bd540",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
+ "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
 "shasum": ""
 },
 "require": {

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

@@ -3,7 +3,7 @@
         'name' => 'roundcube/roundcubemail',
         'pretty_version' => 'dev-dev/kolab-1.5',
         'version' => 'dev-dev/kolab-1.5',
-        'reference' => 'a360052d9916bea169c149874ff98b21cf8f21d8',
+        'reference' => '914c3736231fa997c525cd51a4f1c0ad950b1d43',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -534,9 +534,9 @@
             'dev_requirement' => true,
         ),
         'phpstan/phpstan' => array(
-            'pretty_version' => '1.11.10',
-            'version' => '1.11.10.0',
-            'reference' => '640410b32995914bde3eed26fa89552f9c2c082f',
+            'pretty_version' => '1.12.4',
+            'version' => '1.12.4.0',
+            'reference' => 'ffa517cb918591b93acc9b95c0bebdcd0e4538bd',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpstan/phpstan',
             'aliases' => array(),
@@ -665,7 +665,7 @@
         'roundcube/roundcubemail' => array(
             'pretty_version' => 'dev-dev/kolab-1.5',
             'version' => 'dev-dev/kolab-1.5',
-            'reference' => 'a360052d9916bea169c149874ff98b21cf8f21d8',
+            'reference' => '914c3736231fa997c525cd51a4f1c0ad950b1d43',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
@@ -696,18 +696,18 @@
             'dev_requirement' => false,
         ),
         'sabre/event' => array(
-            'pretty_version' => '5.1.6',
-            'version' => '5.1.6.0',
-            'reference' => 'e0e1ccbff1965083de9a6530182b8b70819e1347',
+            'pretty_version' => '5.1.7',
+            'version' => '5.1.7.0',
+            'reference' => '86d57e305c272898ba3c28e9bd3d65d5464587c2',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sabre/event',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'sabre/http' => array(
-            'pretty_version' => '5.1.11',
-            'version' => '5.1.11.0',
-            'reference' => 'abb019d9415d8c6c39c377e212ef34ad727b711f',
+            'pretty_version' => '5.1.12',
+            'version' => '5.1.12.0',
+            'reference' => 'dedff73f3995578bc942fa4c8484190cac14f139',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sabre/http',
             'aliases' => array(),
@@ -732,9 +732,9 @@
             'dev_requirement' => false,
         ),
         'sabre/xml' => array(
-            'pretty_version' => '2.2.9',
-            'version' => '2.2.9.0',
-            'reference' => '88288712d45f694be3679a0db7dfb3770f08d4f0',
+            'pretty_version' => '2.2.11',
+            'version' => '2.2.11.0',
+            'reference' => '01a7927842abf3e10df3d9c2d9b0cc9d813a3fcc',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sabre/xml',
             'aliases' => array(),
@@ -849,59 +849,50 @@
             'dev_requirement' => false,
         ),
         'squizlabs/php_codesniffer' => array(
-            'pretty_version' => '3.10.2',
-            'version' => '3.10.2.0',
-            'reference' => '86e5f5dd9a840c46810ebe5ff1885581c42a3017',
+            'pretty_version' => '3.10.3',
+            'version' => '3.10.3.0',
+            'reference' => '62d32998e820bddc40f99f8251958aed187a5c9c',
             'type' => 'library',
             'install_path' => __DIR__ . '/../squizlabs/php_codesniffer',
             'aliases' => array(),
             'dev_requirement' => true,
         ),
         'symfony/polyfill-ctype' => array(
-            'pretty_version' => 'v1.30.0',
-            'version' => '1.30.0.0',
-            'reference' => '0424dff1c58f028c451efff2045f5d92410bd540',
+            'pretty_version' => 'v1.31.0',
+            'version' => '1.31.0.0',
+            'reference' => 'a3cc8b044a6ea513310cbd48ef7333b384945638',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-ctype',
             'aliases' => array(),
             'dev_requirement' => true,
         ),
         'symfony/polyfill-intl-idn' => array(
-            'pretty_version' => 'v1.30.0',
-            'version' => '1.30.0.0',
-            'reference' => 'a6e83bdeb3c84391d1dfe16f42e40727ce524a5c',
+            'pretty_version' => 'v1.31.0',
+            'version' => '1.31.0.0',
+            'reference' => 'c36586dcf89a12315939e00ec9b4474adcb1d773',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-intl-idn',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'symfony/polyfill-intl-normalizer' => array(
-            'pretty_version' => 'v1.30.0',
-            'version' => '1.30.0.0',
-            'reference' => 'a95281b0be0d9ab48050ebd988b967875cdb9fdb',
+            'pretty_version' => 'v1.31.0',
+            'version' => '1.31.0.0',
+            'reference' => '3833d7255cc303546435cb650316bff708a1c75c',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-intl-normalizer',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'symfony/polyfill-mbstring' => array(
-            'pretty_version' => 'v1.30.0',
-            'version' => '1.30.0.0',
-            'reference' => 'fd22ab50000ef01661e2a31d850ebaa297f8e03c',
+            'pretty_version' => 'v1.31.0',
+            'version' => '1.31.0.0',
+            'reference' => '85181ba99b2345b0ef10ce42ecac37612d9fd341',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-mbstring',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
-        'symfony/polyfill-php72' => array(
-            'pretty_version' => 'v1.30.0',
-            'version' => '1.30.0.0',
-            'reference' => '10112722600777e02d2745716b70c5db4ca70442',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../symfony/polyfill-php72',
-            'aliases' => array(),
-            'dev_requirement' => false,
-        ),
         'symfony/yaml' => array(
             'pretty_version' => 'v4.4.45',
             'version' => '4.4.45.0',

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/index Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/HEAD Changed

@@ -1,3 +1,3 @@
-0000000000000000000000000000000000000000 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@92ff47c51c68.(none)> 1724076757 +0000	clone: from /home/default/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
-39a754269fe6e5d94b0fe87215e89232876bda01 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@92ff47c51c68.(none)> 1724076757 +0000	checkout: moving from master to master
-39a754269fe6e5d94b0fe87215e89232876bda01 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@92ff47c51c68.(none)> 1724076757 +0000	reset: moving to 39a754269fe6e5d94b0fe87215e89232876bda01
+0000000000000000000000000000000000000000 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@f345fbb8ecec.(none)> 1727267040 +0000	clone: from /home/default/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
+39a754269fe6e5d94b0fe87215e89232876bda01 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@f345fbb8ecec.(none)> 1727267040 +0000	checkout: moving from master to master
+39a754269fe6e5d94b0fe87215e89232876bda01 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@f345fbb8ecec.(none)> 1727267040 +0000	reset: moving to 39a754269fe6e5d94b0fe87215e89232876bda01

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/refs/heads/master Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/refs/remotes/origin/HEAD Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/info/packs Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-52d749ffa19e23bf0aafc4622f83cebff904992a.idx Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-52d749ffa19e23bf0aafc4622f83cebff904992a.pack Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-52d749ffa19e23bf0aafc4622f83cebff904992a.rev Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-d11f406b0b723f91b0d350db99fc935749fea803.idx Deleted

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-d11f406b0b723f91b0d350db99fc935749fea803.pack Deleted

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-d11f406b0b723f91b0d350db99fc935749fea803.rev Deleted

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

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

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

@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAma0iZ8ACgkQUcZzBf/C
-5cBohA//bMVrbkx6MXbgAGRDLfFwfw+yIh0eXtYppHNcIH55RznSH5IMuZmnC+aj
-8pXRSG38zf/69PZU82iaBwPIUJr2QLFeUe0E+2us6zJ81o3ifVuwqE27IQ2u4vCB
-JehufifJRc9ewHCTTvyibIM3IpRCKnc6PsmixBo98BD/aqp1rJKQJscdQcgW5nbq
-Ah6h62j1WqfJvspE6s0jegnCNoaf4ir83u3QJ5e63y7TuV+8Bxzx+co2XjYlBX5h
-j3Es6fOS4fGVQh5aLX6VYiLJcPPvHMOQJPzMmqqbqc10RRp9i9ASAxQpgwVL7vBe
-Pxc+ArPIylTSs5nD5zhURp0v6TReNONMfRa+xYE+AoQloFm9g1KtxscBjqvdLWPo
-0+mDDsCMPS/Bj+UB7dUVjvXCrSqhdh35tfXiM2v0W50hDnDsjBxtLln7f5jwPfvy
-+NnIxkFG3PFJZa0EtEnKcmBvX6zlkvNUSlR22rp7jNaNn5yrH5/1kcGSKHD9bbKb
-ssVcYhMkAZGA+IpOVY0kjsG3f0ItD8Y85QMN1zo5CUwDtK9hdXA0p3+a/muQd1f5
-IfCaME2P6I9CGAuXGPhERhbAoKnSrpBkiKVbBE+m8AP0RxjVL0IQXhxM69CaIScc
-qpG852WUX/pQAA36va3CWJiC6EJ+EiJ+5v6H6moxIJq4obiGWyY=
-=ztg6
+iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmbr2W0ACgkQUcZzBf/C
+5cAV8RAAgeLEsgJ38Vh3jld66+DBPCRBxbfLpIa/C1mBSzgOFLkqMzkCi7LjXykh
+CBiIoMAmRDO+1qD9UnsYxjicKPH4EmY5ZU1S0LgJvQaIUEmr830mn8f9C+JvwYjb
+As1ST9moEgkjb8F/Hg4xHTtGUhCcsl/vvMObSoTDLfsTPsUIv37RSnUVul3WTQYy
+3AoP7VCVlgGGsrdzwvBXQeH7F86+p1zo8UWO1CwHI/O4dDO09slV7+hA2MbLRqJZ
+xefcWPtuqXmpz1Uh2s/E0NO/6SVI1TBIGdckRfIlUizgyHxAA5pXxHEBxdOyHjlF
+1CQjnQdS8+Mbwb/iq66SotdhP4OuEdaLTuQsuMzCDowmdTRc6Gjt04tgnRVJU4bK
+KoUIDF4ZpDhXIp2ZD8m5aozClGUDca8u6RwXhtidEQL09bTQEdMdu9dk1RWV45jJ
+HO/nEcH8NLJ7lMW5YONpXLmjTAz3uSGPb+P4NubTubrF/2z9HlL/KzHMUjhhnuJr
+msriRppAoYNAq8jHJ05h1lsxq+vpaVCG0hzmhZ/j4e+jyLsQX9EJS4MdBILhwRXd
+XI5j46d4SYs44m3TeeA5Zw5yuIID3HStH6RIjY4fpF9nRy86jKqjUSRtAK7zL1cu
+c95iHmeokKYX4+7uyYongHqspztB8rVaC58/Odx+PSnruC1mqFs=
+=Qpd8
 -----END PGP SIGNATURE-----

roundcubemail-1.5.tar.gz/vendor/sabre/event/.php-cs-fixer.dist.php Added

roundcubemail-1.5.tar.gz/vendor/sabre/event/composer.json Changed

roundcubemail-1.5.tar.gz/vendor/sabre/event/lib/Loop/Loop.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/event/lib/Promise.php Changed

@@ -5,7 +5,6 @@
 namespace Sabre\Event;
 
 use Exception;
-use Throwable;
 
 /**
  * An implementation of the Promise pattern.
@@ -30,17 +29,17 @@
     /**
      * The asynchronous operation is pending.
      */
-    const PENDING = 0;
+    public const PENDING = 0;
 
     /**
      * The asynchronous operation has completed, and has a result.
      */
-    const FULFILLED = 1;
+    public const FULFILLED = 1;
 
     /**
      * The asynchronous operation has completed with an error.
      */
-    const REJECTED = 2;
+    public const REJECTED = 2;
 
     /**
      * The current state of this promise.
@@ -128,8 +127,6 @@
 
     /**
      * Marks this promise as fulfilled and sets its return value.
-     *
-     * @param mixed $value
      */
     public function fulfill($value = null)
     {
@@ -146,7 +143,7 @@
     /**
      * Marks this promise as rejected, and set its rejection reason.
      */
-    public function reject(Throwable $reason)
+    public function reject(\Throwable $reason)
     {
         if (self::PENDING !== $this->state) {
             throw new PromiseAlreadyResolvedException('This promise is already resolved, and you\'re not allowed to resolve a promise more than once');
@@ -169,7 +166,6 @@
      * one. In PHP it might be useful to call this on the last promise in a
      * chain.
      *
-     * @return mixed
      * @psalm-return TReturn
      */
     public function wait()
@@ -208,10 +204,8 @@
      *
      * If the promise was fulfilled, this will be the result value. If the
      * promise was rejected, this property hold the rejection reason.
-     *
-     * @var mixed
      */
-    protected $value = null;
+    protected $value;
 
     /**
      * This method is used to call either an onFulfilled or onRejected callback.
@@ -242,7 +236,7 @@
                         // immediately fulfill the chained promise.
                         $subPromise->fulfill($result);
                     }
-                } catch (Throwable $e) {
+                } catch (\Throwable $e) {
                     // If the event handler threw an exception, we need to make sure that
                     // the chained promise is rejected as well.
                     $subPromise->reject($e);

roundcubemail-1.5.tar.gz/vendor/sabre/event/lib/Promise/functions.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/event/lib/Version.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/event/lib/coroutine.php Changed

@@ -5,7 +5,6 @@
 namespace Sabre\Event;
 
 use Generator;
-use Throwable;
 
 /**
 * Turn asynchronous promise-based code into something that looks synchronous
@@ -43,7 +42,9 @@
 * });
 *
 * @psalm-template TReturn
+ *
 * @psalm-param callable():\Generator<mixed, mixed, mixed, TReturn> $gen
+ *
 * @psalm-return Promise<TReturn>
 *
 * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
@@ -53,7 +54,7 @@
 function coroutine(callable $gen): Promise
 {
 $generator = $gen();
- if (!$generator instanceof Generator) {
+ if (!$generator instanceof \Generator) {
 throw new \InvalidArgumentException('You must pass a generator function');
 }
 
@@ -73,11 +74,11 @@
 $generator->send($value);
 $advanceGenerator();
 },
- function (Throwable $reason) use ($generator, $advanceGenerator) {
+ function (\Throwable $reason) use ($generator, $advanceGenerator) {
 $generator->throw($reason);
 $advanceGenerator();
 }
- )->otherwise(function (Throwable $reason) use ($promise) {
+ )->otherwise(function (\Throwable $reason) use ($promise) {
 // This error handler would be called, if something in the
 // generator throws an exception, and it's not caught
 // locally.
@@ -102,7 +103,7 @@
 if ($returnValue instanceof Promise) {
 $returnValue->then(function ($value) use ($promise) {
 $promise->fulfill($value);
- }, function (Throwable $reason) use ($promise) {
+ }, function (\Throwable $reason) use ($promise) {
 $promise->reject($reason);
 });
 } else {
@@ -113,7 +114,7 @@
 
 try {
 $advanceGenerator();
- } catch (Throwable $e) {
+ } catch (\Throwable $e) {
 $promise->reject($e);
 }

roundcubemail-1.5.tar.gz/vendor/sabre/http/.github/workflows/ci.yml Changed

roundcubemail-1.5.tar.gz/vendor/sabre/http/.gitignore Changed

roundcubemail-1.5.tar.gz/vendor/sabre/http/.php-cs-fixer.dist.php Added

roundcubemail-1.5.tar.gz/vendor/sabre/http/CHANGELOG.md Changed

roundcubemail-1.5.tar.gz/vendor/sabre/http/composer.json Changed

roundcubemail-1.5.tar.gz/vendor/sabre/http/examples/client.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/http/examples/stringify.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/http/lib/Auth/AWS.php Changed

@@ -22,14 +22,14 @@
      *
      * @var string
      */
-    private $signature = null;
+    private $signature;
 
     /**
      * The accesskey supplied by the HTTP client.
      *
      * @var string
      */
-    private $accessKey = null;
+    private $accessKey;
 
     /**
      * An error code, if any.
@@ -40,11 +40,11 @@
      */
     public $errorCode = 0;
 
-    const ERR_NOAWSHEADER = 1;
-    const ERR_MD5CHECKSUMWRONG = 2;
-    const ERR_INVALIDDATEFORMAT = 3;
-    const ERR_REQUESTTIMESKEWED = 4;
-    const ERR_INVALIDSIGNATURE = 5;
+    public const ERR_NOAWSHEADER = 1;
+    public const ERR_MD5CHECKSUMWRONG = 2;
+    public const ERR_INVALIDDATEFORMAT = 3;
+    public const ERR_REQUESTTIMESKEWED = 4;
+    public const ERR_INVALIDSIGNATURE = 5;
 
     /**
      * Gathers all information from the headers.
@@ -212,7 +212,7 @@
         }
         $key = str_pad($key, $blocksize, chr(0x00));
         $ipad = str_repeat(chr(0x36), $blocksize);
-        $opad = str_repeat(chr(0x5c), $blocksize);
+        $opad = str_repeat(chr(0x5C), $blocksize);
         $hmac = pack('H*', sha1(($key ^ $opad).pack('H*', sha1(($key ^ $ipad).$message))));
 
         return $hmac;

roundcubemail-1.5.tar.gz/vendor/sabre/http/lib/Auth/Digest.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/http/lib/Client.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/http/lib/Request.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/http/lib/Response.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/http/lib/Sapi.php Changed

@@ -4,8 +4,6 @@
 
 namespace Sabre\HTTP;
 
-use InvalidArgumentException;
-
 /**
  * PHP SAPI.
  *
@@ -168,7 +166,7 @@
                     $url = $value;
                     break;
 
-                // These sometimes show up without a HTTP_ prefix
+                    // These sometimes show up without a HTTP_ prefix
                 case 'CONTENT_TYPE':
                     $headers'Content-Type' = $value;
                     break;
@@ -176,21 +174,21 @@
                     $headers'Content-Length' = $value;
                     break;
 
-                // mod_php on apache will put credentials in these variables.
-                // (fast)cgi does not usually do this, however.
+                    // mod_php on apache will put credentials in these variables.
+                    // (fast)cgi does not usually do this, however.
                 case 'PHP_AUTH_USER':
                     if (isset($serverArray'PHP_AUTH_PW')) {
                         $headers'Authorization' = 'Basic '.base64_encode($value.':'.$serverArray'PHP_AUTH_PW');
                     }
                     break;
 
-                // Similarly, mod_php may also screw around with digest auth.
+                    // Similarly, mod_php may also screw around with digest auth.
                 case 'PHP_AUTH_DIGEST':
                     $headers'Authorization' = 'Digest '.$value;
                     break;
 
-                // Apache may prefix the HTTP_AUTHORIZATION header with
-                // REDIRECT_, if mod_rewrite was used.
+                    // Apache may prefix the HTTP_AUTHORIZATION header with
+                    // REDIRECT_, if mod_rewrite was used.
                 case 'REDIRECT_HTTP_AUTHORIZATION':
                     $headers'Authorization' = $value;
                     break;
@@ -226,11 +224,11 @@
         }
 
         if (null === $url) {
-            throw new InvalidArgumentException('The _SERVER array must have a REQUEST_URI key');
+            throw new \InvalidArgumentException('The _SERVER array must have a REQUEST_URI key');
         }
 
         if (null === $method) {
-            throw new InvalidArgumentException('The _SERVER array must have a REQUEST_METHOD key');
+            throw new \InvalidArgumentException('The _SERVER array must have a REQUEST_METHOD key');
         }
         $r = new Request($method, $url, $headers);
         $r->setHttpVersion($httpVersion);

roundcubemail-1.5.tar.gz/vendor/sabre/http/lib/Version.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/http/lib/functions.php Changed

@@ -4,9 +4,6 @@
 
 namespace Sabre\HTTP;
 
-use DateTime;
-use InvalidArgumentException;
-
 /**
 * A collection of useful helpers for parsing or generating various HTTP
 * headers.
@@ -29,7 +26,7 @@
 * See:
 * http://tools.ietf.org/html/rfc7231#section-7.1.1.1
 *
- * @return bool|DateTime
+ * @return bool|\DateTime
 */
 function parseDate(string $dateString)
 {
@@ -65,7 +62,7 @@
 }
 
 try {
- return new DateTime($dateString, new \DateTimeZone('UTC'));
+ return new \DateTime($dateString, new \DateTimeZone('UTC'));
 } catch (\Exception $e) {
 return false;
 }
@@ -74,7 +71,7 @@
 /**
 * Transforms a DateTime object to a valid HTTP/1.1 Date header value.
 */
-function toDate(DateTime $dateTime): string
+function toDate(\DateTime $dateTime): string
 {
 // We need to clone it, as we don't want to affect the existing
 // DateTime.
@@ -171,9 +168,9 @@
 
 // Does this entry win?
 if (
- ($proposal'quality' > $lastQuality) ||
- ($proposal'quality' === $lastQuality && $specificity > $lastSpecificity) ||
- ($proposal'quality' === $lastQuality && $specificity === $lastSpecificity && $optionIndex < $lastOptionIndex)
+ ($proposal'quality' > $lastQuality)
+ || ($proposal'quality' === $lastQuality && $specificity > $lastSpecificity)
+ || ($proposal'quality' === $lastQuality && $specificity === $lastSpecificity && $optionIndex < $lastOptionIndex)
 ) {
 $lastQuality = $proposal'quality';
 $lastSpecificity = $specificity;
@@ -331,7 +328,7 @@
 if (2 !== count($mimeType)) {
 // Illegal value
 var_dump($mimeType);
- exit();
+ exit;
 // throw new InvalidArgumentException('Not a valid mime-type: '.$str);
 }
 list($type, $subType) = $mimeType;

roundcubemail-1.5.tar.gz/vendor/sabre/http/tests/HTTP/Auth/AWSTest.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/http/tests/HTTP/Auth/DigestTest.php Changed

@@ -26,7 +26,7 @@
      */
     private $auth;
 
-    const REALM = 'SabreDAV unittest';
+    public const REALM = 'SabreDAV unittest';
 
     public function setUp(): void
     {
@@ -50,7 +50,7 @@
             $nc.':'.
             $cnonce.':'.
             'auth:'.
-            md5('GET'.':'.'/')
+            md5('GET:/')
         );
 
         $this->request->setMethod('GET');
@@ -79,7 +79,7 @@
             $nc.':'.
             $cnonce.':'.
             'auth:'.
-            md5('GET'.':'.'/')
+            md5('GET:/')
         );
 
         $this->request->setMethod('GET');
@@ -115,7 +115,7 @@
             $nc.':'.
             $cnonce.':'.
             'auth-int:'.
-            md5('POST'.':'.'/'.':'.md5('body'))
+            md5('POST:/:'.md5('body'))
         );
 
         $this->request->setMethod('POST');
@@ -143,7 +143,7 @@
             $nc.':'.
             $cnonce.':'.
             'auth-int:'.
-            md5('POST'.':'.'/'.':'.md5('body'))
+            md5('POST:/:'.md5('body'))
         );
 
         $this->request->setMethod('POST');
@@ -160,9 +160,12 @@
         $this->auth->requireLogin();
 
         switch ($qop) {
-            case Digest::QOP_AUTH: $qopstr = 'auth'; break;
-            case Digest::QOP_AUTHINT: $qopstr = 'auth-int'; break;
-            default: $qopstr = 'auth,auth-int'; break;
+            case Digest::QOP_AUTH: $qopstr = 'auth';
+                break;
+            case Digest::QOP_AUTHINT: $qopstr = 'auth-int';
+                break;
+            default: $qopstr = 'auth,auth-int';
+                break;
         }
 
         $test = preg_match('/Digest realm="'.self::REALM.'",qop="'.$qopstr.'",nonce="(0-9a-f*)",opaque="(0-9a-f*)"/',

roundcubemail-1.5.tar.gz/vendor/sabre/http/tests/HTTP/ClientTest.php Changed

@@ -14,15 +14,15 @@
         $request = new Request('GET', 'http://example.org/', 'X-Foo' => 'bar');
 
         $settings = 
-                CURLOPT_RETURNTRANSFER => true,
-                CURLOPT_HEADER => true,
-                CURLOPT_POSTREDIR => 0,
-                CURLOPT_HTTPHEADER => 'X-Foo: bar',
-                CURLOPT_NOBODY => false,
-                CURLOPT_URL => 'http://example.org/',
-                CURLOPT_CUSTOMREQUEST => 'GET',
-                CURLOPT_USERAGENT => 'sabre-http/'.Version::VERSION.' (http://sabre.io/)',
-            ;
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_HEADER => true,
+            CURLOPT_POSTREDIR => 0,
+            CURLOPT_HTTPHEADER => 'X-Foo: bar',
+            CURLOPT_NOBODY => false,
+            CURLOPT_URL => 'http://example.org/',
+            CURLOPT_CUSTOMREQUEST => 'GET',
+            CURLOPT_USERAGENT => 'sabre-http/'.Version::VERSION.' (http://sabre.io/)',
+        ;
 
         // FIXME: CURLOPT_PROTOCOLS and CURLOPT_REDIR_PROTOCOLS are currently unsupported by HHVM
         // at least if this unit test fails in the future we know it is :)
@@ -67,14 +67,14 @@
         $request = new Request('HEAD', 'http://example.org/', 'X-Foo' => 'bar');
 
         $settings = 
-                CURLOPT_RETURNTRANSFER => true,
-                CURLOPT_HEADER => true,
-                CURLOPT_NOBODY => true,
-                CURLOPT_CUSTOMREQUEST => 'HEAD',
-                CURLOPT_HTTPHEADER => 'X-Foo: bar',
-                CURLOPT_URL => 'http://example.org/',
-                CURLOPT_USERAGENT => 'sabre-http/'.Version::VERSION.' (http://sabre.io/)',
-            ;
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_HEADER => true,
+            CURLOPT_NOBODY => true,
+            CURLOPT_CUSTOMREQUEST => 'HEAD',
+            CURLOPT_HTTPHEADER => 'X-Foo: bar',
+            CURLOPT_URL => 'http://example.org/',
+            CURLOPT_USERAGENT => 'sabre-http/'.Version::VERSION.' (http://sabre.io/)',
+        ;
 
         // FIXME: CURLOPT_PROTOCOLS and CURLOPT_REDIR_PROTOCOLS are currently unsupported by HHVM
         // at least if this unit test fails in the future we know it is :)
@@ -100,14 +100,14 @@
         $request = new Request('GET', 'http://example.org/', 'X-Foo' => 'bar');
 
         $settings = 
-                CURLOPT_CUSTOMREQUEST => 'GET',
-                CURLOPT_RETURNTRANSFER => true,
-                CURLOPT_HEADER => true,
-                CURLOPT_HTTPHEADER => 'X-Foo: bar',
-                CURLOPT_NOBODY => false,
-                CURLOPT_URL => 'http://example.org/',
-                CURLOPT_USERAGENT => 'sabre-http/'.Version::VERSION.' (http://sabre.io/)',
-            ;
+            CURLOPT_CUSTOMREQUEST => 'GET',
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_HEADER => true,
+            CURLOPT_HTTPHEADER => 'X-Foo: bar',
+            CURLOPT_NOBODY => false,
+            CURLOPT_URL => 'http://example.org/',
+            CURLOPT_USERAGENT => 'sabre-http/'.Version::VERSION.' (http://sabre.io/)',
+        ;
 
         // FIXME: CURLOPT_PROTOCOLS and CURLOPT_REDIR_PROTOCOLS are currently unsupported by HHVM
         // at least if this unit test fails in the future we know it is :)
@@ -129,17 +129,17 @@
         $request = new Request('PUT', 'http://example.org/', 'X-Foo' => 'bar', $h);
 
         $settings = 
-                CURLOPT_RETURNTRANSFER => true,
-                CURLOPT_HEADER => true,
-                CURLOPT_PUT => true,
-                CURLOPT_INFILE => $h,
-                CURLOPT_INFILESIZE => strlen($fileContent),
-                CURLOPT_NOBODY => false,
-                CURLOPT_CUSTOMREQUEST => 'PUT',
-                CURLOPT_HTTPHEADER => 'X-Foo: bar',
-                CURLOPT_URL => 'http://example.org/',
-                CURLOPT_USERAGENT => 'sabre-http/'.Version::VERSION.' (http://sabre.io/)',
-            ;
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_HEADER => true,
+            CURLOPT_PUT => true,
+            CURLOPT_INFILE => $h,
+            CURLOPT_INFILESIZE => strlen($fileContent),
+            CURLOPT_NOBODY => false,
+            CURLOPT_CUSTOMREQUEST => 'PUT',
+            CURLOPT_HTTPHEADER => 'X-Foo: bar',
+            CURLOPT_URL => 'http://example.org/',
+            CURLOPT_USERAGENT => 'sabre-http/'.Version::VERSION.' (http://sabre.io/)',
+        ;
 
         // FIXME: CURLOPT_PROTOCOLS and CURLOPT_REDIR_PROTOCOLS are currently unsupported by HHVM
         // at least if this unit test fails in the future we know it is :)
@@ -157,15 +157,15 @@
         $request = new Request('PUT', 'http://example.org/', 'X-Foo' => 'bar', 'boo');
 
         $settings = 
-                CURLOPT_RETURNTRANSFER => true,
-                CURLOPT_HEADER => true,
-                CURLOPT_NOBODY => false,
-                CURLOPT_POSTFIELDS => 'boo',
-                CURLOPT_CUSTOMREQUEST => 'PUT',
-                CURLOPT_HTTPHEADER => 'X-Foo: bar',
-                CURLOPT_URL => 'http://example.org/',
-                CURLOPT_USERAGENT => 'sabre-http/'.Version::VERSION.' (http://sabre.io/)',
-            ;
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_HEADER => true,
+            CURLOPT_NOBODY => false,
+            CURLOPT_POSTFIELDS => 'boo',
+            CURLOPT_CUSTOMREQUEST => 'PUT',
+            CURLOPT_HTTPHEADER => 'X-Foo: bar',
+            CURLOPT_URL => 'http://example.org/',
+            CURLOPT_USERAGENT => 'sabre-http/'.Version::VERSION.' (http://sabre.io/)',
+        ;
 
         // FIXME: CURLOPT_PROTOCOLS and CURLOPT_REDIR_PROTOCOLS are currently unsupported by HHVM
         // at least if this unit test fails in the future we know it is :)

roundcubemail-1.5.tar.gz/vendor/sabre/http/tests/HTTP/FunctionsTest.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/http/tests/HTTP/MessageDecoratorTest.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/http/tests/HTTP/SapiTest.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/xml/.github/workflows/ci.yml Changed

roundcubemail-1.5.tar.gz/vendor/sabre/xml/.php-cs-fixer.dist.php Added

roundcubemail-1.5.tar.gz/vendor/sabre/xml/composer.json Changed

roundcubemail-1.5.tar.gz/vendor/sabre/xml/lib/Deserializer/functions.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/xml/lib/Element/Base.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/xml/lib/Element/Elements.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/xml/lib/Element/KeyValue.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/xml/lib/Element/Uri.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/xml/lib/Element/XmlFragment.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/xml/lib/LibXMLException.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/xml/lib/ParseException.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/xml/lib/Reader.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/xml/lib/Serializer/functions.php Changed

@@ -4,7 +4,6 @@
 
 namespace Sabre\Xml\Serializer;
 
-use InvalidArgumentException;
 use Sabre\Xml\Writer;
 use Sabre\Xml\XmlSerializable;
 
@@ -197,12 +196,12 @@
                 $writer->write($item);
                 $writer->endElement();
             } else {
-                throw new InvalidArgumentException('The writer does not know how to serialize arrays with keys of type: '.gettype($name));
+                throw new \InvalidArgumentException('The writer does not know how to serialize arrays with keys of type: '.gettype($name));
             }
         }
     } elseif (is_object($value)) {
-        throw new InvalidArgumentException('The writer cannot serialize objects of class: '.get_class($value));
+        throw new \InvalidArgumentException('The writer cannot serialize objects of class: '.get_class($value));
     } elseif (!is_null($value)) {
-        throw new InvalidArgumentException('The writer cannot serialize values of type: '.gettype($value));
+        throw new \InvalidArgumentException('The writer cannot serialize values of type: '.gettype($value));
     }
 }

roundcubemail-1.5.tar.gz/vendor/sabre/xml/lib/Service.php Changed

@@ -105,16 +105,23 @@
      *
      * @param string|resource $input
      *
-     * @throws ParseException
-     *
      * @return array|object|string
+     *
+     * @throws ParseException
      */
     public function parse($input, ?string $contextUri = null, ?string &$rootElementName = null)
     {
-        if (is_resource($input)) {
+        if (!is_string($input)) {
             // Unfortunately the XMLReader doesn't support streams. When it
             // does, we can optimize this.
-            $input = (string) stream_get_contents($input);
+            if (is_resource($input)) {
+                $input = (string) stream_get_contents($input);
+            } else {
+                // Input is not a string and not a resource.
+                // Therefore, it has to be a closed resource.
+                // Effectively empty input has been passed in.
+                $input = '';
+            }
         }
 
         // If input is empty, then it's safe to throw an exception
@@ -149,16 +156,23 @@
      * @param string|string $rootElementName
      * @param string|resource $input
      *
-     * @throws ParseException
-     *
      * @return array|object|string
+     *
+     * @throws ParseException
      */
     public function expect($rootElementName, $input, ?string $contextUri = null)
     {
-        if (is_resource($input)) {
+        if (!is_string($input)) {
             // Unfortunately the XMLReader doesn't support streams. When it
             // does, we can optimize this.
-            $input = (string) stream_get_contents($input);
+            if (is_resource($input)) {
+                $input = (string) stream_get_contents($input);
+            } else {
+                // Input is not a string and not a resource.
+                // Therefore, it has to be a closed resource.
+                // Effectively empty input has been passed in.
+                $input = '';
+            }
         }
 
         // If input is empty, then it's safe to throw an exception

roundcubemail-1.5.tar.gz/vendor/sabre/xml/lib/Version.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/xml/lib/Writer.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/xml/lib/XmlDeserializable.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/CHANGELOG.md Changed

@@ -6,6 +6,50 @@
 
 _Nothing yet._
 
+## 3.10.3 - 2024-09-18
+
+### Changed
+- Various housekeeping, including improvements to the tests and documentation.
+    - Thanks to Rodrigo Primo@rodrigoprimo and Juliette Reinders Folmer@jrfnl for their contributions.
+
+### Fixed
+- Fixed bug #553 : Squiz.Classes.SelfMemberReference: false negative(s) when namespace operator was encountered between the namespace declaration and the OO declaration.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #579 : AbstractPatternSniff: potential PHP notice during live coding.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #580 : Squiz.Formatting.OperatorBracket: potential PHP notice during live coding.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #581 : PSR12.ControlStructures.ControlStructureSpacing: prevent fixer conflict by correctly handling multiple empty newlines before the first condition in a multi-line control structure.
+    - Thanks to Dan Wallis@fredden for the patch.
+- Fixed bug #585 : Tokenizer not applying tab replacement in heredoc/nowdoc openers.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #588 : Squiz.PHP.EmbeddedPhp false positive when checking spaces after a PHP short open tag.
+    - Thanks to Rodrigo Primo@rodrigoprimo for the patch.
+- Fixed bug #597 : Generic.PHP.LowerCaseKeyword did not flag nor fix non-lowercase anonymous class keywords.
+    - Thanks to Marek Štípek@maryo for the patch.
+- Fixed bug #598 : Squiz.PHP.DisallowMultipleAssignments: false positive on assignments to variable property on object stored in array.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #608 : Squiz.Functions.MultiLineFunctionDeclaration did not take (parameter) attributes into account when checking for one parameter per line.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+### Other
+- The provenance of PHAR files associated with a release can now be verified via GitHub Artifact Attestationsghattest using the GitHub CLI toolghcli with the following command: `gh attestation verify phpcs|phpcbf.phar -o PHPCSStandards`. #574
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch.
+
+#553: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/553
+#574: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/574
+#579: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/579
+#580: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/580
+#581: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/581
+#585: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/585
+#588: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/588
+#597: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/597
+#598: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/598
+#608: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/608
+
+ghcli:    https://cli.github.com/
+ghattest: https://docs.github.com/en/actions/security-guides/using-artifact-attestations-to-establish-provenance-for-builds
+
 ## 3.10.2 - 2024-07-22
 
 ### Changed
@@ -396,7 +440,7 @@
         - **_In contrast to earlier information, the `squizlabs/php_codesniffer` package now points to the new repository and everything will continue to work as before._**
     - PHIVE users may need to clear the PHIVE URL cache.
         - PHIVE users who don't use the package alias, but refer to the package URL, will need to update the URL from `https://squizlabs.github.io/PHP_CodeSniffer/phars/` to `https://phars.phpcodesniffer.com/phars/`.
-    - Users who download the PHAR files using curl or wget, will need to update the download URL from `https://squizlabs.github.io/PHP_CodeSniffer/phpcs|phpcbf.phar` or `https://github.com/squizlabs/PHP_CodeSnifffer/releases/latest/download/phpcs|phpcbf.phar` to `https://phars.phpcodesniffer.com/phpcs|phpcbf.phar`.
+    - Users who download the PHAR files using curl or wget, will need to update the download URL from `https://squizlabs.github.io/PHP_CodeSniffer/phpcs|phpcbf.phar` or `https://github.com/squizlabs/PHP_CodeSniffer/releases/latest/download/phpcs|phpcbf.phar` to `https://phars.phpcodesniffer.com/phpcs|phpcbf.phar`.
     - For users who install PHP_CodeSniffer via the Setup-PHP(https://github.com/shivammathur/setup-php/) action runner for GitHub Actions, nothing changes.
     - Users using a git clone will need to update the clone address from `git@github.com:squizlabs/PHP_CodeSniffer.git` to `git@github.com:PHPCSStandards/PHP_CodeSniffer.git`.
         - Contributors will need to fork the new repo and add both the new fork as well as the new repo as remotes to their local git copy of PHP_CodeSniffer.
@@ -7002,6 +7046,7 @@
 -->
 
 Unreleased: https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/master...HEAD
+3.10.3:     https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.10.2...3.10.3
 3.10.2:     https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.10.1...3.10.2
 3.10.1:     https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.10.0...3.10.1
 3.10.0:     https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.9.2...3.10.0
@@ -7234,6 +7279,7 @@
 @MarkMaldaba:         https://github.com/MarkMaldaba
 @martinssipenko:      https://github.com/martinssipenko
 @marvasDE:            https://github.com/marvasDE
+@maryo:               https://github.com/maryo
 @MasterOdin:          https://github.com/MasterOdin
 @mathroc:             https://github.com/mathroc
 @maxgalbu:            https://github.com/maxgalbu

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/README.md Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/autoload.php Changed

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

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Sniffs/AbstractPatternSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Docs/ControlStructures/DisallowYodaConditionsStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Docs/Files/InlineHTMLStandard.xml Changed

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

@@ -1,18 +1,18 @@
 <documentation title="Aligning Blocks of Assignments">
 <standard>
 <!CDATA
- There should be one space on either side of an equals sign used to assign a value to a variable. In the case of a block of related assignments, more space may be inserted to promote readability.
+ There should be one space on either side of an equals sign used to assign a value to a variable. In the case of a block of related assignments, more space may be inserted to promote readability.
 >
 </standard>
 <code_comparison>
- <code title="Equals signs aligned">
+ <code title="Valid: Equals signs aligned.">
 <!CDATA
 $shortVar = (1 + 2);
 $veryLongVarName = 'string';
 $var = foo($bar, $baz);
 >
 </code>
- <code title="Not aligned; harder to read">
+ <code title="Invalid: Not aligned; harder to read.">
 <!CDATA
 $shortVar = (1 + 2);
 $veryLongVarName = 'string';
@@ -22,17 +22,17 @@
 </code_comparison>
 <standard>
 <!CDATA
- When using plus-equals, minus-equals etc. still ensure the equals signs are aligned to one space after the longest variable name.
+ When using plus-equals, minus-equals etc. still ensure the equals signs are aligned to one space after the longest variable name.
 >
 </standard>
 <code_comparison>
- <code title="Equals signs aligned; only one space after longest var name">
+ <code title="Valid: Equals signs aligned; only one space after longest var name.">
 <!CDATA
 $shortVar += 1;
 $veryLongVarName = 1;
 >
 </code>
- <code title="Two spaces after longest var name">
+ <code title="Invalid: Two spaces after longest var name.">
 <!CDATA
 $shortVar += 1;
 $veryLongVarName = 1;
@@ -40,13 +40,13 @@
 </code>
 </code_comparison>
 <code_comparison>
- <code title="Equals signs aligned">
+ <code title="Valid: Equals signs aligned.">
 <!CDATA
 $shortVar = 1;
 $veryLongVarName -= 1;
 >
 </code>
- <code title="Equals signs not aligned">
+ <code title="Invalid: Equals signs not aligned.">
 <!CDATA
 $shortVar = 1;
 $veryLongVarName -= 1;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Docs/Functions/OpeningFunctionBraceBsdAllmanStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Docs/Functions/OpeningFunctionBraceKernighanRitchieStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Docs/NamingConventions/AbstractClassNamePrefixStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Docs/NamingConventions/InterfaceNameSuffixStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Docs/NamingConventions/TraitNameSuffixStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Docs/NamingConventions/UpperCaseConstantNameStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Docs/PHP/CharacterBeforePHPOpeningTagStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Docs/PHP/ClosingPHPTagStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Docs/PHP/LowerCaseConstantStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Docs/PHP/RequireStrictTypesStandard.xml Changed

@@ -5,14 +5,14 @@
 >
 </standard>
 <code_comparison>
- <code title="Valid: strict_types declaration is present.">
+ <code title="Valid: `strict_types` declaration is present.">
 <!CDATA
 declare(strict_types=1);
 
 declare(encoding='UTF-8', strict_types=0);
 >
 </code>
- <code title="Invalid: Missing strict_types declaration.">
+ <code title="Invalid: Missing `strict_types` declaration.">
 <!CDATA
 declare(encoding='ISO-8859-1');
 >
@@ -24,12 +24,12 @@
 >
 </standard>
 <code_comparison>
- <code title="Valid: strict_types declaration is enabled.">
+ <code title="Valid: `strict_types` declaration is enabled.">
 <!CDATA
 declare(strict_types=1);
 >
 </code>
- <code title="Invalid: strict_types declaration is disabled.">
+ <code title="Invalid: `strict_types` declaration is disabled.">
 <!CDATA
 declare(strict_types=0);
 >

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Docs/PHP/SAPIUsageStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Docs/PHP/UpperCaseConstantStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Docs/VersionControl/SubversionPropertiesStandard.xml Changed

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

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

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

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

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

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

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Docs/Commenting/FileCommentStandard.xml Changed

@@ -1,7 +1,14 @@
 <documentation title="File Comments">
 <standard>
 <!CDATA
- Files must have a non-empty doc comment. The short description must be on the second line of the comment. Each description must have one blank comment line before and after. There must be one blank line before the tags in the comments. There must be a category, package, author, license, and link tag. There may only be one category, package, subpackage, license, version, since and deprecated tag. The tags must be in the order category, package, subpackage, author, copyright, license, version, link, see, since, and deprecated. The php version must be specified.
+ Files must have a non-empty doc comment.
+ The short description must be on the second line of the comment.
+ Each description must have one blank comment line before and after.
+ There must be one blank line before the tags in the comments.
+ There must be a category, package, author, license, and link tag.
+ There may only be one category, package, subpackage, license, version, since and deprecated tag.
+ The tags must be in the order category, package, subpackage, author, copyright, license, version, link, see, since, and deprecated.
+ The PHP version must be specified.
 >
 </standard>
 <code_comparison>
@@ -231,16 +238,14 @@
 */
 >
 </code>
- <code title="Invalid: Category and package tags are swapped in order.">
+ <code title="Invalid: No PHP version specified.">
 <!CDATA
 <?php
 /**
 * Short description here.
 *
- * PHP version 5
- *
- * @package Foo_Helpers
- * @category Foo
+ * @category Foo
+ * @package Foo_Helpers
 * @author Marty McFly <mmcfly@example.com>
 * @copyright 2013-2014 Foo Inc.
 * @license MIT License
@@ -267,14 +272,16 @@
 */
 >
 </code>
- <code title="Invalid: No php version specified.">
+ <code title="Invalid: Category and package tags are swapped in order.">
 <!CDATA
 <?php
 /**
 * Short description here.
 *
- * @category Foo
- * @package Foo_Helpers
+ * PHP version 5
+ *
+ * @package Foo_Helpers
+ * @category Foo
 * @author Marty McFly <mmcfly@example.com>
 * @copyright 2013-2014 Foo Inc.
 * @license MIT License

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Docs/Files/IncludingFileStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Docs/Functions/FunctionCallSignatureStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Docs/Functions/ValidDefaultValueStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Docs/NamingConventions/ValidClassNameStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Docs/NamingConventions/ValidFunctionNameStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Docs/NamingConventions/ValidVariableNameStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR1/Docs/Files/SideEffectsStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR1/Docs/Methods/CamelCapsMethodNameStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Docs/Functions/NullableTypeDeclarationStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Sniffs/ControlStructures/ControlStructureSpacingSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/ControlStructures/ControlStructureSpacingUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/ControlStructures/ControlStructureSpacingUnitTest.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/ControlStructures/ControlStructureSpacingUnitTest.php Changed

@@ -31,25 +31,29 @@
     public function getErrorList()
     {
         return 
-            2  => 2,
-            16 => 1,
-            17 => 1,
-            18 => 1,
-            22 => 1,
-            23 => 1,
-            32 => 1,
-            33 => 1,
-            34 => 1,
-            37 => 1,
-            38 => 1,
-            39 => 1,
-            48 => 2,
-            58 => 1,
-            59 => 1,
-            92 => 1,
-            96 => 1,
-            97 => 1,
-            98 => 2,
+            2   => 2,
+            16  => 1,
+            17  => 1,
+            18  => 1,
+            22  => 1,
+            23  => 1,
+            32  => 1,
+            33  => 1,
+            34  => 1,
+            37  => 1,
+            38  => 1,
+            39  => 1,
+            48  => 2,
+            58  => 1,
+            59  => 1,
+            92  => 1,
+            96  => 1,
+            97  => 1,
+            98  => 2,
+            106 => 1,
+            111 => 1,
+            117 => 1,
+            127 => 1,
         ;
 
     }//end getErrorList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Docs/Methods/MethodDeclarationStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Docs/Arrays/ArrayDeclarationStandard.xml Changed

@@ -10,12 +10,12 @@
 >
 </standard>
 <code_comparison>
- <code title="Valid: array keyword lowercase">
+ <code title="Valid: Array keyword lowercase.">
 <!CDATA
 $array = array('val1', 'val2');
 >
 </code>
- <code title="Invalid: first letter capitalised">
+ <code title="Invalid: First letter capitalised.">
 <!CDATA
 $array = Array('val1', 'val2');
 >
@@ -27,7 +27,7 @@
 >
 </standard>
 <code_comparison>
- <code title="Valid: first key on second line">
+ <code title="Valid: First key on second line.">
 <!CDATA
 $array = array(
 'key1' => 'value1',
@@ -35,7 +35,7 @@
 );
 >
 </code>
- <code title="Invalid: first key on same line">
+ <code title="Invalid: First key on same line.">
 <!CDATA
 $array = array('key1' => 'value1',
 'key2' => 'value2',
@@ -49,7 +49,7 @@
 >
 </standard>
 <code_comparison>
- <code title="Valid: aligned correctly">
+ <code title="Valid: Aligned correctly.">
 <!CDATA
 $array = array(
 'key1' => 'value1',
@@ -57,7 +57,7 @@
 );
 >
 </code>
- <code title="Invalid: keys and parenthesis aligned incorrectly">
+ <code title="Invalid: Keys and parenthesis aligned incorrectly.">
 <!CDATA
 $array = array(
 'key1' => 'value1',
@@ -72,7 +72,7 @@
 >
 </standard>
 <code_comparison>
- <code title="Valid: keys and values aligned">
+ <code title="Valid: Keys and values aligned.">
 <!CDATA
 $array = array(
 'keyTen' => 'ValueTen',
@@ -80,7 +80,7 @@
 );
 >
 </code>
- <code title="Invalid: alignment incorrect">
+ <code title="Invalid: Alignment incorrect.">
 <!CDATA
 $array = array(
 'keyTen' => 'ValueTen',
@@ -95,7 +95,7 @@
 >
 </standard>
 <code_comparison>
- <code title="Valid: comma after each value">
+ <code title="Valid: Comma after each value.">
 <!CDATA
 $array = array(
 'key1' => 'value1',
@@ -104,7 +104,7 @@
 );
 >
 </code>
- <code title="Invalid: no comma after last value">
+ <code title="Invalid: No comma after last value.">
 <!CDATA
 $array = array(
 'key1' => 'value1',

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Docs/Classes/LowercaseClassKeywordsStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Docs/ControlStructures/LowercaseDeclarationStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Docs/Functions/FunctionDuplicateArgumentStandard.xml Deleted

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Docs/Functions/LowercaseFunctionKeywordsStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Docs/WhiteSpace/LanguageConstructSpacingStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Docs/WhiteSpace/ScopeKeywordSpacingStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Classes/SelfMemberReferenceSniff.php Changed

@@ -221,15 +221,23 @@
      */
     protected function getNamespaceOfScope(File $phpcsFile, $stackPtr)
     {
-        $namespace            = '\\';
-        $namespaceDeclaration = $phpcsFile->findPrevious(T_NAMESPACE, $stackPtr);
+        $namespace = '\\';
+        $tokens    = $phpcsFile->getTokens();
+
+        while (($namespaceDeclaration = $phpcsFile->findPrevious(T_NAMESPACE, $stackPtr)) !== false) {
+            $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($namespaceDeclaration + 1), null, true);
+            if ($tokens$nextNonEmpty'code' === T_NS_SEPARATOR) {
+                // Namespace operator. Ignore.
+                $stackPtr = ($namespaceDeclaration - 1);
+                continue;
+            }
 
-        if ($namespaceDeclaration !== false) {
             $endOfNamespaceDeclaration = $phpcsFile->findNext(T_SEMICOLON, T_OPEN_CURLY_BRACKET, T_CLOSE_TAG, $namespaceDeclaration);
             $namespace = $this->getDeclarationNameWithNamespace(
                 $phpcsFile->getTokens(),
                 ($endOfNamespaceDeclaration - 1)
             );
+            break;
         }
 
         return $namespace;

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

@@ -354,16 +354,23 @@
             }
 
             if ($tokens$after'code' === T_OPEN_PARENTHESIS) {
+                if (isset($tokens$after'parenthesis_closer') === false) {
+                    // Live coding/parse error. Ignore.
+                    return;
+                }
+
                 $after = $tokens$after'parenthesis_closer';
                 continue;
             }
 
-            if ($tokens$after'code' === T_OPEN_SQUARE_BRACKET) {
-                $after = $tokens$after'bracket_closer';
-                continue;
-            }
+            if (($tokens$after'code' === T_OPEN_SQUARE_BRACKET
+                || $tokens$after'code' === T_OPEN_SHORT_ARRAY)
+            ) {
+                if (isset($tokens$after'bracket_closer') === false) {
+                    // Live coding/parse error. Ignore.
+                    return;
+                }
 
-            if ($tokens$after'code' === T_OPEN_SHORT_ARRAY) {
                 $after = $tokens$after'bracket_closer';
                 continue;
             }

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Functions/MultiLineFunctionDeclarationSniff.php Changed

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

@@ -105,6 +105,13 @@
             }
 
             if ($tokens$varToken'code' === T_VARIABLE) {
+                $prevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($varToken - 1), null, true);
+                if ($tokens$prevNonEmpty'code' === T_OBJECT_OPERATOR) {
+                    // Dynamic property access, the real "start" variable still needs to be found.
+                    $varToken = $prevNonEmpty;
+                    continue;
+                }
+
                 // We found our variable.
                 break;
             }
@@ -119,15 +126,14 @@
 
         $allowed = Tokens::$emptyTokens;
 
-        $allowedT_STRING          = T_STRING;
-        $allowedT_NS_SEPARATOR    = T_NS_SEPARATOR;
-        $allowedT_DOUBLE_COLON    = T_DOUBLE_COLON;
-        $allowedT_OBJECT_OPERATOR = T_OBJECT_OPERATOR;
-        $allowedT_ASPERAND        = T_ASPERAND;
-        $allowedT_DOLLAR          = T_DOLLAR;
-        $allowedT_SELF            = T_SELF;
-        $allowedT_PARENT          = T_PARENT;
-        $allowedT_STATIC          = T_STATIC;
+        $allowedT_STRING       = T_STRING;
+        $allowedT_NS_SEPARATOR = T_NS_SEPARATOR;
+        $allowedT_DOUBLE_COLON = T_DOUBLE_COLON;
+        $allowedT_ASPERAND     = T_ASPERAND;
+        $allowedT_DOLLAR       = T_DOLLAR;
+        $allowedT_SELF         = T_SELF;
+        $allowedT_PARENT       = T_PARENT;
+        $allowedT_STATIC       = T_STATIC;
 
         $varToken = $phpcsFile->findPrevious($allowed, ($varToken - 1), null, true);

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

@@ -379,10 +379,14 @@
 }
 
 // Check that there is one, and only one space at the start of the statement.
- $leadingSpace = 0;
- if ($tokens$stackPtr'code' === T_OPEN_TAG) {
+ $leadingSpace = 0;
+ $isLongOpenTag = false;
+ if ($tokens$stackPtr'code' === T_OPEN_TAG
+ && stripos($tokens$stackPtr'content', '<?php') === 0
+ ) {
 // The long open tag token in a single line tag set always contains a single space after it.
- $leadingSpace = 1;
+ $leadingSpace = 1;
+ $isLongOpenTag = true;
 }
 
 if ($tokens($stackPtr + 1)'code' === T_WHITESPACE) {
@@ -394,7 +398,7 @@
 $data = $leadingSpace;
 $fix = $phpcsFile->addFixableError($error, $stackPtr, 'SpacingAfterOpen', $data);
 if ($fix === true) {
- if ($tokens$stackPtr'code' === T_OPEN_TAG) {
+ if ($isLongOpenTag === true) {
 $phpcsFile->fixer->replaceToken(($stackPtr + 1), '');
 } else if ($tokens($stackPtr + 1)'code' === T_WHITESPACE) {
 // Short open tag with too much whitespace.

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.php Changed

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

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

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.2.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.3.inc Added

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

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Functions/FunctionDeclarationUnitTest.1.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Functions/FunctionDeclarationUnitTest.2.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Functions/FunctionDeclarationUnitTest.3.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Functions/FunctionDeclarationUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.inc Changed

@@ -302,3 +302,55 @@
     ) {
     }
 }
+
+// Issue #608 - multi-attributes are not handled correctly.
+function ParamWithMultiAttributeOnSameLine(
+    #AttributeA, AttributeB string $param,
+) {
+}
+
+function ParamWithMultiAttributeOnSameLineWithParamsShouldNotBeSeenAsMultipleFnParams(
+    #AttributeA(10, 'test'), AttributeB(1, 2, 3,) string $param,
+) {
+}
+
+function ParamWithMultiAttributeOnSameLine(
+    #AttributeA, AttributeB string $paramA, int $paramB
+) {
+}
+
+function ParamWithMultiAttributeOnSameLineWithParamsShouldNotBeSeenAsMultipleFnParams(
+    #AttributeA(10, 'test'), AttributeB(1, 2, 3,) string $param, int $paramB
+) {
+}
+
+function ParamWithAttributeOnOwnLineShouldNotBeSeenAsMultipleFnParams(
+    #Attribute
+    string $param,
+) {
+}
+
+function ParamWithMultipleAttributesOnOwnLineShouldNotBeSeenAsMultipleFnParams(
+    #AttributeA
+    #AttributeB
+    string $param,
+) {
+}
+
+function ParamWithAttributeOnOwnLineWithParamsShouldNotBeSeenAsMultipleFnParamse(
+    #Attribute(10, 20)
+    string $param,
+) {
+}
+
+function ParamWithMultiAttributeOnOwnLineShouldNotBeSeenAsMultipleFnParams(
+    #AttributeA, AttributeB
+    string $param,
+) {
+}
+
+function ParamWithMultiAttributeOnOwnLineWithParamsShouldNotBeSeenAsMultipleFnParams(
+    #AttributeA(10, 'test'), AttributeB(1, 2, 3,)
+    string $param,
+) {
+}

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.inc.fixed Changed

@@ -314,3 +314,57 @@
     ) {
     }
 }
+
+// Issue #608 - multi-attributes are not handled correctly.
+function ParamWithMultiAttributeOnSameLine(
+    #AttributeA, AttributeB string $param,
+) {
+}
+
+function ParamWithMultiAttributeOnSameLineWithParamsShouldNotBeSeenAsMultipleFnParams(
+    #AttributeA(10, 'test'), AttributeB(1, 2, 3,) string $param,
+) {
+}
+
+function ParamWithMultiAttributeOnSameLine(
+    #AttributeA, AttributeB string $paramA,
+    int $paramB
+) {
+}
+
+function ParamWithMultiAttributeOnSameLineWithParamsShouldNotBeSeenAsMultipleFnParams(
+    #AttributeA(10, 'test'), AttributeB(1, 2, 3,) string $param,
+    int $paramB
+) {
+}
+
+function ParamWithAttributeOnOwnLineShouldNotBeSeenAsMultipleFnParams(
+    #Attribute
+    string $param,
+) {
+}
+
+function ParamWithMultipleAttributesOnOwnLineShouldNotBeSeenAsMultipleFnParams(
+    #AttributeA
+    #AttributeB
+    string $param,
+) {
+}
+
+function ParamWithAttributeOnOwnLineWithParamsShouldNotBeSeenAsMultipleFnParamse(
+    #Attribute(10, 20)
+    string $param,
+) {
+}
+
+function ParamWithMultiAttributeOnOwnLineShouldNotBeSeenAsMultipleFnParams(
+    #AttributeA, AttributeB
+    string $param,
+) {
+}
+
+function ParamWithMultiAttributeOnOwnLineWithParamsShouldNotBeSeenAsMultipleFnParams(
+    #AttributeA(10, 'test'), AttributeB(1, 2, 3,)
+    string $param,
+) {
+}

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/DisallowMultipleAssignmentsUnitTest.1.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.1.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.1.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.24.inc Added

@@ -0,0 +1,25 @@
+<?
+
+// This test case file MUST always start with a open PHP tag set (with this comment) to prevent
+// the tests running into the "first PHP open tag excepted" condition breaking the tests.
+// Tests related to that "first PHP open tag excepted" condition should go in separate files.
+
+// This test case file only deals with SHORT OPEN TAGS.
+
+?>
+
+<?
+/* Contrary to the long open tag token, the short open tag token does not contain a space after the
+ tag and the sniff should handle it accordingly. The test below protects against regressions
+ related to https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/588. */
+?>
+<? echo 'one space after short open tag'; ?>
+
+<? echo 'two spaces after short open tag'; ?>
+
+<?echo 'without space after short open tag'; ?>
+
+<?
+// This test case file MUST always end with an unclosed open PHP tag (with this comment) to prevent
+// the tests running into the "last PHP closing tag excepted" condition breaking tests.
+// Tests related to that "last PHP closing tag excepted" condition should go in separate files.

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.24.inc.fixed Added

@@ -0,0 +1,25 @@
+<?
+
+// This test case file MUST always start with a open PHP tag set (with this comment) to prevent
+// the tests running into the "first PHP open tag excepted" condition breaking the tests.
+// Tests related to that "first PHP open tag excepted" condition should go in separate files.
+
+// This test case file only deals with SHORT OPEN TAGS.
+
+?>
+
+<?
+/* Contrary to the long open tag token, the short open tag token does not contain a space after the
+ tag and the sniff should handle it accordingly. The test below protects against regressions
+ related to https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/588. */
+?>
+<? echo 'one space after short open tag'; ?>
+
+<? echo 'two spaces after short open tag'; ?>
+
+<? echo 'without space after short open tag'; ?>
+
+<?
+// This test case file MUST always end with an unclosed open PHP tag (with this comment) to prevent
+// the tests running into the "last PHP closing tag excepted" condition breaking tests.
+// Tests related to that "last PHP closing tag excepted" condition should go in separate files.

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Zend/Docs/Files/ClosingTagStandard.xml Changed

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

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

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

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/ConfigDouble.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/AbstractMethodUnitTest.php Changed

@@ -81,6 +81,33 @@
 
 
     /**
+     * Clean up after finished test by resetting all static properties on the class to their default values.
+     *
+     * Note: This is a PHPUnit cross-version compatible {@see \PHPUnit\Framework\TestCase::tearDownAfterClass()}
+     * method.
+     *
+     * @afterClass
+     *
+     * @return void
+     */
+    public static function reset()
+    {
+        // Explicitly trigger __destruct() on the ConfigDouble to reset the Config statics.
+        // The explicit method call prevents potential stray test-local references to the $config object
+        // preventing the destructor from running the clean up (which without stray references would be
+        // automagically triggered when `self::$phpcsFile` is reset, but we can't definitively rely on that).
+        if (isset(self::$phpcsFile) === true) {
+            self::$phpcsFile->config->__destruct();
+        }
+
+        self::$fileExtension = 'inc';
+        self::$tabWidth      = 4;
+        self::$phpcsFile     = null;
+
+    }//end reset()
+
+
+    /**
      * Get the token pointer for a target token based on a specific comment found on the line before.
      *
      * Note: the test delimiter comment MUST start with "/* test" to allow this function to

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Filters/AbstractFilterTestCase.php Changed

@@ -52,6 +52,29 @@
 
 
     /**
+     * Clean up after finished test by resetting all static properties on the Config class to their default values.
+     *
+     * Note: This is a PHPUnit cross-version compatible {@see \PHPUnit\Framework\TestCase::tearDownAfterClass()}
+     * method.
+     *
+     * @afterClass
+     *
+     * @return void
+     */
+    public static function reset()
+    {
+        // Explicitly trigger __destruct() on the ConfigDouble to reset the Config statics.
+        // The explicit method call prevents potential stray test-local references to the $config object
+        // preventing the destructor from running the clean up (which without stray references would be
+        // automagically triggered when `self::$phpcsFile` is reset, but we can't definitively rely on that).
+        if (isset(self::$config) === true) {
+            self::$config->__destruct();
+        }
+
+    }//end reset()
+
+
+    /**
      * Helper method to retrieve a mock object for a Filter class.
      *
      * The `setMethods()` method was silently deprecated in PHPUnit 9 and removed in PHPUnit 10.

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/PHP/HeredocNowdocTest.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/PHP/HeredocNowdocTest.php Added

@@ -0,0 +1,213 @@
+<?php
+/**
+ * Tests the tokenization for heredoc/nowdoc constructs.
+ *
+ * @author Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
+ * @copyright 2024 PHPCSStandards and contributors
+ * @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+
+use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Util\Tokens;
+
+/**
+ * Tests the tokenization for heredoc/nowdoc constructs.
+ *
+ * Verifies that:
+ * - Nowdoc opener/closers are retokenized from `T_START_|END_HEREDOC` to `T_START_|END_NOWDOC`.
+ * - The contents of the heredoc/nowdoc is tokenized as `T_HEREDOC`/`T_NOWDOC`.
+ * - Each line of the contents has its own token, which includes the new line char.
+ *
+ * @covers PHP_CodeSniffer\Tokenizers\PHP::tokenize
+ */
+final class HeredocNowdocTest extends AbstractTokenizerTestCase
+{
+
+
+ /**
+ * Verify tokenization a heredoc construct.
+ *
+ * @phpcs:disable Squiz.Arrays.ArrayDeclaration.SpaceBeforeDoubleArrow -- Readability is better with alignment.
+ *
+ * @return void
+ */
+ public function testHeredocSingleLine()
+ {
+ $expectedSequence = 
+ T_START_HEREDOC => '<<<EOD'."\n",
+ T_HEREDOC => 'Some $var text'."\n",
+ T_END_HEREDOC => 'EOD',
+ ;
+
+ $target = $this->getTargetToken('/* '.__FUNCTION__.' */', T_START_HEREDOC);
+
+ $this->checkTokenSequence($target, $expectedSequence);
+
+ }//end testHeredocSingleLine()
+
+
+ /**
+ * Verify tokenization a nowdoc construct.
+ *
+ * @phpcs:disable Squiz.Arrays.ArrayDeclaration.SpaceBeforeDoubleArrow -- Readability is better with alignment.
+ *
+ * @return void
+ */
+ public function testNowdocSingleLine()
+ {
+ $expectedSequence = 
+ T_START_NOWDOC => "<<<'MARKER'\n",
+ T_NOWDOC => 'Some text'."\n",
+ T_END_NOWDOC => 'MARKER',
+ ;
+
+ $target = $this->getTargetToken('/* '.__FUNCTION__.' */', T_START_NOWDOC);
+
+ $this->checkTokenSequence($target, $expectedSequence);
+
+ }//end testNowdocSingleLine()
+
+
+ /**
+ * Verify tokenization a multiline heredoc construct.
+ *
+ * @phpcs:disable Squiz.Arrays.ArrayDeclaration.SpaceBeforeDoubleArrow -- Readability is better with alignment.
+ *
+ * @return void
+ */
+ public function testHeredocMultiLine()
+ {
+ $expectedSequence = 
+ T_START_HEREDOC => '<<<"😬"'."\n",
+ T_HEREDOC => 'Lorum ipsum'."\n",
+ T_HEREDOC => 'Some $var text'."\n",
+ T_HEREDOC => 'dolor sit amet'."\n",
+ T_END_HEREDOC => '😬',
+ ;
+
+ $target = $this->getTargetToken('/* '.__FUNCTION__.' */', T_START_HEREDOC);
+
+ $this->checkTokenSequence($target, $expectedSequence);
+
+ }//end testHeredocMultiLine()
+
+
+ /**
+ * Verify tokenization a multiline testNowdocSingleLine construct.
+ *
+ * @phpcs:disable Squiz.Arrays.ArrayDeclaration.SpaceBeforeDoubleArrow -- Readability is better with alignment.
+ *
+ * @return void
+ */
+ public function testNowdocMultiLine()
+ {
+ $expectedSequence = 
+ T_START_NOWDOC => "<<<'multi_line'\n",
+ T_NOWDOC => 'Lorum ipsum'."\n",
+ T_NOWDOC => 'Some text'."\n",
+ T_NOWDOC => 'dolor sit amet'."\n",
+ T_END_NOWDOC => 'multi_line',
+ ;
+
+ $target = $this->getTargetToken('/* '.__FUNCTION__.' */', T_START_NOWDOC);
+
+ $this->checkTokenSequence($target, $expectedSequence);
+
+ }//end testNowdocMultiLine()
+
+
+ /**
+ * Verify tokenization a multiline heredoc construct.
+ *
+ * @phpcs:disable Squiz.Arrays.ArrayDeclaration.SpaceBeforeDoubleArrow -- Readability is better with alignment.
+ *
+ * @return void
+ */
+ public function testHeredocEndsOnBlankLine()
+ {
+ $expectedSequence = 
+ T_START_HEREDOC => '<<<EOD'."\n",
+ T_HEREDOC => 'Lorum ipsum'."\n",
+ T_HEREDOC => 'dolor sit amet'."\n",
+ T_HEREDOC => "\n",
+ T_END_HEREDOC => 'EOD',
+ ;
+
+ $target = $this->getTargetToken('/* '.__FUNCTION__.' */', T_START_HEREDOC);
+
+ $this->checkTokenSequence($target, $expectedSequence);
+
+ }//end testHeredocEndsOnBlankLine()
+
+
+ /**
+ * Verify tokenization a multiline testNowdocSingleLine construct.
+ *
+ * @phpcs:disable Squiz.Arrays.ArrayDeclaration.SpaceBeforeDoubleArrow -- Readability is better with alignment.
+ *
+ * @return void
+ */
+ public function testNowdocEndsOnBlankLine()
+ {
+ $expectedSequence = 
+ T_START_NOWDOC => "<<<'EOD'\n",
+ T_NOWDOC => 'Lorum ipsum'."\n",
+ T_NOWDOC => 'dolor sit amet'."\n",
+ T_NOWDOC => "\n",
+ T_END_NOWDOC => 'EOD',
+ ;
+
+ $target = $this->getTargetToken('/* '.__FUNCTION__.' */', T_START_NOWDOC);
+
+ $this->checkTokenSequence($target, $expectedSequence);
+
+ }//end testNowdocEndsOnBlankLine()
+
+
+ /**
+ * Test helper. Check a token sequence complies with an expected token sequence.
+ *
+ * @param int $startPtr The position in the file to start checking from.
+ * @param array<array<int|string, string>> $expectedSequence The consecutive token constants and their contents to expect.
+ *
+ * @return void
+ */
+ private function checkTokenSequence($startPtr, array $expectedSequence)
+ {
+ $tokens = $this->phpcsFile->getTokens();
+
+ $sequenceKey = 0;
+ $sequenceCount = count($expectedSequence);
+
+ for ($i = $startPtr; $sequenceKey < $sequenceCount; $i++, $sequenceKey++) {
+ $currentItem = $expectedSequence$sequenceKey;
+ $expectedCode = key($currentItem);
+ $expectedType = Tokens::tokenName($expectedCode);
+ $expectedContent = current($currentItem);
+ $errorMsgSuffix = PHP_EOL.'(StackPtr: '.$i.' | Position in sequence: '.$sequenceKey.' | Expected: '.$expectedType.')';
+
+ $this->assertSame(
+ $expectedCode,
+ $tokens$i'code',
+ 'Token tokenized as '.Tokens::tokenName($tokens$i'code').', not '.$expectedType.' (code)'.$errorMsgSuffix
+ );
+
+ $this->assertSame(
+ $expectedType,
+ $tokens$i'type',

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/PHP/HeredocParseErrorTest.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/PHP/HeredocParseErrorTest.php Added

@@ -0,0 +1,41 @@
+<?php
+/**
+ * Tests the tokenization for an unclosed heredoc construct.
+ *
+ * @author Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
+ * @copyright 2024 PHPCSStandards and contributors
+ * @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+
+use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+
+/**
+ * Tests the tokenization for an unclosed heredoc construct.
+ *
+ * @covers PHP_CodeSniffer\Tokenizers\PHP::tokenize
+ */
+final class HeredocParseErrorTest extends AbstractTokenizerTestCase
+{
+
+
+ /**
+ * Verify that a heredoc (and nowdoc) start token is retokenized to T_STRING if no closer is found.
+ *
+ * @return void
+ */
+ public function testMergeConflict()
+ {
+ $tokens = $this->phpcsFile->getTokens();
+
+ $token = $this->getTargetToken('/* testUnclosedHeredoc */', T_START_HEREDOC, T_STRING, '<<< HEAD'."\n");
+ $tokenArray = $tokens$token;
+
+ $this->assertSame(T_STRING, $tokenArray'code', 'Token tokenized as '.$tokenArray'type'.', not T_START_HEREDOC (code)');
+ $this->assertSame('T_STRING', $tokenArray'type', 'Token tokenized as '.$tokenArray'type'.', not T_START_HEREDOC (type)');
+
+ }//end testMergeConflict()
+
+
+}//end class

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/Tokenizer/HeredocNowdocOpenerTest.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/Tokenizer/HeredocNowdocOpenerTest.php Added

@@ -0,0 +1,121 @@
+<?php
+/**
+ * Tests the tokenization of heredoc/nowdoc opener tokens.
+ *
+ * @author Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
+ * @copyright 2024 PHPCSStandards and contributors
+ * @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Tests\Core\Tokenizer\Tokenizer;
+
+use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+
+/**
+ * Heredoc/nowdoc opener token test.
+ */
+final class HeredocNowdocOpenerTest extends AbstractTokenizerTestCase
+{
+
+
+ /**
+ * Verify that spaces/tabs in a heredoc/nowdoc opener token get the tab replacement treatment.
+ *
+ * @param string $testMarker The comment prefacing the target token.
+ * @param array<string, int|string|null> $expected Expectations for the token array.
+ *
+ * @dataProvider dataHeredocNowdocOpenerTabReplacement
+ * @covers PHP_CodeSniffer\Tokenizers\Tokenizer::createPositionMap
+ *
+ * @return void
+ */
+ public function testHeredocNowdocOpenerTabReplacement($testMarker, $expected)
+ {
+ $tokens = $this->phpcsFile->getTokens();
+ $opener = $this->getTargetToken($testMarker, T_START_HEREDOC, T_START_NOWDOC);
+
+ foreach ($expected as $key => $value) {
+ if ($key === 'orig_content' && $value === null) {
+ $this->assertArrayNotHasKey($key, $tokens$opener, "Unexpected 'orig_content' key found in the token array.");
+ continue;
+ }
+
+ $this->assertArrayHasKey($key, $tokens$opener, "Key $key not found in the token array.");
+ $this->assertSame($value, $tokens$opener$key, "Value for key $key does not match expectation.");
+ }
+
+ }//end testHeredocNowdocOpenerTabReplacement()
+
+
+ /**
+ * Data provider.
+ *
+ * @see testHeredocNowdocOpenerTabReplacement()
+ *
+ * @return array<string, array<string, string|array<string, int|string|null>>>
+ */
+ public static function dataHeredocNowdocOpenerTabReplacement()
+ {
+ return 
+ 'Heredoc opener without space' => 
+ 'testMarker' => '/* testHeredocOpenerNoSpace */',
+ 'expected' => 
+ 'length' => 6,
+ 'content' => '<<<EOD
+',
+ 'orig_content' => null,
+ ,
+ ,
+ 'Nowdoc opener without space' => 
+ 'testMarker' => '/* testNowdocOpenerNoSpace */',
+ 'expected' => 
+ 'length' => 8,
+ 'content' => "<<<'EOD'
+",
+ 'orig_content' => null,
+ ,
+ ,
+ 'Heredoc opener with space(s)' => 
+ 'testMarker' => '/* testHeredocOpenerHasSpace */',
+ 'expected' => 
+ 'length' => 7,
+ 'content' => '<<< END
+',
+ 'orig_content' => null,
+ ,
+ ,
+ 'Nowdoc opener with space(s)' => 
+ 'testMarker' => '/* testNowdocOpenerHasSpace */',
+ 'expected' => 
+ 'length' => 21,
+ 'content' => "<<< 'END'
+",
+ 'orig_content' => null,
+ ,
+ ,
+ 'Heredoc opener with tab(s)' => 
+ 'testMarker' => '/* testHeredocOpenerHasTab */',
+ 'expected' => 
+ 'length' => 18,
+ 'content' => '<<< "END"
+',
+ 'orig_content' => '<<<			"END"
+',
+ ,
+ ,
+ 'Nowdoc opener with tab(s)' => 
+ 'testMarker' => '/* testNowdocOpenerHasTab */',
+ 'expected' => 
+ 'length' => 11,
+ 'content' => "<<< 'END'
+",
+ 'orig_content' => "<<<	'END'
+",
+ ,
+ ,
+ ;
+
+ }//end dataHeredocNowdocOpenerTabReplacement()
+
+
+}//end class

roundcubemail-1.5.tar.gz/vendor/symfony/polyfill-ctype/composer.json Changed

roundcubemail-1.5.tar.gz/vendor/symfony/polyfill-intl-idn/Idn.php Changed

roundcubemail-1.5.tar.gz/vendor/symfony/polyfill-intl-idn/composer.json Changed

roundcubemail-1.5.tar.gz/vendor/symfony/polyfill-intl-normalizer/composer.json Changed

roundcubemail-1.5.tar.gz/vendor/symfony/polyfill-mbstring/Mbstring.php Changed

@@ -50,6 +50,9 @@
 * - mb_substr_count - Count the number of substring occurrences
 * - mb_ucfirst - Make a string's first character uppercase
 * - mb_lcfirst - Make a string's first character lowercase
+ * - mb_trim - Strip whitespace (or other characters) from the beginning and end of a string
+ * - mb_ltrim - Strip whitespace (or other characters) from the beginning of a string
+ * - mb_rtrim - Strip whitespace (or other characters) from the end of a string
 *
 * Not implemented:
 * - mb_convert_kana - Convert "kana" one from another ("zen-kaku", "han-kaku" and more)
@@ -83,12 +86,6 @@
 public static function mb_convert_encoding($s, $toEncoding, $fromEncoding = null)
 {
 if (\is_array($s)) {
- if (PHP_VERSION_ID < 70200) {
- trigger_error('mb_convert_encoding() expects parameter 1 to be string, array given', \E_USER_WARNING);
-
- return null;
- }
-
 $r = ;
 foreach ($s as $str) {
 $r = self::mb_convert_encoding($str, $toEncoding, $fromEncoding);
@@ -427,12 +424,6 @@
 
 public static function mb_check_encoding($var = null, $encoding = null)
 {
- if (\PHP_VERSION_ID < 70200 && \is_array($var)) {
- trigger_error('mb_check_encoding() expects parameter 1 to be string, array given', \E_USER_WARNING);
-
- return null;
- }
-
 if (null === $encoding) {
 if (null === $var) {
 return false;
@@ -980,17 +971,75 @@
 return $encoding;
 }
 
+ public static function mb_trim(string $string, ?string $characters = null, ?string $encoding = null): string
+ {
+ return self::mb_internal_trim('{^%s+|%1$s+$}Du', $string, $characters, $encoding, __FUNCTION__);
+ }
+
+ public static function mb_ltrim(string $string, ?string $characters = null, ?string $encoding = null): string
+ {
+ return self::mb_internal_trim('{^%s+}Du', $string, $characters, $encoding, __FUNCTION__);
+ }
+
+ public static function mb_rtrim(string $string, ?string $characters = null, ?string $encoding = null): string
+ {
+ return self::mb_internal_trim('{%s+$}D', $string, $characters, $encoding, __FUNCTION__);
+ }
+
+ private static function mb_internal_trim(string $regex, string $string, ?string $characters, ?string $encoding, string $function): string
+ {
+ if (null === $encoding) {
+ $encoding = self::mb_internal_encoding();
+ } else {
+ self::assertEncoding($encoding, $function.'(): Argument #3 ($encoding) must be a valid encoding, "%s" given');
+ }
+
+ if ('' === $characters) {
+ return null === $encoding ? $string : self::mb_convert_encoding($string, $encoding);
+ }
+
+ if ('UTF-8' === $encoding) {
+ $encoding = null;
+ if (!preg_match('//u', $string)) {
+ $string = @iconv('UTF-8', 'UTF-8//IGNORE', $string);
+ }
+ if (null !== $characters && !preg_match('//u', $characters)) {
+ $characters = @iconv('UTF-8', 'UTF-8//IGNORE', $characters);
+ }
+ } else {
+ $string = iconv($encoding, 'UTF-8//IGNORE', $string);
+
+ if (null !== $characters) {
+ $characters = iconv($encoding, 'UTF-8//IGNORE', $characters);
+ }
+ }
+
+ if (null === $characters) {
+ $characters = "\\0 \f\n\r\t\v\u{00A0}\u{1680}\u{2000}\u{2001}\u{2002}\u{2003}\u{2004}\u{2005}\u{2006}\u{2007}\u{2008}\u{2009}\u{200A}\u{2028}\u{2029}\u{202F}\u{205F}\u{3000}\u{0085}\u{180E}";
+ } else {
+ $characters = preg_quote($characters);
+ }
+
+ $string = preg_replace(sprintf($regex, $characters), '', $string);
+
+ if (null === $encoding) {
+ return $string;
+ }
+
+ return iconv('UTF-8', $encoding.'//IGNORE', $string);
+ }
+
 private static function assertEncoding(string $encoding, string $errorFormat): void
 {
 try {
 $validEncoding = @self::mb_check_encoding('', $encoding);
 } catch (\ValueError $e) {
- throw new \ValueError(\sprintf($errorFormat, $encoding));
+ throw new \ValueError(sprintf($errorFormat, $encoding));
 }
 
 // BC for PHP 7.3 and lower
 if (!$validEncoding) {
- throw new \ValueError(\sprintf($errorFormat, $encoding));
+ throw new \ValueError(sprintf($errorFormat, $encoding));
 }
 }
 }

roundcubemail-1.5.tar.gz/vendor/symfony/polyfill-mbstring/bootstrap.php Changed

roundcubemail-1.5.tar.gz/vendor/symfony/polyfill-mbstring/bootstrap80.php Changed

@@ -93,7 +93,7 @@
     function mb_strstr(?string $haystack, ?string $needle, ?bool $before_needle = false, ?string $encoding = null): string|false { return p\Mbstring::mb_strstr((string) $haystack, (string) $needle, (bool) $before_needle, $encoding); }
 }
 if (!function_exists('mb_get_info')) {
-    function mb_get_info(?string $type = 'all'): array|string|int|false { return p\Mbstring::mb_get_info((string) $type); }
+    function mb_get_info(?string $type = 'all'): array|string|int|false|null { return p\Mbstring::mb_get_info((string) $type); }
 }
 if (!function_exists('mb_http_output')) {
     function mb_http_output(?string $encoding = null): string|bool { return p\Mbstring::mb_http_output($encoding); }
@@ -140,6 +140,18 @@
     function mb_lcfirst($string, ?string $encoding = null): string { return p\Mbstring::mb_lcfirst($string, $encoding); }
 }
 
+if (!function_exists('mb_trim')) {
+    function mb_trim(string $string, ?string $characters = null, ?string $encoding = null): string { return p\Mbstring::mb_trim($string, $characters, $encoding); }
+}
+
+if (!function_exists('mb_ltrim')) {
+    function mb_ltrim(string $string, ?string $characters = null, ?string $encoding = null): string { return p\Mbstring::mb_ltrim($string, $characters, $encoding); }
+}
+
+if (!function_exists('mb_rtrim')) {
+    function mb_rtrim(string $string, ?string $characters = null, ?string $encoding = null): string { return p\Mbstring::mb_rtrim($string, $characters, $encoding); }
+}
+
 if (extension_loaded('mbstring')) {
     return;
 }

roundcubemail-1.5.tar.gz/vendor/symfony/polyfill-mbstring/composer.json Changed

roundcubemail-1.5.tar.gz/vendor/symfony/polyfill-php72 Deleted

roundcubemail-1.5.tar.gz/vendor/symfony/polyfill-php72/LICENSE Deleted

@@ -1,19 +0,0 @@
-Copyright (c) 2015-present Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

roundcubemail-1.5.tar.gz/vendor/symfony/polyfill-php72/Php72.php Deleted

@@ -1,218 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Polyfill\Php72;
-
-/**
- * @author Nicolas Grekas <p@tchwork.com>
- * @author Dariusz Rumiński <dariusz.ruminski@gmail.com>
- *
- * @internal
- */
-final class Php72
-{
- private static $hashMask;
-
- public static function utf8_encode($s)
- {
- $s .= $s;
- $len = \strlen($s);
-
- for ($i = $len >> 1, $j = 0; $i < $len; ++$i, ++$j) {
- switch (true) {
- case $s$i < "\x80": $s$j = $s$i; break;
- case $s$i < "\xC0": $s$j = "\xC2"; $s++$j = $s$i; break;
- default: $s$j = "\xC3"; $s++$j = \chr(\ord($s$i) - 64); break;
- }
- }
-
- return substr($s, 0, $j);
- }
-
- public static function utf8_decode($s)
- {
- $s = (string) $s;
- $len = \strlen($s);
-
- for ($i = 0, $j = 0; $i < $len; ++$i, ++$j) {
- switch ($s$i & "\xF0") {
- case "\xC0":
- case "\xD0":
- $c = (\ord($s$i & "\x1F") << 6) | \ord($s++$i & "\x3F");
- $s$j = $c < 256 ? \chr($c) : '?';
- break;
-
- case "\xF0":
- ++$i;
- // no break
-
- case "\xE0":
- $s$j = '?';
- $i += 2;
- break;
-
- default:
- $s$j = $s$i;
- }
- }
-
- return substr($s, 0, $j);
- }
-
- public static function php_os_family()
- {
- if ('\\' === \DIRECTORY_SEPARATOR) {
- return 'Windows';
- }
-
- $map = 
- 'Darwin' => 'Darwin',
- 'DragonFly' => 'BSD',
- 'FreeBSD' => 'BSD',
- 'NetBSD' => 'BSD',
- 'OpenBSD' => 'BSD',
- 'Linux' => 'Linux',
- 'SunOS' => 'Solaris',
- ;
-
- return $map\PHP_OS ?? 'Unknown';
- }
-
- public static function spl_object_id($object)
- {
- if (null === self::$hashMask) {
- self::initHashMask();
- }
- if (null === $hash = spl_object_hash($object)) {
- return;
- }
-
- // On 32-bit systems, PHP_INT_SIZE is 4,
- return self::$hashMask ^ hexdec(substr($hash, 16 - (\PHP_INT_SIZE * 2 - 1), \PHP_INT_SIZE * 2 - 1));
- }
-
- public static function sapi_windows_vt100_support($stream, $enable = null)
- {
- if (!\is_resource($stream)) {
- trigger_error('sapi_windows_vt100_support() expects parameter 1 to be resource, '.\gettype($stream).' given', \E_USER_WARNING);
-
- return false;
- }
-
- $meta = stream_get_meta_data($stream);
-
- if ('STDIO' !== $meta'stream_type') {
- trigger_error('sapi_windows_vt100_support() was not able to analyze the specified stream', \E_USER_WARNING);
-
- return false;
- }
-
- // We cannot actually disable vt100 support if it is set
- if (false === $enable || !self::stream_isatty($stream)) {
- return false;
- }
-
- // The native function does not apply to stdin
- $meta = array_map('strtolower', $meta);
- $stdin = 'php://stdin' === $meta'uri' || 'php://fd/0' === $meta'uri';
-
- return !$stdin
- && (false !== getenv('ANSICON')
- || 'ON' === getenv('ConEmuANSI')
- || 'xterm' === getenv('TERM')
- || 'Hyper' === getenv('TERM_PROGRAM'));
- }
-
- public static function stream_isatty($stream)
- {
- if (!\is_resource($stream)) {
- trigger_error('stream_isatty() expects parameter 1 to be resource, '.\gettype($stream).' given', \E_USER_WARNING);
-
- return false;
- }
-
- if ('\\' === \DIRECTORY_SEPARATOR) {
- $stat = @fstat($stream);
-
- // Check if formatted mode is S_IFCHR
- return $stat ? 0020000 === ($stat'mode' & 0170000) : false;
- }
-
- return \function_exists('posix_isatty') && @posix_isatty($stream);
- }
-
- private static function initHashMask()
- {
- $obj = (object) ;
- self::$hashMask = -1;
-
- // check if we are nested in an output buffering handler to prevent a fatal error with ob_start() below
- $obFuncs = 'ob_clean', 'ob_end_clean', 'ob_flush', 'ob_end_flush', 'ob_get_contents', 'ob_get_flush';
- foreach (debug_backtrace(\PHP_VERSION_ID >= 50400 ? \DEBUG_BACKTRACE_IGNORE_ARGS : false) as $frame) {
- if (isset($frame'function'0) && !isset($frame'class') && 'o' === $frame'function'0 && \in_array($frame'function', $obFuncs)) {
- $frame'line' = 0;
- break;
- }
- }
- if (!empty($frame'line')) {
- ob_start();
- debug_zval_dump($obj);
- self::$hashMask = (int) substr(ob_get_clean(), 17);
- }
-
- self::$hashMask ^= hexdec(substr(spl_object_hash($obj), 16 - (\PHP_INT_SIZE * 2 - 1), \PHP_INT_SIZE * 2 - 1));
- }
-
- public static function mb_chr($code, $encoding = null)
- {
- if (0x80 > $code %= 0x200000) {
- $s = \chr($code);
- } elseif (0x800 > $code) {
- $s = \chr(0xC0 | $code >> 6).\chr(0x80 | $code & 0x3F);
- } elseif (0x10000 > $code) {
- $s = \chr(0xE0 | $code >> 12).\chr(0x80 | $code >> 6 & 0x3F).\chr(0x80 | $code & 0x3F);
- } else {
- $s = \chr(0xF0 | $code >> 18).\chr(0x80 | $code >> 12 & 0x3F).\chr(0x80 | $code >> 6 & 0x3F).\chr(0x80 | $code & 0x3F);
- }
-
- if ('UTF-8' !== $encoding = $encoding ?? mb_internal_encoding()) {
- $s = mb_convert_encoding($s, $encoding, 'UTF-8');
- }
-
- return $s;
- }
-
- public static function mb_ord($s, $encoding = null)
- {
- if (null === $encoding) {
- $s = mb_convert_encoding($s, 'UTF-8');
- } elseif ('UTF-8' !== $encoding) {
- $s = mb_convert_encoding($s, 'UTF-8', $encoding);
- }

roundcubemail-1.5.tar.gz/vendor/symfony/polyfill-php72/README.md Deleted

@@ -1,35 +0,0 @@
-Symfony Polyfill / Php72
-========================
-
-This component provides functions added to PHP 7.2 core:
-
-- `spl_object_id`(https://php.net/spl_object_id)
-- `stream_isatty`(https://php.net/stream_isatty)
-
-And also functions added to PHP 7.2 mbstring:
-
-- `mb_ord`(https://php.net/mb_ord)
-- `mb_chr`(https://php.net/mb_chr)
-- `mb_scrub`(https://php.net/mb_scrub)
-
-On Windows only:
-
-- `sapi_windows_vt100_support`(https://php.net/sapi_windows_vt100_support)
-
-Moved to core since 7.2 (was in the optional XML extension earlier):
-
-- `utf8_encode`(https://php.net/utf8_encode)
-- `utf8_decode`(https://php.net/utf8_decode)
-
-Also, it provides constants added to PHP 7.2:
-
-- `PHP_FLOAT_*`(https://php.net/reserved.constants#constant.php-float-dig)
-- `PHP_OS_FAMILY`(https://php.net/reserved.constants#constant.php-os-family)
-
-More information can be found in the
-main Polyfill README(https://github.com/symfony/polyfill/blob/main/README.md).
-
-License
-=======
-
-This library is released under the MIT license(LICENSE).

roundcubemail-1.5.tar.gz/vendor/symfony/polyfill-php72/bootstrap.php Deleted

@@ -1,57 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Symfony\Polyfill\Php72 as p;
-
-if (\PHP_VERSION_ID >= 70200) {
- return;
-}
-
-if (!defined('PHP_FLOAT_DIG')) {
- define('PHP_FLOAT_DIG', 15);
-}
-if (!defined('PHP_FLOAT_EPSILON')) {
- define('PHP_FLOAT_EPSILON', 2.2204460492503E-16);
-}
-if (!defined('PHP_FLOAT_MIN')) {
- define('PHP_FLOAT_MIN', 2.2250738585072E-308);
-}
-if (!defined('PHP_FLOAT_MAX')) {
- define('PHP_FLOAT_MAX', 1.7976931348623157E+308);
-}
-if (!defined('PHP_OS_FAMILY')) {
- define('PHP_OS_FAMILY', p\Php72::php_os_family());
-}
-
-if ('\\' === \DIRECTORY_SEPARATOR && !function_exists('sapi_windows_vt100_support')) {
- function sapi_windows_vt100_support($stream, $enable = null) { return p\Php72::sapi_windows_vt100_support($stream, $enable); }
-}
-if (!function_exists('stream_isatty')) {
- function stream_isatty($stream) { return p\Php72::stream_isatty($stream); }
-}
-if (!function_exists('utf8_encode')) {
- function utf8_encode($string) { return p\Php72::utf8_encode($string); }
-}
-if (!function_exists('utf8_decode')) {
- function utf8_decode($string) { return p\Php72::utf8_decode($string); }
-}
-if (!function_exists('spl_object_id')) {
- function spl_object_id($object) { return p\Php72::spl_object_id($object); }
-}
-if (!function_exists('mb_ord')) {
- function mb_ord($string, $encoding = null) { return p\Php72::mb_ord($string, $encoding); }
-}
-if (!function_exists('mb_chr')) {
- function mb_chr($codepoint, $encoding = null) { return p\Php72::mb_chr($codepoint, $encoding); }
-}
-if (!function_exists('mb_scrub')) {
- function mb_scrub($string, $encoding = null) { $encoding = null === $encoding ? mb_internal_encoding() : $encoding; return mb_convert_encoding($string, $encoding, $encoding); }
-}

roundcubemail-1.5.tar.gz/vendor/symfony/polyfill-php72/composer.json Deleted

roundcubemail.dsc Changed

Changes of Revision 69