Request 3292 (accepted)

roundcubemail.spec Changed

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

@@ -4992,16 +4992,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.11.1",
+            "version": "1.11.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "e524358f930e41a2b4cca1320e3b04fc26b39e0b"
+                "reference": "9100a76ce8015b9aa7125b9171ae3a76887b6c82"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e524358f930e41a2b4cca1320e3b04fc26b39e0b",
-                "reference": "e524358f930e41a2b4cca1320e3b04fc26b39e0b",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9100a76ce8015b9aa7125b9171ae3a76887b6c82",
+                "reference": "9100a76ce8015b9aa7125b9171ae3a76887b6c82",
                 "shasum": ""
             },
             "require": {
@@ -5046,7 +5046,7 @@
                     "type": "github"
                 }
             ,
-            "time": "2024-05-15T08:00:59+00:00"
+            "time": "2024-06-06T12:19:22+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -6032,16 +6032,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.10.0",
+            "version": "3.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "57e09801c2fbae2d257b8b75bebb3deeb7e9deb2"
+                "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/57e09801c2fbae2d257b8b75bebb3deeb7e9deb2",
-                "reference": "57e09801c2fbae2d257b8b75bebb3deeb7e9deb2",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/8f90f7a53ce271935282967f53d0894f8f1ff877",
+                "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877",
                 "shasum": ""
             },
             "require": {
@@ -6108,7 +6108,7 @@
                     "type": "open_collective"
                 }
             ,
-            "time": "2024-05-20T08:11:32+00:00"
+            "time": "2024-05-22T21:24:41+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",

roundcubemail-1.5.tar.gz/node_modules/sax/LICENSE Changed

roundcubemail-1.5.tar.gz/node_modules/sax/README.md Changed

roundcubemail-1.5.tar.gz/node_modules/sax/lib/sax.js Changed

@@ -71,6 +71,12 @@
 parser.ns = Object.create(rootNS)
 }
 
+ // disallow unquoted attribute values if not otherwise configured
+ // and strict mode is true
+ if (parser.opt.unquotedAttributeValues === undefined) {
+ parser.opt.unquotedAttributeValues = !strict;
+ }
+
 // mostly just for error reporting
 parser.trackPosition = parser.opt.position !== false
 if (parser.trackPosition) {
@@ -1090,15 +1096,22 @@
 continue
 
 case S.SGML_DECL:
- if ((parser.sgmlDecl + c).toUpperCase() === CDATA) {
+ if (parser.sgmlDecl + c === '--') {
+ parser.state = S.COMMENT
+ parser.comment = ''
+ parser.sgmlDecl = ''
+ continue;
+ }
+
+ if (parser.doctype && parser.doctype !== true && parser.sgmlDecl) {
+ parser.state = S.DOCTYPE_DTD
+ parser.doctype += '<!' + parser.sgmlDecl + c
+ parser.sgmlDecl = ''
+ } else if ((parser.sgmlDecl + c).toUpperCase() === CDATA) {
 emitNode(parser, 'onopencdata')
 parser.state = S.CDATA
 parser.sgmlDecl = ''
 parser.cdata = ''
- } else if (parser.sgmlDecl + c === '--') {
- parser.state = S.COMMENT
- parser.comment = ''
- parser.sgmlDecl = ''
 } else if ((parser.sgmlDecl + c).toUpperCase() === DOCTYPE) {
 parser.state = S.DOCTYPE
 if (parser.doctype || parser.sawRoot) {
@@ -1152,12 +1165,18 @@
 continue
 
 case S.DOCTYPE_DTD:
- parser.doctype += c
 if (c === '') {
+ parser.doctype += c
 parser.state = S.DOCTYPE
+ } else if (c === '<') {
+ parser.state = S.OPEN_WAKA
+ parser.startTagPosition = parser.position
 } else if (isQuote(c)) {
+ parser.doctype += c
 parser.state = S.DOCTYPE_DTD_QUOTED
 parser.q = c
+ } else {
+ parser.doctype += c
 }
 continue
 
@@ -1198,6 +1217,8 @@
 // which is a comment of " blah -- bloo "
 parser.comment += '--' + c
 parser.state = S.COMMENT
+ } else if (parser.doctype && parser.doctype !== true) {
+ parser.state = S.DOCTYPE_DTD
 } else {
 parser.state = S.TEXT
 }
@@ -1365,7 +1386,9 @@
 parser.q = c
 parser.state = S.ATTRIB_VALUE_QUOTED
 } else {
- strictFail(parser, 'Unquoted attribute value')
+ if (!parser.opt.unquotedAttributeValues) {
+ error(parser, 'Unquoted attribute value')
+ }
 parser.state = S.ATTRIB_VALUE_UNQUOTED
 parser.attribValue = c
 }
@@ -1483,13 +1506,13 @@
 }
 
 if (c === ';') {
- if (parser.opt.unparsedEntities) {
- var parsedEntity = parseEntity(parser)
+ var parsedEntity = parseEntity(parser)
+ if (parser.opt.unparsedEntities && !Object.values(sax.XML_ENTITIES).includes(parsedEntity)) {
 parser.entity = ''
 parser.state = returnState
 parser.write(parsedEntity)
 } else {
- parserbuffer += parseEntity(parser)
+ parserbuffer += parsedEntity
 parser.entity = ''
 parser.state = returnState
 }

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

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

roundcubemail-1.5.tar.gz/node_modules/tslib/tslib.d.ts Changed

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

@@ -228,8 +228,9 @@
 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"), iSymbol.asyncIterator = function () { return this; }, i;
-    function verb(n) { if (gn) in = function (v) { return new Promise(function (a, b) { q.push(n, v, a, b) > 1 || resume(n, v); }); }; }
+    return i = {}, 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); } }
     function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q02, r); }
     function fulfill(value) { resume("next", value); }
@@ -295,7 +296,7 @@
 export function __addDisposableResource(env, value, async) {
     if (value !== null && value !== void 0) {
         if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
-        var dispose;
+        var dispose, inner;
         if (async) {
             if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
             dispose = valueSymbol.asyncDispose;
@@ -303,14 +304,17 @@
         if (dispose === void 0) {
             if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
             dispose = valueSymbol.dispose;
+            if (async) inner = dispose;
         }
         if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+        if (inner) dispose = function() { try { inner.call(this); } catch (e) { return Promise.reject(e); } };
         env.stack.push({ value: value, dispose: dispose, async: async });
     }
     else if (async) {
         env.stack.push({ async: true });
     }
     return value;
+
 }
 
 var _SuppressedError = typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {

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

@@ -228,8 +228,9 @@
 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"), iSymbol.asyncIterator = function () { return this; }, i;
-  function verb(n) { if (gn) in = function (v) { return new Promise(function (a, b) { q.push(n, v, a, b) > 1 || resume(n, v); }); }; }
+  return i = {}, 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); } }
   function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q02, r); }
   function fulfill(value) { resume("next", value); }
@@ -295,16 +296,18 @@
 export function __addDisposableResource(env, value, async) {
   if (value !== null && value !== void 0) {
     if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
-    var dispose;
+    var dispose, inner;
     if (async) {
-        if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
-        dispose = valueSymbol.asyncDispose;
+      if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+      dispose = valueSymbol.asyncDispose;
     }
     if (dispose === void 0) {
-        if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
-        dispose = valueSymbol.dispose;
+      if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+      dispose = valueSymbol.dispose;
+      if (async) inner = dispose;
     }
     if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+    if (inner) dispose = function() { try { inner.call(this); } catch (e) { return Promise.reject(e); } };
     env.stack.push({ value: value, dispose: dispose, async: async });
   }
   else if (async) {

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

@@ -276,10 +276,11 @@
     __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"), iSymbol.asyncIterator = function () { return this; }, i;
-        function verb(n) { if (gn) in = function (v) { return new Promise(function (a, b) { q.push(n, v, a, b) > 1 || resume(n, v); }); }; }
+        return i = {}, 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); } }
-        function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q02, r);  }
+        function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q02, r); }
         function fulfill(value) { resume("next", value); }
         function reject(value) { resume("throw", value); }
         function settle(f, v) { if (f(v), q.shift(), q.length) resume(q00, q01); }
@@ -343,7 +344,7 @@
     __addDisposableResource = function (env, value, async) {
         if (value !== null && value !== void 0) {
             if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
-            var dispose;
+            var dispose, inner;
             if (async) {
                 if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
                 dispose = valueSymbol.asyncDispose;
@@ -351,8 +352,10 @@
             if (dispose === void 0) {
                 if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
                 dispose = valueSymbol.dispose;
+                if (async) inner = dispose;
             }
             if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+            if (inner) dispose = function() { try { inner.call(this); } catch (e) { return Promise.reject(e); } };
             env.stack.push({ value: value, dispose: dispose, async: async });
         }
         else if (async) {

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

@@ -147,9 +147,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sax": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz",
-      "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA=="
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz",
+      "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg=="
     },
     "semver": {
       "version": "5.7.2",
@@ -162,9 +162,9 @@
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
     },
     "tslib": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
+      "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ=="
     }
   }
 }

roundcubemail-1.5.tar.gz/plugins/kolab_tags/lib/kolab_tags_engine.php Changed

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

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

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

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

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit535cba52fd83de304df47c42dbcbaa9c
+class ComposerAutoloaderInitba58e93685476c253beb20a82872e02d
 {
     private static $loader;
 
@@ -24,20 +24,20 @@
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit535cba52fd83de304df47c42dbcbaa9c', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitba58e93685476c253beb20a82872e02d', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit535cba52fd83de304df47c42dbcbaa9c', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitba58e93685476c253beb20a82872e02d', 'loadClassLoader'));
 
         $includePaths = require __DIR__ . '/include_paths.php';
         $includePaths = get_include_path();
         set_include_path(implode(PATH_SEPARATOR, $includePaths));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit535cba52fd83de304df47c42dbcbaa9c::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInitba58e93685476c253beb20a82872e02d::getInitializer($loader));
 
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInit535cba52fd83de304df47c42dbcbaa9c::$files;
+        $filesToLoad = \Composer\Autoload\ComposerStaticInitba58e93685476c253beb20a82872e02d::$files;
         $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
             if (empty($GLOBALS'__composer_autoload_files'$fileIdentifier)) {
                 $GLOBALS'__composer_autoload_files'$fileIdentifier = true;

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

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit535cba52fd83de304df47c42dbcbaa9c
+class ComposerStaticInitba58e93685476c253beb20a82872e02d
 {
     public static $files = array (
         '383eaff206634a77a1be54e64e6459c7' => __DIR__ . '/..' . '/sabre/uri/lib/functions.php',
@@ -1153,10 +1153,10 @@
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit535cba52fd83de304df47c42dbcbaa9c::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit535cba52fd83de304df47c42dbcbaa9c::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit535cba52fd83de304df47c42dbcbaa9c::$prefixesPsr0;
-            $loader->classMap = ComposerStaticInit535cba52fd83de304df47c42dbcbaa9c::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitba58e93685476c253beb20a82872e02d::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitba58e93685476c253beb20a82872e02d::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInitba58e93685476c253beb20a82872e02d::$prefixesPsr0;
+            $loader->classMap = ComposerStaticInitba58e93685476c253beb20a82872e02d::$classMap;
 
         }, null, ClassLoader::class);
     }

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

@@ -3186,17 +3186,17 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.11.1",
-            "version_normalized": "1.11.1.0",
+            "version": "1.11.4",
+            "version_normalized": "1.11.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "e524358f930e41a2b4cca1320e3b04fc26b39e0b"
+                "reference": "9100a76ce8015b9aa7125b9171ae3a76887b6c82"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e524358f930e41a2b4cca1320e3b04fc26b39e0b",
-                "reference": "e524358f930e41a2b4cca1320e3b04fc26b39e0b",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9100a76ce8015b9aa7125b9171ae3a76887b6c82",
+                "reference": "9100a76ce8015b9aa7125b9171ae3a76887b6c82",
                 "shasum": ""
             },
             "require": {
@@ -3205,7 +3205,7 @@
             "conflict": {
                 "phpstan/phpstan-shim": "*"
             },
-            "time": "2024-05-15T08:00:59+00:00",
+            "time": "2024-06-06T12:19:22+00:00",
             "bin": 
                 "phpstan",
                 "phpstan.phar"
@@ -5207,17 +5207,17 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.10.0",
-            "version_normalized": "3.10.0.0",
+            "version": "3.10.1",
+            "version_normalized": "3.10.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "57e09801c2fbae2d257b8b75bebb3deeb7e9deb2"
+                "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/57e09801c2fbae2d257b8b75bebb3deeb7e9deb2",
-                "reference": "57e09801c2fbae2d257b8b75bebb3deeb7e9deb2",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/8f90f7a53ce271935282967f53d0894f8f1ff877",
+                "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877",
                 "shasum": ""
             },
             "require": {
@@ -5229,7 +5229,7 @@
             "require-dev": {
                 "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4"
             },
-            "time": "2024-05-20T08:11:32+00:00",
+            "time": "2024-05-22T21:24:41+00:00",
             "bin": 
                 "bin/phpcbf",
                 "bin/phpcs"

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

@@ -534,9 +534,9 @@
             'dev_requirement' => true,
         ),
         'phpstan/phpstan' => array(
-            'pretty_version' => '1.11.1',
-            'version' => '1.11.1.0',
-            'reference' => 'e524358f930e41a2b4cca1320e3b04fc26b39e0b',
+            'pretty_version' => '1.11.4',
+            'version' => '1.11.4.0',
+            'reference' => '9100a76ce8015b9aa7125b9171ae3a76887b6c82',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpstan/phpstan',
             'aliases' => array(),
@@ -849,9 +849,9 @@
             'dev_requirement' => false,
         ),
         'squizlabs/php_codesniffer' => array(
-            'pretty_version' => '3.10.0',
-            'version' => '3.10.0.0',
-            'reference' => '57e09801c2fbae2d257b8b75bebb3deeb7e9deb2',
+            'pretty_version' => '3.10.1',
+            'version' => '3.10.1.0',
+            'reference' => '8f90f7a53ce271935282967f53d0894f8f1ff877',
             'type' => 'library',
             'install_path' => __DIR__ . '/../squizlabs/php_codesniffer',
             'aliases' => array(),

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@f7c4d4ac4de3.(none)> 1716362444 +0000	clone: from /home/default/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
-39a754269fe6e5d94b0fe87215e89232876bda01 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@f7c4d4ac4de3.(none)> 1716362445 +0000	checkout: moving from master to master
-39a754269fe6e5d94b0fe87215e89232876bda01 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@f7c4d4ac4de3.(none)> 1716362445 +0000	reset: moving to 39a754269fe6e5d94b0fe87215e89232876bda01
+0000000000000000000000000000000000000000 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@17bd003a7dc0.(none)> 1718189830 +0000	clone: from /home/default/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
+39a754269fe6e5d94b0fe87215e89232876bda01 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@17bd003a7dc0.(none)> 1718189830 +0000	checkout: moving from master to master
+39a754269fe6e5d94b0fe87215e89232876bda01 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@17bd003a7dc0.(none)> 1718189830 +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-5071ce79d8f518d56d4d77de8369f7db5a79f91d.idx Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-5071ce79d8f518d56d4d77de8369f7db5a79f91d.pack Added

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

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

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

roundcubemail-1.5.tar.gz/vendor/phpstan/phpstan/bootstrap.php 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/C5cAFAmZEa54ACgkQUcZzBf/C
-5cDElA/+P2NT++aZCwLQ9zh2OEoCABCX7Ef7/5oJZdxINlQHJlPvVDqICUebw+m1
-HI5H3VcR/9AXsYf7ztR/49lbUS2xNjdLQyGloh3KPH3M7o1z1boElv/BRu8cZ/F3
-83Jj3J0hy5mwedznEBhBqgdOujT7FwKzXaQYi5oYvYTQLTjitOgqt/dHvcqvqwcq
-9CXbZyqbmiy8h36OIRtRTc0G1pcN/oJ1TiPZ1goCuh7wgGUhJ/Hnynvqr139sXCq
-hblfXjU2kh+gGUyqenl036xY3XQTdl1/jWVx34DD+zIUZO6ww9xU8rjiG+GXXFNv
-tgYAOZUadg1douF2Sx16w8luCNPrYiqHYsfb/vBDi+knoYU3CWJzdWZtHpN4Yopd
-jIJb9s8gUiKSL7CqyUe1VD+N+zf6dhdinQN935a0CWMo4931Y5ILkfgiaSLWt8zA
-y/jk6jw0XuN5QBXPH/HVO12MfCr7rfT2XmZOMhBRqFBIJbk5FHldhC96U+qGBSld
-5oIm4B4EMEzOXCsPlqySPd7XOt2WzRaPKvOwB8qVA5iMYOK4bAZnwZ5Fvg+vUFyg
-Rb0TYrRaQ9iwFXYcSCP4CXWMZZ/KYcLSbSHnl4TcngduQ0qDtgHU0aDbkOvY5Ara
-49nZNPp6XqpUSLRTOQltb2+X67zORAiaPe9n+nPr6B0GvNcZUBo=
-=Yo3u
+iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmZhqS4ACgkQUcZzBf/C
+5cD6tw/6AveAZEiYSutdNaqINLirtkRF9LZJIOMmnEmm79jRs59owwTiQrYbNela
+ZJiQuZU3dh0ozPFbGqGpL6GdLvsAl3qjnC0RZmdeJTJxn647bMFqFIVqD+sdVf4q
+OHKFMpwOQNFXpo23g7PCBYKeHL28WjqukoVYi3mnOOA2spzRj4adzmF6Xs/1J/G1
+XnxK+8vuRnqxfPiMVjqlxz/xvYQKBieAbn4dcwzIgr7hRfShkVQsaNdfS+K2AxQV
+AH2iE8FCBTeEVRlLER9ANzl6GR7koFl2UI403MmHjWaZc+Fuc2n6LKRcdtNSBf/K
+QfcSiTROwjZPaJCN+qMXA+2Nlx/2NeD5hpqDaDGMu50XyD4pwA5Ls7a2LDes93sg
+nTn+RtlI9kaq/d/dOKkqcPuFkJVIlgjGxr+QCL+ORJyCJBo1pbTfL8DV48YxKnQG
+oimtM0dXfI853CkuEptRbHFG58wSzqqr5Bh7Vp7qPYNjmxfJcvZsMJrzdkn+AQr+
+Lp3BIv2N+1oTqvtz34RQft+A9KN2CSB7C/oc1JjCaw1uT3NHPq45/Wd97qdJ2Q+v
+iiON+kWjxw9HLVKmE07IdsbWazQ0xqm0PhQzafB1aLQday72Eh8lFf+7b66OmUhP
+d/jvbx9n1yzqYdw5b4HWuq38UYYIXfCXIxVBB9z9nZ64UNcFHRY=
+=MsKM
 -----END PGP SIGNATURE-----

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

@@ -6,6 +6,36 @@
 
 _Nothing yet._
 
+## 3.10.1 - 2024-05-22
+
+### Added
+- Documentation for the following sniffs:
+    - Generic.Commenting.DocComment
+    - Thanks to Rodrigo Primo@rodrigoprimo for the patch.
+
+### Changed
+- The following have received efficiency improvements:
+    - Type handling in the PHP Tokenizer
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch.
+- Various housekeeping, including improvements to the tests and documentation.
+    - Thanks to Juliette Reinders Folmer@jrfnl for their contributions.
+
+### Fixed
+- Fixed bug #110, #437, #475: `File::findStartOfStatement()`: the start of statement/expression determination for tokens in parentheses/short array brackets/others scopes, nested within match expressions, was incorrect in most cases.
+    The trickle down effect of the bug fixes made to the `File::findStartOfStatement()` method, is that the Generic.WhiteSpace.ScopeIndent and the PEAR.WhiteSpace.ScopeIndent sniffs should now be able to correctly determine and fix the indent for match expressions containing nested expressions.
+    These fixes also fix an issue with the `Squiz.Arrays.ArrayDeclaration` sniff and possibly other, unreported bugs.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #504: The tokenizer could inadvertently mistake the last parameter in a function call using named arguments for a DNF type.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #508: Tokenizer/PHP: extra hardening against handling parse errors in the type handling layer.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+#110: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/110
+#437: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/437
+#475: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/475
+#504: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/504
+#508: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/508
+
 ## 3.10.0 - 2024-05-20
 
 ### Added
@@ -6934,6 +6964,7 @@
 -->
 
 Unreleased: https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/master...HEAD
+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
 3.9.2:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.9.1...3.9.2
 3.9.1:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.9.0...3.9.1

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

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

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

@@ -2435,51 +2435,88 @@
 // If the start token is inside the case part of a match expression,
 // find the start of the condition. If it's in the statement part, find
 // the token that comes after the match arrow.
- $matchExpression = $this->getCondition($start, T_MATCH);
- if ($matchExpression !== false) {
- for ($prevMatch = $start; $prevMatch > $this->tokens$matchExpression'scope_opener'; $prevMatch--) {
- if ($prevMatch !== $start
- && ($this->tokens$prevMatch'code' === T_MATCH_ARROW
- || $this->tokens$prevMatch'code' === T_COMMA)
- ) {
- break;
- }
-
- // Skip nested statements.
- if (isset($this->tokens$prevMatch'bracket_opener') === true
- && $prevMatch === $this->tokens$prevMatch'bracket_closer'
- ) {
- $prevMatch = $this->tokens$prevMatch'bracket_opener';
- } else if (isset($this->tokens$prevMatch'parenthesis_opener') === true
- && $prevMatch === $this->tokens$prevMatch'parenthesis_closer'
- ) {
- $prevMatch = $this->tokens$prevMatch'parenthesis_opener';
- }
- }
-
- if ($prevMatch <= $this->tokens$matchExpression'scope_opener') {
- // We're before the arrow in the first case.
- $next = $this->findNext(Tokens::$emptyTokens, ($this->tokens$matchExpression'scope_opener' + 1), null, true);
- if ($next === false) {
- return $start;
- }
-
- return $next;
- }
-
- if ($this->tokens$prevMatch'code' === T_COMMA) {
- // We're before the arrow, but not in the first case.
- $prevMatchArrow = $this->findPrevious(T_MATCH_ARROW, ($prevMatch - 1), $this->tokens$matchExpression'scope_opener');
- if ($prevMatchArrow === false) {
- // We're before the arrow in the first case.
- $next = $this->findNext(Tokens::$emptyTokens, ($this->tokens$matchExpression'scope_opener' + 1), null, true);
- return $next;
- }
+ if (empty($this->tokens$start'conditions') === false) {
+ $conditions = $this->tokens$start'conditions';
+ $lastConditionOwner = end($conditions);
+ $matchExpression = key($conditions);
+
+ if ($lastConditionOwner === T_MATCH
+ // Check if the $start token is at the same parentheses nesting level as the match token.
+ && ((empty($this->tokens$matchExpression'nested_parenthesis') === true
+ && empty($this->tokens$start'nested_parenthesis') === true)
+ || ((empty($this->tokens$matchExpression'nested_parenthesis') === false
+ && empty($this->tokens$start'nested_parenthesis') === false)
+ && $this->tokens$matchExpression'nested_parenthesis' === $this->tokens$start'nested_parenthesis'))
+ ) {
+ // Walk back to the previous match arrow (if it exists).
+ $lastComma = null;
+ $inNestedExpression = false;
+ for ($prevMatch = $start; $prevMatch > $this->tokens$matchExpression'scope_opener'; $prevMatch--) {
+ if ($prevMatch !== $start && $this->tokens$prevMatch'code' === T_MATCH_ARROW) {
+ break;
+ }
+
+ if ($prevMatch !== $start && $this->tokens$prevMatch'code' === T_COMMA) {
+ $lastComma = $prevMatch;
+ continue;
+ }
+
+ // Skip nested statements.
+ if (isset($this->tokens$prevMatch'bracket_opener') === true
+ && $prevMatch === $this->tokens$prevMatch'bracket_closer'
+ ) {
+ $prevMatch = $this->tokens$prevMatch'bracket_opener';
+ continue;
+ }
+
+ if (isset($this->tokens$prevMatch'parenthesis_opener') === true
+ && $prevMatch === $this->tokens$prevMatch'parenthesis_closer'
+ ) {
+ $prevMatch = $this->tokens$prevMatch'parenthesis_opener';
+ continue;
+ }
+
+ // Stop if we're _within_ a nested short array statement, which may contain comma's too.
+ // No need to deal with parentheses, those are handled above via the `nested_parenthesis` checks.
+ if (isset($this->tokens$prevMatch'bracket_opener') === true
+ && $this->tokens$prevMatch'bracket_closer' > $start
+ ) {
+ $inNestedExpression = true;
+ break;
+ }
+ }//end for
+
+ if ($inNestedExpression === false) {
+ // $prevMatch will now either be the scope opener or a match arrow.
+ // If it is the scope opener, go the first non-empty token after. $start will have been part of the first condition.
+ if ($prevMatch <= $this->tokens$matchExpression'scope_opener') {
+ // We're before the arrow in the first case.
+ $next = $this->findNext(Tokens::$emptyTokens, ($this->tokens$matchExpression'scope_opener' + 1), null, true);
+ if ($next === false) {
+ // Shouldn't be possible.
+ return $start;
+ }
+
+ return $next;
+ }
+
+ // Okay, so we found a match arrow.
+ // If $start was part of the "next" condition, the last comma will be set.
+ // Otherwise, $start must have been part of a return expression.
+ if (isset($lastComma) === true && $lastComma > $prevMatch) {
+ $prevMatch = $lastComma;
+ }
+
+ // In both cases, go to the first non-empty token after.
+ $next = $this->findNext(Tokens::$emptyTokens, ($prevMatch + 1), null, true);
+ if ($next === false) {
+ // Shouldn't be possible.
+ return $start;
+ }
 
- $end = $this->findEndOfStatement($prevMatchArrow);
- $next = $this->findNext(Tokens::$emptyTokens, ($end + 1), null, true);
- return $next;
- }
+ return $next;
+ }//end if
+ }//end if
 }//end if
 
 $lastNotEmpty = $start;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Docs/Commenting/DocCommentStandard.xml Added

@@ -0,0 +1,269 @@
+<documentation title="Doc Comment">
+ <standard>
+ <!CDATA
+ Enforces rules related to the formatting of DocBlocks ("Doc Comments") in PHP code.
+
+ DocBlocks are a special type of comment that can provide information about a structural element. In the context of DocBlocks, the following are considered structural elements:
+ class, interface, trait, enum, function, property, constant, variable declarations and require/include_once statements.
+
+ DocBlocks start with a `/**` marker and end on `*/`. This sniff will check the formatting of all DocBlocks, independently of whether or not they are attached to a structural element.
+ >
+ </standard>
+ <standard>
+ <!CDATA
+ A DocBlock must not be empty.
+ >
+ </standard>
+ <code_comparison>
+ <code title="Valid: DocBlock with some content.">
+ <!CDATA
+/**
+ * Some content.
+ */
+ >
+ </code>
+ <code title="Invalid: Empty DocBlock.">
+ <!CDATA
+/**
+ * 
+ */
+ >
+ </code>
+ </code_comparison>
+ <standard>
+ <!CDATA
+ The opening and closing DocBlock tags must be the only content on the line.
+ >
+ </standard>
+ <code_comparison>
+ <code title="Valid: The opening and closing DocBlock tags have to be on a line by themselves.">
+ <!CDATA
+/**
+ * Short description.
+ */
+ >
+ </code>
+ <code title="Invalid: The opening and closing DocBlock tags are not on a line by themselves.">
+ <!CDATA
+/** Short description. */
+ >
+ </code>
+ </code_comparison>
+ <standard>
+ <!CDATA
+ The DocBlock must have a short description, and it must be on the first line.
+ >
+ </standard>
+ <code_comparison>
+ <code title="Valid: DocBlock with a short description on the first line.">
+ <!CDATA
+/**
+ * Short description.
+ */
+ >
+ </code>
+ <code title="Invalid: DocBlock without a short description or short description not on the first line.">
+ <!CDATA
+/**
+ * @return int
+ */
+
+/**
+ *
+ * Short description.
+ */
+ >
+ </code>
+ </code_comparison>
+ <standard>
+ <!CDATA
+ Both the short description, as well as the long description, must start with a capital letter.
+ >
+ </standard>
+ <code_comparison>
+ <code title="Valid: Both the short and long description start with a capital letter.">
+ <!CDATA
+/**
+ * Short description.
+ *
+ * Long description.
+ */
+ >
+ </code>
+ <code title="Invalid: Neither short nor long description starts with a capital letter.">
+ <!CDATA
+/**
+ * short description.
+ *
+ * long description.
+ */
+ >
+ </code>
+ </code_comparison>
+ <standard>
+ <!CDATA
+ There must be exactly one blank line separating the short description, the long description and tag groups.
+ >
+ </standard>
+ <code_comparison>
+ <code title="Valid: One blank line separating the short description, the long description and tag groups.">
+ <!CDATA
+/**
+ * Short description.
+ *
+ * Long description.
+ *
+ * @param int $foo
+ */
+ >
+ </code>
+ <code title="Invalid: More than one or no blank line separating the short description, the long description and tag groups.">
+ <!CDATA
+/**
+ * Short description.
+ *
+ *
+
+ * Long description.
+ * @param int $foo
+ */
+ >
+ </code>
+ </code_comparison>
+ <standard>
+ <!CDATA
+ Parameter tags must be grouped together.
+ >
+ </standard>
+ <code_comparison>
+ <code title="Valid: Parameter tags grouped together.">
+ <!CDATA
+/**
+ * Short description.
+ *
+ * @param int $foo
+ * @param string $bar
+ */
+ >
+ </code>
+ <code title="Invalid: Parameter tags not grouped together.">
+ <!CDATA
+/**
+ * Short description.
+ *
+ * @param int $foo
+ *
+ * @param string $bar
+ */
+ >
+ </code>
+ </code_comparison>
+ <standard>
+ <!CDATA
+ Parameter tags must not be grouped together with other tags.
+ >
+ </standard>
+ <code_comparison>
+ <code title="Valid: Parameter tags are not grouped together with other tags.">
+ <!CDATA
+/**
+ * Short description.
+ *
+ * @param int $foo
+ *
+ * @since 3.4.8
+ * @deprecated 6.0.0
+ */
+ >
+ </code>
+ <code title="Invalid: Parameter tags grouped together with other tags.">
+ <!CDATA
+/**
+ * Short description.
+ *
+ * @param int $foo
+ * @since 3.4.8
+ * @deprecated 6.0.0
+ */
+ >
+ </code>
+ </code_comparison>
+ <standard>
+ <!CDATA
+ Tag values for different tags in the same group must be aligned with each other.
+ >
+ </standard>
+ <code_comparison>
+ <code title="Valid: Tag values for different tags in the same tag group are aligned with each other.">
+ <!CDATA
+/**
+ * Short description.
+ *
+ * @since 0.5.0
+ * @deprecated 1.0.0
+ */
+ >
+ </code>
+ <code title="Invalid: Tag values for different tags in the same tag group are not aligned with each other.">
+ <!CDATA
+/**
+ * Short description.
+ *
+ * @since 0.5.0
+ * @deprecated 1.0.0
+ */
+ >
+ </code>
+ </code_comparison>
+ <standard>
+ <!CDATA
+ Parameter tags must be defined before other tags in a DocBlock.
+ >
+ </standard>
+ <code_comparison>
+ <code title="Valid: Parameter tags are defined first.">
+ <!CDATA
+/**
+ * Short description.
+ *
+ * @param string $foo
+ *
+ * @return void
+ */
+ >
+ </code>
+ <code title="Invalid: Parameter tags are not defined first.">
+ <!CDATA
+/**
+ * Short description.
+ *
+ * @return void
+ *
+ * @param string $bar
+ */
+ >
+ </code>
+ </code_comparison>
+ <standard>
+ <!CDATA
+ There must be no additional blank (comment) lines before the closing DocBlock tag.
+ >
+ </standard>
+ <code_comparison>
+ <code title="Valid: No additional blank lines before the closing DocBlock tag.">
+ <!CDATA
+/**
+ * Short description.
+ */
+ >
+ </code>
+ <code title="Invalid: Additional blank lines before the closing DocBlock tag.">
+ <!CDATA
+/**
+ * Short description.
+ *
+ */
+ >
+ </code>
+ </code_comparison>
+</documentation>

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

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

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

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

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

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

@@ -2602,7 +2602,9 @@
 
 $this->createAttributesNestingMap();
 
- $numTokens = count($this->tokens);
+ $numTokens = count($this->tokens);
+ $lastSeenTypeToken = $numTokens;
+
 for ($i = ($numTokens - 1); $i >= 0; $i--) {
 // Check for any unset scope conditions due to alternate IF/ENDIF syntax.
 if (isset($this->tokens$i'scope_opener') === true
@@ -3036,9 +3038,14 @@
 continue;
 } else if ($this->tokens$i'code' === T_BITWISE_OR
 || $this->tokens$i'code' === T_BITWISE_AND
- || $this->tokens$i'code' === T_OPEN_PARENTHESIS
 || $this->tokens$i'code' === T_CLOSE_PARENTHESIS
 ) {
+ if ($lastSeenTypeToken < $i) {
+ // We've already examined this code to check if it is a type declaration and concluded it wasn't.
+ // No need to do it again.
+ continue;
+ }
+
 /*
 Convert "|" to T_TYPE_UNION or leave as T_BITWISE_OR.
 Convert "&" to T_TYPE_INTERSECTION or leave as T_BITWISE_AND.
@@ -3133,9 +3140,14 @@
 
 $typeTokenCountBefore = 0;
 $typeOperators = $i;
+ $parenthesesCount = 0;
 $confirmed = false;
 $maybeNullable = null;
 
+ if ($this->tokens$i'code' === T_OPEN_PARENTHESIS || $this->tokens$i'code' === T_CLOSE_PARENTHESIS) {
+ ++$parenthesesCount;
+ }
+
 for ($x = ($i - 1); $x >= 0; $x--) {
 if (isset(Tokens::$emptyTokens$this->tokens$x'code') === true) {
 continue;
@@ -3167,7 +3179,7 @@
 $confirmed = true;
 break;
 } else {
- // This may still be an arrow function which hasn't be handled yet.
+ // This may still be an arrow function which hasn't been handled yet.
 for ($y = ($x - 1); $y > 0; $y--) {
 if (isset(Tokens::$emptyTokens$this->tokens$y'code') === false
 && $this->tokens$y'code' !== T_BITWISE_AND
@@ -3202,17 +3214,29 @@
 continue;
 }
 
- if ($this->tokens$x'code' === T_BITWISE_OR
- || $this->tokens$x'code' === T_BITWISE_AND
- || $this->tokens$x'code' === T_OPEN_PARENTHESIS
- || $this->tokens$x'code' === T_CLOSE_PARENTHESIS
- ) {
+ if ($this->tokens$x'code' === T_BITWISE_OR || $this->tokens$x'code' === T_BITWISE_AND) {
+ $typeOperators = $x;
+ continue;
+ }
+
+ if ($this->tokens$x'code' === T_OPEN_PARENTHESIS || $this->tokens$x'code' === T_CLOSE_PARENTHESIS) {
+ ++$parenthesesCount;
 $typeOperators = $x;
 continue;
 }
 
 if ($suspectedType === 'return' && $this->tokens$x'code' === T_COLON) {
- $confirmed = true;
+ // Make sure this is not the colon from a parameter name.
+ for ($y = ($x - 1); $y > 0; $y--) {
+ if (isset(Tokens::$emptyTokens$this->tokens$y'code') === false) {
+ break;
+ }
+ }
+
+ if ($this->tokens$y'code' !== T_PARAM_NAME) {
+ $confirmed = true;
+ }
+
 break;
 }
 
@@ -3234,6 +3258,9 @@
 break;
 }//end for
 
+ // Remember the last token we examined as part of the (non-)"type declaration".
+ $lastSeenTypeToken = $x;
+
 if ($confirmed === false
 && $suspectedType === 'property or parameter'
 && isset($this->tokens$i'nested_parenthesis') === true
@@ -3278,8 +3305,8 @@
 unset($parens, $last);
 }//end if
 
- if ($confirmed === false) {
- // Not a union or intersection type after all, move on.
+ if ($confirmed === false || ($parenthesesCount % 2) !== 0) {
+ // Not a (valid) union, intersection or DNF type after all, move on.
 continue;
 }

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

@@ -10,6 +10,7 @@
 namespace PHP_CodeSniffer\Tests\Core\File;
 
 use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+use PHP_CodeSniffer\Util\Tokens;
 
 /**
 * Tests for the \PHP_CodeSniffer\Files\File::findEndOfStatement method.
@@ -21,6 +22,42 @@
 
 
 /**
+ * Test that end of statement is NEVER before the "current" token.
+ *
+ * @return void
+ */
+ public function testEndIsNeverLessThanCurrentToken()
+ {
+ $tokens = self::$phpcsFile->getTokens();
+ $errors = ;
+
+ for ($i = 0; $i < self::$phpcsFile->numTokens; $i++) {
+ if (isset(Tokens::$emptyTokens$tokens$i'code') === true) {
+ continue;
+ }
+
+ $end = self::$phpcsFile->findEndOfStatement($i);
+
+ // Collect all the errors.
+ if ($end < $i) {
+ $errors = sprintf(
+ 'End of statement for token %1$d (%2$s: %3$s) on line %4$d is %5$d (%6$s), which is less than %1$d',
+ $i,
+ $tokens$i'type',
+ $tokens$i'content',
+ $tokens$i'line',
+ $end,
+ $tokens$end'type'
+ );
+ }
+ }
+
+ $this->assertSame(, $errors);
+
+ }//end testEndIsNeverLessThanCurrentToken()
+
+
+ /**
 * Test a simple assignment.
 *
 * @return void

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/FindStartOfStatementTest.inc Changed

@@ -14,7 +14,7 @@
 $a = 1;
 
 /* testClosureAssignment */
-$a = function($b=false;){};
+$a = function($b=false){};
 
 /* testHeredocFunctionArg */
 myFunction(<<<END
@@ -39,8 +39,8 @@
 
 $a = 
 /* testArrowFunctionArrayValue */
- 'a' => fn() => return 1,
- 'b' => fn() => return 1,
+ 'a' => fn() => 1,
+ 'b' => fn() => 1,
 ;
 
 /* testStaticArrowFunction */
@@ -139,11 +139,11 @@
 /* testInsideCaseStatement */
 $var = doSomething();
 /* testInsideCaseBreakStatement */
- break 2;
+ break 1;
 
 case 2:
 /* testInsideCaseContinueStatement */
- continue 2;
+ continue 1;
 
 case 3:
 /* testInsideCaseReturnStatement */
@@ -162,3 +162,39 @@
 /* testInsideDefaultContinueStatement */
 continue $var;
 }
+
+match ($var) {
+ true =>
+ /* test437ClosureDeclaration */
+ function ($var) {
+ /* test437EchoNestedWithinClosureWithinMatch */
+ echo $var, 'text', PHP_EOL;
+ },
+ default => false
+};
+
+match ($var) {
+ /* test437NestedLongArrayWithinMatch */
+ 'a' => array( 1, 2.5, $var),
+ /* test437NestedFunctionCallWithinMatch */
+ 'b' => functionCall( 11, $var, 50.50),
+ /* test437NestedArrowFunctionWithinMatch */
+ 'c' => fn($p1, /* test437FnSecondParamWithinMatch */ $p2) => $p1 + $p2,
+ default => false
+};
+
+callMe($paramA, match ($var) {
+ /* test437NestedLongArrayWithinNestedMatch */
+ 'a' => array( 1, 2.5, $var),
+ /* test437NestedFunctionCallWithinNestedMatch */
+ 'b' => functionCall( 11, $var, 50.50),
+ /* test437NestedArrowFunctionWithinNestedMatch */
+ 'c' => fn($p1, /* test437FnSecondParamWithinNestedMatch */ $p2) => $p1 + $p2,
+ default => false
+});
+
+match ($var) {
+ /* test437NestedShortArrayWithinMatch */
+ 'a' => 1, 2.5, $var,
+ default => false
+};

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

@@ -12,6 +12,7 @@
 namespace PHP_CodeSniffer\Tests\Core\File;
 
 use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+use PHP_CodeSniffer\Util\Tokens;
 
 /**
 * Tests for the \PHP_CodeSniffer\Files\File:findStartOfStatement method.
@@ -23,6 +24,42 @@
 
 
 /**
+ * Test that start of statement is NEVER beyond the "current" token.
+ *
+ * @return void
+ */
+ public function testStartIsNeverMoreThanCurrentToken()
+ {
+ $tokens = self::$phpcsFile->getTokens();
+ $errors = ;
+
+ for ($i = 0; $i < self::$phpcsFile->numTokens; $i++) {
+ if (isset(Tokens::$emptyTokens$tokens$i'code') === true) {
+ continue;
+ }
+
+ $start = self::$phpcsFile->findStartOfStatement($i);
+
+ // Collect all the errors.
+ if ($start > $i) {
+ $errors = sprintf(
+ 'Start of statement for token %1$d (%2$s: %3$s) on line %4$d is %5$d (%6$s), which is more than %1$d',
+ $i,
+ $tokens$i'type',
+ $tokens$i'content',
+ $tokens$i'line',
+ $start,
+ $tokens$start'type'
+ );
+ }
+ }
+
+ $this->assertSame(, $errors);
+
+ }//end testStartIsNeverMoreThanCurrentToken()
+
+
+ /**
 * Test a simple assignment.
 *
 * @return void
@@ -92,7 +129,7 @@
 $start = $this->getTargetToken('/* testClosureAssignment */', T_CLOSE_CURLY_BRACKET);
 $found = self::$phpcsFile->findStartOfStatement($start);
 
- $this->assertSame(($start - 12), $found);
+ $this->assertSame(($start - 11), $found);
 
 }//end testClosureAssignment()
 
@@ -224,7 +261,7 @@
 $start = $this->getTargetToken('/* testArrowFunctionArrayValue */', T_COMMA);
 $found = self::$phpcsFile->findStartOfStatement($start);
 
- $this->assertSame(($start - 9), $found);
+ $this->assertSame(($start - 7), $found);
 
 }//end testArrowFunctionArrayValue()
 
@@ -637,4 +674,300 @@
 }//end dataFindStartInsideSwitchCaseDefaultStatements()
 
 
+ /**
+ * Test finding the start of a statement inside a closed scope nested within a match expressions.
+ *
+ * @param string $testMarker The comment which prefaces the target token in the test file.
+ * @param int|string $target The token to search for after the test marker.
+ * @param int|string $expectedTarget Token code of the expected start of statement stack pointer.
+ *
+ * @link https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/437
+ *
+ * @dataProvider dataFindStartInsideClosedScopeNestedWithinMatch
+ *
+ * @return void
+ */
+ public function testFindStartInsideClosedScopeNestedWithinMatch($testMarker, $target, $expectedTarget)
+ {
+ $testToken = $this->getTargetToken($testMarker, $target);
+ $expected = $this->getTargetToken($testMarker, $expectedTarget);
+
+ $found = self::$phpcsFile->findStartOfStatement($testToken);
+
+ $this->assertSame($expected, $found);
+
+ }//end testFindStartInsideClosedScopeNestedWithinMatch()
+
+
+ /**
+ * Data provider.
+ *
+ * @return array<string, array<string, int|string>>
+ */
+ public static function dataFindStartInsideClosedScopeNestedWithinMatch()
+ {
+ return 
+ // These were already working correctly.
+ 'Closure function keyword should be start of closure - closure keyword' => 
+ 'testMarker' => '/* test437ClosureDeclaration */',
+ 'targets' => T_CLOSURE,
+ 'expectedTarget' => T_CLOSURE,
+ ,
+ 'Open curly is a statement/expression opener - open curly' => 
+ 'testMarker' => '/* test437ClosureDeclaration */',
+ 'targets' => T_OPEN_CURLY_BRACKET,
+ 'expectedTarget' => T_OPEN_CURLY_BRACKET,
+ ,
+
+ 'Echo should be start for expression - echo keyword' => 
+ 'testMarker' => '/* test437EchoNestedWithinClosureWithinMatch */',
+ 'targets' => T_ECHO,
+ 'expectedTarget' => T_ECHO,
+ ,
+ 'Echo should be start for expression - variable' => 
+ 'testMarker' => '/* test437EchoNestedWithinClosureWithinMatch */',
+ 'targets' => T_VARIABLE,
+ 'expectedTarget' => T_ECHO,
+ ,
+ 'Echo should be start for expression - comma' => 
+ 'testMarker' => '/* test437EchoNestedWithinClosureWithinMatch */',
+ 'targets' => T_COMMA,
+ 'expectedTarget' => T_ECHO,
+ ,
+
+ // These were not working correctly and would previously return the close curly of the match expression.
+ 'First token after comma in echo expression should be start for expression - text string' => 
+ 'testMarker' => '/* test437EchoNestedWithinClosureWithinMatch */',
+ 'targets' => T_CONSTANT_ENCAPSED_STRING,
+ 'expectedTarget' => T_CONSTANT_ENCAPSED_STRING,
+ ,
+ 'First token after comma in echo expression - PHP_EOL constant' => 
+ 'testMarker' => '/* test437EchoNestedWithinClosureWithinMatch */',
+ 'targets' => T_STRING,
+ 'expectedTarget' => T_STRING,
+ ,
+ 'First token after comma in echo expression - semicolon' => 
+ 'testMarker' => '/* test437EchoNestedWithinClosureWithinMatch */',
+ 'targets' => T_SEMICOLON,
+ 'expectedTarget' => T_STRING,
+ ,
+ ;
+
+ }//end dataFindStartInsideClosedScopeNestedWithinMatch()
+
+
+ /**
+ * Test finding the start of a statement for a token within a set of parentheses within a match expressions.
+ *
+ * @param string $testMarker The comment which prefaces the target token in the test file.
+ * @param int|string $target The token to search for after the test marker.
+ * @param int|string $expectedTarget Token code of the expected start of statement stack pointer.
+ *
+ * @link https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/437
+ *
+ * @dataProvider dataFindStartInsideParenthesesNestedWithinMatch
+ *
+ * @return void
+ */
+ public function testFindStartInsideParenthesesNestedWithinMatch($testMarker, $target, $expectedTarget)
+ {
+ $testToken = $this->getTargetToken($testMarker, $target);
+ $expected = $this->getTargetToken($testMarker, $expectedTarget);
+
+ $found = self::$phpcsFile->findStartOfStatement($testToken);
+
+ $this->assertSame($expected, $found);
+
+ }//end testFindStartInsideParenthesesNestedWithinMatch()
+
+
+ /**
+ * Data provider.
+ *
+ * @return array<string, array<string, int|string>>
+ */
+ public static function dataFindStartInsideParenthesesNestedWithinMatch()
+ {
+ return 
+ 'Array item itself should be start for first array item' => 
+ 'testMarker' => '/* test437NestedLongArrayWithinMatch */',
+ 'targets' => T_LNUMBER,
+ 'expectedTarget' => T_LNUMBER,
+ ,
+ 'Array item itself should be start for second array item' => 
+ 'testMarker' => '/* test437NestedLongArrayWithinMatch */',
+ 'targets' => T_DNUMBER,
+ 'expectedTarget' => T_DNUMBER,
+ ,
+ 'Array item itself should be start for third array item' => 
+ 'testMarker' => '/* test437NestedLongArrayWithinMatch */',
+ 'targets' => T_VARIABLE,
+ 'expectedTarget' => T_VARIABLE,
+ ,
+
+ 'Parameter itself should be start for first param passed to function call' => 
+ 'testMarker' => '/* test437NestedFunctionCallWithinMatch */',
+ 'targets' => T_LNUMBER,
+ 'expectedTarget' => T_LNUMBER,
+ ,
+ 'Parameter itself should be start for second param passed to function call' => 
+ 'testMarker' => '/* test437NestedFunctionCallWithinMatch */',
+ 'targets' => T_VARIABLE,
+ 'expectedTarget' => T_VARIABLE,
+ ,
+ 'Parameter itself should be start for third param passed to function call' => 
+ 'testMarker' => '/* test437NestedFunctionCallWithinMatch */',
+ 'targets' => T_DNUMBER,
+ 'expectedTarget' => T_DNUMBER,
+ ,
+
+ 'Parameter itself should be start for first param declared in arrow function' => 
+ 'testMarker' => '/* test437NestedArrowFunctionWithinMatch */',
+ 'targets' => T_VARIABLE,
+ 'expectedTarget' => T_VARIABLE,
+ ,
+ 'Parameter itself should be start for second param declared in arrow function' => 
+ 'testMarker' => '/* test437FnSecondParamWithinMatch */',
+ 'targets' => T_VARIABLE,
+ 'expectedTarget' => T_VARIABLE,
+ ,
+ ;
+
+ }//end dataFindStartInsideParenthesesNestedWithinMatch()
+
+
+ /**
+ * Test finding the start of a statement for a token within a set of parentheses within a match expressions,
+ * which itself is nested within parentheses.
+ *
+ * @param string $testMarker The comment which prefaces the target token in the test file.
+ * @param int|string $target The token to search for after the test marker.
+ * @param int|string $expectedTarget Token code of the expected start of statement stack pointer.
+ *
+ * @link https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/437
+ *
+ * @dataProvider dataFindStartInsideParenthesesNestedWithinNestedMatch
+ *
+ * @return void
+ */
+ public function testFindStartInsideParenthesesNestedWithinNestedMatch($testMarker, $target, $expectedTarget)
+ {
+ $testToken = $this->getTargetToken($testMarker, $target);
+ $expected = $this->getTargetToken($testMarker, $expectedTarget);
+
+ $found = self::$phpcsFile->findStartOfStatement($testToken);
+
+ $this->assertSame($expected, $found);
+
+ }//end testFindStartInsideParenthesesNestedWithinNestedMatch()
+
+
+ /**
+ * Data provider.
+ *
+ * @return array<string, array<string, int|string>>
+ */
+ public static function dataFindStartInsideParenthesesNestedWithinNestedMatch()
+ {
+ return 
+ 'Array item itself should be start for first array item' => 
+ 'testMarker' => '/* test437NestedLongArrayWithinNestedMatch */',
+ 'targets' => T_LNUMBER,
+ 'expectedTarget' => T_LNUMBER,
+ ,
+ 'Array item itself should be start for second array item' => 
+ 'testMarker' => '/* test437NestedLongArrayWithinNestedMatch */',
+ 'targets' => T_DNUMBER,
+ 'expectedTarget' => T_DNUMBER,
+ ,
+ 'Array item itself should be start for third array item' => 
+ 'testMarker' => '/* test437NestedLongArrayWithinNestedMatch */',
+ 'targets' => T_VARIABLE,
+ 'expectedTarget' => T_VARIABLE,
+ ,
+
+ 'Parameter itself should be start for first param passed to function call' => 
+ 'testMarker' => '/* test437NestedFunctionCallWithinNestedMatch */',
+ 'targets' => T_LNUMBER,
+ 'expectedTarget' => T_LNUMBER,
+ ,
+ 'Parameter itself should be start for second param passed to function call' => 
+ 'testMarker' => '/* test437NestedFunctionCallWithinNestedMatch */',
+ 'targets' => T_VARIABLE,
+ 'expectedTarget' => T_VARIABLE,
+ ,
+ 'Parameter itself should be start for third param passed to function call' => 
+ 'testMarker' => '/* test437NestedFunctionCallWithinNestedMatch */',
+ 'targets' => T_DNUMBER,
+ 'expectedTarget' => T_DNUMBER,
+ ,
+
+ 'Parameter itself should be start for first param declared in arrow function' => 
+ 'testMarker' => '/* test437NestedArrowFunctionWithinNestedMatch */',
+ 'targets' => T_VARIABLE,
+ 'expectedTarget' => T_VARIABLE,
+ ,
+ 'Parameter itself should be start for second param declared in arrow function' => 
+ 'testMarker' => '/* test437FnSecondParamWithinNestedMatch */',
+ 'targets' => T_VARIABLE,
+ 'expectedTarget' => T_VARIABLE,
+ ,
+ ;
+
+ }//end dataFindStartInsideParenthesesNestedWithinNestedMatch()
+
+
+ /**
+ * Test finding the start of a statement for a token within a short array within a match expressions.
+ *
+ * @param string $testMarker The comment which prefaces the target token in the test file.
+ * @param int|string $target The token to search for after the test marker.
+ * @param int|string $expectedTarget Token code of the expected start of statement stack pointer.
+ *
+ * @link https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/437
+ *
+ * @dataProvider dataFindStartInsideShortArrayNestedWithinMatch
+ *
+ * @return void
+ */
+ public function testFindStartInsideShortArrayNestedWithinMatch($testMarker, $target, $expectedTarget)
+ {
+ $testToken = $this->getTargetToken($testMarker, $target);
+ $expected = $this->getTargetToken($testMarker, $expectedTarget);
+
+ $found = self::$phpcsFile->findStartOfStatement($testToken);
+
+ $this->assertSame($expected, $found);
+
+ }//end testFindStartInsideShortArrayNestedWithinMatch()
+
+
+ /**
+ * Data provider.
+ *
+ * @return array<string, array<string, int|string>>
+ */
+ public static function dataFindStartInsideShortArrayNestedWithinMatch()
+ {
+ return 
+ 'Array item itself should be start for first array item' => 
+ 'testMarker' => '/* test437NestedShortArrayWithinMatch */',
+ 'targets' => T_LNUMBER,
+ 'expectedTarget' => T_LNUMBER,
+ ,
+ 'Array item itself should be start for second array item' => 
+ 'testMarker' => '/* test437NestedShortArrayWithinMatch */',
+ 'targets' => T_DNUMBER,
+ 'expectedTarget' => T_DNUMBER,
+ ,
+ 'Array item itself should be start for third array item' => 
+ 'testMarker' => '/* test437NestedShortArrayWithinMatch */',
+ 'targets' => T_VARIABLE,
+ 'expectedTarget' => T_VARIABLE,
+ ,
+ ;
+
+ }//end dataFindStartInsideShortArrayNestedWithinMatch()
+
+
 }//end class

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

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

@@ -0,0 +1,69 @@
+<?php
+/**
+ * Tests that parentheses tokens are not converted to type parentheses tokens in broken DNF types.
+ *
+ * @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;
+
+final class DNFTypesParseError1Test extends AbstractTokenizerTestCase
+{
+
+
+ /**
+ * Document handling for a DNF type / parse error where the last significant type specific token is an open parenthesis.
+ *
+ * @param string $testMarker The comment prefacing the target token.
+ *
+ * @dataProvider dataBrokenDNFTypeCantEndOnOpenParenthesis
+ * @covers PHP_CodeSniffer\Tokenizers\PHP::processAdditional
+ *
+ * @return void
+ */
+ public function testBrokenDNFTypeCantEndOnOpenParenthesis($testMarker)
+ {
+ $tokens = $this->phpcsFile->getTokens();
+
+ $openPtr = $this->getTargetToken($testMarker, T_OPEN_PARENTHESIS, T_TYPE_OPEN_PARENTHESIS, '(');
+ $token = $tokens$openPtr;
+
+ // Verify that the open parenthesis is tokenized as a normal parenthesis.
+ $this->assertSame(T_OPEN_PARENTHESIS, $token'code', 'Token tokenized as '.$token'type'.', not T_OPEN_PARENTHESIS (code)');
+ $this->assertSame('T_OPEN_PARENTHESIS', $token'type', 'Token tokenized as '.$token'type'.', not T_OPEN_PARENTHESIS (type)');
+
+ // Verify that the type union is still tokenized as T_BITWISE_OR as the type declaration
+ // is not recognized as a valid type declaration.
+ $unionPtr = $this->getTargetToken($testMarker, T_BITWISE_OR, T_TYPE_UNION, '|');
+ $token = $tokens$unionPtr;
+
+ $this->assertSame(T_BITWISE_OR, $token'code', 'Token tokenized as '.$token'type'.', not T_BITWISE_OR (code)');
+ $this->assertSame('T_BITWISE_OR', $token'type', 'Token tokenized as '.$token'type'.', not T_BITWISE_OR (type)');
+
+ }//end testBrokenDNFTypeCantEndOnOpenParenthesis()
+
+
+ /**
+ * Data provider.
+ *
+ * @see testBrokenDNFTypeCantEndOnOpenParenthesis()
+ *
+ * @return array<string, array<string, string>>
+ */
+ public static function dataBrokenDNFTypeCantEndOnOpenParenthesis()
+ {
+ return 
+ 'OO const type' => '/* testBrokenConstDNFTypeEndOnOpenParenthesis */',
+ 'OO property type' => '/* testBrokenPropertyDNFTypeEndOnOpenParenthesis */',
+ 'Parameter type' => '/* testBrokenParamDNFTypeEndOnOpenParenthesis */',
+ 'Return type' => '/* testBrokenReturnDNFTypeEndOnOpenParenthesis */',
+ ;
+
+ }//end dataBrokenDNFTypeCantEndOnOpenParenthesis()
+
+
+}//end class

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

@@ -0,0 +1,48 @@
+<?php
+
+// Parentheses in broken DNF type declarations will remain tokenized as normal parentheses.
+// This test is in a separate file as the 'nested_parenthesis' indexes will be off after this code.
+//
+// Also note that the order of these tests is deliberate to try and trick the parentheses handling
+// in the Tokenizer class into matching parentheses pairs, even though the parentheses do
+// no belong together.
+
+class UnmatchedParentheses {
+ /* testBrokenConstDNFTypeParensMissingClose */
+ const A|(B&C PARSE_ERROR_1 = null;
+
+ /* testBrokenConstDNFTypeParensMissingOpen */
+ const A|B&C) PARSE_ERROR_2 = null;
+
+ /* testBrokenPropertyDNFTypeParensMissingClose */
+ private A|(B&C $parseError1;
+
+ /* testBrokenPropertyDNFTypeParensMissingOpen */
+ protected A|B&C) $parseError2;
+
+ function unmatchedParens1 (
+ /* testBrokenParamDNFTypeParensMissingClose */
+ A|(B&C $parseError,
+ /* testBrokenReturnDNFTypeParensMissingOpen */
+ ) : A|B&C) {}
+
+ function unmatchedParens2 (
+ /* testBrokenParamDNFTypeParensMissingOpen */
+ A|B&C) $parseError
+ /* testBrokenReturnDNFTypeParensMissingClose */
+ ) : A|(B&C {}
+}
+
+class MatchedAndUnmatchedParentheses {
+ /* testBrokenConstDNFTypeParensMissingOneClose */
+ const (A&B)|(B&C PARSE_ERROR = null;
+
+ /* testBrokenPropertyDNFTypeParensMissingOneOpen */
+ protected (A&B)|B&C) $parseError;
+
+ function unmatchedParens (
+ /* testBrokenParamDNFTypeParensMissingOneClose */
+ (A&B)|(B&C $parseError,
+ /* testBrokenReturnDNFTypeParensMissingOneOpen */
+ ) : (A&B)|B&C) {}
+}

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

@@ -0,0 +1,218 @@
+<?php
+/**
+ * Tests that parentheses tokens are not converted to type parentheses tokens in broken DNF types.
+ *
+ * @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;
+
+final class DNFTypesParseError2Test extends AbstractTokenizerTestCase
+{
+
+
+ /**
+ * Document handling for a DNF type / parse error where the type declaration contains an unmatched parenthesis.
+ *
+ * @param string $testMarker The comment prefacing the target token.
+ *
+ * @dataProvider dataBrokenDNFTypeParensShouldAlwaysBeAPairMissingCloseParens
+ * @covers PHP_CodeSniffer\Tokenizers\PHP::processAdditional
+ *
+ * @return void
+ */
+ public function testBrokenDNFTypeParensShouldAlwaysBeAPairMissingCloseParens($testMarker)
+ {
+ $tokens = $this->phpcsFile->getTokens();
+
+ // Verify that the type union is still tokenized as T_BITWISE_OR as the type declaration
+ // is not recognized as a valid type declaration.
+ $unionPtr = $this->getTargetToken($testMarker, T_BITWISE_OR, T_TYPE_UNION, '|');
+ $token = $tokens$unionPtr;
+
+ $this->assertSame(T_BITWISE_OR, $token'code', 'Token tokenized as '.$token'type'.', not T_BITWISE_OR (code)');
+ $this->assertSame('T_BITWISE_OR', $token'type', 'Token tokenized as '.$token'type'.', not T_BITWISE_OR (type)');
+
+ // Verify that the unmatched open parenthesis is tokenized as a normal parenthesis.
+ $openPtr = $this->getTargetToken($testMarker, T_OPEN_PARENTHESIS, T_TYPE_OPEN_PARENTHESIS, '(');
+ $token = $tokens$openPtr;
+
+ $this->assertSame(T_OPEN_PARENTHESIS, $token'code', 'Token tokenized as '.$token'type'.', not T_OPEN_PARENTHESIS (code)');
+ $this->assertSame('T_OPEN_PARENTHESIS', $token'type', 'Token tokenized as '.$token'type'.', not T_OPEN_PARENTHESIS (type)');
+
+ // Verify that the type intersection is still tokenized as T_BITWISE_AND as the type declaration
+ // is not recognized as a valid type declaration.
+ $intersectPtr = $this->getTargetToken($testMarker, T_BITWISE_AND, T_TYPE_INTERSECTION, '&');
+ $token = $tokens$intersectPtr;
+
+ $this->assertSame(T_BITWISE_AND, $token'code', 'Token tokenized as '.$token'type'.', not T_BITWISE_AND (code)');
+ $this->assertSame('T_BITWISE_AND', $token'type', 'Token tokenized as '.$token'type'.', not T_BITWISE_AND (type)');
+
+ }//end testBrokenDNFTypeParensShouldAlwaysBeAPairMissingCloseParens()
+
+
+ /**
+ * Data provider.
+ *
+ * @see testBrokenDNFTypeParensShouldAlwaysBeAPairMissingCloseParens()
+ *
+ * @return array<string, array<string, string>>
+ */
+ public static function dataBrokenDNFTypeParensShouldAlwaysBeAPairMissingCloseParens()
+ {
+ return 
+ 'OO const type' => '/* testBrokenConstDNFTypeParensMissingClose */',
+ 'OO property type' => '/* testBrokenPropertyDNFTypeParensMissingClose */',
+ 'Parameter type' => '/* testBrokenParamDNFTypeParensMissingClose */',
+ 'Return type' => '/* testBrokenReturnDNFTypeParensMissingClose */',
+ ;
+
+ }//end dataBrokenDNFTypeParensShouldAlwaysBeAPairMissingCloseParens()
+
+
+ /**
+ * Document handling for a DNF type / parse error where the type declaration contains an unmatched parenthesis.
+ *
+ * @param string $testMarker The comment prefacing the target token.
+ *
+ * @dataProvider dataBrokenDNFTypeParensShouldAlwaysBeAPairMissingOpenParens
+ * @covers PHP_CodeSniffer\Tokenizers\PHP::processAdditional
+ *
+ * @return void
+ */
+ public function testBrokenDNFTypeParensShouldAlwaysBeAPairMissingOpenParens($testMarker)
+ {
+ $tokens = $this->phpcsFile->getTokens();
+
+ // Verify that the type union is still tokenized as T_BITWISE_OR as the type declaration
+ // is not recognized as a valid type declaration.
+ $unionPtr = $this->getTargetToken($testMarker, T_BITWISE_OR, T_TYPE_UNION, '|');
+ $token = $tokens$unionPtr;
+
+ $this->assertSame(T_BITWISE_OR, $token'code', 'Token tokenized as '.$token'type'.', not T_BITWISE_OR (code)');
+ $this->assertSame('T_BITWISE_OR', $token'type', 'Token tokenized as '.$token'type'.', not T_BITWISE_OR (type)');
+
+ // Verify that the unmatched open parenthesis is tokenized as a normal parenthesis.
+ $closePtr = $this->getTargetToken($testMarker, T_CLOSE_PARENTHESIS, T_TYPE_CLOSE_PARENTHESIS, ')');
+ $token = $tokens$closePtr;
+
+ $this->assertSame(T_CLOSE_PARENTHESIS, $token'code', 'Token tokenized as '.$token'type'.', not T_CLOSE_PARENTHESIS (code)');
+ $this->assertSame('T_CLOSE_PARENTHESIS', $token'type', 'Token tokenized as '.$token'type'.', not T_CLOSE_PARENTHESIS (type)');
+
+ // Verify that the type intersection is still tokenized as T_BITWISE_AND as the type declaration
+ // is not recognized as a valid type declaration.
+ $intersectPtr = $this->getTargetToken($testMarker, T_BITWISE_AND, T_TYPE_INTERSECTION, '&');
+ $token = $tokens$intersectPtr;
+
+ $this->assertSame(T_BITWISE_AND, $token'code', 'Token tokenized as '.$token'type'.', not T_BITWISE_AND (code)');
+ $this->assertSame('T_BITWISE_AND', $token'type', 'Token tokenized as '.$token'type'.', not T_BITWISE_AND (type)');
+
+ }//end testBrokenDNFTypeParensShouldAlwaysBeAPairMissingOpenParens()
+
+
+ /**
+ * Data provider.
+ *
+ * @see testBrokenDNFTypeParensShouldAlwaysBeAPairMissingOpenParens()
+ *
+ * @return array<string, array<string, string>>
+ */
+ public static function dataBrokenDNFTypeParensShouldAlwaysBeAPairMissingOpenParens()
+ {
+ return 
+ 'OO const type' => '/* testBrokenConstDNFTypeParensMissingOpen */',
+ 'OO property type' => '/* testBrokenPropertyDNFTypeParensMissingOpen */',
+ 'Parameter type' => '/* testBrokenParamDNFTypeParensMissingOpen */',
+ 'Return type' => '/* testBrokenReturnDNFTypeParensMissingOpen */',
+ ;
+
+ }//end dataBrokenDNFTypeParensShouldAlwaysBeAPairMissingOpenParens()
+
+
+ /**
+ * Document handling for a DNF type / parse error where the type declaration contains an unmatched parenthesis,
+ * but also contains a set of matched parentheses.
+ *
+ * @param string $testMarker The comment prefacing the target token.
+ *
+ * @dataProvider dataBrokenDNFTypeParensShouldAlwaysBeAPairMatchedAndUnmatched
+ * @covers PHP_CodeSniffer\Tokenizers\PHP::processAdditional
+ *
+ * @return void
+ */
+ public function testBrokenDNFTypeParensShouldAlwaysBeAPairMatchedAndUnmatched($testMarker)
+ {
+ $tokens = $this->phpcsFile->getTokens();
+ $startPtr = $this->getTargetToken($testMarker, T_OPEN_PARENTHESIS, T_TYPE_OPEN_PARENTHESIS, '(');
+
+ for ($i = $startPtr; $i < $this->phpcsFile->numTokens; $i++) {
+ if (isset(Tokens::$emptyTokens$tokens$i'code') === true) {
+ continue;
+ }
+
+ if ($tokens$i'code' === T_EQUAL
+ || $tokens$i'code' === T_VARIABLE
+ || $tokens$i'code' === T_OPEN_CURLY_BRACKET
+ ) {
+ // Reached the end of the type.
+ break;
+ }
+
+ $errorPrefix = 'Token tokenized as '.$tokens$i'type';
+
+ // Verify that type tokens have not been retokenized to `T_TYPE_*` tokens for broken type declarations.
+ switch ($tokens$i'content') {
+ case '|':
+ $this->assertSame(T_BITWISE_OR, $tokens$i'code', $errorPrefix.', not T_BITWISE_OR (code)');
+ $this->assertSame('T_BITWISE_OR', $tokens$i'type', $errorPrefix.', not T_BITWISE_OR (type)');
+ break;
+
+ case '&':
+ $this->assertSame(T_BITWISE_AND, $tokens$i'code', $errorPrefix.', not T_BITWISE_AND (code)');
+ $this->assertSame('T_BITWISE_AND', $tokens$i'type', $errorPrefix.', not T_BITWISE_AND (type)');
+ break;
+
+ case '(':
+ // Verify that the open parenthesis is tokenized as a normal parenthesis.
+ $this->assertSame(T_OPEN_PARENTHESIS, $tokens$i'code', $errorPrefix.', not T_OPEN_PARENTHESIS (code)');
+ $this->assertSame('T_OPEN_PARENTHESIS', $tokens$i'type', $errorPrefix.', not T_OPEN_PARENTHESIS (type)');
+ break;
+
+ case ')':
+ $this->assertSame(T_CLOSE_PARENTHESIS, $tokens$i'code', $errorPrefix.', not T_CLOSE_PARENTHESIS (code)');
+ $this->assertSame('T_CLOSE_PARENTHESIS', $tokens$i'type', $errorPrefix.', not T_CLOSE_PARENTHESIS (type)');
+ break;
+
+ default:
+ break;
+ }//end switch
+ }//end for
+
+ }//end testBrokenDNFTypeParensShouldAlwaysBeAPairMatchedAndUnmatched()
+
+
+ /**
+ * Data provider.
+ *
+ * @see testBrokenDNFTypeParensShouldAlwaysBeAPairMatchedAndUnmatched()
+ *
+ * @return array<string, array<string, string>>
+ */
+ public static function dataBrokenDNFTypeParensShouldAlwaysBeAPairMatchedAndUnmatched()
+ {
+ return 
+ 'OO const type - missing one close parenthesis' => '/* testBrokenConstDNFTypeParensMissingOneClose */',
+ 'OO property type - missing one open parenthesis' => '/* testBrokenPropertyDNFTypeParensMissingOneOpen */',
+ 'Parameter type - missing one close parenthesis' => '/* testBrokenParamDNFTypeParensMissingOneClose */',
+ 'Return type - missing one open parenthesis' => '/* testBrokenReturnDNFTypeParensMissingOneOpen */',
+ ;
+
+ }//end dataBrokenDNFTypeParensShouldAlwaysBeAPairMatchedAndUnmatched()
+
+
+}//end class

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/PHP/DNFTypesTest.inc Changed

@@ -44,12 +44,20 @@
 /* testParensNoOwnerFunctionCallwithDNFLookALikeParam */
 $obj->static((CONST_A&CONST_B)|CONST_C | $var);
 
+/* testParensNoOwnerFunctionCallWithDNFLookALikeNamedParamPlain */
+callMe(label: false);
+
+/* testParensNoOwnerFunctionCallWithDNFLookALikeNamedParamUnion */
+callMe(label: CONST_A | CONST_B);
+
+/* testParensNoOwnerFunctionCallWithDNFLookALikeNamedParamIntersect */
+callMe(label: CONST_A & CONST_B);
 
 /*
  * DNF parentheses.
  */
 
-class DNFTypes {
+abstract class DNFTypes {
     /* testDNFTypeOOConstUnqualifiedClasses */
     public const (A&B)|D UNQUALIFIED = new Foo;
 
@@ -63,7 +71,7 @@
         (C&D) | // phpcs:ignore Stnd.Cat.Sniff
         /* testDNFTypeOOConstMulti3 */
         (Y&D)
-        | null MULTI_DNF = false;
+        | null MULTI_DNF = null;
 
     /* testDNFTypeOOConstNamespaceRelative */
     final protected const (namespace\Sub\NameA&namespace\Sub\NameB)|namespace\Sub\NameC NAMESPACE_RELATIVE = new namespace\Sub\NameB;
@@ -75,10 +83,10 @@
     const (\Fully\Qualified\NameA&\Fully\Qualified\NameB)|\Fully\Qualified\NameC FULLY_QUALIFIED = new \Fully\Qualified\NameB();
 
     /* testDNFTypePropertyUnqualifiedClasses */
-    public static (Foo&Bar)|object $obj;
+    public static (Foo&Bar)|array $obj;
 
     /* testDNFTypePropertyReverseModifierOrder */
-    static protected string|(A&B)|bool $dnf /* testParensNoOwnerPropertyDefaultValue1 */ = ( E_WARNING & E_NOTICE ) | /* testParensNoOwnerPropertyDefaultValue2 */ (E_ALL & E_DEPRECATED);
+    static protected string|(A&B)|int $dnf /* testParensNoOwnerPropertyDefaultValue1 */ = ( E_WARNING & E_NOTICE ) | /* testParensNoOwnerPropertyDefaultValue2 */ (E_ALL & E_DEPRECATED);
 
     private
         /* testDNFTypePropertyMultiNamespaceRelative */
@@ -96,7 +104,7 @@
     static readonly (A&B&C)|array $staticReadonly;
 
     /* testDNFTypePropertyWithOnlyStaticKeyword */
-    static (A&B&C)|true $obj;
+    static (A&B&C)|true $onlyStaticModified;
 
     public function paramTypes(
         /* testDNFTypeParam1WithAttribute */
@@ -104,7 +112,7 @@
         (\Foo&Bar)|int|float $paramA /* testParensNoOwnerParamDefaultValue */ = SOMETHING | (CONSTANT_A & CONSTANT_B),
 
         /* testDNFTypeParam2 */
-        (Foo&\Bar) /* testDNFTypeParam3 */ |(Baz&Fop) &...$paramB = null,
+        (Foo&\Bar) /* testDNFTypeParam3 */ |(Baz&Fop) &...$paramB,
     ) {
         /* testParensNoOwnerInReturnValue1 */
         return (
@@ -148,7 +156,7 @@
     /* testDNFTypeWithReference */
     float|(B&A) &$paramA,
     /* testDNFTypeWithSpreadOperator */
-    string|(B|D) ...$paramB
+    string|(B&D) ...$paramB
 ) {}
 
 
@@ -160,7 +168,7 @@
 /* testParensOwnerArrowDNFUsedWithin */
 $arrowWithParamType = fn (
     /* testDNFTypeArrowParam */
-    object|(A&B&C)|array $param,
+    int|(A&B&C)|array $param,
     /* testParensNoOwnerAmpersandInDefaultValue */ ?int $int = (CONSTA & CONSTB )| CONST_C
 )
     /* testParensNoOwnerInArrowReturnExpression */
@@ -175,11 +183,11 @@
 
 function InvalidSyntaxes(
     /* testDNFTypeParamIllegalUnnecessaryParens */
-    (A&B) $parensNotNeeded
+    (A&B) $parensNotNeeded,
 
     /* testDNFTypeParamIllegalIntersectUnionReversed */
-    A&(B|D) $onlyIntersectAllowedWithinParensAndUnionOutside
+    A&(B|D) $onlyIntersectAllowedWithinParensAndUnionOutside,
 
     /* testDNFTypeParamIllegalNestedParens */
-    A|(B&(D|W)|null) $nestedParensNotAllowed
+    A|(B&(D|W)|null) $nestedParensNotAllowed,
 ) {}

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/PHP/DNFTypesTest.php Changed

@@ -46,11 +46,19 @@
 $this->assertSame(T_CLOSE_PARENTHESIS, $closer'code', 'Token tokenized as '.$closer'type'.', not T_CLOSE_PARENTHESIS (code)');
 $this->assertSame('T_CLOSE_PARENTHESIS', $closer'type', 'Token tokenized as '.$closer'type'.', not T_CLOSE_PARENTHESIS (type)');
 
- for ($i = ($openPtr + 1); $i < $closePtr; $i++) {
- // If there are ampersands, make sure these are tokenized as bitwise and.
- if ($skipCheckInside === false && $tokens$i'content' === '&') {
- $this->assertSame(T_BITWISE_AND, $tokens$i'code', 'Token tokenized as '.$tokens$i'type'.', not T_BITWISE_AND (code)');
- $this->assertSame('T_BITWISE_AND', $tokens$i'type', 'Token tokenized as '.$tokens$i'type'.', not T_BITWISE_AND (type)');
+ if ($skipCheckInside === false) {
+ for ($i = ($openPtr + 1); $i < $closePtr; $i++) {
+ // If there are ampersands, make sure these are tokenized as bitwise and.
+ if ($tokens$i'content' === '&') {
+ $this->assertSame(T_BITWISE_AND, $tokens$i'code', 'Token tokenized as '.$tokens$i'type'.', not T_BITWISE_AND (code)');
+ $this->assertSame('T_BITWISE_AND', $tokens$i'type', 'Token tokenized as '.$tokens$i'type'.', not T_BITWISE_AND (type)');
+ }
+
+ // If there are pipes, make sure these are tokenized as bitwise or.
+ if ($tokens$i'content' === '|') {
+ $this->assertSame(T_BITWISE_OR, $tokens$i'code', 'Token tokenized as '.$tokens$i'type'.', not T_BITWISE_OR (code)');
+ $this->assertSame('T_BITWISE_OR', $tokens$i'type', 'Token tokenized as '.$tokens$i'type'.', not T_BITWISE_OR (type)');
+ }
 }
 }
 
@@ -141,6 +149,15 @@
 'parens without owner, function call with DNF look-a-like param' => 
 'testMarker' => '/* testParensNoOwnerFunctionCallwithDNFLookALikeParam */',
 ,
+ 'parens without owner, function call, named param' => 
+ 'testMarker' => '/* testParensNoOwnerFunctionCallWithDNFLookALikeNamedParamPlain */',
+ ,
+ 'parens without owner, function call, named param + bitwise or' => 
+ 'testMarker' => '/* testParensNoOwnerFunctionCallWithDNFLookALikeNamedParamUnion */',
+ ,
+ 'parens without owner, function call, named param + bitwise and' => 
+ 'testMarker' => '/* testParensNoOwnerFunctionCallWithDNFLookALikeNamedParamIntersect */',
+ ,
 
 'parens without owner in OO const default value' => 
 'testMarker' => '/* testParensNoOwnerOOConstDefaultValue */',

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/Tokenizer/CreateParenthesisNestingMapDNFTypesTest.inc Changed

@@ -49,7 +49,7 @@
  * DNF parentheses.
  */
 
-class DNFTypes {
+abstract class DNFTypes {
     /* testDNFTypeOOConstUnqualifiedClasses */
     public const (A&B)|D UNQUALIFIED = new Foo;
 
@@ -63,7 +63,7 @@
         (C&D) | // phpcs:ignore Stnd.Cat.Sniff
         /* testDNFTypeOOConstMulti3 */
         (Y&D)
-        | null MULTI_DNF = false;
+        | null MULTI_DNF = null;
 
     /* testDNFTypeOOConstNamespaceRelative */
     final protected const (namespace\Sub\NameA&namespace\Sub\NameB)|namespace\Sub\NameC NAMESPACE_RELATIVE = new namespace\Sub\NameB;
@@ -75,10 +75,10 @@
     const (\Fully\Qualified\NameA&\Fully\Qualified\NameB)|\Fully\Qualified\NameC FULLY_QUALIFIED = new \Fully\Qualified\NameB();
 
     /* testDNFTypePropertyUnqualifiedClasses */
-    public static (Foo&Bar)|object $obj;
+    public static (Foo&Bar)|array $obj;
 
     /* testDNFTypePropertyReverseModifierOrder */
-    static protected string|(A&B)|bool $dnf /* testParensNoOwnerPropertyDefaultValue1 */ = ( E_WARNING & E_NOTICE ) | /* testParensNoOwnerPropertyDefaultValue2 */ (E_ALL & E_DEPRECATED);
+    static protected string|(A&B)|int $dnf /* testParensNoOwnerPropertyDefaultValue1 */ = ( E_WARNING & E_NOTICE ) | /* testParensNoOwnerPropertyDefaultValue2 */ (E_ALL & E_DEPRECATED);
 
     private
         /* testDNFTypePropertyMultiNamespaceRelative */
@@ -96,7 +96,7 @@
     static readonly (A&B&C)|array $staticReadonly;
 
     /* testDNFTypePropertyWithOnlyStaticKeyword */
-    static (A&B&C)|true $obj;
+    static (A&B&C)|true $onlyStaticModified;
 
     public function paramTypes(
         /* testDNFTypeParam1WithAttribute */
@@ -104,7 +104,7 @@
         (\Foo&Bar)|int|float $paramA /* testParensNoOwnerParamDefaultValue */ = SOMETHING | (CONSTANT_A & CONSTANT_B),
 
         /* testDNFTypeParam2 */
-        (Foo&\Bar) /* testDNFTypeParam3 */ |(Baz&Fop) &...$paramB = null,
+        (Foo&\Bar) /* testDNFTypeParam3 */ |(Baz&Fop) &...$paramB,
     ) {
         /* testParensNoOwnerInReturnValue1 */
         return (
@@ -148,7 +148,7 @@
     /* testDNFTypeWithReference */
     float|(B&A) &$paramA,
     /* testDNFTypeWithSpreadOperator */
-    string|(B|D) ...$paramB
+    string|(B&D) ...$paramB
 ) {}
 
 
@@ -160,7 +160,7 @@
 /* testParensOwnerArrowDNFUsedWithin */
 $arrowWithParamType = fn (
     /* testDNFTypeArrowParam */
-    object|(A&B&C)|array $param,
+    int|(A&B&C)|array $param,
     /* testParensNoOwnerAmpersandInDefaultValue */ ?int $int = (CONSTA & CONSTB )| CONST_C
 )
     /* testParensNoOwnerInArrowReturnExpression */
@@ -175,11 +175,11 @@
 
 function InvalidSyntaxes(
     /* testDNFTypeParamIllegalUnnecessaryParens */
-    (A&B) $parensNotNeeded
+    (A&B) $parensNotNeeded,
 
     /* testDNFTypeParamIllegalIntersectUnionReversed */
-    A&(B|D) $onlyIntersectAllowedWithinParensAndUnionOutside
+    A&(B|D) $onlyIntersectAllowedWithinParensAndUnionOutside,
 
     /* testDNFTypeParamIllegalNestedParens */
-    A|(B&(D|W)|null) $nestedParensNotAllowed
+    A|(B&(D|W)|null) $nestedParensNotAllowed,
 ) {}

roundcubemail.dsc Changed

Overview

Request 3292 (accepted)

Request History