Request 3280 (accepted)

roundcubemail.spec Changed

buildroundcubemailtarball.sh Changed

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

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

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ,
-    "content-hash": "60ae678291a569c227222d1aeac89603",
+    "content-hash": "2c8fe43978344519c37ecd666bc14842",
     "packages": 
         {
             "name": "beberlei/assert",
@@ -379,6 +379,69 @@
             "time": "2023-11-17T15:01:25+00:00"
         },
         {
+            "name": "firebase/php-jwt",
+            "version": "v6.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/firebase/php-jwt.git",
+                "reference": "4dd1e007f22a927ac77da5a3fbb067b42d3bc224"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/4dd1e007f22a927ac77da5a3fbb067b42d3bc224",
+                "reference": "4dd1e007f22a927ac77da5a3fbb067b42d3bc224",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1||^8.0"
+            },
+            "require-dev": {
+                "guzzlehttp/guzzle": "^6.5||^7.4",
+                "phpspec/prophecy-phpunit": "^1.1",
+                "phpunit/phpunit": "^7.5||^9.5",
+                "psr/cache": "^1.0||^2.0",
+                "psr/http-client": "^1.0",
+                "psr/http-factory": "^1.0"
+            },
+            "suggest": {
+                "ext-sodium": "Support EdDSA (Ed25519) signatures",
+                "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Firebase\\JWT\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": 
+                "BSD-3-Clause"
+            ,
+            "authors": 
+                {
+                    "name": "Neuman Vong",
+                    "email": "neuman+pear@twilio.com",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Anant Narayanan",
+                    "email": "anant@php.net",
+                    "role": "Developer"
+                }
+            ,
+            "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.",
+            "homepage": "https://github.com/firebase/php-jwt",
+            "keywords": 
+                "jwt",
+                "php"
+            ,
+            "support": {
+                "issues": "https://github.com/firebase/php-jwt/issues",
+                "source": "https://github.com/firebase/php-jwt/tree/v6.4.0"
+            },
+            "time": "2023-02-09T21:01:23+00:00"
+        },
+        {
             "name": "guzzlehttp/guzzle",
             "version": "6.5.8",
             "source": {
@@ -1112,9 +1175,10 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/roundcubemail-1.5/roundcubemail-plugins-kolab-latest/plugins/kolab_sso",
-                "reference": "a15ea62c786c8ffa4bb6fe27cbb7d4de7f193917"
+                "reference": "f30506dbd73df3d74ff3bcbc18964a3b40bb6b45"
             },
             "require": {
+                "firebase/php-jwt": "~6.4.0",
                 "kolab/libkolab": ">=3.4.0",
                 "pear/http_request2": "~2.5.0",
                 "php": ">=5.3.0",
@@ -1211,11 +1275,12 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/roundcubemail-1.5/roundcubemail-plugins-kolab-latest/plugins/libkolab",
-                "reference": "30bad7150f1999a5a2a0d33c9bcd490514a4a307"
+                "reference": "0952f000597cf19fbd1f5e1e04e3d9398e7edd45"
             },
             "require": {
-                "caxy/php-htmldiff": "~0.1.7",
+                "caxy/php-htmldiff": "~0.1",
                 "kolab/libcalendaring": ">=3.4.0",
+                "lolli42/finediff": "~1.0.3",
                 "pear/http_request2": "~2.5.0",
                 "php": ">=7.2.0",
                 "roundcube/plugin-installer": ">=0.1.3"
@@ -1510,6 +1575,71 @@
             "time": "2019-10-25T12:34:43+00:00"
         },
         {
+            "name": "lolli42/finediff",
+            "version": "1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/lolli42/FineDiff.git",
+                "reference": "8d535de757062fed8412833f5eede7064595ca5b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/lolli42/FineDiff/zipball/8d535de757062fed8412833f5eede7064595ca5b",
+                "reference": "8d535de757062fed8412833f5eede7064595ca5b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.0",
+                "symfony/polyfill-mbstring": "^1.23"
+            },
+            "replace": {
+                "cogpowered/finediff": "*"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3.4",
+                "phpstan/phpstan": "^1.9.14",
+                "phpunit/phpunit": "^8.5.33 || ^9.6.11 || ^10.3.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "cogpowered\\FineDiff\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": 
+                "MIT"
+            ,
+            "authors": 
+                {
+                    "name": "Raymond Hill"
+                },
+                {
+                    "name": "Rob Crowe",
+                    "email": "rob@cogpowered.com"
+                },
+                {
+                    "name": "Christian Kuhn",
+                    "email": "lolli@schwarzbu.ch",
+                    "role": "maintainer"
+                }
+            ,
+            "description": "PHP implementation of a Fine granularity Diff engine",
+            "homepage": "https://github.com/lolli42/FineDiff",
+            "keywords": 
+                "diff",
+                "finediff",
+                "opcode",
+                "string",
+                "text"
+            ,
+            "support": {
+                "issues": "https://github.com/lolli42/FineDiff/issues",
+                "source": "https://github.com/lolli42/FineDiff/tree/1.0.3"
+            },
+            "time": "2024-02-06T13:56:20+00:00"
+        },
+        {
             "name": "masterminds/html5",
             "version": "2.7.6",
             "source": {
@@ -1875,16 +2005,16 @@
         },
         {
             "name": "pear/crypt_gpg",
-            "version": "v1.6.8",
+            "version": "v1.6.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Crypt_GPG.git",
-                "reference": "89c661fbd7027f7745c25efd4053552972278bc1"
+                "reference": "1572e126f8c8e083af6db1ebe43fcd9c7954537c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Crypt_GPG/zipball/89c661fbd7027f7745c25efd4053552972278bc1",
-                "reference": "89c661fbd7027f7745c25efd4053552972278bc1",
+                "url": "https://api.github.com/repos/pear/Crypt_GPG/zipball/1572e126f8c8e083af6db1ebe43fcd9c7954537c",
+                "reference": "1572e126f8c8e083af6db1ebe43fcd9c7954537c",
                 "shasum": ""
             },
             "require": {
@@ -1894,6 +2024,7 @@
                 "php": ">=5.4.8"
             },
             "require-dev": {
+                "phpstan/phpstan": "^1.2",
                 "phpunit/phpunit": "^9"
             },
             "suggest": {
@@ -1941,7 +2072,7 @@
                 "issues": "https://pear.php.net/bugs/search.php?cmd=display&package_name=Crypt_GPG",
                 "source": "https://github.com/pear/Crypt_GPG"
             },
-            "time": "2023-11-23T09:15:05+00:00"
+            "time": "2024-03-23T10:43:40+00:00"
         },
         {
             "name": "pear/http_request2",
@@ -2004,16 +2135,16 @@
         },
         {
             "name": "pear/mail_mime",
-            "version": "1.10.11",
+            "version": "1.10.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Mail_Mime.git",
-                "reference": "d4fb9ce61201593d0f8c6db629c45e29c3409c14"
+                "reference": "d032c7c9335e96d5954ac6e93d33955f3b7246e2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Mail_Mime/zipball/d4fb9ce61201593d0f8c6db629c45e29c3409c14",
-                "reference": "d4fb9ce61201593d0f8c6db629c45e29c3409c14",
+                "url": "https://api.github.com/repos/pear/Mail_Mime/zipball/d032c7c9335e96d5954ac6e93d33955f3b7246e2",
+                "reference": "d032c7c9335e96d5954ac6e93d33955f3b7246e2",
                 "shasum": ""
             },
             "require": {
@@ -2051,7 +2182,7 @@
                 "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name=Mail_Mime",
                 "source": "https://github.com/pear/Mail_Mime"
             },
-            "time": "2021-09-05T08:42:45+00:00"
+            "time": "2024-03-10T20:20:27+00:00"
         },
         {
             "name": "pear/net_ldap2",
@@ -2363,16 +2494,16 @@
         },
         {
             "name": "pear/pear-core-minimal",
-            "version": "v1.10.14",
+            "version": "v1.10.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/pear-core-minimal.git",
-                "reference": "a86fc145edb5caedbf96527214ce3cadc9de4a32"
+                "reference": "ce0adade8b97561656ace07cdaac4751c271ea8c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/a86fc145edb5caedbf96527214ce3cadc9de4a32",
-                "reference": "a86fc145edb5caedbf96527214ce3cadc9de4a32",
+                "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/ce0adade8b97561656ace07cdaac4751c271ea8c",
+                "reference": "ce0adade8b97561656ace07cdaac4751c271ea8c",
                 "shasum": ""
             },
             "require": {
@@ -2385,9 +2516,9 @@
             },
             "type": "library",
             "autoload": {
-                "psr-0": {
-                    "": "src/"
-                }
+                "classmap": 
+                    "src/"
+                
             },
             "notification-url": "https://packagist.org/downloads/",
             "include-path": 
@@ -2408,7 +2539,7 @@
                 "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name=PEAR",
                 "source": "https://github.com/pear/pear-core-minimal"
             },
-            "time": "2023-11-26T16:15:38+00:00"
+            "time": "2024-03-16T18:41:45+00:00"
         },
         {
             "name": "pear/pear_exception",
@@ -3356,16 +3487,16 @@
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "ecaafce9f77234a6a449d29e49267ba10499116d"
+                "reference": "a287ed7475f85bf6f61890146edbc932c0fff919"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/ecaafce9f77234a6a449d29e49267ba10499116d",
-                "reference": "ecaafce9f77234a6a449d29e49267ba10499116d",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a287ed7475f85bf6f61890146edbc932c0fff919",
+                "reference": "a287ed7475f85bf6f61890146edbc932c0fff919",
                 "shasum": ""
             },
             "require": {
@@ -3378,9 +3509,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -3423,7 +3551,7 @@
                 "shim"
             ,
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.29.0"
             },
             "funding": 
                 {
@@ -3439,20 +3567,20 @@
                     "type": "tidelift"
                 }
             ,
-            "time": "2023-01-26T09:30:37+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92"
+                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
-                "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d",
+                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d",
                 "shasum": ""
             },
             "require": {
@@ -3463,9 +3591,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -3507,7 +3632,7 @@
                 "shim"
             ,
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0"
             },
             "funding": 
                 {
@@ -3523,20 +3648,100 @@
                     "type": "tidelift"
                 }
             ,
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.29.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "provide": {
+                "ext-mbstring": "*"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": 
+                    "bootstrap.php"
+                ,
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": 
+                "MIT"
+            ,
+            "authors": 
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ,
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": 
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ,
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0"
+            },
+            "funding": 
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ,
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179"
+                "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/70f4aebd92afca2f865444d30a4d2151c13c3179",
-                "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/861391a8da9a04cbad2d232ddd9e4893220d6e25",
+                "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25",
                 "shasum": ""
             },
             "require": {
@@ -3544,9 +3749,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -3583,7 +3785,7 @@
                 "shim"
             ,
             "support": {
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-php72/tree/v1.29.0"
             },
             "funding": 
                 {
@@ -3599,7 +3801,7 @@
                     "type": "tidelift"
                 }
             ,
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "thecodingmachine/safe",
@@ -4789,16 +4991,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.57",
+            "version": "1.10.65",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "1627b1d03446904aaa77593f370c5201d2ecc34e"
+                "reference": "3c657d057a0b7ecae19cb12db446bbc99d8839c6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/1627b1d03446904aaa77593f370c5201d2ecc34e",
-                "reference": "1627b1d03446904aaa77593f370c5201d2ecc34e",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/3c657d057a0b7ecae19cb12db446bbc99d8839c6",
+                "reference": "3c657d057a0b7ecae19cb12db446bbc99d8839c6",
                 "shasum": ""
             },
             "require": {
@@ -4847,7 +5049,7 @@
                     "type": "tidelift"
                 }
             ,
-            "time": "2024-01-24T11:51:34+00:00"
+            "time": "2024-03-23T10:30:26+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -5274,16 +5476,16 @@
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
-            "version": "1.0.2",
+            "version": "1.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619"
+                "reference": "92a1a52e86d34cde6caa54f1b5ffa9fda18e5d54"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619",
-                "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/92a1a52e86d34cde6caa54f1b5ffa9fda18e5d54",
+                "reference": "92a1a52e86d34cde6caa54f1b5ffa9fda18e5d54",
                 "shasum": ""
             },
             "require": {
@@ -5317,7 +5519,7 @@
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2"
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.3"
             },
             "funding": 
                 {
@@ -5325,7 +5527,7 @@
                     "type": "github"
                 }
             ,
-            "time": "2020-11-30T08:15:22+00:00"
+            "time": "2024-03-01T13:45:45+00:00"
         },
         {
             "name": "sebastian/comparator",
@@ -5833,16 +6035,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.8.1",
+            "version": "3.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "14f5fff1e64118595db5408e946f3a22c75807f7"
+                "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/14f5fff1e64118595db5408e946f3a22c75807f7",
-                "reference": "14f5fff1e64118595db5408e946f3a22c75807f7",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b",
+                "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b",
                 "shasum": ""
             },
             "require": {
@@ -5909,20 +6111,20 @@
                     "type": "open_collective"
                 }
             ,
-            "time": "2024-01-11T20:47:48+00:00"
+            "time": "2024-02-16T15:06:51+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"
+                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
-                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4",
+                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4",
                 "shasum": ""
             },
             "require": {
@@ -5936,9 +6138,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -5975,7 +6174,7 @@
                 "portable"
             ,
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0"
             },
             "funding": 
                 {
@@ -5991,7 +6190,7 @@
                     "type": "tidelift"
                 }
             ,
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/yaml",

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/drivers/kolab/kolab_contacts_driver.php Changed

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

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/kolab_delegation_engine.php Changed

roundcubemail-1.5.tar.gz/plugins/kolab_files/lib/kolab_files_engine.php Changed

roundcubemail-1.5.tar.gz/plugins/kolab_sso/composer.json Changed

roundcubemail-1.5.tar.gz/plugins/kolab_sso/config.inc.php Changed

roundcubemail-1.5.tar.gz/plugins/kolab_sso/config.inc.php.dist Changed

roundcubemail-1.5.tar.gz/plugins/kolab_sso/drivers/oauth2.php Changed

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

roundcubemail-1.5.tar.gz/plugins/kolab_sso/lib Deleted

roundcubemail-1.5.tar.gz/plugins/kolab_sso/lib/Firebase Deleted

roundcubemail-1.5.tar.gz/plugins/kolab_sso/lib/Firebase/JWT Deleted

roundcubemail-1.5.tar.gz/plugins/kolab_sso/lib/Firebase/JWT/JWT.php Deleted

@@ -1,382 +0,0 @@
-<?php
-
-namespace Firebase\JWT;
-
-use DomainException;
-use InvalidArgumentException;
-use UnexpectedValueException;
-use DateTime;
-
-/**
- * JSON Web Token implementation, based on this spec:
- * https://tools.ietf.org/html/rfc7519
- *
- * PHP version 5
- *
- * @category Authentication
- * @package  Authentication_JWT
- * @author   Neuman Vong <neuman@twilio.com>
- * @author   Anant Narayanan <anant@php.net>
- * @license  http://opensource.org/licenses/BSD-3-Clause 3-clause BSD
- * @link     https://github.com/firebase/php-jwt
- */
-class JWT
-{
-    /**
-     * When checking nbf, iat or expiration times,
-     * we want to provide some extra leeway time to
-     * account for clock skew.
-     */
-    public static $leeway = 0;
-
-    /**
-     * Allow the current timestamp to be specified.
-     * Useful for fixing a value within unit testing.
-     *
-     * Will default to PHP time() value if null.
-     */
-    public static $timestamp = null;
-
-    public static $supported_algs = 
-        'HS256' => 'hash_hmac', 'SHA256',
-        'HS512' => 'hash_hmac', 'SHA512',
-        'HS384' => 'hash_hmac', 'SHA384',
-        'RS256' => 'openssl', 'SHA256',
-        'RS384' => 'openssl', 'SHA384',
-        'RS512' => 'openssl', 'SHA512',
-    ;
-
-    /**
-     * Decodes a JWT string into a PHP object.
-     *
-     * @param string        $jwt            The JWT
-     * @param string|array  $key            The key, or map of keys.
-     *                                      If the algorithm used is asymmetric, this is the public key
-     * @param array         $allowed_algs   List of supported verification algorithms
-     *                                      Supported algorithms are 'HS256', 'HS384', 'HS512' and 'RS256'
-     *
-     * @return object The JWT's payload as a PHP object
-     *
-     * @throws UnexpectedValueException     Provided JWT was invalid
-     * @throws SignatureInvalidException    Provided JWT was invalid because the signature verification failed
-     * @throws BeforeValidException         Provided JWT is trying to be used before it's eligible as defined by 'nbf'
-     * @throws BeforeValidException         Provided JWT is trying to be used before it's been created as defined by 'iat'
-     * @throws ExpiredException             Provided JWT has since expired, as defined by the 'exp' claim
-     *
-     * @uses jsonDecode
-     * @uses urlsafeB64Decode
-     */
-    public static function decode($jwt, $key, array $allowed_algs = )
-    {
-        $timestamp = is_null(static::$timestamp) ? time() : static::$timestamp;
-
-        if (empty($key)) {
-            throw new InvalidArgumentException('Key may not be empty');
-        }
-        $tks = explode('.', $jwt);
-        if (count($tks) != 3) {
-            throw new UnexpectedValueException('Wrong number of segments');
-        }
-        $headb64, $bodyb64, $cryptob64 = $tks;
-        if (null === ($header = static::jsonDecode(static::urlsafeB64Decode($headb64)))) {
-            throw new UnexpectedValueException('Invalid header encoding');
-        }
-        if (null === $payload = static::jsonDecode(static::urlsafeB64Decode($bodyb64))) {
-            throw new UnexpectedValueException('Invalid claims encoding');
-        }
-        if (false === ($sig = static::urlsafeB64Decode($cryptob64))) {
-            throw new UnexpectedValueException('Invalid signature encoding');
-        }
-        if (empty($header->alg)) {
-            throw new UnexpectedValueException('Empty algorithm');
-        }
-        if (empty(static::$supported_algs$header->alg)) {
-            throw new UnexpectedValueException('Algorithm not supported');
-        }
-        if (!in_array($header->alg, $allowed_algs)) {
-            throw new UnexpectedValueException('Algorithm not allowed');
-        }
-        if (is_array($key) || $key instanceof \ArrayAccess) {
-            if (isset($header->kid)) {
-                if (!isset($key$header->kid)) {
-                    throw new UnexpectedValueException('"kid" invalid, unable to lookup correct key');
-                }
-                $key = $key$header->kid;
-            } else {
-                throw new UnexpectedValueException('"kid" empty, unable to lookup correct key');
-            }
-        }
-
-        // Check the signature
-        if (!static::verify("$headb64.$bodyb64", $sig, $key, $header->alg)) {
-            throw new SignatureInvalidException('Signature verification failed');
-        }
-
-        // Check if the nbf if it is defined. This is the time that the
-        // token can actually be used. If it's not yet that time, abort.
-        if (isset($payload->nbf) && $payload->nbf > ($timestamp + static::$leeway)) {
-            throw new BeforeValidException(
-                'Cannot handle token prior to ' . date(DateTime::ISO8601, $payload->nbf)
-            );
-        }
-
-        // Check that this token has been created before 'now'. This prevents
-        // using tokens that have been created for later use (and haven't
-        // correctly used the nbf claim).
-        if (isset($payload->iat) && $payload->iat > ($timestamp + static::$leeway)) {
-            throw new BeforeValidException(
-                'Cannot handle token prior to ' . date(DateTime::ISO8601, $payload->iat)
-            );
-        }
-
-        // Check if this token has expired.
-        if (isset($payload->exp) && ($timestamp - static::$leeway) >= $payload->exp) {
-            throw new ExpiredException('Expired token');
-        }
-
-        return $payload;
-    }
-
-    /**
-     * Converts and signs a PHP object or array into a JWT string.
-     *
-     * @param object|array  $payload    PHP object or array
-     * @param string        $key        The secret key.
-     *                                  If the algorithm used is asymmetric, this is the private key
-     * @param string        $alg        The signing algorithm.
-     *                                  Supported algorithms are 'HS256', 'HS384', 'HS512' and 'RS256'
-     * @param mixed         $keyId
-     * @param array         $head       An array with header elements to attach
-     *
-     * @return string A signed JWT
-     *
-     * @uses jsonEncode
-     * @uses urlsafeB64Encode
-     */
-    public static function encode($payload, $key, $alg = 'HS256', $keyId = null, $head = null)
-    {
-        $header = 'typ' => 'JWT', 'alg' => $alg;
-        if ($keyId !== null) {
-            $header'kid' = $keyId;
-        }
-        if (isset($head) && is_array($head)) {
-            $header = array_merge($head, $header);
-        }
-        $segments = ;
-        $segments = static::urlsafeB64Encode(static::jsonEncode($header));
-        $segments = static::urlsafeB64Encode(static::jsonEncode($payload));
-        $signing_input = implode('.', $segments);
-
-        $signature = static::sign($signing_input, $key, $alg);
-        $segments = static::urlsafeB64Encode($signature);
-
-        return implode('.', $segments);
-    }
-
-    /**
-     * Sign a string with a given key and algorithm.
-     *
-     * @param string            $msg    The message to sign
-     * @param string|resource   $key    The secret key
-     * @param string            $alg    The signing algorithm.
-     *                                  Supported algorithms are 'HS256', 'HS384', 'HS512' and 'RS256'
-     *
-     * @return string An encrypted message
-     *
-     * @throws DomainException Unsupported algorithm was specified
-     */
-    public static function sign($msg, $key, $alg = 'HS256')
-    {
-        if (empty(static::$supported_algs$alg)) {
-            throw new DomainException('Algorithm not supported');
-        }
-
-        $function, $algorithm = static::$supported_algs$alg;
-
-        switch($function) {
-            case 'hash_hmac':
-                return hash_hmac($algorithm, $msg, $key, true);
-            case 'openssl':
-                $signature = '';
-                $success = openssl_sign($msg, $signature, $key, $algorithm);
-                if (!$success) {
-                    throw new DomainException("OpenSSL unable to sign data");
-                } else {
-                    return $signature;
-                }
-        }
-
-        throw new DomainException("Invalid algorithm");
-    }
-
-    /**
-     * Verify a signature with the message, key and method. Not all methods
-     * are symmetric, so we must have a separate verify and sign method.
-     *
-     * @param string            $msg        The original message (header and body)
-     * @param string            $signature  The original signature
-     * @param string|resource   $key        For HS*, a string key works. for RS*, must be a resource of an openssl public key
-     * @param string            $alg        The algorithm
-     *
-     * @return bool
-     *
-     * @throws DomainException Invalid Algorithm or OpenSSL failure
-     */
-    private static function verify($msg, $signature, $key, $alg)
-    {
-        if (empty(static::$supported_algs$alg)) {
-            throw new DomainException('Algorithm not supported');
-        }
-
-        $function, $algorithm = static::$supported_algs$alg;
-        switch($function) {
-            case 'openssl':
-                $success = openssl_verify($msg, $signature, $key, $algorithm);
-                if ($success === 1) {
-                    return true;
-                } elseif ($success === 0) {
-                    return false;
-                }
-                // returns 1 on success, 0 on failure, -1 on error.
-                throw new DomainException(
-                    'OpenSSL error: ' . openssl_error_string()
-                );
-            case 'hash_hmac':
-            default:
-                $hash = hash_hmac($algorithm, $msg, $key, true);
-                if (function_exists('hash_equals')) {
-                    return hash_equals($signature, $hash);
-                }
-                $len = min(static::safeStrlen($signature), static::safeStrlen($hash));
-
-                $status = 0;
-                for ($i = 0; $i < $len; $i++) {
-                    $status |= (ord($signature$i) ^ ord($hash$i));
-                }
-                $status |= (static::safeStrlen($signature) ^ static::safeStrlen($hash));
-
-                return ($status === 0);
-        }
-    }
-
-    /**
-     * Decode a JSON string into a PHP object.
-     *
-     * @param string $input JSON string
-     *
-     * @return object Object representation of JSON string
-     *
-     * @throws DomainException Provided string was invalid JSON
-     */
-    public static function jsonDecode($input)
-    {
-        if (version_compare(PHP_VERSION, '5.4.0', '>=') && !(defined('JSON_C_VERSION') && PHP_INT_SIZE > 4)) {
-            /** In PHP >=5.4.0, json_decode() accepts an options parameter, that allows you
-             * to specify that large ints (like Steam Transaction IDs) should be treated as
-             * strings, rather than the PHP default behaviour of converting them to floats.
-             */
-            $obj = json_decode($input, false, 512, JSON_BIGINT_AS_STRING);
-        } else {
-            /** Not all servers will support that, however, so for older versions we must
-             * manually detect large ints in the JSON string and quote them (thus converting
-             *them to strings) before decoding, hence the preg_replace() call.
-             */
-            $max_int_length = strlen((string) PHP_INT_MAX) - 1;
-            $json_without_bigints = preg_replace('/:\s*(-?\d{' . $max_int_length . ',})/', ': "$1"', $input);
-            $obj = json_decode($json_without_bigints);
-        }
-
-        if (function_exists('json_last_error') && $errno = json_last_error()) {
-            static::handleJsonError($errno);
-        } elseif ($obj === null && $input !== 'null') {
-            throw new DomainException('Null result with non-null input');
-        }
-        return $obj;
-    }
-
-    /**
-     * Encode a PHP object into a JSON string.
-     *
-     * @param object|array $input A PHP object or array
-     *
-     * @return string JSON representation of the PHP object or array
-     *
-     * @throws DomainException Provided object could not be encoded to valid JSON
-     */
-    public static function jsonEncode($input)
-    {
-        $json = json_encode($input);
-        if (function_exists('json_last_error') && $errno = json_last_error()) {
-            static::handleJsonError($errno);
-        } elseif ($json === 'null' && $input !== null) {
-            throw new DomainException('Null result with non-null input');
-        }
-        return $json;
-    }
-
-    /**
-     * Decode a string with URL-safe Base64.
-     *
-     * @param string $input A Base64 encoded string
-     *
-     * @return string A decoded string
-     */
-    public static function urlsafeB64Decode($input)
-    {
-        $remainder = strlen($input) % 4;
-        if ($remainder) {
-            $padlen = 4 - $remainder;
-            $input .= str_repeat('=', $padlen);
-        }
-        return base64_decode(strtr($input, '-_', '+/'));
-    }
-
-    /**
-     * Encode a string with URL-safe Base64.
-     *
-     * @param string $input The string you want encoded
-     *
-     * @return string The base64 encode of what you passed in
-     */
-    public static function urlsafeB64Encode($input)
-    {
-        return str_replace('=', '', strtr(base64_encode($input), '+/', '-_'));
-    }
-
-    /**
-     * Helper method to create a JSON error.
-     *
-     * @param int $errno An error number from json_last_error()
-     *
-     * @return void
-     */
-    private static function handleJsonError($errno)
-    {
-        $messages = 
-            JSON_ERROR_DEPTH => 'Maximum stack depth exceeded',
-            JSON_ERROR_STATE_MISMATCH => 'Invalid or malformed JSON',
-            JSON_ERROR_CTRL_CHAR => 'Unexpected control character found',
-            JSON_ERROR_SYNTAX => 'Syntax error, malformed JSON',
-            JSON_ERROR_UTF8 => 'Malformed UTF-8 characters', //PHP >= 5.3.3
-        ;
-        throw new DomainException(
-            $messages$errno
-            ?? 'Unknown JSON error: ' . $errno
-        );
-    }
-
-    /**
-     * Get the number of bytes in cryptographic strings.
-     *
-     * @param string $str
-     *
-     * @return int
-     */
-    private static function safeStrlen($str)
-    {
-        if (function_exists('mb_strlen')) {
-            return mb_strlen($str, '8bit');
-        }
-        return strlen($str);
-    }
-}

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

roundcubemail-1.5.tar.gz/plugins/libkolab/composer.json Changed

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

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

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

@@ -311,8 +311,8 @@
     {
         // auto-detect text/html format
         if ($is_html === null) {
-            $from_html = (preg_match('/<(html|body)(\s+a-z|>)/', $from, $m) && strpos($from, '</' . $m1 . '>') > 0);
-            $to_html   = (preg_match('/<(html|body)(\s+a-z|>)/', $to, $m) && strpos($to, '</' . $m1 . '>') > 0);
+            $from_html = preg_match('/<(html|body)(\s+a-z|>)/', $from, $m) && strpos($from, '</' . $m1 . '>') > 0;
+            $to_html   = preg_match('/<(html|body)(\s+a-z|>)/', $to, $m) && strpos($to, '</' . $m1 . '>') > 0;
             $is_html   = $from_html || $to_html;
 
             // ensure both parts are of the same format
@@ -328,13 +328,10 @@
 
         // compute diff from HTML
         if ($is_html) {
-            include_once __dir__ . '/vendor/Caxy/HtmlDiff/Match.php';
-            include_once __dir__ . '/vendor/Caxy/HtmlDiff/Operation.php';
-            include_once __dir__ . '/vendor/Caxy/HtmlDiff/HtmlDiff.php';
-
             // replace data: urls with a transparent image to avoid memory problems
-            $from = preg_replace('/src="data:image^"+/', 'src="data:image/gif;base64,R0lGODlhAQABAPAAAOjq6gAAACH/C1hNUCBEYXRhWE1QAT8AIfkEBQAAAAAsAAAAAAEAAQAAAgJEAQA7', $from);
-            $to   = preg_replace('/src="data:image^"+/', 'src="data:image/gif;base64,R0lGODlhAQABAPAAAOjq6gAAACH/C1hNUCBEYXRhWE1QAT8AIfkEBQAAAAAsAAAAAAEAAQAAAgJEAQA7', $to);
+            $src  = 'src="data:image/gif;base64,R0lGODlhAQABAPAAAOjq6gAAACH/C1hNUCBEYXRhWE1QAT8AIfkEBQAAAAAsAAAAAAEAAQAAAgJEAQA7';
+            $from = preg_replace('/src="data:image^"+/', $src, $from);
+            $to   = preg_replace('/src="data:image^"+/', $src, $to);
 
             $diff = new Caxy\HtmlDiff\HtmlDiff($from, $to);
             $diffhtml = $diff->build();
@@ -342,10 +339,8 @@
             // remove empty inserts (from tables)
             return preg_replace('!<ins class="diff\w+">\s*</ins>!Uims', '', $diffhtml);
         } else {
-            include_once __dir__ . '/vendor/finediff.php';
-
-            $diff = new FineDiff($from, $to, FineDiff::$wordGranularity);
-            return $diff->renderDiffToHTML();
+            $diff = new cogpowered\FineDiff\Diff(new cogpowered\FineDiff\Granularity\Word());
+            return $diff->render($from, $to);
         }
     }

roundcubemail-1.5.tar.gz/plugins/libkolab/vendor Deleted

roundcubemail-1.5.tar.gz/plugins/libkolab/vendor/Caxy Deleted

roundcubemail-1.5.tar.gz/plugins/libkolab/vendor/Caxy/HtmlDiff Deleted

roundcubemail-1.5.tar.gz/plugins/libkolab/vendor/Caxy/HtmlDiff/HtmlDiff.php Deleted

@@ -1,629 +0,0 @@
-<?php
-
-namespace Caxy\HtmlDiff;
-
-class HtmlDiff
-{
-    public static $defaultSpecialCaseTags = array('strong', 'b', 'i', 'big', 'small', 'u', 'sub', 'sup', 'strike', 's', 'p');
-    public static $defaultSpecialCaseChars = array('.', ',', '(', ')', '\'');
-    public static $defaultGroupDiffs = true;
-    
-    protected $content;
-    protected $oldText;
-    protected $newText;
-    protected $oldWords = array();
-    protected $newWords = array();
-    protected $wordIndices;
-    protected $encoding;
-    protected $specialCaseOpeningTags = array();
-    protected $specialCaseClosingTags = array();
-    protected $specialCaseTags;
-    protected $specialCaseChars;
-    protected $groupDiffs;
-    protected $insertSpaceInReplace = false;
-
-    public function __construct($oldText, $newText, $encoding = 'UTF-8', $specialCaseTags = null, $groupDiffs = null)
-    {        
-        if ($specialCaseTags === null) {
-            $specialCaseTags = static::$defaultSpecialCaseTags;
-        }
-        
-        if ($groupDiffs === null) {
-            $groupDiffs = static::$defaultGroupDiffs;
-        }
-        
-        $this->oldText = $this->purifyHtml(trim($oldText));
-        $this->newText = $this->purifyHtml(trim($newText));
-        $this->encoding = $encoding;
-        $this->content = '';
-        $this->groupDiffs = $groupDiffs;
-        $this->setSpecialCaseTags($specialCaseTags);
-        $this->setSpecialCaseChars(static::$defaultSpecialCaseChars);
-    }
-
-    /**
-     * @param boolean $boolean
-     * @return HtmlDiff
-     */
-    public function setInsertSpaceInReplace($boolean)
-    {
-        $this->insertSpaceInReplace = $boolean;
-
-        return $this;
-    }
-
-    /**
-     * @return boolean
-     */
-    public function getInsertSpaceInReplace()
-    {
-        return $this->insertSpaceInReplace;
-    }
-    
-    public function setSpecialCaseChars(array $chars)
-    {
-        $this->specialCaseChars = $chars;
-    }
-    
-    public function getSpecialCaseChars()
-    {
-        return $this->specialCaseChars;
-    }
-    
-    public function addSpecialCaseChar($char)
-    {
-        if (!in_array($char, $this->specialCaseChars)) {
-            $this->specialCaseChars = $char;
-        }
-    }
-    
-    public function removeSpecialCaseChar($char)
-    {
-        $key = array_search($char, $this->specialCaseChars);
-        if ($key !== false) {
-            unset($this->specialCaseChars$key);
-        }
-    }
-
-    public function setSpecialCaseTags(array $tags = array())
-    {
-        $this->specialCaseTags = $tags;
-
-        foreach ($this->specialCaseTags as $tag) {
-            $this->addSpecialCaseTag($tag);
-        }
-    }
-
-    public function addSpecialCaseTag($tag)
-    {
-        if (!in_array($tag, $this->specialCaseTags)) {
-            $this->specialCaseTags = $tag;
-        }
-
-        $opening = $this->getOpeningTag($tag);
-        $closing = $this->getClosingTag($tag);
-
-        if (!in_array($opening, $this->specialCaseOpeningTags)) {
-            $this->specialCaseOpeningTags = $opening;
-        }
-        if (!in_array($closing, $this->specialCaseClosingTags)) {
-            $this->specialCaseClosingTags = $closing;
-        }
-    }
-
-    public function removeSpecialCaseTag($tag)
-    {
-        if (($key = array_search($tag, $this->specialCaseTags)) !== false) {
-            unset($this->specialCaseTags$key);
-
-            $opening = $this->getOpeningTag($tag);
-            $closing = $this->getClosingTag($tag);
-
-            if (($key = array_search($opening, $this->specialCaseOpeningTags)) !== false) {
-                unset($this->specialCaseOpeningTags$key);
-            }
-            if (($key = array_search($closing, $this->specialCaseClosingTags)) !== false) {
-                unset($this->specialCaseClosingTags$key);
-            }
-        }
-    }
-
-    public function getSpecialCaseTags()
-    {
-        return $this->specialCaseTags;
-    }
-
-    public function getOldHtml()
-    {
-        return $this->oldText;
-    }
-
-    public function getNewHtml()
-    {
-        return $this->newText;
-    }
-
-    public function getDifference()
-    {
-        return $this->content;
-    }
-    
-    public function setGroupDiffs($boolean)
-    {
-        $this->groupDiffs = $boolean;
-    }
-    
-    public function isGroupDiffs()
-    {
-        return $this->groupDiffs;
-    }
-
-    protected function getOpeningTag($tag)
-    {
-        return "/<".$tag."^>*/i";
-    }
-
-    protected function getClosingTag($tag)
-    {
-        return "</".$tag.">";
-    }
-
-    protected function getStringBetween($str, $start, $end)
-    {
-        $expStr = explode( $start, $str, 2 );
-        if ( count( $expStr ) > 1 ) {
-            $expStr = explode( $end, $expStr 1  );
-            if ( count( $expStr ) > 1 ) {
-                array_pop( $expStr );
-
-                return implode( $end, $expStr );
-            }
-        }
-
-        return '';
-    }
-
-    protected function purifyHtml($html, $tags = null)
-    {
-        if ( class_exists( 'Tidy' ) && false ) {
-            $config = array( 'output-xhtml'   => true, 'indent' => false );
-            $tidy = new tidy;
-            $tidy->parseString( $html, $config, 'utf8' );
-            $html = (string) $tidy;
-
-            return $this->getStringBetween( $html, '<body>' );
-        }
-
-        return $html;
-    }
-
-    public function build()
-    {
-        $this->splitInputsToWords();
-        $this->indexNewWords();
-        $operations = $this->operations();
-        foreach ($operations as $item) {
-            $this->performOperation( $item );
-        }
-
-        return $this->content;
-    }
-
-    protected function indexNewWords()
-    {
-        $this->wordIndices = array();
-        foreach ($this->newWords as $i => $word) {
-            if ( $this->isTag( $word ) ) {
-                $word = $this->stripTagAttributes( $word );
-            }
-            if ( isset( $this->wordIndices $word  ) ) {
-                $this->wordIndices $word  = $i;
-            } else {
-                $this->wordIndices $word  = array( $i );
-            }
-        }
-    }
-
-    protected function splitInputsToWords()
-    {
-        $this->oldWords = $this->convertHtmlToListOfWords( $this->explode( $this->oldText ) );
-        $this->newWords = $this->convertHtmlToListOfWords( $this->explode( $this->newText ) );
-    }
-    
-    protected function isPartOfWord($text)
-    {
-        return ctype_alnum(str_replace($this->specialCaseChars, '', $text));
-    }
-
-    protected function convertHtmlToListOfWords($characterString)
-    {
-        $mode = 'character';
-        $current_word = '';
-        $words = array();
-        foreach ($characterString as $i => $character) {
-            switch ($mode) {
-                case 'character':
-                if ( $this->isStartOfTag( $character ) ) {
-                    if ($current_word != '') {
-                        $words = $current_word;
-                    }
-                    $current_word = "<";
-                    $mode = 'tag';
-                } elseif ( preg_match( "^\s", $character ) > 0 ) {
-                    if ($current_word != '') {
-                        $words = $current_word;
-                    }
-                    $current_word = $character;
-                    $mode = 'whitespace';
-                } else {
-                    if (
-                        (ctype_alnum($character) && (strlen($current_word) == 0 || $this->isPartOfWord($current_word))) ||
-                        (in_array($character, $this->specialCaseChars) && isset($characterString$i+1) && $this->isPartOfWord($characterString$i+1))
-                    ) {
-                        $current_word .= $character;
-                    } else {
-                        $words = $current_word;
-                        $current_word = $character;
-                    }
-                }
-                break;
-                case 'tag' :
-                if ( $this->isEndOfTag( $character ) ) {
-                    $current_word .= ">";
-                    $words = $current_word;
-                    $current_word = "";
-
-                    if ( !preg_match('^\s', $character ) ) {
-                        $mode = 'whitespace';
-                    } else {
-                        $mode = 'character';
-                    }
-                } else {
-                    $current_word .= $character;
-                }
-                break;
-                case 'whitespace':
-                if ( $this->isStartOfTag( $character ) ) {
-                    if ($current_word != '') {
-                        $words = $current_word;
-                    }
-                    $current_word = "<";
-                    $mode = 'tag';
-                } elseif ( preg_match( "^\s", $character ) ) {
-                    $current_word .= $character;
-                } else {
-                    if ($current_word != '') {
-                        $words = $current_word;
-                    }
-                    $current_word = $character;
-                    $mode = 'character';
-                }
-                break;
-                default:
-                break;
-            }
-        }
-        if ($current_word != '') {
-            $words = $current_word;
-        }
-
-        return $words;
-    }
-
-    protected function isStartOfTag($val)
-    {
-        return $val == "<";
-    }
-
-    protected function isEndOfTag($val)
-    {
-        return $val == ">";
-    }
-
-    protected function isWhiteSpace($value)
-    {
-        return !preg_match( '^\s', $value );
-    }
-
-    protected function explode($value)
-    {
-        // as suggested by @onassar
-        return preg_split( '//u', $value );
-    }
-
-    protected function performOperation($operation)
-    {
-        switch ($operation->action) {
-            case 'equal' :
-            $this->processEqualOperation( $operation );
-            break;
-            case 'delete' :
-            $this->processDeleteOperation( $operation, "diffdel" );
-            break;
-            case 'insert' :
-            $this->processInsertOperation( $operation, "diffins");
-            break;
-            case 'replace':
-            $this->processReplaceOperation( $operation );
-            break;
-            default:
-            break;
-        }
-    }
-
-    protected function processReplaceOperation($operation)
-    {
-        $processDelete = strlen($this->oldText) > 0;
-        $processInsert = strlen($this->newText) > 0;
-
-        if ($processDelete) {
-            $this->processDeleteOperation( $operation, "diffmod" );
-        }
-
-        if ($this->insertSpaceInReplace && $processDelete && $processInsert) {
-            $this->content .= ' ';
-        }
-
-        if ($processInsert) {
-            $this->processInsertOperation( $operation, "diffmod" );
-        }
-    }
-
-    protected function processInsertOperation($operation, $cssClass)
-    {
-        $text = array();
-        foreach ($this->newWords as $pos => $s) {
-            if ($pos >= $operation->startInNew && $pos < $operation->endInNew) {
-                $text = $s;
-            }
-        }
-        $this->insertTag( "ins", $cssClass, $text );
-    }
-
-    protected function processDeleteOperation($operation, $cssClass)
-    {
-        $text = array();
-        foreach ($this->oldWords as $pos => $s) {
-            if ($pos >= $operation->startInOld && $pos < $operation->endInOld) {
-                $text = $s;
-            }
-        }
-        $this->insertTag( "del", $cssClass, $text );
-    }
-
-    protected function processEqualOperation($operation)
-    {
-        $result = array();
-        foreach ($this->newWords as $pos => $s) {
-            if ($pos >= $operation->startInNew && $pos < $operation->endInNew) {
-                $result = $s;
-            }
-        }
-        $this->content .= implode( "", $result );
-    }
-
-    protected function insertTag($tag, $cssClass, &$words)
-    {
-        while (true) {
-            if ( count( $words ) == 0 ) {
-                break;
-            }
-
-            $nonTags = $this->extractConsecutiveWords( $words, 'noTag' );
-
-            $specialCaseTagInjection = '';
-            $specialCaseTagInjectionIsBefore = false;
-
-            if ( count( $nonTags ) != 0 ) {
-                $text = $this->wrapText( implode( "", $nonTags ), $tag, $cssClass );
-                $this->content .= $text;
-            } else {
-                $firstOrDefault = false;
-                foreach ($this->specialCaseOpeningTags as $x) {
-                    if ( preg_match( $x, $words 0  ) ) {
-                        $firstOrDefault = $x;
-                        break;
-                    }
-                }
-                if ($firstOrDefault) {
-                    $specialCaseTagInjection = '<ins class="mod">';
-                    if ($tag == "del") {
-                        unset( $words 0  );
-                    }
-                } elseif ( array_search( $words 0 , $this->specialCaseClosingTags ) !== false ) {
-                    $specialCaseTagInjection = "</ins>";
-                    $specialCaseTagInjectionIsBefore = true;
-                    if ($tag == "del") {
-                        unset( $words 0  );
-                    }
-                }
-            }
-            if ( count( $words ) == 0 && count( $specialCaseTagInjection ) == 0 ) {
-                break;
-            }
-            if ($specialCaseTagInjectionIsBefore) {
-                $this->content .= $specialCaseTagInjection . implode( "", $this->extractConsecutiveWords( $words, 'tag' ) );
-            } else {
-                $workTag = $this->extractConsecutiveWords( $words, 'tag' );
-                if ( isset( $workTag 0  ) && $this->isOpeningTag( $workTag 0  ) && !$this->isClosingTag( $workTag 0  ) ) {
-                    if ( strpos( $workTag 0 , 'class=' ) ) {
-                        $workTag 0  = str_replace( 'class="', 'class="diffmod ', $workTag 0  );
-                        $workTag 0  = str_replace( "class='", 'class="diffmod ', $workTag 0  );
-                    } else {
-                        $workTag 0  = str_replace( ">", ' class="diffmod">', $workTag 0  );
-                    }
-                }
-                $this->content .= implode( "", $workTag ) . $specialCaseTagInjection;
-            }
-        }
-    }
-
-    protected function checkCondition($word, $condition)
-    {
-        return $condition == 'tag' ? $this->isTag( $word ) : !$this->isTag( $word );
-    }
-
-    protected function wrapText($text, $tagName, $cssClass)
-    {
-        return sprintf( '<%1$s class="%2$s">%3$s</%1$s>', $tagName, $cssClass, $text );
-    }
-
-    protected function extractConsecutiveWords(&$words, $condition)
-    {
-        $indexOfFirstTag = null;
-        foreach ($words as $i => $word) {
-            if ( !$this->checkCondition( $word, $condition ) ) {
-                $indexOfFirstTag = $i;
-                break;
-            }
-        }
-        if ($indexOfFirstTag !== null) {
-            $items = array();
-            foreach ($words as $pos => $s) {
-                if ($pos >= 0 && $pos < $indexOfFirstTag) {
-                    $items = $s;
-                }
-            }
-            if ($indexOfFirstTag > 0) {
-                array_splice( $words, 0, $indexOfFirstTag );
-            }
-
-            return $items;
-        } else {
-            $items = array();
-            foreach ($words as $pos => $s) {
-                if ( $pos >= 0 && $pos <= count( $words ) ) {
-                    $items = $s;
-                }
-            }
-            array_splice( $words, 0, count( $words ) );
-
-            return $items;
-        }
-    }
-
-    protected function isTag($item)
-    {
-        return $this->isOpeningTag( $item ) || $this->isClosingTag( $item );
-    }
-
-    protected function isOpeningTag($item)
-    {
-        return preg_match( "#<^>+>\\s*#iU", $item );
-    }
-
-    protected function isClosingTag($item)
-    {
-        return preg_match( "#</^>+>\\s*#iU", $item );
-    }
-
-    protected function operations()
-    {
-        $positionInOld = 0;
-        $positionInNew = 0;
-        $operations = array();
-        $matches = $this->matchingBlocks();
-        $matches = new Match( count( $this->oldWords ), count( $this->newWords ), 0 );
-        foreach ($matches as $i => $match) {
-            $matchStartsAtCurrentPositionInOld = ( $positionInOld == $match->startInOld );
-            $matchStartsAtCurrentPositionInNew = ( $positionInNew == $match->startInNew );
-            $action = 'none';
-
-            if ($matchStartsAtCurrentPositionInOld == false && $matchStartsAtCurrentPositionInNew == false) {
-                $action = 'replace';
-            } elseif ($matchStartsAtCurrentPositionInOld == true && $matchStartsAtCurrentPositionInNew == false) {
-                $action = 'insert';
-            } elseif ($matchStartsAtCurrentPositionInOld == false && $matchStartsAtCurrentPositionInNew == true) {
-                $action = 'delete';
-            } else { // This occurs if the first few words are the same in both versions
-                $action = 'none';
-            }
-            if ($action != 'none') {
-                $operations = new Operation( $action, $positionInOld, $match->startInOld, $positionInNew, $match->startInNew );
-            }
-            if ( count( $match ) != 0 ) {
-                $operations = new Operation( 'equal', $match->startInOld, $match->endInOld(), $match->startInNew, $match->endInNew() );
-            }
-            $positionInOld = $match->endInOld();
-            $positionInNew = $match->endInNew();
-        }
-
-        return $operations;
-    }
-
-    protected function matchingBlocks()
-    {
-        $matchingBlocks = array();
-        $this->findMatchingBlocks( 0, count( $this->oldWords ), 0, count( $this->newWords ), $matchingBlocks );
-
-        return $matchingBlocks;
-    }
-
-    protected function findMatchingBlocks($startInOld, $endInOld, $startInNew, $endInNew, &$matchingBlocks)
-    {
-        $match = $this->findMatch( $startInOld, $endInOld, $startInNew, $endInNew );
-        if ($match !== null) {
-            if ($startInOld < $match->startInOld && $startInNew < $match->startInNew) {
-                $this->findMatchingBlocks( $startInOld, $match->startInOld, $startInNew, $match->startInNew, $matchingBlocks );
-            }
-            $matchingBlocks = $match;
-            if ( $match->endInOld() < $endInOld && $match->endInNew() < $endInNew ) {
-                $this->findMatchingBlocks( $match->endInOld(), $endInOld, $match->endInNew(), $endInNew, $matchingBlocks );
-            }
-        }
-    }
-
-    protected function stripTagAttributes($word)
-    {
-        $word = explode( ' ', trim( $word, '<>' ) );
-
-        return '<' . $word 0  . '>';
-    }
-
-    protected function findMatch($startInOld, $endInOld, $startInNew, $endInNew)
-    {
-        $bestMatchInOld = $startInOld;
-        $bestMatchInNew = $startInNew;
-        $bestMatchSize = 0;
-        $matchLengthAt = array();
-        for ($indexInOld = $startInOld; $indexInOld < $endInOld; $indexInOld++) {
-            $newMatchLengthAt = array();
-            $index = $this->oldWords $indexInOld ;
-            if ( $this->isTag( $index ) ) {
-                $index = $this->stripTagAttributes( $index );
-            }
-            if ( !isset( $this->wordIndices $index  ) ) {
-                $matchLengthAt = $newMatchLengthAt;
-                continue;
-            }
-            foreach ($this->wordIndices $index  as $indexInNew) {
-                if ($indexInNew < $startInNew) {
-                    continue;
-                }
-                if ($indexInNew >= $endInNew) {
-                    break;
-                }
-                $newMatchLength = ( isset( $matchLengthAt $indexInNew - 1  ) ? $matchLengthAt $indexInNew - 1  : 0 ) + 1;
-                $newMatchLengthAt $indexInNew  = $newMatchLength;
-                if ($newMatchLength > $bestMatchSize) {
-                    $bestMatchInOld = $indexInOld - $newMatchLength + 1;
-                    $bestMatchInNew = $indexInNew - $newMatchLength + 1;
-                    $bestMatchSize = $newMatchLength;
-                }
-            }
-            $matchLengthAt = $newMatchLengthAt;
-        }
-        
-        // Skip match if none found or match consists only of whitespace
-        if ($bestMatchSize != 0 && 
-            (
-                !$this->isGroupDiffs() || 
-                !preg_match('/^\s+$/', implode('', array_slice($this->oldWords, $bestMatchInOld, $bestMatchSize)))
-            )
-        ) {
-            return new Match($bestMatchInOld, $bestMatchInNew, $bestMatchSize);
-        }
-        
-        return null;
-    }
-}

roundcubemail-1.5.tar.gz/plugins/libkolab/vendor/Caxy/HtmlDiff/Match.php Deleted

roundcubemail-1.5.tar.gz/plugins/libkolab/vendor/Caxy/HtmlDiff/Operation.php Deleted

roundcubemail-1.5.tar.gz/plugins/libkolab/vendor/finediff.php Deleted

@@ -1,688 +0,0 @@
-<?php
-/**
-* FINE granularity DIFF
-*
-* Computes a set of instructions to convert the content of
-* one string into another.
-*
-* Copyright (c) 2011 Raymond Hill (http://raymondhill.net/blog/?p=441)
-*
-* Licensed under The MIT License
-* 
-* 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.
-*
-* @copyright Copyright 2011 (c) Raymond Hill (http://raymondhill.net/blog/?p=441)
-* @link http://www.raymondhill.net/finediff/
-* @version 0.6
-* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
-*/
-
-/**
-* Usage (simplest):
-*
-*   include 'finediff.php';
-*
-*   // for the stock stack, granularity values are:
-*   // FineDiff::$paragraphGranularity = paragraph/line level
-*   // FineDiff::$sentenceGranularity = sentence level
-*   // FineDiff::$wordGranularity = word level
-*   // FineDiff::$characterGranularity = character level default
-*
-*   $opcodes = FineDiff::getDiffOpcodes($from_text, $to_text , $granularityStack = null );
-*   // store opcodes for later use...
-*
-*   ...
-*
-*   // restore $to_text from $from_text + $opcodes
-*   include 'finediff.php';
-*   $to_text = FineDiff::renderToTextFromOpcodes($from_text, $opcodes);
-*
-*   ...
-*/
-
-/**
-* Persisted opcodes (string) are a sequence of atomic opcode.
-* A single opcode can be one of the following:
-*   c | c{n} | d | d{n} | i:{c} | i{length}:{s}
-*   'c'        = copy one character from source
-*   'c{n}'     = copy n characters from source
-*   'd'        = skip one character from source
-*   'd{n}'     = skip n characters from source
-*   'i:{c}     = insert character 'c'
-*   'i{n}:{s}' = insert string s, which is of length n
-*
-* Do not exist as of now, under consideration:
-*   'm{n}:{o}  = move n characters from source o characters ahead.
-*   It would be essentially a shortcut for a delete->copy->insert
-*   command (swap) for when the inserted segment is exactly the same
-*   as the deleted one, and with only a copy operation in between.
-*   TODO: How often this case occurs? Is it worth it? Can only
-*   be done as a postprocessing method (->optimize()?)
-*/
-abstract class FineDiffOp {
-	abstract public function getFromLen();
-	abstract public function getToLen();
-	abstract public function getOpcode();
-	}
-
-class FineDiffDeleteOp extends FineDiffOp {
-	public function __construct($len) {
-		$this->fromLen = $len;
-		}
-	public function getFromLen() {
-		return $this->fromLen;
-		}
-	public function getToLen() {
-		return 0;
-		}
-	public function getOpcode() {
-		if ( $this->fromLen === 1 ) {
-			return 'd';
-			}
-		return "d{$this->fromLen}";
-		}
-	}
-
-class FineDiffInsertOp extends FineDiffOp {
-	public function __construct($text) {
-		$this->text = $text;
-		}
-	public function getFromLen() {
-		return 0;
-		}
-	public function getToLen() {
-		return strlen($this->text);
-		}
-	public function getText() {
-		return $this->text;
-		}
-	public function getOpcode() {
-		$to_len = strlen($this->text);
-		if ( $to_len === 1 ) {
-			return "i:{$this->text}";
-			}
-		return "i{$to_len}:{$this->text}";
-		}
-	}
-
-class FineDiffReplaceOp extends FineDiffOp {
-	public function __construct($fromLen, $text) {
-		$this->fromLen = $fromLen;
-		$this->text = $text;
-		}
-	public function getFromLen() {
-		return $this->fromLen;
-		}
-	public function getToLen() {
-		return strlen($this->text);
-		}
-	public function getText() {
-		return $this->text;
-		}
-	public function getOpcode() {
-		if ( $this->fromLen === 1 ) {
-			$del_opcode = 'd';
-			}
-		else {
-			$del_opcode = "d{$this->fromLen}";
-			}
-		$to_len = strlen($this->text);
-		if ( $to_len === 1 ) {
-			return "{$del_opcode}i:{$this->text}";
-			}
-		return "{$del_opcode}i{$to_len}:{$this->text}";
-		}
-	}
-
-class FineDiffCopyOp extends FineDiffOp {
-	public function __construct($len) {
-		$this->len = $len;
-		}
-	public function getFromLen() {
-		return $this->len;
-		}
-	public function getToLen() {
-		return $this->len;
-		}
-	public function getOpcode() {
-		if ( $this->len === 1 ) {
-			return 'c';
-			}
-		return "c{$this->len}";
-		}
-	public function increase($size) {
-		return $this->len += $size;
-		}
-	}
-
-/**
-* FineDiff ops
-*
-* Collection of ops
-*/
-class FineDiffOps {
-	public function appendOpcode($opcode, $from, $from_offset, $from_len) {
-		if ( $opcode === 'c' ) {
-			$edits = new FineDiffCopyOp($from_len);
-			}
-		else if ( $opcode === 'd' ) {
-			$edits = new FineDiffDeleteOp($from_len);
-			}
-		else /* if ( $opcode === 'i' ) */ {
-			$edits = new FineDiffInsertOp(substr($from, $from_offset, $from_len));
-			}
-		}
-	public $edits = array();
-	}
-
-/**
-* FineDiff class
-*
-* TODO: Document
-*
-*/
-class FineDiff {
-
-	/**------------------------------------------------------------------------
-	*
-	* Public section
-	*
-	*/
-
-	/**
-	* Constructor
-	* ...
-	* The $granularityStack allows FineDiff to be configurable so that
-	* a particular stack tailored to the specific content of a document can
-	* be passed.
-	*/
-	public function __construct($from_text = '', $to_text = '', $granularityStack = null) {
-		// setup stack for generic text documents by default
-		$this->granularityStack = $granularityStack ? $granularityStack : FineDiff::$characterGranularity;
-		$this->edits = array();
-		$this->from_text = $from_text;
-		$this->doDiff($from_text, $to_text);
-		}
-
-	public function getOps() {
-		return $this->edits;
-		}
-
-	public function getOpcodes() {
-		$opcodes = array();
-		foreach ( $this->edits as $edit ) {
-			$opcodes = $edit->getOpcode();
-			}
-		return implode('', $opcodes);
-		}
-
-	public function renderDiffToHTML() {
-		$in_offset = 0;
-		$html = '';
-		foreach ( $this->edits as $edit ) {
-			$n = $edit->getFromLen();
-			if ( $edit instanceof FineDiffCopyOp ) {
-				$html .= FineDiff::renderDiffToHTMLFromOpcode('c', $this->from_text, $in_offset, $n);
-				}
-			else if ( $edit instanceof FineDiffDeleteOp ) {
-				$html .= FineDiff::renderDiffToHTMLFromOpcode('d', $this->from_text, $in_offset, $n);
-				}
-			else if ( $edit instanceof FineDiffInsertOp ) {
-				$html .= FineDiff::renderDiffToHTMLFromOpcode('i', $edit->getText(), 0, $edit->getToLen());
-				}
-			else /* if ( $edit instanceof FineDiffReplaceOp ) */ {
-				$html .= FineDiff::renderDiffToHTMLFromOpcode('d', $this->from_text, $in_offset, $n);
-				$html .= FineDiff::renderDiffToHTMLFromOpcode('i', $edit->getText(), 0, $edit->getToLen());
-				}
-			$in_offset += $n;
-			}
-		return $html;
-		}
-
-	/**------------------------------------------------------------------------
-	* Return an opcodes string describing the diff between a "From" and a
-	* "To" string
-	*/
-	public static function getDiffOpcodes($from, $to, $granularities = null) {
-		$diff = new FineDiff($from, $to, $granularities);
-		return $diff->getOpcodes();
-		}
-
-	/**------------------------------------------------------------------------
-	* Return an iterable collection of diff ops from an opcodes string
-	*/
-	public static function getDiffOpsFromOpcodes($opcodes) {
-		$diffops = new FineDiffOps();
-		FineDiff::renderFromOpcodes(null, $opcodes, array($diffops,'appendOpcode'));
-		return $diffops->edits;
-		}
-
-	/**------------------------------------------------------------------------
-	* Re-create the "To" string from the "From" string and an "Opcodes" string
-	*/
-	public static function renderToTextFromOpcodes($from, $opcodes) {
-		return FineDiff::renderFromOpcodes($from, $opcodes, array('FineDiff','renderToTextFromOpcode'));
-		}
-
-	/**------------------------------------------------------------------------
-	* Render the diff to an HTML string
-	*/
-	public static function renderDiffToHTMLFromOpcodes($from, $opcodes) {
-		return FineDiff::renderFromOpcodes($from, $opcodes, array('FineDiff','renderDiffToHTMLFromOpcode'));
-		}
-
-	/**------------------------------------------------------------------------
-	* Generic opcodes parser, user must supply callback for handling
-	* single opcode
-	*/
-	public static function renderFromOpcodes($from, $opcodes, $callback) {
-		if ( !is_callable($callback) ) {
-			return '';
-			}
-		$out = '';
-		$opcodes_len = strlen($opcodes);
-		$from_offset = $opcodes_offset = 0;
-		while ( $opcodes_offset <  $opcodes_len ) {
-			$opcode = substr($opcodes, $opcodes_offset, 1);
-			$opcodes_offset++;
-			$n = intval(substr($opcodes, $opcodes_offset));
-			if ( $n ) {
-				$opcodes_offset += strlen(strval($n));
-				}
-			else {
-				$n = 1;
-				}
-			if ( $opcode === 'c' ) { // copy n characters from source
-				$out .= call_user_func($callback, 'c', $from, $from_offset, $n, '');
-				$from_offset += $n;
-				}
-			else if ( $opcode === 'd' ) { // delete n characters from source
-				$out .= call_user_func($callback, 'd', $from, $from_offset, $n, '');
-				$from_offset += $n;
-				}
-			else /* if ( $opcode === 'i' ) */ { // insert n characters from opcodes
-				$out .= call_user_func($callback, 'i', $opcodes, $opcodes_offset + 1, $n);
-				$opcodes_offset += 1 + $n;
-				}
-			}
-		return $out;
-		}
-
-	/**
-	* Stock granularity stacks and delimiters
-	*/
-
-	const paragraphDelimiters = "\n\r";
-	public static $paragraphGranularity = array(
-		FineDiff::paragraphDelimiters
-		);
-	const sentenceDelimiters = ".\n\r";
-	public static $sentenceGranularity = array(
-		FineDiff::paragraphDelimiters,
-		FineDiff::sentenceDelimiters
-		);
-	const wordDelimiters = " \t.\n\r";
-	public static $wordGranularity = array(
-		FineDiff::paragraphDelimiters,
-		FineDiff::sentenceDelimiters,
-		FineDiff::wordDelimiters
-		);
-	const characterDelimiters = "";
-	public static $characterGranularity = array(
-		FineDiff::paragraphDelimiters,
-		FineDiff::sentenceDelimiters,
-		FineDiff::wordDelimiters,
-		FineDiff::characterDelimiters
-		);
-
-	public static $textStack = array(
-		".",
-		" \t.\n\r",
-		""
-		);
-
-	/**------------------------------------------------------------------------
-	*
-	* Private section
-	*
-	*/
-
-	/**
-	* Entry point to compute the diff.
-	*/
-	private function doDiff($from_text, $to_text) {
-		$this->last_edit = false;
-		$this->stackpointer = 0;
-		$this->from_text = $from_text;
-		$this->from_offset = 0;
-		// can't diff without at least one granularity specifier
-		if ( empty($this->granularityStack) ) {
-			return;
-			}
-		$this->_processGranularity($from_text, $to_text);
-		}
-
-	/**
-	* This is the recursive function which is responsible for
-	* handling/increasing granularity.
-	*
-	* Incrementally increasing the granularity is key to compute the
-	* overall diff in a very efficient way.
-	*/
-	private function _processGranularity($from_segment, $to_segment) {
-		$delimiters = $this->granularityStack$this->stackpointer++;
-		$has_next_stage = $this->stackpointer < count($this->granularityStack);
-		foreach ( FineDiff::doFragmentDiff($from_segment, $to_segment, $delimiters) as $fragment_edit ) {
-			// increase granularity
-			if ( $fragment_edit instanceof FineDiffReplaceOp && $has_next_stage ) {
-				$this->_processGranularity(
-					substr($this->from_text, $this->from_offset, $fragment_edit->getFromLen()),
-					$fragment_edit->getText()
-					);
-				}
-			// fuse copy ops whenever possible
-			else if ( $fragment_edit instanceof FineDiffCopyOp && $this->last_edit instanceof FineDiffCopyOp ) {
-				$this->editscount($this->edits)-1->increase($fragment_edit->getFromLen());
-				$this->from_offset += $fragment_edit->getFromLen();
-				}
-			else {
-				/* $fragment_edit instanceof FineDiffCopyOp */
-				/* $fragment_edit instanceof FineDiffDeleteOp */
-				/* $fragment_edit instanceof FineDiffInsertOp */
-				$this->edits = $this->last_edit = $fragment_edit;
-				$this->from_offset += $fragment_edit->getFromLen();
-				}
-			}
-		$this->stackpointer--;
-		}
-
-	/**
-	* This is the core algorithm which actually perform the diff itself,
-	* fragmenting the strings as per specified delimiters.
-	*
-	* This function is naturally recursive, however for performance purpose
-	* a local job queue is used instead of outright recursivity.
-	*/
-	private static function doFragmentDiff($from_text, $to_text, $delimiters) {
-		// Empty delimiter means character-level diffing.
-		// In such case, use code path optimized for character-level
-		// diffing.
-		if ( empty($delimiters) ) {
-			return FineDiff::doCharDiff($from_text, $to_text);
-			}
-
-		$result = array();
-
-		// fragment-level diffing
-		$from_text_len = strlen($from_text);
-		$to_text_len = strlen($to_text);
-		$from_fragments = FineDiff::extractFragments($from_text, $delimiters);
-		$to_fragments = FineDiff::extractFragments($to_text, $delimiters);
-
-		$jobs = array(array(0, $from_text_len, 0, $to_text_len));
-
-		$cached_array_keys = array();
-
-		while ( $job = array_pop($jobs) ) {
-
-			// get the segments which must be diff'ed
-			list($from_segment_start, $from_segment_end, $to_segment_start, $to_segment_end) = $job;
-
-			// catch easy cases first
-			$from_segment_length = $from_segment_end - $from_segment_start;
-			$to_segment_length = $to_segment_end - $to_segment_start;
-			if ( !$from_segment_length || !$to_segment_length ) {
-				if ( $from_segment_length ) {
-					$result$from_segment_start * 4 = new FineDiffDeleteOp($from_segment_length);
-					}
-				else if ( $to_segment_length ) {
-					$result$from_segment_start * 4 + 1 = new FineDiffInsertOp(substr($to_text, $to_segment_start, $to_segment_length));
-					}
-				continue;
-				}
-
-			// find longest copy operation for the current segments
-			$best_copy_length = 0;
-
-			$from_base_fragment_index = $from_segment_start;
-
-			$cached_array_keys_for_current_segment = array();
-
-			while ( $from_base_fragment_index < $from_segment_end ) {
-				$from_base_fragment = $from_fragments$from_base_fragment_index;
-				$from_base_fragment_length = strlen($from_base_fragment);
-				// performance boost: cache array keys
-				if ( !isset($cached_array_keys_for_current_segment$from_base_fragment) ) {
-					if ( !isset($cached_array_keys$from_base_fragment) ) {
-						$to_all_fragment_indices = $cached_array_keys$from_base_fragment = array_keys($to_fragments, $from_base_fragment, true);
-						}
-					else {
-						$to_all_fragment_indices = $cached_array_keys$from_base_fragment;
-						}
-					// get only indices which falls within current segment
-					if ( $to_segment_start > 0 || $to_segment_end < $to_text_len ) {
-						$to_fragment_indices = array();
-						foreach ( $to_all_fragment_indices as $to_fragment_index ) {
-							if ( $to_fragment_index < $to_segment_start ) { continue; }
-							if ( $to_fragment_index >= $to_segment_end ) { break; }
-							$to_fragment_indices = $to_fragment_index;
-							}
-						$cached_array_keys_for_current_segment$from_base_fragment = $to_fragment_indices;
-						}
-					else {
-						$to_fragment_indices = $to_all_fragment_indices;
-						}
-					}
-				else {
-					$to_fragment_indices = $cached_array_keys_for_current_segment$from_base_fragment;
-					}
-				// iterate through collected indices
-				foreach ( $to_fragment_indices as $to_base_fragment_index ) {
-					$fragment_index_offset = $from_base_fragment_length;
-					// iterate until no more match
-					for (;;) {
-						$fragment_from_index = $from_base_fragment_index + $fragment_index_offset;
-						if ( $fragment_from_index >= $from_segment_end ) {
-							break;
-							}
-						$fragment_to_index = $to_base_fragment_index + $fragment_index_offset;
-						if ( $fragment_to_index >= $to_segment_end ) {
-							break;
-							}
-						if ( $from_fragments$fragment_from_index !== $to_fragments$fragment_to_index ) {
-							break;
-							}
-						$fragment_length = strlen($from_fragments$fragment_from_index);
-						$fragment_index_offset += $fragment_length;
-						}
-					if ( $fragment_index_offset > $best_copy_length ) {
-						$best_copy_length = $fragment_index_offset;
-						$best_from_start = $from_base_fragment_index;
-						$best_to_start = $to_base_fragment_index;
-						}
-					}
-				$from_base_fragment_index += strlen($from_base_fragment);
-				// If match is larger than half segment size, no point trying to find better
-				// TODO: Really?
-				if ( $best_copy_length >= $from_segment_length / 2) {
-					break;
-					}
-				// no point to keep looking if what is left is less than
-				// current best match
-				if ( $from_base_fragment_index + $best_copy_length >= $from_segment_end ) {
-					break;
-					}
-				}
-
-			if ( $best_copy_length ) {
-				$jobs = array($from_segment_start, $best_from_start, $to_segment_start, $best_to_start);
-				$result$best_from_start * 4 + 2 = new FineDiffCopyOp($best_copy_length);
-				$jobs = array($best_from_start + $best_copy_length, $from_segment_end, $best_to_start + $best_copy_length, $to_segment_end);
-				}
-			else {
-				$result$from_segment_start * 4  = new FineDiffReplaceOp($from_segment_length, substr($to_text, $to_segment_start, $to_segment_length));
-				}
-			}
-
-		ksort($result, SORT_NUMERIC);
-		return array_values($result);
-		}
-
-	/**
-	* Perform a character-level diff.
-	*
-	* The algorithm is quite similar to doFragmentDiff(), except that
-	* the code path is optimized for character-level diff -- strpos() is
-	* used to find out the longest common subequence of characters.
-	*
-	* We try to find a match using the longest possible subsequence, which
-	* is at most the length of the shortest of the two strings, then incrementally
-	* reduce the size until a match is found.
-	*
-	* I still need to study more the performance of this function. It
-	* appears that for long strings, the generic doFragmentDiff() is more
-	* performant. For word-sized strings, doCharDiff() is somewhat more
-	* performant.
-	*/
-	private static function doCharDiff($from_text, $to_text) {
-		$result = array();
-		$jobs = array(array(0, strlen($from_text), 0, strlen($to_text)));
-		while ( $job = array_pop($jobs) ) {
-			// get the segments which must be diff'ed
-			list($from_segment_start, $from_segment_end, $to_segment_start, $to_segment_end) = $job;
-			$from_segment_len = $from_segment_end - $from_segment_start;
-			$to_segment_len = $to_segment_end - $to_segment_start;
-
-			// catch easy cases first
-			if ( !$from_segment_len || !$to_segment_len ) {
-				if ( $from_segment_len ) {
-					$result$from_segment_start * 4 + 0 = new FineDiffDeleteOp($from_segment_len);
-					}
-				else if ( $to_segment_len ) {
-					$result$from_segment_start * 4 + 1 = new FineDiffInsertOp(substr($to_text, $to_segment_start, $to_segment_len));
-					}
-				continue;
-				}
-			if ( $from_segment_len >= $to_segment_len ) {
-				$copy_len = $to_segment_len;
-				while ( $copy_len ) {
-					$to_copy_start = $to_segment_start;
-					$to_copy_start_max = $to_segment_end - $copy_len;
-					while ( $to_copy_start <= $to_copy_start_max ) {
-						$from_copy_start = strpos(substr($from_text, $from_segment_start, $from_segment_len), substr($to_text, $to_copy_start, $copy_len));
-						if ( $from_copy_start !== false ) {
-							$from_copy_start += $from_segment_start;
-							break 2;
-							}
-						$to_copy_start++;
-						}
-					$copy_len--;
-					}
-				}
-			else {
-				$copy_len = $from_segment_len;
-				while ( $copy_len ) {
-					$from_copy_start = $from_segment_start;
-					$from_copy_start_max = $from_segment_end - $copy_len;
-					while ( $from_copy_start <= $from_copy_start_max ) {
-						$to_copy_start = strpos(substr($to_text, $to_segment_start, $to_segment_len), substr($from_text, $from_copy_start, $copy_len));
-						if ( $to_copy_start !== false ) {
-							$to_copy_start += $to_segment_start;
-							break 2;
-							}
-						$from_copy_start++;
-						}
-					$copy_len--;
-					}
-				}
-			// match found
-			if ( $copy_len ) {
-				$jobs = array($from_segment_start, $from_copy_start, $to_segment_start, $to_copy_start);
-				$result$from_copy_start * 4 + 2 = new FineDiffCopyOp($copy_len);
-				$jobs = array($from_copy_start + $copy_len, $from_segment_end, $to_copy_start + $copy_len, $to_segment_end);
-				}
-			// no match,  so delete all, insert all
-			else {
-				$result$from_segment_start * 4 = new FineDiffReplaceOp($from_segment_len, substr($to_text, $to_segment_start, $to_segment_len));
-				}
-			}
-		ksort($result, SORT_NUMERIC);
-		return array_values($result);
-		}
-
-	/**
-	* Efficiently fragment the text into an array according to
-	* specified delimiters.
-	* No delimiters means fragment into single character.
-	* The array indices are the offset of the fragments into
-	* the input string.
-	* A sentinel empty fragment is always added at the end.
-	* Careful: No check is performed as to the validity of the
-	* delimiters.
-	*/
-	private static function extractFragments($text, $delimiters) {
-		// special case: split into characters
-		if ( empty($delimiters) ) {
-			$chars = str_split($text, 1);
-			$charsstrlen($text) = '';
-			return $chars;
-			}
-		$fragments = array();
-		$start = $end = 0;
-		for (;;) {
-			$end += strcspn($text, $delimiters, $end);
-			$end += strspn($text, $delimiters, $end);
-			if ( $end === $start ) {
-				break;
-				}
-			$fragments$start = substr($text, $start, $end - $start);
-			$start = $end;
-			}
-		$fragments$start = '';
-		return $fragments;
-		}
-
-	/**
-	* Stock opcode renderers
-	*/
-	private static function renderToTextFromOpcode($opcode, $from, $from_offset, $from_len) {
-		if ( $opcode === 'c' || $opcode === 'i' ) {
-			return substr($from, $from_offset, $from_len);
-			}
-		return '';
-		}
-
-	private static function renderDiffToHTMLFromOpcode($opcode, $from, $from_offset, $from_len) {
-		if ( $opcode === 'c' ) {
-			return htmlentities(substr($from, $from_offset, $from_len));
-			}
-		else if ( $opcode === 'd' ) {
-			$deletion = substr($from, $from_offset, $from_len);
-			if ( strcspn($deletion, " \n\r") === 0 ) {
-				$deletion = str_replace(array("\n","\r"), array('\n','\r'), $deletion);
-				}
-			return '<del>' . htmlentities($deletion) . '</del>';
-			}
-		else /* if ( $opcode === 'i' ) */ {
- 			return '<ins>' . htmlentities(substr($from, $from_offset, $from_len)) . '</ins>';
-			}
-		return '';
-		}
-	}
-

roundcubemail-1.5.tar.gz/plugins/libkolab/vendor/finediff_modifications.diff Deleted

@@ -1,121 +0,0 @@
---- finediff.php.orig	2014-07-29 14:24:10.000000000 +0200
-+++ finediff.php	2014-07-29 14:30:38.000000000 +0200
-@@ -234,25 +234,25 @@
- 
- 	public function renderDiffToHTML() {
- 		$in_offset = 0;
--		ob_start();
-+		$html = '';
- 		foreach ( $this->edits as $edit ) {
- 			$n = $edit->getFromLen();
- 			if ( $edit instanceof FineDiffCopyOp ) {
--				FineDiff::renderDiffToHTMLFromOpcode('c', $this->from_text, $in_offset, $n);
-+				$html .= FineDiff::renderDiffToHTMLFromOpcode('c', $this->from_text, $in_offset, $n);
- 				}
- 			else if ( $edit instanceof FineDiffDeleteOp ) {
--				FineDiff::renderDiffToHTMLFromOpcode('d', $this->from_text, $in_offset, $n);
-+				$html .= FineDiff::renderDiffToHTMLFromOpcode('d', $this->from_text, $in_offset, $n);
- 				}
- 			else if ( $edit instanceof FineDiffInsertOp ) {
--				FineDiff::renderDiffToHTMLFromOpcode('i', $edit->getText(), 0, $edit->getToLen());
-+				$html .= FineDiff::renderDiffToHTMLFromOpcode('i', $edit->getText(), 0, $edit->getToLen());
- 				}
- 			else /* if ( $edit instanceof FineDiffReplaceOp ) */ {
--				FineDiff::renderDiffToHTMLFromOpcode('d', $this->from_text, $in_offset, $n);
--				FineDiff::renderDiffToHTMLFromOpcode('i', $edit->getText(), 0, $edit->getToLen());
-+				$html .= FineDiff::renderDiffToHTMLFromOpcode('d', $this->from_text, $in_offset, $n);
-+				$html .= FineDiff::renderDiffToHTMLFromOpcode('i', $edit->getText(), 0, $edit->getToLen());
- 				}
- 			$in_offset += $n;
- 			}
--		return ob_get_clean();
-+		return $html;
- 		}
- 
- 	/**------------------------------------------------------------------------
-@@ -277,18 +277,14 @@
- 	* Re-create the "To" string from the "From" string and an "Opcodes" string
- 	*/
- 	public static function renderToTextFromOpcodes($from, $opcodes) {
--		ob_start();
--		FineDiff::renderFromOpcodes($from, $opcodes, array('FineDiff','renderToTextFromOpcode'));
--		return ob_get_clean();
-+		return FineDiff::renderFromOpcodes($from, $opcodes, array('FineDiff','renderToTextFromOpcode'));
- 		}
- 
- 	/**------------------------------------------------------------------------
- 	* Render the diff to an HTML string
- 	*/
- 	public static function renderDiffToHTMLFromOpcodes($from, $opcodes) {
--		ob_start();
--		FineDiff::renderFromOpcodes($from, $opcodes, array('FineDiff','renderDiffToHTMLFromOpcode'));
--		return ob_get_clean();
-+		return FineDiff::renderFromOpcodes($from, $opcodes, array('FineDiff','renderDiffToHTMLFromOpcode'));
- 		}
- 
- 	/**------------------------------------------------------------------------
-@@ -297,8 +293,9 @@
- 	*/
- 	public static function renderFromOpcodes($from, $opcodes, $callback) {
- 		if ( !is_callable($callback) ) {
--			return;
-+			return '';
- 			}
-+		$out = '';
- 		$opcodes_len = strlen($opcodes);
- 		$from_offset = $opcodes_offset = 0;
- 		while ( $opcodes_offset <  $opcodes_len ) {
-@@ -312,18 +309,19 @@
- 				$n = 1;
- 				}
- 			if ( $opcode === 'c' ) { // copy n characters from source
--				call_user_func($callback, 'c', $from, $from_offset, $n, '');
-+				$out .= call_user_func($callback, 'c', $from, $from_offset, $n, '');
- 				$from_offset += $n;
- 				}
- 			else if ( $opcode === 'd' ) { // delete n characters from source
--				call_user_func($callback, 'd', $from, $from_offset, $n, '');
-+				$out .= call_user_func($callback, 'd', $from, $from_offset, $n, '');
- 				$from_offset += $n;
- 				}
- 			else /* if ( $opcode === 'i' ) */ { // insert n characters from opcodes
--				call_user_func($callback, 'i', $opcodes, $opcodes_offset + 1, $n);
-+				$out .= call_user_func($callback, 'i', $opcodes, $opcodes_offset + 1, $n);
- 				$opcodes_offset += 1 + $n;
- 				}
- 			}
-+		return $out;
- 		}
- 
- 	/**
-@@ -665,24 +663,26 @@
- 	*/
- 	private static function renderToTextFromOpcode($opcode, $from, $from_offset, $from_len) {
- 		if ( $opcode === 'c' || $opcode === 'i' ) {
--			echo substr($from, $from_offset, $from_len);
-+			return substr($from, $from_offset, $from_len);
- 			}
-+		return '';
- 		}
- 
- 	private static function renderDiffToHTMLFromOpcode($opcode, $from, $from_offset, $from_len) {
- 		if ( $opcode === 'c' ) {
--			echo htmlentities(substr($from, $from_offset, $from_len));
-+			return htmlentities(substr($from, $from_offset, $from_len));
- 			}
- 		else if ( $opcode === 'd' ) {
- 			$deletion = substr($from, $from_offset, $from_len);
- 			if ( strcspn($deletion, " \n\r") === 0 ) {
- 				$deletion = str_replace(array("\n","\r"), array('\n','\r'), $deletion);
- 				}
--			echo '<del>', htmlentities($deletion), '</del>';
-+			return '<del>' . htmlentities($deletion) . '</del>';
- 			}
- 		else /* if ( $opcode === 'i' ) */ {
-- 			echo '<ins>', htmlentities(substr($from, $from_offset, $from_len)), '</ins>';
-+ 			return '<ins>' . htmlentities(substr($from, $from_offset, $from_len)) . '</ins>';
- 			}
-+		return '';
- 		}
- 	}
-

roundcubemail-1.5.tar.gz/plugins/tasklist/drivers/caldav/tasklist_caldav_driver.php Changed

@@ -79,7 +79,6 @@
 
             $this->lists$tasklist'id' = $tasklist;
             $this->folders$tasklist'id' = $folder;
-            //            $this->folders$folder->name = $folder;
         }
 
         return $this->lists;
@@ -88,13 +87,13 @@
     /**
      * Derive list properties from the given kolab_storage_folder object
      */
-    protected function folder_props($folder, $prefs)
+    protected function folder_props($folder, $prefs = )
     {
         if ($folder->get_namespace() == 'personal') {
             $norename = false;
             $editable = true;
             $rights = 'lrswikxtea';
-            $alarms = true;
+            $alarms = !isset($folder->attributes'alarms') || $folder->attributes'alarms';
         } else {
             $alarms = false;
             $rights = 'lr';
@@ -302,6 +301,7 @@
     public function create_list(&$prop)
     {
         $prop'type' = 'task';
+        $prop'alarms' = !empty($prop'showalarms');
 
         $id = $this->storage->folder_update($prop);
 
@@ -309,22 +309,12 @@
             return false;
         }
 
-        $prefs'kolab_tasklists' = $this->rc->config->get('kolab_tasklists', );
-
-        if (isset($prop'showalarms')) {
-            $prefs'kolab_tasklists'$id'showalarms' = $prop'showalarms' ? true : false;
-        }
-
-        if (isset($prefs'kolab_tasklists'$id)) {
-            $this->rc->user->save_prefs($prefs);
-        }
-
         // force page reload to properly render folder hierarchy
         if (!empty($prop'parent')) {
             $prop'_reload' = true;
         } else {
-            $folder = $this->get_folder($id);
-            $prop += $this->folder_props($folder, );
+            $prop += $this->_read_lists(true)$id ?? ;
+            unset($prop'type', $prop'alarms');
         }
 
         return $id;
@@ -346,23 +336,12 @@
         if (!empty($prop'id')) {
             $id = $prop'id';
             $prop'type' = 'task';
+            $prop'alarms' = !empty($prop'showalarms');
 
             if ($this->storage->folder_update($prop) !== false) {
-                $prefs'kolab_tasklists' = $this->rc->config->get('kolab_tasklists', );
-
-                if (isset($prop'showalarms')) {
-                    $prefs'kolab_tasklists'$id'showalarms' = $prop'showalarms' ? true : false;
-                }
+                $prop += $this->_read_lists(true)$id ?? ;
+                unset($prop'type', $prop'alarms');
 
-                if (isset($prefs'kolab_tasklists'$id)) {
-                    $this->rc->user->save_prefs($prefs);
-                }
-                /*
-                                // force page reload if folder name/hierarchy changed
-                                if ($newfolder != $prop'oldname') {
-                                    $prop'_reload' = true;
-                                }
-                */
                 return true;
             }
         }

roundcubemail-1.5.tar.gz/plugins/tasklist/tasklist.js Changed

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

@@ -1009,10 +1009,6 @@
 
         unset($list'_token');
 
-        if (isset($list'showalarms')) {
-            $list'showalarms' = intval($list'showalarms');
-        }
-
         switch ($action) {
             case 'form-new':
             case 'form-edit':
@@ -1021,7 +1017,7 @@
                 exit;
 
             case 'new':
-                $list += 'showalarms' => true, 'active' => true, 'editable' => true;
+                $list += 'showalarms' => !empty($list'showalarms'), 'active' => true, 'editable' => true;
                 if ($insert_id = $this->driver->create_list($list)) {
                     $list'id' = $insert_id;
                     if (empty($list'_reload')) {
@@ -1036,6 +1032,7 @@
 
             case 'edit':
                 $list'oldid' = $list'id';
+                $list'showalarms' = !empty($list'showalarms');
                 if ($success = $this->driver->edit_list($list)) {
                     $this->rc->output->command('plugin.update_tasklist', $list);
                 }
@@ -1279,7 +1276,7 @@
         }
 
         if (!isset($rec'tags') || !is_array($rec'tags')) {
-            $rec'tags' = (array) ($rec'tags' ?? '');
+            $rec'tags' = ;
         }
 
         sort($rec'tags', SORT_LOCALE_STRING);

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

@@ -1270,6 +1270,20 @@
         self::write_log('console', implode(";\n", $msg));
     }
 
+    public static function component_name()
+    {
+        if (defined("KOLAB_SYNC_START")) {
+            return "syncroton";
+        }
+        if (defined("KOLAB_DAV_VERSION")) {
+            return "irony";
+        }
+        if (defined("FILE_API_START")) {
+            return "chwala";
+        }
+        return "roundcube";
+    }
+
     /**
      * Append a line to a logfile in the logs directory.
      * Date will be added automatically to the line.
@@ -1309,6 +1323,25 @@
             }
         }
 
+        // write message in logfmt format with extra info when configured to log to STDOUT
+        if ($log_driver == 'logfmt') {
+            $user_name = self::$instance->get_user_name();
+            $component = self::component_name();
+
+            $output = "name=$name component=$component";
+            // add session ID to the log
+            if ($session_key > 0 && ($sess = session_id())) {
+                $output .= " session=" . substr($sess, 0, $session_key);
+            }
+
+            if (!empty($user_name)) {
+                $output .= " user=$user_name";
+            }
+            $line = json_encode($line);
+            $output .= " log=$line\n";
+            return file_put_contents("php://stdout", $output, FILE_APPEND) !== false;
+        }
+
         // add session ID to the log
         if ($session_key > 0 && ($sess = session_id())) {
             $line = '<' . substr($sess, 0, $session_key) . '> ' . $line;
@@ -1330,13 +1363,6 @@
             return syslog($prio, $line);
         }
 
-        // write message with file name when configured to log to STDOUT
-        if ($log_driver == 'stdout') {
-            $stdout = "php://stdout";
-            $line = "$name: $line\n";
-            return file_put_contents($stdout, $line, FILE_APPEND) !== false;
-        }
-
         // log_driver == 'file' is assumed here
 
         $line = sprintf("%s: %s\n", $date, $line);

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

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

@@ -48,6 +48,10 @@
     'Net_Sieve' => $vendorDir . '/pear/net_sieve/Sieve.php',
     'Net_URL2' => $vendorDir . '/pear/net_url2/Net/URL2.php',
     'Normalizer' => $vendorDir . '/symfony/polyfill-intl-normalizer/Resources/stubs/Normalizer.php',
+    'OS_Guess' => $vendorDir . '/pear/pear-core-minimal/src/OS/Guess.php',
+    'PEAR' => $vendorDir . '/pear/pear-core-minimal/src/PEAR.php',
+    'PEAR_Error' => $vendorDir . '/pear/pear-core-minimal/src/PEAR.php',
+    'PEAR_ErrorStack' => $vendorDir . '/pear/pear-core-minimal/src/PEAR/ErrorStack.php',
     'PEAR_Exception' => $vendorDir . '/pear/pear_exception/PEAR/Exception.php',
     'PHPUnit\\Framework\\Assert' => $vendorDir . '/phpunit/phpunit/src/ForwardCompatibility/Assert.php',
     'PHPUnit\\Framework\\AssertionFailedError' => $vendorDir . '/phpunit/phpunit/src/ForwardCompatibility/AssertionFailedError.php',
@@ -681,6 +685,7 @@
     'Smarty_Template_Source' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_template_source.php',
     'Smarty_Undefined_Variable' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_undefined_variable.php',
     'Smarty_Variable' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_variable.php',
+    'System' => $vendorDir . '/pear/pear-core-minimal/src/System.php',
     'TPC_yyStackEntry' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_configfileparser.php',
     'TP_yyStackEntry' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_templateparser.php',
     'Text_Template' => $vendorDir . '/phpunit/php-text-template/src/Template.php',

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

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

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

@@ -7,8 +7,10 @@
 
 return array(
     'phpDocumentor\\Reflection\\' => array($vendorDir . '/phpdocumentor/reflection-common/src', $vendorDir . '/phpdocumentor/type-resolver/src', $vendorDir . '/phpdocumentor/reflection-docblock/src'),
+    'cogpowered\\FineDiff\\' => array($vendorDir . '/lolli42/finediff/src'),
     'Webmozart\\Assert\\' => array($vendorDir . '/webmozart/assert/src'),
     'Symfony\\Polyfill\\Php72\\' => array($vendorDir . '/symfony/polyfill-php72'),
+    'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'),
     'Symfony\\Polyfill\\Intl\\Normalizer\\' => array($vendorDir . '/symfony/polyfill-intl-normalizer'),
     'Symfony\\Polyfill\\Intl\\Idn\\' => array($vendorDir . '/symfony/polyfill-intl-idn'),
     'Symfony\\Polyfill\\Ctype\\' => array($vendorDir . '/symfony/polyfill-ctype'),
@@ -31,6 +33,7 @@
     'GuzzleHttp\\Psr7\\' => array($vendorDir . '/guzzlehttp/psr7/src'),
     'GuzzleHttp\\Promise\\' => array($vendorDir . '/guzzlehttp/promises/src'),
     'GuzzleHttp\\' => array($vendorDir . '/guzzlehttp/guzzle/src'),
+    'Firebase\\JWT\\' => array($vendorDir . '/firebase/php-jwt/src'),
     'Endroid\\QrCode\\' => array($vendorDir . '/endroid/qr-code/src'),
     'Doctrine\\Instantiator\\' => array($vendorDir . '/doctrine/instantiator/src/Doctrine/Instantiator'),
     'Desarrolla2\\Cache\\' => array($vendorDir . '/desarrolla2/cache/src'),

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

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit758ba27398a1a87e40d07c0405f425dd
+class ComposerAutoloaderInit93840a7b3de0b02c1df7d02502aad51b
 {
     private static $loader;
 
@@ -24,20 +24,20 @@
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit758ba27398a1a87e40d07c0405f425dd', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit93840a7b3de0b02c1df7d02502aad51b', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit758ba27398a1a87e40d07c0405f425dd', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit93840a7b3de0b02c1df7d02502aad51b', '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\ComposerStaticInit758ba27398a1a87e40d07c0405f425dd::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit93840a7b3de0b02c1df7d02502aad51b::getInitializer($loader));
 
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInit758ba27398a1a87e40d07c0405f425dd::$files;
+        $filesToLoad = \Composer\Autoload\ComposerStaticInit93840a7b3de0b02c1df7d02502aad51b::$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,13 +4,14 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit758ba27398a1a87e40d07c0405f425dd
+class ComposerStaticInit93840a7b3de0b02c1df7d02502aad51b
 {
     public static $files = array (
         '383eaff206634a77a1be54e64e6459c7' => __DIR__ . '/..' . '/sabre/uri/lib/functions.php',
         '3569eecfeed3bcf0bad3c998a494ecb8' => __DIR__ . '/..' . '/sabre/xml/lib/Deserializer/functions.php',
         '93aa591bc4ca510c520999e34229ee79' => __DIR__ . '/..' . '/sabre/xml/lib/Serializer/functions.php',
         '2cffec82183ee1cea088009cef9a6fc3' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php',
+        '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
         '2b9d0f43f9552984cfa82fee95491826' => __DIR__ . '/..' . '/sabre/event/lib/coroutine.php',
         'd81bab31d3feb45bfe2f283ea3c8fdf7' => __DIR__ . '/..' . '/sabre/event/lib/Loop/functions.php',
         'a1cce3d26cc15c00fcd0b3354bd72c88' => __DIR__ . '/..' . '/sabre/event/lib/Promise/functions.php',
@@ -122,6 +123,10 @@
         array (
             'phpDocumentor\\Reflection\\' => 25,
         ),
+        'c' => 
+        array (
+            'cogpowered\\FineDiff\\' => 20,
+        ),
         'W' => 
         array (
             'Webmozart\\Assert\\' => 17,
@@ -129,6 +134,7 @@
         'S' => 
         array (
             'Symfony\\Polyfill\\Php72\\' => 23,
+            'Symfony\\Polyfill\\Mbstring\\' => 26,
             'Symfony\\Polyfill\\Intl\\Normalizer\\' => 33,
             'Symfony\\Polyfill\\Intl\\Idn\\' => 26,
             'Symfony\\Polyfill\\Ctype\\' => 23,
@@ -167,6 +173,10 @@
             'GuzzleHttp\\Promise\\' => 19,
             'GuzzleHttp\\' => 11,
         ),
+        'F' => 
+        array (
+            'Firebase\\JWT\\' => 13,
+        ),
         'E' => 
         array (
             'Endroid\\QrCode\\' => 15,
@@ -190,6 +200,10 @@
             1 => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src',
             2 => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src',
         ),
+        'cogpowered\\FineDiff\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/lolli42/finediff/src',
+        ),
         'Webmozart\\Assert\\' => 
         array (
             0 => __DIR__ . '/..' . '/webmozart/assert/src',
@@ -198,6 +212,10 @@
         array (
             0 => __DIR__ . '/..' . '/symfony/polyfill-php72',
         ),
+        'Symfony\\Polyfill\\Mbstring\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/symfony/polyfill-mbstring',
+        ),
         'Symfony\\Polyfill\\Intl\\Normalizer\\' => 
         array (
             0 => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer',
@@ -288,6 +306,10 @@
         array (
             0 => __DIR__ . '/..' . '/guzzlehttp/guzzle/src',
         ),
+        'Firebase\\JWT\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/firebase/php-jwt/src',
+        ),
         'Endroid\\QrCode\\' => 
         array (
             0 => __DIR__ . '/..' . '/endroid/qr-code/src',
@@ -442,10 +464,6 @@
         ),
     );
 
-    public static $fallbackDirsPsr0 = array (
-        0 => __DIR__ . '/..' . '/pear/pear-core-minimal/src',
-    );
-
     public static $classMap = array (
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
         'Crypt_GPG' => __DIR__ . '/..' . '/pear/crypt_gpg/Crypt/GPG.php',
@@ -489,6 +507,10 @@
         'Net_Sieve' => __DIR__ . '/..' . '/pear/net_sieve/Sieve.php',
         'Net_URL2' => __DIR__ . '/..' . '/pear/net_url2/Net/URL2.php',
         'Normalizer' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/Resources/stubs/Normalizer.php',
+        'OS_Guess' => __DIR__ . '/..' . '/pear/pear-core-minimal/src/OS/Guess.php',
+        'PEAR' => __DIR__ . '/..' . '/pear/pear-core-minimal/src/PEAR.php',
+        'PEAR_Error' => __DIR__ . '/..' . '/pear/pear-core-minimal/src/PEAR.php',
+        'PEAR_ErrorStack' => __DIR__ . '/..' . '/pear/pear-core-minimal/src/PEAR/ErrorStack.php',
         'PEAR_Exception' => __DIR__ . '/..' . '/pear/pear_exception/PEAR/Exception.php',
         'PHPUnit\\Framework\\Assert' => __DIR__ . '/..' . '/phpunit/phpunit/src/ForwardCompatibility/Assert.php',
         'PHPUnit\\Framework\\AssertionFailedError' => __DIR__ . '/..' . '/phpunit/phpunit/src/ForwardCompatibility/AssertionFailedError.php',
@@ -1122,6 +1144,7 @@
         'Smarty_Template_Source' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_template_source.php',
         'Smarty_Undefined_Variable' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_undefined_variable.php',
         'Smarty_Variable' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_variable.php',
+        'System' => __DIR__ . '/..' . '/pear/pear-core-minimal/src/System.php',
         'TPC_yyStackEntry' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_configfileparser.php',
         'TP_yyStackEntry' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_templateparser.php',
         'Text_Template' => __DIR__ . '/..' . '/phpunit/php-text-template/src/Template.php',
@@ -1130,11 +1153,10 @@
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit758ba27398a1a87e40d07c0405f425dd::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit758ba27398a1a87e40d07c0405f425dd::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit758ba27398a1a87e40d07c0405f425dd::$prefixesPsr0;
-            $loader->fallbackDirsPsr0 = ComposerStaticInit758ba27398a1a87e40d07c0405f425dd::$fallbackDirsPsr0;
-            $loader->classMap = ComposerStaticInit758ba27398a1a87e40d07c0405f425dd::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit93840a7b3de0b02c1df7d02502aad51b::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit93840a7b3de0b02c1df7d02502aad51b::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInit93840a7b3de0b02c1df7d02502aad51b::$prefixesPsr0;
+            $loader->classMap = ComposerStaticInit93840a7b3de0b02c1df7d02502aad51b::$classMap;
 
         }, null, ClassLoader::class);
     }

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

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

@@ -464,6 +464,72 @@
             "install-path": "../ezyang/htmlpurifier"
         },
         {
+            "name": "firebase/php-jwt",
+            "version": "v6.4.0",
+            "version_normalized": "6.4.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/firebase/php-jwt.git",
+                "reference": "4dd1e007f22a927ac77da5a3fbb067b42d3bc224"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/4dd1e007f22a927ac77da5a3fbb067b42d3bc224",
+                "reference": "4dd1e007f22a927ac77da5a3fbb067b42d3bc224",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1||^8.0"
+            },
+            "require-dev": {
+                "guzzlehttp/guzzle": "^6.5||^7.4",
+                "phpspec/prophecy-phpunit": "^1.1",
+                "phpunit/phpunit": "^7.5||^9.5",
+                "psr/cache": "^1.0||^2.0",
+                "psr/http-client": "^1.0",
+                "psr/http-factory": "^1.0"
+            },
+            "suggest": {
+                "ext-sodium": "Support EdDSA (Ed25519) signatures",
+                "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present"
+            },
+            "time": "2023-02-09T21:01:23+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Firebase\\JWT\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": 
+                "BSD-3-Clause"
+            ,
+            "authors": 
+                {
+                    "name": "Neuman Vong",
+                    "email": "neuman+pear@twilio.com",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Anant Narayanan",
+                    "email": "anant@php.net",
+                    "role": "Developer"
+                }
+            ,
+            "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.",
+            "homepage": "https://github.com/firebase/php-jwt",
+            "keywords": 
+                "jwt",
+                "php"
+            ,
+            "support": {
+                "issues": "https://github.com/firebase/php-jwt/issues",
+                "source": "https://github.com/firebase/php-jwt/tree/v6.4.0"
+            },
+            "install-path": "../firebase/php-jwt"
+        },
+        {
             "name": "guzzlehttp/guzzle",
             "version": "6.5.8",
             "version_normalized": "6.5.8.0",
@@ -1243,9 +1309,10 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/roundcubemail-1.5/roundcubemail-plugins-kolab-latest/plugins/kolab_sso",
-                "reference": "a15ea62c786c8ffa4bb6fe27cbb7d4de7f193917"
+                "reference": "f30506dbd73df3d74ff3bcbc18964a3b40bb6b45"
             },
             "require": {
+                "firebase/php-jwt": "~6.4.0",
                 "kolab/libkolab": ">=3.4.0",
                 "pear/http_request2": "~2.5.0",
                 "php": ">=5.3.0",
@@ -1351,11 +1418,12 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/roundcubemail-1.5/roundcubemail-plugins-kolab-latest/plugins/libkolab",
-                "reference": "30bad7150f1999a5a2a0d33c9bcd490514a4a307"
+                "reference": "0952f000597cf19fbd1f5e1e04e3d9398e7edd45"
             },
             "require": {
-                "caxy/php-htmldiff": "~0.1.7",
+                "caxy/php-htmldiff": "~0.1",
                 "kolab/libcalendaring": ">=3.4.0",
+                "lolli42/finediff": "~1.0.3",
                 "pear/http_request2": "~2.5.0",
                 "php": ">=7.2.0",
                 "roundcube/plugin-installer": ">=0.1.3"
@@ -1673,6 +1741,74 @@
             "install-path": "../kub-at/php-simple-html-dom-parser"
         },
         {
+            "name": "lolli42/finediff",
+            "version": "1.0.3",
+            "version_normalized": "1.0.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/lolli42/FineDiff.git",
+                "reference": "8d535de757062fed8412833f5eede7064595ca5b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/lolli42/FineDiff/zipball/8d535de757062fed8412833f5eede7064595ca5b",
+                "reference": "8d535de757062fed8412833f5eede7064595ca5b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.0",
+                "symfony/polyfill-mbstring": "^1.23"
+            },
+            "replace": {
+                "cogpowered/finediff": "*"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3.4",
+                "phpstan/phpstan": "^1.9.14",
+                "phpunit/phpunit": "^8.5.33 || ^9.6.11 || ^10.3.2"
+            },
+            "time": "2024-02-06T13:56:20+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "cogpowered\\FineDiff\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": 
+                "MIT"
+            ,
+            "authors": 
+                {
+                    "name": "Raymond Hill"
+                },
+                {
+                    "name": "Rob Crowe",
+                    "email": "rob@cogpowered.com"
+                },
+                {
+                    "name": "Christian Kuhn",
+                    "email": "lolli@schwarzbu.ch",
+                    "role": "maintainer"
+                }
+            ,
+            "description": "PHP implementation of a Fine granularity Diff engine",
+            "homepage": "https://github.com/lolli42/FineDiff",
+            "keywords": 
+                "diff",
+                "finediff",
+                "opcode",
+                "string",
+                "text"
+            ,
+            "support": {
+                "issues": "https://github.com/lolli42/FineDiff/issues",
+                "source": "https://github.com/lolli42/FineDiff/tree/1.0.3"
+            },
+            "install-path": "../lolli42/finediff"
+        },
+        {
             "name": "masterminds/html5",
             "version": "2.7.6",
             "version_normalized": "2.7.6.0",
@@ -2118,17 +2254,17 @@
         },
         {
             "name": "pear/crypt_gpg",
-            "version": "v1.6.8",
-            "version_normalized": "1.6.8.0",
+            "version": "v1.6.9",
+            "version_normalized": "1.6.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Crypt_GPG.git",
-                "reference": "89c661fbd7027f7745c25efd4053552972278bc1"
+                "reference": "1572e126f8c8e083af6db1ebe43fcd9c7954537c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Crypt_GPG/zipball/89c661fbd7027f7745c25efd4053552972278bc1",
-                "reference": "89c661fbd7027f7745c25efd4053552972278bc1",
+                "url": "https://api.github.com/repos/pear/Crypt_GPG/zipball/1572e126f8c8e083af6db1ebe43fcd9c7954537c",
+                "reference": "1572e126f8c8e083af6db1ebe43fcd9c7954537c",
                 "shasum": ""
             },
             "require": {
@@ -2138,12 +2274,13 @@
                 "php": ">=5.4.8"
             },
             "require-dev": {
+                "phpstan/phpstan": "^1.2",
                 "phpunit/phpunit": "^9"
             },
             "suggest": {
                 "ext-posix": "May require the posix PHP extension"
             },
-            "time": "2023-11-23T09:15:05+00:00",
+            "time": "2024-03-23T10:43:40+00:00",
             "bin": 
                 "scripts/crypt-gpg-pinentry"
             ,
@@ -2253,24 +2390,24 @@
         },
         {
             "name": "pear/mail_mime",
-            "version": "1.10.11",
-            "version_normalized": "1.10.11.0",
+            "version": "1.10.12",
+            "version_normalized": "1.10.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Mail_Mime.git",
-                "reference": "d4fb9ce61201593d0f8c6db629c45e29c3409c14"
+                "reference": "d032c7c9335e96d5954ac6e93d33955f3b7246e2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Mail_Mime/zipball/d4fb9ce61201593d0f8c6db629c45e29c3409c14",
-                "reference": "d4fb9ce61201593d0f8c6db629c45e29c3409c14",
+                "url": "https://api.github.com/repos/pear/Mail_Mime/zipball/d032c7c9335e96d5954ac6e93d33955f3b7246e2",
+                "reference": "d032c7c9335e96d5954ac6e93d33955f3b7246e2",
                 "shasum": ""
             },
             "require": {
                 "pear/pear-core-minimal": "*",
                 "php": ">=5.2.0"
             },
-            "time": "2021-09-05T08:42:45+00:00",
+            "time": "2024-03-10T20:20:27+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -2630,17 +2767,17 @@
         },
         {
             "name": "pear/pear-core-minimal",
-            "version": "v1.10.14",
-            "version_normalized": "1.10.14.0",
+            "version": "v1.10.15",
+            "version_normalized": "1.10.15.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/pear-core-minimal.git",
-                "reference": "a86fc145edb5caedbf96527214ce3cadc9de4a32"
+                "reference": "ce0adade8b97561656ace07cdaac4751c271ea8c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/a86fc145edb5caedbf96527214ce3cadc9de4a32",
-                "reference": "a86fc145edb5caedbf96527214ce3cadc9de4a32",
+                "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/ce0adade8b97561656ace07cdaac4751c271ea8c",
+                "reference": "ce0adade8b97561656ace07cdaac4751c271ea8c",
                 "shasum": ""
             },
             "require": {
@@ -2651,13 +2788,13 @@
             "replace": {
                 "rsky/pear-core-min": "self.version"
             },
-            "time": "2023-11-26T16:15:38+00:00",
+            "time": "2024-03-16T18:41:45+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
-                "psr-0": {
-                    "": "src/"
-                }
+                "classmap": 
+                    "src/"
+                
             },
             "notification-url": "https://packagist.org/downloads/",
             "include-path": 
@@ -3048,17 +3185,17 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.57",
-            "version_normalized": "1.10.57.0",
+            "version": "1.10.65",
+            "version_normalized": "1.10.65.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "1627b1d03446904aaa77593f370c5201d2ecc34e"
+                "reference": "3c657d057a0b7ecae19cb12db446bbc99d8839c6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/1627b1d03446904aaa77593f370c5201d2ecc34e",
-                "reference": "1627b1d03446904aaa77593f370c5201d2ecc34e",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/3c657d057a0b7ecae19cb12db446bbc99d8839c6",
+                "reference": "3c657d057a0b7ecae19cb12db446bbc99d8839c6",
                 "shasum": ""
             },
             "require": {
@@ -3067,7 +3204,7 @@
             "conflict": {
                 "phpstan/phpstan-shim": "*"
             },
-            "time": "2024-01-24T11:51:34+00:00",
+            "time": "2024-03-23T10:30:26+00:00",
             "bin": 
                 "phpstan",
                 "phpstan.phar"
@@ -4340,17 +4477,17 @@
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
-            "version": "1.0.2",
-            "version_normalized": "1.0.2.0",
+            "version": "1.0.3",
+            "version_normalized": "1.0.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619"
+                "reference": "92a1a52e86d34cde6caa54f1b5ffa9fda18e5d54"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619",
-                "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/92a1a52e86d34cde6caa54f1b5ffa9fda18e5d54",
+                "reference": "92a1a52e86d34cde6caa54f1b5ffa9fda18e5d54",
                 "shasum": ""
             },
             "require": {
@@ -4359,7 +4496,7 @@
             "require-dev": {
                 "phpunit/phpunit": "^8.5"
             },
-            "time": "2020-11-30T08:15:22+00:00",
+            "time": "2024-03-01T13:45:45+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -4386,7 +4523,7 @@
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2"
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.3"
             },
             "funding": 
                 {
@@ -5073,17 +5210,17 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.8.1",
-            "version_normalized": "3.8.1.0",
+            "version": "3.9.0",
+            "version_normalized": "3.9.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "14f5fff1e64118595db5408e946f3a22c75807f7"
+                "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/14f5fff1e64118595db5408e946f3a22c75807f7",
-                "reference": "14f5fff1e64118595db5408e946f3a22c75807f7",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b",
+                "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b",
                 "shasum": ""
             },
             "require": {
@@ -5095,7 +5232,7 @@
             "require-dev": {
                 "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4"
             },
-            "time": "2024-01-11T20:47:48+00:00",
+            "time": "2024-02-16T15:06:51+00:00",
             "bin": 
                 "bin/phpcbf",
                 "bin/phpcs"
@@ -5156,17 +5293,17 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.28.0",
-            "version_normalized": "1.28.0.0",
+            "version": "v1.29.0",
+            "version_normalized": "1.29.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"
+                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
-                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4",
+                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4",
                 "shasum": ""
             },
             "require": {
@@ -5178,12 +5315,9 @@
             "suggest": {
                 "ext-ctype": "For best performance"
             },
-            "time": "2023-01-26T09:26:14+00:00",
+            "time": "2024-01-29T20:11:03+00:00",
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -5221,7 +5355,7 @@
                 "portable"
             ,
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0"
             },
             "funding": 
                 {
@@ -5241,17 +5375,17 @@
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.28.0",
-            "version_normalized": "1.28.0.0",
+            "version": "v1.29.0",
+            "version_normalized": "1.29.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "ecaafce9f77234a6a449d29e49267ba10499116d"
+                "reference": "a287ed7475f85bf6f61890146edbc932c0fff919"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/ecaafce9f77234a6a449d29e49267ba10499116d",
-                "reference": "ecaafce9f77234a6a449d29e49267ba10499116d",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a287ed7475f85bf6f61890146edbc932c0fff919",
+                "reference": "a287ed7475f85bf6f61890146edbc932c0fff919",
                 "shasum": ""
             },
             "require": {
@@ -5262,12 +5396,9 @@
             "suggest": {
                 "ext-intl": "For best performance"
             },
-            "time": "2023-01-26T09:30:37+00:00",
+            "time": "2024-01-29T20:11:03+00:00",
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -5311,7 +5442,7 @@
                 "shim"
             ,
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.29.0"
             },
             "funding": 
                 {
@@ -5331,17 +5462,17 @@
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.28.0",
-            "version_normalized": "1.28.0.0",
+            "version": "v1.29.0",
+            "version_normalized": "1.29.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92"
+                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
-                "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d",
+                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d",
                 "shasum": ""
             },
             "require": {
@@ -5350,12 +5481,9 @@
             "suggest": {
                 "ext-intl": "For best performance"
             },
-            "time": "2023-01-26T09:26:14+00:00",
+            "time": "2024-01-29T20:11:03+00:00",
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -5398,7 +5526,7 @@
                 "shim"
             ,
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0"
             },
             "funding": 
                 {
@@ -5417,29 +5545,109 @@
             "install-path": "../symfony/polyfill-intl-normalizer"
         },
         {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.29.0",
+            "version_normalized": "1.29.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "provide": {
+                "ext-mbstring": "*"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "time": "2024-01-29T20:11:03+00:00",
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "files": 
+                    "bootstrap.php"
+                ,
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": 
+                "MIT"
+            ,
+            "authors": 
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ,
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": 
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ,
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0"
+            },
+            "funding": 
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ,
+            "install-path": "../symfony/polyfill-mbstring"
+        },
+        {
             "name": "symfony/polyfill-php72",
-            "version": "v1.28.0",
-            "version_normalized": "1.28.0.0",
+            "version": "v1.29.0",
+            "version_normalized": "1.29.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179"
+                "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/70f4aebd92afca2f865444d30a4d2151c13c3179",
-                "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/861391a8da9a04cbad2d232ddd9e4893220d6e25",
+                "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1"
             },
-            "time": "2023-01-26T09:26:14+00:00",
+            "time": "2024-01-29T20:11:03+00:00",
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -5477,7 +5685,7 @@
                 "shim"
             ,
             "support": {
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-php72/tree/v1.29.0"
             },
             "funding": 
                 {

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' => '653149972c8f3e3fb9b9c5f075a8a52f340ad956',
+        'reference' => '5a11cebc1263c6f15d0db5419e6f99e6f5299208',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -28,6 +28,12 @@
             'aliases' => array(),
             'dev_requirement' => false,
         ),
+        'cogpowered/finediff' => array(
+            'dev_requirement' => false,
+            'replaced' => array(
+                0 => '*',
+            ),
+        ),
         'desarrolla2/cache' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
@@ -75,6 +81,15 @@
             'aliases' => array(),
             'dev_requirement' => false,
         ),
+        'firebase/php-jwt' => array(
+            'pretty_version' => 'v6.4.0',
+            'version' => '6.4.0.0',
+            'reference' => '4dd1e007f22a927ac77da5a3fbb067b42d3bc224',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../firebase/php-jwt',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
         'guzzlehttp/guzzle' => array(
             'pretty_version' => '6.5.8',
             'version' => '6.5.8.0',
@@ -213,7 +228,7 @@
         'kolab/kolab_sso' => array(
             'pretty_version' => '3.5.4',
             'version' => '3.5.4.0',
-            'reference' => 'a15ea62c786c8ffa4bb6fe27cbb7d4de7f193917',
+            'reference' => 'f30506dbd73df3d74ff3bcbc18964a3b40bb6b45',
             'type' => 'roundcube-plugin',
             'install_path' => __DIR__ . '/../../plugins/kolab_sso',
             'aliases' => array(),
@@ -240,7 +255,7 @@
         'kolab/libkolab' => array(
             'pretty_version' => '3.5.11',
             'version' => '3.5.11.0',
-            'reference' => '30bad7150f1999a5a2a0d33c9bcd490514a4a307',
+            'reference' => '0952f000597cf19fbd1f5e1e04e3d9398e7edd45',
             'type' => 'roundcube-plugin',
             'install_path' => __DIR__ . '/../../plugins/libkolab',
             'aliases' => array(),
@@ -311,6 +326,15 @@
             'aliases' => array(),
             'dev_requirement' => false,
         ),
+        'lolli42/finediff' => array(
+            'pretty_version' => '1.0.3',
+            'version' => '1.0.3.0',
+            'reference' => '8d535de757062fed8412833f5eede7064595ca5b',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../lolli42/finediff',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
         'masterminds/html5' => array(
             'pretty_version' => '2.7.6',
             'version' => '2.7.6.0',
@@ -375,9 +399,9 @@
             'dev_requirement' => false,
         ),
         'pear/crypt_gpg' => array(
-            'pretty_version' => 'v1.6.8',
-            'version' => '1.6.8.0',
-            'reference' => '89c661fbd7027f7745c25efd4053552972278bc1',
+            'pretty_version' => 'v1.6.9',
+            'version' => '1.6.9.0',
+            'reference' => '1572e126f8c8e083af6db1ebe43fcd9c7954537c',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pear/crypt_gpg',
             'aliases' => array(),
@@ -393,9 +417,9 @@
             'dev_requirement' => false,
         ),
         'pear/mail_mime' => array(
-            'pretty_version' => '1.10.11',
-            'version' => '1.10.11.0',
-            'reference' => 'd4fb9ce61201593d0f8c6db629c45e29c3409c14',
+            'pretty_version' => '1.10.12',
+            'version' => '1.10.12.0',
+            'reference' => 'd032c7c9335e96d5954ac6e93d33955f3b7246e2',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pear/mail_mime',
             'aliases' => array(),
@@ -447,9 +471,9 @@
             'dev_requirement' => false,
         ),
         'pear/pear-core-minimal' => array(
-            'pretty_version' => 'v1.10.14',
-            'version' => '1.10.14.0',
-            'reference' => 'a86fc145edb5caedbf96527214ce3cadc9de4a32',
+            'pretty_version' => 'v1.10.15',
+            'version' => '1.10.15.0',
+            'reference' => 'ce0adade8b97561656ace07cdaac4751c271ea8c',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pear/pear-core-minimal',
             'aliases' => array(),
@@ -510,9 +534,9 @@
             'dev_requirement' => true,
         ),
         'phpstan/phpstan' => array(
-            'pretty_version' => '1.10.57',
-            'version' => '1.10.57.0',
-            'reference' => '1627b1d03446904aaa77593f370c5201d2ecc34e',
+            'pretty_version' => '1.10.65',
+            'version' => '1.10.65.0',
+            'reference' => '3c657d057a0b7ecae19cb12db446bbc99d8839c6',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpstan/phpstan',
             'aliases' => array(),
@@ -641,7 +665,7 @@
         'roundcube/roundcubemail' => array(
             'pretty_version' => 'dev-dev/kolab-1.5',
             'version' => 'dev-dev/kolab-1.5',
-            'reference' => '653149972c8f3e3fb9b9c5f075a8a52f340ad956',
+            'reference' => '5a11cebc1263c6f15d0db5419e6f99e6f5299208',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
@@ -659,7 +683,7 @@
         'rsky/pear-core-min' => array(
             'dev_requirement' => false,
             'replaced' => array(
-                0 => 'v1.10.14',
+                0 => 'v1.10.15',
             ),
         ),
         'sabre/dav' => array(
@@ -717,9 +741,9 @@
             'dev_requirement' => false,
         ),
         'sebastian/code-unit-reverse-lookup' => array(
-            'pretty_version' => '1.0.2',
-            'version' => '1.0.2.0',
-            'reference' => '1de8cd5c010cb153fcd68b8d0f64606f523f7619',
+            'pretty_version' => '1.0.3',
+            'version' => '1.0.3.0',
+            'reference' => '92a1a52e86d34cde6caa54f1b5ffa9fda18e5d54',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sebastian/code-unit-reverse-lookup',
             'aliases' => array(),
@@ -825,45 +849,54 @@
             'dev_requirement' => false,
         ),
         'squizlabs/php_codesniffer' => array(
-            'pretty_version' => '3.8.1',
-            'version' => '3.8.1.0',
-            'reference' => '14f5fff1e64118595db5408e946f3a22c75807f7',
+            'pretty_version' => '3.9.0',
+            'version' => '3.9.0.0',
+            'reference' => 'd63cee4890a8afaf86a22e51ad4d97c91dd4579b',
             'type' => 'library',
             'install_path' => __DIR__ . '/../squizlabs/php_codesniffer',
             'aliases' => array(),
             'dev_requirement' => true,
         ),
         'symfony/polyfill-ctype' => array(
-            'pretty_version' => 'v1.28.0',
-            'version' => '1.28.0.0',
-            'reference' => 'ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb',
+            'pretty_version' => 'v1.29.0',
+            'version' => '1.29.0.0',
+            'reference' => 'ef4d7e442ca910c4764bce785146269b30cb5fc4',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-ctype',
             'aliases' => array(),
             'dev_requirement' => true,
         ),
         'symfony/polyfill-intl-idn' => array(
-            'pretty_version' => 'v1.28.0',
-            'version' => '1.28.0.0',
-            'reference' => 'ecaafce9f77234a6a449d29e49267ba10499116d',
+            'pretty_version' => 'v1.29.0',
+            'version' => '1.29.0.0',
+            'reference' => 'a287ed7475f85bf6f61890146edbc932c0fff919',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-intl-idn',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'symfony/polyfill-intl-normalizer' => array(
-            'pretty_version' => 'v1.28.0',
-            'version' => '1.28.0.0',
-            'reference' => '8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92',
+            'pretty_version' => 'v1.29.0',
+            'version' => '1.29.0.0',
+            'reference' => 'bc45c394692b948b4d383a08d7753968bed9a83d',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-intl-normalizer',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
+        'symfony/polyfill-mbstring' => array(
+            'pretty_version' => 'v1.29.0',
+            'version' => '1.29.0.0',
+            'reference' => '9773676c8a1bb1f8d4340a62efe641cf76eda7ec',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../symfony/polyfill-mbstring',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
         'symfony/polyfill-php72' => array(
-            'pretty_version' => 'v1.28.0',
-            'version' => '1.28.0.0',
-            'reference' => '70f4aebd92afca2f865444d30a4d2151c13c3179',
+            'pretty_version' => 'v1.29.0',
+            'version' => '1.29.0.0',
+            'reference' => '861391a8da9a04cbad2d232ddd9e4893220d6e25',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-php72',
             'aliases' => array(),

roundcubemail-1.5.tar.gz/vendor/firebase Added

roundcubemail-1.5.tar.gz/vendor/firebase/php-jwt Added

roundcubemail-1.5.tar.gz/vendor/firebase/php-jwt/CHANGELOG.md Added

@@ -0,0 +1,105 @@
+# Changelog
+
+## 6.4.0(https://github.com/firebase/php-jwt/compare/v6.3.2...v6.4.0) (2023-02-08)
+
+
+### Features
+
+* add support for W3C ES256K (#462(https://github.com/firebase/php-jwt/issues/462)) (213924f(https://github.com/firebase/php-jwt/commit/213924f51936291fbbca99158b11bd4ae56c2c95))
+* improve caching by only decoding jwks when necessary (#486(https://github.com/firebase/php-jwt/issues/486)) (78d3ed1(https://github.com/firebase/php-jwt/commit/78d3ed1073553f7d0bbffa6c2010009a0d483d5c))
+
+## 6.3.2(https://github.com/firebase/php-jwt/compare/v6.3.1...v6.3.2) (2022-11-01)
+
+
+### Bug Fixes
+
+* check kid before using as array index (bad1b04(https://github.com/firebase/php-jwt/commit/bad1b040d0c736bbf86814c6b5ae614f517cf7bd))
+
+## 6.3.1(https://github.com/firebase/php-jwt/compare/v6.3.0...v6.3.1) (2022-11-01)
+
+
+### Bug Fixes
+
+* casing of GET for PSR compat (#451(https://github.com/firebase/php-jwt/issues/451)) (60b52b7(https://github.com/firebase/php-jwt/commit/60b52b71978790eafcf3b95cfbd83db0439e8d22))
+* string interpolation format for php 8.2 (#446(https://github.com/firebase/php-jwt/issues/446)) (2e07d8a(https://github.com/firebase/php-jwt/commit/2e07d8a1524d12b69b110ad649f17461d068b8f2))
+
+## 6.3.0 / 2022-07-15
+
+ - Added ES256 support to JWK parsing (#399(https://github.com/firebase/php-jwt/pull/399))
+ - Fixed potential caching error in `CachedKeySet` by caching jwks as strings (#435(https://github.com/firebase/php-jwt/pull/435))
+
+## 6.2.0 / 2022-05-14
+
+ - Added `CachedKeySet` (#397(https://github.com/firebase/php-jwt/pull/397))
+ - Added `$defaultAlg` parameter to `JWT::parseKey` and `JWT::parseKeySet` (#426(https://github.com/firebase/php-jwt/pull/426)).
+
+## 6.1.0 / 2022-03-23
+
+ - Drop support for PHP 5.3, 5.4, 5.5, 5.6, and 7.0
+ - Add parameter typing and return types where possible
+
+## 6.0.0 / 2022-01-24
+
+ - **Backwards-Compatibility Breaking Changes**: See the Release Notes(https://github.com/firebase/php-jwt/releases/tag/v6.0.0) for more information.
+ - New Key object to prevent key/algorithm type confusion (#365)
+ - Add JWK support (#273)
+ - Add ES256 support (#256)
+ - Add ES384 support (#324)
+ - Add Ed25519 support (#343)
+
+## 5.0.0 / 2017-06-26
+- Support RS384 and RS512.
+  See #117(https://github.com/firebase/php-jwt/pull/117). Thanks @joostfaassen(https://github.com/joostfaassen)!
+- Add an example for RS256 openssl.
+  See #125(https://github.com/firebase/php-jwt/pull/125). Thanks @akeeman(https://github.com/akeeman)!
+- Detect invalid Base64 encoding in signature.
+  See #162(https://github.com/firebase/php-jwt/pull/162). Thanks @psignoret(https://github.com/psignoret)!
+- Update `JWT::verify` to handle OpenSSL errors.
+  See #159(https://github.com/firebase/php-jwt/pull/159). Thanks @bshaffer(https://github.com/bshaffer)!
+- Add `array` type hinting to `decode` method
+  See #101(https://github.com/firebase/php-jwt/pull/101). Thanks @hywak(https://github.com/hywak)!
+- Add all JSON error types.
+  See #110(https://github.com/firebase/php-jwt/pull/110). Thanks @gbalduzzi(https://github.com/gbalduzzi)!
+- Bugfix 'kid' not in given key list.
+  See #129(https://github.com/firebase/php-jwt/pull/129). Thanks @stampycode(https://github.com/stampycode)!
+- Miscellaneous cleanup, documentation and test fixes.
+  See #107(https://github.com/firebase/php-jwt/pull/107), #115(https://github.com/firebase/php-jwt/pull/115),
+  #160(https://github.com/firebase/php-jwt/pull/160), #161(https://github.com/firebase/php-jwt/pull/161), and
+  #165(https://github.com/firebase/php-jwt/pull/165). Thanks @akeeman(https://github.com/akeeman),
+  @chinedufn(https://github.com/chinedufn), and @bshaffer(https://github.com/bshaffer)!
+
+## 4.0.0 / 2016-07-17
+- Add support for late static binding. See #88(https://github.com/firebase/php-jwt/pull/88) for details. Thanks to @chappy84(https://github.com/chappy84)!
+- Use static `$timestamp` instead of `time()` to improve unit testing. See #93(https://github.com/firebase/php-jwt/pull/93) for details. Thanks to @josephmcdermott(https://github.com/josephmcdermott)!
+- Fixes to exceptions classes. See #81(https://github.com/firebase/php-jwt/pull/81) for details. Thanks to @Maks3w(https://github.com/Maks3w)!
+- Fixes to PHPDoc. See #76(https://github.com/firebase/php-jwt/pull/76) for details. Thanks to @akeeman(https://github.com/akeeman)!
+
+## 3.0.0 / 2015-07-22
+- Minimum PHP version updated from `5.2.0` to `5.3.0`.
+- Add `\Firebase\JWT` namespace. See
+#59(https://github.com/firebase/php-jwt/pull/59) for details. Thanks to
+@Dashron(https://github.com/Dashron)!
+- Require a non-empty key to decode and verify a JWT. See
+#60(https://github.com/firebase/php-jwt/pull/60) for details. Thanks to
+@sjones608(https://github.com/sjones608)!
+- Cleaner documentation blocks in the code. See
+#62(https://github.com/firebase/php-jwt/pull/62) for details. Thanks to
+@johanderuijter(https://github.com/johanderuijter)!
+
+## 2.2.0 / 2015-06-22
+- Add support for adding custom, optional JWT headers to `JWT::encode()`. See
+#53(https://github.com/firebase/php-jwt/pull/53/files) for details. Thanks to
+@mcocaro(https://github.com/mcocaro)!
+
+## 2.1.0 / 2015-05-20
+- Add support for adding a leeway to `JWT:decode()` that accounts for clock skew
+between signing and verifying entities. Thanks to @lcabral(https://github.com/lcabral)!
+- Add support for passing an object implementing the `ArrayAccess` interface for
+`$keys` argument in `JWT::decode()`. Thanks to @aztech-dev(https://github.com/aztech-dev)!
+
+## 2.0.0 / 2015-04-01
+- **Note**: It is strongly recommended that you update to > v2.0.0 to address
+  known security vulnerabilities in prior versions when both symmetric and
+  asymmetric keys are used together.
+- Update signature for `JWT::decode(...)` to require an array of supported
+  algorithms to use when verifying token signatures.

roundcubemail-1.5.tar.gz/vendor/firebase/php-jwt/LICENSE Added

@@ -0,0 +1,30 @@
+Copyright (c) 2011, Neuman Vong
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of the copyright holder nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

roundcubemail-1.5.tar.gz/vendor/firebase/php-jwt/README.md Added

@@ -0,0 +1,332 @@
+!Build Status(https://github.com/firebase/php-jwt/actions/workflows/tests.yml/badge.svg)
+!Latest Stable Version(https://poser.pugx.org/firebase/php-jwt/v/stable)(https://packagist.org/packages/firebase/php-jwt)
+!Total Downloads(https://poser.pugx.org/firebase/php-jwt/downloads)(https://packagist.org/packages/firebase/php-jwt)
+!License(https://poser.pugx.org/firebase/php-jwt/license)(https://packagist.org/packages/firebase/php-jwt)
+
+PHP-JWT
+=======
+A simple library to encode and decode JSON Web Tokens (JWT) in PHP, conforming to RFC 7519(https://tools.ietf.org/html/rfc7519).
+
+Installation
+------------
+
+Use composer to manage your dependencies and download PHP-JWT:
+
+```bash
+composer require firebase/php-jwt
+```
+
+Optionally, install the `paragonie/sodium_compat` package from composer if your
+php is < 7.2 or does not have libsodium installed:
+
+```bash
+composer require paragonie/sodium_compat
+```
+
+Example
+-------
+```php
+use Firebase\JWT\JWT;
+use Firebase\JWT\Key;
+
+$key = 'example_key';
+$payload = 
+    'iss' => 'http://example.org',
+    'aud' => 'http://example.com',
+    'iat' => 1356999524,
+    'nbf' => 1357000000
+;
+
+/**
+ * IMPORTANT:
+ * You must specify supported algorithms for your application. See
+ * https://tools.ietf.org/html/draft-ietf-jose-json-web-algorithms-40
+ * for a list of spec-compliant algorithms.
+ */
+$jwt = JWT::encode($payload, $key, 'HS256');
+$decoded = JWT::decode($jwt, new Key($key, 'HS256'));
+
+print_r($decoded);
+
+/*
+ NOTE: This will now be an object instead of an associative array. To get
+ an associative array, you will need to cast it as such:
+*/
+
+$decoded_array = (array) $decoded;
+
+/**
+ * You can add a leeway to account for when there is a clock skew times between
+ * the signing and verifying servers. It is recommended that this leeway should
+ * not be bigger than a few minutes.
+ *
+ * Source: http://self-issued.info/docs/draft-ietf-oauth-json-web-token.html#nbfDef
+ */
+JWT::$leeway = 60; // $leeway in seconds
+$decoded = JWT::decode($jwt, new Key($key, 'HS256'));
+```
+Example with RS256 (openssl)
+----------------------------
+```php
+use Firebase\JWT\JWT;
+use Firebase\JWT\Key;
+
+$privateKey = <<<EOD
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQC8kGa1pSjbSYZVebtTRBLxBz5H4i2p/llLCrEeQhta5kaQu/Rn
+vuER4W8oDH3+3iuIYW4VQAzyqFpwuzjkDI+17t5t0tyazyZ8JXw+KgXTxldMPEL9
+5+qVhgXvwtihXC1c5oGbRlEDvDF6Sa53rcFVsYJ4ehde/zUxo6UvS7UrBQIDAQAB
+AoGAb/MXV46XxCFRxNuB8LyAtmLDgi/xRnTAlMHjSACddwkyKem8//8eZtw9fzxz
+bWZ/1/doQOuHBGYZU8aDzzj59FZ78dyzNFoF91hbvZKkg+6wGyd/LrGVEB+Xre0J
+Nil0GReM2AHDNZUYRv+HYJPIOrB0CRczLQsgFJ8K6aAD6F0CQQDzbpjYdx10qgK1
+cP59UHiHjPZYC0loEsk7s+hUmT3QHerAQJMZWC11Qrn2N+ybwwNblDKv+s5qgMQ5
+5tNoQ9IfAkEAxkyffU6ythpg/H0Ixe1I2rd0GbF05biIzO/i77Det3n4YsJVlDck
+ZkcvY3SK2iRIL4c9yY6hlIhs+K9wXTtGWwJBAO9Dskl48mO7woPR9uD22jDpNSwe
+k90OMepTjzSvlhjbfuPN1IdhqvSJTDychRwn1kIJ7LQZgQ8fVz9OCFZ/6qMCQGOb
+qaGwHmUK6xzpUbbacnYrIM6nLSkXgOAwv7XXCojvY614ILTK3iXiLBOxPu5Eu13k
+eUz9sHyD6vkgZzjtxXECQAkp4Xerf5TGfQXGXhxIX52yH+N2LtujCdkQZjXAsGdm
+B2zNzvrlgRmgBrklMTrMYgm1NPcW+bRLGcwgW2PTvNM=
+-----END RSA PRIVATE KEY-----
+EOD;
+
+$publicKey = <<<EOD
+-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC8kGa1pSjbSYZVebtTRBLxBz5H
+4i2p/llLCrEeQhta5kaQu/RnvuER4W8oDH3+3iuIYW4VQAzyqFpwuzjkDI+17t5t
+0tyazyZ8JXw+KgXTxldMPEL95+qVhgXvwtihXC1c5oGbRlEDvDF6Sa53rcFVsYJ4
+ehde/zUxo6UvS7UrBQIDAQAB
+-----END PUBLIC KEY-----
+EOD;
+
+$payload = 
+    'iss' => 'example.org',
+    'aud' => 'example.com',
+    'iat' => 1356999524,
+    'nbf' => 1357000000
+;
+
+$jwt = JWT::encode($payload, $privateKey, 'RS256');
+echo "Encode:\n" . print_r($jwt, true) . "\n";
+
+$decoded = JWT::decode($jwt, new Key($publicKey, 'RS256'));
+
+/*
+ NOTE: This will now be an object instead of an associative array. To get
+ an associative array, you will need to cast it as such:
+*/
+
+$decoded_array = (array) $decoded;
+echo "Decode:\n" . print_r($decoded_array, true) . "\n";
+```
+
+Example with a passphrase
+-------------------------
+
+```php
+use Firebase\JWT\JWT;
+use Firebase\JWT\Key;
+
+// Your passphrase
+$passphrase = 'YOUR_PASSPHRASE';
+
+// Your private key file with passphrase
+// Can be generated with "ssh-keygen -t rsa -m pem"
+$privateKeyFile = '/path/to/key-with-passphrase.pem';
+
+// Create a private key of type "resource"
+$privateKey = openssl_pkey_get_private(
+    file_get_contents($privateKeyFile),
+    $passphrase
+);
+
+$payload = 
+    'iss' => 'example.org',
+    'aud' => 'example.com',
+    'iat' => 1356999524,
+    'nbf' => 1357000000
+;
+
+$jwt = JWT::encode($payload, $privateKey, 'RS256');
+echo "Encode:\n" . print_r($jwt, true) . "\n";
+
+// Get public key from the private key, or pull from from a file.
+$publicKey = openssl_pkey_get_details($privateKey)'key';
+
+$decoded = JWT::decode($jwt, new Key($publicKey, 'RS256'));
+echo "Decode:\n" . print_r((array) $decoded, true) . "\n";
+```
+
+Example with EdDSA (libsodium and Ed25519 signature)
+----------------------------
+```php
+use Firebase\JWT\JWT;
+use Firebase\JWT\Key;
+
+// Public and private keys are expected to be Base64 encoded. The last
+// non-empty line is used so that keys can be generated with
+// sodium_crypto_sign_keypair(). The secret keys generated by other tools may
+// need to be adjusted to match the input expected by libsodium.
+
+$keyPair = sodium_crypto_sign_keypair();
+
+$privateKey = base64_encode(sodium_crypto_sign_secretkey($keyPair));
+
+$publicKey = base64_encode(sodium_crypto_sign_publickey($keyPair));
+
+$payload = 
+    'iss' => 'example.org',
+    'aud' => 'example.com',
+    'iat' => 1356999524,
+    'nbf' => 1357000000
+;
+
+$jwt = JWT::encode($payload, $privateKey, 'EdDSA');
+echo "Encode:\n" . print_r($jwt, true) . "\n";
+
+$decoded = JWT::decode($jwt, new Key($publicKey, 'EdDSA'));
+echo "Decode:\n" . print_r((array) $decoded, true) . "\n";
+````
+
+Using JWKs
+----------
+
+```php
+use Firebase\JWT\JWK;
+use Firebase\JWT\JWT;
+
+// Set of keys. The "keys" key is required. For example, the JSON response to
+// this endpoint: https://www.gstatic.com/iap/verify/public_key-jwk
+$jwks = 'keys' => ;
+
+// JWK::parseKeySet($jwks) returns an associative array of **kid** to Firebase\JWT\Key
+// objects. Pass this as the second parameter to JWT::decode.
+JWT::decode($payload, JWK::parseKeySet($jwks));
+```
+
+Using Cached Key Sets
+---------------------
+
+The `CachedKeySet` class can be used to fetch and cache JWKS (JSON Web Key Sets) from a public URI.
+This has the following advantages:
+
+1. The results are cached for performance.
+2. If an unrecognized key is requested, the cache is refreshed, to accomodate for key rotation.
+3. If rate limiting is enabled, the JWKS URI will not make more than 10 requests a second.
+
+```php
+use Firebase\JWT\CachedKeySet;
+use Firebase\JWT\JWT;
+
+// The URI for the JWKS you wish to cache the results from
+$jwksUri = 'https://www.gstatic.com/iap/verify/public_key-jwk';
+
+// Create an HTTP client (can be any PSR-7 compatible HTTP client)
+$httpClient = new GuzzleHttp\Client();
+
+// Create an HTTP request factory (can be any PSR-17 compatible HTTP request factory)
+$httpFactory = new GuzzleHttp\Psr\HttpFactory();
+
+// Create a cache item pool (can be any PSR-6 compatible cache item pool)
+$cacheItemPool = Phpfastcache\CacheManager::getInstance('files');
+
+$keySet = new CachedKeySet(
+    $jwksUri,
+    $httpClient,
+    $httpFactory,
+    $cacheItemPool,
+    null, // $expiresAfter int seconds to set the JWKS to expire
+    true  // $rateLimit    true to enable rate limit of 10 RPS on lookup of invalid keys
+);
+
+$jwt = 'eyJhbGci...'; // Some JWT signed by a key from the $jwkUri above
+$decoded = JWT::decode($jwt, $keySet);
+```
+
+Miscellaneous
+-------------
+
+#### Exception Handling
+
+When a call to `JWT::decode` is invalid, it will throw one of the following exceptions:
+
+```php
+use Firebase\JWT\JWT;
+use Firebase\JWT\SignatureInvalidException;
+use Firebase\JWT\BeforeValidException;
+use Firebase\JWT\ExpiredException;
+use DomainException;
+use InvalidArgumentException;
+use UnexpectedValueException;
+
+try {
+    $decoded = JWT::decode($payload, $keys);
+} catch (InvalidArgumentException $e) {
+    // provided key/key-array is empty or malformed.
+} catch (DomainException $e) {
+    // provided algorithm is unsupported OR
+    // provided key is invalid OR
+    // unknown error thrown in openSSL or libsodium OR
+    // libsodium is required but not available.
+} catch (SignatureInvalidException $e) {
+    // provided JWT signature verification failed.
+} catch (BeforeValidException $e) {
+    // provided JWT is trying to be used before "nbf" claim OR
+    // provided JWT is trying to be used before "iat" claim.
+} catch (ExpiredException $e) {
+    // provided JWT is trying to be used after "exp" claim.
+} catch (UnexpectedValueException $e) {
+    // provided JWT is malformed OR
+    // provided JWT is missing an algorithm / using an unsupported algorithm OR
+    // provided JWT algorithm does not match provided key OR
+    // provided key ID in key/key-array is empty or invalid.
+}
+```
+
+All exceptions in the `Firebase\JWT` namespace extend `UnexpectedValueException`, and can be simplified
+like this:
+
+```php
+try {
+    $decoded = JWT::decode($payload, $keys);
+} catch (LogicException $e) {
+    // errors having to do with environmental setup or malformed JWT Keys
+} catch (UnexpectedValueException $e) {
+    // errors having to do with JWT signature and claims
+}
+```
+
+#### Casting to array
+
+The return value of `JWT::decode` is the generic PHP object `stdClass`. If you'd like to handle with arrays
+instead, you can do the following:
+
+```php
+// return type is stdClass
+$decoded = JWT::decode($payload, $keys);
+
+// cast to array
+$decoded = json_decode(json_encode($decoded), true);
+```
+
+Tests
+-----
+Run the tests using phpunit:
+
+```bash
+$ pear install PHPUnit
+$ phpunit --configuration phpunit.xml.dist
+PHPUnit 3.7.10 by Sebastian Bergmann.
+.....
+Time: 0 seconds, Memory: 2.50Mb
+OK (5 tests, 5 assertions)
+```
+
+New Lines in private keys
+-----
+
+If your private key contains `\n` characters, be sure to wrap it in double quotes `""`
+and not single quotes `''` in order to properly interpret the escaped characters.
+
+License
+-------
+3-Clause BSD(http://opensource.org/licenses/BSD-3-Clause).

roundcubemail-1.5.tar.gz/vendor/firebase/php-jwt/composer.json Added

@@ -0,0 +1,42 @@
+{
+    "name": "firebase/php-jwt",
+    "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.",
+    "homepage": "https://github.com/firebase/php-jwt",
+    "keywords": 
+        "php",
+        "jwt"
+    ,
+    "authors": 
+        {
+            "name": "Neuman Vong",
+            "email": "neuman+pear@twilio.com",
+            "role": "Developer"
+        },
+        {
+            "name": "Anant Narayanan",
+            "email": "anant@php.net",
+            "role": "Developer"
+        }
+    ,
+    "license": "BSD-3-Clause",
+    "require": {
+        "php": "^7.1||^8.0"
+    },
+    "suggest": {
+        "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present",
+        "ext-sodium": "Support EdDSA (Ed25519) signatures"
+    },
+    "autoload": {
+        "psr-4": {
+            "Firebase\\JWT\\": "src"
+        }
+    },
+    "require-dev": {
+        "guzzlehttp/guzzle": "^6.5||^7.4",
+        "phpspec/prophecy-phpunit": "^1.1",
+        "phpunit/phpunit": "^7.5||^9.5",
+        "psr/cache": "^1.0||^2.0",
+        "psr/http-client": "^1.0",
+        "psr/http-factory": "^1.0"
+    }
+}

roundcubemail-1.5.tar.gz/vendor/firebase/php-jwt/src Added

roundcubemail-1.5.tar.gz/vendor/firebase/php-jwt/src/BeforeValidException.php Changed

roundcubemail-1.5.tar.gz/vendor/firebase/php-jwt/src/CachedKeySet.php Added

@@ -0,0 +1,258 @@
+<?php
+
+namespace Firebase\JWT;
+
+use ArrayAccess;
+use InvalidArgumentException;
+use LogicException;
+use OutOfBoundsException;
+use Psr\Cache\CacheItemInterface;
+use Psr\Cache\CacheItemPoolInterface;
+use Psr\Http\Client\ClientInterface;
+use Psr\Http\Message\RequestFactoryInterface;
+use RuntimeException;
+use UnexpectedValueException;
+
+/**
+ * @implements ArrayAccess<string, Key>
+ */
+class CachedKeySet implements ArrayAccess
+{
+    /**
+     * @var string
+     */
+    private $jwksUri;
+    /**
+     * @var ClientInterface
+     */
+    private $httpClient;
+    /**
+     * @var RequestFactoryInterface
+     */
+    private $httpFactory;
+    /**
+     * @var CacheItemPoolInterface
+     */
+    private $cache;
+    /**
+     * @var ?int
+     */
+    private $expiresAfter;
+    /**
+     * @var ?CacheItemInterface
+     */
+    private $cacheItem;
+    /**
+     * @var array<string, array<mixed>>
+     */
+    private $keySet;
+    /**
+     * @var string
+     */
+    private $cacheKey;
+    /**
+     * @var string
+     */
+    private $cacheKeyPrefix = 'jwks';
+    /**
+     * @var int
+     */
+    private $maxKeyLength = 64;
+    /**
+     * @var bool
+     */
+    private $rateLimit;
+    /**
+     * @var string
+     */
+    private $rateLimitCacheKey;
+    /**
+     * @var int
+     */
+    private $maxCallsPerMinute = 10;
+    /**
+     * @var string|null
+     */
+    private $defaultAlg;
+
+    public function __construct(
+        string $jwksUri,
+        ClientInterface $httpClient,
+        RequestFactoryInterface $httpFactory,
+        CacheItemPoolInterface $cache,
+        int $expiresAfter = null,
+        bool $rateLimit = false,
+        string $defaultAlg = null
+    ) {
+        $this->jwksUri = $jwksUri;
+        $this->httpClient = $httpClient;
+        $this->httpFactory = $httpFactory;
+        $this->cache = $cache;
+        $this->expiresAfter = $expiresAfter;
+        $this->rateLimit = $rateLimit;
+        $this->defaultAlg = $defaultAlg;
+        $this->setCacheKeys();
+    }
+
+    /**
+     * @param string $keyId
+     * @return Key
+     */
+    public function offsetGet($keyId): Key
+    {
+        if (!$this->keyIdExists($keyId)) {
+            throw new OutOfBoundsException('Key ID not found');
+        }
+        return JWK::parseKey($this->keySet$keyId, $this->defaultAlg);
+    }
+
+    /**
+     * @param string $keyId
+     * @return bool
+     */
+    public function offsetExists($keyId): bool
+    {
+        return $this->keyIdExists($keyId);
+    }
+
+    /**
+     * @param string $offset
+     * @param Key $value
+     */
+    public function offsetSet($offset, $value): void
+    {
+        throw new LogicException('Method not implemented');
+    }
+
+    /**
+     * @param string $offset
+     */
+    public function offsetUnset($offset): void
+    {
+        throw new LogicException('Method not implemented');
+    }
+
+    /**
+     * @return array<mixed>
+     */
+    private function formatJwksForCache(string $jwks): array
+    {
+        $jwks = json_decode($jwks, true);
+
+        if (!isset($jwks'keys')) {
+            throw new UnexpectedValueException('"keys" member must exist in the JWK Set');
+        }
+
+        if (empty($jwks'keys')) {
+            throw new InvalidArgumentException('JWK Set did not contain any keys');
+        }
+
+        $keys = ;
+        foreach ($jwks'keys' as $k => $v) {
+            $kid = isset($v'kid') ? $v'kid' : $k;
+            $keys(string) $kid = $v;
+        }
+
+        return $keys;
+    }
+
+    private function keyIdExists(string $keyId): bool
+    {
+        if (null === $this->keySet) {
+            $item = $this->getCacheItem();
+            // Try to load keys from cache
+            if ($item->isHit()) {
+                // item found! retrieve it
+                $this->keySet = $item->get();
+                // If the cached item is a string, the JWKS response was cached (previous behavior).
+                // Parse this into expected format array<kid, jwk> instead.
+                if (\is_string($this->keySet)) {
+                    $this->keySet = $this->formatJwksForCache($this->keySet);
+                }
+            }
+        }
+
+        if (!isset($this->keySet$keyId)) {
+            if ($this->rateLimitExceeded()) {
+                return false;
+            }
+            $request = $this->httpFactory->createRequest('GET', $this->jwksUri);
+            $jwksResponse = $this->httpClient->sendRequest($request);
+            $this->keySet = $this->formatJwksForCache((string) $jwksResponse->getBody());
+
+            if (!isset($this->keySet$keyId)) {
+                return false;
+            }
+
+            $item = $this->getCacheItem();
+            $item->set($this->keySet);
+            if ($this->expiresAfter) {
+                $item->expiresAfter($this->expiresAfter);
+            }
+            $this->cache->save($item);
+        }
+
+        return true;
+    }
+
+    private function rateLimitExceeded(): bool
+    {
+        if (!$this->rateLimit) {
+            return false;
+        }
+
+        $cacheItem = $this->cache->getItem($this->rateLimitCacheKey);
+        if (!$cacheItem->isHit()) {
+            $cacheItem->expiresAfter(1); // # of calls are cached each minute
+        }
+
+        $callsPerMinute = (int) $cacheItem->get();
+        if (++$callsPerMinute > $this->maxCallsPerMinute) {
+            return true;
+        }
+        $cacheItem->set($callsPerMinute);
+        $this->cache->save($cacheItem);
+        return false;
+    }
+
+    private function getCacheItem(): CacheItemInterface
+    {
+        if (\is_null($this->cacheItem)) {
+            $this->cacheItem = $this->cache->getItem($this->cacheKey);
+        }
+
+        return $this->cacheItem;
+    }
+
+    private function setCacheKeys(): void
+    {
+        if (empty($this->jwksUri)) {
+            throw new RuntimeException('JWKS URI is empty');
+        }
+
+        // ensure we do not have illegal characters
+        $key = preg_replace('|^a-zA-Z0-9_\.!|', '', $this->jwksUri);
+
+        // add prefix
+        $key = $this->cacheKeyPrefix . $key;
+
+        // Hash keys if they exceed $maxKeyLength of 64
+        if (\strlen($key) > $this->maxKeyLength) {
+            $key = substr(hash('sha256', $key), 0, $this->maxKeyLength);
+        }
+
+        $this->cacheKey = $key;
+
+        if ($this->rateLimit) {
+            // add prefix
+            $rateLimitKey = $this->cacheKeyPrefix . 'ratelimit' . $key;
+
+            // Hash keys if they exceed $maxKeyLength of 64
+            if (\strlen($rateLimitKey) > $this->maxKeyLength) {
+                $rateLimitKey = substr(hash('sha256', $rateLimitKey), 0, $this->maxKeyLength);
+            }
+
+            $this->rateLimitCacheKey = $rateLimitKey;
+        }
+    }
+}

roundcubemail-1.5.tar.gz/vendor/firebase/php-jwt/src/ExpiredException.php Changed

roundcubemail-1.5.tar.gz/vendor/firebase/php-jwt/src/JWK.php Added

@@ -0,0 +1,323 @@
+<?php
+
+namespace Firebase\JWT;
+
+use DomainException;
+use InvalidArgumentException;
+use UnexpectedValueException;
+
+/**
+ * JSON Web Key implementation, based on this spec:
+ * https://tools.ietf.org/html/draft-ietf-jose-json-web-key-41
+ *
+ * PHP version 5
+ *
+ * @category Authentication
+ * @package  Authentication_JWT
+ * @author   Bui Sy Nguyen <nguyenbs@gmail.com>
+ * @license  http://opensource.org/licenses/BSD-3-Clause 3-clause BSD
+ * @link     https://github.com/firebase/php-jwt
+ */
+class JWK
+{
+    private const OID = '1.2.840.10045.2.1';
+    private const ASN1_OBJECT_IDENTIFIER = 0x06;
+    private const ASN1_SEQUENCE = 0x10; // also defined in JWT
+    private const ASN1_BIT_STRING = 0x03;
+    private const EC_CURVES = 
+        'P-256' => '1.2.840.10045.3.1.7', // Len: 64
+        'secp256k1' => '1.3.132.0.10', // Len: 64
+        // 'P-384' => '1.3.132.0.34', // Len: 96 (not yet supported)
+        // 'P-521' => '1.3.132.0.35', // Len: 132 (not supported)
+    ;
+
+    /**
+     * Parse a set of JWK keys
+     *
+     * @param array<mixed> $jwks The JSON Web Key Set as an associative array
+     * @param string       $defaultAlg The algorithm for the Key object if "alg" is not set in the
+     *                                 JSON Web Key Set
+     *
+     * @return array<string, Key> An associative array of key IDs (kid) to Key objects
+     *
+     * @throws InvalidArgumentException     Provided JWK Set is empty
+     * @throws UnexpectedValueException     Provided JWK Set was invalid
+     * @throws DomainException              OpenSSL failure
+     *
+     * @uses parseKey
+     */
+    public static function parseKeySet(array $jwks, string $defaultAlg = null): array
+    {
+        $keys = ;
+
+        if (!isset($jwks'keys')) {
+            throw new UnexpectedValueException('"keys" member must exist in the JWK Set');
+        }
+
+        if (empty($jwks'keys')) {
+            throw new InvalidArgumentException('JWK Set did not contain any keys');
+        }
+
+        foreach ($jwks'keys' as $k => $v) {
+            $kid = isset($v'kid') ? $v'kid' : $k;
+            if ($key = self::parseKey($v, $defaultAlg)) {
+                $keys(string) $kid = $key;
+            }
+        }
+
+        if (0 === \count($keys)) {
+            throw new UnexpectedValueException('No supported algorithms found in JWK Set');
+        }
+
+        return $keys;
+    }
+
+    /**
+     * Parse a JWK key
+     *
+     * @param array<mixed> $jwk An individual JWK
+     * @param string       $defaultAlg The algorithm for the Key object if "alg" is not set in the
+     *                                 JSON Web Key Set
+     *
+     * @return Key The key object for the JWK
+     *
+     * @throws InvalidArgumentException     Provided JWK is empty
+     * @throws UnexpectedValueException     Provided JWK was invalid
+     * @throws DomainException              OpenSSL failure
+     *
+     * @uses createPemFromModulusAndExponent
+     */
+    public static function parseKey(array $jwk, string $defaultAlg = null): ?Key
+    {
+        if (empty($jwk)) {
+            throw new InvalidArgumentException('JWK must not be empty');
+        }
+
+        if (!isset($jwk'kty')) {
+            throw new UnexpectedValueException('JWK must contain a "kty" parameter');
+        }
+
+        if (!isset($jwk'alg')) {
+            if (\is_null($defaultAlg)) {
+                // The "alg" parameter is optional in a KTY, but an algorithm is required
+                // for parsing in this library. Use the $defaultAlg parameter when parsing the
+                // key set in order to prevent this error.
+                // @see https://datatracker.ietf.org/doc/html/rfc7517#section-4.4
+                throw new UnexpectedValueException('JWK must contain an "alg" parameter');
+            }
+            $jwk'alg' = $defaultAlg;
+        }
+
+        switch ($jwk'kty') {
+            case 'RSA':
+                if (!empty($jwk'd')) {
+                    throw new UnexpectedValueException('RSA private keys are not supported');
+                }
+                if (!isset($jwk'n') || !isset($jwk'e')) {
+                    throw new UnexpectedValueException('RSA keys must contain values for both "n" and "e"');
+                }
+
+                $pem = self::createPemFromModulusAndExponent($jwk'n', $jwk'e');
+                $publicKey = \openssl_pkey_get_public($pem);
+                if (false === $publicKey) {
+                    throw new DomainException(
+                        'OpenSSL error: ' . \openssl_error_string()
+                    );
+                }
+                return new Key($publicKey, $jwk'alg');
+            case 'EC':
+                if (isset($jwk'd')) {
+                    // The key is actually a private key
+                    throw new UnexpectedValueException('Key data must be for a public key');
+                }
+
+                if (empty($jwk'crv')) {
+                    throw new UnexpectedValueException('crv not set');
+                }
+
+                if (!isset(self::EC_CURVES$jwk'crv')) {
+                    throw new DomainException('Unrecognised or unsupported EC curve');
+                }
+
+                if (empty($jwk'x') || empty($jwk'y')) {
+                    throw new UnexpectedValueException('x and y not set');
+                }
+
+                $publicKey = self::createPemFromCrvAndXYCoordinates($jwk'crv', $jwk'x', $jwk'y');
+                return new Key($publicKey, $jwk'alg');
+            default:
+                // Currently only RSA is supported
+                break;
+        }
+
+        return null;
+    }
+
+    /**
+     * Converts the EC JWK values to pem format.
+     *
+     * @param   string  $crv The EC curve (only P-256 is supported)
+     * @param   string  $x   The EC x-coordinate
+     * @param   string  $y   The EC y-coordinate
+     *
+     * @return  string
+     */
+    private static function createPemFromCrvAndXYCoordinates(string $crv, string $x, string $y): string
+    {
+        $pem =
+            self::encodeDER(
+                self::ASN1_SEQUENCE,
+                self::encodeDER(
+                    self::ASN1_SEQUENCE,
+                    self::encodeDER(
+                        self::ASN1_OBJECT_IDENTIFIER,
+                        self::encodeOID(self::OID)
+                    )
+                    . self::encodeDER(
+                        self::ASN1_OBJECT_IDENTIFIER,
+                        self::encodeOID(self::EC_CURVES$crv)
+                    )
+                ) .
+                self::encodeDER(
+                    self::ASN1_BIT_STRING,
+                    \chr(0x00) . \chr(0x04)
+                    . JWT::urlsafeB64Decode($x)
+                    . JWT::urlsafeB64Decode($y)
+                )
+            );
+
+        return sprintf(
+            "-----BEGIN PUBLIC KEY-----\n%s\n-----END PUBLIC KEY-----\n",
+            wordwrap(base64_encode($pem), 64, "\n", true)
+        );
+    }
+
+    /**
+     * Create a public key represented in PEM format from RSA modulus and exponent information
+     *
+     * @param string $n The RSA modulus encoded in Base64
+     * @param string $e The RSA exponent encoded in Base64
+     *
+     * @return string The RSA public key represented in PEM format
+     *
+     * @uses encodeLength
+     */
+    private static function createPemFromModulusAndExponent(
+        string $n,
+        string $e
+    ): string {
+        $mod = JWT::urlsafeB64Decode($n);
+        $exp = JWT::urlsafeB64Decode($e);
+
+        $modulus = \pack('Ca*a*', 2, self::encodeLength(\strlen($mod)), $mod);
+        $publicExponent = \pack('Ca*a*', 2, self::encodeLength(\strlen($exp)), $exp);
+
+        $rsaPublicKey = \pack(
+            'Ca*a*a*',
+            48,
+            self::encodeLength(\strlen($modulus) + \strlen($publicExponent)),
+            $modulus,
+            $publicExponent
+        );
+
+        // sequence(oid(1.2.840.113549.1.1.1), null)) = rsaEncryption.
+        $rsaOID = \pack('H*', '300d06092a864886f70d0101010500'); // hex version of MA0GCSqGSIb3DQEBAQUA
+        $rsaPublicKey = \chr(0) . $rsaPublicKey;
+        $rsaPublicKey = \chr(3) . self::encodeLength(\strlen($rsaPublicKey)) . $rsaPublicKey;
+
+        $rsaPublicKey = \pack(
+            'Ca*a*',
+            48,
+            self::encodeLength(\strlen($rsaOID . $rsaPublicKey)),
+            $rsaOID . $rsaPublicKey
+        );
+
+        return "-----BEGIN PUBLIC KEY-----\r\n" .
+            \chunk_split(\base64_encode($rsaPublicKey), 64) .
+            '-----END PUBLIC KEY-----';
+    }
+
+    /**
+     * DER-encode the length
+     *
+     * DER supports lengths up to (2**8)**127, however, we'll only support lengths up to (2**8)**4.  See
+     * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690 paragraph 8.1.3} for more information.
+     *
+     * @param int $length
+     * @return string
+     */
+    private static function encodeLength(int $length): string
+    {
+        if ($length <= 0x7F) {
+            return \chr($length);
+        }
+
+        $temp = \ltrim(\pack('N', $length), \chr(0));
+
+        return \pack('Ca*', 0x80 | \strlen($temp), $temp);
+    }
+
+    /**
+     * Encodes a value into a DER object.
+     * Also defined in Firebase\JWT\JWT
+     *
+     * @param   int     $type DER tag
+     * @param   string  $value the value to encode
+     * @return  string  the encoded object
+     */
+    private static function encodeDER(int $type, string $value): string
+    {
+        $tag_header = 0;
+        if ($type === self::ASN1_SEQUENCE) {
+            $tag_header |= 0x20;
+        }
+
+        // Type
+        $der = \chr($tag_header | $type);
+
+        // Length
+        $der .= \chr(\strlen($value));
+
+        return $der . $value;
+    }
+
+    /**
+     * Encodes a string into a DER-encoded OID.
+     *
+     * @param   string $oid the OID string
+     * @return  string the binary DER-encoded OID
+     */
+    private static function encodeOID(string $oid): string
+    {
+        $octets = explode('.', $oid);
+
+        // Get the first octet
+        $first = (int) array_shift($octets);
+        $second = (int) array_shift($octets);
+        $oid = \chr($first * 40 + $second);
+
+        // Iterate over subsequent octets
+        foreach ($octets as $octet) {
+            if ($octet == 0) {
+                $oid .= \chr(0x00);
+                continue;
+            }
+            $bin = '';
+
+            while ($octet) {
+                $bin .= \chr(0x80 | ($octet & 0x7f));
+                $octet >>= 7;
+            }
+            $bin0 = $bin0 & \chr(0x7f);
+
+            // Convert to big endian if necessary
+            if (pack('V', 65534) == pack('L', 65534)) {
+                $oid .= strrev($bin);
+            } else {
+                $oid .= $bin;
+            }
+        }
+
+        return $oid;
+    }
+}

roundcubemail-1.5.tar.gz/vendor/firebase/php-jwt/src/JWT.php Added

@@ -0,0 +1,638 @@
+<?php
+
+namespace Firebase\JWT;
+
+use ArrayAccess;
+use DateTime;
+use DomainException;
+use Exception;
+use InvalidArgumentException;
+use OpenSSLAsymmetricKey;
+use OpenSSLCertificate;
+use stdClass;
+use UnexpectedValueException;
+
+/**
+ * JSON Web Token implementation, based on this spec:
+ * https://tools.ietf.org/html/rfc7519
+ *
+ * PHP version 5
+ *
+ * @category Authentication
+ * @package  Authentication_JWT
+ * @author   Neuman Vong <neuman@twilio.com>
+ * @author   Anant Narayanan <anant@php.net>
+ * @license  http://opensource.org/licenses/BSD-3-Clause 3-clause BSD
+ * @link     https://github.com/firebase/php-jwt
+ */
+class JWT
+{
+    private const ASN1_INTEGER = 0x02;
+    private const ASN1_SEQUENCE = 0x10;
+    private const ASN1_BIT_STRING = 0x03;
+
+    /**
+     * When checking nbf, iat or expiration times,
+     * we want to provide some extra leeway time to
+     * account for clock skew.
+     *
+     * @var int
+     */
+    public static $leeway = 0;
+
+    /**
+     * Allow the current timestamp to be specified.
+     * Useful for fixing a value within unit testing.
+     * Will default to PHP time() value if null.
+     *
+     * @var ?int
+     */
+    public static $timestamp = null;
+
+    /**
+     * @var array<string, string>
+     */
+    public static $supported_algs = 
+        'ES384' => 'openssl', 'SHA384',
+        'ES256' => 'openssl', 'SHA256',
+        'ES256K' => 'openssl', 'SHA256',
+        'HS256' => 'hash_hmac', 'SHA256',
+        'HS384' => 'hash_hmac', 'SHA384',
+        'HS512' => 'hash_hmac', 'SHA512',
+        'RS256' => 'openssl', 'SHA256',
+        'RS384' => 'openssl', 'SHA384',
+        'RS512' => 'openssl', 'SHA512',
+        'EdDSA' => 'sodium_crypto', 'EdDSA',
+    ;
+
+    /**
+     * Decodes a JWT string into a PHP object.
+     *
+     * @param string                 $jwt            The JWT
+     * @param Key|array<string,Key> $keyOrKeyArray  The Key or associative array of key IDs (kid) to Key objects.
+     *                                               If the algorithm used is asymmetric, this is the public key
+     *                                               Each Key object contains an algorithm and matching key.
+     *                                               Supported algorithms are 'ES384','ES256', 'HS256', 'HS384',
+     *                                               'HS512', 'RS256', 'RS384', and 'RS512'
+     *
+     * @return stdClass The JWT's payload as a PHP object
+     *
+     * @throws InvalidArgumentException     Provided key/key-array was empty or malformed
+     * @throws DomainException              Provided JWT is malformed
+     * @throws UnexpectedValueException     Provided JWT was invalid
+     * @throws SignatureInvalidException    Provided JWT was invalid because the signature verification failed
+     * @throws BeforeValidException         Provided JWT is trying to be used before it's eligible as defined by 'nbf'
+     * @throws BeforeValidException         Provided JWT is trying to be used before it's been created as defined by 'iat'
+     * @throws ExpiredException             Provided JWT has since expired, as defined by the 'exp' claim
+     *
+     * @uses jsonDecode
+     * @uses urlsafeB64Decode
+     */
+    public static function decode(
+        string $jwt,
+        $keyOrKeyArray
+    ): stdClass {
+        // Validate JWT
+        $timestamp = \is_null(static::$timestamp) ? \time() : static::$timestamp;
+
+        if (empty($keyOrKeyArray)) {
+            throw new InvalidArgumentException('Key may not be empty');
+        }
+        $tks = \explode('.', $jwt);
+        if (\count($tks) !== 3) {
+            throw new UnexpectedValueException('Wrong number of segments');
+        }
+        list($headb64, $bodyb64, $cryptob64) = $tks;
+        $headerRaw = static::urlsafeB64Decode($headb64);
+        if (null === ($header = static::jsonDecode($headerRaw))) {
+            throw new UnexpectedValueException('Invalid header encoding');
+        }
+        $payloadRaw = static::urlsafeB64Decode($bodyb64);
+        if (null === ($payload = static::jsonDecode($payloadRaw))) {
+            throw new UnexpectedValueException('Invalid claims encoding');
+        }
+        if (\is_array($payload)) {
+            // prevent PHP Fatal Error in edge-cases when payload is empty array
+            $payload = (object) $payload;
+        }
+        if (!$payload instanceof stdClass) {
+            throw new UnexpectedValueException('Payload must be a JSON object');
+        }
+        $sig = static::urlsafeB64Decode($cryptob64);
+        if (empty($header->alg)) {
+            throw new UnexpectedValueException('Empty algorithm');
+        }
+        if (empty(static::$supported_algs$header->alg)) {
+            throw new UnexpectedValueException('Algorithm not supported');
+        }
+
+        $key = self::getKey($keyOrKeyArray, property_exists($header, 'kid') ? $header->kid : null);
+
+        // Check the algorithm
+        if (!self::constantTimeEquals($key->getAlgorithm(), $header->alg)) {
+            // See issue #351
+            throw new UnexpectedValueException('Incorrect key for this algorithm');
+        }
+        if (\in_array($header->alg, 'ES256', 'ES256K', 'ES384', true)) {
+            // OpenSSL expects an ASN.1 DER sequence for ES256/ES256K/ES384 signatures
+            $sig = self::signatureToDER($sig);
+        }
+        if (!self::verify("{$headb64}.{$bodyb64}", $sig, $key->getKeyMaterial(), $header->alg)) {
+            throw new SignatureInvalidException('Signature verification failed');
+        }
+
+        // Check the nbf if it is defined. This is the time that the
+        // token can actually be used. If it's not yet that time, abort.
+        if (isset($payload->nbf) && $payload->nbf > ($timestamp + static::$leeway)) {
+            throw new BeforeValidException(
+                'Cannot handle token prior to ' . \date(DateTime::ISO8601, $payload->nbf)
+            );
+        }
+
+        // Check that this token has been created before 'now'. This prevents
+        // using tokens that have been created for later use (and haven't
+        // correctly used the nbf claim).
+        if (isset($payload->iat) && $payload->iat > ($timestamp + static::$leeway)) {
+            throw new BeforeValidException(
+                'Cannot handle token prior to ' . \date(DateTime::ISO8601, $payload->iat)
+            );
+        }
+
+        // Check if this token has expired.
+        if (isset($payload->exp) && ($timestamp - static::$leeway) >= $payload->exp) {
+            throw new ExpiredException('Expired token');
+        }
+
+        return $payload;
+    }
+
+    /**
+     * Converts and signs a PHP array into a JWT string.
+     *
+     * @param array<mixed>          $payload PHP array
+     * @param string|resource|OpenSSLAsymmetricKey|OpenSSLCertificate $key The secret key.
+     * @param string                $alg     Supported algorithms are 'ES384','ES256', 'ES256K', 'HS256',
+     *                                       'HS384', 'HS512', 'RS256', 'RS384', and 'RS512'
+     * @param string                $keyId
+     * @param array<string, string> $head    An array with header elements to attach
+     *
+     * @return string A signed JWT
+     *
+     * @uses jsonEncode
+     * @uses urlsafeB64Encode
+     */
+    public static function encode(
+        array $payload,
+        $key,
+        string $alg,
+        string $keyId = null,
+        array $head = null
+    ): string {
+        $header = 'typ' => 'JWT', 'alg' => $alg;
+        if ($keyId !== null) {
+            $header'kid' = $keyId;
+        }
+        if (isset($head) && \is_array($head)) {
+            $header = \array_merge($head, $header);
+        }
+        $segments = ;
+        $segments = static::urlsafeB64Encode((string) static::jsonEncode($header));
+        $segments = static::urlsafeB64Encode((string) static::jsonEncode($payload));
+        $signing_input = \implode('.', $segments);
+
+        $signature = static::sign($signing_input, $key, $alg);
+        $segments = static::urlsafeB64Encode($signature);
+
+        return \implode('.', $segments);
+    }
+
+    /**
+     * Sign a string with a given key and algorithm.
+     *
+     * @param string $msg  The message to sign
+     * @param string|resource|OpenSSLAsymmetricKey|OpenSSLCertificate  $key  The secret key.
+     * @param string $alg  Supported algorithms are 'ES384','ES256', 'ES256K', 'HS256',
+     *                    'HS384', 'HS512', 'RS256', 'RS384', and 'RS512'
+     *
+     * @return string An encrypted message
+     *
+     * @throws DomainException Unsupported algorithm or bad key was specified
+     */
+    public static function sign(
+        string $msg,
+        $key,
+        string $alg
+    ): string {
+        if (empty(static::$supported_algs$alg)) {
+            throw new DomainException('Algorithm not supported');
+        }
+        list($function, $algorithm) = static::$supported_algs$alg;
+        switch ($function) {
+            case 'hash_hmac':
+                if (!\is_string($key)) {
+                    throw new InvalidArgumentException('key must be a string when using hmac');
+                }
+                return \hash_hmac($algorithm, $msg, $key, true);
+            case 'openssl':
+                $signature = '';
+                $success = \openssl_sign($msg, $signature, $key, $algorithm); // @phpstan-ignore-line
+                if (!$success) {
+                    throw new DomainException('OpenSSL unable to sign data');
+                }
+                if ($alg === 'ES256' || $alg === 'ES256K') {
+                    $signature = self::signatureFromDER($signature, 256);
+                } elseif ($alg === 'ES384') {
+                    $signature = self::signatureFromDER($signature, 384);
+                }
+                return $signature;
+            case 'sodium_crypto':
+                if (!\function_exists('sodium_crypto_sign_detached')) {
+                    throw new DomainException('libsodium is not available');
+                }
+                if (!\is_string($key)) {
+                    throw new InvalidArgumentException('key must be a string when using EdDSA');
+                }
+                try {
+                    // The last non-empty line is used as the key.
+                    $lines = array_filter(explode("\n", $key));
+                    $key = base64_decode((string) end($lines));
+                    if (\strlen($key) === 0) {
+                        throw new DomainException('Key cannot be empty string');
+                    }
+                    return sodium_crypto_sign_detached($msg, $key);
+                } catch (Exception $e) {
+                    throw new DomainException($e->getMessage(), 0, $e);
+                }
+        }
+
+        throw new DomainException('Algorithm not supported');
+    }
+
+    /**
+     * Verify a signature with the message, key and method. Not all methods
+     * are symmetric, so we must have a separate verify and sign method.
+     *
+     * @param string $msg         The original message (header and body)
+     * @param string $signature   The original signature
+     * @param string|resource|OpenSSLAsymmetricKey|OpenSSLCertificate  $keyMaterial For HS*, a string key works. for RS*, must be an instance of OpenSSLAsymmetricKey
+     * @param string $alg         The algorithm
+     *
+     * @return bool
+     *
+     * @throws DomainException Invalid Algorithm, bad key, or OpenSSL failure
+     */
+    private static function verify(
+        string $msg,
+        string $signature,
+        $keyMaterial,
+        string $alg
+    ): bool {
+        if (empty(static::$supported_algs$alg)) {
+            throw new DomainException('Algorithm not supported');
+        }
+
+        list($function, $algorithm) = static::$supported_algs$alg;
+        switch ($function) {
+            case 'openssl':
+                $success = \openssl_verify($msg, $signature, $keyMaterial, $algorithm); // @phpstan-ignore-line
+                if ($success === 1) {
+                    return true;
+                }
+                if ($success === 0) {
+                    return false;
+                }
+                // returns 1 on success, 0 on failure, -1 on error.
+                throw new DomainException(
+                    'OpenSSL error: ' . \openssl_error_string()
+                );
+            case 'sodium_crypto':
+                if (!\function_exists('sodium_crypto_sign_verify_detached')) {
+                    throw new DomainException('libsodium is not available');
+                }
+                if (!\is_string($keyMaterial)) {
+                    throw new InvalidArgumentException('key must be a string when using EdDSA');
+                }
+                try {
+                    // The last non-empty line is used as the key.
+                    $lines = array_filter(explode("\n", $keyMaterial));
+                    $key = base64_decode((string) end($lines));
+                    if (\strlen($key) === 0) {
+                        throw new DomainException('Key cannot be empty string');
+                    }
+                    if (\strlen($signature) === 0) {
+                        throw new DomainException('Signature cannot be empty string');
+                    }
+                    return sodium_crypto_sign_verify_detached($signature, $msg, $key);
+                } catch (Exception $e) {
+                    throw new DomainException($e->getMessage(), 0, $e);
+                }
+            case 'hash_hmac':
+            default:
+                if (!\is_string($keyMaterial)) {
+                    throw new InvalidArgumentException('key must be a string when using hmac');
+                }
+                $hash = \hash_hmac($algorithm, $msg, $keyMaterial, true);
+                return self::constantTimeEquals($hash, $signature);
+        }
+    }
+
+    /**
+     * Decode a JSON string into a PHP object.
+     *
+     * @param string $input JSON string
+     *
+     * @return mixed The decoded JSON string
+     *
+     * @throws DomainException Provided string was invalid JSON
+     */
+    public static function jsonDecode(string $input)
+    {
+        $obj = \json_decode($input, false, 512, JSON_BIGINT_AS_STRING);
+
+        if ($errno = \json_last_error()) {
+            self::handleJsonError($errno);
+        } elseif ($obj === null && $input !== 'null') {
+            throw new DomainException('Null result with non-null input');
+        }
+        return $obj;
+    }
+
+    /**
+     * Encode a PHP array into a JSON string.
+     *
+     * @param array<mixed> $input A PHP array
+     *
+     * @return string JSON representation of the PHP array
+     *
+     * @throws DomainException Provided object could not be encoded to valid JSON
+     */
+    public static function jsonEncode(array $input): string
+    {
+        if (PHP_VERSION_ID >= 50400) {
+            $json = \json_encode($input, \JSON_UNESCAPED_SLASHES);
+        } else {
+            // PHP 5.3 only
+            $json = \json_encode($input);
+        }
+        if ($errno = \json_last_error()) {
+            self::handleJsonError($errno);
+        } elseif ($json === 'null' && $input !== null) {
+            throw new DomainException('Null result with non-null input');
+        }
+        if ($json === false) {
+            throw new DomainException('Provided object could not be encoded to valid JSON');
+        }
+        return $json;
+    }
+
+    /**
+     * Decode a string with URL-safe Base64.
+     *
+     * @param string $input A Base64 encoded string
+     *
+     * @return string A decoded string
+     *
+     * @throws InvalidArgumentException invalid base64 characters
+     */
+    public static function urlsafeB64Decode(string $input): string
+    {
+        $remainder = \strlen($input) % 4;
+        if ($remainder) {
+            $padlen = 4 - $remainder;
+            $input .= \str_repeat('=', $padlen);
+        }
+        return \base64_decode(\strtr($input, '-_', '+/'));
+    }
+
+    /**
+     * Encode a string with URL-safe Base64.
+     *
+     * @param string $input The string you want encoded
+     *
+     * @return string The base64 encode of what you passed in
+     */
+    public static function urlsafeB64Encode(string $input): string
+    {
+        return \str_replace('=', '', \strtr(\base64_encode($input), '+/', '-_'));
+    }
+
+
+    /**
+     * Determine if an algorithm has been provided for each Key
+     *
+     * @param Key|ArrayAccess<string,Key>|array<string,Key> $keyOrKeyArray
+     * @param string|null            $kid
+     *
+     * @throws UnexpectedValueException
+     *
+     * @return Key
+     */
+    private static function getKey(
+        $keyOrKeyArray,
+        ?string $kid
+    ): Key {
+        if ($keyOrKeyArray instanceof Key) {
+            return $keyOrKeyArray;
+        }
+
+        if (empty($kid)) {
+            throw new UnexpectedValueException('"kid" empty, unable to lookup correct key');
+        }
+
+        if ($keyOrKeyArray instanceof CachedKeySet) {
+            // Skip "isset" check, as this will automatically refresh if not set
+            return $keyOrKeyArray$kid;
+        }
+
+        if (!isset($keyOrKeyArray$kid)) {
+            throw new UnexpectedValueException('"kid" invalid, unable to lookup correct key');
+        }
+
+        return $keyOrKeyArray$kid;
+    }
+
+    /**
+     * @param string $left  The string of known length to compare against
+     * @param string $right The user-supplied string
+     * @return bool
+     */
+    public static function constantTimeEquals(string $left, string $right): bool
+    {
+        if (\function_exists('hash_equals')) {
+            return \hash_equals($left, $right);
+        }
+        $len = \min(self::safeStrlen($left), self::safeStrlen($right));
+
+        $status = 0;
+        for ($i = 0; $i < $len; $i++) {
+            $status |= (\ord($left$i) ^ \ord($right$i));
+        }
+        $status |= (self::safeStrlen($left) ^ self::safeStrlen($right));
+
+        return ($status === 0);
+    }
+
+    /**
+     * Helper method to create a JSON error.
+     *
+     * @param int $errno An error number from json_last_error()
+     *
+     * @throws DomainException
+     *
+     * @return void
+     */
+    private static function handleJsonError(int $errno): void
+    {
+        $messages = 
+            JSON_ERROR_DEPTH => 'Maximum stack depth exceeded',
+            JSON_ERROR_STATE_MISMATCH => 'Invalid or malformed JSON',
+            JSON_ERROR_CTRL_CHAR => 'Unexpected control character found',
+            JSON_ERROR_SYNTAX => 'Syntax error, malformed JSON',
+            JSON_ERROR_UTF8 => 'Malformed UTF-8 characters' //PHP >= 5.3.3
+        ;
+        throw new DomainException(
+            isset($messages$errno)
+            ? $messages$errno
+            : 'Unknown JSON error: ' . $errno
+        );
+    }
+
+    /**
+     * Get the number of bytes in cryptographic strings.
+     *
+     * @param string $str
+     *
+     * @return int
+     */
+    private static function safeStrlen(string $str): int
+    {
+        if (\function_exists('mb_strlen')) {
+            return \mb_strlen($str, '8bit');
+        }
+        return \strlen($str);
+    }
+
+    /**
+     * Convert an ECDSA signature to an ASN.1 DER sequence
+     *
+     * @param   string $sig The ECDSA signature to convert
+     * @return  string The encoded DER object
+     */
+    private static function signatureToDER(string $sig): string
+    {
+        // Separate the signature into r-value and s-value
+        $length = max(1, (int) (\strlen($sig) / 2));
+        list($r, $s) = \str_split($sig, $length);
+
+        // Trim leading zeros
+        $r = \ltrim($r, "\x00");
+        $s = \ltrim($s, "\x00");
+
+        // Convert r-value and s-value from unsigned big-endian integers to
+        // signed two's complement
+        if (\ord($r0) > 0x7f) {
+            $r = "\x00" . $r;
+        }
+        if (\ord($s0) > 0x7f) {
+            $s = "\x00" . $s;
+        }
+
+        return self::encodeDER(
+            self::ASN1_SEQUENCE,
+            self::encodeDER(self::ASN1_INTEGER, $r) .
+            self::encodeDER(self::ASN1_INTEGER, $s)
+        );
+    }
+
+    /**
+     * Encodes a value into a DER object.
+     *
+     * @param   int     $type DER tag
+     * @param   string  $value the value to encode
+     *
+     * @return  string  the encoded object
+     */
+    private static function encodeDER(int $type, string $value): string
+    {
+        $tag_header = 0;
+        if ($type === self::ASN1_SEQUENCE) {
+            $tag_header |= 0x20;
+        }
+
+        // Type
+        $der = \chr($tag_header | $type);
+
+        // Length
+        $der .= \chr(\strlen($value));
+
+        return $der . $value;
+    }
+
+    /**
+     * Encodes signature from a DER object.
+     *
+     * @param   string  $der binary signature in DER format
+     * @param   int     $keySize the number of bits in the key
+     *
+     * @return  string  the signature
+     */
+    private static function signatureFromDER(string $der, int $keySize): string
+    {
+        // OpenSSL returns the ECDSA signatures as a binary ASN.1 DER SEQUENCE
+        list($offset, $_) = self::readDER($der);
+        list($offset, $r) = self::readDER($der, $offset);
+        list($offset, $s) = self::readDER($der, $offset);
+
+        // Convert r-value and s-value from signed two's compliment to unsigned
+        // big-endian integers
+        $r = \ltrim($r, "\x00");
+        $s = \ltrim($s, "\x00");
+
+        // Pad out r and s so that they are $keySize bits long
+        $r = \str_pad($r, $keySize / 8, "\x00", STR_PAD_LEFT);
+        $s = \str_pad($s, $keySize / 8, "\x00", STR_PAD_LEFT);
+
+        return $r . $s;
+    }
+
+    /**
+     * Reads binary DER-encoded data and decodes into a single object
+     *
+     * @param string $der the binary data in DER format
+     * @param int $offset the offset of the data stream containing the object
+     * to decode
+     *
+     * @return array{int, string|null} the new offset and the decoded object
+     */
+    private static function readDER(string $der, int $offset = 0): array
+    {
+        $pos = $offset;
+        $size = \strlen($der);
+        $constructed = (\ord($der$pos) >> 5) & 0x01;
+        $type = \ord($der$pos++) & 0x1f;
+
+        // Length
+        $len = \ord($der$pos++);
+        if ($len & 0x80) {
+            $n = $len & 0x1f;
+            $len = 0;
+            while ($n-- && $pos < $size) {
+                $len = ($len << 8) | \ord($der$pos++);
+            }
+        }
+
+        // Value
+        if ($type === self::ASN1_BIT_STRING) {
+            $pos++; // Skip the first contents octet (padding indicator)
+            $data = \substr($der, $pos, $len - 1);
+            $pos += $len - 1;
+        } elseif (!$constructed) {
+            $data = \substr($der, $pos, $len);
+            $pos += $len;
+        } else {
+            $data = null;
+        }
+
+        return $pos, $data;
+    }
+}

roundcubemail-1.5.tar.gz/vendor/firebase/php-jwt/src/Key.php Added

@@ -0,0 +1,64 @@
+<?php
+
+namespace Firebase\JWT;
+
+use InvalidArgumentException;
+use OpenSSLAsymmetricKey;
+use OpenSSLCertificate;
+use TypeError;
+
+class Key
+{
+    /** @var string|resource|OpenSSLAsymmetricKey|OpenSSLCertificate */
+    private $keyMaterial;
+    /** @var string */
+    private $algorithm;
+
+    /**
+     * @param string|resource|OpenSSLAsymmetricKey|OpenSSLCertificate $keyMaterial
+     * @param string $algorithm
+     */
+    public function __construct(
+        $keyMaterial,
+        string $algorithm
+    ) {
+        if (
+            !\is_string($keyMaterial)
+            && !$keyMaterial instanceof OpenSSLAsymmetricKey
+            && !$keyMaterial instanceof OpenSSLCertificate
+            && !\is_resource($keyMaterial)
+        ) {
+            throw new TypeError('Key material must be a string, resource, or OpenSSLAsymmetricKey');
+        }
+
+        if (empty($keyMaterial)) {
+            throw new InvalidArgumentException('Key material must not be empty');
+        }
+
+        if (empty($algorithm)) {
+            throw new InvalidArgumentException('Algorithm must not be empty');
+        }
+
+        // TODO: Remove in PHP 8.0 in favor of class constructor property promotion
+        $this->keyMaterial = $keyMaterial;
+        $this->algorithm = $algorithm;
+    }
+
+    /**
+     * Return the algorithm valid for this key
+     *
+     * @return string
+     */
+    public function getAlgorithm(): string
+    {
+        return $this->algorithm;
+    }
+
+    /**
+     * @return string|resource|OpenSSLAsymmetricKey|OpenSSLCertificate
+     */
+    public function getKeyMaterial()
+    {
+        return $this->keyMaterial;
+    }
+}

roundcubemail-1.5.tar.gz/vendor/firebase/php-jwt/src/SignatureInvalidException.php Changed

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@a966b73c000f.(none)> 1707132209 +0000	clone: from /home/default/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
-39a754269fe6e5d94b0fe87215e89232876bda01 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@a966b73c000f.(none)> 1707132209 +0000	checkout: moving from master to master
-39a754269fe6e5d94b0fe87215e89232876bda01 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@a966b73c000f.(none)> 1707132209 +0000	reset: moving to 39a754269fe6e5d94b0fe87215e89232876bda01
+0000000000000000000000000000000000000000 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@43dfe6f62dbb.(none)> 1711454039 +0000	clone: from /home/default/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
+39a754269fe6e5d94b0fe87215e89232876bda01 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@43dfe6f62dbb.(none)> 1711454039 +0000	checkout: moving from master to master
+39a754269fe6e5d94b0fe87215e89232876bda01 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@43dfe6f62dbb.(none)> 1711454039 +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 Deleted

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

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-6a6243b7a42cea6b09852a51579809429158017f.idx Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-6a6243b7a42cea6b09852a51579809429158017f.pack Added

roundcubemail-1.5.tar.gz/vendor/lolli42 Added

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff Added

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/LICENSE Added

@@ -0,0 +1,23 @@
+MIT License
+
+Copyright (c) 2011 Raymond Hill (http://raymondhill.net/blog/?p=441)
+Copyright (c) 2013 Rob Crowe (http://cogpowered.com)
+Copyright (c) 2021 Christian Kuhn (https://github.com/lolli42)
+
+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/lolli42/finediff/README.md Added

@@ -0,0 +1,107 @@
+!Tests(https://github.com/lolli42/FineDiff/actions/workflows/tests.yml/badge.svg)(https://github.com/lolli42/FineDiff/actions/workflows/tests.yml)
+
+FineDiff
+========
+
+FineDiff is a rather simple library to create HTML diff view of two strings:
+
+```php
+echo (new Diff())->render('hello world', 'hello2 worlds');
+```
+```
+hello<ins>2</ins> world<ins>s</ins>
+```
+
+Installation
+------------
+
+```
+$ composer req lolli42/finediff
+```
+
+Tags
+----
+
+* **1.x** Dropped PHP <7.2, has PHP >=7.2 support, added multibyte support, forces strict types, E_ALL error free
+* **<1.x** is identical to cogpowered/finediff from (https://github.com/cogpowered/FineDiff(https://github.com/cogpowered/FineDiff))
+
+Usage
+-----
+
+Render the difference between two strings as HTML on a character basis:
+```php
+echo (new Diff())->render('string one', 'string two');
+```
+```
+string <ins>tw</ins>o<del>ne</del>
+```
+
+Render the difference between two strings as HTML on a word basis:
+```php
+echo (new Diff(new Word()))->render('string one', 'string two');
+```
+```
+string <del>one</del><ins>two</ins>
+```
+
+Special characters and entities are quoted by HTML renderer and multibyte strings are handled:
+```php
+echo (new Diff())->render('foo<bär>baz', 'foo<qüx>baz');
+```
+```
+foo&lt;<del>b&auml;r</del><ins>q&uuml;x</ins>&gt;baz
+```
+
+Algorithm
+---------
+
+To create a diff-view between two string, an intermediate "Opcode" representation
+is created that specifies the differences form string one to string two. The renderer
+then takes this opcode and creates HTML from it. Note the opcode string is considered
+internal and may change in a backwards breaking way with younger library releases.
+
+```php
+$diff = new Diff();
+echo $diff->getOpcodes('hello world', 'hello2 worlds');
+// c5i:2c6i:s
+// Means: copy 5 chars "hello", then insert "2", then copy 6 chars " world", then insert "s"
+echo $diff->process('hello wordl', 'c5i:2c6i:s');
+// hello<ins>2</ins> world<ins>s</ins>
+```
+
+Running tests
+-------------
+
+Full test run:
+
+```
+$ composer update
+$ vendor/bin/phpunit
+```
+
+Restricting to single files:
+
+```
+$ composer update
+$ vendor/bin/phpunit tests/DiffTest.php
+```
+
+Casual setup to run tests with xdebug (3.x) enabled, an IDE like phpstorm should then break point:
+
+```
+$ composer update
+$ XDEBUG_MODE="debug,develop" XDEBUG_TRIGGER="foo" vendor/bin/phpunit
+```
+
+History
+-------
+
+* Originally written by Raymond Hill (https://github.com/gorhill/PHP-FineDiff(https://github.com/gorhill/PHP-FineDiff))
+* Tweaked to bring it up to date with the modern world. That means documented, nicely formatted, tested code
+  that can be easily extended by Rob Crowe (https://github.com/cogpowered/FineDiff(https://github.com/cogpowered/FineDiff))
+* Added PHP 8 compatibility and multibyte string support by Christian Kuhn (https://github.com/lolli42/FineDiff(https://github.com/lolli42/FineDiff))
+
+License
+-------
+
+MIT License. See LICENSE file.

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/composer.json Added

@@ -0,0 +1,40 @@
+{
+    "name": "lolli42/finediff",
+    "description": "PHP implementation of a Fine granularity Diff engine",
+    "homepage": "https://github.com/lolli42/FineDiff",
+    "license": "MIT",
+    "keywords": "finediff", "diff", "text", "string", "opcode",
+    "authors": 
+        {
+            "name": "Raymond Hill"
+        },
+        {
+            "name": "Rob Crowe",
+            "email": "rob@cogpowered.com"
+        },
+        {
+            "name": "Christian Kuhn",
+            "email": "lolli@schwarzbu.ch",
+            "role": "maintainer"
+        }
+    ,
+    "type": "library",
+    "require": {
+        "php": ">=7.2.0",
+        "symfony/polyfill-mbstring": "^1.23"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^8.5.33 || ^9.6.11 || ^10.3.2",
+        "friendsofphp/php-cs-fixer": "^3.4",
+        "phpstan/phpstan": "^1.9.14"
+    },
+    "replace": {
+        "cogpowered/finediff": "*"
+    },
+    "autoload": {
+        "psr-4": { "cogpowered\\FineDiff\\": "src/" }
+    },
+    "autoload-dev": {
+        "psr-4": { "cogpowered\\FineDiff\\Tests\\": "tests/"}
+    }
+}

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/src Added

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/src/Delimiters.php Added

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/src/Diff.php Added

@@ -0,0 +1,129 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * FINE granularity DIFF
+ *
+ * (c) 2011 Raymond Hill (http://raymondhill.net/blog/?p=441)
+ * (c) 2013 Robert Crowe (http://cogpowered.com)
+ * (c) 2021 Christian Kuhn
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace cogpowered\FineDiff;
+
+use cogpowered\FineDiff\Granularity\Character;
+use cogpowered\FineDiff\Granularity\GranularityInterface;
+use cogpowered\FineDiff\Parser\OpcodesInterface;
+use cogpowered\FineDiff\Parser\Parser;
+use cogpowered\FineDiff\Parser\ParserInterface;
+use cogpowered\FineDiff\Render\Html;
+use cogpowered\FineDiff\Render\RendererInterface;
+
+/**
+ * Diff class.
+ */
+class Diff
+{
+    /**
+     * @var GranularityInterface
+     */
+    protected $granularity;
+
+    /**
+     * @var RendererInterface
+     */
+    protected $renderer;
+
+    /**
+     * @var ParserInterface
+     */
+    protected $parser;
+
+    /**
+     * Instantiate a new instance of Diff.
+     *
+     * @param GranularityInterface|null $granularity Level of diff.
+     * @param RendererInterface|null $renderer Diff renderer.
+     * @param ParserInterface|null $parser Parser used to generate opcodes.
+     */
+    public function __construct(GranularityInterface $granularity = null, RendererInterface $renderer = null, ParserInterface $parser = null)
+    {
+        $this->granularity = $granularity ?? new Character();
+        $this->renderer = $renderer ?? new Html();
+        $this->parser = $parser ?? new Parser($this->granularity);
+    }
+
+    /**
+     * Returns the granularity object used by the parser.
+     */
+    public function getGranularity(): GranularityInterface
+    {
+        return $this->parser->getGranularity();
+    }
+
+    /**
+     * Set the granularity level of the parser.
+     */
+    public function setGranularity(GranularityInterface $granularity): void
+    {
+        $this->parser->setGranularity($granularity);
+    }
+
+    /**
+     * Get the render.
+     */
+    public function getRenderer(): RendererInterface
+    {
+        return $this->renderer;
+    }
+
+    /**
+     * Set the renderer.
+     */
+    public function setRenderer(RendererInterface $renderer): void
+    {
+        $this->renderer = $renderer;
+    }
+
+    /**
+     * Get the parser responsible for generating the diff/opcodes.
+     */
+    public function getParser(): ParserInterface
+    {
+        return $this->parser;
+    }
+
+    /**
+     * Set the parser.
+     */
+    public function setParser(ParserInterface $parser): void
+    {
+        $this->parser = $parser;
+    }
+
+    /**
+     * Gets the diff / opcodes between two strings.
+     *
+     * Returns the opcode diff which can be used for example
+     * to generate HTML report of the differences.
+     */
+    public function getOpcodes(string $from_text, string $to_text): OpcodesInterface
+    {
+        return $this->parser->parse($from_text, $to_text);
+    }
+
+    /**
+     * Render the difference between two strings.
+     * By default, will return the difference as HTML.
+     */
+    public function render(string $from_text, string $to_text): string
+    {
+        // First we need the opcodes
+        $opcodes = $this->getOpcodes($from_text, $to_text);
+        return $this->renderer->process($from_text, $opcodes);
+    }
+}

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/src/Exceptions Added

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/src/Exceptions/GranularityCountException.php Added

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/src/Exceptions/OperationException.php Added

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/src/Granularity Added

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/src/Granularity/Character.php Added

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/src/Granularity/Granularity.php Added

@@ -0,0 +1,82 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * FINE granularity DIFF
+ *
+ * (c) 2011 Raymond Hill (http://raymondhill.net/blog/?p=441)
+ * (c) 2013 Robert Crowe (http://cogpowered.com)
+ * (c) 2021 Christian Kuhn
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace cogpowered\FineDiff\Granularity;
+
+/**
+ * Granularities should extend this class.
+ */
+abstract class Granularity implements GranularityInterface
+{
+    /**
+     * @var array<int, array<int, string>> Extending granularities should override this.
+     */
+    protected $delimiters = ;
+
+    #\ReturnTypeWillChange
+    public function offsetExists($offset)
+    {
+        return isset($this->delimiters$offset);
+    }
+
+    /**
+     * @return array<int, string>|null
+     */
+    #\ReturnTypeWillChange
+    public function offsetGet($offset)
+    {
+        return $this->delimiters$offset ?? null;
+    }
+
+    /**
+     * @param mixed $value
+     */
+    #\ReturnTypeWillChange
+    public function offsetSet($offset, $value)
+    {
+        if (is_null($offset)) {
+            $this->delimiters = $value;
+        } else {
+            $this->delimiters$offset = $value;
+        }
+    }
+
+    #\ReturnTypeWillChange
+    public function offsetUnset($offset)
+    {
+        unset($this->delimiters$offset);
+    }
+
+    /**
+     * Return the number of delimiters this granularity contains.
+     *
+     * @return int
+     */
+    #\ReturnTypeWillChange
+    public function count()
+    {
+        return count($this->delimiters);
+    }
+
+    public function getDelimiters(): array
+    {
+        return $this->delimiters;
+    }
+
+    public function setDelimiters(array $delimiters): void
+    {
+        $this->delimiters = $delimiters;
+    }
+}

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/src/Granularity/GranularityInterface.php Added

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/src/Granularity/Paragraph.php Added

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/src/Granularity/Sentence.php Added

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/src/Granularity/Word.php Added

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/src/Parser Added

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/src/Parser/Opcodes.php Added

@@ -0,0 +1,70 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * FINE granularity DIFF
+ *
+ * (c) 2011 Raymond Hill (http://raymondhill.net/blog/?p=441)
+ * (c) 2013 Robert Crowe (http://cogpowered.com)
+ * (c) 2021 Christian Kuhn
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace cogpowered\FineDiff\Parser;
+
+use cogpowered\FineDiff\Exceptions\OperationException;
+use cogpowered\FineDiff\Parser\Operations\OperationInterface;
+
+/**
+ * Holds all the opcodes returned by the parser.
+ */
+class Opcodes implements OpcodesInterface
+{
+    /**
+     * @var array<int, string> Individual opcodes.
+     */
+    protected $opcodes = ;
+
+    /**
+     * @inheritdoc
+     */
+    public function getOpcodes(): array
+    {
+        return $this->opcodes;
+    }
+
+    /**
+     * @inheritdoc
+     * @throws OperationException
+     */
+    public function setOpcodes(array $opcodes): void
+    {
+        $this->opcodes = ;
+        // Ensure that all elements of the array are of the correct type.
+        foreach ($opcodes as $opcode) {
+            if (!$opcode instanceof OperationInterface) {
+                throw new OperationException('Invalid opcode object');
+            }
+            $this->opcodes = $opcode->getOpcode();
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function generate(): string
+    {
+        return implode('', $this->opcodes);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function __toString()
+    {
+        return $this->generate();
+    }
+}

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/src/Parser/OpcodesInterface.php Added

@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * FINE granularity DIFF
+ *
+ * (c) 2011 Raymond Hill (http://raymondhill.net/blog/?p=441)
+ * (c) 2013 Robert Crowe (http://cogpowered.com)
+ * (c) 2021 Christian Kuhn
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace cogpowered\FineDiff\Parser;
+
+use cogpowered\FineDiff\Parser\Operations\OperationInterface;
+
+interface OpcodesInterface
+{
+    /**
+     * Get the opcodes.
+     *
+     * @return array<int, string>
+     */
+    public function getOpcodes(): array;
+
+    /**
+     * Set the opcodes for this parse.
+     *
+     * @param array<int, OperationInterface> $opcodes Elements must be an instance of OperationInterface.
+     */
+    public function setOpcodes(array $opcodes): void;
+
+    /**
+     * Return the opcodes in a format that can then be rendered.
+     */
+    public function generate(): string;
+
+    /**
+     * When object is cast to a string returns opcodes as string.
+     */
+    public function __toString();
+}

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/src/Parser/Operations Added

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/src/Parser/Operations/Copy.php Added

@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * FINE granularity DIFF
+ *
+ * (c) 2011 Raymond Hill (http://raymondhill.net/blog/?p=441)
+ * (c) 2013 Robert Crowe (http://cogpowered.com)
+ * (c) 2021 Christian Kuhn
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace cogpowered\FineDiff\Parser\Operations;
+
+/**
+ * Generates the opcode for a copy operation.
+ */
+class Copy implements OperationInterface
+{
+    /**
+     * @var int
+     */
+    protected $len;
+
+    /**
+     * Set the initial length.
+     *
+     * @param int $len Length of string.
+     */
+    public function __construct(int $len)
+    {
+        $this->len = $len;
+    }
+
+    public function getFromLen(): int
+    {
+        return $this->len;
+    }
+
+    public function getToLen(): int
+    {
+        return $this->len;
+    }
+
+    public function getOpcode(): string
+    {
+        if ($this->len === 1) {
+            return 'c';
+        }
+
+        return "c{$this->len}";
+    }
+
+    /**
+     * Increase the length of the string.
+     *
+     * @param int $size Amount to increase the string length by.
+     * @return int New length
+     */
+    public function increase(int $size): int
+    {
+        return $this->len += $size;
+    }
+}

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/src/Parser/Operations/Delete.php Added

@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * FINE granularity DIFF
+ *
+ * (c) 2011 Raymond Hill (http://raymondhill.net/blog/?p=441)
+ * (c) 2013 Robert Crowe (http://cogpowered.com)
+ * (c) 2021 Christian Kuhn
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace cogpowered\FineDiff\Parser\Operations;
+
+/**
+ * Generates the opcode for a delete operation.
+ */
+class Delete implements OperationInterface
+{
+    /**
+     * @var int
+     */
+    protected $fromLen;
+
+    /**
+     * Set the initial length.
+     *
+     * @param int $len Length of string.
+     */
+    public function __construct(int $len)
+    {
+        $this->fromLen = $len;
+    }
+
+    public function getFromLen(): int
+    {
+        return $this->fromLen;
+    }
+
+    public function getToLen(): int
+    {
+        return 0;
+    }
+
+    public function getOpcode(): string
+    {
+        if ($this->fromLen === 1) {
+            return 'd';
+        }
+        return "d{$this->fromLen}";
+    }
+}

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/src/Parser/Operations/Insert.php Added

@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * FINE granularity DIFF
+ *
+ * (c) 2011 Raymond Hill (http://raymondhill.net/blog/?p=441)
+ * (c) 2013 Robert Crowe (http://cogpowered.com)
+ * (c) 2021 Christian Kuhn
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace cogpowered\FineDiff\Parser\Operations;
+
+/**
+ * Generates the opcode for a copy operation.
+ */
+class Insert implements OperationInterface
+{
+    /**
+     * @var string
+     */
+    protected $text;
+
+    /**
+     * Sets the text that the operation is working with.
+     */
+    public function __construct(string $text)
+    {
+        $this->text = $text;
+    }
+
+    public function getFromLen(): int
+    {
+        return 0;
+    }
+
+    public function getToLen(): int
+    {
+        return mb_strlen($this->text);
+    }
+
+    public function getText(): string
+    {
+        return $this->text;
+    }
+
+    public function getOpcode(): string
+    {
+        $to_len = mb_strlen($this->text);
+        if ($to_len === 1) {
+            return "i:{$this->text}";
+        }
+        return "i{$to_len}:{$this->text}";
+    }
+}

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/src/Parser/Operations/OperationInterface.php Added

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/src/Parser/Operations/Replace.php Added

@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * FINE granularity DIFF
+ *
+ * (c) 2011 Raymond Hill (http://raymondhill.net/blog/?p=441)
+ * (c) 2013 Robert Crowe (http://cogpowered.com)
+ * (c) 2021 Christian Kuhn
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace cogpowered\FineDiff\Parser\Operations;
+
+class Replace implements OperationInterface
+{
+    /**
+     * @var string
+     */
+    protected $text;
+
+    /**
+     * @var int
+     */
+    protected $fromLen;
+
+    /**
+     * @param int $fromLen
+     * @param string $text
+     */
+    public function __construct(int $fromLen, string $text)
+    {
+        $this->fromLen = $fromLen;
+        $this->text    = $text;
+    }
+
+    public function getFromLen(): int
+    {
+        return $this->fromLen;
+    }
+
+    public function getToLen(): int
+    {
+        return mb_strlen($this->text);
+    }
+
+    /**
+     * Get the text the operation is working with.
+     */
+    public function getText(): string
+    {
+        return $this->text;
+    }
+
+    public function getOpcode(): string
+    {
+        if ($this->fromLen === 1) {
+            $del_opcode = 'd';
+        } else {
+            $del_opcode = "d{$this->fromLen}";
+        }
+        $to_len = mb_strlen($this->text);
+        if ($to_len === 1) {
+            return "{$del_opcode}i:{$this->text}";
+        }
+        return "{$del_opcode}i{$to_len}:{$this->text}";
+    }
+}

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/src/Parser/Parser.php Added

@@ -0,0 +1,450 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * FINE granularity DIFF
+ *
+ * (c) 2011 Raymond Hill (http://raymondhill.net/blog/?p=441)
+ * (c) 2013 Robert Crowe (http://cogpowered.com)
+ * (c) 2021 Christian Kuhn
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace cogpowered\FineDiff\Parser;
+
+use cogpowered\FineDiff\Exceptions\GranularityCountException;
+use cogpowered\FineDiff\Exceptions\OperationException;
+use cogpowered\FineDiff\Granularity\GranularityInterface;
+use cogpowered\FineDiff\Parser\Operations\Copy;
+use cogpowered\FineDiff\Parser\Operations\Delete;
+use cogpowered\FineDiff\Parser\Operations\Insert;
+use cogpowered\FineDiff\Parser\Operations\OperationInterface;
+use cogpowered\FineDiff\Parser\Operations\Replace;
+
+/**
+ * Generates a set of instructions to convert one string to another.
+ */
+class Parser implements ParserInterface
+{
+    /**
+     * @var GranularityInterface
+     */
+    protected $granularity;
+
+    /**
+     * @var OpcodesInterface
+     */
+    protected $opcodes;
+
+    /**
+     * @var string Text we are comparing against.
+     */
+    protected $from_text;
+
+    /**
+     * @var int Position of the $from_text we are at.
+     */
+    protected $from_offset = 0;
+
+    /**
+     * @var OperationInterface|null
+     */
+    protected $last_edit;
+
+    /**
+     * @var int Current position in the granularity array.
+     */
+    protected $stackpointer = 0;
+
+    /**
+     * @var array<int, OperationInterface> Holds the individual opcodes as the diff takes place.
+     */
+    protected $edits = ;
+
+    /**
+     * @inheritdoc
+     */
+    public function __construct(GranularityInterface $granularity)
+    {
+        $this->granularity = $granularity;
+
+        // Set default opcodes generator
+        $this->opcodes = new Opcodes();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getGranularity()
+    {
+        return $this->granularity;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setGranularity(GranularityInterface $granularity): void
+    {
+        $this->granularity = $granularity;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getOpcodes(): OpcodesInterface
+    {
+        return $this->opcodes;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setOpcodes(OpcodesInterface $opcodes): void
+    {
+        $this->opcodes = $opcodes;
+    }
+
+    /**
+     * @inheritdoc
+     * @throws GranularityCountException|OperationException
+     */
+    public function parse(string $from_text, string $to_text): OpcodesInterface
+    {
+        // Ensure the granularity contains some delimiters
+        if (count($this->granularity) === 0) {
+            throw new GranularityCountException('Granularity contains no delimiters');
+        }
+
+        // Reset internal parser properties
+        $this->from_text    = $from_text;
+        $this->from_offset  = 0;
+        $this->last_edit    = null;
+        $this->stackpointer = 0;
+        $this->edits        = ;
+
+        // Parse the two string
+        $this->process($from_text, $to_text);
+
+        // Return processed diff
+        $this->opcodes->setOpcodes($this->edits);
+        return $this->opcodes;
+    }
+
+    /**
+     * Actually kicks off the processing. Recursive function.
+     */
+    protected function process(string $from_text, string $to_text): void
+    {
+        // Lets get parsing
+        /** @var array<int, string> $delimiters */
+        $delimiters = $this->granularity$this->stackpointer++ ?? ;
+        $has_next_stage = $this->stackpointer < count($this->granularity);
+
+        // Actually perform diff
+        $diff = $this->diff($from_text, $to_text, $delimiters);
+
+        foreach ($diff as $fragment) {
+            // increase granularity
+            if ($fragment instanceof Replace && $has_next_stage) {
+                $this->process(
+                    mb_substr($this->from_text, $this->from_offset, $fragment->getFromLen()),
+                    $fragment->getText()
+                );
+            } elseif ($fragment instanceof Copy && $this->last_edit instanceof Copy) {
+                // fuse copy ops whenever possible
+                /** @var Copy $copyOperation */
+                $copyOperation = $this->editscount($this->edits)-1;
+                $copyOperation->increase($fragment->getFromLen());
+                $this->from_offset += $fragment->getFromLen();
+            } else {
+                /* $fragment instanceof Copy */
+                /* $fragment instanceof Delete */
+                /* $fragment instanceof Insert */
+                $this->edits = $this->last_edit = $fragment;
+                $this->from_offset += $fragment->getFromLen();
+            }
+        }
+
+        $this->stackpointer--;
+    }
+
+    /**
+     * Core parsing function.
+     *
+     * @param array<int, string> $delimiters
+     * @return array<int, OperationInterface>
+     */
+    protected function diff(string $from_text, string $to_text, array $delimiters): array
+    {
+        // Empty delimiter means character-level diffing.
+        // In such case, use code path optimized for character-level diffing.
+        if (empty(implode('', $delimiters))) {
+            return $this->charDiff($from_text, $to_text);
+        }
+
+        $result = ;
+
+        // fragment-level diffing
+        $from_text_len  = mb_strlen($from_text);
+        $to_text_len    = mb_strlen($to_text);
+        $from_fragments = $this->extractFragments($from_text, $delimiters);
+        $to_fragments   = $this->extractFragments($to_text, $delimiters);
+
+        $jobs              = 0, $from_text_len, 0, $to_text_len;
+        $cached_array_keys = ;
+        $best_from_start = 0;
+        $best_to_start = 0;
+
+        while ($job = array_pop($jobs)) {
+
+            // get the segments which must be diff'ed
+            list($from_segment_start, $from_segment_end, $to_segment_start, $to_segment_end) = $job;
+
+            // catch easy cases first
+            $from_segment_length = $from_segment_end - $from_segment_start;
+            $to_segment_length   = $to_segment_end - $to_segment_start;
+
+            if (!$from_segment_length || !$to_segment_length) {
+                if ($from_segment_length) {
+                    $result$from_segment_start * 4 = new Delete($from_segment_length);
+                } elseif ($to_segment_length) {
+                    $result$from_segment_start * 4 + 1 = new Insert(mb_substr($to_text, $to_segment_start, $to_segment_length));
+                }
+
+                continue;
+            }
+
+            // find longest copy operation for the current segments
+            $best_copy_length = 0;
+
+            $from_base_fragment_index = $from_segment_start;
+            $cached_array_keys_for_current_segment = ;
+
+            while ($from_base_fragment_index < $from_segment_end) {
+                $from_base_fragment        = $from_fragments$from_base_fragment_index;
+                $from_base_fragment_length = mb_strlen($from_base_fragment);
+
+                // performance boost: cache array keys
+                if (!isset($cached_array_keys_for_current_segment$from_base_fragment)) {
+                    if (!isset($cached_array_keys$from_base_fragment)) {
+                        $to_all_fragment_indices = $cached_array_keys$from_base_fragment = array_keys($to_fragments, $from_base_fragment, true);
+                    } else {
+                        $to_all_fragment_indices = $cached_array_keys$from_base_fragment;
+                    }
+
+                    // get only indices which falls within current segment
+                    if ($to_segment_start > 0 || $to_segment_end < $to_text_len) {
+                        $to_fragment_indices = ;
+
+                        foreach ($to_all_fragment_indices as $to_fragment_index) {
+                            if ($to_fragment_index < $to_segment_start) {
+                                continue;
+                            }
+
+                            if ($to_fragment_index >= $to_segment_end) {
+                                break;
+                            }
+
+                            $to_fragment_indices = $to_fragment_index;
+                        }
+
+                        $cached_array_keys_for_current_segment$from_base_fragment = $to_fragment_indices;
+                    } else {
+                        $to_fragment_indices = $to_all_fragment_indices;
+                    }
+                } else {
+                    $to_fragment_indices = $cached_array_keys_for_current_segment$from_base_fragment;
+                }
+
+                // iterate through collected indices
+                foreach ($to_fragment_indices as $to_base_fragment_index) {
+                    $fragment_index_offset = $from_base_fragment_length;
+
+                    // iterate until no more match
+                    do {
+                        $fragment_from_index = $from_base_fragment_index + $fragment_index_offset;
+
+                        if ($fragment_from_index >= $from_segment_end) {
+                            break;
+                        }
+
+                        $fragment_to_index = $to_base_fragment_index + $fragment_index_offset;
+
+                        if ($fragment_to_index >= $to_segment_end) {
+                            break;
+                        }
+
+                        if ($from_fragments$fragment_from_index !== $to_fragments$fragment_to_index) {
+                            break;
+                        }
+
+                        $fragment_length = mb_strlen($from_fragments$fragment_from_index);
+                        $fragment_index_offset += $fragment_length;
+                    } while (true);
+
+                    if ($fragment_index_offset > $best_copy_length) {
+                        $best_copy_length = $fragment_index_offset;
+                        $best_from_start  = $from_base_fragment_index;
+                        $best_to_start    = $to_base_fragment_index;
+                    }
+                }
+
+                $from_base_fragment_index += mb_strlen($from_base_fragment);
+
+                // If match is larger than half segment size, no point trying to find better
+                // @todo: Really?
+                if ($best_copy_length >= $from_segment_length / 2) {
+                    break;
+                }
+
+                // no point to keep looking if what is left is less than
+                // current best match
+                if ($from_base_fragment_index + $best_copy_length >= $from_segment_end) {
+                    break;
+                }
+            }
+
+            if ($best_copy_length) {
+                $jobs = $from_segment_start, $best_from_start, $to_segment_start, $best_to_start;
+                $result$best_from_start * 4 + 2 = new Copy($best_copy_length);
+                $jobs = $best_from_start + $best_copy_length, $from_segment_end, $best_to_start + $best_copy_length, $to_segment_end;
+            } else {
+                $result$from_segment_start * 4  = new Replace($from_segment_length, mb_substr($to_text, $to_segment_start, $to_segment_length));
+            }
+        }
+
+        ksort($result, SORT_NUMERIC);
+        return array_values($result);
+    }
+
+    /**
+     * Same as Parser::diff but tuned for character level granularity.
+     *
+     * @return array<int, OperationInterface>
+     */
+    protected function charDiff(string $from_text, string $to_text): array
+    {
+        $result = ;
+        $jobs   = 0, mb_strlen($from_text), 0, mb_strlen($to_text);
+        $from_copy_start = 0;
+        $to_copy_start = 0;
+
+        while ($job = array_pop($jobs)) {
+
+            // get the segments which must be diff'ed
+            list($from_segment_start, $from_segment_end, $to_segment_start, $to_segment_end) = $job;
+
+            $from_segment_len = $from_segment_end - $from_segment_start;
+            $to_segment_len   = $to_segment_end - $to_segment_start;
+
+            // catch easy cases first
+            if (!$from_segment_len || !$to_segment_len) {
+                if ($from_segment_len) {
+                    $result$from_segment_start * 4 + 0 = new Delete($from_segment_len);
+                } elseif ($to_segment_len) {
+                    $result$from_segment_start * 4 + 1 = new Insert(mb_substr($to_text, $to_segment_start, $to_segment_len));
+                }
+
+                continue;
+            }
+
+            if ($from_segment_len >= $to_segment_len) {
+                $copy_len = $to_segment_len;
+
+                while ($copy_len) {
+                    $to_copy_start     = $to_segment_start;
+                    $to_copy_start_max = $to_segment_end - $copy_len;
+
+                    while ($to_copy_start <= $to_copy_start_max) {
+                        $from_copy_start = mb_strpos(mb_substr($from_text, $from_segment_start, $from_segment_len), mb_substr($to_text, $to_copy_start, $copy_len));
+
+                        if ($from_copy_start !== false) {
+                            $from_copy_start += $from_segment_start;
+                            break 2;
+                        }
+
+                        $to_copy_start++;
+                    }
+
+                    $copy_len--;
+                }
+            } else {
+                $copy_len = $from_segment_len;
+
+                while ($copy_len) {
+                    $from_copy_start     = $from_segment_start;
+                    $from_copy_start_max = $from_segment_end - $copy_len;
+
+                    while ($from_copy_start <= $from_copy_start_max) {
+                        $to_copy_start = mb_strpos(mb_substr($to_text, $to_segment_start, $to_segment_len), mb_substr($from_text, $from_copy_start, $copy_len));
+
+                        if ($to_copy_start !== false) {
+                            $to_copy_start += $to_segment_start;
+                            break 2;
+                        }
+
+                        $from_copy_start++;
+                    }
+
+                    $copy_len--;
+                }
+            }
+
+            // match found
+            if ($copy_len) {
+                $jobs = $from_segment_start, $from_copy_start, $to_segment_start, $to_copy_start;
+                $result$from_copy_start * 4 + 2 = new Copy($copy_len);
+                $jobs = $from_copy_start + $copy_len, $from_segment_end, $to_copy_start + $copy_len, $to_segment_end;
+            }
+            // no match,  so delete all, insert all
+            else {
+                $result$from_segment_start * 4 = new Replace($from_segment_len, mb_substr($to_text, $to_segment_start, $to_segment_len));
+            }
+        }
+
+        ksort($result, SORT_NUMERIC);
+        return array_values($result);
+    }
+
+    /**
+     * Efficiently fragment the text into an array according to specified delimiters.
+     *
+     * The array indices are the offset of the fragments into
+     * the input string. A sentinel empty fragment is always added at the end.
+     * Careful: No check is performed as to the validity of the delimiters.
+     *
+     * @param array<int, string> $delimiters
+     * @return array<int, string>
+     */
+    protected function extractFragments(string $text, array $delimiters)
+    {
+        $charCount = mb_strlen($text);
+        $fragments = ;
+        $currentFragmentString = '';
+        $fragmentStartPosition = 0;
+        $foundDelimiterInFragment = false;
+        $chars = mb_str_split($text, 1, 'UTF-8');
+        foreach ($chars as $currentPosition => $character) {
+            $isDelimiterCharacter = in_array($character, $delimiters, true);
+            if ($isDelimiterCharacter) {
+                $currentFragmentString .= $character;
+                $foundDelimiterInFragment = true;
+            } elseif ($foundDelimiterInFragment) {
+                $foundDelimiterInFragment = false;
+                $fragments$fragmentStartPosition = $currentFragmentString;
+                $fragmentStartPosition = $currentPosition;
+                $currentFragmentString = $character;
+            } else {
+                $currentFragmentString .= $character;
+            }
+        }
+        if (mb_strlen($currentFragmentString) > 0) {
+            $fragments$fragmentStartPosition = $currentFragmentString;
+        }
+        $fragments$charCount = '';
+        return $fragments;
+    }
+}

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/src/Parser/ParserInterface.php Added

@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * FINE granularity DIFF
+ *
+ * (c) 2011 Raymond Hill (http://raymondhill.net/blog/?p=441)
+ * (c) 2013 Robert Crowe (http://cogpowered.com)
+ * (c) 2021 Christian Kuhn
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace cogpowered\FineDiff\Parser;
+
+use cogpowered\FineDiff\Granularity\GranularityInterface;
+
+interface ParserInterface
+{
+    /**
+     * Creates an instance.
+     */
+    public function __construct(GranularityInterface $granularity);
+
+    /**
+     * Granularity the parser is working with.
+     *
+     * Default is \cogpowered\FineDiff\Granularity\Character.
+     *
+     * @return GranularityInterface
+     */
+    public function getGranularity();
+
+    /**
+     * Set the granularity that the parser is working with.
+     */
+    public function setGranularity(GranularityInterface $granularity): void;
+
+    /**
+     * Get the opcodes object that is used to store all the opcodes.
+     */
+    public function getOpcodes(): OpcodesInterface;
+
+    /**
+     * Set the opcodes object used to store all the opcodes for this parse.
+     */
+    public function setOpcodes(OpcodesInterface $opcodes): void;
+
+    /**
+     * Generates the opcodes needed to transform one string to another.
+     */
+    public function parse(string $from_text, string $to_text): OpcodesInterface;
+}

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/src/Render Added

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/src/Render/Html.php Added

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * FINE granularity DIFF
+ *
+ * (c) 2011 Raymond Hill (http://raymondhill.net/blog/?p=441)
+ * (c) 2013 Robert Crowe (http://cogpowered.com)
+ * (c) 2021 Christian Kuhn
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace cogpowered\FineDiff\Render;
+
+class Html extends Renderer
+{
+    public function callback(string $opcode, string $from, int $from_offset, int $from_len): string
+    {
+        if ($opcode === 'c') {
+            $html = htmlentities(mb_substr($from, $from_offset, $from_len));
+        } elseif ($opcode === 'd') {
+            $deletion = mb_substr($from, $from_offset, $from_len);
+
+            if (strcspn($deletion, " \n\r") === 0) {
+                $deletion = str_replace("\n", "\r", '\n', '\r', $deletion);
+            }
+
+            $html = '<del>' . htmlentities($deletion) . '</del>';
+        } else /* if ( $opcode === 'i' ) */ {
+            $html = '<ins>' . htmlentities(mb_substr($from, $from_offset, $from_len)) . '</ins>';
+        }
+
+        return $html;
+    }
+}

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/src/Render/Renderer.php Added

@@ -0,0 +1,74 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * FINE granularity DIFF
+ *
+ * (c) 2011 Raymond Hill (http://raymondhill.net/blog/?p=441)
+ * (c) 2013 Robert Crowe (http://cogpowered.com)
+ * (c) 2021 Christian Kuhn
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace cogpowered\FineDiff\Render;
+
+use cogpowered\FineDiff\Parser\OpcodesInterface;
+
+abstract class Renderer implements RendererInterface
+{
+    /**
+     * Covert text based on the provided opcodes.
+     *
+     * @param string $from_text
+     * @param string|OpcodesInterface|mixed $opcodes Throws on non-string and non-OpcodesInterface
+     * @return string
+     */
+    public function process(string $from_text, $opcodes)
+    {
+        // Validate opcodes
+        if (!is_string($opcodes) && !($opcodes instanceof OpcodesInterface)) {
+            throw new \InvalidArgumentException('Invalid opcodes type');
+        }
+        $opcodes = ($opcodes instanceof OpcodesInterface) ? $opcodes->generate() : $opcodes;
+
+        // Holds the generated string that is returned
+        $output = '';
+
+        $opcodes_len    = mb_strlen($opcodes);
+        $from_offset    = 0;
+        $opcodes_offset = 0;
+
+        while ($opcodes_offset < $opcodes_len) {
+            $opcode = mb_substr($opcodes, $opcodes_offset, 1);
+            $opcodes_offset++;
+            $n = (int)(mb_substr($opcodes, $opcodes_offset));
+
+            if ($n) {
+                $opcodes_offset += mb_strlen((string)$n);
+            } else {
+                $n = 1;
+            }
+
+            if ($opcode === 'c') {
+                // copy n characters from source
+                $data = $this->callback('c', $from_text, $from_offset, $n);
+                $from_offset += $n;
+            } elseif ($opcode === 'd') {
+                // delete n characters from source
+                $data = $this->callback('d', $from_text, $from_offset, $n);
+                $from_offset += $n;
+            } else /* if ( $opcode === 'i' ) */ {
+                // insert n characters from opcodes
+                $data = $this->callback('i', $opcodes, $opcodes_offset + 1, $n);
+                $opcodes_offset += 1 + $n;
+            }
+
+            $output .= $data;
+        }
+
+        return $output;
+    }
+}

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/src/Render/RendererInterface.php Added

roundcubemail-1.5.tar.gz/vendor/lolli42/finediff/src/Render/Text.php Added

roundcubemail-1.5.tar.gz/vendor/pear/crypt_gpg/Crypt/GPG.php Changed

@@ -330,7 +330,7 @@
      *                       the private key. For example,
      *                       "Test User (example) <test@example.com>",
      *                       "test@example.com" or a hexadecimal string.
-     * @param boolean $armor optional. If true, ASCII armored data is returned;
+     * @param bool    $armor optional. If true, ASCII armored data is returned;
      *                       otherwise, binary data is returned. Defaults to
      *                       true.
      *
@@ -367,7 +367,7 @@
      *                       the public key. For example,
      *                       "Test User (example) <test@example.com>",
      *                       "test@example.com" or a hexadecimal string.
-     * @param boolean $armor optional. If true, ASCII armored data is returned;
+     * @param bool    $armor optional. If true, ASCII armored data is returned;
      *                       otherwise, binary data is returned. Defaults to
      *                       true.
      *
@@ -528,7 +528,7 @@
      *                        the key. For example,
      *                        "Test User (example) <test@example.com>",
      *                        "test@example.com" or a hexadecimal string.
-     * @param integer $format optional. How the fingerprint should be formatted.
+     * @param int     $format optional. How the fingerprint should be formatted.
      *                        Use {@link Crypt_GPG::FORMAT_X509} for X.509
      *                        certificate format,
      *                        {@link Crypt_GPG::FORMAT_CANONICAL} for the format
@@ -536,8 +536,8 @@
      *                        {@link Crypt_GPG::FORMAT_NONE} for no formatting.
      *                        Defaults to <code>Crypt_GPG::FORMAT_NONE</code>.
      *
-     * @return string the fingerprint of the key, or null if no fingerprint
-     *                is found for the given <kbd>$keyId</kbd>.
+     * @return string|null The fingerprint of the key, or null if no fingerprint
+     *                     is found for the given <kbd>$keyId</kbd>.
      *
      * @throws Crypt_GPG_Exception if an unknown or unexpected error occurs.
      *         Use the <kbd>debug</kbd> option and file a bug report if these
@@ -601,7 +601,7 @@
      * binary.
      *
      * @param string  $data  the data to be encrypted.
-     * @param boolean $armor optional. If true, ASCII armored data is returned;
+     * @param bool    $armor optional. If true, ASCII armored data is returned;
      *                       otherwise, binary data is returned. Defaults to
      *                       true.
      *
@@ -632,7 +632,7 @@
      *                               which to store the encrypted data. If null
      *                               or unspecified, the encrypted data is
      *                               returned as a string.
-     * @param boolean $armor         optional. If true, ASCII armored data is
+     * @param bool    $armor         optional. If true, ASCII armored data is
      *                               returned; otherwise, binary data is
      *                               returned. Defaults to true.
      *
@@ -668,12 +668,12 @@
      * earlier GnuPG versions, you will get an error. Please use
      * {@link Crypt_GPG::decryptAndVerify()} to verify encrypted-signed data.
      *
-     * @param string  $data  the data to be encrypted and signed.
-     * @param boolean $armor optional. If true, ASCII armored data is returned;
-     *                       otherwise, binary data is returned. Defaults to
-     *                       true.
+     * @param string $data  The data to be encrypted and signed.
+     * @param bool   $armor Optional. If true, ASCII armored data is returned;
+     *                      otherwise, binary data is returned. Defaults to
+     *                      true.
      *
-     * @return string the encrypted signed data.
+     * @return string The encrypted signed data.
      *
      * @throws Crypt_GPG_KeyNotFoundException if no encryption key is specified
      *         or if no signing key is specified. See
@@ -712,7 +712,7 @@
      *                            encrypted, signed data should be stored. If
      *                            null or unspecified, the encrypted, signed
      *                            data is returned as a string.
-     * @param boolean $armor      optional. If true, ASCII armored data is
+     * @param bool    $armor      optional. If true, ASCII armored data is
      *                            returned; otherwise, binary data is returned.
      *                            Defaults to true.
      *
@@ -826,7 +826,7 @@
      *
      * @param string  $encryptedData      the encrypted, signed data to be decrypted
      *                                    and verified.
-     * @param boolean $ignoreVerifyErrors enables ignoring of signature
+     * @param bool    $ignoreVerifyErrors enables ignoring of signature
      *                                    verification errors caused by missing public key
      *                                    When enabled Crypt_GPG_KeyNotFoundException
      *                                    will not be thrown.
@@ -870,7 +870,7 @@
      *                                    decrypted data should be written. If null
      *                                    or unspecified, the decrypted data is
      *                                    returned in the results array.
-     * @param boolean $ignoreVerifyErrors enables ignoring of signature
+     * @param bool    $ignoreVerifyErrors enables ignoring of signature
      *                                    verification errors caused by missing public key
      *                                    When enabled Crypt_GPG_KeyNotFoundException
      *                                    will not be thrown.
@@ -920,12 +920,12 @@
      *                          {@link Crypt_GPG::SIGN_MODE_DETACHED}. If not
      *                          specified, defaults to
      *                          <kbd>Crypt_GPG::SIGN_MODE_NORMAL</kbd>.
-     * @param boolean $armor    optional. If true, ASCII armored data is
+     * @param bool    $armor    optional. If true, ASCII armored data is
      *                          returned; otherwise, binary data is returned.
      *                          Defaults to true. This has no effect if the
      *                          mode <kbd>Crypt_GPG::SIGN_MODE_CLEAR</kbd> is
      *                          used.
-     * @param boolean $textmode optional. If true, line-breaks in signed data
+     * @param bool    $textmode optional. If true, line-breaks in signed data
      *                          are normalized. Use this option when signing
      *                          e-mail, or for greater compatibility between
      *                          systems with different line-break formats.
@@ -976,12 +976,12 @@
      *                            {@link Crypt_GPG::SIGN_MODE_DETACHED}. If not
      *                            specified, defaults to
      *                            <kbd>Crypt_GPG::SIGN_MODE_NORMAL</kbd>.
-     * @param boolean $armor      optional. If true, ASCII armored data is
+     * @param bool    $armor      optional. If true, ASCII armored data is
      *                            returned; otherwise, binary data is returned.
      *                            Defaults to true. This has no effect if the
      *                            mode <kbd>Crypt_GPG::SIGN_MODE_CLEAR</kbd> is
      *                            used.
-     * @param boolean $textmode   optional. If true, line-breaks in signed data
+     * @param bool    $textmode   optional. If true, line-breaks in signed data
      *                            are normalized. Use this option when signing
      *                            e-mail, or for greater compatibility between
      *                            systems with different line-break formats.
@@ -1246,7 +1246,7 @@
     /**
      * Tell if there are encryption keys registered
      *
-     * @return boolean True if the data shall be encrypted
+     * @return bool True if the data shall be encrypted
      */
     public function hasEncryptKeys()
     {
@@ -1256,7 +1256,7 @@
     /**
      * Tell if there are signing keys registered
      *
-     * @return boolean True if the data shall be signed
+     * @return bool True if the data shall be signed
      */
     public function hasSignKeys()
     {
@@ -1279,15 +1279,14 @@
      * This handles resolving full key objects from the provided
      * <kbd>$key</kbd> value.
      *
-     * @param &array  $array      the array to which the key should be added.
-     * @param boolean $encrypt    whether or not the key must be able to
-     *                            encrypt.
-     * @param boolean $sign       whether or not the key must be able to sign.
-     * @param mixed   $key        the key to add. This may be a key identifier,
+     * @param array   &$array     The array to which the key should be added
+     * @param bool    $encrypt    Whether or not the key must be able to
+     *                            encrypt
+     * @param bool    $sign       Whether or not the key must be able to sign
+     * @param mixed   $key        The key to add. This may be a key identifier,
      *                            user id, fingerprint, {@link Crypt_GPG_Key} or
-     *                            {@link Crypt_GPG_SubKey}.
-     * @param string  $passphrase optional. The passphrase associated with the
-     *                            key.
+     *                            {@link Crypt_GPG_SubKey}
+     * @param string  $passphrase Optional passphrase associated with the key
      *
      * @return void
      *
@@ -1369,8 +1368,8 @@
     /**
      * Imports a public or private key into the keyring
      *
-     * @param string  $key    the key to be imported.
-     * @param boolean $isFile whether or not the input is a filename.
+     * @param string $key    The key to be imported.
+     * @param bool   $isFile Whether or not the input is a filename.
      *
      * @return array an associative array containing the following elements:
      *               - <kbd>fingerprint</kbd>       - the fingerprint of the
@@ -1432,10 +1431,10 @@
      *
      * @param string  $keyId   either the full uid of the key, the email
      *                         part of the uid of the key or the key id.
-     * @param boolean $armor   optional. If true, ASCII armored data is returned;
+     * @param bool    $armor   optional. If true, ASCII armored data is returned;
      *                         otherwise, binary data is returned. Defaults to
      *                         true.
-     * @param boolean $private return private instead of public key
+     * @param bool    $private return private instead of public key
      *
      * @return string the key data.
      *
@@ -1479,13 +1478,13 @@
     /**
      * Encrypts data
      *
-     * @param string  $data       the data to encrypt.
-     * @param boolean $isFile     whether or not the data is a filename.
-     * @param string  $outputFile the filename of the file in which to store
-     *                            the encrypted data. If null, the encrypted
-     *                            data is returned as a string.
-     * @param boolean $armor      if true, ASCII armored data is returned;
-     *                            otherwise, binary data is returned.
+     * @param string      $data       The data to encrypt.
+     * @param bool        $isFile     Whether or not the data is a filename.
+     * @param string|null $outputFile The filename of the file in which to store
+     *                                the encrypted data. If null, the encrypted
+     *                                data is returned as a string.
+     * @param bool        $armor      If true, ASCII armored data is returned;
+     *                                otherwise, binary data is returned.
      *
      * @return void|string if the <kbd>$outputFile</kbd> parameter is null, a
      *                     string containing the encrypted data is returned.
@@ -1530,11 +1529,11 @@
     /**
      * Decrypts data
      *
-     * @param string  $data       the data to be decrypted.
-     * @param boolean $isFile     whether or not the data is a filename.
-     * @param string  $outputFile the name of the file to which the decrypted
-     *                            data should be written. If null, the decrypted
-     *                            data is returned as a string.
+     * @param string      $data       The data to be decrypted.
+     * @param bool        $isFile     Whether or not the data is a filename.
+     * @param string|null $outputFile The name of the file to which the decrypted
+     *                                data should be written. If null, the decrypted
+     *                                data is returned as a string.
      *
      * @return void|string if the <kbd>$outputFile</kbd> parameter is null, a
      *                     string containing the decrypted data is returned.
@@ -1576,27 +1575,27 @@
     /**
      * Signs data
      *
-     * @param string  $data       the data to be signed.
-     * @param boolean $isFile     whether or not the data is a filename.
-     * @param string  $outputFile the name of the file in which the signed data
-     *                            should be stored. If null, the signed data is
-     *                            returned as a string.
-     * @param int     $mode       the data signing mode to use. Should be one of
-     *                            {@link Crypt_GPG::SIGN_MODE_NORMAL},
-     *                            {@link Crypt_GPG::SIGN_MODE_CLEAR} or
-     *                            {@link Crypt_GPG::SIGN_MODE_DETACHED}.
-     * @param boolean $armor      if true, ASCII armored data is returned;
-     *                            otherwise, binary data is returned. This has
-     *                            no effect if the mode
-     *                            <kbd>Crypt_GPG::SIGN_MODE_CLEAR</kbd> is
-     *                            used.
-     * @param boolean $textmode   if true, line-breaks in signed data be
-     *                            normalized. Use this option when signing
-     *                            e-mail, or for greater compatibility between
-     *                            systems with different line-break formats.
-     *                            Defaults to false. This has no effect if the
-     *                            mode <kbd>Crypt_GPG::SIGN_MODE_CLEAR</kbd> is
-     *                            used as clear-signing always uses textmode.
+     * @param string      $data       The data to be signed.
+     * @param bool        $isFile     Whether or not the data is a filename.
+     * @param string|null $outputFile The name of the file in which the signed data
+     *                                should be stored. If null, the signed data is
+     *                                returned as a string.
+     * @param int         $mode       The data signing mode to use. Should be one of
+     *                                {@link Crypt_GPG::SIGN_MODE_NORMAL},
+     *                                {@link Crypt_GPG::SIGN_MODE_CLEAR} or
+     *                                {@link Crypt_GPG::SIGN_MODE_DETACHED}.
+     * @param bool        $armor      If true, ASCII armored data is returned;
+     *                                otherwise, binary data is returned. This has
+     *                                no effect if the mode
+     *                                <kbd>Crypt_GPG::SIGN_MODE_CLEAR</kbd> is
+     *                                used.
+     * @param bool        $textmode   If true, line-breaks in signed data be
+     *                                normalized. Use this option when signing
+     *                                e-mail, or for greater compatibility between
+     *                                systems with different line-break formats.
+     *                                Defaults to false. This has no effect if the
+     *                                mode <kbd>Crypt_GPG::SIGN_MODE_CLEAR</kbd> is
+     *                                used as clear-signing always uses textmode.
      *
      * @return void|string if the <kbd>$outputFile</kbd> parameter is null, a
      *                     string containing the signed data (or the signature
@@ -1670,14 +1669,14 @@
     /**
      * Encrypts and signs data
      *
-     * @param string  $data       the data to be encrypted and signed.
-     * @param boolean $isFile     whether or not the data is a filename.
-     * @param string  $outputFile the name of the file in which the encrypted,
-     *                            signed data should be stored. If null, the
-     *                            encrypted, signed data is returned as a
-     *                            string.
-     * @param boolean $armor      if true, ASCII armored data is returned;
-     *                            otherwise, binary data is returned.
+     * @param string      $data       The data to be encrypted and signed.
+     * @param bool        $isFile     Whether or not the data is a filename.
+     * @param string|null $outputFile The name of the file in which the encrypted,
+     *                                signed data should be stored. If null, the
+     *                                encrypted, signed data is returned as a
+     *                                string.
+     * @param bool        $armor      If true, ASCII armored data is returned;
+     *                                otherwise, binary data is returned.
      *
      * @return void|string if the <kbd>$outputFile</kbd> parameter is null, a
      *                     string containing the encrypted, signed data is
@@ -1741,7 +1740,7 @@
      * Verifies data
      *
      * @param string  $data      the signed data to be verified.
-     * @param boolean $isFile    whether or not the data is a filename.
+     * @param bool    $isFile    whether or not the data is a filename.
      * @param string  $signature if verifying a file signed using a detached
      *                           signature, this must be the detached signature
      *                           data. Otherwise, specify ''.
@@ -1797,16 +1796,16 @@
     /**
      * Decrypts and verifies encrypted, signed data
      *
-     * @param string  $data               the encrypted signed data to be decrypted and
-     *                                    verified.
-     * @param boolean $isFile             whether or not the data is a filename.
-     * @param string  $outputFile         the name of the file to which the decrypted
-     *                                    data should be written. If null, the decrypted
-     *                                    data is returned in the results array.
-     * @param boolean $ignoreVerifyErrors enables ignoring of signature verification
-     *                                    errors caused by missing public key.
-     *                                    When enabled Crypt_GPG_KeyNotFoundException
-     *                                    will not be thrown.
+     * @param string      $data               The encrypted signed data to be decrypted and
+     *                                        verified.
+     * @param bool        $isFile             Whether or not the data is a filename.
+     * @param string|null $outputFile         The name of the file to which the decrypted
+     *                                        data should be written. If null, the decrypted
+     *                                        data is returned in the results array.
+     * @param bool        $ignoreVerifyErrors Enables ignoring of signature verification
+     *                                        errors caused by missing public key.
+     *                                        When enabled Crypt_GPG_KeyNotFoundException
+     *                                        will not be thrown.
      *
      * @return array two element array. The array has an element 'data'
      *               containing the decrypted data and an element
@@ -1863,9 +1862,9 @@
     /**
      * Prepares command input
      *
-     * @param string  $data       the input data.
-     * @param boolean $isFile     whether or not the input is a filename.
-     * @param boolean $allowEmpty whether to check if the input is not empty.
+     * @param string $data       The input data
+     * @param bool   $isFile     Whether or not the input is a filename
+     * @param bool   $allowEmpty Whether to check if the input is not empty
      *
      * @throws Crypt_GPG_NoDataException if the key data is missing.
      * @throws Crypt_GPG_FileException if the file is not readable.
@@ -1899,15 +1898,15 @@
     /**
      * Prepares command output
      *
-     * @param string  $outputFile the name of the file in which the output
-     *                            data should be stored. If null, the output
-     *                            data is returned as a string.
-     * @param boolean $input      the input resource, in case it would need
-     *                            to be released (closed) on exception.
+     * @param string|null $outputFile The name of the file in which the output
+     *                                data should be stored. If null, the output
+     *                                data is returned as a string.
+     * @param resource    $input      The input resource, in case it would need
+     *                                to be released (closed) on exception.
      *
      * @throws Crypt_GPG_FileException if the file is not writeable.
      *
-     * @return string The command output
+     * @return string|resource The command output
      */
     protected function _prepareOutput($outputFile, $input = null)
     {

roundcubemail-1.5.tar.gz/vendor/pear/crypt_gpg/Crypt/GPG/Engine.php Changed

@@ -149,7 +149,7 @@
      *
      * Strict mode is disabled by default.
      *
-     * @var boolean
+     * @var bool
      * @see Crypt_GPG_Engine::__construct()
      */
     private $_strict = false;
@@ -197,7 +197,7 @@
      *
      * Only used for GnuPG 2.1.x
      *
-     * @var string
+     * @var string|false|null
      * @see Crypt_GPG_Engine::__construct()
      * @see Crypt_GPG_Engine::_getGPGConf()
      */
@@ -293,28 +293,28 @@
     /**
      * A handle for the GPG process
      *
-     * @var resource
+     * @var resource|null
      */
     private $_process = null;
 
     /**
      * A handle for the gpg-agent process
      *
-     * @var resource
+     * @var resource|null
      */
     private $_agentProcess = null;
 
     /**
      * GPG agent daemon socket and PID for running gpg-agent
      *
-     * @var string
+     * @var string|null
      */
     private $_agentInfo = null;
 
     /**
      * Whether or not the operating system is Darwin (OS X)
      *
-     * @var boolean
+     * @var bool
      */
     private $_isDarwin = false;
 
@@ -357,7 +357,7 @@
     /**
      * A status/error handler
      *
-     * @var Crypt_GPG_ProcessHanler
+     * @var Crypt_GPG_ProcessHandler|null
      */
     private $_processHandler = null;
 
@@ -382,7 +382,7 @@
      *
      * This is data to send to GPG. Either a string or a stream resource.
      *
-     * @var string|resource
+     * @var string|resource|null
      * @see Crypt_GPG_Engine::setInput()
      */
     private $_input = null;
@@ -392,7 +392,7 @@
      *
      * Either a string or a stream resource.
      *
-     * @var string|resource
+     * @var string|resource|null
      * @see Crypt_GPG_Engine::setMessage()
      */
     private $_message = null;
@@ -663,7 +663,7 @@
      * subprocess. The handler method must accept the error line to be handled
      * as its first parameter.
      *
-     * @param callback $callback the callback method to use.
+     * @param callable $callback the callback method to use.
      * @param array    $args     optional. Additional arguments to pass as
      *                           parameters to the callback method.
      *
@@ -684,7 +684,7 @@
      * GPG subprocess. The handler method must accept the status line to be
      * handled as its first parameter.
      *
-     * @param callback $callback the callback method to use.
+     * @param callable $callback the callback method to use.
      * @param array    $args     optional. Additional arguments to pass as
      *                           parameters to the callback method.
      *
@@ -780,10 +780,9 @@
     /**
      * Sets the input source for the current GPG operation
      *
-     * @param &string|resource $input either a reference to the string
+     * @param string|resource &$input Either a reference to the string
      *                                containing the input data or an open
-     *                                stream resource containing the input
-     *                                data.
+     *                                stream resource containing the input data
      *
      * @return void
      */
@@ -797,10 +796,9 @@
      *
      * Detached signature data should be specified here.
      *
-     * @param &string|resource $message either a reference to the string
+     * @param string|resource &$message Either a reference to the string
      *                                  containing the message data or an open
-     *                                  stream resource containing the message
-     *                                  data.
+     *                                  stream resource containing the message data
      *
      * @return void
      */
@@ -812,10 +810,10 @@
     /**
      * Sets the output destination for the current GPG operation
      *
-     * @param &string|resource $output either a reference to the string in
+     * @param string|resource &$output Either a reference to the string in
      *                                 which to store GPG output or an open
      *                                 stream resource to which the output data
-     *                                 should be written.
+     *                                 should be written
      *
      * @return void
      */
@@ -908,7 +906,7 @@
      *         Use the <kbd>debug</kbd> option and file a bug report if these
      *         exceptions occur.
      *
-     * @throws Crypt_GPG_UnsupportedException if the provided binary is not
+     * @throws Crypt_GPG_Exception if the provided binary is not
      *         GnuPG or if the GnuPG version is less than 1.0.2.
      */
     public function getVersion()
@@ -1715,7 +1713,7 @@
 
             // proc_close() can return -1 in some cases,
             // get the real exit code from the process status
-            if ($exitCode < 0 && $status && !$status'running') {
+            if ($exitCode < 0 && !$status'running') {
                 $exitCode = $status'exitcode';
             }
 
@@ -1804,8 +1802,7 @@
      * If the pipe is already closed, it is ignored. If the pipe is open, it
      * is flushed and then closed.
      *
-     * @param integer $pipeNumber the file descriptor number of the pipe to
-     *                            close.
+     * @param int $pipeNumber The file descriptor number of the pipe to close
      *
      * @return void
      */
@@ -1925,7 +1922,7 @@
     /**
      * Gets the location of the PinEntry script
      *
-     * @return string the location of the PinEntry script.
+     * @return string|null the location of the PinEntry script.
      */
     private function _getPinEntry()
     {
@@ -1943,6 +1940,8 @@
                 return $path . $ds . 'crypt-gpg-pinentry';
             }
         }
+
+        return null;
     }
 
     /**

roundcubemail-1.5.tar.gz/vendor/pear/crypt_gpg/Crypt/GPG/Exceptions.php Changed

@@ -80,9 +80,9 @@
     /**
      * Creates a new Crypt_GPG_FileException
      *
-     * @param string  $message  an error message.
-     * @param integer $code     a user defined error code.
-     * @param string  $filename the name of the file that caused this exception.
+     * @param string $message  An error message.
+     * @param int    $code     A user defined error code.
+     * @param string $filename The name of the file that caused this exception.
      */
     public function __construct($message, $code = 0, $filename = '')
     {
@@ -128,10 +128,10 @@
     /**
      * Creates a new Crypt_GPG_OpenSubprocessException
      *
-     * @param string  $message an error message.
-     * @param integer $code    a user defined error code.
-     * @param string  $command the command that was called to open the
-     *                         new subprocess.
+     * @param string $message An error message.
+     * @param int    $code    A user defined error code.
+     * @param string $command The command that was called to open the
+     *                        new subprocess.
      *
      * @see Crypt_GPG::_openSubprocess()
      */
@@ -176,9 +176,9 @@
     /**
      * Creates a new Crypt_GPG_OpenSubprocessException
      *
-     * @param string  $message   an error message.
-     * @param integer $code      a user defined error code.
-     * @param string  $operation the operation.
+     * @param string $message   An error message.
+     * @param int    $code      A user defined error code.
+     * @param string $operation The operation.
      */
     public function __construct($message, $code = 0, $operation = '')
     {
@@ -222,9 +222,9 @@
     /**
      * Creates a new Crypt_GPG_KeyNotFoundException
      *
-     * @param string  $message an error message.
-     * @param integer $code    a user defined error code.
-     * @param string  $keyId   the key identifier of the key.
+     * @param string $message An error message.
+     * @param int    $code    A user defined error code.
+     * @param string $keyId   The key identifier of the key.
      */
     public function __construct($message, $code = 0, $keyId= '')
     {
@@ -291,12 +291,12 @@
     /**
      * Creates a new Crypt_GPG_BadPassphraseException
      *
-     * @param string  $message            an error message.
-     * @param integer $code               a user defined error code.
-     * @param array   $badPassphrases     an array containing user ids of keys
-     *                                    for which the passphrase is incorrect.
-     * @param array   $missingPassphrases an array containing user ids of keys
-     *                                    for which the passphrase is missing.
+     * @param string $message            An error message.
+     * @param int    $code               A user defined error code.
+     * @param array  $badPassphrases     An array containing user ids of keys
+     *                                   for which the passphrase is incorrect.
+     * @param array  $missingPassphrases An array containing user ids of keys
+     *                                   for which the passphrase is missing.
      */
     public function __construct($message, $code = 0,
         array $badPassphrases = array(), array $missingPassphrases = array()
@@ -355,10 +355,10 @@
     /**
      * Creates a new Crypt_GPG_DeletePrivateKeyException
      *
-     * @param string  $message an error message.
-     * @param integer $code    a user defined error code.
-     * @param string  $keyId   the key identifier of the public key that was
-     *                         attempted to delete.
+     * @param string $message An error message.
+     * @param int    $code    A user defined error code.
+     * @param string $keyId   The key identifier of the public key that was
+     *                        attempted to delete.
      *
      * @see Crypt_GPG::deletePublicKey()
      */
@@ -410,32 +410,32 @@
     /**
      * The key algorithm
      *
-     * @var integer
+     * @var int
      */
     private $_algorithm = 0;
 
     /**
      * The key size
      *
-     * @var integer
+     * @var int
      */
     private $_size = 0;
 
     /**
      * The key usage
      *
-     * @var integer
+     * @var int
      */
     private $_usage = 0;
 
     /**
      * Creates a new Crypt_GPG_InvalidKeyParamsException
      *
-     * @param string  $message   an error message.
-     * @param integer $code      a user defined error code.
-     * @param string  $algorithm the key algorithm.
-     * @param string  $size      the key size.
-     * @param string  $usage     the key usage.
+     * @param string $message   An error message.
+     * @param int    $code      A user defined error code.
+     * @param int    $algorithm The key algorithm.
+     * @param int    $size      The key size.
+     * @param int    $usage     The key usage.
      */
     public function __construct(
         $message,
@@ -454,7 +454,7 @@
     /**
      * Gets the key algorithm
      *
-     * @return integer the key algorithm.
+     * @return int The key algorithm.
      */
     public function getAlgorithm()
     {
@@ -464,7 +464,7 @@
     /**
      * Gets the key size
      *
-     * @return integer the key size.
+     * @return int The key size.
      */
     public function getSize()
     {
@@ -474,7 +474,7 @@
     /**
      * Gets the key usage
      *
-     * @return integer the key usage.
+     * @return int The key usage.
      */
     public function getUsage()
     {

roundcubemail-1.5.tar.gz/vendor/pear/crypt_gpg/Crypt/GPG/Key.php Changed

@@ -60,7 +60,7 @@
      *
      * This is an array of {@link Crypt_GPG_UserId} objects.
      *
-     * @var array
+     * @var array<Crypt_GPG_UserId>
      *
      * @see Crypt_GPG_Key::addUserId()
      * @see Crypt_GPG_Key::getUserIds()
@@ -72,7 +72,7 @@
      *
      * This is an array of {@link Crypt_GPG_SubKey} objects.
      *
-     * @var array
+     * @var array<Crypt_GPG_SubKey>
      *
      * @see Crypt_GPG_Key::addSubKey()
      * @see Crypt_GPG_Key::getSubKeys()
@@ -82,7 +82,7 @@
     /**
      * Gets the sub-keys of this key
      *
-     * @return array the sub-keys of this key.
+     * @return array<Crypt_GPG_SubKey> the sub-keys of this key.
      *
      * @see Crypt_GPG_Key::addSubKey()
      */
@@ -94,7 +94,7 @@
     /**
      * Gets the user ids of this key
      *
-     * @return array the user ids of this key.
+     * @return array<Crypt_GPG_UserId> the user ids of this key.
      *
      * @see Crypt_GPG_Key::addUserId()
      */
@@ -124,8 +124,8 @@
      *
      * This key can sign data if any sub-key of this key can sign data.
      *
-     * @return boolean true if this key can sign data and false if this key
-     *                 cannot sign data.
+     * @return bool True if this key can sign data and false if this key
+     *              cannot sign data.
      */
     public function canSign()
     {
@@ -144,8 +144,8 @@
      *
      * This key can encrypt data if any sub-key of this key can encrypt data.
      *
-     * @return boolean true if this key can encrypt data and false if this
-     *                 key cannot encrypt data.
+     * @return bool True if this key can encrypt data and false if this
+     *              key cannot encrypt data.
      */
     public function canEncrypt()
     {

roundcubemail-1.5.tar.gz/vendor/pear/crypt_gpg/Crypt/GPG/KeyGenerator.php Changed

@@ -70,7 +70,7 @@
     /**
      * The expiration date of generated keys
      *
-     * @var integer
+     * @var int
      *
      * @see Crypt_GPG_KeyGenerator::setExpirationDate()
      */
@@ -88,7 +88,7 @@
     /**
      * The algorithm for generated primary keys
      *
-     * @var integer
+     * @var int
      *
      * @see Crypt_GPG_KeyGenerator::setKeyParams()
      */
@@ -97,7 +97,7 @@
     /**
      * The size of generated primary keys
      *
-     * @var integer
+     * @var int
      *
      * @see Crypt_GPG_KeyGenerator::setKeyParams()
      */
@@ -109,7 +109,7 @@
      * This is a bitwise combination of the usage constants in
      * {@link Crypt_GPG_SubKey}.
      *
-     * @var integer
+     * @var int
      *
      * @see Crypt_GPG_KeyGenerator::setKeyParams()
      */
@@ -118,7 +118,7 @@
     /**
      * The algorithm for generated sub-keys
      *
-     * @var integer
+     * @var int
      *
      * @see Crypt_GPG_KeyGenerator::setSubKeyParams()
      */
@@ -127,7 +127,7 @@
     /**
      * The size of generated sub-keys
      *
-     * @var integer
+     * @var int
      *
      * @see Crypt_GPG_KeyGenerator::setSubKeyParams()
      */
@@ -139,7 +139,7 @@
      * This is a bitwise combination of the usage constants in
      * {@link Crypt_GPG_SubKey}.
      *
-     * @var integer
+     * @var int
      *
      * @see Crypt_GPG_KeyGenerator::setSubKeyParams()
      */
@@ -179,21 +179,21 @@
     /**
      * Sets the expiration date of generated keys
      *
-     * @param string|integer $date either a string that may be parsed by
-     *                             PHP's strtotime() function, or an integer
-     *                             timestamp representing the number of seconds
-     *                             since the UNIX epoch. This date must be at
-     *                             least one date in the future. Keys that
-     *                             expire in the past may not be generated. Use
-     *                             an expiration date of 0 for keys that do not
-     *                             expire.
+     * @param string|int $date Either a string that may be parsed by
+     *                         PHP's strtotime() function, or an integer
+     *                         timestamp representing the number of seconds
+     *                         since the UNIX epoch. This date must be at
+     *                         least one date in the future. Keys that
+     *                         expire in the past may not be generated. Use
+     *                         an expiration date of 0 for keys that do not
+     *                         expire.
      *
-     * @throws InvalidArgumentException if the date is not a valid format, or
+     * @throws InvalidArgumentException If the date is not a valid format, or
      *                                  if the date is not at least one day in
      *                                  the future, or if the date is greater
      *                                  than 2038-01-19T03:14:07.
      *
-     * @return Crypt_GPG_KeyGenerator the current object, for fluent interface.
+     * @return Crypt_GPG_KeyGenerator The current object, for fluent interface.
      */
     public function setExpirationDate($date)
     {
@@ -248,22 +248,22 @@
     /**
      * Sets the parameters for the primary key of generated key-pairs
      *
-     * @param integer $algorithm the algorithm used by the key. This should be
-     *                           one of the Crypt_GPG_SubKey::ALGORITHM_*
-     *                           constants.
-     * @param integer $size      optional. The size of the key. Different
-     *                           algorithms have different size requirements.
-     *                           If not specified, the default size for the
-     *                           specified algorithm will be used. If an
-     *                           invalid key size is used, GnuPG will do its
-     *                           best to round it to a valid size.
-     * @param integer $usage     optional. A bitwise combination of key usages.
-     *                           If not specified, the primary key will be used
-     *                           only to sign and certify. This is the default
-     *                           behavior of GnuPG in interactive mode. Use
-     *                           the Crypt_GPG_SubKey::USAGE_* constants here.
-     *                           The primary key may be used to certify even
-     *                           if the certify usage is not specified.
+     * @param int $algorithm the algorithm used by the key. This should be
+     *                       one of the Crypt_GPG_SubKey::ALGORITHM_*
+     *                       constants.
+     * @param int $size      optional. The size of the key. Different
+     *                       algorithms have different size requirements.
+     *                       If not specified, the default size for the
+     *                       specified algorithm will be used. If an
+     *                       invalid key size is used, GnuPG will do its
+     *                       best to round it to a valid size.
+     * @param int $usage     optional. A bitwise combination of key usages.
+     *                       If not specified, the primary key will be used
+     *                       only to sign and certify. This is the default
+     *                       behavior of GnuPG in interactive mode. Use
+     *                       the Crypt_GPG_SubKey::USAGE_* constants here.
+     *                       The primary key may be used to certify even
+     *                       if the certify usage is not specified.
      *
      * @return Crypt_GPG_KeyGenerator the current object, for fluent interface.
      */
@@ -322,24 +322,24 @@
     /**
      * Sets the parameters for the sub-key of generated key-pairs
      *
-     * @param integer $algorithm the algorithm used by the key. This should be
-     *                           one of the Crypt_GPG_SubKey::ALGORITHM_*
-     *                           constants.
-     * @param integer $size      optional. The size of the key. Different
-     *                           algorithms have different size requirements.
-     *                           If not specified, the default size for the
-     *                           specified algorithm will be used. If an
-     *                           invalid key size is used, GnuPG will do its
-     *                           best to round it to a valid size.
-     * @param integer $usage     optional. A bitwise combination of key usages.
-     *                           If not specified, the sub-key will be used
-     *                           only to encrypt. This is the default behavior
-     *                           of GnuPG in interactive mode. Use the
-     *                           Crypt_GPG_SubKey::USAGE_* constants here.
-     *
-     * @return Crypt_GPG_KeyGenerator the current object, for fluent interface.
+     * @param int $algorithm The algorithm used by the key. This should be
+     *                       one of the Crypt_GPG_SubKey::ALGORITHM_*
+     *                       constants.
+     * @param int $size      Optional size of the key. Different
+     *                       algorithms have different size requirements.
+     *                       If not specified, the default size for the
+     *                       specified algorithm will be used. If an
+     *                       invalid key size is used, GnuPG will do its
+     *                       best to round it to a valid size.
+     * @param int $usage     Optional bitwise combination of key usages.
+     *                       If not specified, the sub-key will be used
+     *                       only to encrypt. This is the default behavior
+     *                       of GnuPG in interactive mode. Use the
+     *                       Crypt_GPG_SubKey::USAGE_* constants here.
+     *
+     * @return Crypt_GPG_KeyGenerator The current object, for fluent interface.
      */
-    public function setSubKeyParams($algorithm, $size = '', $usage = 0)
+    public function setSubKeyParams($algorithm, $size = 0, $usage = 0)
     {
         $algorithm = intval($algorithm);
 
@@ -535,11 +535,11 @@
      * {@link http://www.gnupg.org/download/ GPG distribution} for detailed
      * information on the key usage format.
      *
-     * @param integer $usage a bitwise combination of the key usages. This is
-     *                       a combination of the Crypt_GPG_SubKey::USAGE_*
-     *                       constants.
+     * @param int $usage A bitwise combination of the key usages. This is
+     *                   a combination of the Crypt_GPG_SubKey::USAGE_*
+     *                   constants.
      *
-     * @return string the key usage string.
+     * @return string The key usage string.
      */
     protected function getUsage($usage)
     {

roundcubemail-1.5.tar.gz/vendor/pear/crypt_gpg/Crypt/GPG/PinEntry.php Changed

@@ -97,28 +97,28 @@
     /**
      * File handle for the input stream
      *
-     * @var resource
+     * @var resource|null
      */
     protected $stdin = null;
 
     /**
      * File handle for the output stream
      *
-     * @var resource
+     * @var resource|null
      */
     protected $stdout = null;
 
     /**
      * File handle for the log file if a log file is used
      *
-     * @var resource
+     * @var resource|null
      */
     protected $logFile = null;
 
     /**
      * Whether or not this pinentry is finished and is exiting
      *
-     * @var boolean
+     * @var bool
      */
     protected $moribund = false;
 
@@ -130,7 +130,7 @@
      * - {@link Crypt_GPG_PinEntry::VERBOSITY_ERRORS}, or
      * - {@link Crypt_GPG_PinEntry::VERBOSITY_ALL}
      *
-     * @var integer
+     * @var int
      */
     protected $verbosity = self::VERBOSITY_NONE;
 
@@ -212,8 +212,8 @@
 
             $this->disconnect();
 
-        } catch (Console_CommandLineException $e) {
-            $this->log($e->getMessage() . PHP_EOL, slf::VERBOSITY_ERRORS);
+        } catch (Console_CommandLine_Exception $e) {
+            $this->log($e->getMessage() . PHP_EOL, self::VERBOSITY_ERRORS);
             exit(1);
         } catch (Exception $e) {
             $this->log($e->getMessage() . PHP_EOL, self::VERBOSITY_ERRORS);
@@ -232,13 +232,13 @@
      * - {@link Crypt_GPG_PinEntry::VERBOSITY_ALL}    - log everything, including
      *                                                  the assuan protocol.
      *
-     * @param integer $verbosity the level of verbosity of this pinentry.
+     * @param int $verbosity The level of verbosity of this pinentry.
      *
      * @return Crypt_GPG_PinEntry the current object, for fluent interface.
      */
     public function setVerbosity($verbosity)
     {
-        $this->verbosity = (integer)$verbosity;
+        $this->verbosity = (int) $verbosity;
         return $this;
     }
 
@@ -280,7 +280,7 @@
      * Detects whether or not this package is PEAR-installed and appropriately
      * locates the XML UI definition.
      *
-     * @return string the location of the CLI user-interface definition XML.
+     * @return string|null The location of the CLI user-interface definition XML.
      */
     protected function getUIXML()
     {
@@ -298,6 +298,8 @@
                 return $path . $ds . 'pinentry-cli.xml';
             }
         }
+
+        return null;
     }
 
     /**
@@ -316,9 +318,9 @@
      * If a log file is used, the message is written to the log. Otherwise,
      * the message is sent to STDERR.
      *
-     * @param string  $data  the message to log.
-     * @param integer $level the verbosity level above which the message should
-     *                       be logged.
+     * @param string $data  The message to log.
+     * @param int    $level The verbosity level above which the message should
+     *                      be logged.
      *
      * @return Crypt_GPG_PinEntry the current object, for fluent interface.
      */
@@ -405,7 +407,7 @@
             return $this->sendGetInfo($data);
 
         case 'GETPIN':
-            return $this->sendGetPin($data);
+            return $this->sendGetPin();
 
         case 'RESET':
             return $this->sendReset();
@@ -611,8 +613,6 @@
         default:
             return $this->send($this->getOK());
         }
-
-        return $this;
     }
 
     /**
@@ -731,7 +731,7 @@
                 $line = $prefix . ' ' . mb_strcut($data, 0, 996, 'utf-8') . "\\\n";
                 $lines = $line;
                 $lineLength = mb_strlen($line, '8bit') - 1;
-                $dataLength = mb_substr($data, '8bit');
+                $dataLength = mb_strlen($data, '8bit');
                 $data = mb_substr(
                     $data,
                     $lineLength,

roundcubemail-1.5.tar.gz/vendor/pear/crypt_gpg/Crypt/GPG/ProcessControl.php Changed

roundcubemail-1.5.tar.gz/vendor/pear/crypt_gpg/Crypt/GPG/ProcessHandler.php Changed

@@ -72,7 +72,7 @@
     /**
      * The error code of the current operation
      *
-     * @var integer
+     * @var int
      */
     protected $errorCode = Crypt_GPG::ERROR_NONE;
 
@@ -82,7 +82,7 @@
      * If this is not zero when the GPG command is completed, the error code is
      * set to {@link Crypt_GPG::ERROR_MISSING_PASSPHRASE}.
      *
-     * @var integer
+     * @var int
      */
     protected $needPassphrase = 0;
 
@@ -606,7 +606,7 @@
                     'Unknown error deleting key. ' . $note, $code
                 );
             }
-            break;
+            break; // @phpstan-ignore-line
 
         case 'import':
             switch ($code) {
@@ -624,7 +624,7 @@
                     'Unknown error importing GPG key. ' . $note, $code
                 );
             }
-            break;
+            break; // @phpstan-ignore-line
 
         case 'export':
         case 'export-secret-keys':
@@ -638,7 +638,7 @@
                     'Unknown error exporting a key. ' . $note, $code
                 );
             }
-            break;
+            break; // @phpstan-ignore-line
 
         case 'encrypt':
         case 'sign':
@@ -668,7 +668,7 @@
                     "Unknown error {$this->operation}ing data. $note", $code
                 );
             }
-            break;
+            break; // @phpstan-ignore-line
 
         case 'verify':
             switch ($code) {

roundcubemail-1.5.tar.gz/vendor/pear/crypt_gpg/Crypt/GPG/Signature.php Changed

@@ -83,7 +83,7 @@
      *
      * This is a Unix timestamp.
      *
-     * @var integer
+     * @var int
      */
     private $_creationDate = 0;
 
@@ -93,7 +93,7 @@
      * This is a Unix timestamp. If this signature does not expire, this will
      * be zero.
      *
-     * @var integer
+     * @var int
      */
     private $_expirationDate = 0;
 
@@ -107,7 +107,7 @@
     /**
      * Whether or not this signature is valid
      *
-     * @var boolean
+     * @var bool
      */
     private $_isValid = false;
 
@@ -124,12 +124,12 @@
      *                                    characters.
      * - <kbd>string  keyId</kbd>       - the id of the key used to create the
      *                                    the signature.
-     * - <kbd>integer creation</kbd>    - the date the signature was created.
+     * - <kbd>int     creation</kbd>    - the date the signature was created.
      *                                    This is a UNIX timestamp.
-     * - <kbd>integer expiration</kbd>  - the date the signature expired. This
+     * - <kbd>int     expiration</kbd>  - the date the signature expired. This
      *                                    is a UNIX timestamp. If the signature
      *                                    does not expire, use 0.
-     * - <kbd>boolean valid</kbd>       - whether or not the signature is valid.
+     * - <kbd>bool    valid</kbd>       - whether or not the signature is valid.
      * - <kbd>string  userId</kbd>      - the user id associated with the
      *                                    signature. This may also be a
      *                                    {@link Crypt_GPG_UserId} object.
@@ -190,7 +190,7 @@
     /**
      * Gets the id of this signature
      *
-     * @return string a base64-encoded string containing a unique id for this
+     * @return string A base64-encoded string containing a unique id for this
      *                signature. This id is used to prevent replay attacks and
      *                is not present for all types of signatures.
      */
@@ -202,7 +202,7 @@
     /**
      * Gets the fingerprint of the key used to create this signature
      *
-     * @return string the fingerprint of the key used to create this signature.
+     * @return string The fingerprint of the key used to create this signature.
      */
     public function getKeyFingerprint()
     {
@@ -216,7 +216,7 @@
      * (for example if the signature is bad), the id should always be
      * available.
      *
-     * @return string the id of the key used to create this signature.
+     * @return string The id of the key used to create this signature.
      */
     public function getKeyId()
     {
@@ -226,8 +226,8 @@
     /**
      * Gets the creation date of this signature
      *
-     * @return integer the creation date of this signature. This is a Unix
-     *                 timestamp.
+     * @return int The creation date of this signature. This is a Unix
+     *             timestamp.
      */
     public function getCreationDate()
     {
@@ -237,9 +237,9 @@
     /**
      * Gets the expiration date of the signature
      *
-     * @return integer the expiration date of this signature. This is a Unix
-     *                 timestamp. If this signature does not expire, this will
-     *                 be zero.
+     * @return int The expiration date of this signature. This is a Unix
+     *             timestamp. If this signature does not expire, this will
+     *             be zero.
      */
     public function getExpirationDate()
     {
@@ -249,7 +249,7 @@
     /**
      * Gets the user id associated with this signature
      *
-     * @return Crypt_GPG_UserId the user id associated with this signature.
+     * @return Crypt_GPG_UserId|null The user id associated with this signature.
      */
     public function getUserId()
     {
@@ -259,7 +259,7 @@
     /**
      * Gets whether or no this signature is valid
      *
-     * @return boolean true if this signature is valid and false if it is not.
+     * @return bool True if this signature is valid and false if it is not.
      */
     public function isValid()
     {
@@ -314,8 +314,8 @@
     /**
      * Sets the creation date of this signature
      *
-     * @param integer $creationDate the creation date of this signature. This
-     *                              is a Unix timestamp.
+     * @param int $creationDate The creation date of this signature. This
+     *                          is a Unix timestamp.
      *
      * @return Crypt_GPG_Signature the current object, for fluent interface.
      */
@@ -328,9 +328,9 @@
     /**
      * Sets the expiration date of this signature
      *
-     * @param integer $expirationDate the expiration date of this signature.
-     *                                This is a Unix timestamp. Specify zero if
-     *                                this signature does not expire.
+     * @param int $expirationDate the expiration date of this signature.
+     *                            This is a Unix timestamp. Specify zero if
+     *                            this signature does not expire.
      *
      * @return Crypt_GPG_Signature the current object, for fluent interface.
      */
@@ -357,8 +357,8 @@
     /**
      * Sets whether or not this signature is valid
      *
-     * @param boolean $isValid true if this signature is valid and false if it
-     *                         is not.
+     * @param bool $isValid True if this signature is valid and false if it
+     *                      is not.
      *
      * @return Crypt_GPG_Signature the current object, for fluent interface.
      */

roundcubemail-1.5.tar.gz/vendor/pear/crypt_gpg/Crypt/GPG/SignatureCreationInfo.php Changed

@@ -32,14 +32,14 @@
      * - {@link Crypt_GPG::SIGN_MODE_CLEAR}
      * - {@link Crypt_GPG::SIGN_MODE_DETACHED}
      *
-     * @var integer
+     * @var int
      */
     protected $mode;
 
     /**
      * Public Key algorithm
      *
-     * @var integer
+     * @var int
      */
     protected $pkAlgorithm;
 
@@ -47,7 +47,7 @@
      * Algorithm to hash the data
      *
      * @see RFC 2440 / 9.4. Hash Algorithm
-     * @var integer
+     * @var int
      */
     protected $hashAlgorithm;
 
@@ -61,7 +61,7 @@
     /**
      * Unix timestamp when the signature was created
      *
-     * @var integer
+     * @var int
      */
     protected $timestamp;
 
@@ -75,7 +75,7 @@
     /**
      * If the line given to the constructor was valid
      *
-     * @var boolean
+     * @var bool
      */
     protected $valid;
 
@@ -153,7 +153,7 @@
      * - {@link Crypt_GPG::SIGN_MODE_CLEAR}
      * - {@link Crypt_GPG::SIGN_MODE_DETACHED}
      *
-     * @return integer
+     * @return int
      */
     public function getMode()
     {
@@ -163,7 +163,7 @@
     /**
      * Return the public key algorithm used.
      *
-     * @return integer
+     * @return int
      */
     public function getPkAlgorithm()
     {
@@ -173,7 +173,7 @@
     /**
      * Return the hash algorithm used to hash the data to sign.
      *
-     * @return integer
+     * @return int
      */
     public function getHashAlgorithm()
     {
@@ -196,7 +196,7 @@
     /**
      * Return the timestamp at which the signature was created
      *
-     * @return integer
+     * @return int
      */
     public function getTimestamp()
     {
@@ -216,7 +216,7 @@
     /**
      * Tell if the fingerprint line given to the constructor was valid
      *
-     * @return boolean
+     * @return bool
      */
     public function isValid()
     {

roundcubemail-1.5.tar.gz/vendor/pear/crypt_gpg/Crypt/GPG/SubKey.php Changed

@@ -101,7 +101,7 @@
      *
      * The value is one of the Crypt_GPG_SubKey::ALGORITHM_* constants.
      *
-     * @var integer
+     * @var int
      */
     private $_algorithm = 0;
 
@@ -115,7 +115,7 @@
     /**
      * Length of this sub-key in bits
      *
-     * @var integer
+     * @var int
      */
     private $_length = 0;
 
@@ -124,9 +124,9 @@
      *
      * This is a Unix timestamp.
      *
-     * @var DateTime
+     * @var DateTime|null
      */
-    private $_creationDate;
+    private $_creationDate = null;
 
     /**
      * Date this sub-key expires
@@ -134,9 +134,9 @@
      * This is a Unix timestamp. If this sub-key does not expire, this will be
      * null.
      *
-     * @var DateTime
+     * @var DateTime|null
      */
-    private $_expirationDate;
+    private $_expirationDate = null;
 
     /**
      * Contains usage flags of this sub-key
@@ -148,14 +148,14 @@
     /**
      * Whether or not the private key for this sub-key exists in the keyring
      *
-     * @var boolean
+     * @var bool
      */
     private $_hasPrivate = false;
 
     /**
      * Whether or not this sub-key is revoked
      *
-     * @var boolean
+     * @var bool
      */
     private $_isRevoked = false;
 
@@ -165,27 +165,27 @@
      * Sub-keys can be initialized from an array of named values. Available
      * names are:
      *
-     * - <kbd>string  id</kbd>          - the key id of the sub-key.
-     * - <kbd>integer algorithm</kbd>   - the encryption algorithm of the
-     *                                    sub-key.
-     * - <kbd>string  fingerprint</kbd> - the fingerprint of the sub-key. The
-     *                                    fingerprint should not contain
-     *                                    formatting characters.
-     * - <kbd>integer length</kbd>      - the length of the sub-key in bits.
-     * - <kbd>integer creation</kbd>    - the date the sub-key was created.
-     *                                    This is a UNIX timestamp.
-     * - <kbd>integer expiration</kbd>  - the date the sub-key expires. This
-     *                                    is a UNIX timestamp. If the sub-key
-     *                                    does not expire, use 0.
-     * - <kbd>boolean canSign</kbd>     - whether or not the sub-key can be
-     *                                    used to sign data.
-     * - <kbd>boolean canEncrypt</kbd>  - whether or not the sub-key can be
-     *                                    used to encrypt data.
-     * - <kbd>integer usage</kbd>       - the sub-key usage flags
-     * - <kbd>boolean hasPrivate</kbd>  - whether or not the private key for
-     *                                    the sub-key exists in the keyring.
-     * - <kbd>boolean isRevoked</kbd>   - whether or not this sub-key is
-     *                                    revoked.
+     * - <kbd>string id</kbd>          - the key id of the sub-key.
+     * - <kbd>int    algorithm</kbd>   - the encryption algorithm of the
+     *                                   sub-key.
+     * - <kbd>string fingerprint</kbd> - the fingerprint of the sub-key. The
+     *                                   fingerprint should not contain
+     *                                   formatting characters.
+     * - <kbd>int    length</kbd>      - the length of the sub-key in bits.
+     * - <kbd>int    creation</kbd>    - the date the sub-key was created.
+     *                                   This is a UNIX timestamp.
+     * - <kbd>int    expiration</kbd>  - the date the sub-key expires. This
+     *                                   is a UNIX timestamp. If the sub-key
+     *                                   does not expire, use 0.
+     * - <kbd>bool   canSign</kbd>     - whether or not the sub-key can be
+     *                                   used to sign data.
+     * - <kbd>bool   canEncrypt</kbd>  - whether or not the sub-key can be
+     *                                   used to encrypt data.
+     * - <kbd>int    usage</kbd>       - the sub-key usage flags
+     * - <kbd>bool   hasPrivate</kbd>  - whether or not the private key for
+     *                                   the sub-key exists in the keyring.
+     * - <kbd>bool   isRevoked</kbd>   - whether or not this sub-key is
+     *                                   revoked.
      *
      * @param Crypt_GPG_SubKey|string|array|null $key Either an existing sub-key object,
      *                                                which is copied; a sub-key string,
@@ -263,7 +263,7 @@
     /**
      * Gets the id of this sub-key
      *
-     * @return string the id of this sub-key.
+     * @return string The id of this sub-key.
      */
     public function getId()
     {
@@ -276,7 +276,7 @@
      * The algorithm should be one of the Crypt_GPG_SubKey::ALGORITHM_*
      * constants.
      *
-     * @return integer the algorithm used by this sub-key.
+     * @return int The algorithm used by this sub-key.
      */
     public function getAlgorithm()
     {
@@ -289,7 +289,7 @@
      * This is a Unix timestamp. Warning: On 32-bit systems it returns
      * invalid value for dates after 2038-01-19. Use getCreationDateTime().
      *
-     * @return integer the creation date of this sub-key.
+     * @return int The creation date of this sub-key.
      */
     public function getCreationDate()
     {
@@ -313,7 +313,7 @@
      * zero. Warning: On 32-bit systems it returns invalid value for dates
      * after 2038-01-19. Use getExpirationDateTime().
      *
-     * @return integer the date this sub-key expires.
+     * @return int The date this sub-key expires.
      */
     public function getExpirationDate()
     {
@@ -323,7 +323,7 @@
     /**
      * Gets the date-time (UTC) this sub-key expires
      *
-     * @return integer the date this sub-key expires.
+     * @return DateTime|null The date this sub-key expires.
      */
     public function getExpirationDateTime()
     {
@@ -333,7 +333,7 @@
     /**
      * Gets the fingerprint of this sub-key
      *
-     * @return string the fingerprint of this sub-key.
+     * @return string The fingerprint of this sub-key.
      */
     public function getFingerprint()
     {
@@ -343,7 +343,7 @@
     /**
      * Gets the length of this sub-key in bits
      *
-     * @return integer the length of this sub-key in bits.
+     * @return int The length of this sub-key in bits.
      */
     public function getLength()
     {
@@ -353,8 +353,8 @@
     /**
      * Gets whether or not this sub-key can sign data
      *
-     * @return boolean true if this sub-key can sign data and false if this
-     *                 sub-key can not sign data.
+     * @return bool True if this sub-key can sign data and false if this
+     *              sub-key can not sign data.
      */
     public function canSign()
     {
@@ -364,8 +364,8 @@
     /**
      * Gets whether or not this sub-key can encrypt data
      *
-     * @return boolean true if this sub-key can encrypt data and false if this
-     *                 sub-key can not encrypt data.
+     * @return bool True if this sub-key can encrypt data and false if this
+     *              sub-key can not encrypt data.
      */
     public function canEncrypt()
     {
@@ -386,8 +386,8 @@
      * Gets whether or not the private key for this sub-key exists in the
      * keyring
      *
-     * @return boolean true the private key for this sub-key exists in the
-     *                 keyring and false if it does not.
+     * @return bool True the private key for this sub-key exists in the
+     *              keyring and false if it does not.
      */
     public function hasPrivate()
     {
@@ -397,7 +397,7 @@
     /**
      * Gets whether or not this sub-key is revoked
      *
-     * @return boolean true if this sub-key is revoked and false if it is not.
+     * @return bool True if this sub-key is revoked and false if it is not.
      */
     public function isRevoked()
     {
@@ -409,9 +409,9 @@
      *
      * The creation date is a Unix timestamp or DateTime object.
      *
-     * @param integer|DateTime $creationDate the creation date of this sub-key.
+     * @param int|DateTime $creationDate The creation date of this sub-key.
      *
-     * @return Crypt_GPG_SubKey the current object, for fluent interface.
+     * @return Crypt_GPG_SubKey The current object, for fluent interface.
      */
     public function setCreationDate($creationDate)
     {
@@ -436,9 +436,9 @@
      * The expiration date is a Unix timestamp. Specify zero if this sub-key
      * does not expire.
      *
-     * @param integer|DateTime $expirationDate the expiration date of this sub-key.
+     * @param int|DateTime $expirationDate The expiration date of this sub-key.
      *
-     * @return Crypt_GPG_SubKey the current object, for fluent interface.
+     * @return Crypt_GPG_SubKey The current object, for fluent interface.
      */
     public function setExpirationDate($expirationDate)
     {
@@ -460,9 +460,9 @@
     /**
      * Sets the id of this sub-key
      *
-     * @param string $id the id of this sub-key.
+     * @param string $id The id of this sub-key.
      *
-     * @return Crypt_GPG_SubKey the current object, for fluent interface.
+     * @return Crypt_GPG_SubKey The current object, for fluent interface.
      */
     public function setId($id)
     {
@@ -473,9 +473,9 @@
     /**
      * Sets the algorithm used by this sub-key
      *
-     * @param integer $algorithm the algorithm used by this sub-key.
+     * @param int $algorithm The algorithm used by this sub-key.
      *
-     * @return Crypt_GPG_SubKey the current object, for fluent interface.
+     * @return Crypt_GPG_SubKey The current object, for fluent interface.
      */
     public function setAlgorithm($algorithm)
     {
@@ -486,9 +486,9 @@
     /**
      * Sets the fingerprint of this sub-key
      *
-     * @param string $fingerprint the fingerprint of this sub-key.
+     * @param string $fingerprint The fingerprint of this sub-key.
      *
-     * @return Crypt_GPG_SubKey the current object, for fluent interface.
+     * @return Crypt_GPG_SubKey The current object, for fluent interface.
      */
     public function setFingerprint($fingerprint)
     {
@@ -499,9 +499,9 @@
     /**
      * Sets the length of this sub-key in bits
      *
-     * @param integer $length the length of this sub-key in bits.
+     * @param int $length The length of this sub-key in bits.
      *
-     * @return Crypt_GPG_SubKey the current object, for fluent interface.
+     * @return Crypt_GPG_SubKey The current object, for fluent interface.
      */
     public function setLength($length)
     {
@@ -512,10 +512,10 @@
     /**
      * Sets whether or not this sub-key can sign data
      *
-     * @param boolean $canSign true if this sub-key can sign data and false if
-     *                         it can not.
+     * @param bool $canSign True if this sub-key can sign data and false if
+     *                      it can not.
      *
-     * @return Crypt_GPG_SubKey the current object, for fluent interface.
+     * @return Crypt_GPG_SubKey The current object, for fluent interface.
      */
     public function setCanSign($canSign)
     {
@@ -531,10 +531,10 @@
     /**
      * Sets whether or not this sub-key can encrypt data
      *
-     * @param boolean $canEncrypt true if this sub-key can encrypt data and
-     *                            false if it can not.
+     * @param bool $canEncrypt True if this sub-key can encrypt data and
+     *                         false if it can not.
      *
-     * @return Crypt_GPG_SubKey the current object, for fluent interface.
+     * @return Crypt_GPG_SubKey The current object, for fluent interface.
      */
     public function setCanEncrypt($canEncrypt)
     {
@@ -550,9 +550,9 @@
     /**
      * Sets usage flags of the sub-key
      *
-     * @param integer $usage Usage flags
+     * @param int $usage Usage flags
      *
-     * @return Crypt_GPG_SubKey the current object, for fluent interface.
+     * @return Crypt_GPG_SubKey The current object, for fluent interface.
      */
     public function setUsage($usage)
     {
@@ -564,11 +564,11 @@
      * Sets whether of not the private key for this sub-key exists in the
      * keyring
      *
-     * @param boolean $hasPrivate true if the private key for this sub-key
-     *                            exists in the keyring and false if it does
-     *                            not.
+     * @param bool $hasPrivate True if the private key for this sub-key
+     *                         exists in the keyring and false if it does
+     *                         not.
      *
-     * @return Crypt_GPG_SubKey the current object, for fluent interface.
+     * @return Crypt_GPG_SubKey The current object, for fluent interface.
      */
     public function setHasPrivate($hasPrivate)
     {
@@ -579,9 +579,9 @@
     /**
      * Sets whether or not this sub-key is revoked
      *
-     * @param boolean $isRevoked whether or not this sub-key is revoked.
+     * @param bool $isRevoked Whether or not this sub-key is revoked.
      *
-     * @return Crypt_GPG_SubKey the current object, for fluent interface.
+     * @return Crypt_GPG_SubKey The current object, for fluent interface.
      */
     public function setRevoked($isRevoked)
     {
@@ -596,9 +596,9 @@
      * {@link http://www.gnupg.org/download/ GPG distribution} for information
      * on how the sub-key string is parsed.
      *
-     * @param string $string the string containing the sub-key.
+     * @param string $string The string containing the sub-key.
      *
-     * @return Crypt_GPG_SubKey the sub-key object parsed from the string.
+     * @return Crypt_GPG_SubKey The sub-key object parsed from the string.
      */
     public static function parse($string)
     {
@@ -638,9 +638,9 @@
     /**
      * Parses a date string as provided by GPG into a UNIX timestamp
      *
-     * @param string $string the date string.
+     * @param string $string The date string.
      *
-     * @return DateTime|null the date corresponding to the provided date string.
+     * @return DateTime|null The date corresponding to the provided date string.
      */
     private static function _parseDate($string)
     {

roundcubemail-1.5.tar.gz/vendor/pear/crypt_gpg/Crypt/GPG/UserId.php Changed

@@ -70,14 +70,14 @@
     /**
      * Whether or not this user id is revoked
      *
-     * @var boolean
+     * @var bool
      */
     private $_isRevoked = false;
 
     /**
      * Whether or not this user id is valid
      *
-     * @var boolean
+     * @var bool
      */
     private $_isValid = true;
 
@@ -90,8 +90,8 @@
      * - <kbd>string  name</kbd>    - the name field of the user id.
      * - <kbd>string  comment</kbd> - the comment field of the user id.
      * - <kbd>string  email</kbd>   - the email field of the user id.
-     * - <kbd>boolean valid</kbd>   - whether or not the user id is valid.
-     * - <kbd>boolean revoked</kbd> - whether or not the user id is revoked.
+     * - <kbd>bool    valid</kbd>   - whether or not the user id is valid.
+     * - <kbd>bool    revoked</kbd> - whether or not the user id is revoked.
      *
      * @param Crypt_GPG_UserId|string|array|null $userId Either an existing user id object,
      *                                                   which is copied; a user id string,
@@ -171,7 +171,7 @@
     /**
      * Gets whether or not this user id is revoked
      *
-     * @return boolean true if this user id is revoked and false if it is not.
+     * @return bool True if this user id is revoked and false if it is not.
      */
     public function isRevoked()
     {
@@ -181,7 +181,7 @@
     /**
      * Gets whether or not this user id is valid
      *
-     * @return boolean true if this user id is valid and false if it is not.
+     * @return bool True if this user id is valid and false if it is not.
      */
     public function isValid()
     {
@@ -257,9 +257,9 @@
     /**
      * Sets whether or not this user id is revoked
      *
-     * @param boolean $isRevoked whether or not this user id is revoked.
+     * @param bool $isRevoked Whether or not this user id is revoked.
      *
-     * @return Crypt_GPG_UserId the current object, for fluent interface.
+     * @return Crypt_GPG_UserId The current object, for fluent interface.
      */
     public function setRevoked($isRevoked)
     {
@@ -270,9 +270,9 @@
     /**
      * Sets whether or not this user id is valid
      *
-     * @param boolean $isValid whether or not this user id is valid.
+     * @param bool $isValid Whether or not this user id is valid.
      *
-     * @return Crypt_GPG_UserId the current object, for fluent interface.
+     * @return Crypt_GPG_UserId The current object, for fluent interface.
      */
     public function setValid($isValid)
     {

roundcubemail-1.5.tar.gz/vendor/pear/crypt_gpg/Crypt/GPGAbstract.php Changed

roundcubemail-1.5.tar.gz/vendor/pear/crypt_gpg/composer.json Changed

roundcubemail-1.5.tar.gz/vendor/pear/mail_mime/.gitattributes Deleted

roundcubemail-1.5.tar.gz/vendor/pear/mail_mime/Mail/mime.php Changed

@@ -483,6 +483,9 @@
     protected function file2str($file_name)
     {
         // Check state of file and raise an error properly
+        if (!is_string($file_name)) {
+            return self::raiseError('Invalid or empty file name');
+        }
         if (!file_exists($file_name)) {
             return self::raiseError('File not found: ' . $file_name);
         }
@@ -514,7 +517,7 @@
      * @param mixed $obj The object to add the part to, or
      *                   anything else if a new object is to be created.
      *
-     * @return object The text mimePart object
+     * @return Mail_mimePart The text mimePart object
      */
     protected function addTextPart($obj = null)
     {
@@ -528,7 +531,7 @@
      * @param mixed $obj The object to add the part to, or
      *                   anything else if a new object is to be created.
      *
-     * @return object The html mimePart object
+     * @return Mail_mimePart The html mimePart object
      */
     protected function addHtmlPart($obj = null)
     {
@@ -542,7 +545,7 @@
      * @param mixed $obj The object to add the part to, or
      *                   anything else if a new object is to be created.
      *
-     * @return object The text mimePart object
+     * @return Mail_mimePart The text mimePart object
      */
     protected function addCalendarPart($obj = null)
     {
@@ -558,7 +561,7 @@
      *
      * @param array $params Additional part parameters
      *
-     * @return object The multipart/mixed mimePart object
+     * @return Mail_mimePart The multipart/mixed mimePart object
      */
     protected function addMixedPart($params = array())
     {
@@ -577,7 +580,7 @@
      * @param mixed $obj The object to add the part to, or
      *                   anything else if a new object is to be created.
      *
-     * @return object The multipart/mixed mimePart object
+     * @return Mail_mimePart The multipart/mixed mimePart object
      */
     protected function addAlternativePart($obj = null)
     {
@@ -601,7 +604,7 @@
      * @param mixed $obj The object to add the part to, or
      *                   anything else if a new object is to be created
      *
-     * @return object The multipart/mixed mimePart object
+     * @return Mail_mimePart The multipart/mixed mimePart object
      */
     protected function addRelatedPart($obj = null)
     {
@@ -624,7 +627,7 @@
      * @param object $obj   The mimePart to add the image to
      * @param array  $value The image information
      *
-     * @return object The image mimePart object
+     * @return Mail_mimePart The image mimePart object
      */
     protected function addHtmlImagePart($obj, $value)
     {
@@ -653,7 +656,7 @@
      * @param object $obj   The mimePart to add the image to
      * @param mixed  $value The attachment information array or Mail_mimePart object
      *
-     * @return object The image mimePart object
+     * @return Mail_mimePart The image mimePart object
      */
     protected function addAttachmentPart($obj, $value)
     {
@@ -844,12 +847,12 @@
      * Builds the multipart message from the list ($this->parts) and
      * returns the mime content.
      *
-     * @param array   $params    Build parameters that change the way the email
-     *                           is built. Should be associative. See $_build_params.
-     * @param mixed   $filename  Output filename or file pointer where to save
-     *                           the message instead of returning it
-     * @param boolean $skip_head True if you want to return/save only the message
-     *                           without headers
+     * @param array $params    Build parameters that change the way the email
+     *                         is built. Should be associative. See $_build_params.
+     * @param mixed $filename  Output filename or file pointer where to save
+     *                         the message instead of returning it
+     * @param bool  $skip_head True if you want to return/save only the message
+     *                         without headers
      *
      * @return mixed The MIME message content string, null or PEAR error object
      */
@@ -975,9 +978,9 @@
      *                                         part when no parent_part is
      *                                         received.
      *
-     * @return null|object The main part built inside the method. It will be an
-     *                     alternative part or text, html, or calendar part.
-     *                     Null if no body texts are found.
+     * @return null|Mail_mimePart The main part built inside the method. It will be an
+     *                            alternative part or text, html, or calendar part.
+     *                            Null if no body texts are found.
      */
     protected function buildAlternativeParts($parent_part, $mixed_params = null)
     {
@@ -1540,7 +1543,7 @@
      * @param string $ctype Part content type
      * @param string $type  Internal part type
      *
-     * @return object The mimePart object
+     * @return Mail_mimePart The mimePart object
      */
     protected function addBodyPart($obj, $body, $ctype, $type)
     {

roundcubemail-1.5.tar.gz/vendor/pear/mail_mime/Mail/mimePart.php Changed

@@ -302,11 +302,11 @@
      *
      * @param string $boundary Pre-defined boundary string
      *
-     * @return An associative array containing two elements,
-     *         body and headers. The headers element is itself
-     *         an indexed array. On error returns PEAR error object.
+     * @return array An associative array containing two elements,
+     *               body and headers. The headers element is itself
+     *               an indexed array. On error returns PEAR error object.
      */
-    public function encode($boundary=null)
+    public function encode($boundary = null)
     {
         $encoded =& $this->encoded;
 
@@ -365,10 +365,10 @@
      * Encodes and saves the email into file or stream.
      * Data will be appended to the file/stream.
      *
-     * @param mixed   $filename  Existing file location
-     *                           or file pointer resource
-     * @param string  $boundary  Pre-defined boundary string
-     * @param boolean $skip_head True if you don't want to save headers
+     * @param mixed  $filename  Existing file location
+     *                          or file pointer resource
+     * @param string $boundary  Pre-defined boundary string
+     * @param bool   $skip_head True if you don't want to save headers
      *
      * @return array An associative array containing message headers
      *               or PEAR error object
@@ -411,9 +411,9 @@
     /**
      * Encodes given email part into file
      *
-     * @param string  $fh        Output file handle
-     * @param string  $boundary  Pre-defined boundary string
-     * @param boolean $skip_head True if you don't want to save headers
+     * @param string $fh        Output file handle
+     * @param string $boundary  Pre-defined boundary string
+     * @param bool   $skip_head True if you don't want to save headers
      *
      * @return array True on sucess or PEAR error object
      */

roundcubemail-1.5.tar.gz/vendor/pear/pear-core-minimal/README.rst Changed

roundcubemail-1.5.tar.gz/vendor/pear/pear-core-minimal/composer.json Changed

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

roundcubemail-1.5.tar.gz/vendor/pear/pear-core-minimal/src/PEAR/Error.php Deleted

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/C5cAFAmWw+a0ACgkQUcZzBf/C
-5cAToQ/8D3XHtsO5mN1k9HUQKwSQIhWnFVVleRidk9vFRSZhPJjV7HelLNZw5bnp
-ojHGINUlqFHuOxlGGbdYSAQAcix6Jb+CE0kCI5mI3+OBfL2NiF9LHTgG6mMPLsSx
-Lvk0Q4Wbl14Zc33252pEiWkRIUGQREM2nYmmYF35SJfhABZhF0wxWTQEBLSDKyn4
-qoeVC55RtafIUJ0x/auxvszp6Z6ca7Z1fmjFyIglhwHLt0iSv2nWcxQKNng/AqHr
-a80J7qrcI8L1H69ScargAvh1X/CNp3YCMfDHj15NVOO7tZO+aEFtQARpw8JW+CJx
-zEfw6+B0Dk5AMt2KPxDgVKXth+3rKRQ5nF0bo3cyEEikrfVMqhHWu6d0crpDtRfW
-hQ5k3bSVbk5aY805pzU3PbGMea0eWY35igiWa/Kyu33dPvXxI/zkRF2zkL76d7K5
-JzWidcs9enz7hTqFTG3bKODogtaIlvN/vjw4hNrojhfam941DT6cicepntq6o6fy
-H40f1xQ4W4no7dRs+2HDg63BeYyxKeoya+yCWQY0/q/xFdp5xNS6rMNE9XHXKIPY
-3rUw7lbQELr/b1/Ob3o8zhrbpu/BKjkxCrU5bNlUspvBk5c2MA+DmYtbhTZBkUa/
-j99L6ysyNAmoCyy1uRkUR86qsYA3NjpVJntgmSZmbf79vjKa45M=
-=9AJu
+iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmX+rykACgkQUcZzBf/C
+5cAshhAAlC7JXoq3mjgtNUCBl0a8FCsyF4UTFIZyQz4/G1bUGOL8bQICELmEFT0s
+X6WMSB2W+3dNKy9ZzUfu0yZ+69sv+rLku9+Hg8QJJYgLvxjJvNX1oA9GYX4j9Obo
+exNbHnP4oQW4ZTJhD6BmM4Q3WkVZ4FotSTPpWIYAlrnJL/juPrRbbxMH63dCieD2
+Cpw0FKGhqn+UnZ3bnGpqr/ExUboiCqyXFM9OQf+H3m6WSrZEbdB4E/HKkroxcVbB
+v3p24jojleB9DXVSQZNaPWL0cDYuWTPe1ZIDXymgDrkhtVjiWH1NKjebo1WWDR02
+mZgAJ1uFCyUBWtPq9iepWIl7ftFU6Mhu+K/Yi7mfPcaaXDDYopOmgm33phtzUGEh
+YRbupYmLmhZLyehA7hODDOP6ErFu0PSuplJiS/ZB8Jp2mltV4ky15Z07maxLIEb7
+qk44PU+vqedos6zuneYCJGpEyswRxQWKA0a6af/VYsITibhGdcFJofMF38FXdKul
+8S1qckVwzFQPPAsK9CXHMpMTDSJB+HmgY9DD9xKDHStrdytSbHby6sQ1Wvav1i5W
++S1irxe8XXgyK9uFf+b88ZjTTmNNht4TVXf19i7SOQMakh+73MQjTIj4ktg062+A
+UFae9jeJB3gjFFSfGajr2jHd16q7rsE9cb06ma424OG9T2YuNco=
+=neXj
 -----END PGP SIGNATURE-----

roundcubemail-1.5.tar.gz/vendor/sebastian/code-unit-reverse-lookup/.gitignore Deleted

roundcubemail-1.5.tar.gz/vendor/sebastian/code-unit-reverse-lookup/.php_cs Deleted

@@ -1,67 +0,0 @@
-<?php
-$finder = Symfony\CS\Finder\DefaultFinder::create()
-    ->files()
-    ->in('src')
-    ->in('tests')
-    ->name('*.php');
-
-return Symfony\CS\Config\Config::create()
-    ->level(\Symfony\CS\FixerInterface::NONE_LEVEL)
-    ->fixers(
-        array(
-            'align_double_arrow',
-            'align_equals',
-            'braces',
-            'concat_with_spaces',
-            'duplicate_semicolon',
-            'elseif',
-            'empty_return',
-            'encoding',
-            'eof_ending',
-            'extra_empty_lines',
-            'function_call_space',
-            'function_declaration',
-            'indentation',
-            'join_function',
-            'line_after_namespace',
-            'linefeed',
-            'list_commas',
-            'lowercase_constants',
-            'lowercase_keywords',
-            'method_argument_space',
-            'multiple_use',
-            'namespace_no_leading_whitespace',
-            'no_blank_lines_after_class_opening',
-            'no_empty_lines_after_phpdocs',
-            'parenthesis',
-            'php_closing_tag',
-            'phpdoc_indent',
-            'phpdoc_no_access',
-            'phpdoc_no_empty_return',
-            'phpdoc_no_package',
-            'phpdoc_params',
-            'phpdoc_scalar',
-            'phpdoc_separation',
-            'phpdoc_to_comment',
-            'phpdoc_trim',
-            'phpdoc_types',
-            'phpdoc_var_without_name',
-            'remove_lines_between_uses',
-            'return',
-            'self_accessor',
-            'short_array_syntax',
-            'short_tag',
-            'single_line_after_imports',
-            'single_quote',
-            'spaces_before_semicolon',
-            'spaces_cast',
-            'ternary_spaces',
-            'trailing_spaces',
-            'trim_array_spaces',
-            'unused_use',
-            'visibility',
-            'whitespacy_lines'
-        )
-    )
-    ->finder($finder);
-

roundcubemail-1.5.tar.gz/vendor/sebastian/code-unit-reverse-lookup/.travis.yml Deleted

roundcubemail-1.5.tar.gz/vendor/sebastian/code-unit-reverse-lookup/ChangeLog.md Changed

roundcubemail-1.5.tar.gz/vendor/sebastian/code-unit-reverse-lookup/build.xml Deleted

roundcubemail-1.5.tar.gz/vendor/sebastian/code-unit-reverse-lookup/phpunit.xml Deleted

roundcubemail-1.5.tar.gz/vendor/sebastian/code-unit-reverse-lookup/tests Deleted

roundcubemail-1.5.tar.gz/vendor/sebastian/code-unit-reverse-lookup/tests/WizardTest.php Deleted

@@ -1,45 +0,0 @@
-<?php
-/*
- * This file is part of code-unit-reverse-lookup.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\CodeUnitReverseLookup;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * @covers SebastianBergmann\CodeUnitReverseLookup\Wizard
- */
-class WizardTest extends TestCase
-{
-    /**
-     * @var Wizard
-     */
-    private $wizard;
-
-    protected function setUp(): void
-    {
-        $this->wizard = new Wizard;
-    }
-
-    public function testMethodCanBeLookedUp()
-    {
-        $this->assertEquals(
-            __METHOD__,
-            $this->wizard->lookup(__FILE__, __LINE__)
-        );
-    }
-
-    public function testReturnsFilenameAndLineNumberAsStringWhenNotInCodeUnit()
-    {
-        $this->assertEquals(
-            'file.php:1',
-            $this->wizard->lookup('file.php', 1)
-        );
-    }
-}

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

@@ -5,6 +5,123 @@
 
 _Nothing yet._
 
+## 3.9.0 - 2024-02-16
+
+### Added
+- Tokenizer support for PHP 8.3 typed class constants. #321
+    - Additionally, the following sniffs have been updated to support typed class constants:
+        - Generic.NamingConventions.UpperCaseConstantName #332
+        - Generic.PHP.LowerCaseConstant #330
+        - Generic.PHP.LowerCaseType #331
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patches
+- Tokenizer support for PHP 8.3 readonly anonymous classes. #309
+    - Additionally, the following sniffs have been updated to support readonly anonymous classes:
+        - PSR12.Classes.ClassInstantiation #324
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patches
+- New `PHP_CodeSniffer\Sniffs\DeprecatedSniff` interface to allow for marking a sniff as deprecated. #281
+    - If a ruleset uses deprecated sniffs, deprecation notices will be shown to the end-user before the scan starts.
+        When running in `-q` (quiet) mode, the deprecation notices will be hidden.
+    - Deprecated sniffs will still run and using them will have no impact on the exit code for a scan.
+    - In ruleset "explain"-mode (`-e`) an asterix `*` will show next to deprecated sniffs.
+    - Sniff maintainers are advised to read through the PR description for full details on how to use this feature for their own (deprecated) sniffs.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- New `Generic.CodeAnalysis.RequireExplicitBooleanOperatorPrecedence` sniff. #197
+    - Forbid mixing different binary boolean operators within a single expression without making precedence clear using parentheses
+    - Thanks to Tim Düsterhus@TimWolla for the contribution
+- Squiz.PHP.EmbeddedPhp : the sniff will now also examine the formatting of embedded PHP statements using short open echo tags. #27
+    - Includes a new `ShortOpenEchoNoSemicolon` errorcode to allow for selectively ignoring missing semicolons in single line embedded PHP snippets within short open echo tags.
+    - The other error codes are the same and do not distinguish between what type of open tag was used.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Documentation for the following sniffs:
+    - Generic.WhiteSpace.IncrementDecrementSpacing
+    - PSR12.ControlStructures.ControlStructureSpacing
+    - PSR12.Files.ImportStatement
+    - PSR12.Functions.ReturnTypeDeclaration
+    - PSR12.Properties.ConstantVisibility
+    - Thanks to Denis Žoljom@dingo-d and Rodrigo Primo@rodrigoprimo for the patches
+
+### Changed
+- The Performance report can now also be used for a `phpcbf` run. #308
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Sniff tests which extend the PHPCS native `AbstractSniffUnitTest` class will now show a (non-build-breaking) warning when test case files contain fixable errors/warnings, but there is no corresponding `.fixed` file available in the test suite to verify the fixes against. #336
+    - The warning is only displayed on PHPUnit 7.3.0 and higher.
+    - The warning will be elevated to a test failure in PHPCS 4.0.
+    - Thanks to Dan Wallis@fredden for the patch
+- The following sniffs have received performance related improvements:
+    - Squiz.PHP.EmbeddedPhp
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Various housekeeping, including improvements to the tests and documentation
+    - Thanks to Dan Wallis@fredden, Joachim Noreiko@joachim-n, Remi Collet@remicollet, Rodrigo Primo@rodrigoprimo and Juliette Reinders Folmer@jrfnl for their contributions
+
+### Deprecated
+- Support for scanning JavaScript and CSS files. See #2448.
+    - This also means that all sniffs which are only aimed at JavaScript or CSS files are now deprecated.
+    - The Javascript and CSS Tokenizers, all Javascript and CSS specific sniffs, and support for JS and CSS in select sniffs which support multiple file types, will be removed in version 4.0.0.
+- The abstract `PHP_CodeSniffer\Filters\ExactMatch::getBlacklist()` and `PHP_CodeSniffer\Filters\ExactMatch::getWhitelist()` methods are deprecated and will be removed in the 4.0 release. See #198.
+    - In version 4.0, these methods will be replaced with abstract `ExactMatch::getDisallowedFiles()` and `ExactMatch::getAllowedFiles()` methods
+    - To make Filters extending `ExactMatch` cross-version compatible with both PHP_CodeSniffer 3.9.0+ as well as 4.0+, implement the new `getDisallowedFiles()` and `getAllowedFiles()` methods.
+        - When both the `getDisallowedFiles()` and `getAllowedFiles()` methods as well as the `getBlacklist()` and `getWhitelist()` are available, the new methods will take precedence over the old methods.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- The MySource standard and all sniffs in it. See #2471.
+    - The MySource standard and all sniffs in it will be removed in version 4.0.0.
+- The `Zend.Debug.CodeAnalyzer` sniff. See #277.
+    - This sniff will be removed in version 4.0.0.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+### Fixed
+- Fixed bug #127 : Squiz.Commenting.FunctionComment : The `MissingParamType` error code will now be used instead of `MissingParamName` when a parameter name is provided, but not its type. Additionally, invalid type hint suggestions will no longer be provided in these cases.
+    - Thanks to Dan Wallis@fredden for the patch
+- Fixed bug #196 : Squiz.PHP.EmbeddedPhp : fixer will no longer leave behind trailing whitespace when moving code to another line.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #196 : Squiz.PHP.EmbeddedPhp : will now determine the needed indent with higher precision in multiple situations.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #196 : Squiz.PHP.EmbeddedPhp : fixer will no longer insert a stray new line when the closer of a multi-line embedded PHP block and the opener of the next multi-line embedded PHP block would be on the same line.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #235 : Generic.CodeAnalysis.ForLoopWithTestFunctionCall : prevent a potential PHP 8.3 deprecation notice during live coding
+    - Thanks to Rodrigo Primo@rodrigoprimo for the patch
+- Fixed bug #288 : Generic.WhiteSpace.IncrementDecrementSpacing : error message for post-in/decrement will now correctly inform about new lines found before the operator.
+    - Thanks to Rodrigo Primo@rodrigoprimo for the patch
+- Fixed bug #296 : Generic.WhiteSpace.ArbitraryParenthesesSpacing : false positive for non-arbitrary parentheses when these follow the scope closer of a `switch` `case`.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #307 : PSR2.Classes.ClassDeclaration : space between a modifier keyword and the `class` keyword was not checked when the space included a new line or comment.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #325 : Squiz.Operators.IncrementDecrementUsage : the sniff was underreporting when there was (no) whitespace and/or comments in unexpected places.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #335 : PSR12.Files.DeclareStatement : bow out in a certain parse error situation to prevent incorrect auto-fixes from being made.
+    - Thanks to Dan Wallis@fredden for the patch
+- Fixed bug #340 : Squiz.Commenting.ClosingDeclarationComment : no longer adds a stray newline when adding a missing comment.
+    - Thanks to Dan Wallis@fredden for the patch
+
+### Other
+- A "Community cc list" has been introduced to ping maintainers of external standards and integrators for input regarding change proposals for PHP_CodeSniffer which may impact them. #227
+    - For anyone who missed the discussion about this and is interested to be on this list, please feel invited to submit a PR to add yourself.
+        The list is located in the `.github` folder.
+
+#2448: https://github.com/squizlabs/PHP_CodeSniffer/issues/2448
+#2471: https://github.com/squizlabs/PHP_CodeSniffer/issues/2471
+#27: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/27
+#127: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/127
+#196: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/196
+#197: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/197
+#198: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/198
+#227: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/227
+#235: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/235
+#277: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/277
+#281: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/281
+#288: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/288
+#296: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/296
+#307: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/307
+#308: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/308
+#309: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/309
+#321: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/321
+#324: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/324
+#325: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/325
+#330: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/330
+#331: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/331
+#332: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/332
+#335: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/335
+#336: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/336
+#340: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/340
 
 ## 3.8.1 - 2024-01-11
 
@@ -52,7 +169,6 @@
 #211: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/211
 #226: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/226
 
-
 ## 3.8.0 - 2023-12-08
 
 Squizlabs/PHP_CodeSniffer(https://github.com/squizlabs/PHP_CodeSniffer) is dead. Long live PHPCSStandards/PHP_CodeSniffer(https://github.com/PHPCSStandards/PHP_CodeSniffer)!
@@ -320,33 +436,47 @@
 - Squiz.Formatting.OperatorBracket no longer reports false positives in match() structures
 
 ### Fixed
-- Fixed bug #3616 : Squiz.PHP.DisallowComparisonAssignment false positive for PHP 8 match expression
+- Fixed bug #3616 : Squiz.PHP.DisallowComparisonAssignment false positive for PHP 8 match expression
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3618 : Generic.WhiteSpace.ArbitraryParenthesesSpacing false positive for return new parent()
+- Fixed bug #3618 : Generic.WhiteSpace.ArbitraryParenthesesSpacing false positive for return new parent()
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3632 : Short list not tokenized correctly in control structures without braces
+- Fixed bug #3632 : Short list not tokenized correctly in control structures without braces
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3639 : Tokenizer not applying tab replacement to heredoc/nowdoc closers
+- Fixed bug #3639 : Tokenizer not applying tab replacement to heredoc/nowdoc closers
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3640 : Generic.WhiteSpace.DisallowTabIndent not reporting errors for PHP 7.3 flexible heredoc/nowdoc syntax
+- Fixed bug #3640 : Generic.WhiteSpace.DisallowTabIndent not reporting errors for PHP 7.3 flexible heredoc/nowdoc syntax
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3645 : PHPCS can show 0 exit code when running in parallel even if child process has fatal error
+- Fixed bug #3645 : PHPCS can show 0 exit code when running in parallel even if child process has fatal error
     - Thanks to Alex Panshin@enl for the patch
-- Fixed bug #3653 : False positives for match() in OperatorSpacingSniff
+- Fixed bug #3653 : False positives for match() in OperatorSpacingSniff
     - Thanks to Jaroslav Hanslík@kukulich for the patch
-- Fixed bug #3666 : PEAR.Functions.FunctionCallSignature incorrect indent fix when checking mixed HTML/PHP files
-- Fixed bug #3668 : PSR12.Classes.ClassInstantiation.MissingParentheses false positive when instantiating parent classes
+- Fixed bug #3666 : PEAR.Functions.FunctionCallSignature incorrect indent fix when checking mixed HTML/PHP files
+- Fixed bug #3668 : PSR12.Classes.ClassInstantiation.MissingParentheses false positive when instantiating parent classes
     - Similar issues also fixed in Generic.Functions.FunctionCallArgumentSpacing and Squiz.Formatting.OperatorBracket
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3672 : Incorrect ScopeIndent.IncorrectExact report for match inside array literal
-- Fixed bug #3694 : Generic.WhiteSpace.SpreadOperatorSpacingAfter does not ignore spread operator in PHP 8.1 first class   callables
+- Fixed bug #3672 : Incorrect ScopeIndent.IncorrectExact report for match inside array literal
+- Fixed bug #3694 : Generic.WhiteSpace.SpreadOperatorSpacingAfter does not ignore spread operator in PHP 8.1 first class   callables
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 
+#3616: https://github.com/squizlabs/PHP_CodeSniffer/issues/3616
+#3618: https://github.com/squizlabs/PHP_CodeSniffer/issues/3618
+#3632: https://github.com/squizlabs/PHP_CodeSniffer/pull/3632
+#3639: https://github.com/squizlabs/PHP_CodeSniffer/pull/3639
+#3640: https://github.com/squizlabs/PHP_CodeSniffer/pull/3640
+#3645: https://github.com/squizlabs/PHP_CodeSniffer/pull/3645
+#3653: https://github.com/squizlabs/PHP_CodeSniffer/pull/3653
+#3666: https://github.com/squizlabs/PHP_CodeSniffer/issues/3666
+#3668: https://github.com/squizlabs/PHP_CodeSniffer/issues/3668
+#3672: https://github.com/squizlabs/PHP_CodeSniffer/issues/3672
+#3694: https://github.com/squizlabs/PHP_CodeSniffer/pull/3694 
+
 ## 3.7.1 - 2022-06-18
 ### Fixed
-- Fixed bug #3609 : Methods/constants with name empty/isset/unset are always reported as error
+- Fixed bug #3609 : Methods/constants with name empty/isset/unset are always reported as error
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 
+#3609: https://github.com/squizlabs/PHP_CodeSniffer/issues/3609
+
 ## 3.7.0 - 2022-06-13
 ### Added
 - Added support for PHP 8.1 explicit octal notation
@@ -359,7 +489,7 @@
     - Thanks to Jaroslav Hanslík@kukulich for the patch
     - Thanks to Juliette Reinders Folmer@jrfnl for additional core and sniff support
 - Added support for the PHP 8.1 readonly token
-    - Tokenzing of the readonly keyword has been backfilled for PHP versions less than 8.1
+    - Tokenizing of the readonly keyword has been backfilled for PHP versions less than 8.1
     - Thanks to Jaroslav Hanslík@kukulich for the patch
 - Added support for PHP 8.1 intersection types
     - Includes a new T_TYPE_INTERSECTION token to represent the ampersand character inside intersection types
@@ -391,58 +521,80 @@
     - Thanks to Jaroslav Hanslík@kukulich for the patch
 
 ### Fixed
-- Fixed bug #3502 : A match statement within an array produces Squiz.Arrays.ArrayDeclaration.NoKeySpecified
-- Fixed bug #3503 : Squiz.Commenting.FunctionComment.ThrowsNoFullStop false positive when one line @throw
-- Fixed bug #3505 : The nullsafe operator is not counted in Generic.Metrics.CyclomaticComplexity
+- Fixed bug #3502 : A match statement within an array produces Squiz.Arrays.ArrayDeclaration.NoKeySpecified
+- Fixed bug #3503 : Squiz.Commenting.FunctionComment.ThrowsNoFullStop false positive when one line @throw
+- Fixed bug #3505 : The nullsafe operator is not counted in Generic.Metrics.CyclomaticComplexity
     - Thanks to Mark Baker@MarkBaker for the patch
-- Fixed bug #3526 : PSR12.Properties.ConstantVisibility false positive when using public final const syntax
+- Fixed bug #3526 : PSR12.Properties.ConstantVisibility false positive when using public final const syntax
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3530 : Line indented incorrectly false positive when using match-expression inside switch case
-- Fixed bug #3534 : Name of typed enum tokenized as T_GOTO_LABEL
+- Fixed bug #3530 : Line indented incorrectly false positive when using match-expression inside switch case
+- Fixed bug #3534 : Name of typed enum tokenized as T_GOTO_LABEL
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3546 : Tokenizer/PHP: bug fix - parent/static keywords in class instantiations
+- Fixed bug #3546 : Tokenizer/PHP: bug fix - parent/static keywords in class instantiations
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3550 : False positive from PSR2.ControlStructures.SwitchDeclaration.TerminatingComment when using trailing   comment
+- Fixed bug #3550 : False positive from PSR2.ControlStructures.SwitchDeclaration.TerminatingComment when using trailing   comment
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3575: Squiz.Scope.MethodScope misses visibility keyword on previous line
+- Fixed bug #3575: Squiz.Scope.MethodScope misses visibility keyword on previous line
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3604: Tokenizer/PHP: bug fix for double quoted strings using ${
+- Fixed bug #3604: Tokenizer/PHP: bug fix for double quoted strings using ${
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 
+#3502: https://github.com/squizlabs/PHP_CodeSniffer/issues/3502
+#3503: https://github.com/squizlabs/PHP_CodeSniffer/issues/3503
+#3505: https://github.com/squizlabs/PHP_CodeSniffer/issues/3505
+#3526: https://github.com/squizlabs/PHP_CodeSniffer/issues/3526
+#3530: https://github.com/squizlabs/PHP_CodeSniffer/issues/3530
+#3534: https://github.com/squizlabs/PHP_CodeSniffer/pull/3534
+#3546: https://github.com/squizlabs/PHP_CodeSniffer/pull/3546
+#3550: https://github.com/squizlabs/PHP_CodeSniffer/issues/3550
+#3575: https://github.com/squizlabs/PHP_CodeSniffer/pull/3575
+#3604: https://github.com/squizlabs/PHP_CodeSniffer/pull/3604
+
 ## 3.6.2 - 2021-12-13
 ### Changed
 - Processing large code bases that use tab indenting inside comments and strings will now be faster
     - Thanks to Thiemo Kreuz@thiemowmde for the patch
 
 ### Fixed
-- Fixed bug #3388 : phpcs does not work when run from WSL drives
+- Fixed bug #3388 : phpcs does not work when run from WSL drives
     - Thanks to Juliette Reinders Folmer@jrfnl and Graham Wharton@gwharton for the patch
-- Fixed bug #3422 : Squiz.WhiteSpace.ScopeClosingBrace fixer removes HTML content when fixing closing brace alignment
+- Fixed bug #3422 : Squiz.WhiteSpace.ScopeClosingBrace fixer removes HTML content when fixing closing brace alignment
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3437 : PSR12 does not forbid blank lines at the start of the class body
+- Fixed bug #3437 : PSR12 does not forbid blank lines at the start of the class body
     - Added new PSR12.Classes.OpeningBraceSpace sniff to enforce this
-- Fixed bug #3440 : Squiz.WhiteSpace.MemberVarSpacing false positives when attributes used without docblock
+- Fixed bug #3440 : Squiz.WhiteSpace.MemberVarSpacing false positives when attributes used without docblock
     - Thanks to Vadim Borodavko@javer for the patch
-- Fixed bug #3448 : PHP 8.1 deprecation notice while generating running time value
-    - Thanks to Juliette Reinders Folmer@jrfnl and Andy Postnikov for the patch
-- Fixed bug #3456 : PSR12.Classes.ClassInstantiation.MissingParentheses false positive using attributes on anonymous class
+- Fixed bug #3448 : PHP 8.1 deprecation notice while generating running time value
+    - Thanks to Juliette Reinders Folmer@jrfnl and Andy Postnikov@andypost for the patch
+- Fixed bug #3456 : PSR12.Classes.ClassInstantiation.MissingParentheses false positive using attributes on anonymous class
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3460 : Generic.Formatting.MultipleStatementAlignment false positive on closure with parameters
+- Fixed bug #3460 : Generic.Formatting.MultipleStatementAlignment false positive on closure with parameters
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3468 : do/while loops are double-counted in Generic.Metrics.CyclomaticComplexity
+- Fixed bug #3468 : do/while loops are double-counted in Generic.Metrics.CyclomaticComplexity
     - Thanks to Mark Baker@MarkBaker for the patch
-- Fixed bug #3469 : Ternary Operator and Null Coalescing Operator are not counted in Generic.Metrics.CyclomaticComplexity
+- Fixed bug #3469 : Ternary Operator and Null Coalescing Operator are not counted in Generic.Metrics.CyclomaticComplexity
     - Thanks to Mark Baker@MarkBaker for the patch
-- Fixed bug #3472 : PHP 8 match() expression is not counted in Generic.Metrics.CyclomaticComplexity
+- Fixed bug #3472 : PHP 8 match() expression is not counted in Generic.Metrics.CyclomaticComplexity
     - Thanks to Mark Baker@MarkBaker for the patch
 
+#3388: https://github.com/squizlabs/PHP_CodeSniffer/issues/3388
+#3422: https://github.com/squizlabs/PHP_CodeSniffer/issues/3422
+#3437: https://github.com/squizlabs/PHP_CodeSniffer/issues/3437
+#3440: https://github.com/squizlabs/PHP_CodeSniffer/pull/3440
+#3448: https://github.com/squizlabs/PHP_CodeSniffer/issues/3448
+#3456: https://github.com/squizlabs/PHP_CodeSniffer/issues/3456
+#3460: https://github.com/squizlabs/PHP_CodeSniffer/issues/3460
+#3468: https://github.com/squizlabs/PHP_CodeSniffer/issues/3468
+#3469: https://github.com/squizlabs/PHP_CodeSniffer/issues/3469
+#3472: https://github.com/squizlabs/PHP_CodeSniffer/issues/3472
+
 ## 3.6.1 - 2021-10-11
 ### Changed
 - PHPCS annotations can now be specified using hash-style comments
     - Previously, only slash-style and block-style comments could be used to do things like disable errors
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- The new PHP 8.1 tokenisation for ampersands has been reverted to use the existing PHP_CodeSniffer method
-    - The PHP 8.1 tokens T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG and T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG are unsued
+- The new PHP 8.1 tokenization for ampersands has been reverted to use the existing PHP_CodeSniffer method
+    - The PHP 8.1 tokens T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG and T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG are unused
     - Ampersands continue to be tokenized as T_BITWISE_AND for all PHP versions
     - Thanks to Juliette Reinders Folmer@jrfnl and Anna Filina@afilina for the patch
 - File::getMethodParameters() no longer incorrectly returns argument attributes in the type hint array index
@@ -474,44 +626,67 @@
     - Squiz.Commenting.VariableComment
     - Squiz.WhiteSpace.MemberVarSpacing
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3294 : Bug in attribute tokenization when content contains PHP end token or attribute closer on new line
+- Fixed bug #3294 : Bug in attribute tokenization when content contains PHP end token or attribute closer on new line
     - Thanks to Alessandro Chitolina@alekitto for the patch
     - Thanks to Juliette Reinders Folmer@jrfnl for the tests
-- Fixed bug #3296 : PSR2.ControlStructures.SwitchDeclaration takes phpcs:ignore as content of case body
-- Fixed bug #3297 : PSR2.ControlStructures.SwitchDeclaration.TerminatingComment does not handle try/finally blocks
+- Fixed bug #3296 : PSR2.ControlStructures.SwitchDeclaration takes phpcs:ignore as content of case body
+- Fixed bug #3297 : PSR2.ControlStructures.SwitchDeclaration.TerminatingComment does not handle try/finally blocks
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3302 : PHP 8.0 | Tokenizer/PHP: bugfix for union types using namespace operator
+- Fixed bug #3302 : PHP 8.0 | Tokenizer/PHP: bugfix for union types using namespace operator
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3303 : findStartOfStatement() doesn't work with T_OPEN_TAG_WITH_ECHO
-- Fixed bug #3316 : Arrow function not tokenized correctly when using null in union type
-- Fixed bug #3317 : Problem with how phpcs handles ignored files when running in parallel
+- Fixed bug #3303 : findStartOfStatement() doesn't work with T_OPEN_TAG_WITH_ECHO
+- Fixed bug #3316 : Arrow function not tokenized correctly when using null in union type
+- Fixed bug #3317 : Problem with how phpcs handles ignored files when running in parallel
     - Thanks to Emil Andersson@emil-nasso for the patch
-- Fixed bug #3324 : PHPCS hangs processing some nested arrow functions inside a function call
-- Fixed bug #3326 : Generic.Formatting.MultipleStatementAlignment error with const DEFAULT
-    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3333 : Squiz.Objects.ObjectInstantiation: null coalesce operators are not recognized as assignment
+- Fixed bug #3324 : PHPCS hangs processing some nested arrow functions inside a function call
+- Fixed bug #3326 : Generic.Formatting.MultipleStatementAlignment error with const DEFAULT
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3340 : Ensure interface and trait names are always tokenized as T_STRING
+- Fixed bug #3333 : Squiz.Objects.ObjectInstantiation: null coalesce operators are not recognized as assignment
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3342 : PSR12/Squiz/PEAR standards all error on promoted properties with docblocks
+- Fixed bug #3340 : Ensure interface and trait names are always tokenized as T_STRING
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3345 : IF statement with no braces and double catch turned into syntax error by auto-fixer
-    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3352 : PSR2.ControlStructures.SwitchDeclaration can remove comments on the same line as the case statement while   fixing
-    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3357 : Generic.Functions.OpeningFunctionBraceBsdAllman removes return type when additional lines are present
-    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3362 : Generic.WhiteSpace.ScopeIndent false positive for arrow functions inside arrays
-- Fixed bug #3384 : Squiz.Commenting.FileComment.SpacingAfterComment false positive on empty file
-- Fixed bug #3394 : Fix PHP 8.1 auto_detect_line_endings deprecation notice
-- Fixed bug #3400 : PHP 8.1: prevent deprecation notices about missing return types
-    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3424 : PHPCS fails when using PHP 8 Constructor property promotion with attributes
-    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3425 : PHP 8.1 | Runner::processChildProcs(): fix passing null to non-nullable bug
-    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3445 : Nullable parameter after attribute incorrectly tokenized as ternary operator
+- Fixed bug #3342 : PSR12/Squiz/PEAR standards all error on promoted properties with docblocks
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3345 : IF statement with no braces and double catch turned into syntax error by auto-fixer
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3352 : PSR2.ControlStructures.SwitchDeclaration can remove comments on the same line as the case statement while fixing
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3357 : Generic.Functions.OpeningFunctionBraceBsdAllman removes return type when additional lines are present
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3362 : Generic.WhiteSpace.ScopeIndent false positive for arrow functions inside arrays
+- Fixed bug #3384 : Squiz.Commenting.FileComment.SpacingAfterComment false positive on empty file
+- Fixed bug #3394 : Fix PHP 8.1 auto_detect_line_endings deprecation notice
+- Fixed bug #3400 : PHP 8.1: prevent deprecation notices about missing return types
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3424 : PHPCS fails when using PHP 8 Constructor property promotion with attributes
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3425 : PHP 8.1 | Runner::processChildProcs(): fix passing null to non-nullable bug
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3445 : Nullable parameter after attribute incorrectly tokenized as ternary operator
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+#3294: https://github.com/squizlabs/PHP_CodeSniffer/issues/3294
+#3296: https://github.com/squizlabs/PHP_CodeSniffer/issues/3296
+#3297: https://github.com/squizlabs/PHP_CodeSniffer/issues/3297
+#3302: https://github.com/squizlabs/PHP_CodeSniffer/pull/3302
+#3303: https://github.com/squizlabs/PHP_CodeSniffer/issues/3303
+#3316: https://github.com/squizlabs/PHP_CodeSniffer/issues/3316
+#3317: https://github.com/squizlabs/PHP_CodeSniffer/issues/3317
+#3324: https://github.com/squizlabs/PHP_CodeSniffer/issues/3324
+#3326: https://github.com/squizlabs/PHP_CodeSniffer/issues/3326
+#3333: https://github.com/squizlabs/PHP_CodeSniffer/issues/3333
+#3340: https://github.com/squizlabs/PHP_CodeSniffer/pull/3340
+#3342: https://github.com/squizlabs/PHP_CodeSniffer/issues/3342
+#3345: https://github.com/squizlabs/PHP_CodeSniffer/issues/3345
+#3352: https://github.com/squizlabs/PHP_CodeSniffer/issues/3352
+#3357: https://github.com/squizlabs/PHP_CodeSniffer/issues/3357
+#3362: https://github.com/squizlabs/PHP_CodeSniffer/issues/3362
+#3384: https://github.com/squizlabs/PHP_CodeSniffer/issues/3384
+#3394: https://github.com/squizlabs/PHP_CodeSniffer/pull/3394
+#3400: https://github.com/squizlabs/PHP_CodeSniffer/pull/3400
+#3424: https://github.com/squizlabs/PHP_CodeSniffer/issues/3424
+#3425: https://github.com/squizlabs/PHP_CodeSniffer/pull/3425
+#3445: https://github.com/squizlabs/PHP_CodeSniffer/issues/3445
 
 ## 3.6.0 - 2021-04-09
 ### Added
@@ -540,7 +715,7 @@
 - Added support for PHP 8.0 dereferencing of text strings with interpolated variables
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 - Added support for PHP 8.0 match expressions
-    - Match expressions are now tokenised with parenthesis and scope openers and closers
+    - Match expressions are now tokenized with parenthesis and scope openers and closers
         - Sniffs can listen for the T_MATCH token to process match expressions
         - Note that the case and default statements inside match expressions do not have scopes set
     - A new T_MATCH_ARROW token is available to represent the arrows in match expressions
@@ -590,9 +765,9 @@
 - Spaces are now correctly escaped in the paths to external on Windows
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 - Generic.CodeAnalysis.UnusedFunctionParameter can now be configured to ignore variable usage for specific type hints
-    -- This allows you to suppress warnings for some variables that are not required, but leave warnings for others
-    -- Set the ignoreTypeHints array property to a list of type hints to ignore
-    -- Thanks to Petr Bugyík@o5 for the patch
+    - This allows you to suppress warnings for some variables that are not required, but leave warnings for others
+    - Set the ignoreTypeHints array property to a list of type hints to ignore
+    - Thanks to Petr Bugyík@o5 for the patch
 - Generic.Formatting.MultipleStatementAlignment can now align statements at the start of the assignment token
     - Previously, the sniff enforced that the values were aligned, even if this meant the assignment tokens were not
     - Now, the sniff can enforce that the assignment tokens are aligned, even if this means the values are not
@@ -615,7 +790,7 @@
     - Thanks to Vincent Langlet@VincentLanglet for the patch
 - PSR2.ControlStructures.SwitchDeclaration now supports nested switch statements where every branch terminates
     - Previously, if a CASE only contained a SWITCH and no direct terminating statement, a fall-through error was displayed
-    - Now, the error is surpressed if every branch of the SWITCH has a terminating statement
+    - Now, the error is suppressed if every branch of the SWITCH has a terminating statement
     - Thanks to Vincent Langlet@VincentLanglet for the patch
 - The PSR2.Methods.FunctionCallSignature.SpaceBeforeCloseBracket error message is now reported on the closing parenthesis token
     - Previously, the error was being reported on the function keyword, leading to confusing line numbers in the error report
@@ -639,33 +814,54 @@
     - Sniff no longer errors for assignments on first line of closure
     - Sniff no longer errors for assignments after a goto label
     - Thanks to Jaroslav Hanslík@kukulich for the patch
-- Fixed bug #2913 : Generic.WhiteSpace.ScopeIndent false positive when opening and closing tag on same line inside conditional
-- Fixed bug #2992 : Enabling caching using a ruleset produces invalid cache files when using --sniffs and --exclude CLI args
-- Fixed bug #3003 : Squiz.Formatting.OperatorBracket autofix incorrect when assignment used with null coalescing operator
-- Fixed bug #3145 : Autoloading of sniff fails when multiple classes declared in same file
-- Fixed bug #3157 : PSR2.ControlStructures.SwitchDeclaration.BreakIndent false positive when case keyword is not indented
-- Fixed bug #3163 : Undefined index error with pre-commit hook using husky on PHP 7.4
+- Fixed bug #2913 : Generic.WhiteSpace.ScopeIndent false positive when opening and closing tag on same line inside conditional
+- Fixed bug #2992 : Enabling caching using a ruleset produces invalid cache files when using --sniffs and --exclude CLI args
+- Fixed bug #3003 : Squiz.Formatting.OperatorBracket autofix incorrect when assignment used with null coalescing operator
+- Fixed bug #3145 : Autoloading of sniff fails when multiple classes declared in same file
+- Fixed bug #3157 : PSR2.ControlStructures.SwitchDeclaration.BreakIndent false positive when case keyword is not indented
+- Fixed bug #3163 : Undefined index error with pre-commit hook using husky on PHP 7.4
     - Thanks to Ismo Vuorinen@ivuorinen for the patch
-- Fixed bug #3165 : Squiz.PHP.DisallowComparisonAssignment false positive when comparison inside closure
-- Fixed bug #3167 : Generic.WhiteSpace.ScopeIndent false positive when using PHP 8.0 constructor property promotion
-- Fixed bug #3170 : Squiz.WhiteSpace.OperatorSpacing false positive when using negation with string concat
+- Fixed bug #3165 : Squiz.PHP.DisallowComparisonAssignment false positive when comparison inside closure
+- Fixed bug #3167 : Generic.WhiteSpace.ScopeIndent false positive when using PHP 8.0 constructor property promotion
+- Fixed bug #3170 : Squiz.WhiteSpace.OperatorSpacing false positive when using negation with string concat
     - This also fixes the same issue in the PSR12.Operators.OperatorSpacing sniff
-- Fixed bug #3177 : Incorrect tokenization of GOTO statements in mixed PHP/HTML files
+- Fixed bug #3177 : Incorrect tokenization of GOTO statements in mixed PHP/HTML files
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3184 : PSR2.Namespace.NamespaceDeclaration false positive on namespace operator
+- Fixed bug #3184 : PSR2.Namespace.NamespaceDeclaration false positive on namespace operator
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3188 : Squiz.WhiteSpace.ScopeKeywordSpacing false positive for static return type
+- Fixed bug #3188 : Squiz.WhiteSpace.ScopeKeywordSpacing false positive for static return type
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3192 : findStartOfStatement doesn't work correctly inside switch
+- Fixed bug #3192 : findStartOfStatement doesn't work correctly inside switch
     - Thanks to Vincent Langlet@VincentLanglet for the patch
-- Fixed bug #3195 : Generic.WhiteSpace.ScopeIndent confusing message when combination of tabs and spaces found
-- Fixed bug #3197 : Squiz.NamingConventions.ValidVariableName does not use correct error code for all member vars
-- Fixed bug #3219 : Generic.Formatting.MultipleStatementAlignment false positive for empty anonymous classes and closures
-- Fixed bug #3258 : Squiz.Formatting.OperatorBracket duplicate error messages for unary minus
-    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3273 : Squiz.Functions.FunctionDeclarationArgumentSpacing reports line break as 0 spaces between parenthesis
-- Fixed bug #3277 : Nullable static return typehint causes whitespace error
-- Fixed bug #3284 : Unused parameter false positive when using array index in arrow function
+- Fixed bug #3195 : Generic.WhiteSpace.ScopeIndent confusing message when combination of tabs and spaces found
+- Fixed bug #3197 : Squiz.NamingConventions.ValidVariableName does not use correct error code for all member vars
+- Fixed bug #3219 : Generic.Formatting.MultipleStatementAlignment false positive for empty anonymous classes and closures
+- Fixed bug #3258 : Squiz.Formatting.OperatorBracket duplicate error messages for unary minus
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3273 : Squiz.Functions.FunctionDeclarationArgumentSpacing reports line break as 0 spaces between parenthesis
+- Fixed bug #3277 : Nullable static return typehint causes whitespace error
+- Fixed bug #3284 : Unused parameter false positive when using array index in arrow function
+
+#2913: https://github.com/squizlabs/PHP_CodeSniffer/issues/2913
+#2992: https://github.com/squizlabs/PHP_CodeSniffer/issues/2992
+#3003: https://github.com/squizlabs/PHP_CodeSniffer/issues/3003
+#3145: https://github.com/squizlabs/PHP_CodeSniffer/issues/3145
+#3157: https://github.com/squizlabs/PHP_CodeSniffer/issues/3157
+#3163: https://github.com/squizlabs/PHP_CodeSniffer/pull/3163
+#3165: https://github.com/squizlabs/PHP_CodeSniffer/issues/3165
+#3167: https://github.com/squizlabs/PHP_CodeSniffer/issues/3167
+#3170: https://github.com/squizlabs/PHP_CodeSniffer/pull/3170
+#3177: https://github.com/squizlabs/PHP_CodeSniffer/pull/3177
+#3184: https://github.com/squizlabs/PHP_CodeSniffer/pull/3184
+#3188: https://github.com/squizlabs/PHP_CodeSniffer/issues/3188
+#3192: https://github.com/squizlabs/PHP_CodeSniffer/issues/3192
+#3195: https://github.com/squizlabs/PHP_CodeSniffer/issues/3195
+#3197: https://github.com/squizlabs/PHP_CodeSniffer/issues/3197
+#3219: https://github.com/squizlabs/PHP_CodeSniffer/issues/3219
+#3258: https://github.com/squizlabs/PHP_CodeSniffer/pull/3258
+#3273: https://github.com/squizlabs/PHP_CodeSniffer/issues/3273
+#3277: https://github.com/squizlabs/PHP_CodeSniffer/issues/3277
+#3284: https://github.com/squizlabs/PHP_CodeSniffer/issues/3284
 
 ## 3.5.8 - 2020-10-23
 ### Removed
@@ -675,9 +871,9 @@
 ## 3.5.7 - 2020-10-23
 ### Added
 - The PHP 8.0 T_NULLSAFE_OBJECT_OPERATOR token has been made available for older versions
-    - Existing sniffs that check for T_OBJECT_OPERATOR have been modified to apply the same rules for the nullsafe object   operator
+    - Existing sniffs that check for T_OBJECT_OPERATOR have been modified to apply the same rules for the nullsafe object operator
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- The new method of PHP 8.0 tokenizing for namespaced names has been revert to thr pre 8.0 method
+- The new method of PHP 8.0 tokenizing for namespaced names has been reverted to the pre 8.0 method
     - This maintains backwards compatible for existing sniffs on PHP 8.0
     - This change will be removed in PHPCS 4.0 as the PHP 8.0 tokenizing method will be backported for pre 8.0 versions
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
@@ -698,38 +894,58 @@
 ### Fixed
 - Fixed Squiz.Formatting.OperatorBracket false positive when exiting with a negative number
 - Fixed Squiz.PHP.DisallowComparisonAssignment false positive for methods called on an object
-- Fixed bug #2882 : Generic.Arrays.ArrayIndent can request close brace indent to be less than the statement indent level
-- Fixed bug #2883 : Generic.WhiteSpace.ScopeIndent.Incorrect issue after NOWDOC
-- Fixed bug #2975 : Undefined offset in PSR12.Functions.ReturnTypeDeclaration when checking function return type inside ternary
-- Fixed bug #2988 : Undefined offset in Squiz.Strings.ConcatenationSpacing during live coding
+- Fixed bug #2882 : Generic.Arrays.ArrayIndent can request close brace indent to be less than the statement indent level
+- Fixed bug #2883 : Generic.WhiteSpace.ScopeIndent.Incorrect issue after NOWDOC
+- Fixed bug #2975 : Undefined offset in PSR12.Functions.ReturnTypeDeclaration when checking function return type inside ternary
+- Fixed bug #2988 : Undefined offset in Squiz.Strings.ConcatenationSpacing during live coding
     - Thanks to Thiemo Kreuz@thiemowmde for the patch
-- Fixed bug #2989 : Incorrect auto-fixing in Generic.ControlStructures.InlineControlStructure during live coding
+- Fixed bug #2989 : Incorrect auto-fixing in Generic.ControlStructures.InlineControlStructure during live coding
     - Thanks to Thiemo Kreuz@thiemowmde for the patch
-- Fixed bug #3007 : Directory exclude pattern improperly excludes directories with names that start the same
+- Fixed bug #3007 : Directory exclude pattern improperly excludes directories with names that start the same
     - Thanks to Steve Talbot@SteveTalbot for the patch
-- Fixed bug #3043 : Squiz.WhiteSpace.OperatorSpacing false positive for negation in arrow function
+- Fixed bug #3043 : Squiz.WhiteSpace.OperatorSpacing false positive for negation in arrow function
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3049 : Incorrect error with arrow function and parameter passed as reference
+- Fixed bug #3049 : Incorrect error with arrow function and parameter passed as reference
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3053 : PSR2 incorrect fix when multiple use statements on same line do not have whitespace between them
-- Fixed bug #3058 : Progress gets unaligned when 100% happens at the end of the available dots
-- Fixed bug #3059 : Squiz.Arrays.ArrayDeclaration false positive when using type casting
+- Fixed bug #3053 : PSR2 incorrect fix when multiple use statements on same line do not have whitespace between them
+- Fixed bug #3058 : Progress gets unaligned when 100% happens at the end of the available dots
+- Fixed bug #3059 : Squiz.Arrays.ArrayDeclaration false positive when using type casting
     - Thanks to Sergei Morozov@morozov for the patch
-- Fixed bug #3060 : Squiz.Arrays.ArrayDeclaration false positive for static functions
+- Fixed bug #3060 : Squiz.Arrays.ArrayDeclaration false positive for static functions
     - Thanks to Sergei Morozov@morozov for the patch
-- Fixed bug #3065 : Should not fix Squiz.Arrays.ArrayDeclaration.SpaceBeforeComma if comment between element and comma
+- Fixed bug #3065 : Should not fix Squiz.Arrays.ArrayDeclaration.SpaceBeforeComma if comment between element and comma
     - Thanks to Sergei Morozov@morozov for the patch
-- Fixed bug #3066 : No support for namespace operator used in type declarations
+- Fixed bug #3066 : No support for namespace operator used in type declarations
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3075 : PSR12.ControlStructures.BooleanOperatorPlacement false positive when operator is the only content on line
-- Fixed bug #3099 : Squiz.WhiteSpace.OperatorSpacing false positive when exiting with negative number
+- Fixed bug #3075 : PSR12.ControlStructures.BooleanOperatorPlacement false positive when operator is the only content on line
+- Fixed bug #3099 : Squiz.WhiteSpace.OperatorSpacing false positive when exiting with negative number
     - Thanks to Sergei Morozov@morozov for the patch
-- Fixed bug #3102 : PSR12.Squiz.OperatorSpacing false positive for default values of arrow functions
+- Fixed bug #3102 : PSR12.Squiz.OperatorSpacing false positive for default values of arrow functions
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3124 : PSR-12 not reporting error for empty lines with only whitespace
-- Fixed bug #3135 : Ignore annotations are broken on PHP 8.0
+- Fixed bug #3124 : PSR-12 not reporting error for empty lines with only whitespace
+- Fixed bug #3135 : Ignore annotations are broken on PHP 8.0
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 
+#2882: https://github.com/squizlabs/PHP_CodeSniffer/issues/2882
+#2883: https://github.com/squizlabs/PHP_CodeSniffer/issues/2883
+#2975: https://github.com/squizlabs/PHP_CodeSniffer/issues/2975
+#2988: https://github.com/squizlabs/PHP_CodeSniffer/pull/2988
+#2989: https://github.com/squizlabs/PHP_CodeSniffer/pull/2989
+#3007: https://github.com/squizlabs/PHP_CodeSniffer/issues/3007
+#3043: https://github.com/squizlabs/PHP_CodeSniffer/issues/3043
+#3049: https://github.com/squizlabs/PHP_CodeSniffer/issues/3049
+#3053: https://github.com/squizlabs/PHP_CodeSniffer/issues/3053
+#3058: https://github.com/squizlabs/PHP_CodeSniffer/issues/3058
+#3059: https://github.com/squizlabs/PHP_CodeSniffer/issues/3059
+#3060: https://github.com/squizlabs/PHP_CodeSniffer/issues/3060
+#3065: https://github.com/squizlabs/PHP_CodeSniffer/issues/3065
+#3066: https://github.com/squizlabs/PHP_CodeSniffer/pull/3066
+#3075: https://github.com/squizlabs/PHP_CodeSniffer/issues/3075
+#3099: https://github.com/squizlabs/PHP_CodeSniffer/pull/3099
+#3102: https://github.com/squizlabs/PHP_CodeSniffer/pull/3102
+#3124: https://github.com/squizlabs/PHP_CodeSniffer/issues/3124
+#3135: https://github.com/squizlabs/PHP_CodeSniffer/pull/3135
+
 ## 3.5.6 - 2020-08-10
 ### Added
 - Added support for PHP 8.0 magic constant dereferencing
@@ -753,19 +969,28 @@
     - Thanks to Michał Bundyra@michalbundyra for the patch
 
 ### Fixed
-- Fixed bug #2877 : PEAR.Functions.FunctionCallSignature false positive for array of functions
+- Fixed bug #2877 : PEAR.Functions.FunctionCallSignature false positive for array of functions
     - Thanks to Vincent Langlet@VincentLanglet for the patch
-- Fixed bug #2888 : PSR12.Files.FileHeader blank line error with multiple namespaces in one file
-- Fixed bug #2926 : phpcs hangs when using arrow functions that return heredoc
-- Fixed bug #2943 : Redundant semicolon added to a file when fixing PSR2.Files.ClosingTag.NotAllowed
-- Fixed bug #2967 : Markdown generator does not output headings correctly
+- Fixed bug #2888 : PSR12.Files.FileHeader blank line error with multiple namespaces in one file
+- Fixed bug #2926 : phpcs hangs when using arrow functions that return heredoc
+- Fixed bug #2943 : Redundant semicolon added to a file when fixing PSR2.Files.ClosingTag.NotAllowed
+- Fixed bug #2967 : Markdown generator does not output headings correctly
     - Thanks to Petr Bugyík@o5 for the patch
-- Fixed bug #2977 : File::isReference() does not detect return by reference for closures
+- Fixed bug #2977 : File::isReference() does not detect return by reference for closures
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2994 : Generic.Formatting.DisallowMultipleStatements false positive for FOR loop with no body
-- Fixed bug #3033 : Error generated during tokenizing of goto statements on PHP 8
+- Fixed bug #2994 : Generic.Formatting.DisallowMultipleStatements false positive for FOR loop with no body
+- Fixed bug #3033 : Error generated during tokenizing of goto statements on PHP 8
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 
+#2877: https://github.com/squizlabs/PHP_CodeSniffer/issues/2877
+#2888: https://github.com/squizlabs/PHP_CodeSniffer/issues/2888
+#2926: https://github.com/squizlabs/PHP_CodeSniffer/issues/2926
+#2943: https://github.com/squizlabs/PHP_CodeSniffer/issues/2943
+#2967: https://github.com/squizlabs/PHP_CodeSniffer/pull/2967
+#2977: https://github.com/squizlabs/PHP_CodeSniffer/pull/2977
+#2994: https://github.com/squizlabs/PHP_CodeSniffer/issues/2994
+#3033: https://github.com/squizlabs/PHP_CodeSniffer/pull/3033
+
 ## 3.5.5 - 2020-04-17
 ### Changed
 - The T_FN backfill now works more reliably so T_FN tokens only ever represent real arrow functions
@@ -5393,6 +5618,7 @@
 -->
 
 Unreleased: https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/master...HEAD
+3.9.0:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.8.1...3.9.0
 3.8.1:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.8.0...3.8.1
 3.8.0:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.7.2...3.8.0
 3.7.2:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.7.1...3.7.2
@@ -5502,6 +5728,7 @@
 @andrei-propertyguru: https://github.com/andrei-propertyguru
 @AndrewDawes:         https://github.com/AndrewDawes
 @andygrunwald:        https://github.com/andygrunwald
+@andypost:            https://github.com/andypost
 @annechko:            https://github.com/annechko
 @anomiex:             https://github.com/anomiex
 @arnested:            https://github.com/arnested
@@ -5584,6 +5811,7 @@
 @jeffslofish:         https://github.com/jeffslofish
 @jmarcil:             https://github.com/jmarcil
 @jnrbsn:              https://github.com/jnrbsn
+@joachim-n:           https://github.com/joachim-n
 @joelposti:           https://github.com/joelposti
 @johanderuijter:      https://github.com/johanderuijter
 @johnmaguire:         https://github.com/johnmaguire
@@ -5642,6 +5870,7 @@
 @r3nat:               https://github.com/r3nat
 @raul338:             https://github.com/raul338
 @realmfoo:            https://github.com/realmfoo
+@remicollet:          https://github.com/remicollet
 @renaatdemuynck:      https://github.com/renaatdemuynck
 @renan:               https://github.com/renan
 @rhorber:             https://github.com/rhorber
@@ -5677,6 +5906,7 @@
 @thomasjfox:          https://github.com/thomasjfox
 @till:                https://github.com/till
 @timoschinkel:        https://github.com/timoschinkel
+@TimWolla:            https://github.com/TimWolla
 @uniquexor:           https://github.com/uniquexor
 @valorin:             https://github.com/valorin
 @VasekPurchart:       https://github.com/VasekPurchart

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/Filters/ExactMatch.php Changed

@@ -2,7 +2,7 @@
 /**
  * An abstract filter class for checking files and folders against exact matches.
  *
- * Supports both allowed files and blocked files.
+ * Supports both allowed files and disallowed files.
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
@@ -21,12 +21,12 @@
      *
      * @var array
      */
-    private $blockedFiles = null;
+    private $disallowedFiles = null;
 
     /**
      * A list of files to include.
      *
-     * If the allowed files list is empty, only files in the blocked files list will be excluded.
+     * If the allowed files list is empty, only files in the disallowed files list will be excluded.
      *
      * @var array
      */
@@ -36,7 +36,7 @@
     /**
      * Check whether the current element of the iterator is acceptable.
      *
-     * If a file is both blocked and allowed, it will be deemed unacceptable.
+     * If a file is both disallowed and allowed, it will be deemed unacceptable.
      *
      * @return bool
      */
@@ -46,23 +46,33 @@
             return false;
         }
 
-        if ($this->blockedFiles === null) {
-            $this->blockedFiles = $this->getblacklist();
+        if ($this->disallowedFiles === null) {
+            $this->disallowedFiles = $this->getDisallowedFiles();
+
+            // BC-layer.
+            if ($this->disallowedFiles === null) {
+                $this->disallowedFiles = $this->getBlacklist();
+            }
         }
 
         if ($this->allowedFiles === null) {
-            $this->allowedFiles = $this->getwhitelist();
+            $this->allowedFiles = $this->getAllowedFiles();
+
+            // BC-layer.
+            if ($this->allowedFiles === null) {
+                $this->allowedFiles = $this->getWhitelist();
+            }
         }
 
         $filePath = Util\Common::realpath($this->current());
 
-        // If file is both blocked and allowed, the blocked files list takes precedence.
-        if (isset($this->blockedFiles$filePath) === true) {
+        // If a file is both disallowed and allowed, the disallowed files list takes precedence.
+        if (isset($this->disallowedFiles$filePath) === true) {
             return false;
         }
 
-        if (empty($this->allowedFiles) === true && empty($this->blockedFiles) === false) {
-            // We are only checking a blocked files list, so everything else should be allowed.
+        if (empty($this->allowedFiles) === true && empty($this->disallowedFiles) === false) {
+            // We are only checking the disallowed files list, so everything else should be allowed.
             return true;
         }
 
@@ -74,7 +84,7 @@
     /**
      * Returns an iterator for the current entry.
      *
-     * Ensures that the blocked files list and the allowed files list are preserved so they don't have
+     * Ensures that the disallowed files list and the allowed files list are preserved so they don't have
      * to be generated each time.
      *
      * @return \RecursiveIterator
@@ -82,8 +92,8 @@
     public function getChildren()
     {
         $children = parent::getChildren();
-        $children->blockedFiles = $this->blockedFiles;
-        $children->allowedFiles = $this->allowedFiles;
+        $children->disallowedFiles = $this->disallowedFiles;
+        $children->allowedFiles    = $this->allowedFiles;
         return $children;
 
     }//end getChildren()
@@ -92,6 +102,11 @@
     /**
      * Get a list of file paths to exclude.
      *
+     * @deprecated 3.9.0 Implement the `getDisallowedFiles()` method instead.
+     *                   The `getDisallowedFiles()` method will be made abstract and therefore required
+     *                   in v4.0 and this method will be removed.
+     *                   If both methods are implemented, the new `getDisallowedFiles()` method will take precedence.
+     *
      * @return array
      */
     abstract protected function getBlacklist();
@@ -100,9 +115,42 @@
     /**
      * Get a list of file paths to include.
      *
+     * @deprecated 3.9.0 Implement the `getAllowedFiles()` method instead.
+     *                   The `getAllowedFiles()` method will be made abstract and therefore required
+     *                   in v4.0 and this method will be removed.
+     *                   If both methods are implemented, the new `getAllowedFiles()` method will take precedence.
+     *
      * @return array
      */
     abstract protected function getWhitelist();
 
 
+    /**
+     * Get a list of file paths to exclude.
+     *
+     * @since 3.9.0 Replaces the deprecated `getBlacklist()` method.
+     *
+     * @return array|null
+     */
+    protected function getDisallowedFiles()
+    {
+        return null;
+
+    }//end getDisallowedFiles()
+
+
+    /**
+     * Get a list of file paths to include.
+     *
+     * @since 3.9.0 Replaces the deprecated `getWhitelist()` method.
+     *
+     * @return array|null
+     */
+    protected function getAllowedFiles()
+    {
+        return null;
+
+    }//end getAllowedFiles()
+
+
 }//end class

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

@@ -18,21 +18,41 @@
     /**
      * Get a list of file paths to exclude.
      *
+     * @since 3.9.0
+     *
      * @return array
      */
-    protected function getBlacklist()
+    protected function getDisallowedFiles()
     {
         return ;
 
+    }//end getDisallowedFiles()
+
+
+    /**
+     * Get a list of file paths to exclude.
+     *
+     * @deprecated 3.9.0 Overload the `getDisallowedFiles()` method instead.
+     *
+     * @codeCoverageIgnore
+     *
+     * @return array
+     */
+    protected function getBlacklist()
+    {
+        return $this->getDisallowedFiles();
+
     }//end getBlacklist()
 
 
     /**
      * Get a list of file paths to include.
      *
+     * @since 3.9.0
+     *
      * @return array
      */
-    protected function getWhitelist()
+    protected function getAllowedFiles()
     {
         $modified = ;
 
@@ -59,6 +79,22 @@
 
         return $modified;
 
+    }//end getAllowedFiles()
+
+
+    /**
+     * Get a list of file paths to include.
+     *
+     * @deprecated 3.9.0 Overload the `getAllowedFiles()` method instead.
+     *
+     * @codeCoverageIgnore
+     *
+     * @return array
+     */
+    protected function getWhitelist()
+    {
+        return $this->getAllowedFiles();
+
     }//end getWhitelist()

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

@@ -20,21 +20,41 @@
     /**
      * Get a list of file paths to exclude.
      *
+     * @since 3.9.0
+     *
      * @return array
      */
-    protected function getBlacklist()
+    protected function getDisallowedFiles()
     {
         return ;
 
+    }//end getDisallowedFiles()
+
+
+    /**
+     * Get a list of file paths to exclude.
+     *
+     * @deprecated 3.9.0 Overload the `getDisallowedFiles()` method instead.
+     *
+     * @codeCoverageIgnore
+     *
+     * @return array
+     */
+    protected function getBlacklist()
+    {
+        return $this->getDisallowedFiles();
+
     }//end getBlacklist()
 
 
     /**
      * Get a list of file paths to include.
      *
+     * @since 3.9.0
+     *
      * @return array
      */
-    protected function getWhitelist()
+    protected function getAllowedFiles()
     {
         $modified = ;
 
@@ -61,6 +81,22 @@
 
         return $modified;
 
+    }//end getAllowedFiles()
+
+
+    /**
+     * Get a list of file paths to include.
+     *
+     * @deprecated 3.9.0 Overload the `getAllowedFiles()` method instead.
+     *
+     * @codeCoverageIgnore
+     *
+     * @return array
+     */
+    protected function getWhitelist()
+    {
+        return $this->getAllowedFiles();
+
     }//end getWhitelist()

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

@@ -12,6 +12,7 @@
 namespace PHP_CodeSniffer;
 
 use PHP_CodeSniffer\Exceptions\RuntimeException;
+use PHP_CodeSniffer\Sniffs\DeprecatedSniff;
 use PHP_CodeSniffer\Util;
 use stdClass;
 
@@ -116,6 +117,16 @@
      */
     private $config = null;
 
+    /**
+     * An array of the names of sniffs which have been marked as deprecated.
+     *
+     * The key is the sniff code and the value
+     * is the fully qualified name of the sniff class.
+     *
+     * @var array<string, string>
+     */
+    private $deprecatedSniffs = ;
+
 
     /**
      * Initialise the ruleset that the run will use.
@@ -290,14 +301,162 @@
                 }
             }//end if
 
+            if (isset($this->deprecatedSniffs$sniff) === true) {
+                $sniff .= ' *';
+            }
+
             $sniffsInStandard = $sniff;
             ++$lastCount;
         }//end foreach
 
+        if (count($this->deprecatedSniffs) > 0) {
+            echo PHP_EOL.'* Sniffs marked with an asterix are deprecated.'.PHP_EOL;
+        }
+
     }//end explain()
 
 
     /**
+     * Checks whether any deprecated sniffs were registered via the ruleset.
+     *
+     * @return bool
+     */
+    public function hasSniffDeprecations()
+    {
+        return (count($this->deprecatedSniffs) > 0);
+
+    }//end hasSniffDeprecations()
+
+
+    /**
+     * Prints an information block about deprecated sniffs being used.
+     *
+     * @return void
+     *
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException When the interface implementation is faulty.
+     */
+    public function showSniffDeprecations()
+    {
+        if ($this->hasSniffDeprecations() === false) {
+            return;
+        }
+
+        // Don't show deprecation notices in quiet mode, in explain mode
+        // or when the documentation is being shown.
+        // Documentation and explain will mark a sniff as deprecated natively
+        // and also call the Ruleset multiple times which would lead to duplicate
+        // display of the deprecation messages.
+        if ($this->config->quiet === true
+            || $this->config->explain === true
+            || $this->config->generator !== null
+        ) {
+            return;
+        }
+
+        $reportWidth = $this->config->reportWidth;
+        // Message takes report width minus the leading dash + two spaces, minus a one space gutter at the end.
+        $maxMessageWidth = ($reportWidth - 4);
+        $maxActualWidth  = 0;
+
+        ksort($this->deprecatedSniffs, (SORT_NATURAL | SORT_FLAG_CASE));
+
+        $messages        = ;
+        $messageTemplate = 'This sniff has been deprecated since %s and will be removed in %s. %s';
+        $errorTemplate   = 'The %s::%s() method must return a %sstring, received %s';
+
+        foreach ($this->deprecatedSniffs as $sniffCode => $className) {
+            if (isset($this->sniffs$className) === false) {
+                // Should only be possible in test situations, but some extra defensive coding is never a bad thing.
+                continue;
+            }
+
+            // Verify the interface was implemented correctly.
+            // Unfortunately can't be safeguarded via type declarations yet.
+            $deprecatedSince = $this->sniffs$className->getDeprecationVersion();
+            if (is_string($deprecatedSince) === false) {
+                throw new RuntimeException(
+                    sprintf($errorTemplate, $className, 'getDeprecationVersion', 'non-empty ', gettype($deprecatedSince))
+                );
+            }
+
+            if ($deprecatedSince === '') {
+                throw new RuntimeException(
+                    sprintf($errorTemplate, $className, 'getDeprecationVersion', 'non-empty ', '""')
+                );
+            }
+
+            $removedIn = $this->sniffs$className->getRemovalVersion();
+            if (is_string($removedIn) === false) {
+                throw new RuntimeException(
+                    sprintf($errorTemplate, $className, 'getRemovalVersion', 'non-empty ', gettype($removedIn))
+                );
+            }
+
+            if ($removedIn === '') {
+                throw new RuntimeException(
+                    sprintf($errorTemplate, $className, 'getRemovalVersion', 'non-empty ', '""')
+                );
+            }
+
+            $customMessage = $this->sniffs$className->getDeprecationMessage();
+            if (is_string($customMessage) === false) {
+                throw new RuntimeException(
+                    sprintf($errorTemplate, $className, 'getDeprecationMessage', '', gettype($customMessage))
+                );
+            }
+
+            // Truncate the error code if there is not enough report width.
+            if (strlen($sniffCode) > $maxMessageWidth) {
+                $sniffCode = substr($sniffCode, 0, ($maxMessageWidth - 3)).'...';
+            }
+
+            $message = '-  '.$sniffCode.PHP_EOL;
+            if ($this->config->colors === true) {
+                $message = '-  '."\03336m".$sniffCode."\0330m".PHP_EOL;
+            }
+
+            $maxActualWidth = max($maxActualWidth, strlen($sniffCode));
+
+            // Normalize new line characters in custom message.
+            $customMessage = preg_replace('`\R`', PHP_EOL, $customMessage);
+
+            $notice         = trim(sprintf($messageTemplate, $deprecatedSince, $removedIn, $customMessage));
+            $maxActualWidth = max($maxActualWidth, min(strlen($notice), $maxMessageWidth));
+            $wrapped        = wordwrap($notice, $maxMessageWidth, PHP_EOL);
+            $message       .= '   '.implode(PHP_EOL.'   ', explode(PHP_EOL, $wrapped));
+
+            $messages = $message;
+        }//end foreach
+
+        if (count($messages) === 0) {
+            return;
+        }
+
+        $summaryLine = "WARNING: The $this->name standard uses 1 deprecated sniff";
+        $sniffCount  = count($messages);
+        if ($sniffCount !== 1) {
+            $summaryLine = str_replace('1 deprecated sniff', "$sniffCount deprecated sniffs", $summaryLine);
+        }
+
+        $maxActualWidth = max($maxActualWidth, min(strlen($summaryLine), $maxMessageWidth));
+
+        $summaryLine = wordwrap($summaryLine, $reportWidth, PHP_EOL);
+        if ($this->config->colors === true) {
+            echo "\03333m".$summaryLine."\0330m".PHP_EOL;
+        } else {
+            echo $summaryLine.PHP_EOL;
+        }
+
+        echo str_repeat('-', min(($maxActualWidth + 4), $reportWidth)).PHP_EOL;
+        echo implode(PHP_EOL, $messages);
+
+        $closer = wordwrap('Deprecated sniffs are still run, but will stop working at some point in the future.', $reportWidth, PHP_EOL);
+        echo PHP_EOL.PHP_EOL.$closer.PHP_EOL.PHP_EOL;
+
+    }//end showSniffDeprecations()
+
+
+    /**
      * Processes a single ruleset and returns a list of the sniffs it represents.
      *
      * Rules founds within the ruleset are processed immediately, but sniff classes
@@ -1225,6 +1384,10 @@
             $sniffCode = Util\Common::getSniffCode($sniffClass);
             $this->sniffCodes$sniffCode = $sniffClass;
 
+            if ($this->sniffs$sniffClass instanceof DeprecatedSniff) {
+                $this->deprecatedSniffs$sniffCode = $sniffClass;
+            }
+
             // Set custom properties.
             if (isset($this->ruleset$sniffCode'properties') === true) {
                 foreach ($this->ruleset$sniffCode'properties' as $name => $settings) {

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

@@ -194,7 +194,15 @@
             $this->config->showSources  = false;
             $this->config->recordErrors = false;
             $this->config->reportFile   = null;
-            $this->config->reports      = 'cbf' => null;
+
+            // Only use the "Cbf" report, but allow for the Performance report as well.
+            $originalReports = array_change_key_case($this->config->reports, CASE_LOWER);
+            $newReports      = 'cbf' => null;
+            if (array_key_exists('performance', $originalReports) === true) {
+                $newReports'performance' = $originalReports'performance';
+            }
+
+            $this->config->reports = $newReports;
 
             // If a standard tries to set command line arguments itself, some
             // may be blocked because PHPCBF is running, so stop the script
@@ -334,6 +342,10 @@
         // should be checked and/or fixed.
         try {
             $this->ruleset = new Ruleset($this->config);
+
+            if ($this->ruleset->hasSniffDeprecations() === true) {
+                $this->ruleset->showSniffDeprecations();
+            }
         } catch (RuntimeException $e) {
             $error  = 'ERROR: '.$e->getMessage().PHP_EOL.PHP_EOL;
             $error .= $this->config->printShortUsage(true);

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Sniffs/DeprecatedSniff.php Added

@@ -0,0 +1,63 @@
+<?php
+/**
+ * Marks a sniff as deprecated.
+ *
+ * Implementing this interface allows for marking a sniff as deprecated and
+ * displaying information about the deprecation to the end-user.
+ *
+ * A sniff will still need to implement the `PHP_CodeSniffer\Sniffs\Sniff` interface
+ * as well, or extend an abstract sniff which does, to be recognized as a valid sniff.
+ *
+ * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
+ * @copyright 2024 PHPCSStandards Contributors
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Sniffs;
+
+interface DeprecatedSniff
+{
+
+
+    /**
+     * Provide the version number in which the sniff was deprecated.
+     *
+     * Recommended format for PHPCS native sniffs: "v3.3.0".
+     * Recommended format for external sniffs: "StandardName v3.3.0".
+     *
+     * @return string
+     */
+    public function getDeprecationVersion();
+
+
+    /**
+     * Provide the version number in which the sniff will be removed.
+     *
+     * Recommended format for PHPCS native sniffs: "v3.3.0".
+     * Recommended format for external sniffs: "StandardName v3.3.0".
+     *
+     * If the removal version is not yet known, it is recommended to set
+     * this to: "a future version".
+     *
+     * @return string
+     */
+    public function getRemovalVersion();
+
+
+    /**
+     * Optionally provide an arbitrary custom message to display with the deprecation.
+     *
+     * Typically intended to allow for displaying information about what to
+     * replace the deprecated sniff with.
+     * Example: "Use the Stnd.Cat.SniffName sniff instead."
+     * Multi-line messages (containing new line characters) are supported.
+     *
+     * An empty string can be returned if there is no replacement/no need
+     * for a custom message.
+     *
+     * @return string
+     */
+    public function getDeprecationMessage();
+
+
+}//end interface

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

@@ -0,0 +1,44 @@
+<documentation title="Require Explicit Boolean Operator Precedence"
+    >
+    <standard>
+    <!CDATA
+    Forbids mixing different binary boolean operators (&&, ||, and, or, xor) within a single expression without making precedence clear using parentheses.
+    >
+    </standard>
+    <code_comparison>
+        <code title="Valid: Making precedence clear with parentheses.">
+        <!CDATA
+$one = false;
+$two = false;
+$three = true;
+
+$result = <em>($one && $two) || $three</em>;
+$result2 = <em>$one && ($two || $three)</em>;
+$result3 = <em>($one && !$two) xor $three</em>;
+$result4 = <em>$one && (!$two xor $three)</em>;
+
+if (
+    <em>($result && !$result3)
+    || (!$result && $result3)</em>
+) {}
+        >
+        </code>
+        <code title="Invalid: Not using parentheses.">
+        <!CDATA
+$one = false;
+$two = false;
+$three = true;
+
+$result = <em>$one && $two || $three</em>;
+
+$result3 = <em>$one && !$two xor $three</em>;
+
+
+if (
+    <em>$result && !$result3
+    || !$result && $result3</em>
+) {}
+        >
+        </code>
+    </code_comparison>
+</documentation>

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

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

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceSniff.php Added

@@ -0,0 +1,119 @@
+<?php
+/**
+ * Forbid mixing different binary boolean operators within a single expression without making precedence
+ * clear using parentheses.
+ *
+ * <code>
+ * $one = false;
+ * $two = false;
+ * $three = true;
+ *
+ * $result = $one && $two || $three;
+ * $result3 = $one && !$two xor $three;
+ * </code>
+ *
+ * {@internal The unary `!` operator is not handled, because its high precedence matches its visuals of
+ * applying only to the sub-expression right next to it, making it unlikely that someone would
+ * misinterpret its precedence. Requiring parentheses around it would reduce the readability of
+ * expressions due to the additional characters, especially if multiple subexpressions / variables
+ * need to be negated.}
+ *
+ * Sister-sniff to the `Squiz.ControlStructures.InlineIfDeclaration` and
+ * `Squiz.Formatting.OperatorBracket.MissingBrackets` sniffs.
+ *
+ * @author    Tim Duesterhus <duesterhus@woltlab.com>
+ * @copyright 2021-2023 WoltLab GmbH.
+ * @copyright 2024 PHPCSStandards and contributors
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Util\Tokens;
+
+class RequireExplicitBooleanOperatorPrecedenceSniff implements Sniff
+{
+
+    /**
+     * Array of tokens this test searches for to find either a boolean
+     * operator or the start of the current (sub-)expression. Used for
+     * performance optimization purposes.
+     *
+     * @var array<int|string>
+     */
+    private $searchTargets = ;
+
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @return array<int|string>
+     */
+    public function register()
+    {
+        $this->searchTargets  = Tokens::$booleanOperators;
+        $this->searchTargets += Tokens::$blockOpeners;
+        $this->searchTargetsT_INLINE_THEN = T_INLINE_THEN;
+        $this->searchTargetsT_INLINE_ELSE = T_INLINE_ELSE;
+
+        return Tokens::$booleanOperators;
+
+    }//end register()
+
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the current token
+     *                                               in the stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        $start = $phpcsFile->findStartOfStatement($stackPtr);
+
+        $previous = $phpcsFile->findPrevious(
+            $this->searchTargets,
+            ($stackPtr - 1),
+            $start,
+            false,
+            null,
+            true
+        );
+
+        if ($previous === false) {
+            // No token found.
+            return;
+        }
+
+        if ($tokens$previous'code' === $tokens$stackPtr'code') {
+            // Identical operator found.
+            return;
+        }
+
+        if (in_array($tokens$previous'code', T_INLINE_THEN, T_INLINE_ELSE, true) === true) {
+            // Beginning of the expression found for the ternary conditional operator.
+            return;
+        }
+
+        if (isset(Tokens::$blockOpeners$tokens$previous'code') === true) {
+            // Beginning of the expression found for a block opener. Needed to
+            // correctly handle match arms.
+            return;
+        }
+
+        // We found a mismatching operator, thus we must report the error.
+        $error  = 'Mixing different binary boolean operators within an expression';
+        $error .= ' without using parentheses to clarify precedence is not allowed.';
+        $phpcsFile->addError($error, $stackPtr, 'MissingParentheses');
+
+    }//end process()
+
+
+}//end class

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

@@ -94,7 +94,6 @@
 
         $errorCode  = 'Found';
         $implements = false;
-        $extends    = false;
 
         if ($token'code' === T_FUNCTION) {
             $classPtr = $phpcsFile->getCondition($stackPtr, T_CLASS);
@@ -174,18 +173,22 @@
 
                 // A return statement as the first content indicates an interface method.
                 if ($code === T_RETURN) {
-                    $tmp = $phpcsFile->findNext(Tokens::$emptyTokens, ($next + 1), null, true);
-                    if ($tmp === false && $implements !== false) {
+                    $firstNonEmptyTokenAfterReturn = $phpcsFile->findNext(Tokens::$emptyTokens, ($next + 1), null, true);
+                    if ($tokens$firstNonEmptyTokenAfterReturn'code' === T_SEMICOLON && $implements !== false) {
                         return;
                     }
 
-                    // There is a return.
-                    if ($tokens$tmp'code' === T_SEMICOLON && $implements !== false) {
-                        return;
-                    }
-
-                    $tmp = $phpcsFile->findNext(Tokens::$emptyTokens, ($tmp + 1), null, true);
-                    if ($tmp !== false && $tokens$tmp'code' === T_SEMICOLON && $implements !== false) {
+                    $secondNonEmptyTokenAfterReturn = $phpcsFile->findNext(
+                        Tokens::$emptyTokens,
+                        ($firstNonEmptyTokenAfterReturn + 1),
+                        null,
+                        true
+                    );
+
+                    if ($secondNonEmptyTokenAfterReturn !== false
+                        && $tokens$secondNonEmptyTokenAfterReturn'code' === T_SEMICOLON
+                        && $implements !== false
+                    ) {
                         // There is a return <token>.
                         return;
                     }

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

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

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

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

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

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

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

@@ -87,7 +87,7 @@
         }
 
         /*
-         * Check property types.
+         * Check OO constant and property types.
          */
 
         if (isset(Tokens::$ooScopeTokens$tokens$stackPtr'code') === true) {
@@ -97,7 +97,7 @@
 
             for ($i = ($tokens$stackPtr'scope_opener' + 1); $i < $tokens$stackPtr'scope_closer'; $i++) {
                 // Skip over potentially large docblocks.
-                if ($tokens$i'code' === \T_DOC_COMMENT_OPEN_TAG
+                if ($tokens$i'code' === T_DOC_COMMENT_OPEN_TAG
                     && isset($tokens$i'comment_closer') === true
                 ) {
                     $i = $tokens$i'comment_closer';
@@ -105,14 +105,74 @@
                 }
 
                 // Skip over function declarations and everything nested within.
-                if ($tokens$i'code' === \T_FUNCTION
+                if ($tokens$i'code' === T_FUNCTION
                     && isset($tokens$i'scope_closer') === true
                 ) {
                     $i = $tokens$i'scope_closer';
                     continue;
                 }
 
-                if ($tokens$i'code' !== \T_VARIABLE) {
+                if ($tokens$i'code' === T_CONST) {
+                    $ignore = Tokens::$emptyTokens;
+                    $ignoreT_NULLABLE = T_NULLABLE;
+
+                    $startOfType = $phpcsFile->findNext($ignore, ($i + 1), null, true);
+                    if ($startOfType === false) {
+                        // Parse error/live coding. Nothing to do. Rest of loop is moot.
+                        return;
+                    }
+
+                    $assignmentOperator = $phpcsFile->findNext(T_EQUAL, T_SEMICOLON, ($startOfType + 1));
+                    if ($assignmentOperator === false || $tokens$assignmentOperator'code' !== T_EQUAL) {
+                        // Parse error/live coding. Nothing to do. Rest of loop is moot.
+                        return;
+                    }
+
+                    $constName = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($assignmentOperator - 1), null, true);
+                    if ($startOfType !== $constName) {
+                        $endOfType = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($constName - 1), null, true);
+
+                        $type        = '';
+                        $isUnionType = false;
+                        $isIntersectionType = false;
+                        for ($j = $startOfType; $j <= $endOfType; $j++) {
+                            if (isset($ignore$tokens$j'code') === true) {
+                                continue;
+                            }
+
+                            if ($tokens$j'code' === T_TYPE_UNION) {
+                                $isUnionType = true;
+                            }
+
+                            if ($tokens$j'code' === T_TYPE_INTERSECTION) {
+                                $isIntersectionType = true;
+                            }
+
+                            $type .= $tokens$j'content';
+                        }
+
+                        $error     = 'PHP constant type declarations must be lowercase; expected "%s" but found "%s"';
+                        $errorCode = 'ConstantTypeFound';
+
+                        if ($isIntersectionType === true) {
+                            // Intersection types don't support simple types.
+                        } else if ($isUnionType === true) {
+                            $this->processUnionType(
+                                $phpcsFile,
+                                $startOfType,
+                                $endOfType,
+                                $error,
+                                $errorCode
+                            );
+                        } else if (isset($this->phpTypesstrtolower($type)) === true) {
+                            $this->processType($phpcsFile, $startOfType, $type, $error, $errorCode);
+                        }
+                    }//end if
+
+                    continue;
+                }//end if
+
+                if ($tokens$i'code' !== T_VARIABLE) {
                     continue;
                 }
 
@@ -135,7 +195,7 @@
                     $error     = 'PHP property type declarations must be lowercase; expected "%s" but found "%s"';
                     $errorCode = 'PropertyTypeFound';
 
-                    if ($props'type_token' === T_TYPE_INTERSECTION) {
+                    if (strpos($type, '&') !== false) {
                         // Intersection types don't support simple types.
                     } else if (strpos($type, '|') !== false) {
                         $this->processUnionType(
@@ -167,7 +227,7 @@
             $error     = 'PHP return type declarations must be lowercase; expected "%s" but found "%s"';
             $errorCode = 'ReturnTypeFound';
 
-            if ($props'return_type_token' === T_TYPE_INTERSECTION) {
+            if (strpos($returnType, '&') !== false) {
                 // Intersection types don't support simple types.
             } else if (strpos($returnType, '|') !== false) {
                 $this->processUnionType(
@@ -199,7 +259,7 @@
                 $error     = 'PHP parameter type declarations must be lowercase; expected "%s" but found "%s"';
                 $errorCode = 'ParamTypeFound';
 
-                if ($param'type_hint_token' === T_TYPE_INTERSECTION) {
+                if (strpos($typeHint, '&') !== false) {
                     // Intersection types don't support simple types.
                 } else if (strpos($typeHint, '|') !== false) {
                     $this->processUnionType(

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

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

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

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

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

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

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

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

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

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

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

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/ForLoopWithTestFunctionCallUnitTest.1.inc Added

@@ -0,0 +1,95 @@
+<?php
+
+$a = array(1, 2, 3, 4);
+for ($i = 0; $i < count($a); $i++) {
+    $a$i *= $i;
+}
+
+for ($i = 0, $c = sizeof($a); $i < $c; ++$i) {
+    $a$i *= $i;
+}
+
+$it = new ArrayIterator($a);
+for ($it->rewind(); $it->valid(); $it->next()) {
+    echo $it->current();
+}
+
+for ($i = 0; MyClass::staticMethod($value); $i++) {
+    echo $i;
+}
+
+for ($i = 0; $countFunction($value); $i++) {
+    echo $i;
+}
+
+$a = array(1, 2, 3, 4);
+for ($i = 0; $i < count($a); $i++):
+    $a$i *= $i;
+endfor;
+
+for ($i = 0, $c = sizeof($a); $i < $c; ++$i):
+    $a$i *= $i;
+endfor;
+
+$it = new ArrayIterator($a);
+for ($it->rewind(); $it->valid(); $it->next()):
+    echo $it->current();
+endfor;
+
+for ($i = 0; MyClass::staticMethod($value); $i++) :
+    echo $i;
+endfor;
+
+for ($i = 0; $countFunction($value); $i++):
+    echo $i;
+endfor;
+
+for ($i = 0; (new MyClass)->method(); $i++) {
+}
+
+for (; $i < 10; ++$i) {}
+
+for (; count($a); ++$i) {}
+
+for ($i = 0;; ++$i) {}
+
+for ($i = 0; $i < 10;) {}
+
+for ($i = 0; count($a);) {}
+
+for (;; $i++) {}
+
+for ($i = 0;;) {}
+
+for (;;) {}
+
+for ($i = 0; (new MyClass)->method(); $i++):
+endfor;
+
+for (; $i < 10; ++$i) :
+endfor;
+
+for (; count($a); ++$i) :
+endfor;
+
+for ($i = 0;; ++$i) :
+endfor;
+
+for ($i = 0; $i < 10;) :
+endfor;
+
+for ($i = 0; count($a);) :
+endfor;
+
+for (;; $i++) :
+endfor;
+
+for ($i = 0;;) :
+endfor;
+
+for (;;) :
+endfor;
+
+for ($i = 0; $i < 10; $i = increment($i)) {}
+
+for ($i = initialValue(); $i < 10; $i = increment($i)) {}

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/ForLoopWithTestFunctionCallUnitTest.2.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/ForLoopWithTestFunctionCallUnitTest.3.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/ForLoopWithTestFunctionCallUnitTest.inc Deleted

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

@@ -16,7 +16,7 @@
  *
  * @covers \PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis\ForLoopWithTestFunctionCallSniff
  */
-class ForLoopWithTestFunctionCallUnitTest extends AbstractSniffUnitTest
+final class ForLoopWithTestFunctionCallUnitTest extends AbstractSniffUnitTest
 {
 
 
@@ -41,14 +41,33 @@
      * The key of the array should represent the line number and the value
      * should represent the number of warnings that should occur on that line.
      *
+     * @param string $testFile The name of the test file being tested.
+     *
      * @return array<int, int>
      */
-    public function getWarningList()
+    public function getWarningList($testFile='')
     {
-        return 
-            4  => 1,
-            13 => 1,
-        ;
+        switch ($testFile) {
+        case 'ForLoopWithTestFunctionCallUnitTest.1.inc':
+            return 
+                4  => 1,
+                13 => 1,
+                17 => 1,
+                21 => 1,
+                26 => 1,
+                35 => 1,
+                39 => 1,
+                43 => 1,
+                47 => 1,
+                52 => 1,
+                58 => 1,
+                66 => 1,
+                72 => 1,
+                81 => 1,
+            ;
+        default:
+            return ;
+        }//end switch
 
     }//end getWarningList()

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

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceUnitTest.inc Added

@@ -0,0 +1,131 @@
+<?php
+
+if (true && true || true); // Not OK.
+if ((true && true) || true);
+if (true && (true || true));
+
+$var = true && true || true; // Not OK.
+$var = (true && true) || true;
+$var = true && (true || true);
+
+$complex = true && (true || true) && true;
+$complex = true && (true || true) || true; // Not OK.
+
+if (
+    true
+    && true
+    || true // Not OK.
+);
+
+if (
+    true
+    && (
+        true
+        || true
+    )
+);
+
+if (true && foo(true || true));
+if (true && foo(true && true || true)); // Not OK.
+if (true && $footrue || true);
+if (true && $footrue && true || true); // Not OK.
+
+if (true && foo(true) || true); // Not OK.
+if (true && $footrue || true); // Not OK.
+if (true && foo($footrue) || true); // Not OK.
+
+$foo = true && true || false; // Not OK.
+
+foo(true && true || false); // Not OK.
+
+if (true && true || true && true); // Not OK.
+
+$foo = false || true && (#\Attr(true && true || true) function (#\SensitiveParameter $p) { // Not OK.
+    echo true || true && true; // Not OK.
+
+    return true;
+})('dummy') || false; // Not OK.
+
+$foo = false || (true && (#\Attr((true && true) || true) function (#\SensitiveParameter $p) {
+    echo (true || true) && true;
+
+    return true;
+})('dummy')) || false;
+
+$foo = true || true || (#\Attr(true && true && true) function (#\SensitiveParameter $p) {
+    echo true && true && true;
+
+    return true;
+})('dummy') || false;
+
+if (true && true, callMe(), ${true || true} || true); // Not OK.
+if (true && true, callMe(), ${true || true} && true);
+
+for (true || true || true; true && true && true; true || true || true);
+for (true || true && true; true && true || true; true || true && true); // Not OK.
+
+for ($a = true || true || true, $b = true && true && true; $a; $b);
+for ($a = true || true && true, $b = true || true && true; $a; $b); // Not OK.
+
+$foo = true || true || true ? true && true && true : true || true || true;
+$foo = true && true || true // Not OK.
+    ? true || true && true // Not OK.
+    : true || true && true; // Not OK.
+
+for(true || true || true, true && true && true);
+for(true && true || true, true && true || true); // Not OK.
+
+(true && true and true); // Not OK.
+(true && true or true); // Not OK.
+(true and true or true); // Not OK.
+(true and true xor true and true); // Not OK.
+
+if (true || true && true && true && true); // Not OK.
+
+match (true) {
+    // OK.
+    $a || ($b && $c) => true,
+};
+
+match (true) {
+    // Not OK.
+    $a || $b && $c => true,
+};
+
+match (true) {
+    // OK.
+    $a || $b => true,
+    $a && $b => true,
+};
+
+match (true) {
+    // Debatable.
+    $a || $b, $a && $b => true,
+};
+
+// OK.
+$foo = fn ($a, $b, $c) => $a && ($b || $c);
+
+// Not OK.
+$foo = fn ($a, $b, $c) => $a && $b || $c;
+
+// OK.
+$foo = $a && (fn ($a, $b, $c) => $a || $b);
+
+// Debatable.
+$foo = $a && fn ($a, $b, $c) => $a || $b;
+
+// OK.
+\array_map(
+    fn ($a, $b, $c) => $a || $b,
+    $a && $b
+);
+
+match (true) {
+    // Not OK.
+    $a || ($b && $c) && $d => true,
+    // Not OK.
+    $b && $c'a' || $d => true,
+    // Not OK.
+    $b && ${$var} || $d => true,
+};

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/RequireExplicitBooleanOperatorPrecedenceUnitTest.php Added

@@ -0,0 +1,91 @@
+<?php
+/**
+ * Unit test class for the RequireExplicitBooleanOperatorPrecedence sniff.
+ *
+ * @author    Tim Duesterhus <duesterhus@woltlab.com>
+ * @copyright 2021-2023 WoltLab GmbH.
+ * @copyright 2024 PHPCSStandards and contributors
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Standards\Generic\Tests\CodeAnalysis;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+/**
+ * Unit test class for the RequireExplicitBooleanOperatorPrecedence sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis\RequireExplicitBooleanOperatorPrecedenceSniff
+ */
+final class RequireExplicitBooleanOperatorPrecedenceUnitTest extends AbstractSniffUnitTest
+{
+
+
+    /**
+     * Returns the lines where errors should occur.
+     *
+     * The key of the array should represent the line number and the value
+     * should represent the number of errors that should occur on that line.
+     *
+     * @return array<int, int>
+     */
+    public function getErrorList()
+    {
+        return 
+            3   => 1,
+            7   => 1,
+            12  => 1,
+            17  => 1,
+            29  => 1,
+            31  => 1,
+            33  => 1,
+            34  => 1,
+            35  => 1,
+            37  => 1,
+            39  => 1,
+            41  => 2,
+            43  => 2,
+            44  => 1,
+            47  => 1,
+            61  => 1,
+            65  => 3,
+            68  => 2,
+            71  => 1,
+            72  => 1,
+            73  => 1,
+            76  => 2,
+            78  => 1,
+            79  => 1,
+            80  => 1,
+            81  => 2,
+            83  => 1,
+            92  => 1,
+            110 => 1,
+            126 => 1,
+            128 => 1,
+            130 => 1,
+
+            // Debatable.
+            103 => 1,
+            116 => 1,
+        ;
+
+    }//end getErrorList()
+
+
+    /**
+     * Returns the lines where warnings should occur.
+     *
+     * The key of the array should represent the line number and the value
+     * should represent the number of warnings that should occur on that line.
+     *
+     * @return array<int, int>
+     */
+    public function getWarningList()
+    {
+        return ;
+
+    }//end getWarningList()
+
+
+}//end class

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

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.1.inc Added

@@ -0,0 +1,56 @@
+<?php
+
+class Foo {
+    public final function fooBar() {}
+    protected final function fool() {}
+    private final function Bar() {}
+}
+
+final class Foo_Bar {
+    public $foobar;
+    public final $FOOBAR = 23; // Parse error, but that's not the concern of this sniff, so report it.
+    public final function fooBar() {}
+
+    protected function foo() {}
+    protected final function fool() {}
+
+    private function Bar() {}
+    private final function Bard() {}
+}
+
+final class Bar_Foo {
+    public $foobar;
+    protected $foo;
+    private $bar;
+
+    public function fooBar() {}
+    protected function foo() {}
+    private function Bar() {}
+}
+
+final readonly class Foo_Bar {
+    public final function fooBar() {}
+    final protected function fool() {}
+}
+
+final class Final_Class_Final_Constants {
+    final public const FINAL_PUBLIC_CONST = 23;
+    protected final const FINAL_PROTECTED_CONST = 'foo';
+}
+
+final class Final_Class_Regular_Constants {
+    public const PUBLIC_CONST = 23;
+    protected const PROTECTED_CONST = 'foo';
+    private const PRIVATE_CONST = true;
+}
+
+class Regular_Class_Final_Constants {
+    public final const FINAL_PUBLIC_CONST = 23;
+    final protected const FINAL_PROTECTED_CONST = 'foo';
+}
+
+class Regular_Class_Regular_Constants {
+    public const PUBLIC_CONST = 23;
+    protected const PROTECTED_CONST = 'foo';
+    private const PRIVATE_CONST = true;
+}

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.2.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.inc Deleted

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

@@ -16,7 +16,7 @@
  *
  * @covers \PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis\UnnecessaryFinalModifierSniff
  */
-class UnnecessaryFinalModifierUnitTest extends AbstractSniffUnitTest
+final class UnnecessaryFinalModifierUnitTest extends AbstractSniffUnitTest
 {
 
 
@@ -41,18 +41,27 @@
      * The key of the array should represent the line number and the value
      * should represent the number of warnings that should occur on that line.
      *
+     * @param string $testFile The name of the test file being tested.
+     *
      * @return array<int, int>
      */
-    public function getWarningList()
+    public function getWarningList($testFile='')
     {
-        return 
-            11 => 1,
-            12 => 1,
-            15 => 1,
-            18 => 1,
-            32 => 1,
-            33 => 1,
-        ;
+        switch ($testFile) {
+        case 'UnnecessaryFinalModifierUnitTest.1.inc':
+            return 
+                11 => 1,
+                12 => 1,
+                15 => 1,
+                18 => 1,
+                32 => 1,
+                33 => 1,
+                37 => 1,
+                38 => 1,
+            ;
+        default:
+            return ;
+        }
 
     }//end getWarningList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/UnusedFunctionParameterUnitTest.1.inc Added

@@ -0,0 +1,274 @@
+<?php
+
+function foo($a, $b) {
+    return $a * 2;
+}
+
+function baz($a, $b) {
+    echo "baz({$a});";
+}
+
+function bar($a, $b) {
+    $x = $b;
+    for ($i = 0; $i <$a; $i++) {
+        $x += $a * $i;
+    }
+    return $x;
+}
+
+function foobar($a, &$b) {
+    return (preg_match('/foo/', $a, $b) !== 0);
+}
+
+class Foo implements Bar {
+    function barfoo($a, $b) {
+        // Empty body means interface method in many cases.
+    }
+
+    function fooBar($a, $b) {
+        return;
+    }
+}
+
+function foo($bar)
+{
+    print <<<BAZ
+    $bar
+BAZ;
+}
+
+function foo( $parameter ) {
+    $wango = <<<HERE
+1 Must be a HEREdoc of at least one line
+HERE;
+    $x = $parameter; // This line must be immediately after the HERE; with no intervening blank lines.
+    $tango = <<<HERE
+1 Must be a HEREdoc
+2
+3
+4
+5
+6
+7
+8
+9 at least 9 lines long
+HERE;
+}
+
+function foo( $parameter ) {
+    return <<<HTML
+<?xml version="1.0"?>
+<value>$parameter</value>
+HTML;
+}
+
+print foo( 'PARAMETER' );
+print "\n";
+
+function foo($bar)
+{
+    print "${bar} things\n";
+}
+
+function bar($x)
+{
+    return 2 * ${x};
+}
+
+$foo = function ($a, $b) {
+    return $a * 2;
+};
+
+function foobar() {
+    return;
+}
+
+
+/*
+ * The function signature of methods in extended classes and implemented
+ * interfaces has to mirror the parent class/interface.
+ * The overloaded method may not use all params.
+ */
+
+class MyClass {
+    public function something($a, $b) {
+        return $a * 2;
+    }
+}
+
+class MyExtendedClass extends SomeClass {
+    public function something($a, $b) {
+        return $a * 2;
+    }
+}
+
+class MyExtendedClass implements SomeInterface {
+    public function something($a, $b) {
+        return $a * 2;
+    }
+}
+
+
+/*
+ * Functions may not use all params passed to them.
+ * Report different violations for params *before* and *after* the last param used.
+ */
+
+function something($a) {
+    return 'foobar';
+}
+
+function myCallback($a, $b, $c, $d) {
+    return $a * $c;
+}
+
+fn ($a, $b, $c) => $b;
+
+// phpcs:set Generic.CodeAnalysis.UnusedFunctionParameter ignoreTypeHints Exception
+
+function oneParam(Exception $foo) {
+    return 'foobar';
+}
+
+function moreParamFirst(Exception $foo, LogicException $bar) {
+    return 'foobar' . $bar;
+}
+
+function moreParamSecond(LogicException $bar, Exception $foo) {
+    return 'foobar' . $bar;
+}
+// phpcs:set Generic.CodeAnalysis.UnusedFunctionParameter ignoreTypeHints
+
+class ConstructorPropertyPromotionNoContentInMethod {
+    public function __construct(protected int $id) {}
+}
+
+class ConstructorPropertyPromotionWithContentInMethod {
+    public function __construct(protected int $id, $toggle = true) {
+        if ($toggle === true) {
+            doSomething();
+        }
+    }
+}
+
+$found = in_array_cb($needle, $haystack, fn($array, $needle) => $array2 === $needle);
+
+
+/*
+ * Don't adjust the error code for closures and arrow functions in extended classes/classes implementing interfaces.
+ */
+class MyExtendedClass extends SomeClass {
+    public function something($a, $b) {
+        $c = $a + $b;
+        $closure = function ($c, $d) {
+            return $c * 2;
+        };
+    }
+}
+
+class MyExtendedClass implements SomeInterface {
+    public function something($a, $b) {
+        $c = $a + $b;
+        $fn = fn($c, $d) => $c2;
+    }
+}
+
+
+/**
+ * Magic methods must match the function signature dictated by PHP.
+ * Flagging unused parameters leads to notices which cannot be solved.
+ */
+class MagicMethodsWithParams {
+    public function __set(string $name, mixed $value) {
+        // Forbid dynamic properties & overloading inaccessible properties.
+        throw new RuntimeException('Forbidden');
+    }
+
+    public function __get(string $name) {
+        throw new RuntimeException('Forbidden');
+    }
+
+    public function __isset(string $name) {
+        throw new RuntimeException('Forbidden');
+    }
+
+    public function __unset(string $name) {
+        throw new RuntimeException('Forbidden');
+    }
+
+    public function __unserialize( array $data ) {
+        // Prevent unserializing from a stored representation of the object for security reasons.
+        $this->instance = new self();
+    }
+
+    public static function __set_state(array $properties) {
+        return new self();
+    }
+
+    public function __call(string $name, array $arguments) {
+        if (method_exists($this, $name)) {
+            // None of the methods which can be called in this class take arguments, so not passing them.
+            return $this->$name();
+        }
+    }
+
+    public static function __callStatic(string $name, array $arguments) {
+        if (method_exists($this, $name)) {
+            // None of the methods which can be called in this class take arguments, so not passing them.
+            return self::$name();
+        }
+    }
+}
+
+/**
+ * Unused parameters in magic methods which have flexible function signatures should still be flagged.
+ */
+class MagicMethodsWithParamsNotDictatedByPHP {
+    public $foo;
+    public function __construct($foo, $bar, $baz) {
+        $this->foo = $foo;
+    }
+
+    public function __invoke($foo, $bar, $baz) {
+        $this->foo = $foo;
+    }
+}
+
+/**
+ * Unused parameters in magic methods which have flexible function signatures
+ * where the method potentially overloads a parent method should still be flagged,
+ * but should use the `FoundInExtendedClassAfterLastUsed` error code.
+ */
+class MagicMethodsWithParamsNotDictatedByPHPInChildClass extends SomeParent{
+    public $foo;
+    public function __construct($foo, $bar, $baz) {
+        $this->foo = $foo;
+    }
+
+    public function __invoke($foo, $bar, $baz) {
+        $this->foo = $foo;
+    }
+}
+
+/**
+ * Methods that throw an exception or return on the first line and are part
+ * of a class that implements an interface should not trigger the sniff.
+ */
+class InterfaceMethodNotImplement implements SomeInterface {
+    public function notImplemented($param) {
+        throw new Exception('Not implemented.');
+    }
+
+    public function notImplemented2($param) {
+        return 'Not implemented.';
+    }
+}
+
+/**
+ * Should trigger the sniff as this method is not part of an interface.
+ */
+class MethodThrowsException {
+    public function throwsException($param) {
+        throw new Exception();
+    }
+}

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/UnusedFunctionParameterUnitTest.2.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/UnusedFunctionParameterUnitTest.3.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/UnusedFunctionParameterUnitTest.inc Deleted

@@ -1,251 +0,0 @@
-<?php
-
-function foo($a, $b) {
-    return $a * 2;
-}
-
-function baz($a, $b) {
-    echo "baz({$a});";
-}
-
-function bar($a, $b) {
-    $x = $b;
-    for ($i = 0; $i <$a; $i++) {
-        $x += $a * $i;
-    }
-    return $x;
-}
-
-function foobar($a, &$b) {
-    return (preg_match('/foo/', $a, $b) !== 0);
-}
-
-class Foo implements Bar {
-    function barfoo($a, $b) {
-        // Empty body means interface method in many cases.
-    }
-
-    function fooBar($a, $b) {
-        return;
-    }
-}
-
-function foo($bar)
-{
-    print <<<BAZ
-    $bar
-BAZ;
-}
-
-function foo( $parameter ) {
-    $wango = <<<HERE
-1 Must be a HEREdoc of at least one line
-HERE;
-    $x = $parameter; // This line must be immediately after the HERE; with no intervening blank lines.
-    $tango = <<<HERE
-1 Must be a HEREdoc
-2
-3
-4
-5
-6
-7
-8
-9 at least 9 lines long
-HERE;
-}
-
-function foo( $parameter ) {
-    return <<<HTML
-<?xml version="1.0"?>
-<value>$parameter</value>
-HTML;
-}
-
-print foo( 'PARAMETER' );
-print "\n";
-
-function foo($bar)
-{
-    print "${bar} things\n";
-}
-
-function bar($x)
-{
-    return 2 * ${x};
-}
-
-$foo = function ($a, $b) {
-    return $a * 2;
-};
-
-function foobar() {
-    return;
-}
-
-
-/*
- * The function signature of methods in extended classes and implemented
- * interfaces has to mirror the parent class/interface.
- * The overloaded method may not use all params.
- */
-
-class MyClass {
-    public function something($a, $b) {
-        return $a * 2;
-    }
-}
-
-class MyExtendedClass extends SomeClass {
-    public function something($a, $b) {
-        return $a * 2;
-    }
-}
-
-class MyExtendedClass implements SomeInterface {
-    public function something($a, $b) {
-        return $a * 2;
-    }
-}
-
-
-/*
- * Functions may not use all params passed to them.
- * Report different violations for params *before* and *after* the last param used.
- */
-
-function something($a) {
-    return 'foobar';
-}
-
-function myCallback($a, $b, $c, $d) {
-    return $a * $c;
-}
-
-fn ($a, $b, $c) => $b;
-
-// phpcs:set Generic.CodeAnalysis.UnusedFunctionParameter ignoreTypeHints Exception
-
-function oneParam(Exception $foo) {
-    return 'foobar';
-}
-
-function moreParamFirst(Exception $foo, LogicException $bar) {
-    return 'foobar' . $bar;
-}
-
-function moreParamSecond(LogicException $bar, Exception $foo) {
-    return 'foobar' . $bar;
-}
-// phpcs:set Generic.CodeAnalysis.UnusedFunctionParameter ignoreTypeHints
-
-class ConstructorPropertyPromotionNoContentInMethod {
-    public function __construct(protected int $id) {}
-}
-
-class ConstructorPropertyPromotionWithContentInMethod {
-    public function __construct(protected int $id, $toggle = true) {
-        if ($toggle === true) {
-            doSomething();
-        }
-    }
-}
-
-$found = in_array_cb($needle, $haystack, fn($array, $needle) => $array2 === $needle);
-
-
-/*
- * Don't adjust the error code for closures and arrow functions in extended classes/classes implementing interfaces.
- */
-class MyExtendedClass extends SomeClass {
-    public function something($a, $b) {
-        $c = $a + $b;
-        $closure = function ($c, $d) {
-            return $c * 2;
-        };
-    }
-}
-
-class MyExtendedClass implements SomeInterface {
-    public function something($a, $b) {
-        $c = $a + $b;
-        $fn = fn($c, $d) => $c2;
-    }
-}
-
-
-/**
- * Magic methods must match the function signature dictated by PHP.
- * Flagging unused parameters leads to notices which cannot be solved.
- */
-class MagicMethodsWithParams {
-    public function __set(string $name, mixed $value) {
-        // Forbid dynamic properties & overloading inaccessible properties.
-        throw new RuntimeException('Forbidden');
-    }
-
-    public function __get(string $name) {
-        throw new RuntimeException('Forbidden');
-    }
-
-    public function __isset(string $name) {
-        throw new RuntimeException('Forbidden');
-    }
-
-    public function __unset(string $name) {
-        throw new RuntimeException('Forbidden');
-    }
-
-    public function __unserialize( array $data ) {
-        // Prevent unserializing from a stored representation of the object for security reasons.
-        $this->instance = new self();
-    }
-
-    public static function __set_state(array $properties) {
-        return new self();
-    }
-
-    public function __call(string $name, array $arguments) {
-        if (method_exists($this, $name)) {
-            // None of the methods which can be called in this class take arguments, so not passing them.
-            return $this->$name();
-        }
-    }
-
-    public static function __callStatic(string $name, array $arguments) {
-        if (method_exists($this, $name)) {
-            // None of the methods which can be called in this class take arguments, so not passing them.
-            return self::$name();
-        }
-    }
-}
-
-/**
- * Unused parameters in magic methods which have flexible function signatures should still be flagged.
- */
-class MagicMethodsWithParamsNotDictatedByPHP {
-    public $foo;
-    public function __construct($foo, $bar, $baz) {
-        $this->foo = $foo;
-    }
-
-    public function __invoke($foo, $bar, $baz) {
-        $this->foo = $foo;
-    }
-}
-
-/**
- * Unused parameters in magic methods which have flexible function signatures
- * where the method potentially overloads a parent method should still be flagged,
- * but should use the `FoundInExtendedClassAfterLastUsed` error code.
- */
-class MagicMethodsWithParamsNotDictatedByPHPInChildClass extends SomeParent{
-    public $foo;
-    public function __construct($foo, $bar, $baz) {
-        $this->foo = $foo;
-    }
-
-    public function __invoke($foo, $bar, $baz) {
-        $this->foo = $foo;
-    }
-}

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

@@ -16,7 +16,7 @@
  *
  * @covers \PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis\UnusedFunctionParameterSniff
  */
-class UnusedFunctionParameterUnitTest extends AbstractSniffUnitTest
+final class UnusedFunctionParameterUnitTest extends AbstractSniffUnitTest
 {
 
 
@@ -41,27 +41,36 @@
      * The key of the array should represent the line number and the value
      * should represent the number of warnings that should occur on that line.
      *
+     * @param string $testFile The name of the file being tested.
+     *
      * @return array<int, int>
      */
-    public function getWarningList()
+    public function getWarningList($testFile='')
     {
-        return 
-            3   => 1,
-            7   => 1,
-            78  => 1,
-            94  => 1,
-            100 => 1,
-            106 => 1,
-            117 => 1,
-            121 => 2,
-            125 => 2,
-            163 => 1,
-            172 => 1,
-            228 => 2,
-            232 => 2,
-            244 => 2,
-            248 => 2,
-        ;
+        switch ($testFile) {
+        case 'UnusedFunctionParameterUnitTest.1.inc':
+            return 
+                3   => 1,
+                7   => 1,
+                78  => 1,
+                94  => 1,
+                100 => 1,
+                106 => 1,
+                117 => 1,
+                121 => 2,
+                125 => 2,
+                163 => 1,
+                172 => 1,
+                228 => 2,
+                232 => 2,
+                244 => 2,
+                248 => 2,
+                271 => 1,
+            ;
+
+        default:
+            return ;
+        }//end switch
 
     }//end getWarningList()

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

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Commenting/DocCommentUnitTest.1.inc Added

@@ -0,0 +1,270 @@
+<?php
+/**
+ * Short description.
+ *
+ * Long description
+ * over multiple lines.
+ *
+ * @tag1 one
+ * @tag2 two
+ * @tag3 three
+ */
+
+/**
+ * short description
+ *
+ * long description
+ * over multiple lines.
+ * @tag1 one
+ */
+
+/**
+ *
+ * Short description
+ *
+ *
+ * Long description
+ * over multiple lines
+ *
+ *
+ * @tag1 one
+ *
+ */
+
+/*
+    This is not a doc block.
+ */
+
+/** Short description.
+ *
+ * @tag one
+ * @tag2 two
+ * @tagThree three
+ * @tagFour  four
+ */
+
+/**
+ * Short description.
+ *
+ * @tag one
+ *
+ * @param
+ * @param
+ *
+ */
+
+/**
+ * Short description.
+ * @param
+ * @param
+ * @tag one
+ */
+
+/**
+ * Short description.
+ *
+ *
+ * @param
+ *
+ * @param
+ *
+ *
+ * @tag one
+ */
+
+/**
+ * Short description.
+ *
+ * @param
+ *
+ * @tag one
+ * @param
+ */
+
+/**
+ * Short description.
+ *
+ * @groupOne one
+ * @groupOne  two
+ *
+ * @group2 one
+ * @group2 two
+ *
+ *
+ * @g3
+ * @g3  two
+ */
+
+/**
+ * Short description
+ * over multiple lines.
+ *
+ * Long description.
+ *
+ * @param
+ *
+ * @tag one
+ */
+
+/**
+ * Short description.
+ *
+ * @tag1 one   some comment across
+ *             multiple lines
+ * @tag1 two   some comment across
+ *             multiple lines
+ * @tag1 three some comment across
+ *             multiple lines
+ */
+
+/**
+ * Returns true if the specified string is in the camel caps format.
+ *
+ * @param boolean $classFormat If true, check to see if the string is in the
+ *                             class format. Class format strings must start
+ *                             with a capital letter and contain no
+ *                             underscores.
+ * @param boolean $strict      If true, the string must not have two capital
+ *                             letters next to each other. If false, a
+ *                             relaxed camel caps policy is used to allow
+ *                             for acronyms.
+ *
+ * @return boolean
+ */
+
+/**
+ * Verifies that a @throws tag exists for a function that throws exceptions.
+ * Verifies the number of @throws tags and the number of throw tokens matches.
+ * Verifies the exception type.
+ *
+ * PHP version 5
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Greg Sherwood <gsherwood@squiz.net>
+ * @author    Marc McIntyre <mmcintyre@squiz.net>
+ * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+/**
+ * Comment
+ *
+ * @one
+ * @two
+ * @one
+ *
+ * @two   something
+ *        here
+ * @two   foo
+ * @three something
+ *        here
+ * @three bar
+ */
+
+/**
+ * @ var Comment
+ */
+
+/** @var Database $mockedDatabase */
+/** @var Container $mockedContainer */
+
+/**
+ * 这是一条测试评论.
+ */
+
+/**
+ * I'm a function short-description
+ * @return boolean
+ */
+
+/**
+ * this is a test
+ * @author test
+ * @param boolean $foo blah
+ * @return boolean
+ * @param boolean $bar Blah.
+ */
+
+/**
+ * Short description.
+ *
+ * @tag    one
+ * @param  int    $number
+ * @param  string $text
+ * @return something
+ */
+
+/**
+ *
+ * @param  int    $number
+ * @param  string $text
+ * @return something
+ */
+
+/**
+ * @param int $number
+ */
+
+/**
+ * étude des ...
+ */
+
+/**doc comment */
+
+        /**
+         * Document behaviour with missing blank lines with indented docblocks.
+         * @param
+         * @param
+         * @tag one
+         *
+         */
+
+        /** Indented doc comment */
+
+/**
+ * Verify and document sniff behaviour when the "tag value" is indented with a mix of tabs and spaces.
+ * The below is "correctly" aligned.
+ *
+ * @category  PHP
+ * @package	  PHP_CodeSniffer
+ * @author	  Greg Sherwood <gsherwood@squiz.net>
+ * @author	  Marc McIntyre <mmcintyre@squiz.net>
+ * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
+ * @license	  https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @link	  http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+/**
+ * Verify and document sniff behaviour when the "tag value" is indented with a mix of tabs and spaces.
+ * The below is incorrectly aligned.
+ *
+ * @category		PHP
+ * @package		  PHP_CodeSniffer
+ * @author	  Greg Sherwood <gsherwood@squiz.net>
+ * @author	Marc McIntyre <mmcintyre@squiz.net>
+ * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
+ * @license	  	https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @link		http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+/**
+ * Do something.
+ *
+ * @codeCoverageIgnore
+ *
+ * @phpcs:disable Stnd.Cat.SniffName
+ *
+ * @return void
+ */
+
+// Tests to check handling empty doc comments.
+/**
+ */
+
+/**
+		*
+ *
+   *
+ */

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Commenting/DocCommentUnitTest.1.inc.fixed Added

@@ -0,0 +1,275 @@
+<?php
+/**
+ * Short description.
+ *
+ * Long description
+ * over multiple lines.
+ *
+ * @tag1 one
+ * @tag2 two
+ * @tag3 three
+ */
+
+/**
+ * short description
+ *
+ * long description
+ * over multiple lines.
+ *
+ * @tag1 one
+ */
+
+/**
+ * Short description
+ *
+ * Long description
+ * over multiple lines
+ *
+ * @tag1 one
+ */
+
+/*
+    This is not a doc block.
+ */
+
+/**
+ * Short description.
+ *
+ * @tag      one
+ * @tag2     two
+ * @tagThree three
+ * @tagFour  four
+ */
+
+/**
+ * Short description.
+ *
+ * @tag one
+ *
+ * @param
+ * @param
+ */
+
+/**
+ * Short description.
+ *
+ * @param
+ * @param
+ * @tag   one
+ */
+
+/**
+ * Short description.
+ *
+ * @param
+ *
+ * @param
+ *
+ * @tag one
+ */
+
+/**
+ * Short description.
+ *
+ * @param
+ *
+ * @tag   one
+ * @param
+ */
+
+/**
+ * Short description.
+ *
+ * @groupOne one
+ * @groupOne two
+ *
+ * @group2 one
+ * @group2 two
+ *
+ * @g3
+ * @g3 two
+ */
+
+/**
+ * Short description
+ * over multiple lines.
+ *
+ * Long description.
+ *
+ * @param
+ *
+ * @tag one
+ */
+
+/**
+ * Short description.
+ *
+ * @tag1 one   some comment across
+ *             multiple lines
+ * @tag1 two   some comment across
+ *             multiple lines
+ * @tag1 three some comment across
+ *             multiple lines
+ */
+
+/**
+ * Returns true if the specified string is in the camel caps format.
+ *
+ * @param boolean $classFormat If true, check to see if the string is in the
+ *                             class format. Class format strings must start
+ *                             with a capital letter and contain no
+ *                             underscores.
+ * @param boolean $strict      If true, the string must not have two capital
+ *                             letters next to each other. If false, a
+ *                             relaxed camel caps policy is used to allow
+ *                             for acronyms.
+ *
+ * @return boolean
+ */
+
+/**
+ * Verifies that a @throws tag exists for a function that throws exceptions.
+ * Verifies the number of @throws tags and the number of throw tokens matches.
+ * Verifies the exception type.
+ *
+ * PHP version 5
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Greg Sherwood <gsherwood@squiz.net>
+ * @author    Marc McIntyre <mmcintyre@squiz.net>
+ * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+/**
+ * Comment
+ *
+ * @one
+ * @two
+ * @one
+ *
+ * @two   something
+ *        here
+ * @two   foo
+ * @three something
+ *        here
+ * @three bar
+ */
+
+/**
+ * @ var Comment
+ */
+
+/**
+ * @var Database $mockedDatabase 
+*/
+/**
+ * @var Container $mockedContainer 
+*/
+
+/**
+ * 这是一条测试评论.
+ */
+
+/**
+ * I'm a function short-description
+ *
+ * @return boolean
+ */
+
+/**
+ * this is a test
+ *
+ * @author test
+ * @param  boolean $foo blah
+ * @return boolean
+ * @param  boolean $bar Blah.
+ */
+
+/**
+ * Short description.
+ *
+ * @tag    one
+ * @param  int    $number
+ * @param  string $text
+ * @return something
+ */
+
+/**
+ *
+ * @param  int    $number
+ * @param  string $text
+ * @return something
+ */
+
+/**
+ * @param int $number
+ */
+
+/**
+ * étude des ...
+ */
+
+/**
+* doc comment 
+*/
+
+        /**
+         * Document behaviour with missing blank lines with indented docblocks.
+         *
+         * @param
+         * @param
+         * @tag   one
+         */
+
+        /**
+ * Indented doc comment 
+*/
+
+/**
+ * Verify and document sniff behaviour when the "tag value" is indented with a mix of tabs and spaces.
+ * The below is "correctly" aligned.
+ *
+ * @category  PHP
+ * @package	  PHP_CodeSniffer
+ * @author	  Greg Sherwood <gsherwood@squiz.net>
+ * @author	  Marc McIntyre <mmcintyre@squiz.net>
+ * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
+ * @license	  https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @link	  http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+/**
+ * Verify and document sniff behaviour when the "tag value" is indented with a mix of tabs and spaces.
+ * The below is incorrectly aligned.
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author	  Greg Sherwood <gsherwood@squiz.net>
+ * @author    Marc McIntyre <mmcintyre@squiz.net>
+ * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+/**
+ * Do something.
+ *
+ * @codeCoverageIgnore
+ *
+ * @phpcs:disable Stnd.Cat.SniffName
+ *
+ * @return void
+ */
+
+// Tests to check handling empty doc comments.
+/**
+ */
+
+/**
+		*
+ *
+   *
+ */

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Commenting/DocCommentUnitTest.1.js Added

@@ -0,0 +1,270 @@
+
+/**
+ * Short description.
+ *
+ * Long description
+ * over multiple lines.
+ *
+ * @tag1 one
+ * @tag2 two
+ * @tag3 three
+ */
+
+/**
+ * short description
+ *
+ * long description
+ * over multiple lines.
+ * @tag1 one
+ */
+
+/**
+ *
+ * Short description
+ *
+ *
+ * Long description
+ * over multiple lines
+ *
+ *
+ * @tag1 one
+ *
+ */
+
+/*
+    This is not a doc block.
+ */
+
+/** Short description.
+ *
+ * @tag one
+ * @tag2 two
+ * @tagThree three
+ * @tagFour  four
+ */
+
+/**
+ * Short description.
+ *
+ * @tag one
+ *
+ * @param
+ * @param
+ *
+ */
+
+/**
+ * Short description.
+ * @param
+ * @param
+ * @tag one
+ */
+
+/**
+ * Short description.
+ *
+ *
+ * @param
+ *
+ * @param
+ *
+ *
+ * @tag one
+ */
+
+ /**
+ * Short description.
+ *
+ * @param
+ *
+ * @tag one
+ * @param
+ */
+
+/**
+ * Short description.
+ *
+ * @groupOne one
+ * @groupOne  two
+ *
+ * @group2 one
+ * @group2 two
+ *
+ *
+ * @g3
+ * @g3  two
+ */
+
+ /**
+ * Short description
+ * over multiple lines.
+ *
+ * Long description.
+ *
+ * @param
+ *
+ * @tag one
+ */
+
+/**
+ * Short description.
+ *
+ * @tag1 one   some comment across
+ *             multiple lines
+ * @tag1 two   some comment across
+ *             multiple lines
+ * @tag1 three some comment across
+ *             multiple lines
+ */
+
+ /**
+ * Returns true if the specified string is in the camel caps format.
+ *
+ * @param boolean $classFormat If true, check to see if the string is in the
+ *                             class format. Class format strings must start
+ *                             with a capital letter and contain no
+ *                             underscores.
+ * @param boolean $strict      If true, the string must not have two capital
+ *                             letters next to each other. If false, a
+ *                             relaxed camel caps policy is used to allow
+ *                             for acronyms.
+ *
+ * @return boolean
+ */
+
+ /**
+ * Verifies that a @throws tag exists for a function that throws exceptions.
+ * Verifies the number of @throws tags and the number of throw tokens matches.
+ * Verifies the exception type.
+ *
+ * PHP version 5
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Greg Sherwood <gsherwood@squiz.net>
+ * @author    Marc McIntyre <mmcintyre@squiz.net>
+ * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+ /**
+ * Comment
+ *
+ * @one
+ * @two
+ * @one
+ *
+ * @two   something
+ *        here
+ * @two   foo
+ * @three something
+ *        here
+ * @three bar
+ */
+
+ /**
+ * @ var Comment
+ */
+
+/** @var Database $mockedDatabase */
+/** @var Container $mockedContainer */
+
+/**
+ * 这是一条测试评论.
+ */
+
+/**
+ * I'm a function short-description
+ * @return boolean
+ */
+
+/**
+ * this is a test
+ * @author test
+ * @param boolean $foo blah
+ * @return boolean
+ * @param boolean $bar Blah.
+ */
+
+/**
+ * Short description.
+ *
+ * @tag    one
+ * @param  int    $number
+ * @param  string $text
+ * @return something
+ */
+
+/**
+ *
+ * @param  int    $number
+ * @param  string $text
+ * @return something
+ */
+
+/**
+ * @param int $number
+ */
+
+/**
+ * étude des ...
+ */
+
+/**doc comment */
+
+        /**
+         * Document behaviour with missing blank lines with indented docblocks.
+         * @param
+         * @param
+         * @tag one
+         *
+         */
+
+        /** Indented doc comment */
+
+/**
+ * Verify and document sniff behaviour when the "tag value" is indented with a mix of tabs and spaces.
+ * The below is "correctly" aligned.
+ *
+ * @category  PHP
+ * @package	  PHP_CodeSniffer
+ * @author	  Greg Sherwood <gsherwood@squiz.net>
+ * @author	  Marc McIntyre <mmcintyre@squiz.net>
+ * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
+ * @license	  https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @link	  http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+/**
+ * Verify and document sniff behaviour when the "tag value" is indented with a mix of tabs and spaces.
+ * The below is incorrectly aligned.
+ *
+ * @category		PHP
+ * @package		  PHP_CodeSniffer
+ * @author	  Greg Sherwood <gsherwood@squiz.net>
+ * @author	Marc McIntyre <mmcintyre@squiz.net>
+ * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
+ * @license	  	https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @link		http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+/**
+ * Do something.
+ *
+ * @codeCoverageIgnore
+ *
+ * @phpcs:disable Stnd.Cat.SniffName
+ *
+ * @return void
+ */
+
+// Tests to check handling empty doc comments.
+/**
+ */
+
+/**
+		*
+ *
+   *
+ */

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Commenting/DocCommentUnitTest.1.js.fixed Added

@@ -0,0 +1,275 @@
+
+/**
+ * Short description.
+ *
+ * Long description
+ * over multiple lines.
+ *
+ * @tag1 one
+ * @tag2 two
+ * @tag3 three
+ */
+
+/**
+ * short description
+ *
+ * long description
+ * over multiple lines.
+ *
+ * @tag1 one
+ */
+
+/**
+ * Short description
+ *
+ * Long description
+ * over multiple lines
+ *
+ * @tag1 one
+ */
+
+/*
+    This is not a doc block.
+ */
+
+/**
+ * Short description.
+ *
+ * @tag      one
+ * @tag2     two
+ * @tagThree three
+ * @tagFour  four
+ */
+
+/**
+ * Short description.
+ *
+ * @tag one
+ *
+ * @param
+ * @param
+ */
+
+/**
+ * Short description.
+ *
+ * @param
+ * @param
+ * @tag   one
+ */
+
+/**
+ * Short description.
+ *
+ * @param
+ *
+ * @param
+ *
+ * @tag one
+ */
+
+ /**
+ * Short description.
+ *
+ * @param
+ *
+ * @tag   one
+ * @param
+ */
+
+/**
+ * Short description.
+ *
+ * @groupOne one
+ * @groupOne two
+ *
+ * @group2 one
+ * @group2 two
+ *
+ * @g3
+ * @g3 two
+ */
+
+ /**
+ * Short description
+ * over multiple lines.
+ *
+ * Long description.
+ *
+ * @param
+ *
+ * @tag one
+ */
+
+/**
+ * Short description.
+ *
+ * @tag1 one   some comment across
+ *             multiple lines
+ * @tag1 two   some comment across
+ *             multiple lines
+ * @tag1 three some comment across
+ *             multiple lines
+ */
+
+ /**
+ * Returns true if the specified string is in the camel caps format.
+ *
+ * @param boolean $classFormat If true, check to see if the string is in the
+ *                             class format. Class format strings must start
+ *                             with a capital letter and contain no
+ *                             underscores.
+ * @param boolean $strict      If true, the string must not have two capital
+ *                             letters next to each other. If false, a
+ *                             relaxed camel caps policy is used to allow
+ *                             for acronyms.
+ *
+ * @return boolean
+ */
+
+ /**
+ * Verifies that a @throws tag exists for a function that throws exceptions.
+ * Verifies the number of @throws tags and the number of throw tokens matches.
+ * Verifies the exception type.
+ *
+ * PHP version 5
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Greg Sherwood <gsherwood@squiz.net>
+ * @author    Marc McIntyre <mmcintyre@squiz.net>
+ * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+ /**
+ * Comment
+ *
+ * @one
+ * @two
+ * @one
+ *
+ * @two   something
+ *        here
+ * @two   foo
+ * @three something
+ *        here
+ * @three bar
+ */
+
+ /**
+ * @ var Comment
+ */
+
+/**
+ * @var Database $mockedDatabase 
+*/
+/**
+ * @var Container $mockedContainer 
+*/
+
+/**
+ * 这是一条测试评论.
+ */
+
+/**
+ * I'm a function short-description
+ *
+ * @return boolean
+ */
+
+/**
+ * this is a test
+ *
+ * @author test
+ * @param  boolean $foo blah
+ * @return boolean
+ * @param  boolean $bar Blah.
+ */
+
+/**
+ * Short description.
+ *
+ * @tag    one
+ * @param  int    $number
+ * @param  string $text
+ * @return something
+ */
+
+/**
+ *
+ * @param  int    $number
+ * @param  string $text
+ * @return something
+ */
+
+/**
+ * @param int $number
+ */
+
+/**
+ * étude des ...
+ */
+
+/**
+* doc comment 
+*/
+
+        /**
+         * Document behaviour with missing blank lines with indented docblocks.
+         *
+         * @param
+         * @param
+         * @tag   one
+         */
+
+        /**
+ * Indented doc comment 
+*/
+
+/**
+ * Verify and document sniff behaviour when the "tag value" is indented with a mix of tabs and spaces.
+ * The below is "correctly" aligned.
+ *
+ * @category  PHP
+ * @package	  PHP_CodeSniffer
+ * @author	  Greg Sherwood <gsherwood@squiz.net>
+ * @author	  Marc McIntyre <mmcintyre@squiz.net>
+ * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
+ * @license	  https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @link	  http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+/**
+ * Verify and document sniff behaviour when the "tag value" is indented with a mix of tabs and spaces.
+ * The below is incorrectly aligned.
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author	  Greg Sherwood <gsherwood@squiz.net>
+ * @author    Marc McIntyre <mmcintyre@squiz.net>
+ * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+/**
+ * Do something.
+ *
+ * @codeCoverageIgnore
+ *
+ * @phpcs:disable Stnd.Cat.SniffName
+ *
+ * @return void
+ */
+
+// Tests to check handling empty doc comments.
+/**
+ */
+
+/**
+		*
+ *
+   *
+ */

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Commenting/DocCommentUnitTest.2.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Commenting/DocCommentUnitTest.2.js Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Commenting/DocCommentUnitTest.inc Deleted

@@ -1,262 +0,0 @@
-<?php
-/**
- * Short description.
- *
- * Long description
- * over multiple lines.
- *
- * @tag1 one
- * @tag2 two
- * @tag3 three
- */
-
-/**
- * short description
- *
- * long description
- * over multiple lines.
- * @tag1 one
- */
-
-/**
- *
- * Short description
- *
- *
- * Long description
- * over multiple lines
- *
- *
- * @tag1 one
- *
- */
-
-/*
-    This is not a doc block.
- */
-
-/** Short description.
- *
- * @tag one
- * @tag2 two
- * @tagThree three
- * @tagFour  four
- */
-
-/**
- * Short description.
- *
- * @tag one
- *
- * @param
- * @param
- *
- */
-
-/**
- * Short description.
- * @param
- * @param
- * @tag one
- */
-
-/**
- * Short description.
- *
- *
- * @param
- *
- * @param
- *
- *
- * @tag one
- */
-
-/**
- * Short description.
- *
- * @param
- *
- * @tag one
- * @param
- */
-
-/**
- * Short description.
- *
- * @groupOne one
- * @groupOne  two
- *
- * @group2 one
- * @group2 two
- *
- *
- * @g3
- * @g3  two
- */
-
-/**
- * Short description
- * over multiple lines.
- *
- * Long description.
- *
- * @param
- *
- * @tag one
- */
-
-/**
- * Short description.
- *
- * @tag1 one   some comment across
- *             multiple lines
- * @tag1 two   some comment across
- *             multiple lines
- * @tag1 three some comment across
- *             multiple lines
- */
-
-/**
- * Returns true if the specified string is in the camel caps format.
- *
- * @param boolean $classFormat If true, check to see if the string is in the
- *                             class format. Class format strings must start
- *                             with a capital letter and contain no
- *                             underscores.
- * @param boolean $strict      If true, the string must not have two capital
- *                             letters next to each other. If false, a
- *                             relaxed camel caps policy is used to allow
- *                             for acronyms.
- *
- * @return boolean
- */
-
-/**
- * Verifies that a @throws tag exists for a function that throws exceptions.
- * Verifies the number of @throws tags and the number of throw tokens matches.
- * Verifies the exception type.
- *
- * PHP version 5
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Greg Sherwood <gsherwood@squiz.net>
- * @author    Marc McIntyre <mmcintyre@squiz.net>
- * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-/**
- * Comment
- *
- * @one
- * @two
- * @one
- *
- * @two   something
- *        here
- * @two   foo
- * @three something
- *        here
- * @three bar
- */
-
-/**
- * @ var Comment
- */
-
-/** @var Database $mockedDatabase */
-/** @var Container $mockedContainer */
-
-/**
- * 这是一条测试评论.
- */
-
-/**
- * I'm a function short-description
- * @return boolean
- */
-
-/**
- * this is a test
- * @author test
- * @param boolean $foo blah
- * @return boolean
- * @param boolean $bar Blah.
- */
-
-/**
- * Short description.
- *
- * @tag    one
- * @param  int    $number
- * @param  string $text
- * @return something
- */
-
-/**
- *
- * @param  int    $number
- * @param  string $text
- * @return something
- */
-
-/**
- * @param int $number
- */
-
-/**
- * étude des ...
- */
-
-/**doc comment */
-
-        /**
-         * Document behaviour with missing blank lines with indented docblocks.
-         * @param
-         * @param
-         * @tag one
-         *
-         */
-
-        /** Indented doc comment */
-
-/**
- * Verify and document sniff behaviour when the "tag value" is indented with a mix of tabs and spaces.
- * The below is "correctly" aligned.
- *
- * @category  PHP
- * @package	  PHP_CodeSniffer
- * @author	  Greg Sherwood <gsherwood@squiz.net>
- * @author	  Marc McIntyre <mmcintyre@squiz.net>
- * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license	  https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- * @link	  http://pear.php.net/package/PHP_CodeSniffer
- */
-
-/**
- * Verify and document sniff behaviour when the "tag value" is indented with a mix of tabs and spaces.
- * The below is incorrectly aligned.
- *
- * @category		PHP
- * @package		  PHP_CodeSniffer
- * @author	  Greg Sherwood <gsherwood@squiz.net>
- * @author	Marc McIntyre <mmcintyre@squiz.net>
- * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license	  	https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- * @link		http://pear.php.net/package/PHP_CodeSniffer
- */
-
-/**
- * Do something.
- *
- * @codeCoverageIgnore
- *
- * @phpcs:disable Stnd.Cat.SniffName
- *
- * @return void
- */
-
-/** No docblock close tag. Must be last test without new line.
\ No newline at end of file

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Commenting/DocCommentUnitTest.inc.fixed Deleted

@@ -1,267 +0,0 @@
-<?php
-/**
- * Short description.
- *
- * Long description
- * over multiple lines.
- *
- * @tag1 one
- * @tag2 two
- * @tag3 three
- */
-
-/**
- * short description
- *
- * long description
- * over multiple lines.
- *
- * @tag1 one
- */
-
-/**
- * Short description
- *
- * Long description
- * over multiple lines
- *
- * @tag1 one
- */
-
-/*
-    This is not a doc block.
- */
-
-/**
- * Short description.
- *
- * @tag      one
- * @tag2     two
- * @tagThree three
- * @tagFour  four
- */
-
-/**
- * Short description.
- *
- * @tag one
- *
- * @param
- * @param
- */
-
-/**
- * Short description.
- *
- * @param
- * @param
- * @tag   one
- */
-
-/**
- * Short description.
- *
- * @param
- *
- * @param
- *
- * @tag one
- */
-
-/**
- * Short description.
- *
- * @param
- *
- * @tag   one
- * @param
- */
-
-/**
- * Short description.
- *
- * @groupOne one
- * @groupOne two
- *
- * @group2 one
- * @group2 two
- *
- * @g3
- * @g3 two
- */
-
-/**
- * Short description
- * over multiple lines.
- *
- * Long description.
- *
- * @param
- *
- * @tag one
- */
-
-/**
- * Short description.
- *
- * @tag1 one   some comment across
- *             multiple lines
- * @tag1 two   some comment across
- *             multiple lines
- * @tag1 three some comment across
- *             multiple lines
- */
-
-/**
- * Returns true if the specified string is in the camel caps format.
- *
- * @param boolean $classFormat If true, check to see if the string is in the
- *                             class format. Class format strings must start
- *                             with a capital letter and contain no
- *                             underscores.
- * @param boolean $strict      If true, the string must not have two capital
- *                             letters next to each other. If false, a
- *                             relaxed camel caps policy is used to allow
- *                             for acronyms.
- *
- * @return boolean
- */
-
-/**
- * Verifies that a @throws tag exists for a function that throws exceptions.
- * Verifies the number of @throws tags and the number of throw tokens matches.
- * Verifies the exception type.
- *
- * PHP version 5
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Greg Sherwood <gsherwood@squiz.net>
- * @author    Marc McIntyre <mmcintyre@squiz.net>
- * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-/**
- * Comment
- *
- * @one
- * @two
- * @one
- *
- * @two   something
- *        here
- * @two   foo
- * @three something
- *        here
- * @three bar
- */
-
-/**
- * @ var Comment
- */
-
-/**
- * @var Database $mockedDatabase 
-*/
-/**
- * @var Container $mockedContainer 
-*/
-
-/**
- * 这是一条测试评论.
- */
-
-/**
- * I'm a function short-description
- *
- * @return boolean
- */
-
-/**
- * this is a test
- *
- * @author test
- * @param  boolean $foo blah
- * @return boolean
- * @param  boolean $bar Blah.
- */
-
-/**
- * Short description.
- *
- * @tag    one
- * @param  int    $number
- * @param  string $text
- * @return something
- */
-
-/**
- *
- * @param  int    $number
- * @param  string $text
- * @return something
- */
-
-/**
- * @param int $number
- */
-
-/**
- * étude des ...
- */
-
-/**
-* doc comment 
-*/
-
-        /**
-         * Document behaviour with missing blank lines with indented docblocks.
-         *
-         * @param
-         * @param
-         * @tag   one
-         */
-
-        /**
- * Indented doc comment 
-*/
-
-/**
- * Verify and document sniff behaviour when the "tag value" is indented with a mix of tabs and spaces.
- * The below is "correctly" aligned.
- *
- * @category  PHP
- * @package	  PHP_CodeSniffer
- * @author	  Greg Sherwood <gsherwood@squiz.net>
- * @author	  Marc McIntyre <mmcintyre@squiz.net>
- * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license	  https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- * @link	  http://pear.php.net/package/PHP_CodeSniffer
- */
-
-/**
- * Verify and document sniff behaviour when the "tag value" is indented with a mix of tabs and spaces.
- * The below is incorrectly aligned.
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author	  Greg Sherwood <gsherwood@squiz.net>
- * @author    Marc McIntyre <mmcintyre@squiz.net>
- * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
-/**
- * Do something.
- *
- * @codeCoverageIgnore
- *
- * @phpcs:disable Stnd.Cat.SniffName
- *
- * @return void
- */
-
-/** No docblock close tag. Must be last test without new line.
\ No newline at end of file

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Commenting/DocCommentUnitTest.js Deleted

@@ -1,250 +0,0 @@
-
-/**
- * Short description.
- *
- * Long description
- * over multiple lines.
- *
- * @tag1 one
- * @tag2 two
- * @tag3 three
- */
-
-/**
- * short description
- *
- * long description
- * over multiple lines.
- * @tag1 one
- */
-
-/**
- *
- * Short description
- *
- *
- * Long description
- * over multiple lines
- *
- *
- * @tag1 one
- *
- */
-
-/*
-    This is not a doc block.
- */
-
-/** Short description.
- *
- * @tag one
- * @tag2 two
- * @tagThree three
- * @tagFour  four
- */
-
-/**
- * Short description.
- *
- * @tag one
- *
- * @param
- * @param
- *
- */
-
-/**
- * Short description.
- * @param
- * @param
- * @tag one
- */
-
-/**
- * Short description.
- *
- *
- * @param
- *
- * @param
- *
- *
- * @tag one
- */
-
- /**
- * Short description.
- *
- * @param
- *
- * @tag one
- * @param
- */
-
-/**
- * Short description.
- *
- * @groupOne one
- * @groupOne  two
- *
- * @group2 one
- * @group2 two
- *
- *
- * @g3
- * @g3  two
- */
-
- /**
- * Short description
- * over multiple lines.
- *
- * Long description.
- *
- * @param
- *
- * @tag one
- */
-
-/**
- * Short description.
- *
- * @tag1 one   some comment across
- *             multiple lines
- * @tag1 two   some comment across
- *             multiple lines
- * @tag1 three some comment across
- *             multiple lines
- */
-
- /**
- * Returns true if the specified string is in the camel caps format.
- *
- * @param boolean $classFormat If true, check to see if the string is in the
- *                             class format. Class format strings must start
- *                             with a capital letter and contain no
- *                             underscores.
- * @param boolean $strict      If true, the string must not have two capital
- *                             letters next to each other. If false, a
- *                             relaxed camel caps policy is used to allow
- *                             for acronyms.
- *
- * @return boolean
- */
-
- /**
- * Verifies that a @throws tag exists for a function that throws exceptions.
- * Verifies the number of @throws tags and the number of throw tokens matches.
- * Verifies the exception type.
- *
- * PHP version 5
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Greg Sherwood <gsherwood@squiz.net>
- * @author    Marc McIntyre <mmcintyre@squiz.net>
- * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
- /**
- * Comment
- *
- * @one
- * @two
- * @one
- *
- * @two   something
- *        here
- * @two   foo
- * @three something
- *        here
- * @three bar
- */
-
- /**
- * @ var Comment
- */
-
-/** @var Database $mockedDatabase */
-/** @var Container $mockedContainer */
-
-/**
- * 这是一条测试评论.
- */
-
-/**
- * I'm a function short-description
- * @return boolean
- */
-
-/**
- * this is a test
- * @author test
- * @param boolean $foo blah
- * @return boolean
- * @param boolean $bar Blah.
- */
-
-/**
- * Short description.
- *
- * @tag    one
- * @param  int    $number
- * @param  string $text
- * @return something
- */
-
-/**
- *
- * @param  int    $number
- * @param  string $text
- * @return something
- */
-
-/**
- * @param int $number
- */
-
-/**
- * étude des ...
- */
-
-/**doc comment */
-
-        /**
-         * Document behaviour with missing blank lines with indented docblocks.
-         * @param
-         * @param
-         * @tag one
-         *
-         */
-
-        /** Indented doc comment */
-
-/**
- * Verify and document sniff behaviour when the "tag value" is indented with a mix of tabs and spaces.
- * The below is "correctly" aligned.
- *
- * @category  PHP
- * @package	  PHP_CodeSniffer
- * @author	  Greg Sherwood <gsherwood@squiz.net>
- * @author	  Marc McIntyre <mmcintyre@squiz.net>
- * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license	  https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- * @link	  http://pear.php.net/package/PHP_CodeSniffer
- */
-
-/**
- * Verify and document sniff behaviour when the "tag value" is indented with a mix of tabs and spaces.
- * The below is incorrectly aligned.
- *
- * @category		PHP
- * @package		  PHP_CodeSniffer
- * @author	  Greg Sherwood <gsherwood@squiz.net>
- * @author	Marc McIntyre <mmcintyre@squiz.net>
- * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license	  	https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- * @link		http://pear.php.net/package/PHP_CodeSniffer
- */

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Commenting/DocCommentUnitTest.js.fixed Deleted

@@ -1,255 +0,0 @@
-
-/**
- * Short description.
- *
- * Long description
- * over multiple lines.
- *
- * @tag1 one
- * @tag2 two
- * @tag3 three
- */
-
-/**
- * short description
- *
- * long description
- * over multiple lines.
- *
- * @tag1 one
- */
-
-/**
- * Short description
- *
- * Long description
- * over multiple lines
- *
- * @tag1 one
- */
-
-/*
-    This is not a doc block.
- */
-
-/**
- * Short description.
- *
- * @tag      one
- * @tag2     two
- * @tagThree three
- * @tagFour  four
- */
-
-/**
- * Short description.
- *
- * @tag one
- *
- * @param
- * @param
- */
-
-/**
- * Short description.
- *
- * @param
- * @param
- * @tag   one
- */
-
-/**
- * Short description.
- *
- * @param
- *
- * @param
- *
- * @tag one
- */
-
- /**
- * Short description.
- *
- * @param
- *
- * @tag   one
- * @param
- */
-
-/**
- * Short description.
- *
- * @groupOne one
- * @groupOne two
- *
- * @group2 one
- * @group2 two
- *
- * @g3
- * @g3 two
- */
-
- /**
- * Short description
- * over multiple lines.
- *
- * Long description.
- *
- * @param
- *
- * @tag one
- */
-
-/**
- * Short description.
- *
- * @tag1 one   some comment across
- *             multiple lines
- * @tag1 two   some comment across
- *             multiple lines
- * @tag1 three some comment across
- *             multiple lines
- */
-
- /**
- * Returns true if the specified string is in the camel caps format.
- *
- * @param boolean $classFormat If true, check to see if the string is in the
- *                             class format. Class format strings must start
- *                             with a capital letter and contain no
- *                             underscores.
- * @param boolean $strict      If true, the string must not have two capital
- *                             letters next to each other. If false, a
- *                             relaxed camel caps policy is used to allow
- *                             for acronyms.
- *
- * @return boolean
- */
-
- /**
- * Verifies that a @throws tag exists for a function that throws exceptions.
- * Verifies the number of @throws tags and the number of throw tokens matches.
- * Verifies the exception type.
- *
- * PHP version 5
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Greg Sherwood <gsherwood@squiz.net>
- * @author    Marc McIntyre <mmcintyre@squiz.net>
- * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */
-
- /**
- * Comment
- *
- * @one
- * @two
- * @one
- *
- * @two   something
- *        here
- * @two   foo
- * @three something
- *        here
- * @three bar
- */
-
- /**
- * @ var Comment
- */
-
-/**
- * @var Database $mockedDatabase 
-*/
-/**
- * @var Container $mockedContainer 
-*/
-
-/**
- * 这是一条测试评论.
- */
-
-/**
- * I'm a function short-description
- *
- * @return boolean
- */
-
-/**
- * this is a test
- *
- * @author test
- * @param  boolean $foo blah
- * @return boolean
- * @param  boolean $bar Blah.
- */
-
-/**
- * Short description.
- *
- * @tag    one
- * @param  int    $number
- * @param  string $text
- * @return something
- */
-
-/**
- *
- * @param  int    $number
- * @param  string $text
- * @return something
- */
-
-/**
- * @param int $number
- */
-
-/**
- * étude des ...
- */
-
-/**
-* doc comment 
-*/
-
-        /**
-         * Document behaviour with missing blank lines with indented docblocks.
-         *
-         * @param
-         * @param
-         * @tag   one
-         */
-
-        /**
- * Indented doc comment 
-*/
-
-/**
- * Verify and document sniff behaviour when the "tag value" is indented with a mix of tabs and spaces.
- * The below is "correctly" aligned.
- *
- * @category  PHP
- * @package	  PHP_CodeSniffer
- * @author	  Greg Sherwood <gsherwood@squiz.net>
- * @author	  Marc McIntyre <mmcintyre@squiz.net>
- * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license	  https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- * @link	  http://pear.php.net/package/PHP_CodeSniffer
- */
-
-/**
- * Verify and document sniff behaviour when the "tag value" is indented with a mix of tabs and spaces.
- * The below is incorrectly aligned.
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author	  Greg Sherwood <gsherwood@squiz.net>
- * @author    Marc McIntyre <mmcintyre@squiz.net>
- * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- */

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

@@ -16,7 +16,7 @@
  *
  * @covers \PHP_CodeSniffer\Standards\Generic\Sniffs\Commenting\DocCommentSniff
  */
-class DocCommentUnitTest extends AbstractSniffUnitTest
+final class DocCommentUnitTest extends AbstractSniffUnitTest
 {
 
 
@@ -41,59 +41,70 @@
      * The key of the array should represent the line number and the value
      * should represent the number of errors that should occur on that line.
      *
+     * @param string $testFile The name of the file being tested.
+     *
      * @return array(int => int)
      */
-    public function getErrorList()
+    public function getErrorList($testFile='')
     {
-        return 
-            14  => 1,
-            16  => 1,
-            18  => 1,
-            23  => 1,
-            26  => 1,
-            30  => 1,
-            32  => 1,
-            38  => 2,
-            40  => 1,
-            41  => 1,
-            51  => 1,
-            54  => 1,
-            58  => 1,
-            60  => 2,
-            67  => 1,
-            69  => 2,
-            80  => 1,
-            81  => 2,
-            88  => 1,
-            91  => 1,
-            95  => 1,
-            156 => 1,
-            158 => 1,
-            170 => 3,
-            171 => 3,
-            179 => 1,
-            183 => 1,
-            184 => 2,
-            185 => 1,
-            186 => 1,
-            187 => 2,
-            193 => 1,
-            196 => 1,
-            199 => 1,
-            203 => 1,
-            206 => 1,
-            211 => 1,
-            214 => 4,
-            218 => 1,
-            220 => 2,
-            222 => 1,
-            224 => 3,
-            243 => 1,
-            244 => 1,
-            246 => 1,
-            248 => 1,
-            249 => 1,
-        ;
+        switch ($testFile) {
+        case 'DocCommentUnitTest.1.inc':
+        case 'DocCommentUnitTest.1.js':
+            return 
+                14  => 1,
+                16  => 1,
+                18  => 1,
+                23  => 1,
+                26  => 1,
+                30  => 1,
+                32  => 1,
+                38  => 2,
+                40  => 1,
+                41  => 1,
+                51  => 1,
+                54  => 1,
+                58  => 1,
+                60  => 2,
+                67  => 1,
+                69  => 2,
+                80  => 1,
+                81  => 2,
+                88  => 1,
+                91  => 1,
+                95  => 1,
+                156 => 1,
+                158 => 1,
+                170 => 3,
+                171 => 3,
+                179 => 1,
+                183 => 1,
+                184 => 2,
+                185 => 1,
+                186 => 1,
+                187 => 2,
+                193 => 1,
+                196 => 1,
+                199 => 1,
+                203 => 1,
+                206 => 1,
+                211 => 1,
+                214 => 4,
+                218 => 1,
+                220 => 2,
+                222 => 1,
+                224 => 3,
+                243 => 1,
+                244 => 1,
+                246 => 1,
+                248 => 1,
+                249 => 1,
+                263 => 1,
+                266 => 1,
+            ;
+
+        default:
+            return ;
+        }//end switch
 
     }//end getErrorList()

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

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

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

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

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

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

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

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

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.1.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.2.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.3.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.4.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.5.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.inc Deleted

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

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

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

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

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Files/InlineHTMLUnitTest.6.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Files/InlineHTMLUnitTest.7.inc Changed

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.php 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/Generic/Tests/PHP/LowerCaseTypeUnitTest.inc Changed

@@ -95,6 +95,36 @@
 
 $cl = function (False $a, TRUE $b, Null $c): ?True {};
 
+class TypedClassConstants
+{
+    const UNTYPED = null;
+    const FLOAT = 'Reserved keyword as name is valid and should not be changed';
+    const OBJECT = 'Reserved keyword as name is valid and should not be changed';
+
+    const ClassName FIRST = null;
+    public const Int SECOND = 0;
+    private const ?BOOL THIRD = false;
+    public const Self FOURTH = null;
+}
+interface TypedInterfaceConstants
+{
+    protected const PaRenT FIRST = null;
+    private const ARRAY SECOND = ;
+    public const Float THIRD = 2.5;
+    final const ?STRING FOURTH = 'fourth';
+}
+trait TypedTraitConstants {
+    const IterablE FIRST = null;
+    const Object SECOND = null;
+    const Mixed THIRD = 'third';
+}
+enum TypedEnumConstants {
+    public const Iterable|FALSE|NULL FIRST = null;
+    protected const SELF|Parent /* comment */ |\Fully\Qualified\ClassName|UnQualifiedClass SECOND = null;
+    private const ClassName|/*comment*/Float|STRING|False THIRD = 'third';
+    public const sTRing | aRRaY | FaLSe FOURTH = 'fourth';
+}
+
 // Intentional error, should be ignored by the sniff.
 interface PropertiesNotAllowed {
     public $notAllowed;

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

@@ -95,6 +95,36 @@
 
 $cl = function (false $a, true $b, null $c): ?true {};
 
+class TypedClassConstants
+{
+    const UNTYPED = null;
+    const FLOAT = 'Reserved keyword as name is valid and should not be changed';
+    const OBJECT = 'Reserved keyword as name is valid and should not be changed';
+
+    const ClassName FIRST = null;
+    public const int SECOND = 0;
+    private const ?bool THIRD = false;
+    public const self FOURTH = null;
+}
+interface TypedInterfaceConstants
+{
+    protected const parent FIRST = null;
+    private const array SECOND = ;
+    public const float THIRD = 2.5;
+    final const ?string FOURTH = 'fourth';
+}
+trait TypedTraitConstants {
+    const iterable FIRST = null;
+    const object SECOND = null;
+    const mixed THIRD = 'third';
+}
+enum TypedEnumConstants {
+    public const iterable|false|null FIRST = null;
+    protected const self|parent /* comment */ |\Fully\Qualified\ClassName|UnQualifiedClass SECOND = null;
+    private const ClassName|/*comment*/float|string|false THIRD = 'third';
+    public const string | array | false FOURTH = 'fourth';
+}
+
 // Intentional error, should be ignored by the sniff.
 interface PropertiesNotAllowed {
     public $notAllowed;

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

@@ -16,7 +16,7 @@
  *
  * @covers \PHP_CodeSniffer\Standards\Generic\Sniffs\PHP\LowerCaseTypeSniff
  */
-class LowerCaseTypeUnitTest extends AbstractSniffUnitTest
+final class LowerCaseTypeUnitTest extends AbstractSniffUnitTest
 {
 
 
@@ -31,48 +31,62 @@
     public function getErrorList()
     {
         return 
-            14 => 1,
-            15 => 1,
-            16 => 1,
-            17 => 1,
-            18 => 1,
-            21 => 4,
-            22 => 3,
-            23 => 3,
-            25 => 1,
-            26 => 2,
-            27 => 2,
-            32 => 4,
-            36 => 1,
-            37 => 1,
-            38 => 1,
-            39 => 1,
-            43 => 2,
-            44 => 1,
-            46 => 1,
-            49 => 1,
-            51 => 2,
-            53 => 1,
-            55 => 2,
-            60 => 1,
-            61 => 1,
-            62 => 1,
-            63 => 1,
-            64 => 1,
-            65 => 1,
-            66 => 1,
-            67 => 1,
-            68 => 1,
-            69 => 1,
-            71 => 3,
-            72 => 2,
-            73 => 3,
-            74 => 3,
-            78 => 3,
-            82 => 2,
-            85 => 1,
-            94 => 5,
-            96 => 4,
+            14  => 1,
+            15  => 1,
+            16  => 1,
+            17  => 1,
+            18  => 1,
+            21  => 4,
+            22  => 3,
+            23  => 3,
+            25  => 1,
+            26  => 2,
+            27  => 2,
+            32  => 4,
+            36  => 1,
+            37  => 1,
+            38  => 1,
+            39  => 1,
+            43  => 2,
+            44  => 1,
+            46  => 1,
+            49  => 1,
+            51  => 2,
+            53  => 1,
+            55  => 2,
+            60  => 1,
+            61  => 1,
+            62  => 1,
+            63  => 1,
+            64  => 1,
+            65  => 1,
+            66  => 1,
+            67  => 1,
+            68  => 1,
+            69  => 1,
+            71  => 3,
+            72  => 2,
+            73  => 3,
+            74  => 3,
+            78  => 3,
+            82  => 2,
+            85  => 1,
+            94  => 5,
+            96  => 4,
+            105 => 1,
+            106 => 1,
+            107 => 1,
+            111 => 1,
+            112 => 1,
+            113 => 1,
+            114 => 1,
+            117 => 1,
+            118 => 1,
+            119 => 1,
+            122 => 3,
+            123 => 2,
+            124 => 3,
+            125 => 3,
         ;
 
     }//end getErrorList()
@@ -89,7 +103,7 @@
     public function getWarningList()
     {
         // Warning from getMemberProperties() about parse error.
-        return 100 => 1;
+        return 130 => 1;
 
     }//end getWarningList()

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/LanguageConstructSpacingUnitTest.php 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/Standards/Generic/Tests/WhiteSpace/SpreadOperatorSpacingAfterUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Sniffs/CSS/BrowserSpecificStylesSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Sniffs/Channels/DisallowSelfActionsSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Sniffs/Channels/IncludeOwnSystemSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Sniffs/Channels/IncludeSystemSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Sniffs/Channels/UnusedSystemSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Sniffs/Commenting/FunctionCommentSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Sniffs/Debug/DebugCodeSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Sniffs/Debug/FirebugConsoleSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Sniffs/Objects/AssignThisSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Sniffs/Objects/CreateWidgetTypeCallbackSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Sniffs/Objects/DisallowNewWidgetSniff.php Changed

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

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

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

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

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Sniffs/Strings/JoinStringsSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Tests/CSS/BrowserSpecificStylesUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Tests/Channels/DisallowSelfActionsUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Tests/Channels/IncludeSystemUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Tests/Channels/UnusedSystemUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Tests/Commenting/FunctionCommentUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Tests/Debug/DebugCodeUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Tests/Debug/FirebugConsoleUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Tests/Objects/AssignThisUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Tests/Objects/CreateWidgetTypeCallbackUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Tests/Objects/DisallowNewWidgetUnitTest.php Changed

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

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

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

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

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Tests/Strings/JoinStringsUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Sniffs/Commenting/FunctionCommentSniff.php Changed

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

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Commenting/ClassCommentUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Commenting/FileCommentUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Commenting/FunctionCommentUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Commenting/InlineCommentUnitTest.php Changed

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

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

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Files/IncludingFileUnitTest.php Changed

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

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

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

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

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/NamingConventions/ValidFunctionNameUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/NamingConventions/ValidVariableNameUnitTest.php Changed

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

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

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

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

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR1/Tests/Files/SideEffectsUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR1/Tests/Methods/CamelCapsMethodNameUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml Added

@@ -0,0 +1,124 @@
+<documentation title="Control Structure Spacing">
+    <standard>
+    <!CDATA
+    Single line control structures must have no spaces after the condition opening parenthesis and before the condition closing parenthesis.
+    >
+    </standard>
+    <code_comparison>
+        <code title="Valid: No space after the opening parenthesis in a single-line condition.">
+        <!CDATA
+if <em>(</em>$expr) {
+}
+        >
+        </code>
+        <code title="Invalid: Space after the opening parenthesis in a single-line condition.">
+        <!CDATA
+if <em>( </em>$expr) {
+}
+        >
+        </code>
+    </code_comparison>
+    <code_comparison>
+        <code title="Valid: No space before the closing parenthesis in a single-line condition.">
+        <!CDATA
+if <em>(</em>$expr) {
+}
+        >
+        </code>
+        <code title="Invalid: Space before the closing parenthesis in a single-line condition.">
+        <!CDATA
+if ($expr<em> )</em> {
+}
+        >
+        </code>
+    </code_comparison>
+    <standard>
+    <!CDATA
+    The condition of the multi-line control structure must be indented once, placing the first expression on the next line after the opening parenthesis.
+    >
+    </standard>
+    <code_comparison>
+        <code title="Valid: First expression of a multi-line control structure condition block is on the line after the opening parenthesis.">
+        <!CDATA
+while (
+    <em>$expr1</em>
+    && $expr2
+) {
+}
+        >
+        </code>
+        <code title="Invalid: First expression of a multi-line control structure condition block is on the same line as the opening parenthesis.">
+        <!CDATA
+while <em>($expr1</em>
+    && $expr2
+) {
+}
+        >
+        </code>
+    </code_comparison>
+    <code_comparison>
+        <code title="Valid: Each line in a multi-line control structure condition block indented at least once. Default indentation is 4 spaces.">
+        <!CDATA
+while (
+<em>    </em>$expr1
+<em>    </em>&& $expr2
+) {
+}
+        >
+        </code>
+        <code title="Invalid: Some lines in a multi-line control structure condition block not indented correctly.">
+        <!CDATA
+while (
+<em>$expr1</em>
+    && $expr2
+<em>  && $expr3</em>
+) {
+}
+        >
+        </code>
+    </code_comparison>
+    <standard>
+    <!CDATA
+    The closing parenthesis of the multi-line control structure must be on the next line after the last condition, indented to the same level as the start of the control structure.
+    >
+    </standard>
+    <code_comparison>
+        <code title="Valid: The closing parenthesis of a multi-line control structure condition block is on the line after the last expression.">
+        <!CDATA
+while (
+    $expr1
+    && $expr2
+<em>)</em> {
+}
+        >
+        </code>
+        <code title="Invalid: The closing parenthesis of a multi-line control structure condition block is on the same line as the last expression.">
+        <!CDATA
+while (
+    $expr1
+    <em>&& $expr2)</em> {
+}
+        >
+        </code>
+    </code_comparison>
+    <code_comparison>
+        <code title="Valid: The closing parenthesis of a multi-line control structure condition block is indented to the same level as start of the control structure.">
+        <!CDATA
+while (
+    $expr1
+    && $expr2
+<em>)</em> {
+}
+        >
+        </code>
+        <code title="Invalid: The closing parenthesis of a multi-line control structure condition block is not indented to the same level as start of the control structure.">
+        <!CDATA
+while (
+    $expr1
+    && $expr2
+<em>  )</em> {
+}
+        >
+        </code>
+    </code_comparison>
+</documentation>

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Docs/Files/ImportStatementStandard.xml Added

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

@@ -0,0 +1,41 @@
+<documentation title="Return Type Declaration">
+    <standard>
+    <!CDATA
+    For function and closure return type declarations, there must be one space after the colon followed by the type declaration, and no space before the colon.
+
+    The colon and the return type declaration have to be on the same line as the argument list closing parenthesis.
+    >
+    </standard>
+    <code_comparison>
+        <code title="Valid: A single space between the colon and type in a return type declaration.">
+        <!CDATA
+$closure = function ( $arg ):<em> </em>string {
+   // Closure body.
+};
+        >
+        </code>
+        <code title="Invalid: No space between the colon and the type in a return type declaration.">
+        <!CDATA
+$closure = function ( $arg ):<em></em>string {
+   // Closure body.
+};
+        >
+        </code>
+    </code_comparison>
+    <code_comparison>
+        <code title="Valid: No space before the colon in a return type declaration.">
+        <!CDATA
+function someFunction( $arg )<em></em>: string {
+   // Function body.
+};
+        >
+        </code>
+        <code title="Invalid: One or more spaces before the colon in a return type declaration.">
+        <!CDATA
+function someFunction( $arg )<em>   </em>: string {
+   // Function body.
+};
+        >
+        </code>
+    </code_comparison>
+</documentation>

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Docs/Properties Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Docs/Properties/ConstantVisibilityStandard.xml Added

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

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

@@ -64,12 +64,14 @@
                 continue;
             }
 
-            // Skip over potential attributes for anonymous classes.
+            // Bow out when this is an anonymous class.
+            // Anonymous classes are the only situation which would allow for an attribute
+            // or for the readonly keyword between "new" and the class "name".
             if ($tokens$i'code' === T_ATTRIBUTE
-                && isset($tokens$i'attribute_closer') === true
+                || $tokens$i'code' === T_READONLY
+                || $tokens$i'code' === T_ANON_CLASS
             ) {
-                $i = $tokens$i'attribute_closer';
-                continue;
+                return;
             }
 
             if ($tokens$i'code' === T_OPEN_SQUARE_BRACKET
@@ -87,11 +89,6 @@
             return;
         }
 
-        if ($tokens$classNameEnd'code' === T_ANON_CLASS) {
-            // Ignore anon classes.
-            return;
-        }
-
         if ($tokens$classNameEnd'code' === T_OPEN_PARENTHESIS) {
             // Using parenthesis.
             return;

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

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

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

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

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

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

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

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

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

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

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

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.1.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.1.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.2.inc Added

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

@@ -16,7 +16,7 @@
  *
  * @covers \PHP_CodeSniffer\Standards\PSR12\Sniffs\Files\DeclareStatementSniff
  */
-class DeclareStatementUnitTest extends AbstractSniffUnitTest
+final class DeclareStatementUnitTest extends AbstractSniffUnitTest
 {
 
 
@@ -26,35 +26,42 @@
      * The key of the array should represent the line number and the value
      * should represent the number of errors that should occur on that line.
      *
+     * @param string $testFile The name of the file being tested.
+     *
      * @return array<int, int>
      */
-    public function getErrorList()
+    public function getErrorList($testFile='')
     {
-        return 
-            2  => 1,
-            3  => 1,
-            4  => 1,
-            5  => 2,
-            6  => 1,
-            7  => 1,
-            9  => 2,
-            10 => 1,
-            11 => 3,
-            12 => 2,
-            13 => 1,
-            14 => 2,
-            16 => 3,
-            19 => 3,
-            22 => 1,
-            24 => 1,
-            26 => 3,
-            28 => 3,
-            34 => 2,
-            43 => 1,
-            46 => 1,
-            47 => 1,
-            49 => 1,
-        ;
+        switch ($testFile) {
+        case 'DeclareStatementUnitTest.1.inc':
+            return 
+                2  => 1,
+                3  => 1,
+                4  => 1,
+                5  => 2,
+                6  => 1,
+                7  => 1,
+                9  => 2,
+                10 => 1,
+                11 => 3,
+                12 => 2,
+                13 => 1,
+                14 => 2,
+                16 => 3,
+                19 => 3,
+                22 => 1,
+                24 => 1,
+                26 => 3,
+                28 => 3,
+                34 => 2,
+                43 => 1,
+                46 => 1,
+                47 => 1,
+                49 => 1,
+            ;
+        default:
+            return ;
+        }//end switch
 
     }//end getErrorList()

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

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

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

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

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

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

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

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

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

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

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

@@ -65,42 +65,51 @@
         $stackPtrType = strtolower($tokens$stackPtr'content');
 
         // Check alignment of the keyword and braces.
-        if ($tokens($stackPtr - 1)'code' === T_WHITESPACE) {
-            $prevContent = $tokens($stackPtr - 1)'content';
-            if ($prevContent !== $phpcsFile->eolChar) {
-                $blankSpace = substr($prevContent, strpos($prevContent, $phpcsFile->eolChar));
-                $spaces     = strlen($blankSpace);
-
-                if (in_array($tokens($stackPtr - 2)'code', T_ABSTRACT, T_FINAL, T_READONLY, true) === true
-                    && $spaces !== 1
-                ) {
-                    $prevContent = strtolower($tokens($stackPtr - 2)'content');
-                    $error       = 'Expected 1 space between %s and %s keywords; %s found';
-                    $data        = 
-                        $prevContent,
-                        $stackPtrType,
-                        $spaces,
-                    ;
-
-                    $fix = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceBeforeKeyword', $data);
-                    if ($fix === true) {
-                        $phpcsFile->fixer->replaceToken(($stackPtr - 1), ' ');
-                    }
-                }
-            } else if ($tokens($stackPtr - 2)'code' === T_ABSTRACT
-                || $tokens($stackPtr - 2)'code' === T_FINAL
-                || $tokens($stackPtr - 2)'code' === T_READONLY
-            ) {
-                $prevContent = strtolower($tokens($stackPtr - 2)'content');
-                $error       = 'Expected 1 space between %s and %s keywords; newline found';
-                $data        = 
-                    $prevContent,
+        $classModifiers = 
+            T_ABSTRACT => T_ABSTRACT,
+            T_FINAL    => T_FINAL,
+            T_READONLY => T_READONLY,
+        ;
+
+        $prevNonSpace = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
+        $prevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+
+        if (isset($classModifiers$tokens$prevNonEmpty'code') === true) {
+            $spaces    = 0;
+            $errorCode = 'SpaceBeforeKeyword';
+            if ($tokens$prevNonEmpty'line' !== $tokens$stackPtr'line') {
+                $spaces    = 'newline';
+                $errorCode = 'NewlineBeforeKeyword';
+            } else if ($tokens($stackPtr - 1)'code' === T_WHITESPACE) {
+                $spaces = $tokens($stackPtr - 1)'length';
+            }
+
+            if ($spaces !== 1) {
+                $error = 'Expected 1 space between %s and %s keywords; %s found';
+                $data  = 
+                    strtolower($tokens$prevNonEmpty'content'),
                     $stackPtrType,
+                    $spaces,
                 ;
 
-                $fix = $phpcsFile->addFixableError($error, $stackPtr, 'NewlineBeforeKeyword', $data);
-                if ($fix === true) {
-                    $phpcsFile->fixer->replaceToken(($stackPtr - 1), ' ');
+                if ($prevNonSpace !== $prevNonEmpty) {
+                    // Comment found between modifier and class keyword. Do not auto-fix.
+                    $phpcsFile->addError($error, $stackPtr, $errorCode, $data);
+                } else {
+                    $fix = $phpcsFile->addFixableError($error, $stackPtr, $errorCode, $data);
+                    if ($fix === true) {
+                        if ($spaces === 0) {
+                            $phpcsFile->fixer->addContentBefore($stackPtr, ' ');
+                        } else {
+                            $phpcsFile->fixer->beginChangeset();
+                            $phpcsFile->fixer->replaceToken(($stackPtr - 1), ' ');
+                            for ($i = ($stackPtr - 2); $i > $prevNonSpace; $i--) {
+                                $phpcsFile->fixer->replaceToken($i, ' ');
+                            }
+
+                            $phpcsFile->fixer->endChangeset();
+                        }
+                    }
                 }
             }//end if
         }//end if

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

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

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

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

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

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

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

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/Files/ClosingTagUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/Methods/FunctionCallSignatureUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/Methods/FunctionClosingBraceUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/Methods/MethodDeclarationUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/Namespaces/NamespaceDeclarationUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.17.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.php Changed

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -120,7 +120,7 @@
     {
         $tokens = $phpcsFile->getTokens();
 
-        $assignedVar = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
+        $assignedVar = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
         // Not an assignment, return.
         if ($tokens$assignedVar'code' !== T_VARIABLE) {
             return;
@@ -129,8 +129,14 @@
         $statementEnd = $phpcsFile->findNext(T_SEMICOLON, T_CLOSE_PARENTHESIS, T_CLOSE_SQUARE_BRACKET, T_CLOSE_CURLY_BRACKET, $stackPtr);
 
         // If there is anything other than variables, numbers, spaces or operators we need to return.
-        $noiseTokens = $phpcsFile->findNext(T_LNUMBER, T_VARIABLE, T_WHITESPACE, T_PLUS, T_MINUS, T_OPEN_PARENTHESIS, ($stackPtr + 1), $statementEnd, true);
-
+        $find   = Tokens::$emptyTokens;
+        $find = T_LNUMBER;
+        $find = T_VARIABLE;
+        $find = T_PLUS;
+        $find = T_MINUS;
+        $find = T_OPEN_PARENTHESIS;
+
+        $noiseTokens = $phpcsFile->findNext($find, ($stackPtr + 1), $statementEnd, true);
         if ($noiseTokens !== false) {
             return;
         }
@@ -145,8 +151,8 @@
         }
 
         if ($tokens$stackPtr'code' === T_EQUAL) {
-            $nextVar          = ($stackPtr + 1);
-            $previousVariable = ($stackPtr + 1);
+            $nextVar          = $stackPtr;
+            $previousVariable = $stackPtr;
             $variableCount    = 0;
             while (($nextVar = $phpcsFile->findNext(T_VARIABLE, ($nextVar + 1), $statementEnd)) !== false) {
                 $previousVariable = $nextVar;
@@ -165,8 +171,8 @@
 
         // We have only one variable, and it's the same as what is being assigned,
         // so we need to check what is being added or subtracted.
-        $nextNumber     = ($stackPtr + 1);
-        $previousNumber = ($stackPtr + 1);
+        $nextNumber     = $stackPtr;
+        $previousNumber = $stackPtr;
         $numberCount    = 0;
         while (($nextNumber = $phpcsFile->findNext(T_LNUMBER, ($nextNumber + 1), $statementEnd, false)) !== false) {
             $previousNumber = $nextNumber;

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

@@ -24,7 +24,10 @@
      */
     public function register()
     {
-        return T_OPEN_TAG;
+        return 
+            T_OPEN_TAG,
+            T_OPEN_TAG_WITH_ECHO,
+        ;
 
     }//end register()
 
@@ -46,9 +49,9 @@
         // then we have an inline embedded PHP block.
         $closeTag = $phpcsFile->findNext(T_CLOSE_TAG, $stackPtr);
         if ($closeTag === false || $tokens$stackPtr'line' !== $tokens$closeTag'line') {
-            $this->validateMultilineEmbeddedPhp($phpcsFile, $stackPtr);
+            $this->validateMultilineEmbeddedPhp($phpcsFile, $stackPtr, $closeTag);
         } else {
-            $this->validateInlineEmbeddedPhp($phpcsFile, $stackPtr);
+            $this->validateInlineEmbeddedPhp($phpcsFile, $stackPtr, $closeTag);
         }
 
     }//end process()
@@ -57,44 +60,40 @@
     /**
      * Validates embedded PHP that exists on multiple lines.
      *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token in the
-     *                                               stack passed in $tokens.
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile  The file being scanned.
+     * @param int                         $stackPtr   The position of the current token in the
+     *                                                stack passed in $tokens.
+     * @param int|false                   $closingTag The position of the PHP close tag in the
+     *                                                stack passed in $tokens.
      *
      * @return void
      */
-    private function validateMultilineEmbeddedPhp($phpcsFile, $stackPtr)
+    private function validateMultilineEmbeddedPhp($phpcsFile, $stackPtr, $closingTag)
     {
         $tokens = $phpcsFile->getTokens();
 
-        $prevTag = $phpcsFile->findPrevious(T_OPEN_TAG, ($stackPtr - 1));
+        $prevTag = $phpcsFile->findPrevious($this->register(), ($stackPtr - 1));
         if ($prevTag === false) {
             // This is the first open tag.
             return;
         }
 
         $firstContent = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-        $closingTag   = $phpcsFile->findNext(T_CLOSE_TAG, $stackPtr);
+        if ($firstContent === false) {
+            // Unclosed PHP open tag at the end of a file. Nothing to do.
+            return;
+        }
+
         if ($closingTag !== false) {
-            $nextContent = $phpcsFile->findNext(T_WHITESPACE, ($closingTag + 1), $phpcsFile->numTokens, true);
-            if ($nextContent === false) {
+            $firstContentAfterBlock = $phpcsFile->findNext(T_WHITESPACE, ($closingTag + 1), $phpcsFile->numTokens, true);
+            if ($firstContentAfterBlock === false) {
                 // Final closing tag. It will be handled elsewhere.
                 return;
             }
 
             // We have an opening and a closing tag, that lie within other content.
             if ($firstContent === $closingTag) {
-                $error = 'Empty embedded PHP tag found';
-                $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'Empty');
-                if ($fix === true) {
-                    $phpcsFile->fixer->beginChangeset();
-                    for ($i = $stackPtr; $i <= $closingTag; $i++) {
-                        $phpcsFile->fixer->replaceToken($i, '');
-                    }
-
-                    $phpcsFile->fixer->endChangeset();
-                }
-
+                $this->reportEmptyTagSet($phpcsFile, $stackPtr, $closingTag);
                 return;
             }
         }//end if
@@ -105,9 +104,16 @@
             if ($fix === true) {
                 $first   = $phpcsFile->findFirstOnLine(T_WHITESPACE, $stackPtr, true);
                 $padding = (strlen($tokens$first'content') - strlen(ltrim($tokens$first'content')));
+
                 $phpcsFile->fixer->beginChangeset();
+                $phpcsFile->fixer->replaceToken($stackPtr, rtrim($tokens$stackPtr'content'));
                 $phpcsFile->fixer->addNewline($stackPtr);
                 $phpcsFile->fixer->addContent($stackPtr, str_repeat(' ', $padding));
+
+                if ($tokens($stackPtr + 1)'code' === T_WHITESPACE) {
+                    $phpcsFile->fixer->replaceToken(($stackPtr + 1), '');
+                }
+
                 $phpcsFile->fixer->endChangeset();
             }
         } else {
@@ -141,10 +147,13 @@
                     }
                 }//end if
 
-                $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $stackPtr);
+                $indent = 0;
+                $first  = $phpcsFile->findFirstOnLine(T_WHITESPACE, $stackPtr);
                 if ($first === false) {
-                    $first  = $phpcsFile->findFirstOnLine(T_INLINE_HTML, $stackPtr);
-                    $indent = (strlen($tokens$first'content') - strlen(ltrim($tokens$first'content')));
+                    $first = $phpcsFile->findFirstOnLine(T_INLINE_HTML, $stackPtr);
+                    if ($first !== false) {
+                        $indent = (strlen($tokens$first'content') - strlen(ltrim($tokens$first'content')));
+                    }
                 } else {
                     $indent = ($tokens($first + 1)'column' - 1);
                 }
@@ -169,17 +178,20 @@
             }//end if
         }//end if
 
-        $lastContent = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
-        if ($tokens$lastContent'line' === $tokens$stackPtr'line'
-            && trim($tokens$lastContent'content') !== ''
+        $lastContentBeforeBlock = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
+        if ($tokens$lastContentBeforeBlock'line' === $tokens$stackPtr'line'
+            && trim($tokens$lastContentBeforeBlock'content') !== ''
         ) {
             $error = 'Opening PHP tag must be on a line by itself';
             $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'ContentBeforeOpen');
             if ($fix === true) {
-                $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $stackPtr);
+                $padding = 0;
+                $first   = $phpcsFile->findFirstOnLine(T_WHITESPACE, $stackPtr);
                 if ($first === false) {
-                    $first   = $phpcsFile->findFirstOnLine(T_INLINE_HTML, $stackPtr);
-                    $padding = (strlen($tokens$first'content') - strlen(ltrim($tokens$first'content')));
+                    $first = $phpcsFile->findFirstOnLine(T_INLINE_HTML, $stackPtr);
+                    if ($first !== false) {
+                        $padding = (strlen($tokens$first'content') - strlen(ltrim($tokens$first'content')));
+                    }
                 } else {
                     $padding = ($tokens($first + 1)'column' - 1);
                 }
@@ -188,11 +200,19 @@
             }
         } else {
             // Find the first token on the first non-empty line we find.
-            for ($first = ($stackPtr - 1); $first > 0; $first--) {
+            for ($first = ($lastContentBeforeBlock - 1); $first > 0; $first--) {
                 if ($tokens$first'line' === $tokens$stackPtr'line') {
                     continue;
                 } else if (trim($tokens$first'content') !== '') {
                     $first = $phpcsFile->findFirstOnLine(, $first, true);
+                    if ($tokens$first'code' === T_COMMENT
+                        && $tokens$first'content' !== ltrim($tokens$first'content')
+                    ) {
+                        // This is a subsequent line in a star-slash comment containing leading indent.
+                        // We'll need the first line of the comment to correctly determine the indent.
+                        continue;
+                    }
+
                     break;
                 }
             }
@@ -225,20 +245,48 @@
             return;
         }
 
-        $lastContent = $phpcsFile->findPrevious(T_WHITESPACE, ($closingTag - 1), ($stackPtr + 1), true);
-        $nextContent = $phpcsFile->findNext(T_WHITESPACE, ($closingTag + 1), null, true);
+        $lastContent            = $phpcsFile->findPrevious(T_WHITESPACE, ($closingTag - 1), ($stackPtr + 1), true);
+        $firstContentAfterBlock = $phpcsFile->findNext(T_WHITESPACE, ($closingTag + 1), null, true);
 
         if ($tokens$lastContent'line' === $tokens$closingTag'line') {
             $error = 'Closing PHP tag must be on a line by itself';
             $fix   = $phpcsFile->addFixableError($error, $closingTag, 'ContentBeforeEnd');
             if ($fix === true) {
-                $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $closingTag, true);
+                // Calculate the indent for the close tag.
+                // If the close tag is on the same line as the first content, re-use the indent
+                // calculated for the first content line to prevent the indent being based on an
+                // "old" indent, not the _new_ (fixed) indent.
+                if ($tokens$firstContent'line' === $tokens$lastContent'line'
+                    && isset($indent) === true
+                ) {
+                    $closerIndent = $indent;
+                } else {
+                    $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $closingTag, true);
+
+                    while ($tokens$first'code' === T_COMMENT
+                        && $tokens$first'content' !== ltrim($tokens$first'content')
+                    ) {
+                        // This is a subsequent line in a star-slash comment containing leading indent.
+                        // We'll need the first line of the comment to correctly determine the indent.
+                        $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, ($first - 1), true);
+                    }
+
+                    $closerIndent = ($tokens$first'column' - 1);
+                }
+
                 $phpcsFile->fixer->beginChangeset();
-                $phpcsFile->fixer->addContentBefore($closingTag, str_repeat(' ', ($tokens$first'column' - 1)));
+
+                if ($tokens($closingTag - 1)'code' === T_WHITESPACE) {
+                    $phpcsFile->fixer->replaceToken(($closingTag - 1), '');
+                }
+
+                $phpcsFile->fixer->addContentBefore($closingTag, str_repeat(' ', $closerIndent));
                 $phpcsFile->fixer->addNewlineBefore($closingTag);
                 $phpcsFile->fixer->endChangeset();
-            }
-        } else if ($tokens$nextContent'line' === $tokens$closingTag'line') {
+            }//end if
+        } else if ($firstContentAfterBlock !== false
+            && $tokens$firstContentAfterBlock'line' === $tokens$closingTag'line'
+        ) {
             $error = 'Closing PHP tag must be on a line by itself';
             $fix   = $phpcsFile->addFixableError($error, $closingTag, 'ContentAfterEnd');
             if ($fix === true) {
@@ -246,11 +294,32 @@
                 $phpcsFile->fixer->beginChangeset();
                 $phpcsFile->fixer->addNewline($closingTag);
                 $phpcsFile->fixer->addContent($closingTag, str_repeat(' ', ($tokens$first'column' - 1)));
+
+                if ($tokens$firstContentAfterBlock'code' === T_INLINE_HTML) {
+                    $trimmedHtmlContent = ltrim($tokens$firstContentAfterBlock'content');
+                    if ($trimmedHtmlContent === '') {
+                        // HTML token contains only whitespace and the next token after is PHP, not HTML, so remove the whitespace.
+                        $phpcsFile->fixer->replaceToken($firstContentAfterBlock, '');
+                    } else {
+                        // The HTML token has content, so remove leading whitespace in favour of the indent.
+                        $phpcsFile->fixer->replaceToken($firstContentAfterBlock, $trimmedHtmlContent);
+                    }
+                }
+
+                if ($tokens$firstContentAfterBlock'code' === T_OPEN_TAG
+                    || $tokens$firstContentAfterBlock'code' === T_OPEN_TAG_WITH_ECHO
+                ) {
+                    // Next token is a PHP open tag which will also have thrown an error.
+                    // Prevent both fixers running in the same loop by making sure the token is "touched" during this loop.
+                    // This prevents a stray new line being added between the close and open tags.
+                    $phpcsFile->fixer->replaceToken($firstContentAfterBlock, $tokens$firstContentAfterBlock'content');
+                }
+
                 $phpcsFile->fixer->endChangeset();
-            }
+            }//end if
         }//end if
 
-        $next = $phpcsFile->findNext(T_OPEN_TAG, ($closingTag + 1));
+        $next = $phpcsFile->findNext($this->register(), ($closingTag + 1));
         if ($next === false) {
             return;
         }
@@ -293,42 +362,31 @@
      * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
      * @param int                         $stackPtr  The position of the current token in the
      *                                               stack passed in $tokens.
+     * @param int                         $closeTag  The position of the PHP close tag in the
+     *                                               stack passed in $tokens.
      *
      * @return void
      */
-    private function validateInlineEmbeddedPhp($phpcsFile, $stackPtr)
+    private function validateInlineEmbeddedPhp($phpcsFile, $stackPtr, $closeTag)
     {
         $tokens = $phpcsFile->getTokens();
 
-        // We only want one line PHP sections, so return if the closing tag is
-        // on the next line.
-        $closeTag = $phpcsFile->findNext(T_CLOSE_TAG, $stackPtr, null, false);
-        if ($tokens$stackPtr'line' !== $tokens$closeTag'line') {
-            return;
-        }
-
-        // Check that there is one, and only one space at the start of the statement.
         $firstContent = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), $closeTag, true);
 
         if ($firstContent === false) {
-            $error = 'Empty embedded PHP tag found';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'Empty');
-            if ($fix === true) {
-                $phpcsFile->fixer->beginChangeset();
-                for ($i = $stackPtr; $i <= $closeTag; $i++) {
-                    $phpcsFile->fixer->replaceToken($i, '');
-                }
-
-                $phpcsFile->fixer->endChangeset();
-            }
-
+            $this->reportEmptyTagSet($phpcsFile, $stackPtr, $closeTag);
             return;
         }
 
-        // The open tag token always contains a single space after it.
-        $leadingSpace = 1;
+        // Check that there is one, and only one space at the start of the statement.
+        $leadingSpace = 0;
+        if ($tokens$stackPtr'code' === T_OPEN_TAG) {
+            // The long open tag token in a single line tag set always contains a single space after it.
+            $leadingSpace = 1;
+        }
+
         if ($tokens($stackPtr + 1)'code' === T_WHITESPACE) {
-            $leadingSpace = ($tokens($stackPtr + 1)'length' + 1);
+            $leadingSpace += $tokens($stackPtr + 1)'length';
         }
 
         if ($leadingSpace !== 1) {
@@ -336,7 +394,15 @@
             $data  = $leadingSpace;
             $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpacingAfterOpen', $data);
             if ($fix === true) {
-                $phpcsFile->fixer->replaceToken(($stackPtr + 1), '');
+                if ($tokens$stackPtr'code' === T_OPEN_TAG) {
+                    $phpcsFile->fixer->replaceToken(($stackPtr + 1), '');
+                } else if ($tokens($stackPtr + 1)'code' === T_WHITESPACE) {
+                    // Short open tag with too much whitespace.
+                    $phpcsFile->fixer->replaceToken(($stackPtr + 1), ' ');
+                } else {
+                    // Short open tag without whitespace.
+                    $phpcsFile->fixer->addContent($stackPtr, ' ');
+                }
             }
         }
 
@@ -349,7 +415,12 @@
                 && $tokens$prev'code' !== T_SEMICOLON
             ) {
                 $error = 'Inline PHP statement must end with a semicolon';
-                $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'NoSemicolon');
+                $code  = 'NoSemicolon';
+                if ($tokens$stackPtr'code' === T_OPEN_TAG_WITH_ECHO) {
+                    $code = 'ShortOpenEchoNoSemicolon';
+                }
+
+                $fix = $phpcsFile->addFixableError($error, $stackPtr, $code);
                 if ($fix === true) {
                     $phpcsFile->fixer->addContent($prev, ';');
                 }
@@ -366,7 +437,7 @@
                     $data  = $statementCount;
                     $phpcsFile->addError($error, $stackPtr, 'MultipleStatements', $data);
                 }
-            }
+            }//end if
         }//end if
 
         $trailingSpace = 0;
@@ -399,4 +470,43 @@
     }//end validateInlineEmbeddedPhp()
 
 
+    /**
+     * Report and fix an set of empty PHP tags.
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the current token in the
+     *                                               stack passed in $tokens.
+     * @param int                         $closeTag  The position of the PHP close tag in the
+     *                                               stack passed in $tokens.
+     *
+     * @return void
+     */
+    private function reportEmptyTagSet(File $phpcsFile, $stackPtr, $closeTag)
+    {
+        $tokens = $phpcsFile->getTokens();
+        $error  = 'Empty embedded PHP tag found';
+        $fix    = $phpcsFile->addFixableError($error, $stackPtr, 'Empty');
+        if ($fix === true) {
+            $phpcsFile->fixer->beginChangeset();
+            for ($i = $stackPtr; $i <= $closeTag; $i++) {
+                $phpcsFile->fixer->replaceToken($i, '');
+            }
+
+            // Prevent leaving indentation whitespace behind when the empty tag set is the only thing on the affected lines.
+            if (isset($tokens($closeTag + 1)) === true
+                && $tokens($closeTag + 1)'line' !== $tokens$closeTag'line'
+                && $tokens($stackPtr - 1)'code' === T_INLINE_HTML
+                && $tokens($stackPtr - 1)'line' === $tokens$stackPtr'line'
+                && $tokens($stackPtr - 1)'column' === 1
+                && trim($tokens($stackPtr - 1)'content') === ''
+            ) {
+                $phpcsFile->fixer->replaceToken(($stackPtr - 1), '');
+            }
+
+            $phpcsFile->fixer->endChangeset();
+        }
+
+    }//end reportEmptyTagSet()
+
+
 }//end class

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Classes/LowercaseClassKeywordsUnitTest.php 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/Classes/ValidClassNameUnitTest.php Changed

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

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

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.inc.fixed Added

@@ -0,0 +1,85 @@
+<?php
+
+function __construct()
+{
+}//end __construct()
+
+function myFunction()
+{
+}//end myFunction()
+
+function ourFunction()
+{
+}//end ourFunction()
+
+function yourFunction()
+{
+}//end yourFunction()
+
+class TestClass
+{
+    function __construct()
+    {
+    }//end __construct()
+
+    function myFunction()
+    {
+    }//end myFunction()
+
+    function yourFunction()
+    {
+    }//end yourFunction()
+
+}//end class
+
+abstract class TestClass
+{
+    abstract function myFunction();
+
+    function ourFunction()
+    {
+    }//end ourFunction()
+
+    function yourFunction()
+    {
+    }//end yourFunction()
+
+}//end class
+
+interface TestClass
+{
+    function myFunction();
+    function ourFunction();
+    function yourFunction();
+
+}//end interface
+
+class TestClass
+{
+}//end class
+
+abstract class TestClass
+{
+}//end class
+
+interface TestClass
+{
+}//end interface
+
+class MyClass
+{
+    public function myFunction();
+}//end class
+
+// Closures don't need end comments.
+echo preg_replace_callback('~-(a-z)~', function ($match) { return strtoupper($match1); }, 'hello-world');
+
+class TestClass
+{
+}//end class
+
+enum MissingClosingComment {
+}//end enum
+
+enum HasClosingComment {
+}//end enum

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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/FunctionDeclarationArgumentSpacingUnitTest.php Changed

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/FunctionDuplicateArgumentUnitTest.php Changed

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

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

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/NamingConventions/ValidFunctionNameUnitTest.php Changed

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,271 @@
+<?php
+    // Not embedded. Do not check here.
+    echo 'Long open tag test case file';
+?>
+<html>
+<head>
+<title><?php echo $title ?></title>
+<script><?php echo $script; ?></script>
+</head>
+<body>
+    <?php
+        echo $body;
+    ?>
+    hello
+    <?php
+    echo $moreBody;
+    ?>
+    <?php  echo 'one'; ?>
+    <?php  echo 'two';   ?>
+    <?php echo 'three;' ?>
+    <?php echo 'fourA'; echo 'fourB;'; ?>
+    <?php  echo 'fiveA'; echo 'fiveB;';   ?>
+
+    <?php
+    ?>
+    <?php ?>
+
+    <?php
+
+        echo $start - $indent + $end;
+
+    ?>
+    <?php
+
+    echo $blankLines;
+
+        ?>
+
+    <?php
+    echo $closerNeedsOwnLine; ?>
+    <?php echo $openerNeedsOwnLine;
+    ?>
+
+            <?php
+        echo 'hi';
+            ?>
+
+    <?php
+echo 'hi';
+    ?>
+</body>
+</html>
+<?php
+function test()
+{
+    foreach ($root->section as $section) {
+        ?>
+        <table>
+            <?php if ($foo) {
+            ?>
+            <tr>
+            </tr>
+            <?php }
+            ?>
+        <?php
+        foreach ($bar as $bar) {
+            echo $bar;
+        }
+    }
+
+    foreach ($root->section as $section) {
+        ?>
+        <table>
+            <?php
+            if ($foo) {
+            ?>
+            <tr>
+            </tr>
+            <?php
+}
+            ?>
+        <?php
+        foreach ($bar as $bar) {
+            echo $bar;
+        }
+    }
+}
+
+echo 'goodbye';
+
+function foo()
+{
+
+    ?><a onClick="Javascript: set_hidden_field('<?php echo $link_offset - $num_per_page; ?>'); set_hidden_field('process_form', '0'); submit_form(); return false;"><?php
+
+}
+
+?>
+
+            <strong><?php
+            echo 'foo';
+            ?></strong>
+
+?>
+
+</html>
+
+<?php if ($foo) { ?>
+<?php } ?>
+
+<?php echo 'okay'; // Something. ?>
+<?php echo 'too much space before close'; // Something.      ?>
+<?php echo 'no space before close'; // Something.?>
+
+<?php /* translators: okay */ ?>
+<?php /* translators: no space before close */?>
+<?php /* translators: too much space before close */      ?>
+
+<?php echo 'okay'; // phpcs:ignore Standard.Category.Sniff -- reason. ?>
+<?php echo 'too much space before close'; // phpcs:ignore Standard.Category.Sniff -- reason.    ?>
+<?php echo 'no space before close'; // phpcs:ignore Standard.Category.Sniff -- reason.?>
+
+
+        <div><?php ?></div>
+    <?php ?><?php echo $i; ?>
+
+
+        <?php ?>
+
+    <?php if (true) { ?><?php echo $i; ?>  <?php ?>  <?php } ?>
+
+        <div><?php
+        ?></div>
+    <?php
+    ?><?php echo $i; ?>
+
+
+    <?php
+    ?>
+
+    <?php if (true) { ?><?php echo $i; ?>  <?php
+    ?>  <?php } ?>
+
+
+    <?php   echo $openerNeedsOwnLine;
+    ?>
+
+
+    <?php
+    echo $closerNeedsOwnLine;   ?>
+
+
+    <?php
+    echo $closerNeedsOwnLine;
+    ?>  </div>
+
+    <?php
+    echo $closerNeedsOwnLine;
+    ?>  <?php echo $i; ?>
+
+
+<?php
+    // Do something.
+    ?><?php
+    echo 'embedded';
+    ?>  <?php
+        echo 'embedded';
+    ?><?php
+echo 'embedded';
+    ?>
+
+
+<?php if (true) { ?>
+<?php
+    } ?>
+
+
+    <?php if ($foo) { ?>
+    <tr></tr>
+    <?php
+
+
+}
+    ?>
+
+
+<?php
+echo 'indent is correct - first on line for open tag is open tag';
+?>
+
+    <?php
+    echo 'indent is correct - first on line for open tag is inline HTML without content';
+    ?>
+        <div><?php
+        echo 'indent is correct - first on line for open tag is inline HTML with content';
+    ?><?php
+    echo 'indent is correct - first on line for open tag is whitespace';
+?>
+
+<?php
+    echo 'indent is incorrect - first on line for open tag is open tag';
+?>
+
+    <?php
+       echo 'indent is incorrect - first on line for open tag is inline HTML';
+    ?>
+        <div><?php
+                       echo 'indent is correct - first on line for open tag is inline HTML with content';
+    ?><?php
+echo 'indent is incorrect - first on line for open tag is whitespace';
+?>
+
+
+    <?php
+    /* Single line star comments are not problematic. */ ?>
+
+    <?php
+    /* Subsequent lines of inline slash-star comments
+       contain the indent in the comment token.
+       This means the calculated indent would be 0 unless we
+       walk to the first line in the comment. */ ?>
+
+
+    <?php
+    /* Subsequent lines of inline slash-star comments
+       contain the indent in the comment token. */ ?>
+<?php
+echo 'the PHP tag is correctly indented as an indent less than the previous code indent is accepted';
+
+    /* Subsequent lines of inline slash-star comments
+       contain the indent in the comment token. */ ?>
+    <?php
+    echo 'the PHP tag is correctly indented';
+
+    /* Subsequent lines of inline slash-star comments
+       contain the indent in the comment token. */ ?>
+        <?php
+        echo 'the PHP tag is correctly indented as a diff of 4 is accepted';
+
+    /* Subsequent lines of inline slash-star comments
+       contain the indent in the comment token. */ ?>
+                <?php
+                echo 'the PHP tag is incorrectly indented as the indent is more than 4 different from the indent of the previous code';
+    ?>
+
+<?php
+// This test case file MUST always end with an unclosed long 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.1.inc.fixed Added

@@ -0,0 +1,283 @@
+<?php
+    // Not embedded. Do not check here.
+    echo 'Long open tag test case file';
+?>
+<html>
+<head>
+<title><?php echo $title; ?></title>
+<script><?php echo $script; ?></script>
+</head>
+<body>
+    <?php
+    echo $body;
+    ?>
+    hello
+    <?php
+    echo $moreBody;
+    ?>
+    <?php echo 'one'; ?>
+    <?php echo 'two'; ?>
+    <?php echo 'three;'; ?>
+    <?php echo 'fourA'; echo 'fourB;'; ?>
+    <?php echo 'fiveA'; echo 'fiveB;'; ?>
+
+
+    <?php
+    echo $start - $indent + $end;
+    ?>
+    <?php
+    echo $blankLines;
+        ?>
+
+    <?php
+    echo $closerNeedsOwnLine;
+    ?>
+    <?php
+    echo $openerNeedsOwnLine;
+    ?>
+
+        <?php
+        echo 'hi';
+            ?>
+
+    <?php
+    echo 'hi';
+    ?>
+</body>
+</html>
+<?php
+function test()
+{
+    foreach ($root->section as $section) {
+        ?>
+        <table>
+            <?php
+            if ($foo) {
+            ?>
+            <tr>
+            </tr>
+            <?php
+            }
+            ?>
+        <?php
+        foreach ($bar as $bar) {
+            echo $bar;
+        }
+    }
+
+    foreach ($root->section as $section) {
+        ?>
+        <table>
+            <?php
+            if ($foo) {
+            ?>
+            <tr>
+            </tr>
+            <?php
+}
+            ?>
+        <?php
+        foreach ($bar as $bar) {
+            echo $bar;
+        }
+    }
+}
+
+echo 'goodbye';
+
+function foo()
+{
+    ?>
+    <a onClick="Javascript: set_hidden_field('<?php echo $link_offset - $num_per_page; ?>'); set_hidden_field('process_form', '0'); submit_form(); return false;">
+    <?php
+
+}
+
+?>
+
+            <strong>
+            <?php
+            echo 'foo';
+            ?>
+            </strong>
+
+?>
+
+</html>
+
+<?php if ($foo) { ?>
+<?php } ?>
+
+<?php echo 'okay'; // Something. ?>
+<?php echo 'too much space before close'; // Something. ?>
+<?php echo 'no space before close'; // Something. ?>
+
+<?php /* translators: okay */ ?>
+<?php /* translators: no space before close */ ?>
+<?php /* translators: too much space before close */ ?>
+
+<?php echo 'okay'; // phpcs:ignore Standard.Category.Sniff -- reason. ?>
+<?php echo 'too much space before close'; // phpcs:ignore Standard.Category.Sniff -- reason. ?>
+<?php echo 'no space before close'; // phpcs:ignore Standard.Category.Sniff -- reason. ?>
+
+
+        <div></div>
+    <?php echo $i; ?>
+
+
+
+    <?php if (true) { ?><?php echo $i; ?>    <?php } ?>
+
+        <div></div>
+    <?php echo $i; ?>
+
+
+
+    <?php if (true) { ?><?php echo $i; ?>    <?php } ?>
+
+
+    <?php
+    echo $openerNeedsOwnLine;
+    ?>
+
+
+    <?php
+    echo $closerNeedsOwnLine;
+    ?>
+
+
+    <?php
+    echo $closerNeedsOwnLine;
+    ?>
+    </div>
+
+    <?php
+    echo $closerNeedsOwnLine;
+    ?>
+    <?php echo $i; ?>
+
+
+<?php
+// Do something.
+    ?>
+    <?php
+    echo 'embedded';
+    ?>
+    <?php
+    echo 'embedded';
+    ?>
+    <?php
+    echo 'embedded';
+    ?>
+
+
+<?php if (true) { ?>
+<?php
+    }
+    ?>
+
+
+    <?php if ($foo) { ?>
+    <tr></tr>
+    <?php
+
+
+}
+    ?>
+
+
+<?php
+echo 'indent is correct - first on line for open tag is open tag';
+?>
+
+    <?php
+    echo 'indent is correct - first on line for open tag is inline HTML without content';
+    ?>
+        <div>
+        <?php
+        echo 'indent is correct - first on line for open tag is inline HTML with content';
+    ?>
+    <?php
+    echo 'indent is correct - first on line for open tag is whitespace';
+?>
+
+<?php
+echo 'indent is incorrect - first on line for open tag is open tag';
+?>
+
+    <?php
+    echo 'indent is incorrect - first on line for open tag is inline HTML';
+    ?>
+        <div>
+        <?php
+        echo 'indent is correct - first on line for open tag is inline HTML with content';
+    ?>
+    <?php
+    echo 'indent is incorrect - first on line for open tag is whitespace';
+?>
+
+
+    <?php
+    /* Single line star comments are not problematic. */
+    ?>
+
+    <?php
+    /* Subsequent lines of inline slash-star comments
+       contain the indent in the comment token.
+       This means the calculated indent would be 0 unless we
+       walk to the first line in the comment. */
+    ?>
+
+
+    <?php
+    /* Subsequent lines of inline slash-star comments
+       contain the indent in the comment token. */
+    ?>
+<?php
+echo 'the PHP tag is correctly indented as an indent less than the previous code indent is accepted';
+
+    /* Subsequent lines of inline slash-star comments
+       contain the indent in the comment token. */
+    ?>
+    <?php
+    echo 'the PHP tag is correctly indented';
+
+    /* Subsequent lines of inline slash-star comments
+       contain the indent in the comment token. */
+    ?>
+        <?php
+        echo 'the PHP tag is correctly indented as a diff of 4 is accepted';
+
+    /* Subsequent lines of inline slash-star comments
+       contain the indent in the comment token. */
+    ?>
+        <?php
+        echo 'the PHP tag is incorrectly indented as the indent is more than 4 different from the indent of the previous code';
+    ?>
+
+<?php
+// This test case file MUST always end with an unclosed long 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.10.inc Added

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,30 @@
+                                <div>Inline HTML with indent to demonstrate the bug in the indent calculation.</div>
+<?php
+// This test case file MUST always start with a long 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.
+?>
+
+<?php
+echo 'indent is correct - first on line for open tag is open tag';
+?>
+<?php
+       echo 'indent is incorrect - first on line for open tag is inline HTML';
+?>
+
+
+<?php
+// This is only here so we can have a close tag as the first token on the next line.
+?><?php
+// The PHP open tag should be fixed to be at the very start of the line without indent.
+// And the indent of this comment should be seen as correct.
+?>
+
+<?php
+// This test case file MUST always end with an unclosed long 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.22.inc.fixed Added

@@ -0,0 +1,31 @@
+                                <div>Inline HTML with indent to demonstrate the bug in the indent calculation.</div>
+<?php
+// This test case file MUST always start with a long 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.
+?>
+
+<?php
+echo 'indent is correct - first on line for open tag is open tag';
+?>
+<?php
+echo 'indent is incorrect - first on line for open tag is inline HTML';
+?>
+
+
+<?php
+// This is only here so we can have a close tag as the first token on the next line.
+?>
+<?php
+// The PHP open tag should be fixed to be at the very start of the line without indent.
+// And the indent of this comment should be seen as correct.
+?>
+
+<?php
+// This test case file MUST always end with an unclosed long 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.23.inc Added

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

@@ -0,0 +1,123 @@
+<?php
+// This test case file MUST always start with a long 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 ECHO TAGS.
+?>
+<html>
+<head>
+<title><?= $title ?></title>
+<script><?= $script; ?></script>
+</head>
+<body>
+    <?=
+        $body;
+    ?>
+    hello
+    <?=
+    $moreBody;
+    ?>
+    <?=  'one'; ?>
+    <?=  'two';   ?>
+    <?= 'three;' ?>
+    <?= 'fourA'; echo 'fourB;'; ?>
+    <?=  'fiveA'; echo 'fiveB;';   ?>
+
+    <?=
+
+        $start - $indent + $end;
+
+    ?>
+    <?=
+
+    $blankLines;
+
+        ?>
+
+    <?=
+    $closerNeedsOwnLine; ?>
+    <?= $openerNeedsOwnLine;
+    ?>
+
+            <?=
+        'hi';
+            ?>
+
+    <?=
+'hi';
+    ?>
+
+    <a onClick="Javascript: set_hidden_field('<?= $link_offset - $num_per_page; ?>'); set_hidden_field('process_form', '0'); submit_form(); return false;">
+
+            <strong><?=
+            'foo';
+            ?></strong>
+
+</body>
+</html>
+
+<?= 'okay'; // Something. ?>
+<?= 'too much space before close'; // Something.      ?>
+<?= 'no space before close'; // Something.?>
+
+<?= 'okay'; /* translators: okay */ ?>
+<?= 'oops' /* translators: no space before close */?>
+<?= 'oops' /* translators: too much space before close */      ?>
+
+<?= 'okay'; // phpcs:ignore Standard.Category.Sniff -- reason. ?>
+<?= 'too much space before close'; // phpcs:ignore Standard.Category.Sniff -- reason.    ?>
+<?= 'no space before close'; // phpcs:ignore Standard.Category.Sniff -- reason.?>
+
+
+    <?=   $openerNeedsOwnLine;
+    ?>
+
+
+    <?=
+    $closerNeedsOwnLine;   ?>
+
+
+    <?=
+    $closerNeedsOwnLine;
+    ?>  </div>
+
+    <?=
+    $closerNeedsOwnLine;
+    ?>  <?= $i; ?>
+
+
+<?=$var ?>
+    <?=$var;
+    ?>
+
+// Safeguard fixing when there is no whitespace between the close tag and the contents.
+<?= $var?>
+    <?=
+    $var;?>
+
+
+<?=
+    'something'
+    ?><?=
+    'embedded';
+    ?>  <?=
+        'embedded';
+    ?><?=
+'embedded';
+    ?>
+
+<?php
+// This test case file MUST always end with an unclosed long 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.3.inc.fixed Added

@@ -0,0 +1,132 @@
+<?php
+// This test case file MUST always start with a long 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 ECHO TAGS.
+?>
+<html>
+<head>
+<title><?= $title; ?></title>
+<script><?= $script; ?></script>
+</head>
+<body>
+    <?=
+    $body;
+    ?>
+    hello
+    <?=
+    $moreBody;
+    ?>
+    <?= 'one'; ?>
+    <?= 'two'; ?>
+    <?= 'three;'; ?>
+    <?= 'fourA'; echo 'fourB;'; ?>
+    <?= 'fiveA'; echo 'fiveB;'; ?>
+
+    <?=
+    $start - $indent + $end;
+    ?>
+    <?=
+    $blankLines;
+        ?>
+
+    <?=
+    $closerNeedsOwnLine;
+    ?>
+    <?=
+    $openerNeedsOwnLine;
+    ?>
+
+        <?=
+        'hi';
+            ?>
+
+    <?=
+    'hi';
+    ?>
+
+    <a onClick="Javascript: set_hidden_field('<?= $link_offset - $num_per_page; ?>'); set_hidden_field('process_form', '0'); submit_form(); return false;">
+
+            <strong>
+            <?=
+            'foo';
+            ?>
+            </strong>
+
+</body>
+</html>
+
+<?= 'okay'; // Something. ?>
+<?= 'too much space before close'; // Something. ?>
+<?= 'no space before close'; // Something. ?>
+
+<?= 'okay'; /* translators: okay */ ?>
+<?= 'oops'; /* translators: no space before close */ ?>
+<?= 'oops'; /* translators: too much space before close */ ?>
+
+<?= 'okay'; // phpcs:ignore Standard.Category.Sniff -- reason. ?>
+<?= 'too much space before close'; // phpcs:ignore Standard.Category.Sniff -- reason. ?>
+<?= 'no space before close'; // phpcs:ignore Standard.Category.Sniff -- reason. ?>
+
+
+    <?=
+    $openerNeedsOwnLine;
+    ?>
+
+
+    <?=
+    $closerNeedsOwnLine;
+    ?>
+
+
+    <?=
+    $closerNeedsOwnLine;
+    ?>
+    </div>
+
+    <?=
+    $closerNeedsOwnLine;
+    ?>
+    <?= $i; ?>
+
+
+<?= $var; ?>
+    <?=
+    $var;
+    ?>
+
+// Safeguard fixing when there is no whitespace between the close tag and the contents.
+<?= $var; ?>
+    <?=
+    $var;
+    ?>
+
+
+<?=
+'something'
+    ?>
+    <?=
+    'embedded';
+    ?>
+    <?=
+    'embedded';
+    ?>
+    <?=
+    'embedded';
+    ?>
+
+<?php
+// This test case file MUST always end with an unclosed long 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.4.inc Added

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

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

@@ -0,0 +1,48 @@
+<?php
+// This test case file MUST always start with a long 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.
+
+// TEST CASE FILE FOR TESTS RELATED TO EMPTY TAG SETS USING THE SHORT OPEN TAG ONLY.
+
+// An empty set of short open/close tags is considered a parse error in PHP.
+// The sniff should still handle these the same way as an "empty" set of long PHP open/close tags (and remove the tags).
+
+// As this code is considered a parse error (though a non-blocking one for PHPCS), these tests are in a separate file
+// and no other type of tests should be added to this file!
+?>
+
+
+    <?=
+    ?>
+    <?= ?>
+
+
+        <div><?= ?></div>
+    <?= ?><?= $i; ?>
+
+
+        <?=?>
+
+    <?php if (true) { ?><?= $i; ?>  <?=?>  <?php } ?>
+
+        <div><?=
+        ?></div>
+    <?=
+    ?><?= $i; ?>
+
+
+    <?=
+    ?>
+
+    <?php if (true) { ?><?= $i; ?>  <?=
+    ?>  <?php } ?>
+
+<?php
+// This test case file MUST always end with an unclosed long 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.5.inc.fixed Added

@@ -0,0 +1,39 @@
+<?php
+// This test case file MUST always start with a long 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.
+
+// TEST CASE FILE FOR TESTS RELATED TO EMPTY TAG SETS USING THE SHORT OPEN TAG ONLY.
+
+// An empty set of short open/close tags is considered a parse error in PHP.
+// The sniff should still handle these the same way as an "empty" set of long PHP open/close tags (and remove the tags).
+
+// As this code is considered a parse error (though a non-blocking one for PHPCS), these tests are in a separate file
+// and no other type of tests should be added to this file!
+?>
+
+
+
+
+        <div></div>
+    <?= $i; ?>
+
+
+
+    <?php if (true) { ?><?= $i; ?>    <?php } ?>
+
+        <div></div>
+    <?= $i; ?>
+
+
+
+    <?php if (true) { ?><?= $i; ?>    <?php } ?>
+
+<?php
+// This test case file MUST always end with an unclosed long 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.6.inc Added

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

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

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

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

@@ -1,119 +0,0 @@
-<?php
-    // Not embedded. Do not check here.
-    echo 'hello';
-?>
-<html>
-<head>
-<title><?php echo $title ?></title>
-<script><?php echo $script; ?></script>
-</head>
-<body>
-    <?php
-        echo $body;
-    ?>
-    hello
-    <?php
-    echo $moreBody;
-    ?>
-    <?php  echo 'hi'; ?>
-    <?php  echo 'hi';   ?>
-    <?php echo 'hi;' ?>
-    <?php echo 'hi'; echo 'hi;'; ?>
-    <?php  echo 'hi'; echo 'hi;';   ?>
-
-    <?php
-    ?>
-    <?php ?>
-
-    <?php
-
-        echo $moreBody;
-
-    ?>
-    <?php
-
-    echo $moreBody;
-
-        ?>
-
-    <?php
-    echo $moreBody; ?>
-    <?php echo $moreBody;
-    ?>
-
-            <?php
-        echo 'hi';
-            ?>
-
-    <?php
-echo 'hi';
-    ?>
-</body>
-</html>
-<?php
-function test()
-{
-    foreach ($root->section as $section) {
-        ?>
-        <table>
-            <?php if ($foo) {
-            ?>
-            <tr>
-            </tr>
-            <?php }
-            ?>
-        <?php
-        foreach ($bar as $bar) {
-            echo $bar;
-        }
-    }
-
-    foreach ($root->section as $section) {
-        ?>
-        <table>
-            <?php
-            if ($foo) {
-            ?>
-            <tr>
-            </tr>
-            <?php
-}
-            ?>
-        <?php
-        foreach ($bar as $bar) {
-            echo $bar;
-        }
-    }
-}
-
-echo 'goodbye';
-
-function foo()
-{
-
-    ?><a onClick="Javascript: set_hidden_field('<?php echo $link_offset - $num_per_page; ?>'); set_hidden_field('process_form', '0'); submit_form(); return false;"><?php
-
-}
-
-?>
-
-            <strong><?php
-            echo 'foo';
-            ?></strong>
-
-?>
-
-</html>
-
-<?php if ($foo) { ?>
-<?php } ?>
-
-<?php echo 'oops'; // Something. ?>
-<?php echo 'oops'; // Something.      ?>
-<?php echo 'oops'; // Something.?>
-
-<?php /* translators: My sites label */ ?>
-<?php /* translators: My sites label */?>
-<?php /* translators: My sites label */      ?>
-
-<?php echo 'oops'; // phpcs:ignore Standard.Category.Sniff -- reason. ?>

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

@@ -1,119 +0,0 @@
-<?php
-    // Not embedded. Do not check here.
-    echo 'hello';
-?>
-<html>
-<head>
-<title><?php echo $title; ?></title>
-<script><?php echo $script; ?></script>
-</head>
-<body>
-    <?php
-    echo $body;
-    ?>
-    hello
-    <?php
-    echo $moreBody;
-    ?>
-    <?php echo 'hi'; ?>
-    <?php echo 'hi'; ?>
-    <?php echo 'hi;'; ?>
-    <?php echo 'hi'; echo 'hi;'; ?>
-    <?php echo 'hi'; echo 'hi;'; ?>
-
-        
-    <?php
-    echo $moreBody;
-    ?>
-    <?php
-    echo $moreBody;
-        ?>
-
-    <?php
-    echo $moreBody; 
-    ?>
-    <?php 
-    echo $moreBody;
-    ?>
-
-        <?php
-        echo 'hi';
-            ?>
-
-    <?php
-    echo 'hi';
-    ?>
-</body>
-</html>
-<?php
-function test()
-{
-    foreach ($root->section as $section) {
-        ?>
-        <table>
-            <?php 
-            if ($foo) {
-            ?>
-            <tr>
-            </tr>
-            <?php 
-            }
-            ?>
-        <?php
-        foreach ($bar as $bar) {
-            echo $bar;
-        }
-    }
-
-    foreach ($root->section as $section) {
-        ?>
-        <table>
-            <?php
-            if ($foo) {
-            ?>
-            <tr>
-            </tr>
-            <?php
-}
-            ?>
-        <?php
-        foreach ($bar as $bar) {
-            echo $bar;
-        }
-    }
-}
-
-echo 'goodbye';
-
-function foo()
-{
-    ?>
-    <a onClick="Javascript: set_hidden_field('<?php echo $link_offset - $num_per_page; ?>'); set_hidden_field('process_form', '0'); submit_form(); return false;">
-    <?php
-
-}
-
-?>
-
-            <strong>
-            <?php
-            echo 'foo';
-            ?>
-            </strong>
-
-?>
-
-</html>
-
-<?php if ($foo) { ?>
-<?php } ?>
-
-<?php echo 'oops'; // Something. ?>
-<?php echo 'oops'; // Something. ?>
-<?php echo 'oops'; // Something. ?>
-
-<?php /* translators: My sites label */ ?>
-<?php /* translators: My sites label */ ?>
-<?php /* translators: My sites label */ ?>
-
-<?php echo 'oops'; // phpcs:ignore Standard.Category.Sniff -- reason. ?>

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

@@ -16,7 +16,7 @@
  *
  * @covers \PHP_CodeSniffer\Standards\Squiz\Sniffs\PHP\EmbeddedPhpSniff
  */
-class EmbeddedPhpUnitTest extends AbstractSniffUnitTest
+final class EmbeddedPhpUnitTest extends AbstractSniffUnitTest
 {
 
 
@@ -26,41 +26,173 @@
      * The key of the array should represent the line number and the value
      * should represent the number of errors that should occur on that line.
      *
+     * @param string $testFile The name of the file being tested.
+     *
      * @return array<int, int>
      */
-    public function getErrorList()
+    public function getErrorList($testFile='')
     {
-        return 
-            7   => 1,
-            12  => 1,
-            18  => 1,
-            19  => 2,
-            20  => 1,
-            21  => 1,
-            22  => 3,
-            24  => 1,
-            26  => 1,
-            29  => 1,
-            30  => 1,
-            31  => 1,
-            34  => 1,
-            36  => 1,
-            40  => 1,
-            41  => 1,
-            44  => 1,
-            45  => 1,
-            49  => 1,
-            59  => 1,
-            63  => 1,
-            93  => 1,
-            94  => 2,
-            100 => 1,
-            102 => 1,
-            112 => 1,
-            113 => 1,
-            116 => 1,
-            117 => 1,
-        ;
+        switch ($testFile) {
+        case 'EmbeddedPhpUnitTest.1.inc':
+            return 
+                7   => 1,
+                12  => 1,
+                18  => 1,
+                19  => 2,
+                20  => 1,
+                21  => 1,
+                22  => 3,
+                24  => 1,
+                26  => 1,
+                29  => 1,
+                30  => 1,
+                31  => 1,
+                34  => 1,
+                36  => 1,
+                40  => 1,
+                41  => 1,
+                44  => 1,
+                45  => 1,
+                49  => 1,
+                59  => 1,
+                63  => 1,
+                93  => 1,
+                94  => 2,
+                100 => 1,
+                102 => 1,
+                112 => 1,
+                113 => 1,
+                116 => 1,
+                117 => 1,
+                120 => 1,
+                121 => 1,
+                128 => 1,
+                129 => 1,
+                132 => 1,
+                134 => 1,
+                136 => 1,
+                138 => 1,
+                142 => 1,
+                145 => 1,
+                151 => 1,
+                158 => 1,
+                165 => 1,
+                169 => 1,
+                175 => 1,
+                176 => 2,
+                178 => 1,
+                179 => 1,
+                180 => 2,
+                181 => 1,
+                189 => 1,
+                212 => 1,
+                214 => 2,
+                219 => 1,
+                223 => 1,
+                225 => 1,
+                226 => 1,
+                227 => 2,
+                228 => 1,
+                235 => 1,
+                241 => 1,
+                248 => 1,
+                253 => 1,
+                258 => 1,
+                263 => 1,
+                264 => 1,
+            ;
+
+        case 'EmbeddedPhpUnitTest.2.inc':
+        case 'EmbeddedPhpUnitTest.4.inc':
+            return 
+                5 => 2,
+                6 => 2,
+                7 => 2,
+            ;
+
+        case 'EmbeddedPhpUnitTest.3.inc':
+            return 
+                10  => 1,
+                15  => 1,
+                21  => 1,
+                22  => 2,
+                23  => 1,
+                24  => 1,
+                25  => 3,
+                28  => 1,
+                29  => 1,
+                30  => 1,
+                33  => 1,
+                35  => 1,
+                39  => 1,
+                40  => 1,
+                43  => 1,
+                44  => 1,
+                48  => 1,
+                53  => 1,
+                55  => 1,
+                61  => 1,
+                62  => 1,
+                65  => 2,
+                66  => 2,
+                69  => 1,
+                70  => 1,
+                75  => 1,
+                82  => 1,
+                89  => 1,
+                93  => 1,
+                98  => 2,
+                99  => 1,
+                103 => 2,
+                105 => 1,
+                111 => 1,
+                112 => 2,
+                114 => 1,
+                115 => 1,
+                116 => 2,
+                117 => 1,
+            ;
+
+        case 'EmbeddedPhpUnitTest.5.inc':
+            return 
+                16 => 1,
+                18 => 1,
+                25 => 1,
+                26 => 1,
+                29 => 1,
+                31 => 1,
+                33 => 1,
+                35 => 1,
+                39 => 1,
+                42 => 1,
+            ;
+
+        case 'EmbeddedPhpUnitTest.12.inc':
+        case 'EmbeddedPhpUnitTest.13.inc':
+            return 
+                10 => 1,
+                12 => 1,
+            ;
+
+        case 'EmbeddedPhpUnitTest.18.inc':
+            return 11 => 1;
+
+        case 'EmbeddedPhpUnitTest.19.inc':
+            return 13 => 1;
+
+        case 'EmbeddedPhpUnitTest.20.inc':
+        case 'EmbeddedPhpUnitTest.21.inc':
+            return 12 => 2;
+
+        case 'EmbeddedPhpUnitTest.22.inc':
+            return 
+                14 => 1,
+                22 => 2,
+            ;
+
+        default:
+            return ;
+        }//end switch
 
     }//end getErrorList()

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Zend/Sniffs/Debug/CodeAnalyzerSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Zend/Tests/Debug/CodeAnalyzerUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Zend/Tests/Files/ClosingTagUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Zend/Tests/NamingConventions/ValidVariableNameUnitTest.php Changed

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

@@ -526,8 +526,9 @@
         $numTokens         = count($tokens);
         $lastNotEmptyToken = 0;
 
-        $insideInlineIf = ;
-        $insideUseGroup = false;
+        $insideInlineIf         = ;
+        $insideUseGroup         = false;
+        $insideConstDeclaration = false;
 
         $commentTokenizer = new Comment();
 
@@ -608,7 +609,8 @@
             if ($tokenIsArray === true
                 && isset(Util\Tokens::$contextSensitiveKeywords$token0) === true
                 && (isset($this->tstringContexts$finalTokens$lastNotEmptyToken'code') === true
-                || $finalTokens$lastNotEmptyToken'content' === '&')
+                || $finalTokens$lastNotEmptyToken'content' === '&'
+                || $insideConstDeclaration === true)
             ) {
                 if (isset($this->tstringContexts$finalTokens$lastNotEmptyToken'code') === true) {
                     $preserveKeyword = false;
@@ -621,6 +623,23 @@
                         $preserveKeyword = true;
                     }
 
+                    // `new readonly class` should be preserved.
+                    if ($finalTokens$lastNotEmptyToken'code' === T_NEW
+                        && strtolower($token1) === 'readonly'
+                    ) {
+                        for ($i = ($stackPtr + 1); $i < $numTokens; $i++) {
+                            if (is_array($tokens$i) === false
+                                || isset(Util\Tokens::$emptyTokens$tokens$i0) === false
+                            ) {
+                                break;
+                            }
+                        }
+
+                        if (is_array($tokens$i) === true && $tokens$i0 === T_CLASS) {
+                            $preserveKeyword = true;
+                        }
+                    }
+
                     // `new class extends` `new class implements` should be preserved
                     if (($token0 === T_EXTENDS || $token0 === T_IMPLEMENTS)
                         && $finalTokens$lastNotEmptyToken'code' === T_CLASS
@@ -648,6 +667,30 @@
                     }
                 }//end if
 
+                // Types in typed constants should not be touched, but the constant name should be.
+                if ((isset($this->tstringContexts$finalTokens$lastNotEmptyToken'code') === true
+                    && $finalTokens$lastNotEmptyToken'code' === T_CONST)
+                    || $insideConstDeclaration === true
+                ) {
+                    $preserveKeyword = true;
+
+                    // Find the next non-empty token.
+                    for ($i = ($stackPtr + 1); $i < $numTokens; $i++) {
+                        if (is_array($tokens$i) === true
+                            && isset(Util\Tokens::$emptyTokens$tokens$i0) === true
+                        ) {
+                            continue;
+                        }
+
+                        break;
+                    }
+
+                    if ($tokens$i === '=' || $tokens$i === ';') {
+                        $preserveKeyword        = false;
+                        $insideConstDeclaration = false;
+                    }
+                }//end if
+
                 if ($finalTokens$lastNotEmptyToken'content' === '&') {
                     $preserveKeyword = true;
 
@@ -682,6 +725,26 @@
             }//end if
 
             /*
+                Mark the start of a constant declaration to allow for handling keyword to T_STRING
+                convertion for constant names using reserved keywords.
+            */
+
+            if ($tokenIsArray === true && $token0 === T_CONST) {
+                $insideConstDeclaration = true;
+            }
+
+            /*
+                Close an open "inside constant declaration" marker when no keyword convertion was needed.
+            */
+
+            if ($insideConstDeclaration === true
+                && $tokenIsArray === false
+                && ($token0 === '=' || $token0 === ';')
+            ) {
+                $insideConstDeclaration = false;
+            }
+
+            /*
                 Special case for `static` used as a function name, i.e. `static()`.
             */
 
@@ -1315,7 +1378,8 @@
 
             if ($tokenIsArray === true
                 && strtolower($token1) === 'readonly'
-                && isset($this->tstringContexts$finalTokens$lastNotEmptyToken'code') === false
+                && (isset($this->tstringContexts$finalTokens$lastNotEmptyToken'code') === false
+                || $finalTokens$lastNotEmptyToken'code' === T_NEW)
             ) {
                 // Get the next non-whitespace token.
                 for ($i = ($stackPtr + 1); $i < $numTokens; $i++) {
@@ -1709,7 +1773,7 @@
                     || (stripos($newContent, '0b') === 0 && bindec(str_replace('_', '', $newContent)) > PHP_INT_MAX)
                     || (stripos($newContent, '0o') === 0 && octdec(str_replace('_', '', $newContent)) > PHP_INT_MAX)
                     || (stripos($newContent, '0x') !== 0
-                    && stripos($newContent, 'e') !== false || strpos($newContent, '.') !== false)
+                    && (stripos($newContent, 'e') !== false || strpos($newContent, '.') !== false))
                     || (strpos($newContent, '0') === 0 && stripos($newContent, '0x') !== 0
                     && stripos($newContent, '0b') !== 0 && octdec(str_replace('_', '', $newContent)) > PHP_INT_MAX)
                     || (strpos($newContent, '0') !== 0 && str_replace('_', '', $newContent) > PHP_INT_MAX))
@@ -1851,6 +1915,20 @@
                 $newToken            = ;
                 $newToken'content' = '?';
 
+                // For typed constants, we only need to check the token before the ? to be sure.
+                if ($finalTokens$lastNotEmptyToken'code' === T_CONST) {
+                    $newToken'code' = T_NULLABLE;
+                    $newToken'type' = 'T_NULLABLE';
+
+                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
+                        echo "\t\t* token $stackPtr changed from ? to T_NULLABLE".PHP_EOL;
+                    }
+
+                    $finalTokens$newStackPtr = $newToken;
+                    $newStackPtr++;
+                    continue;
+                }
+
                 /*
                  * Check if the next non-empty token is one of the tokens which can be used
                  * in type declarations. If not, it's definitely a ternary.
@@ -2218,7 +2296,30 @@
                 if ($tokenIsArray === true && $token0 === T_STRING) {
                     $preserveTstring = false;
 
-                    if (isset($this->tstringContexts$finalTokens$lastNotEmptyToken'code') === true) {
+                    // True/false/parent/self/static in typed constants should be fixed to their own token,
+                    // but the constant name should not be.
+                    if ((isset($this->tstringContexts$finalTokens$lastNotEmptyToken'code') === true
+                        && $finalTokens$lastNotEmptyToken'code' === T_CONST)
+                        || $insideConstDeclaration === true
+                    ) {
+                        // Find the next non-empty token.
+                        for ($i = ($stackPtr + 1); $i < $numTokens; $i++) {
+                            if (is_array($tokens$i) === true
+                                && isset(Util\Tokens::$emptyTokens$tokens$i0) === true
+                            ) {
+                                continue;
+                            }
+
+                            break;
+                        }
+
+                        if ($tokens$i === '=') {
+                            $preserveTstring        = true;
+                            $insideConstDeclaration = false;
+                        }
+                    } else if (isset($this->tstringContexts$finalTokens$lastNotEmptyToken'code') === true
+                        && $finalTokens$lastNotEmptyToken'code' !== T_CONST
+                    ) {
                         $preserveTstring = true;
 
                         // Special case for syntax like: return new self/new parent
@@ -2990,6 +3091,12 @@
                         $suspectedType = 'return';
                     }
 
+                    if ($this->tokens$x'code' === T_EQUAL) {
+                        // Possible constant declaration, the `T_STRING` name will have been skipped over already.
+                        $suspectedType = 'constant';
+                        break;
+                    }
+
                     break;
                 }//end for
 
@@ -2999,7 +3106,7 @@
                 }
 
                 if ($suspectedType === 'property or parameter') {
-                    unset($allowed\T_STATIC);
+                    unset($allowedT_STATIC);
                 }
 
                 $typeTokenCount = 0;
@@ -3030,6 +3137,11 @@
                         $confirmed = true;
                         break;
                     }
+
+                    if ($suspectedType === 'constant' && $this->tokens$x'code' === T_CONST) {
+                        $confirmed = true;
+                        break;
+                    }
 
                     if ($suspectedType === 'property or parameter'
                         && (isset(Util\Tokens::$scopeModifiers$this->tokens$x'code') === true

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

@@ -0,0 +1,196 @@
+<?php
+/**
+ * Config class for use in the tests.
+ *
+ * The Config class contains a number of static properties.
+ * As the value of these static properties will be retained between instantiations of the class,
+ * config values set in one test can influence the results for another test, which makes tests unstable.
+ *
+ * This class is a "double" of the Config class which prevents this from happening.
+ * In _most_ cases, tests should be using this class instead of the "normal" Config,
+ * with the exception of select tests for the Config class itself.
+ *
+ * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
+ * @copyright 2024 Juliette Reinders Folmer. All rights reserved.
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Tests;
+
+use PHP_CodeSniffer\Config;
+use ReflectionProperty;
+
+final class ConfigDouble extends Config
+{
+
+    /**
+     * Whether or not the setting of a standard should be skipped.
+     *
+     * @var boolean
+     */
+    private $skipSettingStandard = false;
+
+
+    /**
+     * Creates a clean Config object and populates it with command line values.
+     *
+     * @param array<string> $cliArgs                An array of values gathered from CLI args.
+     * @param bool          $skipSettingStandard    Whether to skip setting a standard to prevent
+     *                                              the Config class trying to auto-discover a ruleset file.
+     *                                              Should only be set to `true` for tests which actually test
+     *                                              the ruleset auto-discovery.
+     *                                              Note: there is no need to set this to `true` when a standard
+     *                                              is being passed via the `$cliArgs`. Those settings will always
+     *                                              respected.
+     *                                              Defaults to `false`. Will result in the standard being set
+     *                                              to "PSR1" if not provided via `$cliArgs`.
+     * @param bool          $skipSettingReportWidth Whether to skip setting a report-width to prevent
+     *                                              the Config class trying to auto-discover the screen width.
+     *                                              Should only be set to `true` for tests which actually test
+     *                                              the screen width auto-discovery.
+     *                                              Note: there is no need to set this to `true` when a report-width
+     *                                              is being passed via the `$cliArgs`. Those settings will always
+     *                                              respected.
+     *                                              Defaults to `false`. Will result in the reportWidth being set
+     *                                              to "80" if not provided via `$cliArgs`.
+     *
+     * @return void
+     */
+    public function __construct(array $cliArgs=, $skipSettingStandard=false, $skipSettingReportWidth=false)
+    {
+        $this->skipSettingStandard = $skipSettingStandard;
+
+        $this->resetSelectProperties();
+        $this->preventReadingCodeSnifferConfFile();
+
+        parent::__construct($cliArgs);
+
+        if ($skipSettingReportWidth !== true) {
+            $this->preventAutoDiscoveryScreenWidth();
+        }
+
+    }//end __construct()
+
+
+    /**
+     * Sets the command line values and optionally prevents a file system search for a custom ruleset.
+     *
+     * @param array<string> $args An array of command line arguments to set.
+     *
+     * @return void
+     */
+    public function setCommandLineValues($args)
+    {
+        parent::setCommandLineValues($args);
+
+        if ($this->skipSettingStandard !== true) {
+            $this->preventSearchingForRuleset();
+        }
+
+    }//end setCommandLineValues()
+
+
+    /**
+     * Reset a few properties on the Config class to their default values.
+     *
+     * @return void
+     */
+    private function resetSelectProperties()
+    {
+        $this->setStaticConfigProperty('overriddenDefaults', );
+        $this->setStaticConfigProperty('executablePaths', );
+
+    }//end resetSelectProperties()
+
+
+    /**
+     * Prevent the values in a potentially available user-specific `CodeSniffer.conf` file
+     * from influencing the tests.
+     *
+     * This also prevents some file system calls which can influence the test runtime.
+     *
+     * @return void
+     */
+    private function preventReadingCodeSnifferConfFile()
+    {
+        $this->setStaticConfigProperty('configData', );
+        $this->setStaticConfigProperty('configDataFile', '');
+
+    }//end preventReadingCodeSnifferConfFile()
+
+
+    /**
+     * Prevent searching for a custom ruleset by setting a standard, but only if the test
+     * being run doesn't set a standard itself.
+     *
+     * This also prevents some file system calls which can influence the test runtime.
+     *
+     * The standard being set is the smallest one available so the ruleset initialization
+     * will be the fastest possible.
+     *
+     * @return void
+     */
+    private function preventSearchingForRuleset()
+    {
+        $overriddenDefaults = $this->getStaticConfigProperty('overriddenDefaults');
+        if (isset($overriddenDefaults'standards') === false) {
+            $this->standards = 'PSR1';
+            $overriddenDefaults'standards' = true;
+        }
+
+        self::setStaticConfigProperty('overriddenDefaults', $overriddenDefaults);
+
+    }//end preventSearchingForRuleset()
+
+
+    /**
+     * Prevent a call to stty to figure out the screen width, but only if the test being run
+     * doesn't set a report width itself.
+     *
+     * @return void
+     */
+    private function preventAutoDiscoveryScreenWidth()
+    {
+        $settings = $this->getSettings();
+        if ($settings'reportWidth' === 'auto') {
+            $this->reportWidth = self::DEFAULT_REPORT_WIDTH;
+        }
+
+    }//end preventAutoDiscoveryScreenWidth()
+
+
+    /**
+     * Helper function to retrieve the value of a private static property on the Config class.
+     *
+     * @param string $name The name of the property to retrieve.
+     *
+     * @return mixed
+     */
+    private function getStaticConfigProperty($name)
+    {
+        $property = new ReflectionProperty('PHP_CodeSniffer\Config', $name);
+        $property->setAccessible(true);
+        return $property->getValue();
+
+    }//end getStaticConfigProperty()
+
+
+    /**
+     * Helper function to set the value of a private static property on the Config class.
+     *
+     * @param string $name  The name of the property to set.
+     * @param mixed  $value The value to set the property to.
+     *
+     * @return void
+     */
+    private function setStaticConfigProperty($name, $value)
+    {
+        $property = new ReflectionProperty('PHP_CodeSniffer\Config', $name);
+        $property->setAccessible(true);
+        $property->setValue(null, $value);
+        $property->setAccessible(false);
+
+    }//end setStaticConfigProperty()
+
+
+}//end class

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

@@ -9,11 +9,11 @@
 
 namespace PHP_CodeSniffer\Tests\Core;
 
-use PHP_CodeSniffer\Config;
 use PHP_CodeSniffer\Ruleset;
 use PHP_CodeSniffer\Files\DummyFile;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Tests\ConfigDouble;
 use PHPUnit\Framework\TestCase;
-use ReflectionProperty;
 
 abstract class AbstractMethodUnitTest extends TestCase
 {
@@ -57,22 +57,7 @@
      */
     public static function initializeFile()
     {
-        /*
-         * Set the static properties in the Config class to specific values for performance
-         * and to clear out values from other tests.
-         */
-
-        self::setStaticConfigProperty('executablePaths', );
-
-        // Set to a usable value to circumvent Config trying to find a phpcs.xml config file.
-        self::setStaticConfigProperty('overriddenDefaults', 'standards' => 'PSR1');
-
-        // Set to values which prevent the test-runner user's `CodeSniffer.conf` file
-        // from being read and influencing the tests. Also prevent an `exec()` call to stty.
-        self::setStaticConfigProperty('configData', 'report_width' => 80);
-        self::setStaticConfigProperty('configDataFile', '');
-
-        $config = new Config();
+        $config = new ConfigDouble();
         // Also set a tab-width to enable testing tab-replaced vs `orig_content`.
         $config->tabWidth = static::$tabWidth;
 
@@ -94,41 +79,22 @@
 
 
     /**
-     * Clean up after finished test.
-     *
-     * @afterClass
+     * Get the token pointer for a target token based on a specific comment found on the line before.
      *
-     * @return void
-     */
-    public static function resetFile()
-    {
-        self::$phpcsFile = null;
-
-        // Reset the static properties in the Config class to their defaults to prevent tests influencing each other.
-        self::setStaticConfigProperty('overriddenDefaults', );
-        self::setStaticConfigProperty('executablePaths', );
-        self::setStaticConfigProperty('configData', null);
-        self::setStaticConfigProperty('configDataFile', null);
-
-    }//end resetFile()
-
-
-    /**
-     * Helper function to set the value of a private static property on the Config class.
+     * Note: the test delimiter comment MUST start with "/* test" to allow this function to
+     * distinguish between comments used *in* a test and test delimiters.
      *
-     * @param string $name  The name of the property to set.
-     * @param mixed  $value The value to set the property to.
+     * @param string           $commentString The delimiter comment to look for.
+     * @param int|string|array $tokenType     The type of token(s) to look for.
+     * @param string           $tokenContent  Optional. The token content for the target token.
      *
-     * @return void
+     * @return int
      */
-    public static function setStaticConfigProperty($name, $value)
+    public function getTargetToken($commentString, $tokenType, $tokenContent=null)
     {
-        $property = new ReflectionProperty('PHP_CodeSniffer\Config', $name);
-        $property->setAccessible(true);
-        $property->setValue(null, $value);
-        $property->setAccessible(false);
+        return self::getTargetTokenFromFile(self::$phpcsFile, $commentString, $tokenType, $tokenContent);
 
-    }//end setStaticConfigProperty()
+    }//end getTargetToken()
 
 
     /**
@@ -137,16 +103,17 @@
      * Note: the test delimiter comment MUST start with "/* test" to allow this function to
      * distinguish between comments used *in* a test and test delimiters.
      *
-     * @param string           $commentString The delimiter comment to look for.
-     * @param int|string|array $tokenType     The type of token(s) to look for.
-     * @param string           $tokenContent  Optional. The token content for the target token.
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile     The file to find the token in.
+     * @param string                      $commentString The delimiter comment to look for.
+     * @param int|string|array            $tokenType     The type of token(s) to look for.
+     * @param string                      $tokenContent  Optional. The token content for the target token.
      *
      * @return int
      */
-    public function getTargetToken($commentString, $tokenType, $tokenContent=null)
+    public static function getTargetTokenFromFile(File $phpcsFile, $commentString, $tokenType, $tokenContent=null)
     {
-        $start   = (self::$phpcsFile->numTokens - 1);
-        $comment = self::$phpcsFile->findPrevious(
+        $start   = ($phpcsFile->numTokens - 1);
+        $comment = $phpcsFile->findPrevious(
             T_COMMENT,
             $start,
             null,
@@ -154,7 +121,7 @@
             $commentString
         );
 
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $phpcsFile->getTokens();
         $end    = ($start + 1);
 
         // Limit the token finding to between this and the next delimiter comment.
@@ -169,7 +136,7 @@
             }
         }
 
-        $target = self::$phpcsFile->findNext(
+        $target = $phpcsFile->findNext(
             $tokenType,
             ($comment + 1),
             $end,
@@ -183,12 +150,12 @@
                 $msg .= ' With token content: '.$tokenContent;
             }
 
-            $this->assertFalse(true, $msg);
+            self::assertFalse(true, $msg);
         }
 
         return $target;
 
-    }//end getTargetToken()
+    }//end getTargetTokenFromFile()
 
 
     /**

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

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

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

@@ -9,17 +9,18 @@
 
 namespace PHP_CodeSniffer\Tests\Core;
 
-use PHP_CodeSniffer\Config;
 use PHP_CodeSniffer\Ruleset;
 use PHP_CodeSniffer\Files\DummyFile;
+use PHP_CodeSniffer\Tests\ConfigDouble;
 use PHPUnit\Framework\TestCase;
 
 /**
  * Tests for PHP_CodeSniffer error suppression tags.
  *
- * @coversNothing
+ * @covers PHP_CodeSniffer\Files\File::addMessage
+ * @covers PHP_CodeSniffer\Tokenizers\Tokenizer::createPositionMap
  */
-class ErrorSuppressionTest extends TestCase
+final class ErrorSuppressionTest extends TestCase
 {
 
 
@@ -32,7 +33,6 @@
      *                               Defaults to 0.
      *
      * @dataProvider dataSuppressError
-     * @covers       PHP_CodeSniffer\Tokenizers\Tokenizer::createPositionMap
      *
      * @return void
      */
@@ -41,7 +41,7 @@
         static $config, $ruleset;
 
         if (isset($config, $ruleset) === false) {
-            $config            = new Config();
+            $config            = new ConfigDouble();
             $config->standards = 'Generic';
             $config->sniffs    = 'Generic.PHP.LowerCaseConstant';
 
@@ -63,9 +63,9 @@
      *
      * @see testSuppressError()
      *
-     * @return array
+     * @return array<string, array<string, string|int>>
      */
-    public function dataSuppressError()
+    public static function dataSuppressError()
     {
         return 
             'no suppression'                                                           => 
@@ -165,7 +165,6 @@
      *                               Defaults to 1.
      *
      * @dataProvider dataSuppressSomeErrors
-     * @covers       PHP_CodeSniffer\Tokenizers\Tokenizer::createPositionMap
      *
      * @return void
      */
@@ -174,7 +173,7 @@
         static $config, $ruleset;
 
         if (isset($config, $ruleset) === false) {
-            $config            = new Config();
+            $config            = new ConfigDouble();
             $config->standards = 'Generic';
             $config->sniffs    = 'Generic.PHP.LowerCaseConstant';
 
@@ -202,9 +201,9 @@
      *
      * @see testSuppressSomeErrors()
      *
-     * @return array
+     * @return array<string, array<string, string|int>>
      */
-    public function dataSuppressSomeErrors()
+    public static function dataSuppressSomeErrors()
     {
         return 
             'no suppression'                               => 
@@ -258,7 +257,6 @@
      *                                 Defaults to 0.
      *
      * @dataProvider dataSuppressWarning
-     * @covers       PHP_CodeSniffer\Tokenizers\Tokenizer::createPositionMap
      *
      * @return void
      */
@@ -267,7 +265,7 @@
         static $config, $ruleset;
 
         if (isset($config, $ruleset) === false) {
-            $config            = new Config();
+            $config            = new ConfigDouble();
             $config->standards = 'Generic';
             $config->sniffs    = 'Generic.Commenting.Todo';
 
@@ -294,9 +292,9 @@
      *
      * @see testSuppressWarning()
      *
-     * @return array
+     * @return array<string, array<string, string|int>>
      */
-    public function dataSuppressWarning()
+    public static function dataSuppressWarning()
     {
         return 
             'no suppression'                               => 
@@ -343,7 +341,6 @@
      *                               Defaults to 1.
      *
      * @dataProvider dataSuppressLine
-     * @covers       PHP_CodeSniffer\Tokenizers\Tokenizer::createPositionMap
      *
      * @return void
      */
@@ -352,7 +349,7 @@
         static $config, $ruleset;
 
         if (isset($config, $ruleset) === false) {
-            $config            = new Config();
+            $config            = new ConfigDouble();
             $config->standards = 'Generic';
             $config->sniffs    = 'Generic.PHP.LowerCaseConstant';
 
@@ -379,9 +376,9 @@
      *
      * @see testSuppressLine()
      *
-     * @return array
+     * @return array<string, array<string, string|int>>
      */
-    public function dataSuppressLine()
+    public static function dataSuppressLine()
     {
         return 
             'no suppression'                             => 
@@ -391,12 +388,24 @@
             ,
 
             // With suppression on line before.
-            'ignore: line before, slash comment'         => 'before' => '// phpcs:ignore',
-            'ignore: line before, slash comment, with @' => 'before' => '// @phpcs:ignore',
-            'ignore: line before, hash comment'          => 'before' => '# phpcs:ignore',
-            'ignore: line before, hash comment, with @'  => 'before' => '# @phpcs:ignore',
-            'ignore: line before, star comment'          => 'before' => '/* phpcs:ignore */',
-            'ignore: line before, star comment, with @'  => 'before' => '/* @phpcs:ignore */',
+            'ignore: line before, slash comment'         => 
+                'before' => '// phpcs:ignore',
+            ,
+            'ignore: line before, slash comment, with @' => 
+                'before' => '// @phpcs:ignore',
+            ,
+            'ignore: line before, hash comment'          => 
+                'before' => '# phpcs:ignore',
+            ,
+            'ignore: line before, hash comment, with @'  => 
+                'before' => '# @phpcs:ignore',
+            ,
+            'ignore: line before, star comment'          => 
+                'before' => '/* phpcs:ignore */',
+            ,
+            'ignore: line before, star comment, with @'  => 
+                'before' => '/* @phpcs:ignore */',
+            ,
 
             // With suppression as trailing comment on code line.
             'ignore: end of line, slash comment'         => 
@@ -417,7 +426,9 @@
             ,
 
             // Deprecated syntax.
-            'old style: line before, slash comment'      => 'before' => '// @codingStandardsIgnoreLine',
+            'old style: line before, slash comment'      => 
+                'before' => '// @codingStandardsIgnoreLine',
+            ,
             'old style: end of line, slash comment'      => 
                 'before' => '',
                 'after'  => ' // @codingStandardsIgnoreLine',
@@ -430,13 +441,11 @@
     /**
      * Test suppressing a single error using a single line ignore in the middle of a line.
      *
-     * @covers PHP_CodeSniffer\Tokenizers\Tokenizer::createPositionMap
-     *
      * @return void
      */
     public function testSuppressLineMidLine()
     {
-        $config            = new Config();
+        $config            = new ConfigDouble();
         $config->standards = 'Generic';
         $config->sniffs    = 'Generic.PHP.LowerCaseConstant';
 
@@ -455,13 +464,11 @@
     /**
      * Test suppressing a single error using a single line ignore within a docblock.
      *
-     * @covers PHP_CodeSniffer\Tokenizers\Tokenizer::createPositionMap
-     *
      * @return void
      */
     public function testSuppressLineWithinDocblock()
     {
-        $config            = new Config();
+        $config            = new ConfigDouble();
         $config->standards = 'Generic';
         $config->sniffs    = 'Generic.Files.LineLength';
 
@@ -493,7 +500,6 @@
      * @param string $after  Annotation to place after the code.
      *
      * @dataProvider dataNestedSuppressLine
-     * @covers       PHP_CodeSniffer\Tokenizers\Tokenizer::createPositionMap
      *
      * @return void
      */
@@ -502,7 +508,7 @@
         static $config, $ruleset;
 
         if (isset($config, $ruleset) === false) {
-            $config            = new Config();
+            $config            = new ConfigDouble();
             $config->standards = 'Generic';
             $config->sniffs    = 'Generic.PHP.LowerCaseConstant';
 
@@ -530,9 +536,9 @@
      *
      * @see testNestedSuppressLine()
      *
-     * @return array
+     * @return array<string, array<string, string>>
      */
-    public function dataNestedSuppressLine()
+    public static function dataNestedSuppressLine()
     {
         return 
             // Process with disable/enable suppression and no single line suppression.
@@ -584,7 +590,6 @@
      *                               Defaults to 0.
      *
      * @dataProvider dataSuppressScope
-     * @covers       PHP_CodeSniffer\Tokenizers\Tokenizer::createPositionMap
      *
      * @return void
      */
@@ -593,7 +598,7 @@
         static $config, $ruleset;
 
         if (isset($config, $ruleset) === false) {
-            $config            = new Config();
+            $config            = new ConfigDouble();
             $config->standards = 'PEAR';
             $config->sniffs    = 'PEAR.Functions.FunctionDeclaration';
 
@@ -625,9 +630,9 @@
      *
      * @see testSuppressScope()
      *
-     * @return array
+     * @return array<string, array<string, string|int>>
      */
-    public function dataSuppressScope()
+    public static function dataSuppressScope()
     {
         return 
             'no suppression'                                       => 
@@ -682,7 +687,6 @@
      *                                 Defaults to 0.
      *
      * @dataProvider dataSuppressFile
-     * @covers       PHP_CodeSniffer\Tokenizers\Tokenizer::createPositionMap
      *
      * @return void
      */
@@ -691,7 +695,7 @@
         static $config, $ruleset;
 
         if (isset($config, $ruleset) === false) {
-            $config            = new Config();
+            $config            = new ConfigDouble();
             $config->standards = 'Generic';
             $config->sniffs    = 'Generic.Commenting.Todo';
 
@@ -720,9 +724,9 @@
      *
      * @see testSuppressFile()
      *
-     * @return array
+     * @return array<string, array<string, string|int>>
      */
-    public function dataSuppressFile()
+    public static function dataSuppressFile()
     {
         return 
             'no suppression'                                          => 
@@ -732,16 +736,30 @@
             ,
 
             // Process with suppression.
-            'ignoreFile: start of file, slash comment'                => 'before' => '// phpcs:ignoreFile',
-            'ignoreFile: start of file, slash comment, with @'        => 'before' => '// @phpcs:ignoreFile',
-            'ignoreFile: start of file, slash comment, mixed case'    => 'before' => '// PHPCS:Ignorefile',
-            'ignoreFile: start of file, hash comment'                 => 'before' => '# phpcs:ignoreFile',
-            'ignoreFile: start of file, hash comment, with @'         => 'before' => '# @phpcs:ignoreFile',
-            'ignoreFile: start of file, single-line star comment'     => 'before' => '/* phpcs:ignoreFile */',
+            'ignoreFile: start of file, slash comment'                => 
+                'before' => '// phpcs:ignoreFile',
+            ,
+            'ignoreFile: start of file, slash comment, with @'        => 
+                'before' => '// @phpcs:ignoreFile',
+            ,
+            'ignoreFile: start of file, slash comment, mixed case'    => 
+                'before' => '// PHPCS:Ignorefile',
+            ,
+            'ignoreFile: start of file, hash comment'                 => 
+                'before' => '# phpcs:ignoreFile',
+            ,
+            'ignoreFile: start of file, hash comment, with @'         => 
+                'before' => '# @phpcs:ignoreFile',
+            ,
+            'ignoreFile: start of file, single-line star comment'     => 
+                'before' => '/* phpcs:ignoreFile */',
+            ,
             'ignoreFile: start of file, multi-line star comment'      => 
                 'before' => '/*'.PHP_EOL.' phpcs:ignoreFile'.PHP_EOL.' */',
             ,
-            'ignoreFile: start of file, single-line docblock comment' => 'before' => '/** phpcs:ignoreFile */',
+            'ignoreFile: start of file, single-line docblock comment' => 
+                'before' => '/** phpcs:ignoreFile */',
+            ,
 
             // Process late comment.
             'ignoreFile: late comment, slash comment'                 => 
@@ -750,12 +768,18 @@
             ,
 
             // Deprecated syntax.
-            'old style: start of file, slash comment'                 => 'before' => '// @codingStandardsIgnoreFile',
-            'old style: start of file, single-line star comment'      => 'before' => '/* @codingStandardsIgnoreFile */',
+            'old style: start of file, slash comment'                 => 
+                'before' => '// @codingStandardsIgnoreFile',
+            ,
+            'old style: start of file, single-line star comment'      => 
+                'before' => '/* @codingStandardsIgnoreFile */',
+            ,
             'old style: start of file, multi-line star comment'       => 
                 'before' => '/*'.PHP_EOL.' @codingStandardsIgnoreFile'.PHP_EOL.' */',
             ,
-            'old style: start of file, single-line docblock comment'  => 'before' => '/** @codingStandardsIgnoreFile */',
+            'old style: start of file, single-line docblock comment'  => 
+                'before' => '/** @codingStandardsIgnoreFile */',
+            ,
 
             // Deprecated syntax, late comment.
             'old style: late comment, slash comment'                  => 
@@ -777,7 +801,6 @@
      *                                 Defaults to 0.
      *
      * @dataProvider dataDisableSelected
-     * @covers       PHP_CodeSniffer\Tokenizers\Tokenizer::createPositionMap
      *
      * @return void
      */
@@ -786,7 +809,7 @@
         static $config, $ruleset;
 
         if (isset($config, $ruleset) === false) {
-            $config            = new Config();
+            $config            = new ConfigDouble();
             $config->standards = 'Generic';
             $config->sniffs    = 
                 'Generic.PHP.LowerCaseConstant',
@@ -819,9 +842,9 @@
      *
      * @see testDisableSelected()
      *
-     * @return array
+     * @return array<string, array<string, string|int>>
      */
-    public function dataDisableSelected()
+    public static function dataDisableSelected()
     {
         return 
             // Single sniff.
@@ -843,7 +866,9 @@
             ,
 
             // Multiple sniffs.
-            'disable: multiple sniffs in one comment'      => 'before' => '// phpcs:disable Generic.Commenting.Todo,Generic.PHP.LowerCaseConstant',
+            'disable: multiple sniffs in one comment'      => 
+                'before' => '// phpcs:disable Generic.Commenting.Todo,Generic.PHP.LowerCaseConstant',
+            ,
             'disable: multiple sniff in multiple comments' => 
                 'before' => '// phpcs:disable Generic.Commenting.Todo'.PHP_EOL.'// phpcs:disable Generic.PHP.LowerCaseConstant',
             ,
@@ -853,12 +878,16 @@
                 'before'         => '// phpcs:disable Generic.Commenting',
                 'expectedErrors' => 1,
             ,
-            'disable: whole standard'                      => 'before' => '// phpcs:disable Generic',
+            'disable: whole standard'                      => 
+                'before' => '// phpcs:disable Generic',
+            ,
             'disable: single errorcode'                    => 
                 'before'         => '# @phpcs:disable Generic.Commenting.Todo.TaskFound',
                 'expectedErrors' => 1,
             ,
-            'disable: single errorcode and a category'     => 'before' => '// phpcs:disable Generic.PHP.LowerCaseConstant.Found,Generic.Commenting',
+            'disable: single errorcode and a category'     => 
+                'before' => '// phpcs:disable Generic.PHP.LowerCaseConstant.Found,Generic.Commenting',
+            ,
 
             // Wrong category/sniff/code.
             'disable: wrong error code and category'       => 
@@ -889,7 +918,6 @@
      * @param int    $expectedWarnings Number of warnings expected.
      *
      * @dataProvider dataEnableSelected
-     * @covers       PHP_CodeSniffer\Tokenizers\Tokenizer::createPositionMap
      *
      * @return void
      */
@@ -898,7 +926,7 @@
         static $config, $ruleset;
 
         if (isset($config, $ruleset) === false) {
-            $config            = new Config();
+            $config            = new ConfigDouble();
             $config->standards = 'Generic';
             $config->sniffs    = 
                 'Generic.PHP.LowerCaseConstant',
@@ -926,9 +954,9 @@
      *
      * @see testEnableSelected()
      *
-     * @return array
+     * @return array<string, array<string, string|int>>
      */
-    public function dataEnableSelected()
+    public static function dataEnableSelected()
     {
         return 
             'disable/enable: a single sniff'                                                                                => 
@@ -1064,7 +1092,6 @@
      * @param int    $expectedWarnings Number of warnings expected.
      *
      * @dataProvider dataIgnoreSelected
-     * @covers       PHP_CodeSniffer\Tokenizers\Tokenizer::createPositionMap
      *
      * @return void
      */
@@ -1073,7 +1100,7 @@
         static $config, $ruleset;
 
         if (isset($config, $ruleset) === false) {
-            $config            = new Config();
+            $config            = new ConfigDouble();
             $config->standards = 'Generic';
             $config->sniffs    = 
                 'Generic.PHP.LowerCaseConstant',
@@ -1106,9 +1133,9 @@
      *
      * @see testIgnoreSelected()
      *
-     * @return array
+     * @return array<string, array<string, string|int>>
      */
-    public function dataIgnoreSelected()
+    public static function dataIgnoreSelected()
     {
         return 
             'no suppression'                              => 
@@ -1156,7 +1183,6 @@
      * @param int    $expectedWarnings Number of warnings expected.
      *
      * @dataProvider dataCommenting
-     * @covers       PHP_CodeSniffer\Tokenizers\Tokenizer::createPositionMap
      *
      * @return void
      */
@@ -1165,7 +1191,7 @@
         static $config, $ruleset;
 
         if (isset($config, $ruleset) === false) {
-            $config            = new Config();
+            $config            = new ConfigDouble();
             $config->standards = 'Generic';
             $config->sniffs    = 
                 'Generic.PHP.LowerCaseConstant',
@@ -1193,9 +1219,9 @@
      *
      * @see testCommenting()
      *
-     * @return array
+     * @return array<string, array<string, string|int>>
      */
-    public function dataCommenting()
+    public static function dataCommenting()
     {
         return 
             'ignore: single sniff'                                                                         =>

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

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

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

@@ -16,7 +16,7 @@
  *
  * @covers \PHP_CodeSniffer\Files\File::findImplementedInterfaceNames
  */
-class FindImplementedInterfaceNamesTest extends AbstractMethodUnitTest
+final class FindImplementedInterfaceNamesTest extends AbstractMethodUnitTest
 {
 
 
@@ -73,7 +73,7 @@
      *
      * @return array<string, array<string, string|array<string>>>
      */
-    public function dataImplementedInterface()
+    public static function dataImplementedInterface()
     {
         return 
             'interface declaration, no implements'                               => 
@@ -86,7 +86,9 @@
             ,
             'class implements single interface, unqualified'                     => 
                 'identifier' => '/* testClassImplementsSingle */',
-                'expected'   => 'testFIINInterface',
+                'expected'   => 
+                    'testFIINInterface',
+                ,
             ,
             'class implements multiple interfaces'                               => 
                 'identifier' => '/* testClassImplementsMultiple */',
@@ -97,11 +99,15 @@
             ,
             'class implements single interface, fully qualified'                 => 
                 'identifier' => '/* testImplementsFullyQualified */',
-                'expected'   => '\PHP_CodeSniffer\Tests\Core\File\testFIINInterface',
+                'expected'   => 
+                    '\PHP_CodeSniffer\Tests\Core\File\testFIINInterface',
+                ,
             ,
             'class implements single interface, partially qualified'             => 
                 'identifier' => '/* testImplementsPartiallyQualified */',
-                'expected'   => 'Core\File\RelativeInterface',
+                'expected'   => 
+                    'Core\File\RelativeInterface',
+                ,
             ,
             'class extends and implements'                                       => 
                 'identifier' => '/* testClassThatExtendsAndImplements */',
@@ -123,7 +129,9 @@
             ,
             'enum implements single interface, unqualified'                      => 
                 'identifier' => '/* testEnumImplementsSingle */',
-                'expected'   => 'Colorful',
+                'expected'   => 
+                    'Colorful',
+                ,
             ,
             'enum implements multiple interfaces, unqualified + fully qualified' => 
                 'identifier' => '/* testBackedEnumImplementsMulti */',
@@ -134,7 +142,9 @@
             ,
             'anon class implements single interface, unqualified'                => 
                 'identifier' => '/* testAnonClassImplementsSingle */',
-                'expected'   => 'testFIINInterface',
+                'expected'   => 
+                    'testFIINInterface',
+                ,
             ,
             'parse error - implements keyword, but no interface name'            => 
                 'identifier' => '/* testMissingImplementsName */',

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

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

@@ -16,7 +16,7 @@
  *
  * @covers \PHP_CodeSniffer\Files\File::getClassProperties
  */
-class GetClassPropertiesTest extends AbstractMethodUnitTest
+final class GetClassPropertiesTest extends AbstractMethodUnitTest
 {
 
 
@@ -47,20 +47,20 @@
      *
      * @return array<string, array<string, string|int>>
      */
-    public function dataNotAClassException()
+    public static function dataNotAClassException()
     {
         return 
             'interface'  => 
                 'testMarker' => '/* testNotAClass */',
-                'tokenType'  => \T_INTERFACE,
+                'tokenType'  => T_INTERFACE,
             ,
             'anon-class' => 
                 'testMarker' => '/* testAnonClass */',
-                'tokenType'  => \T_ANON_CLASS,
+                'tokenType'  => T_ANON_CLASS,
             ,
             'enum'       => 
                 'testMarker' => '/* testEnum */',
-                'tokenType'  => \T_ENUM,
+                'tokenType'  => T_ENUM,
             ,
         ;
 
@@ -79,7 +79,7 @@
      */
     public function testGetClassProperties($testMarker, $expected)
     {
-        $class  = $this->getTargetToken($testMarker, \T_CLASS);
+        $class  = $this->getTargetToken($testMarker, T_CLASS);
         $result = self::$phpcsFile->getClassProperties($class);
         $this->assertSame($expected, $result);
 
@@ -93,7 +93,7 @@
      *
      * @return array<string, array<string, string|array<string, bool|int>>>
      */
-    public function dataGetClassProperties()
+    public static function dataGetClassProperties()
     {
         return 
             'no-properties'               =>

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

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

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

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

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

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

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

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

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

@@ -16,7 +16,7 @@
  *
  * @covers \PHP_CodeSniffer\Files\File::getMethodProperties
  */
-class GetMethodPropertiesTest extends AbstractMethodUnitTest
+final class GetMethodPropertiesTest extends AbstractMethodUnitTest
 {
 
 
@@ -562,6 +562,32 @@
 
 
     /**
+     * Test a function with return type "?static".
+     *
+     * @return void
+     */
+    public function testReturnTypeNullableStatic()
+    {
+        // Offsets are relative to the T_FUNCTION token.
+        $expected = 
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => '?static',
+            'return_type_token'     => 8,
+            'return_type_end_token' => 8,
+            'nullable_return_type'  => true,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
+        ;
+
+        $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testReturnTypeNullableStatic()
+
+
+    /**
      * Test a function with return type "mixed".
      *
      * @return void

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

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

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

@@ -1,6 +1,6 @@
 <?php
 /**
- * Tests for the \PHP_CodeSniffer\Filters\GitModified class.
+ * Abstract Testcase class for testing Filters.
  *
  * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
  * @copyright 2023 PHPCSStandards Contributors
@@ -9,9 +9,9 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Filters;
 
-use PHP_CodeSniffer\Config;
 use PHP_CodeSniffer\Filters\Filter;
 use PHP_CodeSniffer\Ruleset;
+use PHP_CodeSniffer\Tests\ConfigDouble;
 use PHPUnit\Framework\TestCase;
 use RecursiveIteratorIterator;
 
@@ -45,7 +45,7 @@
      */
     public static function initializeConfigAndRuleset()
     {
-        self::$config  = new Config('--standard=PSR1', '--extensions=php,inc/php,js,css', '--report-width=80');
+        self::$config  = new ConfigDouble('--extensions=php,inc/php,js,css');
         self::$ruleset = new Ruleset(self::$config);
 
     }//end initializeConfigAndRuleset()
@@ -73,7 +73,7 @@
     {
         $mockedObj = $this->getMockBuilder($className);
 
-        if (\method_exists($mockedObj, 'onlyMethods') === true) {
+        if (method_exists($mockedObj, 'onlyMethods') === true) {
             // PHPUnit 8+.
             if (is_array($methodsToMock) === true) {
                 return $mockedObj

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

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

@@ -19,7 +19,7 @@
  *
  * @covers \PHP_CodeSniffer\Filters\GitModified
  */
-class GitModifiedTest extends AbstractFilterTestCase
+final class GitModifiedTest extends AbstractFilterTestCase
 {
 
 
@@ -112,14 +112,18 @@
 
             'single file marked as git modified - file in root dir'                => 
                 'inputPaths'        => $fakeFileList,
-                'outputGitModified' => 'autoload.php',
+                'outputGitModified' => 
+                    'autoload.php',
+                ,
                 'expectedOutput'    => 
                     $basedir.'/autoload.php',
                 ,
             ,
             'single file marked as git modified - file in sub dir'                 => 
                 'inputPaths'        => $fakeFileList,
-                'outputGitModified' => 'src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php',
+                'outputGitModified' => 
+                    'src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php',
+                ,
                 'expectedOutput'    => 
                     $basedir.'/src',
                     $basedir.'/src/Standards',
@@ -211,6 +215,10 @@
      */
     public function testExecAlwaysReturnsArray($cmd, $expected)
     {
+        if (is_dir(__DIR__.'/../../../.git') === false) {
+            $this->markTestSkipped('Not a git repository');
+        }
+
         $fakeDI = new RecursiveArrayIterator(self::getFakeFileList());
         $filter = new GitModified($fakeDI, '/', self::$config, self::$ruleset);

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

@@ -19,7 +19,7 @@
  *
  * @covers \PHP_CodeSniffer\Filters\GitStaged
  */
-class GitStagedTest extends AbstractFilterTestCase
+final class GitStagedTest extends AbstractFilterTestCase
 {
 
 
@@ -112,14 +112,18 @@
 
             'single file marked as git modified - file in root dir'                => 
                 'inputPaths'      => $fakeFileList,
-                'outputGitStaged' => 'autoload.php',
+                'outputGitStaged' => 
+                    'autoload.php',
+                ,
                 'expectedOutput'  => 
                     $basedir.'/autoload.php',
                 ,
             ,
             'single file marked as git modified - file in sub dir'                 => 
                 'inputPaths'      => $fakeFileList,
-                'outputGitStaged' => 'src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php',
+                'outputGitStaged' => 
+                    'src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php',
+                ,
                 'expectedOutput'  => 
                     $basedir.'/src',
                     $basedir.'/src/Standards',
@@ -211,6 +215,10 @@
      */
     public function testExecAlwaysReturnsArray($cmd, $expected)
     {
+        if (is_dir(__DIR__.'/../../../.git') === false) {
+            $this->markTestSkipped('Not a git repository');
+        }
+
         $fakeDI = new RecursiveArrayIterator(self::getFakeFileList());
         $filter = new GitStaged($fakeDI, '/', self::$config, self::$ruleset);

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/ExplainCustomRulesetTest.xml Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/ExplainSingleSniffTest.xml Added

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

@@ -9,8 +9,9 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Ruleset;
 
-use PHP_CodeSniffer\Config;
 use PHP_CodeSniffer\Ruleset;
+use PHP_CodeSniffer\Runner;
+use PHP_CodeSniffer\Tests\ConfigDouble;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -18,7 +19,7 @@
  *
  * @covers \PHP_CodeSniffer\Ruleset::explain
  */
-class ExplainTest extends TestCase
+final class ExplainTest extends TestCase
 {
 
 
@@ -30,7 +31,7 @@
     public function testExplain()
     {
         // Set up the ruleset.
-        $config  = new Config('--standard=PSR1', '-e');
+        $config  = new ConfigDouble('--standard=PSR1', '-e');
         $ruleset = new Ruleset($config);
 
         $expected  = PHP_EOL;
@@ -57,4 +58,201 @@
     }//end testExplain()
 
 
+    /**
+     * Test the output of the "explain" command is not influenced by a user set report width.
+     *
+     * @return void
+     */
+    public function testExplainAlwaysDisplaysCompleteSniffName()
+    {
+        // Set up the ruleset.
+        $config  = new ConfigDouble('--standard=PSR1', '-e', '--report-width=30');
+        $ruleset = new Ruleset($config);
+
+        $expected  = PHP_EOL;
+        $expected .= 'The PSR1 standard contains 8 sniffs'.PHP_EOL.PHP_EOL;
+        $expected .= 'Generic (4 sniffs)'.PHP_EOL;
+        $expected .= '------------------'.PHP_EOL;
+        $expected .= '  Generic.Files.ByteOrderMark'.PHP_EOL;
+        $expected .= '  Generic.NamingConventions.UpperCaseConstantName'.PHP_EOL;
+        $expected .= '  Generic.PHP.DisallowAlternativePHPTags'.PHP_EOL;
+        $expected .= '  Generic.PHP.DisallowShortOpenTag'.PHP_EOL.PHP_EOL;
+        $expected .= 'PSR1 (3 sniffs)'.PHP_EOL;
+        $expected .= '---------------'.PHP_EOL;
+        $expected .= '  PSR1.Classes.ClassDeclaration'.PHP_EOL;
+        $expected .= '  PSR1.Files.SideEffects'.PHP_EOL;
+        $expected .= '  PSR1.Methods.CamelCapsMethodName'.PHP_EOL.PHP_EOL;
+        $expected .= 'Squiz (1 sniff)'.PHP_EOL;
+        $expected .= '---------------'.PHP_EOL;
+        $expected .= '  Squiz.Classes.ValidClassName'.PHP_EOL;
+
+        $this->expectOutputString($expected);
+
+        $ruleset->explain();
+
+    }//end testExplainAlwaysDisplaysCompleteSniffName()
+
+
+    /**
+     * Test the output of the "explain" command when a ruleset only contains a single sniff.
+     *
+     * This is mostly about making sure that the summary line uses the correct grammar.
+     *
+     * @return void
+     */
+    public function testExplainSingleSniff()
+    {
+        // Set up the ruleset.
+        $standard = __DIR__.'/ExplainSingleSniffTest.xml';
+        $config   = new ConfigDouble("--standard=$standard", '-e');
+        $ruleset  = new Ruleset($config);
+
+        $expected  = PHP_EOL;
+        $expected .= 'The ExplainSingleSniffTest standard contains 1 sniff'.PHP_EOL.PHP_EOL;
+        $expected .= 'Squiz (1 sniff)'.PHP_EOL;
+        $expected .= '---------------'.PHP_EOL;
+        $expected .= '  Squiz.Scope.MethodScope'.PHP_EOL;
+
+        $this->expectOutputString($expected);
+
+        $ruleset->explain();
+
+    }//end testExplainSingleSniff()
+
+
+    /**
+     * Test that "explain" works correctly with custom rulesets.
+     *
+     * Verifies that:
+     * - The "standard" name is taken from the custom ruleset.
+     * - Any and all sniff additions and exclusions in the ruleset are taken into account correctly.
+     * - That the displayed list will have both the standards as well as the sniff names
+     *   ordered alphabetically.
+     *
+     * @return void
+     */
+    public function testExplainCustomRuleset()
+    {
+        // Set up the ruleset.
+        $standard = __DIR__.'/ExplainCustomRulesetTest.xml';
+        $config   = new ConfigDouble("--standard=$standard", '-e');
+        $ruleset  = new Ruleset($config);
+
+        $expected  = PHP_EOL;
+        $expected .= 'The ExplainCustomRulesetTest standard contains 10 sniffs'.PHP_EOL.PHP_EOL;
+        $expected .= 'Generic (4 sniffs)'.PHP_EOL;
+        $expected .= '------------------'.PHP_EOL;
+        $expected .= '  Generic.Files.ByteOrderMark'.PHP_EOL;
+        $expected .= '  Generic.NamingConventions.UpperCaseConstantName'.PHP_EOL;
+        $expected .= '  Generic.PHP.DisallowAlternativePHPTags'.PHP_EOL;
+        $expected .= '  Generic.PHP.DisallowShortOpenTag'.PHP_EOL.PHP_EOL;
+        $expected .= 'PSR1 (2 sniffs)'.PHP_EOL;
+        $expected .= '---------------'.PHP_EOL;
+        $expected .= '  PSR1.Classes.ClassDeclaration'.PHP_EOL;
+        $expected .= '  PSR1.Methods.CamelCapsMethodName'.PHP_EOL.PHP_EOL;
+        $expected .= 'PSR12 (2 sniffs)'.PHP_EOL;
+        $expected .= '----------------'.PHP_EOL;
+        $expected .= '  PSR12.ControlStructures.BooleanOperatorPlacement'.PHP_EOL;
+        $expected .= '  PSR12.ControlStructures.ControlStructureSpacing'.PHP_EOL.PHP_EOL;
+        $expected .= 'Squiz (2 sniffs)'.PHP_EOL;
+        $expected .= '----------------'.PHP_EOL;
+        $expected .= '  Squiz.Classes.ValidClassName'.PHP_EOL;
+        $expected .= '  Squiz.Scope.MethodScope'.PHP_EOL;
+
+        $this->expectOutputString($expected);
+
+        $ruleset->explain();
+
+    }//end testExplainCustomRuleset()
+
+
+    /**
+     * Test the output of the "explain" command for a standard containing both deprecated
+     * and non-deprecated sniffs.
+     *
+     * Tests that:
+     * - Deprecated sniffs are marked with an asterix in the list.
+     * - A footnote is displayed explaining the asterix.
+     * - And that the "standard uses # deprecated sniffs" listing is **not** displayed.
+     *
+     * @return void
+     */
+    public function testExplainWithDeprecatedSniffs()
+    {
+        // Set up the ruleset.
+        $standard = __DIR__."/ShowSniffDeprecationsTest.xml";
+        $config   = new ConfigDouble("--standard=$standard", '-e');
+        $ruleset  = new Ruleset($config);
+
+        $expected  = PHP_EOL;
+        $expected .= 'The SniffDeprecationTest standard contains 9 sniffs'.PHP_EOL.PHP_EOL;
+
+        $expected .= 'Fixtures (9 sniffs)'.PHP_EOL;
+        $expected .= '-------------------'.PHP_EOL;
+        $expected .= '  Fixtures.Deprecated.WithLongReplacement *'.PHP_EOL;
+        $expected .= '  Fixtures.Deprecated.WithoutReplacement *'.PHP_EOL;
+        $expected .= '  Fixtures.Deprecated.WithReplacement *'.PHP_EOL;
+        $expected .= '  Fixtures.Deprecated.WithReplacementContainingLinuxNewlines *'.PHP_EOL;
+        $expected .= '  Fixtures.Deprecated.WithReplacementContainingNewlines *'.PHP_EOL;
+        $expected .= '  Fixtures.SetProperty.AllowedAsDeclared'.PHP_EOL;
+        $expected .= '  Fixtures.SetProperty.AllowedViaMagicMethod'.PHP_EOL;
+        $expected .= '  Fixtures.SetProperty.AllowedViaStdClass'.PHP_EOL;
+        $expected .= '  Fixtures.SetProperty.NotAllowedViaAttribute'.PHP_EOL.PHP_EOL;
+
+        $expected .= '* Sniffs marked with an asterix are deprecated.'.PHP_EOL;
+
+        $this->expectOutputString($expected);
+
+        $ruleset->explain();
+
+    }//end testExplainWithDeprecatedSniffs()
+
+
+    /**
+     * Test that each standard passed on the command-line is explained separately.
+     *
+     * @covers \PHP_CodeSniffer\Runner::runPHPCS
+     *
+     * @return void
+     */
+    public function testExplainWillExplainEachStandardSeparately()
+    {
+        $standard        = __DIR__.'/ExplainSingleSniffTest.xml';
+        $_SERVER'argv' = 
+            'phpcs',
+            '-e',
+            "--standard=PSR1,$standard",
+            '--report-width=80',
+        ;
+
+        $expected  = PHP_EOL;
+        $expected .= 'The PSR1 standard contains 8 sniffs'.PHP_EOL.PHP_EOL;
+        $expected .= 'Generic (4 sniffs)'.PHP_EOL;
+        $expected .= '------------------'.PHP_EOL;
+        $expected .= '  Generic.Files.ByteOrderMark'.PHP_EOL;
+        $expected .= '  Generic.NamingConventions.UpperCaseConstantName'.PHP_EOL;
+        $expected .= '  Generic.PHP.DisallowAlternativePHPTags'.PHP_EOL;
+        $expected .= '  Generic.PHP.DisallowShortOpenTag'.PHP_EOL.PHP_EOL;
+        $expected .= 'PSR1 (3 sniffs)'.PHP_EOL;
+        $expected .= '---------------'.PHP_EOL;
+        $expected .= '  PSR1.Classes.ClassDeclaration'.PHP_EOL;
+        $expected .= '  PSR1.Files.SideEffects'.PHP_EOL;
+        $expected .= '  PSR1.Methods.CamelCapsMethodName'.PHP_EOL.PHP_EOL;
+        $expected .= 'Squiz (1 sniff)'.PHP_EOL;
+        $expected .= '---------------'.PHP_EOL;
+        $expected .= '  Squiz.Classes.ValidClassName'.PHP_EOL.PHP_EOL;
+
+        $expected .= 'The ExplainSingleSniffTest standard contains 1 sniff'.PHP_EOL.PHP_EOL;
+        $expected .= 'Squiz (1 sniff)'.PHP_EOL;
+        $expected .= '---------------'.PHP_EOL;
+        $expected .= '  Squiz.Scope.MethodScope'.PHP_EOL;
+
+        $this->expectOutputString($expected);
+
+        $runner   = new Runner();
+        $exitCode = $runner->runPHPCS();
+
+    }//end testExplainWillExplainEachStandardSeparately()
+
+
 }//end class

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/Fixtures/Sniffs/Category Deleted

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/Fixtures/Sniffs/Category/SetPropertyAllowedAsDeclaredSniff.php Deleted

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/Fixtures/Sniffs/Category/SetPropertyAllowedViaMagicMethodSniff.php Deleted

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/Fixtures/Sniffs/Category/SetPropertyAllowedViaStdClassSniff.php Deleted

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/Fixtures/Sniffs/Category/SetPropertyNotAllowedViaAttributeSniff.php Deleted

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/Fixtures/Sniffs/Deprecated Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/Fixtures/Sniffs/Deprecated/WithLongReplacementSniff.php Added

@@ -0,0 +1,41 @@
+<?php
+/**
+ * Test fixture.
+ *
+ * @see \PHP_CodeSniffer\Tests\Core\Ruleset\SniffDeprecationTest
+ */
+
+namespace Fixtures\Sniffs\Deprecated;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\DeprecatedSniff;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+class WithLongReplacementSniff implements Sniff,DeprecatedSniff
+{
+
+    public function getDeprecationVersion()
+    {
+        return 'v3.8.0';
+    }
+
+    public function getRemovalVersion()
+    {
+        return 'v4.0.0';
+    }
+
+    public function getDeprecationMessage()
+    {
+        return 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce vel vestibulum nunc. Sed luctus dolor tortor, eu euismod purus pretium sed. Fusce egestas congue massa semper cursus. Donec quis pretium tellus. In lacinia, augue ut ornare porttitor, diam nunc faucibus purus, et accumsan eros sapien at sem. Sed pulvinar aliquam malesuada. Aliquam erat volutpat. Mauris gravida rutrum lectus at egestas. Fusce tempus elit in tincidunt dictum. Suspendisse dictum egestas sapien, eget ullamcorper metus elementum semper. Vestibulum sem justo, consectetur ac tincidunt et, finibus eget libero.';
+    }
+
+    public function register()
+    {
+        return T_WHITESPACE;
+    }
+
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        // Do something.
+    }
+}

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/Fixtures/Sniffs/Deprecated/WithReplacementContainingLinuxNewlinesSniff.php Added

@@ -0,0 +1,45 @@
+<?php
+/**
+ * Test fixture.
+ *
+ * @see \PHP_CodeSniffer\Tests\Core\Ruleset\SniffDeprecationTest
+ */
+
+namespace Fixtures\Sniffs\Deprecated;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\DeprecatedSniff;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+class WithReplacementContainingLinuxNewlinesSniff implements Sniff,DeprecatedSniff
+{
+
+    public function getDeprecationVersion()
+    {
+        return 'v3.8.0';
+    }
+
+    public function getRemovalVersion()
+    {
+        return 'v4.0.0';
+    }
+
+    public function getDeprecationMessage()
+    {
+        return "Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n"
+            ."Fusce vel vestibulum nunc. Sed luctus dolor tortor, eu euismod purus pretium sed.\n"
+            ."Fusce egestas congue massa semper cursus. Donec quis pretium tellus.\n"
+            ."In lacinia, augue ut ornare porttitor, diam nunc faucibus purus, et accumsan eros sapien at sem.\n"
+            .'Sed pulvinar aliquam malesuada. Aliquam erat volutpat. Mauris gravida rutrum lectus at egestas.';
+    }
+
+    public function register()
+    {
+        return T_WHITESPACE;
+    }
+
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        // Do something.
+    }
+}

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/Fixtures/Sniffs/Deprecated/WithReplacementContainingNewlinesSniff.php Added

@@ -0,0 +1,45 @@
+<?php
+/**
+ * Test fixture.
+ *
+ * @see \PHP_CodeSniffer\Tests\Core\Ruleset\SniffDeprecationTest
+ */
+
+namespace Fixtures\Sniffs\Deprecated;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\DeprecatedSniff;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+class WithReplacementContainingNewlinesSniff implements Sniff,DeprecatedSniff
+{
+
+    public function getDeprecationVersion()
+    {
+        return 'v3.8.0';
+    }
+
+    public function getRemovalVersion()
+    {
+        return 'v4.0.0';
+    }
+
+    public function getDeprecationMessage()
+    {
+        return 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.'.PHP_EOL
+            .'Fusce vel vestibulum nunc. Sed luctus dolor tortor, eu euismod purus pretium sed.'.PHP_EOL
+            .'Fusce egestas congue massa semper cursus. Donec quis pretium tellus.'.PHP_EOL
+            .'In lacinia, augue ut ornare porttitor, diam nunc faucibus purus, et accumsan eros sapien at sem.'.PHP_EOL
+            .'Sed pulvinar aliquam malesuada. Aliquam erat volutpat. Mauris gravida rutrum lectus at egestas';
+    }
+
+    public function register()
+    {
+        return T_WHITESPACE;
+    }
+
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        // Do something.
+    }
+}

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/Fixtures/Sniffs/Deprecated/WithReplacementSniff.php Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/Fixtures/Sniffs/Deprecated/WithoutReplacementSniff.php Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/Fixtures/Sniffs/DeprecatedInvalid Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/Fixtures/Sniffs/DeprecatedInvalid/EmptyDeprecationVersionSniff.php Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/Fixtures/Sniffs/DeprecatedInvalid/EmptyRemovalVersionSniff.php Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/Fixtures/Sniffs/DeprecatedInvalid/InvalidDeprecationMessageSniff.php Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/Fixtures/Sniffs/DeprecatedInvalid/InvalidDeprecationVersionSniff.php Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/Fixtures/Sniffs/DeprecatedInvalid/InvalidRemovalVersionSniff.php Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/Fixtures/Sniffs/SetProperty Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/Fixtures/Sniffs/SetProperty/AllowedAsDeclaredSniff.php Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/Fixtures/Sniffs/SetProperty/AllowedViaMagicMethodSniff.php Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/Fixtures/Sniffs/SetProperty/AllowedViaStdClassSniff.php Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/Fixtures/Sniffs/SetProperty/NotAllowedViaAttributeSniff.php Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/Fixtures/ruleset.xml Added

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

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

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

@@ -9,8 +9,8 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Ruleset;
 
-use PHP_CodeSniffer\Config;
 use PHP_CodeSniffer\Ruleset;
+use PHP_CodeSniffer\Tests\ConfigDouble;
 use PHPUnit\Framework\TestCase;
 use ReflectionObject;
 
@@ -19,7 +19,7 @@
  *
  * @covers \PHP_CodeSniffer\Ruleset
  */
-class RuleInclusionTest extends TestCase
+final class RuleInclusionTest extends TestCase
 {
 
     /**
@@ -74,7 +74,7 @@
             self::markTestSkipped('On the fly ruleset adjustment failed');
         }
 
-        $config        = new Config("--standard=$standard");
+        $config        = new ConfigDouble("--standard=$standard");
         self::$ruleset = new Ruleset($config);
 
     }//end initializeConfigAndRuleset()
@@ -129,9 +129,9 @@
      *
      * @see self::testRegisteredSniffCodes()
      *
-     * @return array
+     * @return array<array<string>>
      */
-    public function dataRegisteredSniffCodes()
+    public static function dataRegisteredSniffCodes()
     {
         return 
             
@@ -335,9 +335,9 @@
      * Test that setting properties for standards, categories, sniffs works for all supported rule
      * inclusion methods.
      *
-     * @param string $sniffClass    The name of the sniff class.
-     * @param string $propertyName  The name of the changed property.
-     * @param mixed  $expectedValue The value expected for the property.
+     * @param string          $sniffClass    The name of the sniff class.
+     * @param string          $propertyName  The name of the changed property.
+     * @param string|int|bool $expectedValue The value expected for the property.
      *
      * @dataProvider dataSettingProperties
      *
@@ -362,62 +362,62 @@
      *
      * @see self::testSettingProperties()
      *
-     * @return array
+     * @return array<string, array<string, string|int|bool>>
      */
-    public function dataSettingProperties()
+    public static function dataSettingProperties()
     {
         return 
             'Set property for complete standard: PSR2 ClassDeclaration'                                  => 
-                'PHP_CodeSniffer\Standards\PSR2\Sniffs\Classes\ClassDeclarationSniff',
-                'indent',
-                '20',
+                'sniffClass'    => 'PHP_CodeSniffer\Standards\PSR2\Sniffs\Classes\ClassDeclarationSniff',
+                'propertyName'  => 'indent',
+                'expectedValue' => '20',
             ,
             'Set property for complete standard: PSR2 SwitchDeclaration'                                 => 
-                'PHP_CodeSniffer\Standards\PSR2\Sniffs\ControlStructures\SwitchDeclarationSniff',
-                'indent',
-                '20',
+                'sniffClass'    => 'PHP_CodeSniffer\Standards\PSR2\Sniffs\ControlStructures\SwitchDeclarationSniff',
+                'propertyName'  => 'indent',
+                'expectedValue' => '20',
             ,
             'Set property for complete standard: PSR2 FunctionCallSignature'                             => 
-                'PHP_CodeSniffer\Standards\PSR2\Sniffs\Methods\FunctionCallSignatureSniff',
-                'indent',
-                '20',
+                'sniffClass'    => 'PHP_CodeSniffer\Standards\PSR2\Sniffs\Methods\FunctionCallSignatureSniff',
+                'propertyName'  => 'indent',
+                'expectedValue' => '20',
             ,
             'Set property for complete category: PSR12 OperatorSpacing'                                  => 
-                'PHP_CodeSniffer\Standards\PSR12\Sniffs\Operators\OperatorSpacingSniff',
-                'ignoreSpacingBeforeAssignments',
-                false,
+                'sniffClass'    => 'PHP_CodeSniffer\Standards\PSR12\Sniffs\Operators\OperatorSpacingSniff',
+                'propertyName'  => 'ignoreSpacingBeforeAssignments',
+                'expectedValue' => false,
             ,
             'Set property for individual sniff: Generic ArrayIndent'                                     => 
-                'PHP_CodeSniffer\Standards\Generic\Sniffs\Arrays\ArrayIndentSniff',
-                'indent',
-                '2',
+                'sniffClass'    => 'PHP_CodeSniffer\Standards\Generic\Sniffs\Arrays\ArrayIndentSniff',
+                'propertyName'  => 'indent',
+                'expectedValue' => '2',
             ,
             'Set property for individual sniff using sniff file inclusion: Generic LineLength'           => 
-                'PHP_CodeSniffer\Standards\Generic\Sniffs\Files\LineLengthSniff',
-                'lineLimit',
-                '10',
+                'sniffClass'    => 'PHP_CodeSniffer\Standards\Generic\Sniffs\Files\LineLengthSniff',
+                'propertyName'  => 'lineLimit',
+                'expectedValue' => '10',
             ,
             'Set property for individual sniff using sniff file inclusion: CamelCapsFunctionName'        => 
-                'PHP_CodeSniffer\Standards\Generic\Sniffs\NamingConventions\CamelCapsFunctionNameSniff',
-                'strict',
-                false,
+                'sniffClass'    => 'PHP_CodeSniffer\Standards\Generic\Sniffs\NamingConventions\CamelCapsFunctionNameSniff',
+                'propertyName'  => 'strict',
+                'expectedValue' => false,
             ,
             'Set property for individual sniff via included ruleset: NestingLevel - nestingLevel'        => 
-                'PHP_CodeSniffer\Standards\Generic\Sniffs\Metrics\NestingLevelSniff',
-                'nestingLevel',
-                '2',
+                'sniffClass'    => 'PHP_CodeSniffer\Standards\Generic\Sniffs\Metrics\NestingLevelSniff',
+                'propertyName'  => 'nestingLevel',
+                'expectedValue' => '2',
             ,
             'Set property for all sniffs in an included ruleset: NestingLevel - absoluteNestingLevel'    => 
-                'PHP_CodeSniffer\Standards\Generic\Sniffs\Metrics\NestingLevelSniff',
-                'absoluteNestingLevel',
-                true,
+                'sniffClass'    => 'PHP_CodeSniffer\Standards\Generic\Sniffs\Metrics\NestingLevelSniff',
+                'propertyName'  => 'absoluteNestingLevel',
+                'expectedValue' => true,
             ,
 
             // Testing that setting a property at error code level does *not* work.
             'Set property for error code will not change the sniff property value: CyclomaticComplexity' => 
-                'PHP_CodeSniffer\Standards\Generic\Sniffs\Metrics\CyclomaticComplexitySniff',
-                'complexity',
-                10,
+                'sniffClass'    => 'PHP_CodeSniffer\Standards\Generic\Sniffs\Metrics\CyclomaticComplexitySniff',
+                'propertyName'  => 'complexity',
+                'expectedValue' => 10,
             ,
         ;
 
@@ -453,22 +453,22 @@
      *
      * @see self::testSettingInvalidPropertiesOnStandardsAndCategoriesSilentlyFails()
      *
-     * @return array
+     * @return array<string, array>string, string>>
      */
-    public function dataSettingInvalidPropertiesOnStandardsAndCategoriesSilentlyFails()
+    public static function dataSettingInvalidPropertiesOnStandardsAndCategoriesSilentlyFails()
     {
         return 
             'Set property for complete standard: PSR2 ClassDeclaration'      => 
-                'PHP_CodeSniffer\Standards\PSR1\Sniffs\Classes\ClassDeclarationSniff',
-                'setforallsniffs',
+                'sniffClass'   => 'PHP_CodeSniffer\Standards\PSR1\Sniffs\Classes\ClassDeclarationSniff',
+                'propertyName' => 'setforallsniffs',
             ,
             'Set property for complete standard: PSR2 FunctionCallSignature' => 
-                'PHP_CodeSniffer\Standards\PSR2\Sniffs\Methods\FunctionCallSignatureSniff',
-                'setforallsniffs',
+                'sniffClass'   => 'PHP_CodeSniffer\Standards\PSR2\Sniffs\Methods\FunctionCallSignatureSniff',
+                'propertyName' => 'setforallsniffs',
             ,
             'Set property for complete category: PSR12 OperatorSpacing'      => 
-                'PHP_CodeSniffer\Standards\PSR12\Sniffs\Operators\OperatorSpacingSniff',
-                'setforallincategory',
+                'sniffClass'   => 'PHP_CodeSniffer\Standards\PSR12\Sniffs\Operators\OperatorSpacingSniff',
+                'propertyName' => 'setforallincategory',
             ,
         ;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/SetPropertyAllowedAsDeclaredTest.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/SetPropertyAllowedViaMagicMethodTest.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/SetPropertyAllowedViaStdClassTest.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/SetPropertyNotAllowedViaAttributeTest.xml Changed

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

@@ -9,8 +9,8 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Ruleset;
 
-use PHP_CodeSniffer\Config;
 use PHP_CodeSniffer\Ruleset;
+use PHP_CodeSniffer\Tests\ConfigDouble;
 use PHPUnit\Framework\TestCase;
 use ReflectionObject;
 
@@ -19,7 +19,7 @@
  *
  * @covers \PHP_CodeSniffer\Ruleset::setSniffProperty
  */
-class SetSniffPropertyTest extends TestCase
+final class SetSniffPropertyTest extends TestCase
 {
 
 
@@ -34,8 +34,8 @@
      */
     public function testSniffPropertiesGetSetWhenAllowed($name)
     {
-        $sniffCode  = "Fixtures.Category.{$name}";
-        $sniffClass = 'Fixtures\Sniffs\Category\\'.$name.'Sniff';
+        $sniffCode  = "Fixtures.SetProperty.{$name}";
+        $sniffClass = 'Fixtures\Sniffs\SetProperty\\'.$name.'Sniff';
         $properties = 
             'arbitrarystring' => 'arbitraryvalue',
             'arbitraryarray'  => 
@@ -45,8 +45,8 @@
         ;
 
         // Set up the ruleset.
-        $standard = __DIR__."/{$name}Test.xml";
-        $config   = new Config("--standard=$standard");
+        $standard = __DIR__."/SetProperty{$name}Test.xml";
+        $config   = new ConfigDouble("--standard=$standard");
         $ruleset  = new Ruleset($config);
 
         // Verify that the sniff has been registered.
@@ -72,14 +72,14 @@
      *
      * @see self::testSniffPropertiesGetSetWhenAllowed()
      *
-     * @return array
+     * @return array<string, array<string>>
      */
-    public function dataSniffPropertiesGetSetWhenAllowed()
+    public static function dataSniffPropertiesGetSetWhenAllowed()
     {
         return 
-            'Property allowed as explicitly declared'            => 'SetPropertyAllowedAsDeclared',
-            'Property allowed as sniff extends stdClass'         => 'SetPropertyAllowedViaStdClass',
-            'Property allowed as sniff has magic __set() method' => 'SetPropertyAllowedViaMagicMethod',
+            'Property allowed as explicitly declared'            => 'AllowedAsDeclared',
+            'Property allowed as sniff extends stdClass'         => 'AllowedViaStdClass',
+            'Property allowed as sniff has magic __set() method' => 'AllowedViaMagicMethod',
         ;
 
     }//end dataSniffPropertiesGetSetWhenAllowed()
@@ -102,7 +102,7 @@
 
         // Set up the ruleset.
         $standard = __DIR__.'/SetPropertyAppliesPropertyToMultipleSniffsInCategoryTest.xml';
-        $config   = new Config("--standard=$standard");
+        $config   = new ConfigDouble("--standard=$standard");
         $ruleset  = new Ruleset($config);
 
         // Test that the two sniffs which support the property have received the value.
@@ -147,7 +147,7 @@
 
         // Set up the ruleset.
         $standard = __DIR__.'/SetPropertyThrowsErrorOnInvalidPropertyTest.xml';
-        $config   = new Config("--standard=$standard");
+        $config   = new ConfigDouble("--standard=$standard");
         $ruleset  = new Ruleset($config);
 
     }//end testSetPropertyThrowsErrorOnInvalidProperty()
@@ -163,7 +163,7 @@
     public function testSetPropertyThrowsErrorWhenPropertyOnlyAllowedViaAttribute()
     {
         $exceptionClass = 'PHP_CodeSniffer\Exceptions\RuntimeException';
-        $exceptionMsg   = 'Ruleset invalid. Property "arbitrarystring" does not exist on sniff Fixtures.Category.SetPropertyNotAllowedViaAttribute';
+        $exceptionMsg   = 'Ruleset invalid. Property "arbitrarystring" does not exist on sniff Fixtures.SetProperty.NotAllowedViaAttribute';
         if (method_exists($this, 'expectException') === true) {
             $this->expectException($exceptionClass);
             $this->expectExceptionMessage($exceptionMsg);
@@ -174,7 +174,7 @@
 
         // Set up the ruleset.
         $standard = __DIR__.'/SetPropertyNotAllowedViaAttributeTest.xml';
-        $config   = new Config("--standard=$standard");
+        $config   = new ConfigDouble("--standard=$standard");
         $ruleset  = new Ruleset($config);
 
     }//end testSetPropertyThrowsErrorWhenPropertyOnlyAllowedViaAttribute()
@@ -192,7 +192,7 @@
     {
         // Set up the ruleset.
         $standard = __DIR__.'/SetPropertyDoesNotThrowErrorOnInvalidPropertyWhenSetForStandardTest.xml';
-        $config   = new Config("--standard=$standard");
+        $config   = new ConfigDouble("--standard=$standard");
         $ruleset  = new Ruleset($config);
 
     }//end testSetPropertyDoesNotThrowErrorOnInvalidPropertyWhenSetForStandard()
@@ -210,7 +210,7 @@
     {
         // Set up the ruleset.
         $standard = __DIR__.'/SetPropertyDoesNotThrowErrorOnInvalidPropertyWhenSetForCategoryTest.xml';
-        $config   = new Config("--standard=$standard");
+        $config   = new ConfigDouble("--standard=$standard");
         $ruleset  = new Ruleset($config);
 
     }//end testSetPropertyDoesNotThrowErrorOnInvalidPropertyWhenSetForCategory()
@@ -224,13 +224,13 @@
      */
     public function testDirectCallWithNewArrayFormatSetsProperty()
     {
-        $name       = 'SetPropertyAllowedAsDeclared';
-        $sniffCode  = "Fixtures.Category.{$name}";
-        $sniffClass = 'Fixtures\Sniffs\Category\\'.$name.'Sniff';
+        $name       = 'AllowedAsDeclared';
+        $sniffCode  = "Fixtures.SetProperty.{$name}";
+        $sniffClass = 'Fixtures\Sniffs\SetProperty\\'.$name.'Sniff';
 
         // Set up the ruleset.
-        $standard = __DIR__."/{$name}Test.xml";
-        $config   = new Config("--standard=$standard");
+        $standard = __DIR__."/SetProperty{$name}Test.xml";
+        $config   = new ConfigDouble("--standard=$standard");
         $ruleset  = new Ruleset($config);
 
         $propertyName  = 'arbitrarystring';
@@ -275,13 +275,13 @@
      */
     public function testDirectCallWithOldArrayFormatSetsProperty($propertyValue)
     {
-        $name       = 'SetPropertyAllowedAsDeclared';
-        $sniffCode  = "Fixtures.Category.{$name}";
-        $sniffClass = 'Fixtures\Sniffs\Category\\'.$name.'Sniff';
+        $name       = 'AllowedAsDeclared';
+        $sniffCode  = "Fixtures.SetProperty.{$name}";
+        $sniffClass = 'Fixtures\Sniffs\SetProperty\\'.$name.'Sniff';
 
         // Set up the ruleset.
-        $standard = __DIR__."/{$name}Test.xml";
-        $config   = new Config("--standard=$standard");
+        $standard = __DIR__."/SetProperty{$name}Test.xml";
+        $config   = new ConfigDouble("--standard=$standard");
         $ruleset  = new Ruleset($config);
 
         $propertyName = 'arbitrarystring';
@@ -313,34 +313,40 @@
      *
      * @see self::testDirectCallWithOldArrayFormatSetsProperty()
      *
-     * @return array
+     * @return array<string, array<string, mixed>>
      */
-    public function dataDirectCallWithOldArrayFormatSetsProperty()
+    public static function dataDirectCallWithOldArrayFormatSetsProperty()
     {
         return 
-            'Property value is not an array (boolean)'                       => false,
-            'Property value is not an array (string)'                        => 'a string',
-            'Property value is an empty array'                               => ,
+            'Property value is not an array (boolean)'                       => 
+                'propertyValue' => false,
+            ,
+            'Property value is not an array (string)'                        => 
+                'propertyValue' => 'a string',
+            ,
+            'Property value is an empty array'                               => 
+                'propertyValue' => ,
+            ,
             'Property value is an array without keys'                        => 
-                
+                'propertyValue' => 
                     'value',
                     false,
                 ,
             ,
             'Property value is an array without the "scope" or "value" keys' => 
-                
+                'propertyValue' => 
                     'key1' => 'value',
                     'key2' => false,
                 ,
             ,
             'Property value is an array without the "scope" key'             => 
-                
+                'propertyValue' => 
                     'key1'  => 'value',
                     'value' => true,
                 ,
             ,
             'Property value is an array without the "value" key'             => 
-                
+                'propertyValue' => 
                     'scope' => 'value',
                     'key2'  => 1234,
                 ,
@@ -376,13 +382,13 @@
             $this->setExpectedException($exceptionClass, $exceptionMsg);
         }
 
-        $name       = 'SetPropertyAllowedAsDeclared';
-        $sniffCode  = "Fixtures.Category.{$name}";
-        $sniffClass = 'Fixtures\Sniffs\Category\\'.$name.'Sniff';
+        $name       = 'AllowedAsDeclared';
+        $sniffCode  = "Fixtures.SetProperty.{$name}";
+        $sniffClass = 'Fixtures\Sniffs\SetProperty\\'.$name.'Sniff';
 
         // Set up the ruleset.
-        $standard = __DIR__."/{$name}Test.xml";
-        $config   = new Config("--standard=$standard");
+        $standard = __DIR__."/SetProperty{$name}Test.xml";
+        $config   = new ConfigDouble("--standard=$standard");
         $ruleset  = new Ruleset($config);
 
         $propertyName = 'arbitrarystring';

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/ShowSniffDeprecationsEmptyDeprecationVersionTest.xml Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/ShowSniffDeprecationsEmptyRemovalVersionTest.xml Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/ShowSniffDeprecationsInvalidDeprecationMessageTest.xml Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/ShowSniffDeprecationsInvalidDeprecationVersionTest.xml Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/ShowSniffDeprecationsInvalidRemovalVersionTest.xml Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/ShowSniffDeprecationsOrderTest.xml Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/ShowSniffDeprecationsReportWidthTest.xml Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/ShowSniffDeprecationsTest.php Added

@@ -0,0 +1,510 @@
+<?php
+/**
+ * Tests PHPCS native handling of sniff deprecations.
+ *
+ * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
+ * @copyright 2024 Juliette Reinders Folmer. All rights reserved.
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Tests\Core\Ruleset;
+
+use PHP_CodeSniffer\Ruleset;
+use PHP_CodeSniffer\Tests\ConfigDouble;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Tests PHPCS native handling of sniff deprecations.
+ *
+ * @covers \PHP_CodeSniffer\Ruleset::hasSniffDeprecations
+ * @covers \PHP_CodeSniffer\Ruleset::showSniffDeprecations
+ */
+final class ShowSniffDeprecationsTest extends TestCase
+{
+
+
+    /**
+     * Test the return value of the hasSniffDeprecations() method.
+     *
+     * @param string $standard The standard to use for the test.
+     * @param bool   $expected The expected function return value.
+     *
+     * @dataProvider dataHasSniffDeprecations
+     *
+     * @return void
+     */
+    public function testHasSniffDeprecations($standard, $expected)
+    {
+        $config  = new ConfigDouble('.', "--standard=$standard");
+        $ruleset = new Ruleset($config);
+
+        $this->assertSame($expected, $ruleset->hasSniffDeprecations());
+
+    }//end testHasSniffDeprecations()
+
+
+    /**
+     * Data provider.
+     *
+     * @see testHasSniffDeprecations()
+     *
+     * @return array<string, array<string, string|bool>>
+     */
+    public static function dataHasSniffDeprecations()
+    {
+        return 
+            'Standard not using deprecated sniffs: PSR1'     => 
+                'standard' => 'PSR1',
+                'expected' => false,
+            ,
+            'Standard using deprecated sniffs: Test Fixture' => 
+                'standard' => __DIR__.'/ShowSniffDeprecationsTest.xml',
+                'expected' => true,
+            ,
+        ;
+
+    }//end dataHasSniffDeprecations()
+
+
+    /**
+     * Test that the listing with deprecated sniffs will not show when specific command-line options are being used.
+     *
+     * @param string        $standard       The standard to use for the test.
+     * @param array<string> $additionalArgs Optional. Additional arguments to pass.
+     *
+     * @dataProvider dataDeprecatedSniffsListDoesNotShow
+     *
+     * @return void
+     */
+    public function testDeprecatedSniffsListDoesNotShow($standard, $additionalArgs=)
+    {
+        $args   = $additionalArgs;
+        $args = '.';
+        $args = "--standard=$standard";
+
+        $config  = new ConfigDouble($args);
+        $ruleset = new Ruleset($config);
+
+        $this->expectOutputString('');
+
+        $ruleset->showSniffDeprecations();
+
+    }//end testDeprecatedSniffsListDoesNotShow()
+
+
+    /**
+     * Data provider.
+     *
+     * @see testDeprecatedSniffsListDoesNotShow()
+     *
+     * @return array<string, array<string, string|array<string>>>
+     */
+    public static function dataDeprecatedSniffsListDoesNotShow()
+    {
+        return 
+            'Standard not using deprecated sniffs: PSR1'                   => 
+                'standard' => 'PSR1',
+            ,
+            'Standard using deprecated sniffs; explain mode'               => 
+                'standard'       => __DIR__.'/ShowSniffDeprecationsTest.xml',
+                'additionalArgs' => '-e',
+            ,
+            'Standard using deprecated sniffs; quiet mode'                 => 
+                'standard'       => __DIR__.'/ShowSniffDeprecationsTest.xml',
+                'additionalArgs' => '-q',
+            ,
+            'Standard using deprecated sniffs; documentation is requested' => 
+                'standard'       => __DIR__.'/ShowSniffDeprecationsTest.xml',
+                'additionalArgs' => '--generator=text',
+            ,
+        ;
+
+    }//end dataDeprecatedSniffsListDoesNotShow()
+
+
+    /**
+     * Test that the listing with deprecated sniffs will not show when using a standard containing deprecated sniffs,
+     * but only running select non-deprecated sniffs (using `--sniffs=...`).
+     *
+     * @return void
+     */
+    public function testDeprecatedSniffsListDoesNotShowWhenSelectedSniffsAreNotDeprecated()
+    {
+        $standard = __DIR__.'/ShowSniffDeprecationsTest.xml';
+        $config   = new ConfigDouble('.', "--standard=$standard");
+        $ruleset  = new Ruleset($config);
+
+        /*
+         * Apply sniff restrictions.
+         * For tests we need to manually trigger this if the standard is "installed", like with the fixtures these tests use.
+         */
+
+        $restrictions = ;
+        $sniffs       = 
+            'Fixtures.SetProperty.AllowedAsDeclared',
+            'Fixtures.SetProperty.AllowedViaStdClass',
+        ;
+        foreach ($sniffs as $sniffCode) {
+            $parts     = explode('.', strtolower($sniffCode));
+            $sniffName = $parts0.'\sniffs\\'.$parts1.'\\'.$parts2.'sniff';
+            $restrictionsstrtolower($sniffName) = true;
+        }
+
+        $sniffFiles = ;
+        $allSniffs  = $ruleset->sniffCodes;
+        foreach ($allSniffs as $sniffName) {
+            $sniffFile    = str_replace('\\', DIRECTORY_SEPARATOR, $sniffName);
+            $sniffFile    = __DIR__.DIRECTORY_SEPARATOR.$sniffFile.'.php';
+            $sniffFiles = $sniffFile;
+        }
+
+        $ruleset->registerSniffs($allSniffs, $restrictions, );
+        $ruleset->populateTokenListeners();
+
+        $this->expectOutputString('');
+
+        $ruleset->showSniffDeprecations();
+
+    }//end testDeprecatedSniffsListDoesNotShowWhenSelectedSniffsAreNotDeprecated()
+
+
+    /**
+     * Test that the listing with deprecated sniffs will not show when using a standard containing deprecated sniffs,
+     * but all deprecated sniffs have been excluded from the run (using `--exclude=...`).
+     *
+     * @return void
+     */
+    public function testDeprecatedSniffsListDoesNotShowWhenAllDeprecatedSniffsAreExcluded()
+    {
+        $standard = __DIR__.'/ShowSniffDeprecationsTest.xml';
+        $config   = new ConfigDouble('.', "--standard=$standard");
+        $ruleset  = new Ruleset($config);
+
+        /*
+         * Apply sniff restrictions.
+         * For tests we need to manually trigger this if the standard is "installed", like with the fixtures these tests use.
+         */
+
+        $exclusions = ;
+        $exclude    = 
+            'Fixtures.Deprecated.WithLongReplacement',
+            'Fixtures.Deprecated.WithoutReplacement',
+            'Fixtures.Deprecated.WithReplacement',
+            'Fixtures.Deprecated.WithReplacementContainingLinuxNewlines',
+            'Fixtures.Deprecated.WithReplacementContainingNewlines',
+        ;
+        foreach ($exclude as $sniffCode) {
+            $parts     = explode('.', strtolower($sniffCode));
+            $sniffName = $parts0.'\sniffs\\'.$parts1.'\\'.$parts2.'sniff';
+            $exclusionsstrtolower($sniffName) = true;
+        }
+
+        $sniffFiles = ;
+        $allSniffs  = $ruleset->sniffCodes;
+        foreach ($allSniffs as $sniffName) {
+            $sniffFile    = str_replace('\\', DIRECTORY_SEPARATOR, $sniffName);
+            $sniffFile    = __DIR__.DIRECTORY_SEPARATOR.$sniffFile.'.php';
+            $sniffFiles = $sniffFile;
+        }
+
+        $ruleset->registerSniffs($allSniffs, , $exclusions);
+        $ruleset->populateTokenListeners();
+
+        $this->expectOutputString('');
+
+        $ruleset->showSniffDeprecations();
+
+    }//end testDeprecatedSniffsListDoesNotShowWhenAllDeprecatedSniffsAreExcluded()
+
+
+    /**
+     * Test deprecated sniffs are listed alphabetically in the deprecated sniffs warning.
+     *
+     * This tests a number of different aspects:
+     * 1. That the summary line uses the correct grammar when there is are multiple deprecated sniffs.
+     * 2. That there is no trailing whitespace when the sniff does not provide a custom message.
+     * 3. That custom messages containing new line characters (any type) are handled correctly and
+     *    that those new line characters are converted to the OS supported new line char.
+     *
+     * @return void
+     */
+    public function testDeprecatedSniffsWarning()
+    {
+        $standard = __DIR__.'/ShowSniffDeprecationsTest.xml';
+        $config   = new ConfigDouble("--standard=$standard", '--no-colors');
+        $ruleset  = new Ruleset($config);
+
+        $expected  = 'WARNING: The SniffDeprecationTest standard uses 5 deprecated sniffs'.PHP_EOL;
+        $expected .= '--------------------------------------------------------------------------------'.PHP_EOL;
+        $expected .= '-  Fixtures.Deprecated.WithLongReplacement'.PHP_EOL;
+        $expected .= '   This sniff has been deprecated since v3.8.0 and will be removed in v4.0.0.'.PHP_EOL;
+        $expected .= '   Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce vel'.PHP_EOL;
+        $expected .= '   vestibulum nunc. Sed luctus dolor tortor, eu euismod purus pretium sed.'.PHP_EOL;
+        $expected .= '   Fusce egestas congue massa semper cursus. Donec quis pretium tellus. In'.PHP_EOL;
+        $expected .= '   lacinia, augue ut ornare porttitor, diam nunc faucibus purus, et accumsan'.PHP_EOL;
+        $expected .= '   eros sapien at sem. Sed pulvinar aliquam malesuada. Aliquam erat volutpat.'.PHP_EOL;
+        $expected .= '   Mauris gravida rutrum lectus at egestas. Fusce tempus elit in tincidunt'.PHP_EOL;
+        $expected .= '   dictum. Suspendisse dictum egestas sapien, eget ullamcorper metus elementum'.PHP_EOL;
+        $expected .= '   semper. Vestibulum sem justo, consectetur ac tincidunt et, finibus eget'.PHP_EOL;
+        $expected .= '   libero.'.PHP_EOL;
+        $expected .= '-  Fixtures.Deprecated.WithoutReplacement'.PHP_EOL;
+        $expected .= '   This sniff has been deprecated since v3.4.0 and will be removed in v4.0.0.'.PHP_EOL;
+        $expected .= '-  Fixtures.Deprecated.WithReplacement'.PHP_EOL;
+        $expected .= '   This sniff has been deprecated since v3.8.0 and will be removed in v4.0.0.'.PHP_EOL;
+        $expected .= '   Use the Stnd.Category.OtherSniff sniff instead.'.PHP_EOL;
+        $expected .= '-  Fixtures.Deprecated.WithReplacementContainingLinuxNewlines'.PHP_EOL;
+        $expected .= '   This sniff has been deprecated since v3.8.0 and will be removed in v4.0.0.'.PHP_EOL;
+        $expected .= '   Lorem ipsum dolor sit amet, consectetur adipiscing elit.'.PHP_EOL;
+        $expected .= '   Fusce vel vestibulum nunc. Sed luctus dolor tortor, eu euismod purus pretium'.PHP_EOL;
+        $expected .= '   sed.'.PHP_EOL;
+        $expected .= '   Fusce egestas congue massa semper cursus. Donec quis pretium tellus.'.PHP_EOL;
+        $expected .= '   In lacinia, augue ut ornare porttitor, diam nunc faucibus purus, et accumsan'.PHP_EOL;
+        $expected .= '   eros sapien at sem.'.PHP_EOL;
+        $expected .= '   Sed pulvinar aliquam malesuada. Aliquam erat volutpat. Mauris gravida rutrum'.PHP_EOL;
+        $expected .= '   lectus at egestas.'.PHP_EOL;
+        $expected .= '-  Fixtures.Deprecated.WithReplacementContainingNewlines'.PHP_EOL;
+        $expected .= '   This sniff has been deprecated since v3.8.0 and will be removed in v4.0.0.'.PHP_EOL;
+        $expected .= '   Lorem ipsum dolor sit amet, consectetur adipiscing elit.'.PHP_EOL;
+        $expected .= '   Fusce vel vestibulum nunc. Sed luctus dolor tortor, eu euismod purus pretium'.PHP_EOL;
+        $expected .= '   sed.'.PHP_EOL;
+        $expected .= '   Fusce egestas congue massa semper cursus. Donec quis pretium tellus.'.PHP_EOL;
+        $expected .= '   In lacinia, augue ut ornare porttitor, diam nunc faucibus purus, et accumsan'.PHP_EOL;
+        $expected .= '   eros sapien at sem.'.PHP_EOL;
+        $expected .= '   Sed pulvinar aliquam malesuada. Aliquam erat volutpat. Mauris gravida rutrum'.PHP_EOL;
+        $expected .= '   lectus at egestas'.PHP_EOL.PHP_EOL;
+        $expected .= 'Deprecated sniffs are still run, but will stop working at some point in the'.PHP_EOL;
+        $expected .= 'future.'.PHP_EOL.PHP_EOL;
+
+        $this->expectOutputString($expected);
+
+        $ruleset->showSniffDeprecations();
+
+    }//end testDeprecatedSniffsWarning()
+
+
+    /**
+     * Test deprecated sniffs are listed alphabetically in the deprecated sniffs warning.
+     *
+     * This tests the following aspects:
+     * 1. That the summary line uses the correct grammar when there is a single deprecated sniff.
+     * 2. That the separator line below the summary maximizes at the longest line length.
+     * 3. That the word wrapping respects the maximum report width.
+     * 4. That the sniff name is truncated if it is longer than the max report width.
+     *
+     * @param int    $reportWidth    Report width for the test.
+     * @param string $expectedOutput Expected output.
+     *
+     * @dataProvider dataReportWidthIsRespected
+     *
+     * @return void
+     */
+    public function testReportWidthIsRespected($reportWidth, $expectedOutput)
+    {
+        // Set up the ruleset.
+        $standard = __DIR__.'/ShowSniffDeprecationsReportWidthTest.xml';
+        $config   = new ConfigDouble('.', "--standard=$standard", "--report-width=$reportWidth", '--no-colors');
+        $ruleset  = new Ruleset($config);
+
+        $this->expectOutputString($expectedOutput);
+
+        $ruleset->showSniffDeprecations();
+
+    }//end testReportWidthIsRespected()
+
+
+    /**
+     * Data provider.
+     *
+     * @see testReportWidthIsRespected()
+     *
+     * @return array<string, array<string, int|string>>
+     */
+    public static function dataReportWidthIsRespected()
+    {
+        $summaryLine = 'WARNING: The SniffDeprecationTest standard uses 1 deprecated sniff'.PHP_EOL;
+
+        // phpcs:disable Squiz.Strings.ConcatenationSpacing.PaddingFound -- Test readability is more important.
+        return 
+            'Report width small: 40; with truncated sniff name and wrapped header and footer lines' => 
+                'reportWidth'    => 40,
+                'expectedOutput' => 'WARNING: The SniffDeprecationTest'.PHP_EOL
+                    .'standard uses 1 deprecated sniff'.PHP_EOL
+                    .'----------------------------------------'.PHP_EOL
+                    .'-  Fixtures.Deprecated.WithLongRepla...'.PHP_EOL
+                    .'   This sniff has been deprecated since'.PHP_EOL
+                    .'   v3.8.0 and will be removed in'.PHP_EOL
+                    .'   v4.0.0. Lorem ipsum dolor sit amet,'.PHP_EOL
+                    .'   consectetur adipiscing elit. Fusce'.PHP_EOL
+                    .'   vel vestibulum nunc. Sed luctus'.PHP_EOL
+                    .'   dolor tortor, eu euismod purus'.PHP_EOL
+                    .'   pretium sed. Fusce egestas congue'.PHP_EOL
+                    .'   massa semper cursus. Donec quis'.PHP_EOL
+                    .'   pretium tellus. In lacinia, augue ut'.PHP_EOL
+                    .'   ornare porttitor, diam nunc faucibus'.PHP_EOL
+                    .'   purus, et accumsan eros sapien at'.PHP_EOL
+                    .'   sem. Sed pulvinar aliquam malesuada.'.PHP_EOL
+                    .'   Aliquam erat volutpat. Mauris'.PHP_EOL
+                    .'   gravida rutrum lectus at egestas.'.PHP_EOL
+                    .'   Fusce tempus elit in tincidunt'.PHP_EOL
+                    .'   dictum. Suspendisse dictum egestas'.PHP_EOL
+                    .'   sapien, eget ullamcorper metus'.PHP_EOL
+                    .'   elementum semper. Vestibulum sem'.PHP_EOL
+                    .'   justo, consectetur ac tincidunt et,'.PHP_EOL
+                    .'   finibus eget libero.'.PHP_EOL.PHP_EOL
+                    .'Deprecated sniffs are still run, but'.PHP_EOL
+                    .'will stop working at some point in the'.PHP_EOL
+                    .'future.'.PHP_EOL.PHP_EOL,
+            ,
+            'Report width default: 80'                                                              => 
+                'reportWidth'    => 80,
+                'expectedOutput' => $summaryLine.str_repeat('-', 80).PHP_EOL
+                    .'-  Fixtures.Deprecated.WithLongReplacement'.PHP_EOL
+                    .'   This sniff has been deprecated since v3.8.0 and will be removed in v4.0.0.'.PHP_EOL
+                    .'   Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce vel'.PHP_EOL
+                    .'   vestibulum nunc. Sed luctus dolor tortor, eu euismod purus pretium sed.'.PHP_EOL
+                    .'   Fusce egestas congue massa semper cursus. Donec quis pretium tellus. In'.PHP_EOL
+                    .'   lacinia, augue ut ornare porttitor, diam nunc faucibus purus, et accumsan'.PHP_EOL
+                    .'   eros sapien at sem. Sed pulvinar aliquam malesuada. Aliquam erat volutpat.'.PHP_EOL
+                    .'   Mauris gravida rutrum lectus at egestas. Fusce tempus elit in tincidunt'.PHP_EOL
+                    .'   dictum. Suspendisse dictum egestas sapien, eget ullamcorper metus elementum'.PHP_EOL
+                    .'   semper. Vestibulum sem justo, consectetur ac tincidunt et, finibus eget'.PHP_EOL
+                    .'   libero.'.PHP_EOL.PHP_EOL
+                    .'Deprecated sniffs are still run, but will stop working at some point in the'.PHP_EOL
+                    .'future.'.PHP_EOL.PHP_EOL,
+            ,
+            'Report width matches longest line: 666; the message should not wrap'                   => 
+                // Length = 4 padding + 75 base line + 587 custom message.
+                'reportWidth'    => 666,
+                'expectedOutput' => $summaryLine.str_repeat('-', 666).PHP_EOL
+                    .'-  Fixtures.Deprecated.WithLongReplacement'.PHP_EOL
+                    .'   This sniff has been deprecated since v3.8.0 and will be removed in v4.0.0. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce vel vestibulum nunc. Sed luctus dolor tortor, eu euismod purus pretium sed. Fusce egestas congue massa semper cursus. Donec quis pretium tellus. In lacinia, augue ut ornare porttitor, diam nunc faucibus purus, et accumsan eros sapien at sem. Sed pulvinar aliquam malesuada. Aliquam erat volutpat. Mauris gravida rutrum lectus at egestas. Fusce tempus elit in tincidunt dictum. Suspendisse dictum egestas sapien, eget ullamcorper metus elementum semper. Vestibulum sem justo, consectetur ac tincidunt et, finibus eget libero.'
+                    .PHP_EOL.PHP_EOL
+                    .'Deprecated sniffs are still run, but will stop working at some point in the future.'.PHP_EOL.PHP_EOL,
+            ,
+            'Report width wide: 1000; delimiter line length should match longest line'              => 
+                'reportWidth'    => 1000,
+                'expectedOutput' => $summaryLine.str_repeat('-', 666).PHP_EOL
+                    .'-  Fixtures.Deprecated.WithLongReplacement'.PHP_EOL
+                    .'   This sniff has been deprecated since v3.8.0 and will be removed in v4.0.0. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce vel vestibulum nunc. Sed luctus dolor tortor, eu euismod purus pretium sed. Fusce egestas congue massa semper cursus. Donec quis pretium tellus. In lacinia, augue ut ornare porttitor, diam nunc faucibus purus, et accumsan eros sapien at sem. Sed pulvinar aliquam malesuada. Aliquam erat volutpat. Mauris gravida rutrum lectus at egestas. Fusce tempus elit in tincidunt dictum. Suspendisse dictum egestas sapien, eget ullamcorper metus elementum semper. Vestibulum sem justo, consectetur ac tincidunt et, finibus eget libero.'
+                    .PHP_EOL.PHP_EOL
+                    .'Deprecated sniffs are still run, but will stop working at some point in the future.'.PHP_EOL.PHP_EOL,
+            ,
+        ;
+        // phpcs:enable
+
+    }//end dataReportWidthIsRespected()
+
+
+    /**
+     * Test deprecated sniffs are listed alphabetically in the deprecated sniffs warning.
+     *
+     * Additionally, this test verifies that deprecated sniffs are still registered to run.
+     *
+     * @return void
+     */
+    public function testDeprecatedSniffsAreListedAlphabetically()
+    {
+        // Set up the ruleset.
+        $standard = __DIR__.'/ShowSniffDeprecationsOrderTest.xml';
+        $config   = new ConfigDouble("--standard=$standard", '--no-colors');
+        $ruleset  = new Ruleset($config);
+
+        $expected  = 'WARNING: The SniffDeprecationTest standard uses 2 deprecated sniffs'.PHP_EOL;
+        $expected .= '--------------------------------------------------------------------------------'.PHP_EOL;
+        $expected .= '-  Fixtures.Deprecated.WithoutReplacement'.PHP_EOL;
+        $expected .= '   This sniff has been deprecated since v3.4.0 and will be removed in v4.0.0.'.PHP_EOL;
+        $expected .= '-  Fixtures.Deprecated.WithReplacement'.PHP_EOL;
+        $expected .= '   This sniff has been deprecated since v3.8.0 and will be removed in v4.0.0.'.PHP_EOL;
+        $expected .= '   Use the Stnd.Category.OtherSniff sniff instead.'.PHP_EOL.PHP_EOL;
+        $expected .= 'Deprecated sniffs are still run, but will stop working at some point in the'.PHP_EOL;
+        $expected .= 'future.'.PHP_EOL.PHP_EOL;
+
+        $this->expectOutputString($expected);
+
+        $ruleset->showSniffDeprecations();
+
+        // Verify that the sniffs have been registered to run.
+        $this->assertCount(2, $ruleset->sniffCodes, 'Incorrect number of sniff codes registered');
+        $this->assertArrayHasKey(
+            'Fixtures.Deprecated.WithoutReplacement',
+            $ruleset->sniffCodes,
+            'WithoutReplacement sniff not registered'
+        );
+        $this->assertArrayHasKey(
+            'Fixtures.Deprecated.WithReplacement',
+            $ruleset->sniffCodes,
+            'WithReplacement sniff not registered'
+        );
+
+    }//end testDeprecatedSniffsAreListedAlphabetically()
+
+
+    /**
+     * Test that an exception is thrown when any of the interface required methods does not
+     * comply with the return type/value requirements.
+     *
+     * @param string $standard         The standard to use for the test.
+     * @param string $exceptionMessage The contents of the expected exception message.
+     *
+     * @dataProvider dataExceptionIsThrownOnIncorrectlyImplementedInterface
+     *
+     * @return void
+     */
+    public function testExceptionIsThrownOnIncorrectlyImplementedInterface($standard, $exceptionMessage)
+    {
+        $exception = 'PHP_CodeSniffer\Exceptions\RuntimeException';
+        if (method_exists($this, 'expectException') === true) {
+            // PHPUnit 5+.
+            $this->expectException($exception);
+            $this->expectExceptionMessage($exceptionMessage);
+        } else {
+            // PHPUnit 4.
+            $this->setExpectedException($exception, $exceptionMessage);
+        }
+
+        // Set up the ruleset.
+        $standard = __DIR__.'/'.$standard;
+        $config   = new ConfigDouble("--standard=$standard");
+        $ruleset  = new Ruleset($config);
+
+        $ruleset->showSniffDeprecations();
+
+    }//end testExceptionIsThrownOnIncorrectlyImplementedInterface()
+
+
+    /**
+     * Data provider.
+     *
+     * @see testExceptionIsThrownOnIncorrectlyImplementedInterface()
+     *
+     * @return array<string, array<string, string>>
+     */
+    public static function dataExceptionIsThrownOnIncorrectlyImplementedInterface()
+    {
+        return 
+            'getDeprecationVersion() does not return a string' => 
+                'standard'         => 'ShowSniffDeprecationsInvalidDeprecationVersionTest.xml',
+                'exceptionMessage' => 'The Fixtures\Sniffs\DeprecatedInvalid\InvalidDeprecationVersionSniff::getDeprecationVersion() method must return a non-empty string, received double',
+            ,
+            'getRemovalVersion() does not return a string'     => 
+                'standard'         => 'ShowSniffDeprecationsInvalidRemovalVersionTest.xml',
+                'exceptionMessage' => 'The Fixtures\Sniffs\DeprecatedInvalid\InvalidRemovalVersionSniff::getRemovalVersion() method must return a non-empty string, received array',
+            ,
+            'getDeprecationMessage() does not return a string' => 
+                'standard'         => 'ShowSniffDeprecationsInvalidDeprecationMessageTest.xml',
+                'exceptionMessage' => 'The Fixtures\Sniffs\DeprecatedInvalid\InvalidDeprecationMessageSniff::getDeprecationMessage() method must return a string, received object',
+            ,
+            'getDeprecationVersion() returns an empty string'  => 
+                'standard'         => 'ShowSniffDeprecationsEmptyDeprecationVersionTest.xml',
+                'exceptionMessage' => 'The Fixtures\Sniffs\DeprecatedInvalid\EmptyDeprecationVersionSniff::getDeprecationVersion() method must return a non-empty string, received ""',
+            ,
+            'getRemovalVersion() returns an empty string'      => 
+                'standard'         => 'ShowSniffDeprecationsEmptyRemovalVersionTest.xml',
+                'exceptionMessage' => 'The Fixtures\Sniffs\DeprecatedInvalid\EmptyRemovalVersionSniff::getRemovalVersion() method must return a non-empty string, received ""',
+            ,
+        ;
+
+    }//end dataExceptionIsThrownOnIncorrectlyImplementedInterface()
+
+
+}//end class

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/ShowSniffDeprecationsTest.xml Added

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

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

@@ -0,0 +1,124 @@
+<?php
+/**
+ * Base class to use when testing parts of the tokenizer.
+ *
+ * This is a near duplicate of the AbstractMethodUnitTest class, with the
+ * difference being that it allows for recording code coverage for tokenizer tests.
+ *
+ * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
+ * @copyright 2018-2019 Juliette Reinders Folmer. All rights reserved.
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
+
+use PHP_CodeSniffer\Ruleset;
+use PHP_CodeSniffer\Files\DummyFile;
+use PHP_CodeSniffer\Tests\ConfigDouble;
+use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+use PHPUnit\Framework\TestCase;
+use ReflectionProperty;
+
+abstract class AbstractTokenizerTestCase extends TestCase
+{
+
+    /**
+     * The file extension of the test case file (without leading dot).
+     *
+     * This allows child classes to overrule the default `inc` with, for instance,
+     * `js` or `css` when applicable.
+     *
+     * @var string
+     */
+    protected $fileExtension = 'inc';
+
+    /**
+     * The tab width setting to use when tokenizing the file.
+     *
+     * This allows for test case files to use a different tab width than the default.
+     *
+     * @var integer
+     */
+    protected $tabWidth = 4;
+
+    /**
+     * The \PHP_CodeSniffer\Files\File object containing the parsed contents of the test case file.
+     *
+     * @var \PHP_CodeSniffer\Files\File
+     */
+    protected $phpcsFile;
+
+
+    /**
+     * Initialize & tokenize \PHP_CodeSniffer\Files\File with code from the test case file.
+     *
+     * The test case file for a unit test class has to be in the same directory
+     * directory and use the same file name as the test class, using the .inc extension.
+     *
+     * @before
+     *
+     * @return void
+     */
+    protected function initializeFile()
+    {
+        if (isset($this->phpcsFile) === false) {
+            $config = new ConfigDouble();
+            // Also set a tab-width to enable testing tab-replaced vs `orig_content`.
+            $config->tabWidth = $this->tabWidth;
+
+            $ruleset = new Ruleset($config);
+
+            // Default to a file with the same name as the test class. Extension is property based.
+            $relativeCN     = str_replace(__NAMESPACE__, '', get_called_class());
+            $relativePath   = str_replace('\\', DIRECTORY_SEPARATOR, $relativeCN);
+            $pathToTestFile = realpath(__DIR__).$relativePath.'.'.$this->fileExtension;
+
+            // Make sure the file gets parsed correctly based on the file type.
+            $contents  = 'phpcs_input_file: '.$pathToTestFile.PHP_EOL;
+            $contents .= file_get_contents($pathToTestFile);
+
+            $this->phpcsFile = new DummyFile($contents, $ruleset, $config);
+            $this->phpcsFile->process();
+        }
+
+    }//end initializeFile()
+
+
+    /**
+     * 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
+     * distinguish between comments used *in* a test and test delimiters.
+     *
+     * @param string           $commentString The delimiter comment to look for.
+     * @param int|string|array $tokenType     The type of token(s) to look for.
+     * @param string           $tokenContent  Optional. The token content for the target token.
+     *
+     * @return int
+     */
+    protected function getTargetToken($commentString, $tokenType, $tokenContent=null)
+    {
+        return AbstractMethodUnitTest::getTargetTokenFromFile($this->phpcsFile, $commentString, $tokenType, $tokenContent);
+
+    }//end getTargetToken()
+
+
+    /**
+     * Clear the static "resolved tokens" cache property on the Tokenizer\PHP class.
+     *
+     * This method should be used selectively by tests to ensure the code under test is actually hit
+     * by the test testing the code.
+     *
+     * @return void
+     */
+    public static function clearResolvedTokensCache()
+    {
+        $property = new ReflectionProperty('PHP_CodeSniffer\Tokenizers\PHP', 'resolveTokenCache');
+        $property->setAccessible(true);
+        $property->setValue(null, );
+        $property->setAccessible(false);
+
+    }//end clearResolvedTokensCache()
+
+
+}//end class

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

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

@@ -9,9 +9,7 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
-
-class AnonClassParenthesisOwnerTest extends AbstractMethodUnitTest
+final class AnonClassParenthesisOwnerTest extends AbstractTokenizerTestCase
 {
 
 
@@ -27,7 +25,7 @@
      */
     public function testAnonClassNoParentheses($testMarker)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $anonClass = $this->getTargetToken($testMarker, T_ANON_CLASS);
         $this->assertFalse(array_key_exists('parenthesis_owner', $tokens$anonClass));
@@ -50,7 +48,7 @@
      */
     public function testAnonClassNoParenthesesNextOpenClose($testMarker)
     {
-        $tokens   = self::$phpcsFile->getTokens();
+        $tokens   = $this->phpcsFile->getTokens();
         $function = $this->getTargetToken($testMarker, T_FUNCTION);
 
         $opener = $this->getTargetToken($testMarker, T_OPEN_PARENTHESIS);
@@ -70,13 +68,20 @@
      * @see testAnonClassNoParentheses()
      * @see testAnonClassNoParenthesesNextOpenClose()
      *
-     * @return array
+     * @return array<string, array<string, string>>
      */
-    public function dataAnonClassNoParentheses()
+    public static function dataAnonClassNoParentheses()
     {
         return 
-            '/* testNoParentheses */',
-            '/* testNoParenthesesAndEmptyTokens */',
+            'plain'                                              => 
+                'testMarker' => '/* testNoParentheses */',
+            ,
+            'readonly'                                           => 
+                'testMarker' => '/* testReadonlyNoParentheses */',
+            ,
+            'declaration contains comments and extra whitespace' => 
+                'testMarker' => '/* testNoParenthesesAndEmptyTokens */',
+            ,
         ;
 
     }//end dataAnonClassNoParentheses()
@@ -95,7 +100,7 @@
      */
     public function testAnonClassWithParentheses($testMarker)
     {
-        $tokens    = self::$phpcsFile->getTokens();
+        $tokens    = $this->phpcsFile->getTokens();
         $anonClass = $this->getTargetToken($testMarker, T_ANON_CLASS);
         $opener    = $this->getTargetToken($testMarker, T_OPEN_PARENTHESIS);
         $closer    = $this->getTargetToken($testMarker, T_CLOSE_PARENTHESIS);
@@ -129,13 +134,20 @@
      *
      * @see testAnonClassWithParentheses()
      *
-     * @return array
+     * @return array<string, array<string, string>>
      */
-    public function dataAnonClassWithParentheses()
+    public static function dataAnonClassWithParentheses()
     {
         return 
-            '/* testWithParentheses */',
-            '/* testWithParenthesesAndEmptyTokens */',
+            'plain'                                              => 
+                'testMarker' => '/* testWithParentheses */',
+            ,
+            'readonly'                                           => 
+                'testMarker' => '/* testReadonlyWithParentheses */',
+            ,
+            'declaration contains comments and extra whitespace' => 
+                'testMarker' => '/* testWithParenthesesAndEmptyTokens */',
+            ,
         ;
 
     }//end dataAnonClassWithParentheses()

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

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

@@ -9,9 +9,7 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
-
-class ArrayKeywordTest extends AbstractMethodUnitTest
+final class ArrayKeywordTest extends AbstractTokenizerTestCase
 {
 
 
@@ -29,7 +27,7 @@
      */
     public function testArrayKeyword($testMarker, $testContent='array')
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $token      = $this->getTargetToken($testMarker, T_ARRAY, T_STRING, $testContent);
         $tokenArray = $tokens$token;
@@ -49,19 +47,30 @@
      *
      * @see testArrayKeyword()
      *
-     * @return array
+     * @return array<string, array<string, string>>
      */
-    public function dataArrayKeyword()
+    public static function dataArrayKeyword()
     {
         return 
-            'empty array'                           => '/* testEmptyArray */',
-            'array with space before parenthesis'   => '/* testArrayWithSpace */',
+            'empty array'                           => 
+                'testMarker' => '/* testEmptyArray */',
+            ,
+            'array with space before parenthesis'   => 
+                'testMarker' => '/* testArrayWithSpace */',
+            ,
             'array with comment before parenthesis' => 
-                '/* testArrayWithComment */',
-                'Array',
+                'testMarker'  => '/* testArrayWithComment */',
+                'testContent' => 'Array',
+            ,
+            'nested: outer array'                   => 
+                'testMarker' => '/* testNestingArray */',
+            ,
+            'nested: inner array'                   => 
+                'testMarker' => '/* testNestedArray */',
+            ,
+            'OO constant default value'             => 
+                'testMarker' => '/* testOOConstDefault */',
             ,
-            'nested: outer array'                   => '/* testNestingArray */',
-            'nested: inner array'                   => '/* testNestedArray */',
         ;
 
     }//end dataArrayKeyword()
@@ -81,7 +90,7 @@
      */
     public function testArrayType($testMarker, $testContent='array')
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $token      = $this->getTargetToken($testMarker, T_ARRAY, T_STRING, $testContent);
         $tokenArray = $tokens$token;
@@ -101,17 +110,27 @@
      *
      * @see testArrayType()
      *
-     * @return array
+     * @return array<string, array<string, string>>
      */
-    public function dataArrayType()
+    public static function dataArrayType()
     {
         return 
             'closure return type'        => 
-                '/* testClosureReturnType */',
-                'Array',
+                'testMarker'  => '/* testClosureReturnType */',
+                'testContent' => 'Array',
+            ,
+            'function param type'        => 
+                'testMarker' => '/* testFunctionDeclarationParamType */',
+            ,
+            'function union return type' => 
+                'testMarker' => '/* testFunctionDeclarationReturnType */',
+            ,
+            'OO constant type'           => 
+                'testMarker' => '/* testOOConstType */',
+            ,
+            'OO property type'           => 
+                'testMarker' => '/* testOOPropertyType */',
             ,
-            'function param type'        => '/* testFunctionDeclarationParamType */',
-            'function union return type' => '/* testFunctionDeclarationReturnType */',
         ;
 
     }//end dataArrayType()
@@ -132,7 +151,7 @@
      */
     public function testNotArrayKeyword($testMarker, $testContent='array')
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $token      = $this->getTargetToken($testMarker, T_ARRAY, T_STRING, $testContent);
         $tokenArray = $tokens$token;
@@ -152,16 +171,22 @@
      *
      * @see testNotArrayKeyword()
      *
-     * @return array
+     * @return array<string, array<string, string>>
      */
-    public function dataNotArrayKeyword()
+    public static function dataNotArrayKeyword()
     {
         return 
-            'class-constant-name' => 
-                '/* testClassConst */',
-                'ARRAY',
+            'class-constant-name'            => 
+                'testMarker'  => '/* testClassConst */',
+                'testContent' => 'ARRAY',
+            ,
+            'class-method-name'              => 
+                'testMarker' => '/* testClassMethod */',
+            ,
+            'class-constant-name-after-type' => 
+                'testMarker'  => '/* testTypedOOConstName */',
+                'testContent' => 'ARRAY',
             ,
-            'class-method-name'   => '/* testClassMethod */',
         ;
 
     }//end dataNotArrayKeyword()

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

@@ -9,18 +9,16 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
-
-class AttributesTest extends AbstractMethodUnitTest
+final class AttributesTest extends AbstractTokenizerTestCase
 {
 
 
     /**
      * Test that attributes are parsed correctly.
      *
-     * @param string $testMarker The comment which prefaces the target token in the test file.
-     * @param int    $length     The number of tokens between opener and closer.
-     * @param array  $tokenCodes The codes of tokens inside the attributes.
+     * @param string            $testMarker The comment which prefaces the target token in the test file.
+     * @param int               $length     The number of tokens between opener and closer.
+     * @param array<int|string> $tokenCodes The codes of tokens inside the attributes.
      *
      * @dataProvider dataAttribute
      * @covers       PHP_CodeSniffer\Tokenizers\PHP::tokenize
@@ -31,7 +29,7 @@
      */
     public function testAttribute($testMarker, $length, $tokenCodes)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $attribute = $this->getTargetToken($testMarker, T_ATTRIBUTE);
         $this->assertArrayHasKey('attribute_closer', $tokens$attribute);
@@ -64,20 +62,22 @@
      *
      * @see testAttribute()
      *
-     * @return array
+     * @return array<string, array<string, string|int|array<int|string>>>
      */
-    public function dataAttribute()
+    public static function dataAttribute()
     {
         return 
-            
-                '/* testAttribute */',
-                2,
-                 T_STRING ,
+            'class attribute'                                                                   => 
+                'testMarker' => '/* testAttribute */',
+                'length'     => 2,
+                'tokenCodes' => 
+                    T_STRING
+                ,
             ,
-            
-                '/* testAttributeWithParams */',
-                7,
-                
+            'class attribute with param'                                                        => 
+                'testMarker' => '/* testAttributeWithParams */',
+                'length'     => 7,
+                'tokenCodes' => 
                     T_STRING,
                     T_OPEN_PARENTHESIS,
                     T_STRING,
@@ -86,10 +86,10 @@
                     T_CLOSE_PARENTHESIS,
                 ,
             ,
-            
-                '/* testAttributeWithNamedParam */',
-                10,
-                
+            'class attribute with named param'                                                  => 
+                'testMarker' => '/* testAttributeWithNamedParam */',
+                'length'     => 10,
+                'tokenCodes' => 
                     T_STRING,
                     T_OPEN_PARENTHESIS,
                     T_PARAM_NAME,
@@ -101,15 +101,17 @@
                     T_CLOSE_PARENTHESIS,
                 ,
             ,
-            
-                '/* testAttributeOnFunction */',
-                2,
-                 T_STRING ,
+            'function attribute'                                                                => 
+                'testMarker' => '/* testAttributeOnFunction */',
+                'length'     => 2,
+                'tokenCodes' => 
+                    T_STRING
+                ,
             ,
-            
-                '/* testAttributeOnFunctionWithParams */',
-                17,
-                
+            'function attribute with params'                                                    => 
+                'testMarker' => '/* testAttributeOnFunctionWithParams */',
+                'length'     => 17,
+                'tokenCodes' => 
                     T_STRING,
                     T_OPEN_PARENTHESIS,
                     T_CONSTANT_ENCAPSED_STRING,
@@ -128,10 +130,10 @@
                     T_CLOSE_PARENTHESIS,
                 ,
             ,
-            
-                '/* testAttributeWithShortClosureParameter */',
-                17,
-                
+            'function attribute with arrow function as param'                                   => 
+                'testMarker' => '/* testAttributeWithShortClosureParameter */',
+                'length'     => 17,
+                'tokenCodes' => 
                     T_STRING,
                     T_OPEN_PARENTHESIS,
                     T_STATIC,
@@ -150,10 +152,10 @@
                     T_CLOSE_PARENTHESIS,
                 ,
             ,
-            
-                '/* testAttributeGrouping */',
-                26,
-                
+            'function attribute; multiple comma separated classes'                              => 
+                'testMarker' => '/* testAttributeGrouping */',
+                'length'     => 26,
+                'tokenCodes' => 
                     T_STRING,
                     T_COMMA,
                     T_WHITESPACE,
@@ -181,10 +183,10 @@
                     T_CLOSE_PARENTHESIS,
                 ,
             ,
-            
-                '/* testAttributeMultiline */',
-                31,
-                
+            'function attribute; multiple comma separated classes, one per line'                => 
+                'testMarker' => '/* testAttributeMultiline */',
+                'length'     => 31,
+                'tokenCodes' => 
                     T_WHITESPACE,
                     T_WHITESPACE,
                     T_STRING,
@@ -217,10 +219,49 @@
                     T_WHITESPACE,
                 ,
             ,
-            
-                '/* testFqcnAttribute */',
-                13,
-                
+            'function attribute; multiple comma separated classes, one per line, with comments' => 
+                'testMarker' => '/* testAttributeMultilineWithComment */',
+                'length'     => 34,
+                'tokenCodes' => 
+                    T_WHITESPACE,
+                    T_WHITESPACE,
+                    T_STRING,
+                    T_COMMA,
+                    T_WHITESPACE,
+                    T_COMMENT,
+                    T_WHITESPACE,
+                    T_STRING,
+                    T_OPEN_PARENTHESIS,
+                    T_COMMENT,
+                    T_WHITESPACE,
+                    T_CONSTANT_ENCAPSED_STRING,
+                    T_CLOSE_PARENTHESIS,
+                    T_COMMA,
+                    T_WHITESPACE,
+                    T_WHITESPACE,
+                    T_STRING,
+                    T_OPEN_PARENTHESIS,
+                    T_CONSTANT_ENCAPSED_STRING,
+                    T_COMMA,
+                    T_WHITESPACE,
+                    T_PARAM_NAME,
+                    T_COLON,
+                    T_WHITESPACE,
+                    T_OPEN_SHORT_ARRAY,
+                    T_CONSTANT_ENCAPSED_STRING,
+                    T_WHITESPACE,
+                    T_DOUBLE_ARROW,
+                    T_WHITESPACE,
+                    T_CONSTANT_ENCAPSED_STRING,
+                    T_CLOSE_SHORT_ARRAY,
+                    T_CLOSE_PARENTHESIS,
+                    T_WHITESPACE,
+                ,
+            ,
+            'function attribute; using partially qualified and fully qualified class names'     => 
+                'testMarker' => '/* testFqcnAttribute */',
+                'length'     => 13,
+                'tokenCodes' => 
                     T_STRING,
                     T_NS_SEPARATOR,
                     T_STRING,
@@ -251,7 +292,7 @@
      */
     public function testTwoAttributesOnTheSameLine()
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $attribute = $this->getTargetToken('/* testTwoAttributeOnTheSameLine */', T_ATTRIBUTE);
         $this->assertArrayHasKey('attribute_closer', $tokens$attribute);
@@ -275,7 +316,7 @@
      */
     public function testAttributeAndLineComment()
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $attribute = $this->getTargetToken('/* testAttributeAndCommentOnTheSameLine */', T_ATTRIBUTE);
         $this->assertArrayHasKey('attribute_closer', $tokens$attribute);
@@ -290,10 +331,10 @@
     /**
      * Test that attributes on function declaration parameters are parsed correctly.
      *
-     * @param string $testMarker The comment which prefaces the target token in the test file.
-     * @param int    $position   The token position (starting from T_FUNCTION) of T_ATTRIBUTE token.
-     * @param int    $length     The number of tokens between opener and closer.
-     * @param array  $tokenCodes The codes of tokens inside the attributes.
+     * @param string            $testMarker The comment which prefaces the target token in the test file.
+     * @param int               $position   The token position (starting from T_FUNCTION) of T_ATTRIBUTE token.
+     * @param int               $length     The number of tokens between opener and closer.
+     * @param array<int|string> $tokenCodes The codes of tokens inside the attributes.
      *
      * @dataProvider dataAttributeOnParameters
      *
@@ -305,7 +346,7 @@
      */
     public function testAttributeOnParameters($testMarker, $position, $length, array $tokenCodes)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $function  = $this->getTargetToken($testMarker, T_FUNCTION);
         $attribute = ($function + $position);
@@ -343,22 +384,24 @@
      *
      * @see testAttributeOnParameters()
      *
-     * @return array
+     * @return array<string, array<string, string|int|array<int|string>>>
      */
-    public function dataAttributeOnParameters()
+    public static function dataAttributeOnParameters()
     {
         return 
-            
-                '/* testSingleAttributeOnParameter */',
-                4,
-                2,
-                T_STRING,
+            'parameter attribute; single, inline'                   => 
+                'testMarker' => '/* testSingleAttributeOnParameter */',
+                'position'   => 4,
+                'length'     => 2,
+                'tokenCodes' => 
+                    T_STRING
+                ,
             ,
-            
-                '/* testMultipleAttributesOnParameter */',
-                4,
-                10,
-                
+            'parameter attribute; multiple comma separated, inline' => 
+                'testMarker' => '/* testMultipleAttributesOnParameter */',
+                'position'   => 4,
+                'length'     => 10,
+                'tokenCodes' => 
                     T_STRING,
                     T_COMMA,
                     T_WHITESPACE,
@@ -370,11 +413,11 @@
                     T_CLOSE_PARENTHESIS,
                 ,
             ,
-            
-                '/* testMultilineAttributesOnParameter */',
-                4,
-                13,
-                
+            'parameter attribute; single, multiline'                => 
+                'testMarker' => '/* testMultilineAttributesOnParameter */',
+                'position'   => 4,
+                'length'     => 13,
+                'tokenCodes' => 
                     T_WHITESPACE,
                     T_WHITESPACE,
                     T_STRING,
@@ -397,10 +440,10 @@
     /**
      * Test that an attribute containing text which looks like a PHP close tag is tokenized correctly.
      *
-     * @param string $testMarker              The comment which prefaces the target token in the test file.
-     * @param int    $length                  The number of tokens between opener and closer.
-     * @param array  $expectedTokensAttribute The codes of tokens inside the attributes.
-     * @param array  $expectedTokensAfter     The codes of tokens after the attributes.
+     * @param string               $testMarker              The comment which prefaces the target token in the test file.
+     * @param int                  $length                  The number of tokens between opener and closer.
+     * @param array<array<string>> $expectedTokensAttribute The codes of tokens inside the attributes.
+     * @param array<int|string>    $expectedTokensAfter     The codes of tokens after the attributes.
      *
      * @covers PHP_CodeSniffer\Tokenizers\PHP::parsePhpAttribute
      *
@@ -410,7 +453,7 @@
      */
     public function testAttributeContainingTextLookingLikeCloseTag($testMarker, $length, array $expectedTokensAttribute, array $expectedTokensAfter)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $attribute = $this->getTargetToken($testMarker, T_ATTRIBUTE);
 
@@ -449,15 +492,15 @@
      *
      * @see dataAttributeOnTextLookingLikeCloseTag()
      *
-     * @return array
+     * @return array<string, array<string, string|int|array<array<string>>|array<int|string>>>
      */
-    public function dataAttributeOnTextLookingLikeCloseTag()
+    public static function dataAttributeOnTextLookingLikeCloseTag()
     {
         return 
-            
-                '/* testAttributeContainingTextLookingLikeCloseTag */',
-                5,
-                
+            'function attribute; string param with "?>"'            => 
+                'testMarker'              => '/* testAttributeContainingTextLookingLikeCloseTag */',
+                'length'                  => 5,
+                'expectedTokensAttribute' => 
                     
                         'T_STRING',
                         'DeprecationReason',
@@ -479,7 +522,7 @@
                         '',
                     ,
                 ,
-                
+                'expectedTokensAfter'     => 
                     T_WHITESPACE,
                     T_FUNCTION,
                     T_WHITESPACE,
@@ -491,10 +534,10 @@
                     T_CLOSE_CURLY_BRACKET,
                 ,
             ,
-            
-                '/* testAttributeContainingMultilineTextLookingLikeCloseTag */',
-                8,
-                
+            'function attribute; string param with "?>"; multiline' => 
+                'testMarker'              => '/* testAttributeContainingMultilineTextLookingLikeCloseTag */',
+                'length'                  => 8,
+                'expectedTokensAttribute' => 
                     
                         'T_STRING',
                         'DeprecationReason',
@@ -528,7 +571,7 @@
                         '',
                     ,
                 ,
-                
+                'expectedTokensAfter'     => 
                     T_WHITESPACE,
                     T_FUNCTION,
                     T_WHITESPACE,
@@ -556,7 +599,7 @@
      */
     public function testInvalidAttribute()
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $attribute = $this->getTargetToken('/* testInvalidAttribute */', T_ATTRIBUTE);
 
@@ -572,12 +615,13 @@
      * @covers PHP_CodeSniffer\Tokenizers\PHP::tokenize
      * @covers PHP_CodeSniffer\Tokenizers\PHP::findCloser
      * @covers PHP_CodeSniffer\Tokenizers\PHP::parsePhpAttribute
+     * @covers PHP_CodeSniffer\Tokenizers\PHP::createAttributesNestingMap
      *
      * @return void
      */
     public function testNestedAttributes()
     {
-        $tokens     = self::$phpcsFile->getTokens();
+        $tokens     = $this->phpcsFile->getTokens();
         $tokenCodes = 
             T_STRING,
             T_NS_SEPARATOR,

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

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

@@ -9,9 +9,7 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
-
-class BackfillEnumTest extends AbstractMethodUnitTest
+final class BackfillEnumTest extends AbstractTokenizerTestCase
 {
 
 
@@ -30,21 +28,21 @@
      */
     public function testEnums($testMarker, $testContent, $openerOffset, $closerOffset)
     {
-        $tokens = self::$phpcsFile->getTokens();
-
-        $enum = $this->getTargetToken($testMarker, T_ENUM, T_STRING, $testContent);
+        $tokens     = $this->phpcsFile->getTokens();
+        $enum       = $this->getTargetToken($testMarker, T_ENUM, T_STRING, $testContent);
+        $tokenArray = $tokens$enum;
 
-        $this->assertSame(T_ENUM, $tokens$enum'code');
-        $this->assertSame('T_ENUM', $tokens$enum'type');
+        $this->assertSame(T_ENUM, $tokenArray'code', 'Token tokenized as '.$tokenArray'type'.', not T_ENUM (code)');
+        $this->assertSame('T_ENUM', $tokenArray'type', 'Token tokenized as '.$tokenArray'type'.', not T_ENUM (type)');
 
-        $this->assertArrayHasKey('scope_condition', $tokens$enum);
-        $this->assertArrayHasKey('scope_opener', $tokens$enum);
-        $this->assertArrayHasKey('scope_closer', $tokens$enum);
+        $this->assertArrayHasKey('scope_condition', $tokenArray);
+        $this->assertArrayHasKey('scope_opener', $tokenArray);
+        $this->assertArrayHasKey('scope_closer', $tokenArray);
 
-        $this->assertSame($enum, $tokens$enum'scope_condition');
+        $this->assertSame($enum, $tokenArray'scope_condition');
 
-        $scopeOpener = $tokens$enum'scope_opener';
-        $scopeCloser = $tokens$enum'scope_closer';
+        $scopeOpener = $tokenArray'scope_opener';
+        $scopeCloser = $tokenArray'scope_closer';
 
         $expectedScopeOpener = ($enum + $openerOffset);
         $expectedScopeCloser = ($enum + $closerOffset);
@@ -73,52 +71,52 @@
      *
      * @see testEnums()
      *
-     * @return array
+     * @return array<string, array<string, string|int>>
      */
-    public function dataEnums()
+    public static function dataEnums()
     {
         return 
-            
-                '/* testPureEnum */',
-                'enum',
-                4,
-                12,
-            ,
-            
-                '/* testBackedIntEnum */',
-                'enum',
-                7,
-                29,
-            ,
-            
-                '/* testBackedStringEnum */',
-                'enum',
-                8,
-                30,
-            ,
-            
-                '/* testComplexEnum */',
-                'enum',
-                11,
-                72,
-            ,
-            
-                '/* testEnumWithEnumAsClassName */',
-                'enum',
-                6,
-                7,
-            ,
-            
-                '/* testEnumIsCaseInsensitive */',
-                'EnUm',
-                4,
-                5,
-            ,
-            
-                '/* testDeclarationContainingComment */',
-                'enum',
-                6,
-                14,
+            'enum - pure'                                                                   => 
+                'testMarker'   => '/* testPureEnum */',
+                'testContent'  => 'enum',
+                'openerOffset' => 4,
+                'closerOffset' => 12,
+            ,
+            'enum - backed int'                                                             => 
+                'testMarker'   => '/* testBackedIntEnum */',
+                'testContent'  => 'enum',
+                'openerOffset' => 7,
+                'closerOffset' => 29,
+            ,
+            'enum - backed string'                                                          => 
+                'testMarker'   => '/* testBackedStringEnum */',
+                'testContent'  => 'enum',
+                'openerOffset' => 8,
+                'closerOffset' => 30,
+            ,
+            'enum - backed int + implements'                                                => 
+                'testMarker'   => '/* testComplexEnum */',
+                'testContent'  => 'enum',
+                'openerOffset' => 11,
+                'closerOffset' => 72,
+            ,
+            'enum keyword when "enum" is the name for the construct (yes, this is allowed)' => 
+                'testMarker'   => '/* testEnumWithEnumAsClassName */',
+                'testContent'  => 'enum',
+                'openerOffset' => 6,
+                'closerOffset' => 7,
+            ,
+            'enum - keyword is case insensitive'                                            => 
+                'testMarker'   => '/* testEnumIsCaseInsensitive */',
+                'testContent'  => 'EnUm',
+                'openerOffset' => 4,
+                'closerOffset' => 5,
+            ,
+            'enum - declaration containing comment'                                         => 
+                'testMarker'   => '/* testDeclarationContainingComment */',
+                'testContent'  => 'enum',
+                'openerOffset' => 6,
+                'closerOffset' => 14,
             ,
         ;
 
@@ -138,11 +136,12 @@
      */
     public function testNotEnums($testMarker, $testContent)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens     = $this->phpcsFile->getTokens();
+        $target     = $this->getTargetToken($testMarker, T_ENUM, T_STRING, $testContent);
+        $tokenArray = $tokens$target;
 
-        $target = $this->getTargetToken($testMarker, T_ENUM, T_STRING, $testContent);
-        $this->assertSame(T_STRING, $tokens$target'code');
-        $this->assertSame('T_STRING', $tokens$target'type');
+        $this->assertSame(T_STRING, $tokenArray'code', 'Token tokenized as '.$tokenArray'type'.', not T_STRING (code)');
+        $this->assertSame('T_STRING', $tokenArray'type', 'Token tokenized as '.$tokenArray'type'.', not T_STRING (type)');
 
     }//end testNotEnums()
 
@@ -152,74 +151,70 @@
      *
      * @see testNotEnums()
      *
-     * @return array
+     * @return array<string, array<string, string>>
      */
-    public function dataNotEnums()
+    public static function dataNotEnums()
     {
         return 
-            
-                '/* testEnumAsClassNameAfterEnumKeyword */',
-                'Enum',
-            ,
-            
-                '/* testEnumUsedAsClassName */',
-                'Enum',
+            'not enum - construct named enum'                            => 
+                'testMarker'  => '/* testEnumAsClassNameAfterEnumKeyword */',
+                'testContent' => 'Enum',
             ,
-            
-                '/* testEnumUsedAsClassConstantName */',
-                'ENUM',
+            'not enum - class named enum'                                => 
+                'testMarker'  => '/* testEnumUsedAsClassName */',
+                'testContent' => 'Enum',
             ,
-            
-                '/* testEnumUsedAsMethodName */',
-                'enum',
+            'not enum - class constant named enum'                       => 
+                'testMarker'  => '/* testEnumUsedAsClassConstantName */',
+                'testContent' => 'ENUM',
             ,
-            
-                '/* testEnumUsedAsPropertyName */',
-                'enum',
+            'not enum - method named enum'                               => 
+                'testMarker'  => '/* testEnumUsedAsMethodName */',
+                'testContent' => 'enum',
             ,
-            
-                '/* testEnumUsedAsFunctionName */',
-                'enum',
+            'not enum - class property named enum'                       => 
+                'testMarker'  => '/* testEnumUsedAsPropertyName */',
+                'testContent' => 'enum',
             ,
-            
-                '/* testEnumUsedAsEnumName */',
-                'Enum',
+            'not enum - global function named enum'                      => 
+                'testMarker'  => '/* testEnumUsedAsFunctionName */',
+                'testContent' => 'enum',
             ,
-            
-                '/* testEnumUsedAsNamespaceName */',
-                'Enum',
+            'not enum - namespace named enum'                            => 
+                'testMarker'  => '/* testEnumUsedAsNamespaceName */',
+                'testContent' => 'Enum',
             ,
-            
-                '/* testEnumUsedAsPartOfNamespaceName */',
-                'Enum',
+            'not enum - part of namespace named enum'                    => 
+                'testMarker'  => '/* testEnumUsedAsPartOfNamespaceName */',
+                'testContent' => 'Enum',
             ,
-            
-                '/* testEnumUsedInObjectInitialization */',
-                'Enum',
+            'not enum - class instantiation for class enum'              => 
+                'testMarker'  => '/* testEnumUsedInObjectInitialization */',
+                'testContent' => 'Enum',
             ,
-            
-                '/* testEnumAsFunctionCall */',
-                'enum',
+            'not enum - function call'                                   => 
+                'testMarker'  => '/* testEnumAsFunctionCall */',
+                'testContent' => 'enum',
             ,
-            
-                '/* testEnumAsFunctionCallWithNamespace */',
-                'enum',
+            'not enum - namespace relative function call'                => 
+                'testMarker'  => '/* testEnumAsFunctionCallWithNamespace */',
+                'testContent' => 'enum',
             ,
-            
-                '/* testClassConstantFetchWithEnumAsClassName */',
-                'Enum',
+            'not enum - class constant fetch with enum as class name'    => 
+                'testMarker'  => '/* testClassConstantFetchWithEnumAsClassName */',
+                'testContent' => 'Enum',
             ,
-            
-                '/* testClassConstantFetchWithEnumAsConstantName */',
-                'ENUM',
+            'not enum - class constant fetch with enum as constant name' => 
+                'testMarker'  => '/* testClassConstantFetchWithEnumAsConstantName */',
+                'testContent' => 'ENUM',
             ,
-            
-                '/* testParseErrorMissingName */',
-                'enum',
+            'parse error, not enum - enum declaration without name'      => 
+                'testMarker'  => '/* testParseErrorMissingName */',
+                'testContent' => 'enum',
             ,
-            
-                '/* testParseErrorLiveCoding */',
-                'enum',
+            'parse error, not enum - enum declaration with curlies'      => 
+                'testMarker'  => '/* testParseErrorLiveCoding */',
+                'testContent' => 'enum',
             ,
         ;

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

@@ -9,9 +9,7 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
-
-class BackfillExplicitOctalNotationTest extends AbstractMethodUnitTest
+final class BackfillExplicitOctalNotationTest extends AbstractTokenizerTestCase
 {
 
 
@@ -30,7 +28,7 @@
      */
     public function testExplicitOctalNotation($marker, $value, $nextToken, $nextContent)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $number = $this->getTargetToken($marker, T_LNUMBER);
 
@@ -47,66 +45,66 @@
      *
      * @see testExplicitOctalNotation()
      *
-     * @return array
+     * @return array<string, array<string, int|string>>
      */
-    public function dataExplicitOctalNotation()
+    public static function dataExplicitOctalNotation()
     {
         return 
-            
+            'Explicit octal'                                                                                       => 
                 'marker'      => '/* testExplicitOctal */',
                 'value'       => '0o137041',
                 'nextToken'   => T_SEMICOLON,
                 'nextContent' => ';',
             ,
-            
+            'Explicit octal - capitalized O'                                                                       => 
                 'marker'      => '/* testExplicitOctalCapitalised */',
                 'value'       => '0O137041',
                 'nextToken'   => T_SEMICOLON,
                 'nextContent' => ';',
             ,
-            
+            'Explicit octal - with numeric literal separator'                                                      => 
                 'marker'      => '/* testExplicitOctalWithNumericSeparator */',
                 'value'       => '0o137_041',
                 'nextToken'   => T_SEMICOLON,
                 'nextContent' => ';',
             ,
-            
+            'Invalid explicit octal - numeric literal separator directly after "0o"'                               => 
                 'marker'      => '/* testInvalid1 */',
                 'value'       => '0',
                 'nextToken'   => T_STRING,
                 'nextContent' => 'o_137',
             ,
-            
+            'Invalid explicit octal - numeric literal separator directly after "0O" (capitalized O)'               => 
                 'marker'      => '/* testInvalid2 */',
                 'value'       => '0',
                 'nextToken'   => T_STRING,
                 'nextContent' => 'O_41',
             ,
-            
+            'Invalid explicit octal - number out of octal range'                                                   => 
                 'marker'      => '/* testInvalid3 */',
                 'value'       => '0',
                 'nextToken'   => T_STRING,
                 'nextContent' => 'o91',
             ,
-            
+            'Invalid explicit octal - part of the number out of octal range'                                       => 
                 'marker'      => '/* testInvalid4 */',
                 'value'       => '0O2',
                 'nextToken'   => T_LNUMBER,
                 'nextContent' => '82',
             ,
-            
+            'Invalid explicit octal - part of the number out of octal range with numeric literal separator after'  => 
                 'marker'      => '/* testInvalid5 */',
                 'value'       => '0o2',
                 'nextToken'   => T_LNUMBER,
                 'nextContent' => '8_2',
             ,
-            
+            'Invalid explicit octal - part of the number out of octal range with numeric literal separator before' => 
                 'marker'      => '/* testInvalid6 */',
                 'value'       => '0o2',
                 'nextToken'   => T_STRING,
                 'nextContent' => '_82',
             ,
-            
+            'Invalid explicit octal - explicit notation without number'                                            => 
                 'marker'      => '/* testInvalid7 */',
                 'value'       => '0',
                 'nextToken'   => T_STRING,

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

@@ -9,9 +9,7 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
-
-class BackfillFnTokenTest extends AbstractMethodUnitTest
+final class BackfillFnTokenTest extends AbstractTokenizerTestCase
 {
 
 
@@ -106,7 +104,7 @@
      */
     public function testNestedInner()
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $token = $this->getTargetToken('/* testNestedInner */', T_FN);
         $this->backfillHelper($token, true);
@@ -137,7 +135,7 @@
      */
     public function testNestedSharedCloser()
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $token = $this->getTargetToken('/* testNestedSharedCloserOuter */', T_FN);
         $this->backfillHelper($token);
@@ -380,7 +378,7 @@
      */
     public function testKeywordReturnTypes()
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $testMarkers = 
             'Self',
@@ -453,7 +451,7 @@
      */
     public function testTernary()
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $token = $this->getTargetToken('/* testTernary */', T_FN);
         $this->backfillHelper($token);
@@ -505,7 +503,7 @@
      */
     public function testTernaryWithTypes()
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $token = $this->getTargetToken('/* testTernaryWithTypes */', T_FN);
         $this->backfillHelper($token);
@@ -563,7 +561,7 @@
      */
     public function testInMatchValue($testMarker, $openerOffset, $closerOffset, $expectedCloserType, $expectedCloserFriendlyName)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $token = $this->getTargetToken($testMarker, T_FN);
         $this->backfillHelper($token);
@@ -579,38 +577,38 @@
      *
      * @see testInMatchValue()
      *
-     * @return array
+     * @return array<string, array<string, string|int>>
      */
-    public function dataInMatchValue()
+    public static function dataInMatchValue()
     {
         return 
             'not_last_value'                      => 
-                '/* testInMatchNotLastValue */',
-                5,
-                11,
-                'T_COMMA',
-                'comma',
+                'testMarker'                 => '/* testInMatchNotLastValue */',
+                'openerOffset'               => 5,
+                'closerOffset'               => 11,
+                'expectedCloserType'         => 'T_COMMA',
+                'expectedCloserFriendlyName' => 'comma',
             ,
             'last_value_with_trailing_comma'      => 
-                '/* testInMatchLastValueWithTrailingComma */',
-                5,
-                11,
-                'T_COMMA',
-                'comma',
+                'testMarker'                 => '/* testInMatchLastValueWithTrailingComma */',
+                'openerOffset'               => 5,
+                'closerOffset'               => 11,
+                'expectedCloserType'         => 'T_COMMA',
+                'expectedCloserFriendlyName' => 'comma',
             ,
             'last_value_without_trailing_comma_1' => 
-                '/* testInMatchLastValueNoTrailingComma1 */',
-                5,
-                10,
-                'T_CLOSE_PARENTHESIS',
-                'close parenthesis',
+                'testMarker'                 => '/* testInMatchLastValueNoTrailingComma1 */',
+                'openerOffset'               => 5,
+                'closerOffset'               => 10,
+                'expectedCloserType'         => 'T_CLOSE_PARENTHESIS',
+                'expectedCloserFriendlyName' => 'close parenthesis',
             ,
             'last_value_without_trailing_comma_2' => 
-                '/* testInMatchLastValueNoTrailingComma2 */',
-                5,
-                11,
-                'T_VARIABLE',
-                '$y variable',
+                'testMarker'                 => '/* testInMatchLastValueNoTrailingComma2 */',
+                'openerOffset'               => 5,
+                'closerOffset'               => 11,
+                'expectedCloserType'         => 'T_VARIABLE',
+                'expectedCloserFriendlyName' => '$y variable',
             ,
         ;
 
@@ -647,7 +645,7 @@
      */
     public function testNotAnArrowFunction($testMarker, $testContent='fn')
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $token      = $this->getTargetToken($testMarker, T_STRING, T_FN, $testContent);
         $tokenArray = $tokens$token;
@@ -669,47 +667,63 @@
      *
      * @see testNotAnArrowFunction()
      *
-     * @return array
+     * @return array<string, array<string, string>>
      */
-    public function dataNotAnArrowFunction()
+    public static function dataNotAnArrowFunction()
     {
         return 
-            '/* testFunctionName */',
-            
-                '/* testConstantDeclaration */',
-                'FN',
+            'name of a function, context: declaration'                                       => 
+                'testMarker' => '/* testFunctionName */',
+            ,
+            'name of a constant, context: declaration using "const" keyword - uppercase'     => 
+                'testMarker'  => '/* testConstantDeclaration */',
+                'testContent' => 'FN',
+            ,
+            'name of a constant, context: declaration using "const" keyword - lowercase'     => 
+                'testMarker'  => '/* testConstantDeclarationLower */',
+                'testContent' => 'fn',
+            ,
+            'name of a (static) method, context: declaration'                                => 
+                'testMarker' => '/* testStaticMethodName */',
+            ,
+            'name of a property, context: property access'                                   => 
+                'testMarker' => '/* testPropertyAssignment */',
+            ,
+            'name of a method, context: declaration in an anon class - mixed case'           => 
+                'testMarker'  => '/* testAnonClassMethodName */',
+                'testContent' => 'fN',
+            ,
+            'name of a method, context: static method call'                                  => 
+                'testMarker' => '/* testNonArrowStaticMethodCall */',
+            ,
+            'name of a constant, context: constant access - uppercase'                       => 
+                'testMarker'  => '/* testNonArrowConstantAccess */',
+                'testContent' => 'FN',
+            ,
+            'name of a constant, context: constant access - mixed case'                      => 
+                'testMarker'  => '/* testNonArrowConstantAccessMixed */',
+                'testContent' => 'Fn',
             ,
-            
-                '/* testConstantDeclarationLower */',
-                'fn',
+            'name of a method, context: method call on object - lowercase'                   => 
+                'testMarker' => '/* testNonArrowObjectMethodCall */',
             ,
-            '/* testStaticMethodName */',
-            '/* testPropertyAssignment */',
-            
-                '/* testAnonClassMethodName */',
-                'fN',
+            'name of a method, context: method call on object - uppercase'                   => 
+                'testMarker'  => '/* testNonArrowObjectMethodCallUpper */',
+                'testContent' => 'FN',
             ,
-            '/* testNonArrowStaticMethodCall */',
-            
-                '/* testNonArrowConstantAccess */',
-                'FN',
+            'name of a (namespaced) function, context: partially qualified function call'    => 
+                'testMarker'  => '/* testNonArrowNamespacedFunctionCall */',
+                'testContent' => 'Fn',
             ,
-            
-                '/* testNonArrowConstantAccessMixed */',
-                'Fn',
+            'name of a (namespaced) function, context: namespace relative function call'     => 
+                'testMarker' => '/* testNonArrowNamespaceOperatorFunctionCall */',
             ,
-            '/* testNonArrowObjectMethodCall */',
-            
-                '/* testNonArrowObjectMethodCallUpper */',
-                'FN',
+            'name of a function, context: declaration with union types for param and return' => 
+                'testMarker' => '/* testNonArrowFunctionNameWithUnionTypes */',
             ,
-            
-                '/* testNonArrowNamespacedFunctionCall */',
-                'Fn',
+            'unknown - live coding/parse error'                                              => 
+                'testMarker' => '/* testLiveCoding */',
             ,
-            '/* testNonArrowNamespaceOperatorFunctionCall */',
-            '/* testNonArrowFunctionNameWithUnionTypes */',
-            '/* testLiveCoding */',
         ;
 
     }//end dataNotAnArrowFunction()
@@ -729,7 +743,7 @@
      */
     private function backfillHelper($token, $skipScopeCloserCheck=false)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $this->assertTrue(array_key_exists('scope_condition', $tokens$token), 'Scope condition is not set');
         $this->assertTrue(array_key_exists('scope_opener', $tokens$token), 'Scope opener is not set');
@@ -781,7 +795,7 @@
      */
     private function scopePositionTestHelper($token, $openerOffset, $closerOffset, $expectedCloserType='semicolon')
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
         $expectedScopeOpener = ($token + $openerOffset);
         $expectedScopeCloser = ($token + $closerOffset);

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

@@ -10,10 +10,9 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
 use PHP_CodeSniffer\Util\Tokens;
 
-class BackfillMatchTokenTest extends AbstractMethodUnitTest
+final class BackfillMatchTokenTest extends AbstractTokenizerTestCase
 {
 
 
@@ -32,7 +31,7 @@
      */
     public function testMatchExpression($testMarker, $openerOffset, $closerOffset, $testContent='match')
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $token      = $this->getTargetToken($testMarker, T_STRING, T_MATCH, $testContent);
         $tokenArray = $tokens$token;
@@ -51,147 +50,147 @@
      *
      * @see testMatchExpression()
      *
-     * @return array
+     * @return array<string, array<string, string|int>>
      */
-    public function dataMatchExpression()
+    public static function dataMatchExpression()
     {
         return 
             'simple_match'                              => 
-                '/* testMatchSimple */',
-                6,
-                33,
+                'testMarker'   => '/* testMatchSimple */',
+                'openerOffset' => 6,
+                'closerOffset' => 33,
             ,
             'no_trailing_comma'                         => 
-                '/* testMatchNoTrailingComma */',
-                6,
-                24,
+                'testMarker'   => '/* testMatchNoTrailingComma */',
+                'openerOffset' => 6,
+                'closerOffset' => 24,
             ,
             'with_default_case'                         => 
-                '/* testMatchWithDefault */',
-                6,
-                33,
+                'testMarker'   => '/* testMatchWithDefault */',
+                'openerOffset' => 6,
+                'closerOffset' => 33,
             ,
             'expression_in_condition'                   => 
-                '/* testMatchExpressionInCondition */',
-                6,
-                77,
+                'testMarker'   => '/* testMatchExpressionInCondition */',
+                'openerOffset' => 6,
+                'closerOffset' => 77,
             ,
             'multicase'                                 => 
-                '/* testMatchMultiCase */',
-                6,
-                40,
+                'testMarker'   => '/* testMatchMultiCase */',
+                'openerOffset' => 6,
+                'closerOffset' => 40,
             ,
             'multicase_trailing_comma_in_case'          => 
-                '/* testMatchMultiCaseTrailingCommaInCase */',
-                6,
-                47,
+                'testMarker'   => '/* testMatchMultiCaseTrailingCommaInCase */',
+                'openerOffset' => 6,
+                'closerOffset' => 47,
             ,
             'in_closure_not_lowercase'                  => 
-                '/* testMatchInClosureNotLowercase */',
-                6,
-                36,
-                'Match',
+                'testMarker'   => '/* testMatchInClosureNotLowercase */',
+                'openerOffset' => 6,
+                'closerOffset' => 36,
+                'testContent'  => 'Match',
             ,
             'in_arrow_function'                         => 
-                '/* testMatchInArrowFunction */',
-                5,
-                36,
+                'testMarker'   => '/* testMatchInArrowFunction */',
+                'openerOffset' => 5,
+                'closerOffset' => 36,
             ,
             'arrow_function_in_match_no_trailing_comma' => 
-                '/* testArrowFunctionInMatchNoTrailingComma */',
-                6,
-                44,
+                'testMarker'   => '/* testArrowFunctionInMatchNoTrailingComma */',
+                'openerOffset' => 6,
+                'closerOffset' => 44,
             ,
             'in_function_call_param_not_lowercase'      => 
-                '/* testMatchInFunctionCallParamNotLowercase */',
-                8,
-                32,
-                'MATCH',
+                'testMarker'   => '/* testMatchInFunctionCallParamNotLowercase */',
+                'openerOffset' => 8,
+                'closerOffset' => 32,
+                'testContent'  => 'MATCH',
             ,
             'in_method_call_param'                      => 
-                '/* testMatchInMethodCallParam */',
-                5,
-                13,
+                'testMarker'   => '/* testMatchInMethodCallParam */',
+                'openerOffset' => 5,
+                'closerOffset' => 13,
             ,
             'discard_result'                            => 
-                '/* testMatchDiscardResult */',
-                6,
-                18,
+                'testMarker'   => '/* testMatchDiscardResult */',
+                'openerOffset' => 6,
+                'closerOffset' => 18,
             ,
             'duplicate_conditions_and_comments'         => 
-                '/* testMatchWithDuplicateConditionsWithComments */',
-                12,
-                59,
+                'testMarker'   => '/* testMatchWithDuplicateConditionsWithComments */',
+                'openerOffset' => 12,
+                'closerOffset' => 59,
             ,
             'nested_match_outer'                        => 
-                '/* testNestedMatchOuter */',
-                6,
-                33,
+                'testMarker'   => '/* testNestedMatchOuter */',
+                'openerOffset' => 6,
+                'closerOffset' => 33,
             ,
             'nested_match_inner'                        => 
-                '/* testNestedMatchInner */',
-                6,
-                14,
+                'testMarker'   => '/* testNestedMatchInner */',
+                'openerOffset' => 6,
+                'closerOffset' => 14,
             ,
             'ternary_condition'                         => 
-                '/* testMatchInTernaryCondition */',
-                6,
-                21,
+                'testMarker'   => '/* testMatchInTernaryCondition */',
+                'openerOffset' => 6,
+                'closerOffset' => 21,
             ,
             'ternary_then'                              => 
-                '/* testMatchInTernaryThen */',
-                6,
-                21,
+                'testMarker'   => '/* testMatchInTernaryThen */',
+                'openerOffset' => 6,
+                'closerOffset' => 21,
             ,
             'ternary_else'                              => 
-                '/* testMatchInTernaryElse */',
-                6,
-                21,
+                'testMarker'   => '/* testMatchInTernaryElse */',
+                'openerOffset' => 6,
+                'closerOffset' => 21,
             ,
             'array_value'                               => 
-                '/* testMatchInArrayValue */',
-                6,
-                21,
+                'testMarker'   => '/* testMatchInArrayValue */',
+                'openerOffset' => 6,
+                'closerOffset' => 21,
             ,
             'array_key'                                 => 
-                '/* testMatchInArrayKey */',
-                6,
-                21,
+                'testMarker'   => '/* testMatchInArrayKey */',
+                'openerOffset' => 6,
+                'closerOffset' => 21,
             ,
             'returning_array'                           => 
-                '/* testMatchreturningArray */',
-                6,
-                125,
+                'testMarker'   => '/* testMatchreturningArray */',
+                'openerOffset' => 6,
+                'closerOffset' => 125,
             ,
             'nested_in_switch_case_1'                   => 
-                '/* testMatchWithDefaultNestedInSwitchCase1 */',
-                6,
-                25,
+                'testMarker'   => '/* testMatchWithDefaultNestedInSwitchCase1 */',
+                'openerOffset' => 6,
+                'closerOffset' => 25,
             ,
             'nested_in_switch_case_2'                   => 
-                '/* testMatchWithDefaultNestedInSwitchCase2 */',
-                6,
-                25,
+                'testMarker'   => '/* testMatchWithDefaultNestedInSwitchCase2 */',
+                'openerOffset' => 6,
+                'closerOffset' => 25,
             ,
             'nested_in_switch_default'                  => 
-                '/* testMatchWithDefaultNestedInSwitchDefault */',
-                6,
-                25,
+                'testMarker'   => '/* testMatchWithDefaultNestedInSwitchDefault */',
+                'openerOffset' => 6,
+                'closerOffset' => 25,
             ,
             'match_with_nested_switch'                  => 
-                '/* testMatchContainingSwitch */',
-                6,
-                180,
+                'testMarker'   => '/* testMatchContainingSwitch */',
+                'openerOffset' => 6,
+                'closerOffset' => 180,
             ,
             'no_cases'                                  => 
-                '/* testMatchNoCases */',
-                6,
-                7,
+                'testMarker'   => '/* testMatchNoCases */',
+                'openerOffset' => 6,
+                'closerOffset' => 7,
             ,
             'multi_default'                             => 
-                '/* testMatchMultiDefault */',
-                6,
-                40,
+                'testMarker'   => '/* testMatchMultiDefault */',
+                'openerOffset' => 6,
+                'closerOffset' => 40,
             ,
         ;
 
@@ -213,7 +212,7 @@
      */
     public function testNotAMatchStructure($testMarker, $testContent='match')
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $token      = $this->getTargetToken($testMarker, T_STRING, T_MATCH, $testContent);
         $tokenArray = $tokens$token;
@@ -228,7 +227,7 @@
         $this->assertArrayNotHasKey('parenthesis_opener', $tokenArray, 'Parenthesis opener is set');
         $this->assertArrayNotHasKey('parenthesis_closer', $tokenArray, 'Parenthesis closer is set');
 
-        $next = self::$phpcsFile->findNext(Tokens::$emptyTokens, ($token + 1), null, true);
+        $next = $this->phpcsFile->findNext(Tokens::$emptyTokens, ($token + 1), null, true);
         if ($next !== false && $tokens$next'code' === T_OPEN_PARENTHESIS) {
             $this->assertArrayNotHasKey('parenthesis_owner', $tokenArray, 'Parenthesis owner is set for opener after');
         }
@@ -241,76 +240,102 @@
      *
      * @see testNotAMatchStructure()
      *
-     * @return array
+     * @return array<string, array<string, string>>
      */
-    public function dataNotAMatchStructure()
+    public static function dataNotAMatchStructure()
     {
         return 
-            'static_method_call'                   => '/* testNoMatchStaticMethodCall */',
+            'static_method_call'                   => 
+                'testMarker' => '/* testNoMatchStaticMethodCall */',
+            ,
             'class_constant_access'                => 
-                '/* testNoMatchClassConstantAccess */',
-                'MATCH',
+                'testMarker'  => '/* testNoMatchClassConstantAccess */',
+                'testContent' => 'MATCH',
             ,
             'class_constant_array_access'          => 
-                '/* testNoMatchClassConstantArrayAccessMixedCase */',
-                'Match',
+                'testMarker'  => '/* testNoMatchClassConstantArrayAccessMixedCase */',
+                'testContent' => 'Match',
+            ,
+            'method_call'                          => 
+                'testMarker' => '/* testNoMatchMethodCall */',
             ,
-            'method_call'                          => '/* testNoMatchMethodCall */',
             'method_call_uppercase'                => 
-                '/* testNoMatchMethodCallUpper */',
-                'MATCH',
-            ,
-            'property_access'                      => '/* testNoMatchPropertyAccess */',
-            'namespaced_function_call'             => '/* testNoMatchNamespacedFunctionCall */',
-            'namespace_operator_function_call'     => '/* testNoMatchNamespaceOperatorFunctionCall */',
-            'interface_method_declaration'         => '/* testNoMatchInterfaceMethodDeclaration */',
-            'class_constant_declaration'           => '/* testNoMatchClassConstantDeclarationLower */',
-            'class_method_declaration'             => '/* testNoMatchClassMethodDeclaration */',
-            'property_assigment'                   => '/* testNoMatchPropertyAssignment */',
+                'testMarker'  => '/* testNoMatchMethodCallUpper */',
+                'testContent' => 'MATCH',
+            ,
+            'property_access'                      => 
+                'testMarker' => '/* testNoMatchPropertyAccess */',
+            ,
+            'namespaced_function_call'             => 
+                'testMarker' => '/* testNoMatchNamespacedFunctionCall */',
+            ,
+            'namespace_operator_function_call'     => 
+                'testMarker' => '/* testNoMatchNamespaceOperatorFunctionCall */',
+            ,
+            'interface_method_declaration'         => 
+                'testMarker' => '/* testNoMatchInterfaceMethodDeclaration */',
+            ,
+            'class_constant_declaration'           => 
+                'testMarker' => '/* testNoMatchClassConstantDeclarationLower */',
+            ,
+            'class_method_declaration'             => 
+                'testMarker' => '/* testNoMatchClassMethodDeclaration */',
+            ,
+            'property_assigment'                   => 
+                'testMarker' => '/* testNoMatchPropertyAssignment */',
+            ,
             'class_instantiation'                  => 
-                '/* testNoMatchClassInstantiation */',
-                'Match',
+                'testMarker'  => '/* testNoMatchClassInstantiation */',
+                'testContent' => 'Match',
             ,
             'anon_class_method_declaration'        => 
-                '/* testNoMatchAnonClassMethodDeclaration */',
-                'maTCH',
+                'testMarker'  => '/* testNoMatchAnonClassMethodDeclaration */',
+                'testContent' => 'maTCH',
             ,
             'class_declaration'                    => 
-                '/* testNoMatchClassDeclaration */',
-                'Match',
+                'testMarker'  => '/* testNoMatchClassDeclaration */',
+                'testContent' => 'Match',
             ,
             'interface_declaration'                => 
-                '/* testNoMatchInterfaceDeclaration */',
-                'Match',
+                'testMarker'  => '/* testNoMatchInterfaceDeclaration */',
+                'testContent' => 'Match',
             ,
             'trait_declaration'                    => 
-                '/* testNoMatchTraitDeclaration */',
-                'Match',
+                'testMarker'  => '/* testNoMatchTraitDeclaration */',
+                'testContent' => 'Match',
             ,
             'constant_declaration'                 => 
-                '/* testNoMatchConstantDeclaration */',
-                'MATCH',
+                'testMarker'  => '/* testNoMatchConstantDeclaration */',
+                'testContent' => 'MATCH',
+            ,
+            'function_declaration'                 => 
+                'testMarker' => '/* testNoMatchFunctionDeclaration */',
             ,
-            'function_declaration'                 => '/* testNoMatchFunctionDeclaration */',
             'namespace_declaration'                => 
-                '/* testNoMatchNamespaceDeclaration */',
-                'Match',
+                'testMarker'  => '/* testNoMatchNamespaceDeclaration */',
+                'testContent' => 'Match',
             ,
             'class_extends_declaration'            => 
-                '/* testNoMatchExtendedClassDeclaration */',
-                'Match',
+                'testMarker'  => '/* testNoMatchExtendedClassDeclaration */',
+                'testContent' => 'Match',
             ,
             'class_implements_declaration'         => 
-                '/* testNoMatchImplementedClassDeclaration */',
-                'Match',
+                'testMarker'  => '/* testNoMatchImplementedClassDeclaration */',
+                'testContent' => 'Match',
             ,
             'use_statement'                        => 
-                '/* testNoMatchInUseStatement */',
-                'Match',
+                'testMarker'  => '/* testNoMatchInUseStatement */',
+                'testContent' => 'Match',
+            ,
+            'unsupported_inline_control_structure' => 
+                'testMarker' => '/* testNoMatchMissingCurlies */',
+            ,
+            'unsupported_alternative_syntax'       => 
+                'testMarker' => '/* testNoMatchAlternativeSyntax */',
+            ,
+            'live_coding'                          => 
+                'testMarker' => '/* testLiveCoding */',
             ,
-            'unsupported_inline_control_structure' => '/* testNoMatchMissingCurlies */',
-            'unsupported_alternative_syntax'       => '/* testNoMatchAlternativeSyntax */',
-            'live_coding'                          => '/* testLiveCoding */',
         ;
 
     }//end dataNotAMatchStructure()
@@ -344,25 +369,25 @@
      *
      * @see testSwitchExpression()
      *
-     * @return array
+     * @return array<string, array<string, string|int>>
      */
-    public function dataSwitchExpression()
+    public static function dataSwitchExpression()
     {
         return 
             'switch_containing_match'   => 
-                '/* testSwitchContainingMatch */',
-                6,
-                174,
+                'testMarker'   => '/* testSwitchContainingMatch */',
+                'openerOffset' => 6,
+                'closerOffset' => 174,
             ,
             'match_containing_switch_1' => 
-                '/* testSwitchNestedInMatch1 */',
-                5,
-                63,
+                'testMarker'   => '/* testSwitchNestedInMatch1 */',
+                'openerOffset' => 5,
+                'closerOffset' => 63,
             ,
             'match_containing_switch_2' => 
-                '/* testSwitchNestedInMatch2 */',
-                5,
-                63,
+                'testMarker'   => '/* testSwitchNestedInMatch2 */',
+                'openerOffset' => 5,
+                'closerOffset' => 63,
             ,
         ;
 
@@ -397,35 +422,35 @@
      *
      * @see testSwitchCaseVersusMatch()
      *
-     * @return array
+     * @return array<string, array<string, string|int>>
      */
-    public function dataSwitchCaseVersusMatch()
+    public static function dataSwitchCaseVersusMatch()
     {
         return 
             'switch_with_nested_match_case_1'       => 
-                '/* testMatchWithDefaultNestedInSwitchCase1 */',
-                3,
-                55,
+                'testMarker'   => '/* testMatchWithDefaultNestedInSwitchCase1 */',
+                'openerOffset' => 3,
+                'closerOffset' => 55,
             ,
             'switch_with_nested_match_case_2'       => 
-                '/* testMatchWithDefaultNestedInSwitchCase2 */',
-                4,
-                21,
+                'testMarker'   => '/* testMatchWithDefaultNestedInSwitchCase2 */',
+                'openerOffset' => 4,
+                'closerOffset' => 21,
             ,
             'switch_with_nested_match_default_case' => 
-                '/* testMatchWithDefaultNestedInSwitchDefault */',
-                1,
-                38,
+                'testMarker'   => '/* testMatchWithDefaultNestedInSwitchDefault */',
+                'openerOffset' => 1,
+                'closerOffset' => 38,
             ,
             'match_with_nested_switch_case'         => 
-                '/* testSwitchDefaultNestedInMatchCase */',
-                1,
-                18,
+                'testMarker'   => '/* testSwitchDefaultNestedInMatchCase */',
+                'openerOffset' => 1,
+                'closerOffset' => 18,
             ,
             'match_with_nested_switch_default_case' => 
-                '/* testSwitchDefaultNestedInMatchDefault */',
-                1,
-                20,
+                'testMarker'   => '/* testSwitchDefaultNestedInMatchDefault */',
+                'openerOffset' => 1,
+                'closerOffset' => 20,
             ,
         ;
 
@@ -451,7 +476,7 @@
      */
     private function scopeTestHelper($token, $openerOffset, $closerOffset, $skipScopeCloserCheck=false)
     {
-        $tokens     = self::$phpcsFile->getTokens();
+        $tokens     = $this->phpcsFile->getTokens();
         $tokenArray = $tokens$token;
         $tokenType  = $tokenArray'type';
         $expectedScopeOpener = ($token + $openerOffset);
@@ -506,7 +531,7 @@
      */
     private function parenthesisTestHelper($token)
     {
-        $tokens     = self::$phpcsFile->getTokens();
+        $tokens     = $this->phpcsFile->getTokens();
         $tokenArray = $tokens$token;
         $tokenType  = $tokenArray'type';

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

@@ -9,30 +9,33 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+use PHP_CodeSniffer\Util\Tokens;
 
-class BackfillNumericSeparatorTest extends AbstractMethodUnitTest
+final class BackfillNumericSeparatorTest extends AbstractTokenizerTestCase
 {
 
 
     /**
      * Test that numbers using numeric separators are tokenized correctly.
      *
-     * @param array $testData The data required for the specific test case.
+     * @param string $marker The comment which prefaces the target token in the test file.
+     * @param string $type   The expected token type.
+     * @param string $value  The expected token content.
      *
      * @dataProvider dataTestBackfill
      * @covers       PHP_CodeSniffer\Tokenizers\PHP::tokenize
      *
      * @return void
      */
-    public function testBackfill($testData)
+    public function testBackfill($marker, $type, $value)
     {
-        $tokens = self::$phpcsFile->getTokens();
-        $number = $this->getTargetToken($testData'marker', T_LNUMBER, T_DNUMBER);
+        $tokens     = $this->phpcsFile->getTokens();
+        $number     = $this->getTargetToken($marker, T_LNUMBER, T_DNUMBER);
+        $tokenArray = $tokens$number;
 
-        $this->assertSame(constant($testData'type'), $tokens$number'code');
-        $this->assertSame($testData'type', $tokens$number'type');
-        $this->assertSame($testData'value', $tokens$number'content');
+        $this->assertSame(constant($type), $tokenArray'code', 'Token tokenized as '.$tokenArray'type'.', not '.$type.' (code)');
+        $this->assertSame($type, $tokenArray'type', 'Token tokenized as '.$tokenArray'type'.', not '.$type.' (type)');
+        $this->assertSame($value, $tokenArray'content');
 
     }//end testBackfill()
 
@@ -42,9 +45,9 @@
      *
      * @see testBackfill()
      *
-     * @return array
+     * @return array<string, array<string, string>>
      */
-    public function dataTestBackfill()
+    public static function dataTestBackfill()
     {
         $testHexType = 'T_LNUMBER';
         if (PHP_INT_MAX < 0xCAFEF00D) {
@@ -62,96 +65,70 @@
         }
 
         return 
-            
-                
-                    'marker' => '/* testSimpleLNumber */',
-                    'type'   => 'T_LNUMBER',
-                    'value'  => '1_000_000_000',
-                ,
+            'decimal integer'                                            => 
+                'marker' => '/* testSimpleLNumber */',
+                'type'   => 'T_LNUMBER',
+                'value'  => '1_000_000_000',
             ,
-            
-                
-                    'marker' => '/* testSimpleDNumber */',
-                    'type'   => 'T_DNUMBER',
-                    'value'  => '107_925_284.88',
-                ,
+            'float'                                                      => 
+                'marker' => '/* testSimpleDNumber */',
+                'type'   => 'T_DNUMBER',
+                'value'  => '107_925_284.88',
             ,
-            
-                
-                    'marker' => '/* testFloat */',
-                    'type'   => 'T_DNUMBER',
-                    'value'  => '6.674_083e-11',
-                ,
+            'float, scientific notation, negative exponent with sigh'    => 
+                'marker' => '/* testFloat */',
+                'type'   => 'T_DNUMBER',
+                'value'  => '6.674_083e-11',
             ,
-            
-                
-                    'marker' => '/* testFloat2 */',
-                    'type'   => 'T_DNUMBER',
-                    'value'  => '6.674_083e+11',
-                ,
+            'float, scientific notation, positive exponent with sign'    => 
+                'marker' => '/* testFloat2 */',
+                'type'   => 'T_DNUMBER',
+                'value'  => '6.674_083e+11',
             ,
-            
-                
-                    'marker' => '/* testFloat3 */',
-                    'type'   => 'T_DNUMBER',
-                    'value'  => '1_2.3_4e1_23',
-                ,
+            'float, scientific notation, positive exponent without sign' => 
+                'marker' => '/* testFloat3 */',
+                'type'   => 'T_DNUMBER',
+                'value'  => '1_2.3_4e1_23',
             ,
-            
-                
-                    'marker' => '/* testHex */',
-                    'type'   => $testHexType,
-                    'value'  => '0xCAFE_F00D',
-                ,
+            'hexidecimal integer/float'                                  => 
+                'marker' => '/* testHex */',
+                'type'   => $testHexType,
+                'value'  => '0xCAFE_F00D',
             ,
-            
-                
-                    'marker' => '/* testHexMultiple */',
-                    'type'   => $testHexMultipleType,
-                    'value'  => '0x42_72_6F_77_6E',
-                ,
+            'hexidecimal integer/float with multiple underscores'        => 
+                'marker' => '/* testHexMultiple */',
+                'type'   => $testHexMultipleType,
+                'value'  => '0x42_72_6F_77_6E',
             ,
-            
-                
-                    'marker' => '/* testHexInt */',
-                    'type'   => 'T_LNUMBER',
-                    'value'  => '0x42_72_6F',
-                ,
+            'hexidecimal integer'                                        => 
+                'marker' => '/* testHexInt */',
+                'type'   => 'T_LNUMBER',
+                'value'  => '0x42_72_6F',
             ,
-            
-                
-                    'marker' => '/* testBinary */',
-                    'type'   => 'T_LNUMBER',
-                    'value'  => '0b0101_1111',
-                ,
+            'binary integer'                                             => 
+                'marker' => '/* testBinary */',
+                'type'   => 'T_LNUMBER',
+                'value'  => '0b0101_1111',
             ,
-            
-                
-                    'marker' => '/* testOctal */',
-                    'type'   => 'T_LNUMBER',
-                    'value'  => '0137_041',
-                ,
+            'octal integer'                                              => 
+                'marker' => '/* testOctal */',
+                'type'   => 'T_LNUMBER',
+                'value'  => '0137_041',
             ,
-            
-                
-                    'marker' => '/* testExplicitOctal */',
-                    'type'   => 'T_LNUMBER',
-                    'value'  => '0o137_041',
-                ,
+            'octal integer using explicit octal notation'                => 
+                'marker' => '/* testExplicitOctal */',
+                'type'   => 'T_LNUMBER',
+                'value'  => '0o137_041',
             ,
-            
-                
-                    'marker' => '/* testExplicitOctalCapitalised */',
-                    'type'   => 'T_LNUMBER',
-                    'value'  => '0O137_041',
-                ,
+            'octal integer using explicit octal notation with capital O' => 
+                'marker' => '/* testExplicitOctalCapitalised */',
+                'type'   => 'T_LNUMBER',
+                'value'  => '0O137_041',
             ,
-            
-                
-                    'marker' => '/* testIntMoreThanMax */',
-                    'type'   => $testIntMoreThanMaxType,
-                    'value'  => '10_223_372_036_854_775_807',
-                ,
+            'integer more than PHP_INT_MAX becomes a float'              => 
+                'marker' => '/* testIntMoreThanMax */',
+                'type'   => $testIntMoreThanMaxType,
+                'value'  => '10_223_372_036_854_775_807',
             ,
         ;
 
@@ -162,8 +139,8 @@
      * Test that numbers using numeric separators which are considered parse errors and/or
      * which aren't relevant to the backfill, do not incorrectly trigger the backfill anyway.
      *
-     * @param string $testMarker     The comment which prefaces the target token in the test file.
-     * @param array  $expectedTokens The token type and content of the expected token sequence.
+     * @param string                           $testMarker     The comment which prefaces the target token in the test file.
+     * @param array<array<string, int|string>> $expectedTokens The token type and content of the expected token sequence.
      *
      * @dataProvider dataNoBackfill
      * @covers       PHP_CodeSniffer\Tokenizers\PHP::tokenize
@@ -172,12 +149,16 @@
      */
     public function testNoBackfill($testMarker, $expectedTokens)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
         $number = $this->getTargetToken($testMarker, T_LNUMBER, T_DNUMBER);
 
         foreach ($expectedTokens as $key => $expectedToken) {
             $i = ($number + $key);
-            $this->assertSame($expectedToken'code', $tokens$i'code');
+            $this->assertSame(
+                $expectedToken'code',
+                $tokens$i'code',
+                'Token tokenized as '.Tokens::tokenName($tokens$i'code').', not '.Tokens::tokenName($expectedToken'code')
+            );
             $this->assertSame($expectedToken'content', $tokens$i'content');
         }
 
@@ -189,14 +170,14 @@
      *
      * @see testBackfill()
      *
-     * @return array
+     * @return array<string, array<string, string|array<array<string, int|string>>>>
      */
-    public function dataNoBackfill()
+    public static function dataNoBackfill()
     {
         return 
-            
-                '/* testInvalid1 */',
-                
+            'invalid: trailing underscore'                                      => 
+                'testMarker'     => '/* testInvalid1 */',
+                'expectedTokens' => 
                     
                         'code'    => T_LNUMBER,
                         'content' => '100',
@@ -207,9 +188,9 @@
                     ,
                 ,
             ,
-            
-                '/* testInvalid2 */',
-                
+            'invalid: two consecutive underscores'                              => 
+                'testMarker'     => '/* testInvalid2 */',
+                'expectedTokens' => 
                     
                         'code'    => T_LNUMBER,
                         'content' => '1',
@@ -220,9 +201,9 @@
                     ,
                 ,
             ,
-            
-                '/* testInvalid3 */',
-                
+            'invalid: underscore directly before decimal point'                 => 
+                'testMarker'     => '/* testInvalid3 */',
+                'expectedTokens' => 
                     
                         'code'    => T_LNUMBER,
                         'content' => '1',
@@ -237,9 +218,9 @@
                     ,
                 ,
             ,
-            
-                '/* testInvalid4 */',
-                
+            'invalid: underscore directly after decimal point'                  => 
+                'testMarker'     => '/* testInvalid4 */',
+                'expectedTokens' => 
                     
                         'code'    => T_DNUMBER,
                         'content' => '1.',
@@ -250,9 +231,9 @@
                     ,
                 ,
             ,
-            
-                '/* testInvalid5 */',
-                
+            'invalid: hex int - underscore directly after x'                    => 
+                'testMarker'     => '/* testInvalid5 */',
+                'expectedTokens' => 
                     
                         'code'    => T_LNUMBER,
                         'content' => '0',
@@ -263,9 +244,9 @@
                     ,
                 ,
             ,
-            
-                '/* testInvalid6 */',
-                
+            'invalid: binary int - underscore directly after b'                 => 
+                'testMarker'     => '/* testInvalid6 */',
+                'expectedTokens' => 
                     
                         'code'    => T_LNUMBER,
                         'content' => '0',
@@ -276,9 +257,9 @@
                     ,
                 ,
             ,
-            
-                '/* testInvalid7 */',
-                
+            'invalid: scientific float - underscore directly before e'          => 
+                'testMarker'     => '/* testInvalid7 */',
+                'expectedTokens' => 
                     
                         'code'    => T_LNUMBER,
                         'content' => '1',
@@ -289,9 +270,9 @@
                     ,
                 ,
             ,
-            
-                '/* testInvalid8 */',
-                
+            'invalid: scientific float - underscore directly after e'           => 
+                'testMarker'     => '/* testInvalid8 */',
+                'expectedTokens' => 
                     
                         'code'    => T_LNUMBER,
                         'content' => '1',
@@ -302,9 +283,9 @@
                     ,
                 ,
             ,
-            
-                '/* testInvalid9 */',
-                
+            'invalid: space between parts of the number'                        => 
+                'testMarker'     => '/* testInvalid9 */',
+                'expectedTokens' => 
                     
                         'code'    => T_LNUMBER,
                         'content' => '107_925_284',
@@ -319,9 +300,9 @@
                     ,
                 ,
             ,
-            
-                '/* testInvalid10 */',
-                
+            'invalid: comment within the number'                                => 
+                'testMarker'     => '/* testInvalid10 */',
+                'expectedTokens' => 
                     
                         'code'    => T_LNUMBER,
                         'content' => '107_925_284',
@@ -336,9 +317,9 @@
                     ,
                 ,
             ,
-            
-                '/* testInvalid11 */',
-                
+            'invalid: explicit octal int - underscore directly after o'         => 
+                'testMarker'     => '/* testInvalid11 */',
+                'expectedTokens' => 
                     
                         'code'    => T_LNUMBER,
                         'content' => '0',
@@ -349,9 +330,9 @@
                     ,
                 ,
             ,
-            
-                '/* testInvalid12 */',
-                
+            'invalid: explicit octal int - underscore directly after capital O' => 
+                'testMarker'     => '/* testInvalid12 */',
+                'expectedTokens' => 
                     
                         'code'    => T_LNUMBER,
                         'content' => '0',
@@ -362,9 +343,9 @@
                     ,
                 ,
             ,
-            
-                '/* testCalc1 */',
-                
+            'calculations should be untouched - int - int'                      => 
+                'testMarker'     => '/* testCalc1 */',
+                'expectedTokens' => 
                     
                         'code'    => T_LNUMBER,
                         'content' => '667_083',
@@ -387,9 +368,9 @@
                     ,
                 ,
             ,
-            
-                '/* test Calc2 */',
-                
+            'calculations should be untouched - scientific float + int'         => 
+                'testMarker'     => '/* test Calc2 */',
+                'expectedTokens' => 
                     
                         'code'    => T_DNUMBER,
                         'content' => '6.674_08e3',

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

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

@@ -9,9 +9,7 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
-
-class BackfillReadonlyTest extends AbstractMethodUnitTest
+final class BackfillReadonlyTest extends AbstractTokenizerTestCase
 {
 
 
@@ -19,20 +17,22 @@
      * Test that the "readonly" keyword is tokenized as such.
      *
      * @param string $testMarker  The comment which prefaces the target token in the test file.
-     * @param string $testContent The token content to look for.
+     * @param string $testContent Optional. The token content to look for.
+     *                            Defaults to lowercase "readonly".
      *
      * @dataProvider dataReadonly
      * @covers       PHP_CodeSniffer\Tokenizers\PHP::processAdditional
      *
      * @return void
      */
-    public function testReadonly($testMarker, $testContent)
+    public function testReadonly($testMarker, $testContent='readonly')
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens     = $this->phpcsFile->getTokens();
+        $target     = $this->getTargetToken($testMarker, T_READONLY, T_STRING, $testContent);
+        $tokenArray = $tokens$target;
 
-        $target = $this->getTargetToken($testMarker, T_READONLY, T_STRING, $testContent);
-        $this->assertSame(T_READONLY, $tokens$target'code');
-        $this->assertSame('T_READONLY', $tokens$target'type');
+        $this->assertSame(T_READONLY, $tokenArray'code', 'Token tokenized as '.$tokenArray'type'.', not T_READONLY (code)');
+        $this->assertSame('T_READONLY', $tokenArray'type', 'Token tokenized as '.$tokenArray'type'.', not T_READONLY (type)');
 
     }//end testReadonly()
 
@@ -42,150 +42,128 @@
      *
      * @see testReadonly()
      *
-     * @return array
+     * @return array<string, array<string, string>>
      */
-    public function dataReadonly()
+    public static function dataReadonly()
     {
         return 
-            
-                '/* testReadonlyProperty */',
-                'readonly',
+            'property declaration, no visibility'                                             => 
+                'testMarker' => '/* testReadonlyProperty */',
+            ,
+            'property declaration, var keyword before'                                        => 
+                'testMarker' => '/* testVarReadonlyProperty */',
+            ,
+            'property declaration, var keyword after'                                         => 
+                'testMarker' => '/* testReadonlyVarProperty */',
+            ,
+            'property declaration, static before'                                             => 
+                'testMarker' => '/* testStaticReadonlyProperty */',
             ,
-            
-                '/* testVarReadonlyProperty */',
-                'readonly',
+            'property declaration, static after'                                              => 
+                'testMarker' => '/* testReadonlyStaticProperty */',
             ,
-            
-                '/* testReadonlyVarProperty */',
-                'readonly',
+            'constant declaration, with visibility'                                           => 
+                'testMarker' => '/* testConstReadonlyProperty */',
             ,
-            
-                '/* testStaticReadonlyProperty */',
-                'readonly',
+            'property declaration, missing type'                                              => 
+                'testMarker' => '/* testReadonlyPropertyWithoutType */',
             ,
-            
-                '/* testReadonlyStaticProperty */',
-                'readonly',
+            'property declaration, public before'                                             => 
+                'testMarker' => '/* testPublicReadonlyProperty */',
             ,
-            
-                '/* testConstReadonlyProperty */',
-                'readonly',
+            'property declaration, protected before'                                          => 
+                'testMarker' => '/* testProtectedReadonlyProperty */',
             ,
-            
-                '/* testReadonlyPropertyWithoutType */',
-                'readonly',
+            'property declaration, private before'                                            => 
+                'testMarker' => '/* testPrivateReadonlyProperty */',
             ,
-            
-                '/* testPublicReadonlyProperty */',
-                'readonly',
+            'property declaration, public after'                                              => 
+                'testMarker' => '/* testPublicReadonlyPropertyWithReadonlyFirst */',
             ,
-            
-                '/* testProtectedReadonlyProperty */',
-                'readonly',
+            'property declaration, protected after'                                           => 
+                'testMarker' => '/* testProtectedReadonlyPropertyWithReadonlyFirst */',
             ,
-            
-                '/* testPrivateReadonlyProperty */',
-                'readonly',
+            'property declaration, private after'                                             => 
+                'testMarker' => '/* testPrivateReadonlyPropertyWithReadonlyFirst */',
             ,
-            
-                '/* testPublicReadonlyPropertyWithReadonlyFirst */',
-                'readonly',
+            'property declaration, private before, comments in declaration'                   => 
+                'testMarker' => '/* testReadonlyWithCommentsInDeclaration */',
             ,
-            
-                '/* testProtectedReadonlyPropertyWithReadonlyFirst */',
-                'readonly',
+            'property declaration, private before, nullable type'                             => 
+                'testMarker' => '/* testReadonlyWithNullableProperty */',
             ,
-            
-                '/* testPrivateReadonlyPropertyWithReadonlyFirst */',
-                'readonly',
+            'property declaration, private before, union type, null first'                    => 
+                'testMarker' => '/* testReadonlyNullablePropertyWithUnionTypeHintAndNullFirst */',
             ,
-            
-                '/* testReadonlyWithCommentsInDeclaration */',
-                'readonly',
+            'property declaration, private before, union type, null last'                     => 
+                'testMarker' => '/* testReadonlyNullablePropertyWithUnionTypeHintAndNullLast */',
             ,
-            
-                '/* testReadonlyWithNullableProperty */',
-                'readonly',
+            'property declaration, private before, array type'                                => 
+                'testMarker' => '/* testReadonlyPropertyWithArrayTypeHint */',
             ,
-            
-                '/* testReadonlyNullablePropertyWithUnionTypeHintAndNullFirst */',
-                'readonly',
+            'property declaration, private before, self type'                                 => 
+                'testMarker' => '/* testReadonlyPropertyWithSelfTypeHint */',
             ,
-            
-                '/* testReadonlyNullablePropertyWithUnionTypeHintAndNullLast */',
-                'readonly',
+            'property declaration, private before, parent type'                               => 
+                'testMarker' => '/* testReadonlyPropertyWithParentTypeHint */',
             ,
-            
-                '/* testReadonlyPropertyWithArrayTypeHint */',
-                'readonly',
+            'property declaration, private before, FQN type'                                  => 
+                'testMarker' => '/* testReadonlyPropertyWithFullyQualifiedTypeHint */',
             ,
-            
-                '/* testReadonlyPropertyWithSelfTypeHint */',
-                'readonly',
+            'property declaration, public before, mixed case'                                 => 
+                'testMarker'  => '/* testReadonlyIsCaseInsensitive */',
+                'testContent' => 'ReAdOnLy',
             ,
-            
-                '/* testReadonlyPropertyWithParentTypeHint */',
-                'readonly',
+            'property declaration, constructor property promotion'                            => 
+                'testMarker' => '/* testReadonlyConstructorPropertyPromotion */',
             ,
-            
-                '/* testReadonlyPropertyWithFullyQualifiedTypeHint */',
-                'readonly',
+            'property declaration, constructor property promotion with reference, mixed case' => 
+                'testMarker'  => '/* testReadonlyConstructorPropertyPromotionWithReference */',
+                'testContent' => 'ReadOnly',
             ,
-            
-                '/* testReadonlyIsCaseInsensitive */',
-                'ReAdOnLy',
+            'property declaration, in anonymous class'                                        => 
+                'testMarker' => '/* testReadonlyPropertyInAnonymousClass */',
             ,
-            
-                '/* testReadonlyConstructorPropertyPromotion */',
-                'readonly',
+            'property declaration, no visibility, DNF type, unqualified'                      => 
+                'testMarker' => '/* testReadonlyPropertyDNFTypeUnqualified */',
             ,
-            
-                '/* testReadonlyConstructorPropertyPromotionWithReference */',
-                'ReadOnly',
+            'property declaration, public before, DNF type, fully qualified'                  => 
+                'testMarker' => '/* testReadonlyPropertyDNFTypeFullyQualified */',
             ,
-            
-                '/* testReadonlyPropertyInAnonymousClass */',
-                'readonly',
+            'property declaration, protected before, DNF type, partially qualified'           => 
+                'testMarker' => '/* testReadonlyPropertyDNFTypePartiallyQualified */',
             ,
-            
-                '/* testReadonlyPropertyDNFTypeUnqualified */',
-                'readonly',
+            'property declaration, private before, DNF type, namespace relative name'         => 
+                'testMarker' => '/* testReadonlyPropertyDNFTypeRelativeName */',
             ,
-            
-                '/* testReadonlyPropertyDNFTypeFullyQualified */',
-                'readonly',
+            'property declaration, private before, DNF type, multiple sets'                   => 
+                'testMarker' => '/* testReadonlyPropertyDNFTypeMultipleSets */',
             ,
-            
-                '/* testReadonlyPropertyDNFTypePartiallyQualified */',
-                'readonly',
+            'property declaration, private before, DNF type, union with array'                => 
+                'testMarker' => '/* testReadonlyPropertyDNFTypeWithArray */',
             ,
-            
-                '/* testReadonlyPropertyDNFTypeRelativeName */',
-                'readonly',
+            'property declaration, private before, DNF type, with spaces and comment'         => 
+                'testMarker' => '/* testReadonlyPropertyDNFTypeWithSpacesAndComments */',
             ,
-            
-                '/* testReadonlyPropertyDNFTypeMultipleSets */',
-                'readonly',
+            'property declaration, constructor property promotion, DNF type'                  => 
+                'testMarker' => '/* testReadonlyConstructorPropertyPromotionWithDNF */',
             ,
-            
-                '/* testReadonlyPropertyDNFTypeWithArray */',
-                'readonly',
+            'property declaration, constructor property promotion, DNF type and reference'    => 
+                'testMarker' => '/* testReadonlyConstructorPropertyPromotionWithDNFAndReference */',
             ,
-            
-                '/* testReadonlyPropertyDNFTypeWithSpacesAndComments */',
-                'readonly',
+            'anon class declaration, with parentheses'                                        => 
+                'testMarker' => '/* testReadonlyAnonClassWithParens */',
             ,
-            
-                '/* testReadonlyConstructorPropertyPromotionWithDNF */',
-                'readonly',
+            'anon class declaration, without parentheses'                                     => 
+                'testMarker'  => '/* testReadonlyAnonClassWithoutParens */',
+                'testContent' => 'Readonly',
             ,
-            
-                '/* testReadonlyConstructorPropertyPromotionWithDNFAndRefence */',
-                'readonly',
+            'anon class declaration, with comments and whitespace'                            => 
+                'testMarker'  => '/* testReadonlyAnonClassWithCommentsAndWhitespace */',
+                'testContent' => 'READONLY',
             ,
-            
-                '/* testParseErrorLiveCoding */',
-                'readonly',
+            'live coding / parse error'                                                       => 
+                'testMarker' => '/* testParseErrorLiveCoding */',
             ,
         ;
 
@@ -196,20 +174,22 @@
      * Test that "readonly" when not used as the keyword is still tokenized as `T_STRING`.
      *
      * @param string $testMarker  The comment which prefaces the target token in the test file.
-     * @param string $testContent The token content to look for.
+     * @param string $testContent Optional. The token content to look for.
+     *                            Defaults to lowercase "readonly".
      *
      * @dataProvider dataNotReadonly
      * @covers       PHP_CodeSniffer\Tokenizers\PHP::processAdditional
      *
      * @return void
      */
-    public function testNotReadonly($testMarker, $testContent)
+    public function testNotReadonly($testMarker, $testContent='readonly')
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens     = $this->phpcsFile->getTokens();
+        $target     = $this->getTargetToken($testMarker, T_READONLY, T_STRING, $testContent);
+        $tokenArray = $tokens$target;
 
-        $target = $this->getTargetToken($testMarker, T_READONLY, T_STRING, $testContent);
-        $this->assertSame(T_STRING, $tokens$target'code');
-        $this->assertSame('T_STRING', $tokens$target'type');
+        $this->assertSame(T_STRING, $tokenArray'code', 'Token tokenized as '.$tokenArray'type'.', not T_STRING (code)');
+        $this->assertSame('T_STRING', $tokenArray'type', 'Token tokenized as '.$tokenArray'type'.', not T_STRING (type)');
 
     }//end testNotReadonly()
 
@@ -219,78 +199,67 @@
      *
      * @see testNotReadonly()
      *
-     * @return array
+     * @return array<string, array<string, string>>
      */
-    public function dataNotReadonly()
+    public static function dataNotReadonly()
     {
         return 
-            
-                '/* testReadonlyUsedAsClassConstantName */',
-                'READONLY',
+            'name of a constant, context: declaration using "const" keyword, uppercase'           => 
+                'testMarker'  => '/* testReadonlyUsedAsClassConstantName */',
+                'testContent' => 'READONLY',
             ,
-            
-                '/* testReadonlyUsedAsMethodName */',
-                'readonly',
+            'name of a method, context: declaration'                                              => 
+                'testMarker' => '/* testReadonlyUsedAsMethodName */',
             ,
-            
-                '/* testReadonlyUsedAsPropertyName */',
-                'readonly',
+            'name of a property, context: property access'                                        => 
+                'testMarker' => '/* testReadonlyUsedAsPropertyName */',
             ,
-            
-                '/* testReadonlyPropertyInTernaryOperator */',
-                'readonly',
+            'name of a property, context: property access in ternary'                             => 
+                'testMarker' => '/* testReadonlyPropertyInTernaryOperator */',
             ,
-            
-                '/* testReadonlyUsedAsFunctionName */',
-                'readonly',
+            'name of a function, context: declaration'                                            => 
+                'testMarker' => '/* testReadonlyUsedAsFunctionName */',
             ,
-            
-                '/* testReadonlyUsedAsFunctionNameWithReturnByRef */',
-                'readonly',
+            'name of a function, context: declaration with return by ref'                         => 
+                'testMarker' => '/* testReadonlyUsedAsFunctionNameWithReturnByRef */',
             ,
-            
-                '/* testReadonlyUsedAsNamespaceName */',
-                'Readonly',
+            'name of namespace, context: declaration, mixed case'                                 => 
+                'testMarker'  => '/* testReadonlyUsedAsNamespaceName */',
+                'testContent' => 'Readonly',
             ,
-            
-                '/* testReadonlyUsedAsPartOfNamespaceName */',
-                'Readonly',
+            'partial name of namespace, context: declaration, mixed case'                         => 
+                'testMarker'  => '/* testReadonlyUsedAsPartOfNamespaceName */',
+                'testContent' => 'Readonly',
             ,
-            
-                '/* testReadonlyAsFunctionCall */',
-                'readonly',
+            'name of a function, context: call'                                                   => 
+                'testMarker' => '/* testReadonlyAsFunctionCall */',
             ,
-            
-                '/* testReadonlyAsNamespacedFunctionCall */',
-                'readonly',
+            'name of a namespaced function, context: partially qualified call'                    => 
+                'testMarker' => '/* testReadonlyAsNamespacedFunctionCall */',
             ,
-            
-                '/* testReadonlyAsNamespaceRelativeFunctionCall */',
-                'ReadOnly',
+            'name of a function, context: namespace relative call, mixed case'                    => 
+                'testMarker'  => '/* testReadonlyAsNamespaceRelativeFunctionCall */',
+                'testContent' => 'ReadOnly',
             ,
-            
-                '/* testReadonlyAsMethodCall */',
-                'readonly',
+            'name of a method, context: method call on object'                                    => 
+                'testMarker' => '/* testReadonlyAsMethodCall */',
             ,
-            
-                '/* testReadonlyAsNullsafeMethodCall */',
-                'readOnly',
+            'name of a method, context: nullsafe method call on object'                           => 
+                'testMarker'  => '/* testReadonlyAsNullsafeMethodCall */',
+                'testContent' => 'readOnly',
             ,
-            
-                '/* testReadonlyAsStaticMethodCallWithSpace */',
-                'readonly',
+            'name of a method, context: static method call with space after'                      => 
+                'testMarker' => '/* testReadonlyAsStaticMethodCallWithSpace */',
             ,
-            
-                '/* testClassConstantFetchWithReadonlyAsConstantName */',
-                'READONLY',
+            'name of a constant, context: constant access - uppercase'                            => 
+                'testMarker'  => '/* testClassConstantFetchWithReadonlyAsConstantName */',
+                'testContent' => 'READONLY',
             ,
-            
-                '/* testReadonlyUsedAsFunctionCallWithSpaceBetweenKeywordAndParens */',
-                'readonly',
+            'name of a function, context: call with space and comment between keyword and parens' => 
+                'testMarker' => '/* testReadonlyUsedAsFunctionCallWithSpaceBetweenKeywordAndParens */',
             ,
-            
-                '/* testReadonlyUsedAsMethodNameWithDNFParam */',
-                'readonly',
+            'name of a method, context: declaration with DNF parameter'                           => 
+                'testMarker' => '/* testReadonlyUsedAsMethodNameWithDNFParam */',
             ,
         ;

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

@@ -9,6 +9,30 @@
 
 class TypeUnion
 {
+    /* testTypeUnionOOConstSimple */
+    public const Foo|Bar SIMPLE = new Foo;
+
+    /* testTypeUnionOOConstReverseModifierOrder */
+    protected final const int|float MODIFIERS_REVERSED /* testBitwiseOrOOConstDefaultValue */ = E_WARNING | E_NOTICE;
+
+    const
+        /* testTypeUnionOOConstMulti1 */
+        array |
+        /* testTypeUnionOOConstMulti2 */
+        Traversable | // phpcs:ignore Stnd.Cat.Sniff
+        false
+        /* testTypeUnionOOConstMulti3 */
+        | null MULTI_UNION = false;
+
+    /* testTypeUnionOOConstNamespaceRelative */
+    final protected const namespace\Sub\NameA|namespace\Sub\NameB NAMESPACE_RELATIVE = new namespace\Sub\NameB;
+
+    /* testTypeUnionOOConstPartiallyQualified */
+    const Partially\Qualified\NameA|Partially\Qualified\NameB PARTIALLY_QUALIFIED = new Partially\Qualified\NameA;
+
+    /* testTypeUnionOOConstFullyQualified */
+    const \Fully\Qualified\NameA|\Fully\Qualified\NameB FULLY_QUALIFIED = new \Fully\Qualified\NameB();
+
     /* testTypeUnionPropertySimple */
     public static Foo|Bar $obj;
 
@@ -71,12 +95,12 @@
         \Fully\Qualified\NameA|\Fully\Qualified\NameB $paramC,
     ) {}
 
-    /* testTypeUnionReturnType */
-    public function returnType() : int|false {}
-
     /* testTypeUnionConstructorPropertyPromotion */
     public function __construct( public bool|null $property) {}
 
+    /* testTypeUnionReturnType */
+    public function returnType() : int|false {}
+
     /* testTypeUnionAbstractMethodReturnType1 */
     abstract public function abstractMethod(): object|array /* testTypeUnionAbstractMethodReturnType2 */ |false;
 
@@ -90,9 +114,6 @@
     public function identifierNamesReturnFQ() : \Fully\Qualified\NameA|\Fully\Qualified\NameB {}
 }
 
-/* testTypeUnionClosureParamIllegalNullable */
-$closureWithParamType = function (?string|null $string) {};
-
 function globalFunctionWithSpreadAndReference(
     /* testTypeUnionWithReference */
     float|null &$paramA,
@@ -100,6 +121,9 @@
     string|int ...$paramB
 ) {}
 
+/* testTypeUnionClosureParamIllegalNullable */
+$closureWithParamType = function (?string|null $string) {};
+
 /* testBitwiseOrClosureParamDefault */
 $closureWithReturnType = function ($string = NONSENSE | FAKE)/* testTypeUnionClosureReturn */ : \Package\MyA|PackageB {};

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

@@ -9,9 +9,7 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
-
-class BitwiseOrTest extends AbstractMethodUnitTest
+final class BitwiseOrTest extends AbstractTokenizerTestCase
 {
 
 
@@ -27,11 +25,12 @@
      */
     public function testBitwiseOr($testMarker)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens     = $this->phpcsFile->getTokens();
+        $target     = $this->getTargetToken($testMarker, T_BITWISE_OR, T_TYPE_UNION);
+        $tokenArray = $tokens$target;
 
-        $opener = $this->getTargetToken($testMarker, T_BITWISE_OR, T_TYPE_UNION);
-        $this->assertSame(T_BITWISE_OR, $tokens$opener'code');
-        $this->assertSame('T_BITWISE_OR', $tokens$opener'type');
+        $this->assertSame(T_BITWISE_OR, $tokenArray'code', 'Token tokenized as '.$tokenArray'type'.', not T_BITWISE_OR (code)');
+        $this->assertSame('T_BITWISE_OR', $tokenArray'type', 'Token tokenized as '.$tokenArray'type'.', not T_BITWISE_OR (type)');
 
     }//end testBitwiseOr()
 
@@ -41,26 +40,27 @@
      *
      * @see testBitwiseOr()
      *
-     * @return array
+     * @return array<string, array<string>>
      */
-    public function dataBitwiseOr()
+    public static function dataBitwiseOr()
     {
         return 
-            '/* testBitwiseOr1 */',
-            '/* testBitwiseOr2 */',
-            '/* testBitwiseOrPropertyDefaultValue */',
-            '/* testBitwiseOrParamDefaultValue */',
-            '/* testBitwiseOr3 */',
-            '/* testBitwiseOrClosureParamDefault */',
-            '/* testBitwiseOrArrowParamDefault */',
-            '/* testBitwiseOrArrowExpression */',
-            '/* testBitwiseOrInArrayKey */',
-            '/* testBitwiseOrInArrayValue */',
-            '/* testBitwiseOrInShortArrayKey */',
-            '/* testBitwiseOrInShortArrayValue */',
-            '/* testBitwiseOrTryCatch */',
-            '/* testBitwiseOrNonArrowFnFunctionCall */',
-            '/* testLiveCoding */',
+            'in simple assignment 1'                    => '/* testBitwiseOr1 */',
+            'in simple assignment 2'                    => '/* testBitwiseOr2 */',
+            'in OO constant default value'              => '/* testBitwiseOrOOConstDefaultValue */',
+            'in property default value'                 => '/* testBitwiseOrPropertyDefaultValue */',
+            'in method parameter default value'         => '/* testBitwiseOrParamDefaultValue */',
+            'in return statement'                       => '/* testBitwiseOr3 */',
+            'in closure parameter default value'        => '/* testBitwiseOrClosureParamDefault */',
+            'in arrow function parameter default value' => '/* testBitwiseOrArrowParamDefault */',
+            'in arrow function return expression'       => '/* testBitwiseOrArrowExpression */',
+            'in long array key'                         => '/* testBitwiseOrInArrayKey */',
+            'in long array value'                       => '/* testBitwiseOrInArrayValue */',
+            'in short array key'                        => '/* testBitwiseOrInShortArrayKey */',
+            'in short array value'                      => '/* testBitwiseOrInShortArrayValue */',
+            'in catch condition'                        => '/* testBitwiseOrTryCatch */',
+            'in parameter in function call'             => '/* testBitwiseOrNonArrowFnFunctionCall */',
+            'live coding / undetermined'                => '/* testLiveCoding */',
         ;
 
     }//end dataBitwiseOr()
@@ -78,11 +78,12 @@
      */
     public function testTypeUnion($testMarker)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens     = $this->phpcsFile->getTokens();
+        $target     = $this->getTargetToken($testMarker, T_BITWISE_OR, T_TYPE_UNION);
+        $tokenArray = $tokens$target;
 
-        $opener = $this->getTargetToken($testMarker, T_BITWISE_OR, T_TYPE_UNION);
-        $this->assertSame(T_TYPE_UNION, $tokens$opener'code');
-        $this->assertSame('T_TYPE_UNION', $tokens$opener'type');
+        $this->assertSame(T_TYPE_UNION, $tokenArray'code', 'Token tokenized as '.$tokenArray'type'.', not T_TYPE_UNION (code)');
+        $this->assertSame('T_TYPE_UNION', $tokenArray'type', 'Token tokenized as '.$tokenArray'type'.', not T_TYPE_UNION (type)');
 
     }//end testTypeUnion()
 
@@ -92,48 +93,56 @@
      *
      * @see testTypeUnion()
      *
-     * @return array
+     * @return array<string, array<string>>
      */
-    public function dataTypeUnion()
+    public static function dataTypeUnion()
     {
         return 
-            '/* testTypeUnionPropertySimple */',
-            '/* testTypeUnionPropertyReverseModifierOrder */',
-            '/* testTypeUnionPropertyMulti1 */',
-            '/* testTypeUnionPropertyMulti2 */',
-            '/* testTypeUnionPropertyMulti3 */',
-            '/* testTypeUnionPropertyNamespaceRelative */',
-            '/* testTypeUnionPropertyPartiallyQualified */',
-            '/* testTypeUnionPropertyFullyQualified */',
-            '/* testTypeUnionPropertyWithReadOnlyKeyword */',
-            '/* testTypeUnionPropertyWithReadOnlyKeywordFirst */',
-            '/* testTypeUnionPropertyWithStaticAndReadOnlyKeywords */',
-            '/* testTypeUnionPropertyWithVarAndReadOnlyKeywords */',
-            '/* testTypeUnionPropertyWithOnlyReadOnlyKeyword */',
-            '/* testTypeUnionPropertyWithOnlyStaticKeyword */',
-            '/* testTypeUnionParam1 */',
-            '/* testTypeUnionParam2 */',
-            '/* testTypeUnionParam3 */',
-            '/* testTypeUnionParamNamespaceRelative */',
-            '/* testTypeUnionParamPartiallyQualified */',
-            '/* testTypeUnionParamFullyQualified */',
-            '/* testTypeUnionReturnType */',
-            '/* testTypeUnionConstructorPropertyPromotion */',
-            '/* testTypeUnionAbstractMethodReturnType1 */',
-            '/* testTypeUnionAbstractMethodReturnType2 */',
-            '/* testTypeUnionReturnTypeNamespaceRelative */',
-            '/* testTypeUnionReturnPartiallyQualified */',
-            '/* testTypeUnionReturnFullyQualified */',
-            '/* testTypeUnionClosureParamIllegalNullable */',
-            '/* testTypeUnionWithReference */',
-            '/* testTypeUnionWithSpreadOperator */',
-            '/* testTypeUnionClosureReturn */',
-            '/* testTypeUnionArrowParam */',
-            '/* testTypeUnionArrowReturnType */',
-            '/* testTypeUnionNonArrowFunctionDeclaration */',
-            '/* testTypeUnionPHP82TrueFirst */',
-            '/* testTypeUnionPHP82TrueMiddle */',
-            '/* testTypeUnionPHP82TrueLast */',
+            'type for OO constant'                                     => '/* testTypeUnionOOConstSimple */',
+            'type for OO constant, reversed modifier order'            => '/* testTypeUnionOOConstReverseModifierOrder */',
+            'type for OO constant, first of multi-union'               => '/* testTypeUnionOOConstMulti1 */',
+            'type for OO constant, middle of multi-union + comments'   => '/* testTypeUnionOOConstMulti2 */',
+            'type for OO constant, last of multi-union'                => '/* testTypeUnionOOConstMulti3 */',
+            'type for OO constant, using namespace relative names'     => '/* testTypeUnionOOConstNamespaceRelative */',
+            'type for OO constant, using partially qualified names'    => '/* testTypeUnionOOConstPartiallyQualified */',
+            'type for OO constant, using fully qualified names'        => '/* testTypeUnionOOConstFullyQualified */',
+            'type for static property'                                 => '/* testTypeUnionPropertySimple */',
+            'type for static property, reversed modifier order'        => '/* testTypeUnionPropertyReverseModifierOrder */',
+            'type for property, first of multi-union'                  => '/* testTypeUnionPropertyMulti1 */',
+            'type for property, middle of multi-union, also comments'  => '/* testTypeUnionPropertyMulti2 */',
+            'type for property, last of multi-union'                   => '/* testTypeUnionPropertyMulti3 */',
+            'type for property using namespace relative names'         => '/* testTypeUnionPropertyNamespaceRelative */',
+            'type for property using partially qualified names'        => '/* testTypeUnionPropertyPartiallyQualified */',
+            'type for property using fully qualified names'            => '/* testTypeUnionPropertyFullyQualified */',
+            'type for readonly property'                               => '/* testTypeUnionPropertyWithReadOnlyKeyword */',
+            'type for static readonly property'                        => '/* testTypeUnionPropertyWithStaticAndReadOnlyKeywords */',
+            'type for readonly property using var keyword'             => '/* testTypeUnionPropertyWithVarAndReadOnlyKeywords */',
+            'type for readonly property, reversed modifier order'      => '/* testTypeUnionPropertyWithReadOnlyKeywordFirst */',
+            'type for readonly property, no visibility'                => '/* testTypeUnionPropertyWithOnlyReadOnlyKeyword */',
+            'type for static property, no visibility'                  => '/* testTypeUnionPropertyWithOnlyStaticKeyword */',
+            'type for method parameter'                                => '/* testTypeUnionParam1 */',
+            'type for method parameter, first in multi-union'          => '/* testTypeUnionParam2 */',
+            'type for method parameter, last in multi-union'           => '/* testTypeUnionParam3 */',
+            'type for method parameter with namespace relative names'  => '/* testTypeUnionParamNamespaceRelative */',
+            'type for method parameter with partially qualified names' => '/* testTypeUnionParamPartiallyQualified */',
+            'type for method parameter with fully qualified names'     => '/* testTypeUnionParamFullyQualified */',
+            'type for property in constructor property promotion'      => '/* testTypeUnionConstructorPropertyPromotion */',
+            'return type for method'                                   => '/* testTypeUnionReturnType */',
+            'return type for method, first of multi-union'             => '/* testTypeUnionAbstractMethodReturnType1 */',
+            'return type for method, last of multi-union'              => '/* testTypeUnionAbstractMethodReturnType2 */',
+            'return type for method with namespace relative names'     => '/* testTypeUnionReturnTypeNamespaceRelative */',
+            'return type for method with partially qualified names'    => '/* testTypeUnionReturnPartiallyQualified */',
+            'return type for method with fully qualified names'        => '/* testTypeUnionReturnFullyQualified */',
+            'type for function parameter with reference'               => '/* testTypeUnionWithReference */',
+            'type for function parameter with spread operator'         => '/* testTypeUnionWithSpreadOperator */',
+            'type for closure parameter with illegal nullable'         => '/* testTypeUnionClosureParamIllegalNullable */',
+            'return type for closure'                                  => '/* testTypeUnionClosureReturn */',
+            'type for arrow function parameter'                        => '/* testTypeUnionArrowParam */',
+            'return type for arrow function'                           => '/* testTypeUnionArrowReturnType */',
+            'type for function parameter, return by ref'               => '/* testTypeUnionNonArrowFunctionDeclaration */',
+            'type for function param with true type first'             => '/* testTypeUnionPHP82TrueFirst */',
+            'type for function param with true type middle'            => '/* testTypeUnionPHP82TrueMiddle */',
+            'type for function param with true type last'              => '/* testTypeUnionPHP82TrueLast */',
         ;
 
     }//end dataTypeUnion()

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

@@ -53,7 +53,6 @@
     const /* testMatch */ MATCH = 'MATCH';
     const /* testNamespace */ NAMESPACE = 'NAMESPACE';
     const /* testNew */ NEW = 'NEW';
-    const /* testParent */ PARENT = 'PARENT';
     const /* testPrint */ PRINT = 'PRINT';
     const /* testPrivate */ PRIVATE = 'PRIVATE';
     const /* testProtected */ PROTECTED = 'PROTECTED';
@@ -62,7 +61,6 @@
     const /* testRequire */ REQUIRE = 'REQUIRE';
     const /* testRequireOnce */ REQUIRE_ONCE = 'REQUIRE_ONCE';
     const /* testReturn */ RETURN = 'RETURN';
-    const /* testSelf */ SELF = 'SELF';
     const /* testStatic */ STATIC = 'STATIC';
     const /* testSwitch */ SWITCH = 'SWITCH';
     const /* testThrows */ THROW = 'THROW';
@@ -79,9 +77,11 @@
     const /* testOr */ OR = 'LOGICAL_OR';
     const /* testXor */ XOR = 'LOGICAL_XOR';
 
-    const /* testFalse */ FALSE = 'FALSE',
-    const /* testTrue */ TRUE = 'TRUE',
-    const /* testNull */ NULL = 'NULL',
+    const /* testArrayIsTstringInConstType */ array /* testArrayNameForTypedConstant */ ARRAY = /* testArrayIsKeywordInConstDefault */ array();
+    const /* testStaticIsKeywordAsConstType */ static /* testStaticIsNameForTypedConstant */ STATIC = new /* testStaticIsKeywordAsConstDefault */ static;
+
+    const int|bool /* testPrivateNameForUnionTypedConstant */ PRIVATE = 'PRIVATE';
+    const Foo&Bar /* testFinalNameForIntersectionTypedConstant */ FINAL = 'FINAL';
 }
 
 namespace /* testKeywordAfterNamespaceShouldBeString */ class;
@@ -105,16 +105,16 @@
     /* testVarIsKeyword */ var $var;
     /* testStaticIsKeyword */ static $static;
 
-    /* testReadonlyIsKeyword */ readonly $readonly;
+    /* testReadonlyIsKeywordForProperty */ readonly $readonly;
 
     /* testFinalIsKeyword */ final /* testFunctionIsKeyword */ function someFunction(
         /* testCallableIsKeyword */
         callable $callable,
-        /* testSelfIsKeyword */
-        self $self,
-        /* testParentIsKeyword */
-        parent $parent
     ) {
+        $anon = new /* testReadonlyIsKeywordForAnonClass */ readonly class() {
+            public function foo() {}
+        };
+
         /* testReturnIsKeyword */
         return $this;
     }
@@ -220,9 +220,7 @@
 $anonymousClass2 = new class /* testExtendsInAnonymousClassIsKeyword */ extends SomeParent {};
 $anonymousClass3 = new class /* testImplementsInAnonymousClassIsKeyword */ implements SomeInterface {};
 
-$instantiated1 = new /* testClassInstantiationParentIsKeyword */ parent();
-$instantiated2 = new /* testClassInstantiationSelfIsKeyword */ SELF;
-$instantiated3 = new /* testClassInstantiationStaticIsKeyword */ static($param);
+$instantiated = new /* testClassInstantiationStaticIsKeyword */ static($param);
 
 class Foo extends /* testNamespaceInNameIsKeyword */ namespace\Exception
 {}
@@ -230,35 +228,10 @@
 function /* testKeywordAfterFunctionShouldBeString */ eval() {}
 function /* testKeywordAfterFunctionByRefShouldBeString */ &switch() {}
 
-function /* testKeywordSelfAfterFunctionByRefShouldBeString */ &self() {}
 function /* testKeywordStaticAfterFunctionByRefShouldBeString */ &static() {}
-function /* testKeywordParentAfterFunctionByRefShouldBeString */ &parent() {}
-function /* testKeywordFalseAfterFunctionByRefShouldBeString */ &false() {}
-function /* testKeywordTrueAfterFunctionByRefShouldBeString */ & true () {}
-function /* testKeywordNullAfterFunctionByRefShouldBeString */ &NULL() {}
 
-/* testKeywordAsFunctionCallNameShouldBeStringSelf */ self();
 /* testKeywordAsFunctionCallNameShouldBeStringStatic */ static();
 $obj-> /* testKeywordAsMethodCallNameShouldBeStringStatic */ static();
-/* testKeywordAsFunctionCallNameShouldBeStringParent */ parent();
-/* testKeywordAsFunctionCallNameShouldBeStringFalse */ false();
-/* testKeywordAsFunctionCallNameShouldBeStringTrue */ True ();
-/* testKeywordAsFunctionCallNameShouldBeStringNull */ null /*comment*/ ();
-
-$instantiated4 = new /* testClassInstantiationFalseIsString */ False();
-$instantiated5 = new /* testClassInstantiationTrueIsString */ true ();
-$instantiated6 = new /* testClassInstantiationNullIsString */ null();
 
 $function = /* testStaticIsKeywordBeforeClosure */ static function(/* testStaticIsKeywordWhenParamType */ static $param) {};
 $arrow = /* testStaticIsKeywordBeforeArrow */ static fn(): /* testStaticIsKeywordWhenReturnType */ static => 10;
-
-function standAloneFalseTrueNullTypesAndMore(
-    /* testFalseIsKeywordAsParamType */ false $paramA,
-    /* testTrueIsKeywordAsParamType */ true $paramB,
-    /* testNullIsKeywordAsParamType */ null $paramC,
-) /* testFalseIsKeywordAsReturnType */ false | /* testTrueIsKeywordAsReturnType */ true | /* testNullIsKeywordAsReturnType */ null {
-    if ($a === /* testFalseIsKeywordInComparison */ false
-    || $a === /* testTrueIsKeywordInComparison */ true
-    || $a === /* testNullIsKeywordInComparison */ null
-    ) {}
-}

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

@@ -1,6 +1,6 @@
 <?php
 /**
- * Tests the conversion of context sensitive keywords to T_STRING.
+ * Tests the conversion of PHP native context sensitive keywords to T_STRING.
  *
  * @author    Jaroslav Hanslík <kukulich@kukulich.cz>
  * @copyright 2020 Squiz Pty Ltd (ABN 77 084 670 600)
@@ -9,10 +9,9 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
 use PHP_CodeSniffer\Util\Tokens;
 
-class ContextSensitiveKeywordsTest extends AbstractMethodUnitTest
+final class ContextSensitiveKeywordsTest extends AbstractTokenizerTestCase
 {
 
 
@@ -28,12 +27,12 @@
      */
     public function testStrings($testMarker)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens     = $this->phpcsFile->getTokens();
+        $target     = $this->getTargetToken($testMarker, (Tokens::$contextSensitiveKeywords + T_STRING));
+        $tokenArray = $tokens$target;
 
-        $token = $this->getTargetToken($testMarker, (Tokens::$contextSensitiveKeywords + T_STRING, T_NULL, T_FALSE, T_TRUE, T_PARENT, T_SELF));
-
-        $this->assertSame(T_STRING, $tokens$token'code');
-        $this->assertSame('T_STRING', $tokens$token'type');
+        $this->assertSame(T_STRING, $tokenArray'code', 'Token tokenized as '.$tokenArray'type'.', not T_STRING (code)');
+        $this->assertSame('T_STRING', $tokenArray'type', 'Token tokenized as '.$tokenArray'type'.', not T_STRING (type)');
 
     }//end testStrings()
 
@@ -43,112 +42,99 @@
      *
      * @see testStrings()
      *
-     * @return array
+     * @return array<string, array<string>>
      */
-    public function dataStrings()
+    public static function dataStrings()
     {
         return 
-            '/* testAbstract */',
-            '/* testArray */',
-            '/* testAs */',
-            '/* testBreak */',
-            '/* testCallable */',
-            '/* testCase */',
-            '/* testCatch */',
-            '/* testClass */',
-            '/* testClone */',
-            '/* testConst */',
-            '/* testContinue */',
-            '/* testDeclare */',
-            '/* testDefault */',
-            '/* testDo */',
-            '/* testEcho */',
-            '/* testElse */',
-            '/* testElseIf */',
-            '/* testEmpty */',
-            '/* testEndDeclare */',
-            '/* testEndFor */',
-            '/* testEndForeach */',
-            '/* testEndIf */',
-            '/* testEndSwitch */',
-            '/* testEndWhile */',
-            '/* testEnum */',
-            '/* testEval */',
-            '/* testExit */',
-            '/* testExtends */',
-            '/* testFinal */',
-            '/* testFinally */',
-            '/* testFn */',
-            '/* testFor */',
-            '/* testForeach */',
-            '/* testFunction */',
-            '/* testGlobal */',
-            '/* testGoto */',
-            '/* testIf */',
-            '/* testImplements */',
-            '/* testInclude */',
-            '/* testIncludeOnce */',
-            '/* testInstanceOf */',
-            '/* testInsteadOf */',
-            '/* testInterface */',
-            '/* testIsset */',
-            '/* testList */',
-            '/* testMatch */',
-            '/* testNamespace */',
-            '/* testNew */',
-            '/* testParent */',
-            '/* testPrint */',
-            '/* testPrivate */',
-            '/* testProtected */',
-            '/* testPublic */',
-            '/* testReadonly */',
-            '/* testRequire */',
-            '/* testRequireOnce */',
-            '/* testReturn */',
-            '/* testSelf */',
-            '/* testStatic */',
-            '/* testSwitch */',
-            '/* testThrows */',
-            '/* testTrait */',
-            '/* testTry */',
-            '/* testUnset */',
-            '/* testUse */',
-            '/* testVar */',
-            '/* testWhile */',
-            '/* testYield */',
-            '/* testYieldFrom */',
-            '/* testAnd */',
-            '/* testOr */',
-            '/* testXor */',
-            '/* testFalse */',
-            '/* testTrue */',
-            '/* testNull */',
-
-            '/* testKeywordAfterNamespaceShouldBeString */',
-            '/* testNamespaceNameIsString1 */',
-            '/* testNamespaceNameIsString2 */',
-            '/* testNamespaceNameIsString3 */',
-
-            '/* testKeywordAfterFunctionShouldBeString */',
-            '/* testKeywordAfterFunctionByRefShouldBeString */',
-            '/* testKeywordSelfAfterFunctionByRefShouldBeString */',
-            '/* testKeywordStaticAfterFunctionByRefShouldBeString */',
-            '/* testKeywordParentAfterFunctionByRefShouldBeString */',
-            '/* testKeywordFalseAfterFunctionByRefShouldBeString */',
-            '/* testKeywordTrueAfterFunctionByRefShouldBeString */',
-            '/* testKeywordNullAfterFunctionByRefShouldBeString */',
-
-            '/* testKeywordAsFunctionCallNameShouldBeStringSelf */',
-            '/* testKeywordAsFunctionCallNameShouldBeStringStatic */',
-            '/* testKeywordAsMethodCallNameShouldBeStringStatic */',
-            '/* testKeywordAsFunctionCallNameShouldBeStringParent */',
-            '/* testKeywordAsFunctionCallNameShouldBeStringFalse */',
-            '/* testKeywordAsFunctionCallNameShouldBeStringTrue */',
-            '/* testKeywordAsFunctionCallNameShouldBeStringNull */',
-
-            '/* testClassInstantiationFalseIsString */',
-            '/* testClassInstantiationTrueIsString */',
-            '/* testClassInstantiationNullIsString */',
+            'constant declaration: abstract'                  => '/* testAbstract */',
+            'constant declaration: array'                     => '/* testArray */',
+            'constant declaration: as'                        => '/* testAs */',
+            'constant declaration: break'                     => '/* testBreak */',
+            'constant declaration: callable'                  => '/* testCallable */',
+            'constant declaration: case'                      => '/* testCase */',
+            'constant declaration: catch'                     => '/* testCatch */',
+            'constant declaration: class'                     => '/* testClass */',
+            'constant declaration: clone'                     => '/* testClone */',
+            'constant declaration: const'                     => '/* testConst */',
+            'constant declaration: continue'                  => '/* testContinue */',
+            'constant declaration: declare'                   => '/* testDeclare */',
+            'constant declaration: default'                   => '/* testDefault */',
+            'constant declaration: do'                        => '/* testDo */',
+            'constant declaration: echo'                      => '/* testEcho */',
+            'constant declaration: else'                      => '/* testElse */',
+            'constant declaration: elseif'                    => '/* testElseIf */',
+            'constant declaration: empty'                     => '/* testEmpty */',
+            'constant declaration: enddeclare'                => '/* testEndDeclare */',
+            'constant declaration: endfor'                    => '/* testEndFor */',
+            'constant declaration: endforeach'                => '/* testEndForeach */',
+            'constant declaration: endif'                     => '/* testEndIf */',
+            'constant declaration: endswitch'                 => '/* testEndSwitch */',
+            'constant declaration: endwhile'                  => '/* testEndWhile */',
+            'constant declaration: enum'                      => '/* testEnum */',
+            'constant declaration: eval'                      => '/* testEval */',
+            'constant declaration: exit'                      => '/* testExit */',
+            'constant declaration: extends'                   => '/* testExtends */',
+            'constant declaration: final'                     => '/* testFinal */',
+            'constant declaration: finally'                   => '/* testFinally */',
+            'constant declaration: fn'                        => '/* testFn */',
+            'constant declaration: for'                       => '/* testFor */',
+            'constant declaration: foreach'                   => '/* testForeach */',
+            'constant declaration: function'                  => '/* testFunction */',
+            'constant declaration: global'                    => '/* testGlobal */',
+            'constant declaration: goto'                      => '/* testGoto */',
+            'constant declaration: if'                        => '/* testIf */',
+            'constant declaration: implements'                => '/* testImplements */',
+            'constant declaration: include'                   => '/* testInclude */',
+            'constant declaration: include_once'              => '/* testIncludeOnce */',
+            'constant declaration: instanceof'                => '/* testInstanceOf */',
+            'constant declaration: insteadof'                 => '/* testInsteadOf */',
+            'constant declaration: interface'                 => '/* testInterface */',
+            'constant declaration: isset'                     => '/* testIsset */',
+            'constant declaration: list'                      => '/* testList */',
+            'constant declaration: match'                     => '/* testMatch */',
+            'constant declaration: namespace'                 => '/* testNamespace */',
+            'constant declaration: new'                       => '/* testNew */',
+            'constant declaration: print'                     => '/* testPrint */',
+            'constant declaration: private'                   => '/* testPrivate */',
+            'constant declaration: protected'                 => '/* testProtected */',
+            'constant declaration: public'                    => '/* testPublic */',
+            'constant declaration: readonly'                  => '/* testReadonly */',
+            'constant declaration: require'                   => '/* testRequire */',
+            'constant declaration: require_once'              => '/* testRequireOnce */',
+            'constant declaration: return'                    => '/* testReturn */',
+            'constant declaration: static'                    => '/* testStatic */',
+            'constant declaration: switch'                    => '/* testSwitch */',
+            'constant declaration: throws'                    => '/* testThrows */',
+            'constant declaration: trait'                     => '/* testTrait */',
+            'constant declaration: try'                       => '/* testTry */',
+            'constant declaration: unset'                     => '/* testUnset */',
+            'constant declaration: use'                       => '/* testUse */',
+            'constant declaration: var'                       => '/* testVar */',
+            'constant declaration: while'                     => '/* testWhile */',
+            'constant declaration: yield'                     => '/* testYield */',
+            'constant declaration: yield_from'                => '/* testYieldFrom */',
+            'constant declaration: and'                       => '/* testAnd */',
+            'constant declaration: or'                        => '/* testOr */',
+            'constant declaration: xor'                       => '/* testXor */',
+
+            'constant declaration: array in type'             => '/* testArrayIsTstringInConstType */',
+            'constant declaration: array, name after type'    => '/* testArrayNameForTypedConstant */',
+            'constant declaration: static, name after type'   => '/* testStaticIsNameForTypedConstant */',
+            'constant declaration: private, name after type'  => '/* testPrivateNameForUnionTypedConstant */',
+            'constant declaration: final, name after type'    => '/* testFinalNameForIntersectionTypedConstant */',
+
+            'namespace declaration: class'                    => '/* testKeywordAfterNamespaceShouldBeString */',
+            'namespace declaration (partial): my'             => '/* testNamespaceNameIsString1 */',
+            'namespace declaration (partial): class'          => '/* testNamespaceNameIsString2 */',
+            'namespace declaration (partial): foreach'        => '/* testNamespaceNameIsString3 */',
+
+            'function declaration: eval'                      => '/* testKeywordAfterFunctionShouldBeString */',
+            'function declaration with return by ref: switch' => '/* testKeywordAfterFunctionByRefShouldBeString */',
+            'function declaration with return by ref: static' => '/* testKeywordStaticAfterFunctionByRefShouldBeString */',
+
+            'function call: static'                           => '/* testKeywordAsFunctionCallNameShouldBeStringStatic */',
+            'method call: static'                             => '/* testKeywordAsMethodCallNameShouldBeStringStatic */',
         ;
 
     }//end dataStrings()
@@ -167,15 +153,20 @@
      */
     public function testKeywords($testMarker, $expectedTokenType)
     {
-        $tokens = self::$phpcsFile->getTokens();
-
-        $token = $this->getTargetToken(
-            $testMarker,
-            (Tokens::$contextSensitiveKeywords + T_ANON_CLASS, T_MATCH_DEFAULT, T_PARENT, T_SELF, T_STRING, T_NULL, T_FALSE, T_TRUE)
+        $tokens     = $this->phpcsFile->getTokens();
+        $target     = $this->getTargetToken($testMarker, (Tokens::$contextSensitiveKeywords + T_ANON_CLASS, T_MATCH_DEFAULT, T_STRING));
+        $tokenArray = $tokens$target;
+
+        $this->assertSame(
+            constant($expectedTokenType),
+            $tokenArray'code',
+            'Token tokenized as '.$tokenArray'type'.', not '.$expectedTokenType.' (code)'
+        );
+        $this->assertSame(
+            $expectedTokenType,
+            $tokenArray'type',
+            'Token tokenized as '.$tokenArray'type'.', not '.$expectedTokenType.' (type)'
         );
-
-        $this->assertSame(constant($expectedTokenType), $tokens$token'code');
-        $this->assertSame($expectedTokenType, $tokens$token'type');
 
     }//end testKeywords()
 
@@ -187,397 +178,361 @@
      *
      * @return array
      */
-    public function dataKeywords()
+    public static function dataKeywords()
     {
         return 
-            
-                '/* testNamespaceIsKeyword */',
-                'T_NAMESPACE',
+            'namespace: declaration'                 => 
+                'testMarker'        => '/* testNamespaceIsKeyword */',
+                'expectedTokenType' => 'T_NAMESPACE',
             ,
-            
-                '/* testAbstractIsKeyword */',
-                'T_ABSTRACT',
+            'array: default value in const decl'     => 
+                'testMarker'        => '/* testArrayIsKeywordInConstDefault */',
+                'expectedTokenType' => 'T_ARRAY',
             ,
-            
-                '/* testClassIsKeyword */',
-                'T_CLASS',
+            'static: type in constant declaration'   => 
+                'testMarker'        => '/* testStaticIsKeywordAsConstType */',
+                'expectedTokenType' => 'T_STATIC',
             ,
-            
-                '/* testExtendsIsKeyword */',
-                'T_EXTENDS',
+            'static: value in constant declaration'  => 
+                'testMarker'        => '/* testStaticIsKeywordAsConstDefault */',
+                'expectedTokenType' => 'T_STATIC',
             ,
-            
-                '/* testImplementsIsKeyword */',
-                'T_IMPLEMENTS',
+
+            'abstract: class declaration'            => 
+                'testMarker'        => '/* testAbstractIsKeyword */',
+                'expectedTokenType' => 'T_ABSTRACT',
+            ,
+            'class: declaration'                     => 
+                'testMarker'        => '/* testClassIsKeyword */',
+                'expectedTokenType' => 'T_CLASS',
+            ,
+            'extends: in class declaration'          => 
+                'testMarker'        => '/* testExtendsIsKeyword */',
+                'expectedTokenType' => 'T_EXTENDS',
             ,
-            
-                '/* testUseIsKeyword */',
-                'T_USE',
+            'implements: in class declaration'       => 
+                'testMarker'        => '/* testImplementsIsKeyword */',
+                'expectedTokenType' => 'T_IMPLEMENTS',
             ,
-            
-                '/* testInsteadOfIsKeyword */',
-                'T_INSTEADOF',
+            'use: in trait import'                   => 
+                'testMarker'        => '/* testUseIsKeyword */',
+                'expectedTokenType' => 'T_USE',
             ,
-            
-                '/* testAsIsKeyword */',
-                'T_AS',
+            'insteadof: in trait import'             => 
+                'testMarker'        => '/* testInsteadOfIsKeyword */',
+                'expectedTokenType' => 'T_INSTEADOF',
             ,
-            
-                '/* testConstIsKeyword */',
-                'T_CONST',
+            'as: in trait import'                    => 
+                'testMarker'        => '/* testAsIsKeyword */',
+                'expectedTokenType' => 'T_AS',
             ,
-            
-                '/* testPrivateIsKeyword */',
-                'T_PRIVATE',
+            'const: declaration'                     => 
+                'testMarker'        => '/* testConstIsKeyword */',
+                'expectedTokenType' => 'T_CONST',
             ,
-            
-                '/* testProtectedIsKeyword */',
-                'T_PROTECTED',
+            'private: property declaration'          => 
+                'testMarker'        => '/* testPrivateIsKeyword */',
+                'expectedTokenType' => 'T_PRIVATE',
             ,
-            
-                '/* testPublicIsKeyword */',
-                'T_PUBLIC',
+            'protected: property declaration'        => 
+                'testMarker'        => '/* testProtectedIsKeyword */',
+                'expectedTokenType' => 'T_PROTECTED',
             ,
-            
-                '/* testVarIsKeyword */',
-                'T_VAR',
+            'public: property declaration'           => 
+                'testMarker'        => '/* testPublicIsKeyword */',
+                'expectedTokenType' => 'T_PUBLIC',
             ,
-            
-                '/* testStaticIsKeyword */',
-                'T_STATIC',
+            'var: property declaration'              => 
+                'testMarker'        => '/* testVarIsKeyword */',
+                'expectedTokenType' => 'T_VAR',
             ,
-            
-                '/* testReadonlyIsKeyword */',
-                'T_READONLY',
+            'static: property declaration'           => 
+                'testMarker'        => '/* testStaticIsKeyword */',
+                'expectedTokenType' => 'T_STATIC',
             ,
-            
-                '/* testFinalIsKeyword */',
-                'T_FINAL',
+            'readonly: property declaration'         => 
+                'testMarker'        => '/* testReadonlyIsKeywordForProperty */',
+                'expectedTokenType' => 'T_READONLY',
             ,
-            
-                '/* testFunctionIsKeyword */',
-                'T_FUNCTION',
+            'final: function declaration'            => 
+                'testMarker'        => '/* testFinalIsKeyword */',
+                'expectedTokenType' => 'T_FINAL',
             ,
-            
-                '/* testCallableIsKeyword */',
-                'T_CALLABLE',
+            'function: declaration'                  => 
+                'testMarker'        => '/* testFunctionIsKeyword */',
+                'expectedTokenType' => 'T_FUNCTION',
             ,
-            
-                '/* testSelfIsKeyword */',
-                'T_SELF',
+            'callable: param type declaration'       => 
+                'testMarker'        => '/* testCallableIsKeyword */',
+                'expectedTokenType' => 'T_CALLABLE',
             ,
-            
-                '/* testParentIsKeyword */',
-                'T_PARENT',
+            'readonly: anon class declaration'       => 
+                'testMarker'        => '/* testReadonlyIsKeywordForAnonClass */',
+                'expectedTokenType' => 'T_READONLY',
             ,
-            
-                '/* testReturnIsKeyword */',
-                'T_RETURN',
+            'return: statement'                      => 
+                'testMarker'        => '/* testReturnIsKeyword */',
+                'expectedTokenType' => 'T_RETURN',
             ,
 
-            
-                '/* testInterfaceIsKeyword */',
-                'T_INTERFACE',
+            'interface: declaration'                 => 
+                'testMarker'        => '/* testInterfaceIsKeyword */',
+                'expectedTokenType' => 'T_INTERFACE',
             ,
-            
-                '/* testTraitIsKeyword */',
-                'T_TRAIT',
+            'trait: declaration'                     => 
+                'testMarker'        => '/* testTraitIsKeyword */',
+                'expectedTokenType' => 'T_TRAIT',
             ,
-            
-                '/* testEnumIsKeyword */',
-                'T_ENUM',
+            'enum: declaration'                      => 
+                'testMarker'        => '/* testEnumIsKeyword */',
+                'expectedTokenType' => 'T_ENUM',
             ,
 
-            
-                '/* testNewIsKeyword */',
-                'T_NEW',
+            'new: named instantiation'               => 
+                'testMarker'        => '/* testNewIsKeyword */',
+                'expectedTokenType' => 'T_NEW',
             ,
-            
-                '/* testInstanceOfIsKeyword */',
-                'T_INSTANCEOF',
+            'instanceof: comparison'                 => 
+                'testMarker'        => '/* testInstanceOfIsKeyword */',
+                'expectedTokenType' => 'T_INSTANCEOF',
             ,
-            
-                '/* testCloneIsKeyword */',
-                'T_CLONE',
+            'clone'                                  => 
+                'testMarker'        => '/* testCloneIsKeyword */',
+                'expectedTokenType' => 'T_CLONE',
             ,
 
-            
-                '/* testIfIsKeyword */',
-                'T_IF',
+            'if'                                     => 
+                'testMarker'        => '/* testIfIsKeyword */',
+                'expectedTokenType' => 'T_IF',
             ,
-            
-                '/* testEmptyIsKeyword */',
-                'T_EMPTY',
+            'empty'                                  => 
+                'testMarker'        => '/* testEmptyIsKeyword */',
+                'expectedTokenType' => 'T_EMPTY',
             ,
-            
-                '/* testElseIfIsKeyword */',
-                'T_ELSEIF',
+            'elseif'                                 => 
+                'testMarker'        => '/* testElseIfIsKeyword */',
+                'expectedTokenType' => 'T_ELSEIF',
             ,
-            
-                '/* testElseIsKeyword */',
-                'T_ELSE',
+            'else'                                   => 
+                'testMarker'        => '/* testElseIsKeyword */',
+                'expectedTokenType' => 'T_ELSE',
             ,
-            
-                '/* testEndIfIsKeyword */',
-                'T_ENDIF',
+            'endif'                                  => 
+                'testMarker'        => '/* testEndIfIsKeyword */',
+                'expectedTokenType' => 'T_ENDIF',
             ,
 
-            
-                '/* testForIsKeyword */',
-                'T_FOR',
+            'for'                                    => 
+                'testMarker'        => '/* testForIsKeyword */',
+                'expectedTokenType' => 'T_FOR',
             ,
-            
-                '/* testEndForIsKeyword */',
-                'T_ENDFOR',
+            'endfor'                                 => 
+                'testMarker'        => '/* testEndForIsKeyword */',
+                'expectedTokenType' => 'T_ENDFOR',
             ,
 
-            
-                '/* testForeachIsKeyword */',
-                'T_FOREACH',
+            'foreach'                                => 
+                'testMarker'        => '/* testForeachIsKeyword */',
+                'expectedTokenType' => 'T_FOREACH',
             ,
-            
-                '/* testEndForeachIsKeyword */',
-                'T_ENDFOREACH',
+            'endforeach'                             => 
+                'testMarker'        => '/* testEndForeachIsKeyword */',
+                'expectedTokenType' => 'T_ENDFOREACH',
             ,
 
-            
-                '/* testSwitchIsKeyword */',
-                'T_SWITCH',
+            'switch'                                 => 
+                'testMarker'        => '/* testSwitchIsKeyword */',
+                'expectedTokenType' => 'T_SWITCH',
             ,
-            
-                '/* testCaseIsKeyword */',
-                'T_CASE',
+            'case: in switch'                        => 
+                'testMarker'        => '/* testCaseIsKeyword */',
+                'expectedTokenType' => 'T_CASE',
             ,
-            
-                '/* testDefaultIsKeyword */',
-                'T_DEFAULT',
+            'default: in switch'                     => 
+                'testMarker'        => '/* testDefaultIsKeyword */',
+                'expectedTokenType' => 'T_DEFAULT',
             ,
-            
-                '/* testEndSwitchIsKeyword */',
-                'T_ENDSWITCH',
+            'endswitch'                              => 
+                'testMarker'        => '/* testEndSwitchIsKeyword */',
+                'expectedTokenType' => 'T_ENDSWITCH',
             ,
-            
-                '/* testBreakIsKeyword */',
-                'T_BREAK',
+            'break: in switch'                       => 
+                'testMarker'        => '/* testBreakIsKeyword */',
+                'expectedTokenType' => 'T_BREAK',
             ,
-            
-                '/* testContinueIsKeyword */',
-                'T_CONTINUE',
+            'continue: in switch'                    => 
+                'testMarker'        => '/* testContinueIsKeyword */',
+                'expectedTokenType' => 'T_CONTINUE',
             ,
 
-            
-                '/* testDoIsKeyword */',
-                'T_DO',
+            'do'                                     => 
+                'testMarker'        => '/* testDoIsKeyword */',
+                'expectedTokenType' => 'T_DO',
             ,
-            
-                '/* testWhileIsKeyword */',
-                'T_WHILE',
+            'while'                                  => 
+                'testMarker'        => '/* testWhileIsKeyword */',
+                'expectedTokenType' => 'T_WHILE',
             ,
-            
-                '/* testEndWhileIsKeyword */',
-                'T_ENDWHILE',
+            'endwhile'                               => 
+                'testMarker'        => '/* testEndWhileIsKeyword */',
+                'expectedTokenType' => 'T_ENDWHILE',
             ,
 
-            
-                '/* testTryIsKeyword */',
-                'T_TRY',
+            'try'                                    => 
+                'testMarker'        => '/* testTryIsKeyword */',
+                'expectedTokenType' => 'T_TRY',
             ,
-            
-                '/* testThrowIsKeyword */',
-                'T_THROW',
+            'throw: statement'                       => 
+                'testMarker'        => '/* testThrowIsKeyword */',
+                'expectedTokenType' => 'T_THROW',
             ,
-            
-                '/* testCatchIsKeyword */',
-                'T_CATCH',
+            'catch'                                  => 
+                'testMarker'        => '/* testCatchIsKeyword */',
+                'expectedTokenType' => 'T_CATCH',
             ,
-            
-                '/* testFinallyIsKeyword */',
-                'T_FINALLY',
+            'finally'                                => 
+                'testMarker'        => '/* testFinallyIsKeyword */',
+                'expectedTokenType' => 'T_FINALLY',
             ,
 
-            
-                '/* testGlobalIsKeyword */',
-                'T_GLOBAL',
+            'global'                                 => 
+                'testMarker'        => '/* testGlobalIsKeyword */',
+                'expectedTokenType' => 'T_GLOBAL',
             ,
-            
-                '/* testEchoIsKeyword */',
-                'T_ECHO',
+            'echo'                                   => 
+                'testMarker'        => '/* testEchoIsKeyword */',
+                'expectedTokenType' => 'T_ECHO',
             ,
-            
-                '/* testPrintIsKeyword */',
-                'T_PRINT',
+            'print: statement'                       => 
+                'testMarker'        => '/* testPrintIsKeyword */',
+                'expectedTokenType' => 'T_PRINT',
             ,
-            
-                '/* testDieIsKeyword */',
-                'T_EXIT',
+            'die: statement'                         => 
+                'testMarker'        => '/* testDieIsKeyword */',
+                'expectedTokenType' => 'T_EXIT',
             ,
-            
-                '/* testEvalIsKeyword */',
-                'T_EVAL',
+            'eval'                                   => 
+                'testMarker'        => '/* testEvalIsKeyword */',
+                'expectedTokenType' => 'T_EVAL',
             ,
-            
-                '/* testExitIsKeyword */',
-                'T_EXIT',
+            'exit: statement'                        => 
+                'testMarker'        => '/* testExitIsKeyword */',
+                'expectedTokenType' => 'T_EXIT',
             ,
-            
-                '/* testIssetIsKeyword */',
-                'T_ISSET',
+            'isset'                                  => 
+                'testMarker'        => '/* testIssetIsKeyword */',
+                'expectedTokenType' => 'T_ISSET',
             ,
-            
-                '/* testUnsetIsKeyword */',
-                'T_UNSET',
+            'unset'                                  => 
+                'testMarker'        => '/* testUnsetIsKeyword */',
+                'expectedTokenType' => 'T_UNSET',
             ,
 
-            
-                '/* testIncludeIsKeyword */',
-                'T_INCLUDE',
+            'include'                                => 
+                'testMarker'        => '/* testIncludeIsKeyword */',
+                'expectedTokenType' => 'T_INCLUDE',
             ,
-            
-                '/* testIncludeOnceIsKeyword */',
-                'T_INCLUDE_ONCE',
+            'include_once'                           => 
+                'testMarker'        => '/* testIncludeOnceIsKeyword */',
+                'expectedTokenType' => 'T_INCLUDE_ONCE',
             ,
-            
-                '/* testRequireIsKeyword */',
-                'T_REQUIRE',
+            'require'                                => 
+                'testMarker'        => '/* testRequireIsKeyword */',
+                'expectedTokenType' => 'T_REQUIRE',
             ,
-            
-                '/* testRequireOnceIsKeyword */',
-                'T_REQUIRE_ONCE',
+            'require_once'                           => 
+                'testMarker'        => '/* testRequireOnceIsKeyword */',
+                'expectedTokenType' => 'T_REQUIRE_ONCE',
             ,
 
-            
-                '/* testListIsKeyword */',
-                'T_LIST',
+            'list'                                   => 
+                'testMarker'        => '/* testListIsKeyword */',
+                'expectedTokenType' => 'T_LIST',
             ,
-            
-                '/* testGotoIsKeyword */',
-                'T_GOTO',
+            'goto'                                   => 
+                'testMarker'        => '/* testGotoIsKeyword */',
+                'expectedTokenType' => 'T_GOTO',
             ,
-            
-                '/* testMatchIsKeyword */',
-                'T_MATCH',
+            'match'                                  => 
+                'testMarker'        => '/* testMatchIsKeyword */',
+                'expectedTokenType' => 'T_MATCH',
             ,
-            
-                '/* testMatchDefaultIsKeyword */',
-                'T_MATCH_DEFAULT',
+            'default: in match expression'           => 
+                'testMarker'        => '/* testMatchDefaultIsKeyword */',
+                'expectedTokenType' => 'T_MATCH_DEFAULT',
             ,
-            
-                '/* testFnIsKeyword */',
-                'T_FN',
+            'fn'                                     => 
+                'testMarker'        => '/* testFnIsKeyword */',
+                'expectedTokenType' => 'T_FN',
             ,
 
-            
-                '/* testYieldIsKeyword */',
-                'T_YIELD',
+            'yield'                                  => 
+                'testMarker'        => '/* testYieldIsKeyword */',
+                'expectedTokenType' => 'T_YIELD',
             ,
-            
-                '/* testYieldFromIsKeyword */',
-                'T_YIELD_FROM',
+            'yield from'                             => 
+                'testMarker'        => '/* testYieldFromIsKeyword */',
+                'expectedTokenType' => 'T_YIELD_FROM',
             ,
 
-            
-                '/* testDeclareIsKeyword */',
-                'T_DECLARE',
+            'declare'                                => 
+                'testMarker'        => '/* testDeclareIsKeyword */',
+                'expectedTokenType' => 'T_DECLARE',
             ,
-            
-                '/* testEndDeclareIsKeyword */',
-                'T_ENDDECLARE',
+            'enddeclare'                             => 
+                'testMarker'        => '/* testEndDeclareIsKeyword */',
+                'expectedTokenType' => 'T_ENDDECLARE',
             ,
 
-            
-                '/* testAndIsKeyword */',
-                'T_LOGICAL_AND',
+            'and: in if'                             => 
+                'testMarker'        => '/* testAndIsKeyword */',
+                'expectedTokenType' => 'T_LOGICAL_AND',
             ,
-            
-                '/* testOrIsKeyword */',
-                'T_LOGICAL_OR',
+            'or: in if'                              => 
+                'testMarker'        => '/* testOrIsKeyword */',
+                'expectedTokenType' => 'T_LOGICAL_OR',
             ,
-            
-                '/* testXorIsKeyword */',
-                'T_LOGICAL_XOR',
+            'xor: in if'                             => 
+                'testMarker'        => '/* testXorIsKeyword */',
+                'expectedTokenType' => 'T_LOGICAL_XOR',
             ,
 
-            
-                '/* testAnonymousClassIsKeyword */',
-                'T_ANON_CLASS',
-            ,
-            
-                '/* testExtendsInAnonymousClassIsKeyword */',
-                'T_EXTENDS',
-            ,
-            
-                '/* testImplementsInAnonymousClassIsKeyword */',
-                'T_IMPLEMENTS',
+            'class: anon class declaration'          => 
+                'testMarker'        => '/* testAnonymousClassIsKeyword */',
+                'expectedTokenType' => 'T_ANON_CLASS',
             ,
-            
-                '/* testClassInstantiationParentIsKeyword */',
-                'T_PARENT',
+            'extends: anon class declaration'        => 
+                'testMarker'        => '/* testExtendsInAnonymousClassIsKeyword */',
+                'expectedTokenType' => 'T_EXTENDS',
             ,
-            
-                '/* testClassInstantiationSelfIsKeyword */',
-                'T_SELF',
+            'implements: anon class declaration'     => 
+                'testMarker'        => '/* testImplementsInAnonymousClassIsKeyword */',
+                'expectedTokenType' => 'T_IMPLEMENTS',
             ,
-            
-                '/* testClassInstantiationStaticIsKeyword */',
-                'T_STATIC',
+            'static: class instantiation'            => 
+                'testMarker'        => '/* testClassInstantiationStaticIsKeyword */',
+                'expectedTokenType' => 'T_STATIC',
             ,
-            
-                '/* testNamespaceInNameIsKeyword */',
-                'T_NAMESPACE',
+            'namespace: operator'                    => 
+                'testMarker'        => '/* testNamespaceInNameIsKeyword */',
+                'expectedTokenType' => 'T_NAMESPACE',
             ,
 
-            
-                '/* testStaticIsKeywordBeforeClosure */',
-                'T_STATIC',
-            ,
-            
-                '/* testStaticIsKeywordWhenParamType */',
-                'T_STATIC',
-            ,
-            
-                '/* testStaticIsKeywordBeforeArrow */',
-                'T_STATIC',
-            ,
-            
-                '/* testStaticIsKeywordWhenReturnType */',
-                'T_STATIC',
-            ,
-
-            
-                '/* testFalseIsKeywordAsParamType */',
-                'T_FALSE',
-            ,
-            
-                '/* testTrueIsKeywordAsParamType */',
-                'T_TRUE',
-            ,
-            
-                '/* testNullIsKeywordAsParamType */',
-                'T_NULL',
-            ,
-            
-                '/* testFalseIsKeywordAsReturnType */',
-                'T_FALSE',
-            ,
-            
-                '/* testTrueIsKeywordAsReturnType */',
-                'T_TRUE',
-            ,
-            
-                '/* testNullIsKeywordAsReturnType */',
-                'T_NULL',
+            'static: closure declaration'            => 
+                'testMarker'        => '/* testStaticIsKeywordBeforeClosure */',
+                'expectedTokenType' => 'T_STATIC',
             ,
-            
-                '/* testFalseIsKeywordInComparison */',
-                'T_FALSE',
+            'static: parameter type (illegal)'       => 
+                'testMarker'        => '/* testStaticIsKeywordWhenParamType */',
+                'expectedTokenType' => 'T_STATIC',
             ,
-            
-                '/* testTrueIsKeywordInComparison */',
-                'T_TRUE',
+            'static: arrow function declaration'     => 
+                'testMarker'        => '/* testStaticIsKeywordBeforeArrow */',
+                'expectedTokenType' => 'T_STATIC',
             ,
-            
-                '/* testNullIsKeywordInComparison */',
-                'T_NULL',
+            'static: return type for arrow function' => 
+                'testMarker'        => '/* testStaticIsKeywordWhenReturnType */',
+                'expectedTokenType' => 'T_STATIC',
             ,
         ;

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

@@ -10,9 +10,7 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
-
-class DefaultKeywordTest extends AbstractMethodUnitTest
+final class DefaultKeywordTest extends AbstractTokenizerTestCase
 {
 
 
@@ -33,7 +31,7 @@
      */
     public function testMatchDefault($testMarker, $testContent='default')
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $token      = $this->getTargetToken($testMarker, T_MATCH_DEFAULT, T_DEFAULT, T_STRING, $testContent);
         $tokenArray = $tokens$token;
@@ -53,40 +51,50 @@
      *
      * @see testMatchDefault()
      *
-     * @return array
+     * @return array<string, array<string, string>>
      */
-    public function dataMatchDefault()
+    public static function dataMatchDefault()
     {
         return 
-            'simple_match_default'                                    => '/* testSimpleMatchDefault */',
-            'match_default_in_switch_case_1'                          => '/* testMatchDefaultNestedInSwitchCase1 */',
-            'match_default_in_switch_case_2'                          => '/* testMatchDefaultNestedInSwitchCase2 */',
-            'match_default_in_switch_default'                         => '/* testMatchDefaultNestedInSwitchDefault */',
-            'match_default_containing_switch'                         => '/* testMatchDefault */',
+            'simple_match_default'                                    => 
+                'testMarker' => '/* testSimpleMatchDefault */',
+            ,
+            'match_default_in_switch_case_1'                          => 
+                'testMarker' => '/* testMatchDefaultNestedInSwitchCase1 */',
+            ,
+            'match_default_in_switch_case_2'                          => 
+                'testMarker' => '/* testMatchDefaultNestedInSwitchCase2 */',
+            ,
+            'match_default_in_switch_default'                         => 
+                'testMarker' => '/* testMatchDefaultNestedInSwitchDefault */',
+            ,
+            'match_default_containing_switch'                         => 
+                'testMarker' => '/* testMatchDefault */',
+            ,
 
             'match_default_with_nested_long_array_and_default_key'    => 
-                '/* testMatchDefaultWithNestedLongArrayWithClassConstantKey */',
-                'DEFAULT',
+                'testMarker'  => '/* testMatchDefaultWithNestedLongArrayWithClassConstantKey */',
+                'testContent' => 'DEFAULT',
             ,
             'match_default_with_nested_long_array_and_default_key_2'  => 
-                '/* testMatchDefaultWithNestedLongArrayWithClassConstantKeyLevelDown */',
-                'DEFAULT',
+                'testMarker'  => '/* testMatchDefaultWithNestedLongArrayWithClassConstantKeyLevelDown */',
+                'testContent' => 'DEFAULT',
             ,
             'match_default_with_nested_short_array_and_default_key'   => 
-                '/* testMatchDefaultWithNestedShortArrayWithClassConstantKey */',
-                'DEFAULT',
+                'testMarker'  => '/* testMatchDefaultWithNestedShortArrayWithClassConstantKey */',
+                'testContent' => 'DEFAULT',
             ,
             'match_default_with_nested_short_array_and_default_key_2' => 
-                '/* testMatchDefaultWithNestedShortArrayWithClassConstantKeyLevelDown */',
-                'DEFAULT',
+                'testMarker'  => '/* testMatchDefaultWithNestedShortArrayWithClassConstantKeyLevelDown */',
+                'testContent' => 'DEFAULT',
             ,
             'match_default_in_long_array'                             => 
-                '/* testMatchDefaultNestedInLongArray */',
-                'DEFAULT',
+                'testMarker'  => '/* testMatchDefaultNestedInLongArray */',
+                'testContent' => 'DEFAULT',
             ,
             'match_default_in_short_array'                            => 
-                '/* testMatchDefaultNestedInShortArray */',
-                'DEFAULT',
+                'testMarker'  => '/* testMatchDefaultNestedInShortArray */',
+                'testContent' => 'DEFAULT',
             ,
         ;
 
@@ -113,7 +121,7 @@
      */
     public function testSwitchDefault($testMarker, $openerOffset, $closerOffset, $conditionStop=null, $testContent='default')
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $token      = $this->getTargetToken($testMarker, T_MATCH_DEFAULT, T_DEFAULT, T_STRING, $testContent);
         $tokenArray = $tokens$token;
@@ -169,40 +177,40 @@
      *
      * @see testSwitchDefault()
      *
-     * @return array
+     * @return array<string, array<string, string|int>>
      */
-    public function dataSwitchDefault()
+    public static function dataSwitchDefault()
     {
         return 
             'simple_switch_default'                  => 
-                '/* testSimpleSwitchDefault */',
-                1,
-                4,
+                'testMarker'   => '/* testSimpleSwitchDefault */',
+                'openerOffset' => 1,
+                'closerOffset' => 4,
             ,
             'simple_switch_default_with_curlies'     => 
                 // For a default structure with curly braces, the scope opener
                 // will be the open curly and the closer the close curly.
                 // However, scope conditions will not be set for open to close,
                 // but only for the open token up to the "break/return/continue" etc.
-                '/* testSimpleSwitchDefaultWithCurlies */',
-                3,
-                12,
-                6,
+                'testMarker'    => '/* testSimpleSwitchDefaultWithCurlies */',
+                'openerOffset'  => 3,
+                'closerOffset'  => 12,
+                'conditionStop' => 6,
             ,
             'switch_default_toplevel'                => 
-                '/* testSwitchDefault */',
-                1,
-                43,
+                'testMarker'   => '/* testSwitchDefault */',
+                'openerOffset' => 1,
+                'closerOffset' => 43,
             ,
             'switch_default_nested_in_match_case'    => 
-                '/* testSwitchDefaultNestedInMatchCase */',
-                1,
-                20,
+                'testMarker'   => '/* testSwitchDefaultNestedInMatchCase */',
+                'openerOffset' => 1,
+                'closerOffset' => 20,
             ,
             'switch_default_nested_in_match_default' => 
-                '/* testSwitchDefaultNestedInMatchDefault */',
-                1,
-                18,
+                'testMarker'   => '/* testSwitchDefaultNestedInMatchDefault */',
+                'openerOffset' => 1,
+                'closerOffset' => 18,
             ,
         ;
 
@@ -224,7 +232,7 @@
      */
     public function testNotDefaultKeyword($testMarker, $testContent='DEFAULT')
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $token      = $this->getTargetToken($testMarker, T_MATCH_DEFAULT, T_DEFAULT, T_STRING, $testContent);
         $tokenArray = $tokens$token;
@@ -244,34 +252,68 @@
      *
      * @see testNotDefaultKeyword()
      *
-     * @return array
+     * @return array<string, array<string, string>>
      */
-    public function dataNotDefaultKeyword()
+    public static function dataNotDefaultKeyword()
     {
         return 
-            'class-constant-as-short-array-key'                   => '/* testClassConstantAsShortArrayKey */',
-            'class-property-as-short-array-key'                   => '/* testClassPropertyAsShortArrayKey */',
-            'namespaced-constant-as-short-array-key'              => '/* testNamespacedConstantAsShortArrayKey */',
-            'fqn-global-constant-as-short-array-key'              => '/* testFQNGlobalConstantAsShortArrayKey */',
-            'class-constant-as-long-array-key'                    => '/* testClassConstantAsLongArrayKey */',
-            'class-constant-as-yield-key'                         => '/* testClassConstantAsYieldKey */',
-
-            'class-constant-as-long-array-key-nested-in-match'    => '/* testClassConstantAsLongArrayKeyNestedInMatch */',
-            'class-constant-as-long-array-key-nested-in-match-2'  => '/* testClassConstantAsLongArrayKeyNestedInMatchLevelDown */',
-            'class-constant-as-short-array-key-nested-in-match'   => '/* testClassConstantAsShortArrayKeyNestedInMatch */',
-            'class-constant-as-short-array-key-nested-in-match-2' => '/* testClassConstantAsShortArrayKeyNestedInMatchLevelDown */',
-            'class-constant-as-long-array-key-with-nested-match'  => '/* testClassConstantAsLongArrayKeyWithNestedMatch */',
-            'class-constant-as-short-array-key-with-nested-match' => '/* testClassConstantAsShortArrayKeyWithNestedMatch */',
-
-            'class-constant-in-switch-case'                       => '/* testClassConstantInSwitchCase */',
-            'class-property-in-switch-case'                       => '/* testClassPropertyInSwitchCase */',
-            'namespaced-constant-in-switch-case'                  => '/* testNamespacedConstantInSwitchCase */',
-            'namespace-relative-constant-in-switch-case'          => '/* testNamespaceRelativeConstantInSwitchCase */',
-
-            'class-constant-declaration'                          => '/* testClassConstant */',
+            'class-constant-as-short-array-key'                   => 
+                'testMarker' => '/* testClassConstantAsShortArrayKey */',
+            ,
+            'class-property-as-short-array-key'                   => 
+                'testMarker' => '/* testClassPropertyAsShortArrayKey */',
+            ,
+            'namespaced-constant-as-short-array-key'              => 
+                'testMarker' => '/* testNamespacedConstantAsShortArrayKey */',
+            ,
+            'fqn-global-constant-as-short-array-key'              => 
+                'testMarker' => '/* testFQNGlobalConstantAsShortArrayKey */',
+            ,
+            'class-constant-as-long-array-key'                    => 
+                'testMarker' => '/* testClassConstantAsLongArrayKey */',
+            ,
+            'class-constant-as-yield-key'                         => 
+                'testMarker' => '/* testClassConstantAsYieldKey */',
+            ,
+
+            'class-constant-as-long-array-key-nested-in-match'    => 
+                'testMarker' => '/* testClassConstantAsLongArrayKeyNestedInMatch */',
+            ,
+            'class-constant-as-long-array-key-nested-in-match-2'  => 
+                'testMarker' => '/* testClassConstantAsLongArrayKeyNestedInMatchLevelDown */',
+            ,
+            'class-constant-as-short-array-key-nested-in-match'   => 
+                'testMarker' => '/* testClassConstantAsShortArrayKeyNestedInMatch */',
+            ,
+            'class-constant-as-short-array-key-nested-in-match-2' => 
+                'testMarker' => '/* testClassConstantAsShortArrayKeyNestedInMatchLevelDown */',
+            ,
+            'class-constant-as-long-array-key-with-nested-match'  => 
+                'testMarker' => '/* testClassConstantAsLongArrayKeyWithNestedMatch */',
+            ,
+            'class-constant-as-short-array-key-with-nested-match' => 
+                'testMarker' => '/* testClassConstantAsShortArrayKeyWithNestedMatch */',
+            ,
+
+            'class-constant-in-switch-case'                       => 
+                'testMarker' => '/* testClassConstantInSwitchCase */',
+            ,
+            'class-property-in-switch-case'                       => 
+                'testMarker' => '/* testClassPropertyInSwitchCase */',
+            ,
+            'namespaced-constant-in-switch-case'                  => 
+                'testMarker' => '/* testNamespacedConstantInSwitchCase */',
+            ,
+            'namespace-relative-constant-in-switch-case'          => 
+                'testMarker' => '/* testNamespaceRelativeConstantInSwitchCase */',
+            ,
+
+            'class-constant-declaration'                          => 
+                'testMarker' => '/* testClassConstant */',
+            ,
             'class-method-declaration'                            => 
-                '/* testMethodDeclaration */',
-                'default',
+                'testMarker'  => '/* testMethodDeclaration */',
+                'testContent' => 'default',
             ,
         ;
 
@@ -290,7 +332,7 @@
      */
     public function testIssue3326()
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $token      = $this->getTargetToken('/* testClassConstant */', T_SEMICOLON);
         $tokenArray = $tokens$token;

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

@@ -11,9 +11,7 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
-
-class DoubleArrowTest extends AbstractMethodUnitTest
+final class DoubleArrowTest extends AbstractTokenizerTestCase
 {
 
 
@@ -29,7 +27,7 @@
      */
     public function testDoubleArrow($testMarker)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $token      = $this->getTargetToken($testMarker, T_DOUBLE_ARROW, T_MATCH_ARROW, T_FN_ARROW);
         $tokenArray = $tokens$token;
@@ -45,9 +43,9 @@
      *
      * @see testDoubleArrow()
      *
-     * @return array
+     * @return array<string, array<string>>
      */
-    public function dataDoubleArrow()
+    public static function dataDoubleArrow()
     {
         return 
             'simple_long_array'                          => '/* testLongArrayArrowSimple */',
@@ -114,7 +112,7 @@
      */
     public function testMatchArrow($testMarker)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $token      = $this->getTargetToken($testMarker, T_DOUBLE_ARROW, T_MATCH_ARROW, T_FN_ARROW);
         $tokenArray = $tokens$token;
@@ -130,9 +128,9 @@
      *
      * @see testMatchArrow()
      *
-     * @return array
+     * @return array<string, array<string>>
      */
-    public function dataMatchArrow()
+    public static function dataMatchArrow()
     {
         return 
             'single_case'                             => '/* testMatchArrowSimpleSingleCase */',
@@ -201,7 +199,7 @@
      */
     public function testFnArrow($testMarker)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $token      = $this->getTargetToken($testMarker, T_DOUBLE_ARROW, T_MATCH_ARROW, T_FN_ARROW);
         $tokenArray = $tokens$token;
@@ -217,9 +215,9 @@
      *
      * @see testFnArrow()
      *
-     * @return array
+     * @return array<string, array<string>>
      */
-    public function dataFnArrow()
+    public static function dataFnArrow()
     {
         return 
             'simple_fn'                             => '/* testFnArrowSimple */',

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

@@ -10,9 +10,7 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
-
-class DoubleQuotedStringTest extends AbstractMethodUnitTest
+final class DoubleQuotedStringTest extends AbstractTokenizerTestCase
 {
 
 
@@ -29,7 +27,7 @@
      */
     public function testDoubleQuotedString($testMarker, $expectedContent)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $target = $this->getTargetToken($testMarker, T_DOUBLE_QUOTED_STRING);
         $this->assertSame($expectedContent, $tokens$target'content');
@@ -40,90 +38,98 @@
     /**
      * Data provider.
      *
+     * Type reference:
+     * 1. Directly embedded variables.
+     * 2. Braces outside the variable.
+     * 3. Braces after the dollar sign.
+     * 4. Variable variables and expressions.
+     *
+     * @link https://wiki.php.net/rfc/deprecate_dollar_brace_string_interpolation
+     *
      * @see testDoubleQuotedString()
      *
-     * @return array
+     * @return array<string, array<string, string>>
      */
-    public function dataDoubleQuotedString()
+    public static function dataDoubleQuotedString()
     {
         return 
-            
+            'Type 1: simple variable'                                                  => 
                 'testMarker'      => '/* testSimple1 */',
                 'expectedContent' => '"$foo"',
             ,
-            
+            'Type 2: simple variable'                                                  => 
                 'testMarker'      => '/* testSimple2 */',
                 'expectedContent' => '"{$foo}"',
             ,
-            
+            'Type 3: simple variable'                                                  => 
                 'testMarker'      => '/* testSimple3 */',
                 'expectedContent' => '"${foo}"',
             ,
-            
+            'Type 1: array offset'                                                     => 
                 'testMarker'      => '/* testDIM1 */',
                 'expectedContent' => '"$foobar"',
             ,
-            
+            'Type 2: array offset'                                                     => 
                 'testMarker'      => '/* testDIM2 */',
                 'expectedContent' => '"{$foo\'bar\'}"',
             ,
-            
+            'Type 3: array offset'                                                     => 
                 'testMarker'      => '/* testDIM3 */',
                 'expectedContent' => '"${foo\'bar\'}"',
             ,
-            
+            'Type 1: object property'                                                  => 
                 'testMarker'      => '/* testProperty1 */',
                 'expectedContent' => '"$foo->bar"',
             ,
-            
+            'Type 2: object property'                                                  => 
                 'testMarker'      => '/* testProperty2 */',
                 'expectedContent' => '"{$foo->bar}"',
             ,
-            
+            'Type 2: object method call'                                               => 
                 'testMarker'      => '/* testMethod1 */',
                 'expectedContent' => '"{$foo->bar()}"',
             ,
-            
+            'Type 2: closure function call'                                            => 
                 'testMarker'      => '/* testClosure1 */',
                 'expectedContent' => '"{$foo()}"',
             ,
-            
+            'Type 2: chaining various syntaxes'                                        => 
                 'testMarker'      => '/* testChain1 */',
                 'expectedContent' => '"{$foo\'bar\'->baz()()}"',
             ,
-            
+            'Type 4: variable variables'                                               => 
                 'testMarker'      => '/* testVariableVar1 */',
                 'expectedContent' => '"${$bar}"',
             ,
-            
+            'Type 4: variable constants'                                               => 
                 'testMarker'      => '/* testVariableVar2 */',
                 'expectedContent' => '"${(foo)}"',
             ,
-            
+            'Type 4: object property'                                                  => 
                 'testMarker'      => '/* testVariableVar3 */',
                 'expectedContent' => '"${foo->bar}"',
             ,
-            
+            'Type 4: variable variable nested in array offset'                         => 
                 'testMarker'      => '/* testNested1 */',
                 'expectedContent' => '"${foo"${bar}"}"',
             ,
-            
+            'Type 4: variable array offset nested in array offset'                     => 
                 'testMarker'      => '/* testNested2 */',
                 'expectedContent' => '"${foo"${bar\'baz\'}"}"',
             ,
-            
+            'Type 4: variable object property'                                         => 
                 'testMarker'      => '/* testNested3 */',
                 'expectedContent' => '"${foo->{$baz}}"',
             ,
-            
+            'Type 4: variable object property - complex with single quotes'            => 
                 'testMarker'      => '/* testNested4 */',
                 'expectedContent' => '"${foo->{${\'a\'}}}"',
             ,
-            
+            'Type 4: variable object property - complex with single and double quotes' => 
                 'testMarker'      => '/* testNested5 */',
                 'expectedContent' => '"${foo->{"${\'a\'}"}}"',
             ,
-            
+            'Type 4: live coding/parse error'                                          => 
                 'testMarker'      => '/* testParseError */',
                 'expectedContent' => '"${foo"${bar
 ',

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

@@ -9,9 +9,7 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
-
-class EnumCaseTest extends AbstractMethodUnitTest
+final class EnumCaseTest extends AbstractTokenizerTestCase
 {
 
 
@@ -28,16 +26,16 @@
      */
     public function testEnumCases($testMarker)
     {
-        $tokens = self::$phpcsFile->getTokens();
-
-        $enumCase = $this->getTargetToken($testMarker, T_ENUM_CASE, T_CASE);
+        $tokens     = $this->phpcsFile->getTokens();
+        $enumCase   = $this->getTargetToken($testMarker, T_ENUM_CASE, T_CASE);
+        $tokenArray = $tokens$enumCase;
 
-        $this->assertSame(T_ENUM_CASE, $tokens$enumCase'code');
-        $this->assertSame('T_ENUM_CASE', $tokens$enumCase'type');
+        $this->assertSame(T_ENUM_CASE, $tokenArray'code', 'Token tokenized as '.$tokenArray'type'.', not T_ENUM_CASE (code)');
+        $this->assertSame('T_ENUM_CASE', $tokenArray'type', 'Token tokenized as '.$tokenArray'type'.', not T_ENUM_CASE (type)');
 
-        $this->assertArrayNotHasKey('scope_condition', $tokens$enumCase, 'Scope condition is set');
-        $this->assertArrayNotHasKey('scope_opener', $tokens$enumCase, 'Scope opener is set');
-        $this->assertArrayNotHasKey('scope_closer', $tokens$enumCase, 'Scope closer is set');
+        $this->assertArrayNotHasKey('scope_condition', $tokenArray, 'Scope condition is set');
+        $this->assertArrayNotHasKey('scope_opener', $tokenArray, 'Scope opener is set');
+        $this->assertArrayNotHasKey('scope_closer', $tokenArray, 'Scope closer is set');
 
     }//end testEnumCases()
 
@@ -47,18 +45,18 @@
      *
      * @see testEnumCases()
      *
-     * @return array
+     * @return array<string, array<string>>
      */
-    public function dataEnumCases()
+    public static function dataEnumCases()
     {
         return 
-            '/* testPureEnumCase */',
-            '/* testBackingIntegerEnumCase */',
-            '/* testBackingStringEnumCase */',
-            '/* testEnumCaseInComplexEnum */',
-            '/* testEnumCaseIsCaseInsensitive */',
-            '/* testEnumCaseAfterSwitch */',
-            '/* testEnumCaseAfterSwitchWithEndSwitch */',
+            'enum case, no value'                                        => '/* testPureEnumCase */',
+            'enum case, integer value'                                   => '/* testBackingIntegerEnumCase */',
+            'enum case, string value'                                    => '/* testBackingStringEnumCase */',
+            'enum case, integer value in more complex enum'              => '/* testEnumCaseInComplexEnum */',
+            'enum case, keyword in mixed case'                           => '/* testEnumCaseIsCaseInsensitive */',
+            'enum case, after switch statement'                          => '/* testEnumCaseAfterSwitch */',
+            'enum case, after switch statement using alternative syntax' => '/* testEnumCaseAfterSwitchWithEndSwitch */',
         ;
 
     }//end dataEnumCases()
@@ -77,16 +75,16 @@
      */
     public function testNotEnumCases($testMarker)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens     = $this->phpcsFile->getTokens();
+        $case       = $this->getTargetToken($testMarker, T_ENUM_CASE, T_CASE);
+        $tokenArray = $tokens$case;
 
-        $case = $this->getTargetToken($testMarker, T_ENUM_CASE, T_CASE);
+        $this->assertSame(T_CASE, $tokenArray'code', 'Token tokenized as '.$tokenArray'type'.', not T_CASE (code)');
+        $this->assertSame('T_CASE', $tokenArray'type', 'Token tokenized as '.$tokenArray'type'.', not T_CASE (type)');
 
-        $this->assertSame(T_CASE, $tokens$case'code');
-        $this->assertSame('T_CASE', $tokens$case'type');
-
-        $this->assertArrayHasKey('scope_condition', $tokens$case, 'Scope condition is not set');
-        $this->assertArrayHasKey('scope_opener', $tokens$case, 'Scope opener is not set');
-        $this->assertArrayHasKey('scope_closer', $tokens$case, 'Scope closer is not set');
+        $this->assertArrayHasKey('scope_condition', $tokenArray, 'Scope condition is not set');
+        $this->assertArrayHasKey('scope_opener', $tokenArray, 'Scope opener is not set');
+        $this->assertArrayHasKey('scope_closer', $tokenArray, 'Scope closer is not set');
 
     }//end testNotEnumCases()
 
@@ -96,18 +94,18 @@
      *
      * @see testNotEnumCases()
      *
-     * @return array
+     * @return array<string, array<string>>
      */
-    public function dataNotEnumCases()
+    public static function dataNotEnumCases()
     {
         return 
-            '/* testCaseWithSemicolonIsNotEnumCase */',
-            '/* testCaseWithConstantIsNotEnumCase */',
-            '/* testCaseWithConstantAndIdenticalIsNotEnumCase */',
-            '/* testCaseWithAssigmentToConstantIsNotEnumCase */',
-            '/* testIsNotEnumCaseIsCaseInsensitive */',
-            '/* testCaseInSwitchWhenCreatingEnumInSwitch1 */',
-            '/* testCaseInSwitchWhenCreatingEnumInSwitch2 */',
+            'switch case with constant, semicolon condition end' => '/* testCaseWithSemicolonIsNotEnumCase */',
+            'switch case with constant, colon condition end'     => '/* testCaseWithConstantIsNotEnumCase */',
+            'switch case with constant, comparison'              => '/* testCaseWithConstantAndIdenticalIsNotEnumCase */',
+            'switch case with constant, assignment'              => '/* testCaseWithAssigmentToConstantIsNotEnumCase */',
+            'switch case with constant, keyword in mixed case'   => '/* testIsNotEnumCaseIsCaseInsensitive */',
+            'switch case, body in curlies declares enum'         => '/* testCaseInSwitchWhenCreatingEnumInSwitch1 */',
+            'switch case, body after semicolon declares enum'    => '/* testCaseInSwitchWhenCreatingEnumInSwitch2 */',
         ;
 
     }//end dataNotEnumCases()
@@ -125,12 +123,12 @@
      */
     public function testKeywordAsEnumCaseNameShouldBeString($testMarker)
     {
-        $tokens = self::$phpcsFile->getTokens();
-
+        $tokens       = $this->phpcsFile->getTokens();
         $enumCaseName = $this->getTargetToken($testMarker, T_STRING, T_INTERFACE, T_TRAIT, T_ENUM, T_FUNCTION, T_FALSE, T_DEFAULT, T_ARRAY);
+        $tokenArray   = $tokens$enumCaseName;
 
-        $this->assertSame(T_STRING, $tokens$enumCaseName'code');
-        $this->assertSame('T_STRING', $tokens$enumCaseName'type');
+        $this->assertSame(T_STRING, $tokenArray'code', 'Token tokenized as '.$tokenArray'type'.', not T_STRING (code)');
+        $this->assertSame('T_STRING', $tokenArray'type', 'Token tokenized as '.$tokenArray'type'.', not T_STRING (type)');
 
     }//end testKeywordAsEnumCaseNameShouldBeString()
 
@@ -140,15 +138,18 @@
      *
      * @see testKeywordAsEnumCaseNameShouldBeString()
      *
-     * @return array
+     * @return array<string, array<string>>
      */
-    public function dataKeywordAsEnumCaseNameShouldBeString()
+    public static function dataKeywordAsEnumCaseNameShouldBeString()
     {
         return 
-            '/* testKeywordAsEnumCaseNameShouldBeString1 */',
-            '/* testKeywordAsEnumCaseNameShouldBeString2 */',
-            '/* testKeywordAsEnumCaseNameShouldBeString3 */',
-            '/* testKeywordAsEnumCaseNameShouldBeString4 */',
+            '"interface" as case name' => '/* testKeywordAsEnumCaseNameShouldBeString1 */',
+            '"trait" as case name'     => '/* testKeywordAsEnumCaseNameShouldBeString2 */',
+            '"enum" as case name'      => '/* testKeywordAsEnumCaseNameShouldBeString3 */',
+            '"function" as case name'  => '/* testKeywordAsEnumCaseNameShouldBeString4 */',
+            '"false" as case name'     => '/* testKeywordAsEnumCaseNameShouldBeString5 */',
+            '"default" as case name'   => '/* testKeywordAsEnumCaseNameShouldBeString6 */',
+            '"array" as case name'     => '/* testKeywordAsEnumCaseNameShouldBeString7 */',
         ;
 
     }//end dataKeywordAsEnumCaseNameShouldBeString()

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

@@ -9,9 +9,7 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
-
-class FinallyTest extends AbstractMethodUnitTest
+final class FinallyTest extends AbstractTokenizerTestCase
 {
 
 
@@ -27,11 +25,12 @@
      */
     public function testFinallyKeyword($testMarker)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens     = $this->phpcsFile->getTokens();
+        $target     = $this->getTargetToken($testMarker, T_FINALLY, T_STRING);
+        $tokenArray = $tokens$target;
 
-        $target = $this->getTargetToken($testMarker, T_FINALLY, T_STRING);
-        $this->assertSame(T_FINALLY, $tokens$target'code');
-        $this->assertSame('T_FINALLY', $tokens$target'type');
+        $this->assertSame(T_FINALLY, $tokenArray'code', 'Token tokenized as '.$tokenArray'type'.', not T_FINALLY (code)');
+        $this->assertSame('T_FINALLY', $tokenArray'type', 'Token tokenized as '.$tokenArray'type'.', not T_FINALLY (type)');
 
     }//end testFinallyKeyword()
 
@@ -41,14 +40,14 @@
      *
      * @see testFinallyKeyword()
      *
-     * @return array
+     * @return array<string, array<string>>
      */
-    public function dataFinallyKeyword()
+    public static function dataFinallyKeyword()
     {
         return 
-            '/* testTryCatchFinally */',
-            '/* testTryFinallyCatch */',
-            '/* testTryFinally */',
+            'finally after try and catch'   => '/* testTryCatchFinally */',
+            'finally between try and catch' => '/* testTryFinallyCatch */',
+            'finally after try, no catch'   => '/* testTryFinally */',
         ;
 
     }//end dataFinallyKeyword()
@@ -66,11 +65,12 @@
      */
     public function testFinallyNonKeyword($testMarker)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens     = $this->phpcsFile->getTokens();
+        $target     = $this->getTargetToken($testMarker, T_FINALLY, T_STRING);
+        $tokenArray = $tokens$target;
 
-        $target = $this->getTargetToken($testMarker, T_FINALLY, T_STRING);
-        $this->assertSame(T_STRING, $tokens$target'code');
-        $this->assertSame('T_STRING', $tokens$target'type');
+        $this->assertSame(T_STRING, $tokenArray'code', 'Token tokenized as '.$tokenArray'type'.', not T_STRING (code)');
+        $this->assertSame('T_STRING', $tokenArray'type', 'Token tokenized as '.$tokenArray'type'.', not T_STRING (type)');
 
     }//end testFinallyNonKeyword()
 
@@ -80,14 +80,14 @@
      *
      * @see testFinallyNonKeyword()
      *
-     * @return array
+     * @return array<string, array<string>>
      */
-    public function dataFinallyNonKeyword()
+    public static function dataFinallyNonKeyword()
     {
         return 
-            '/* testFinallyUsedAsClassConstantName */',
-            '/* testFinallyUsedAsMethodName */',
-            '/* testFinallyUsedAsPropertyName */',
+            'finally used as class constant name' => '/* testFinallyUsedAsClassConstantName */',
+            'finally used as method name'         => '/* testFinallyUsedAsMethodName */',
+            'finally used as property name'       => '/* testFinallyUsedAsPropertyName */',
         ;
 
     }//end dataFinallyNonKeyword()

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

@@ -9,9 +9,7 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
-
-class GotoLabelTest extends AbstractMethodUnitTest
+final class GotoLabelTest extends AbstractTokenizerTestCase
 {
 
 
@@ -28,7 +26,7 @@
      */
     public function testGotoStatement($testMarker, $testContent)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $label = $this->getTargetToken($testMarker, T_STRING);
 
@@ -43,18 +41,18 @@
      *
      * @see testGotoStatement()
      *
-     * @return array
+     * @return array<string, array<string, string>>
      */
-    public function dataGotoStatement()
+    public static function dataGotoStatement()
     {
         return 
-            
-                '/* testGotoStatement */',
-                'marker',
+            'label for goto statement'                              => 
+                'testMarker'  => '/* testGotoStatement */',
+                'testContent' => 'marker',
             ,
-            
-                '/* testGotoStatementInLoop */',
-                'end',
+            'label for goto statement in loop, keyword capitalized' => 
+                'testMarker'  => '/* testGotoStatementInLoop */',
+                'testContent' => 'end',
             ,
         ;
 
@@ -74,7 +72,7 @@
      */
     public function testGotoDeclaration($testMarker, $testContent)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $label = $this->getTargetToken($testMarker, T_GOTO_LABEL);
 
@@ -89,18 +87,18 @@
      *
      * @see testGotoDeclaration()
      *
-     * @return array
+     * @return array<string, array<string, string>>
      */
-    public function dataGotoDeclaration()
+    public static function dataGotoDeclaration()
     {
         return 
-            
-                '/* testGotoDeclaration */',
-                'marker:',
+            'label in goto declaration - marker' => 
+                'testMarker'  => '/* testGotoDeclaration */',
+                'testContent' => 'marker:',
             ,
-            
-                '/* testGotoDeclarationOutsideLoop */',
-                'end:',
+            'label in goto declaration - end'    => 
+                'testMarker'  => '/* testGotoDeclarationOutsideLoop */',
+                'testContent' => 'end:',
             ,
         ;
 
@@ -120,11 +118,12 @@
      */
     public function testNotAGotoDeclaration($testMarker, $testContent)
     {
-        $tokens = self::$phpcsFile->getTokens();
-        $target = $this->getTargetToken($testMarker, T_GOTO_LABEL, T_STRING, $testContent);
+        $tokens     = $this->phpcsFile->getTokens();
+        $target     = $this->getTargetToken($testMarker, T_GOTO_LABEL, T_STRING, $testContent);
+        $tokenArray = $tokens$target;
 
-        $this->assertSame(T_STRING, $tokens$target'code');
-        $this->assertSame('T_STRING', $tokens$target'type');
+        $this->assertSame(T_STRING, $tokenArray'code', 'Token tokenized as '.$tokenArray'type'.', not T_STRING (code)');
+        $this->assertSame('T_STRING', $tokenArray'type', 'Token tokenized as '.$tokenArray'type'.', not T_STRING (type)');
 
     }//end testNotAGotoDeclaration()
 
@@ -134,38 +133,38 @@
      *
      * @see testNotAGotoDeclaration()
      *
-     * @return array
+     * @return array<string, array<string, string>>
      */
-    public function dataNotAGotoDeclaration()
+    public static function dataNotAGotoDeclaration()
     {
         return 
-            
-                '/* testNotGotoDeclarationGlobalConstant */',
-                'CONSTANT',
+            'not goto label - global constant followed by switch-case colon'     => 
+                'testMarker'  => '/* testNotGotoDeclarationGlobalConstant */',
+                'testContent' => 'CONSTANT',
             ,
-            
-                '/* testNotGotoDeclarationNamespacedConstant */',
-                'CONSTANT',
+            'not goto label - namespaced constant followed by switch-case colon' => 
+                'testMarker'  => '/* testNotGotoDeclarationNamespacedConstant */',
+                'testContent' => 'CONSTANT',
             ,
-            
-                '/* testNotGotoDeclarationClassConstant */',
-                'CONSTANT',
+            'not goto label - class constant followed by switch-case colon'      => 
+                'testMarker'  => '/* testNotGotoDeclarationClassConstant */',
+                'testContent' => 'CONSTANT',
             ,
-            
-                '/* testNotGotoDeclarationClassProperty */',
-                'property',
+            'not goto label - class property use followed by switch-case colon'  => 
+                'testMarker'  => '/* testNotGotoDeclarationClassProperty */',
+                'testContent' => 'property',
             ,
-            
-                '/* testNotGotoDeclarationGlobalConstantInTernary */',
-                'CONST_A',
+            'not goto label - global constant followed by ternary else'          => 
+                'testMarker'  => '/* testNotGotoDeclarationGlobalConstantInTernary */',
+                'testContent' => 'CONST_A',
             ,
-            
-                '/* testNotGotoDeclarationGlobalConstantInTernary */',
-                'CONST_B',
+            'not goto label - global constant after ternary else'                => 
+                'testMarker'  => '/* testNotGotoDeclarationGlobalConstantInTernary */',
+                'testContent' => 'CONST_B',
             ,
-            
-                '/* testNotGotoDeclarationEnumWithType */',
-                'Suit',
+            'not goto label - name of backed enum'                               => 
+                'testMarker'  => '/* testNotGotoDeclarationEnumWithType */',
+                'testContent' => 'Suit',
             ,
         ;

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

@@ -1,6 +1,6 @@
 <?php
 /**
- * Tests the tokenization of goto declarations and statements.
+ * Tests the tokenization of heredoc/nowdoc closer tokens.
  *
  * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
  * @copyright 2020 Squiz Pty Ltd (ABN 77 084 670 600)
@@ -9,58 +9,20 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
 
-use PHP_CodeSniffer\Config;
-use PHP_CodeSniffer\Ruleset;
-use PHP_CodeSniffer\Files\DummyFile;
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
-
 /**
  * Heredoc/nowdoc closer token test.
  *
  * @requires PHP 7.3
  */
-class HeredocNowdocCloserTest extends AbstractMethodUnitTest
+final class HeredocNowdocCloserTest extends AbstractTokenizerTestCase
 {
 
 
     /**
-     * Initialize & tokenize \PHP_CodeSniffer\Files\File with code from the test case file.
-     *
-     * {@internal This is a near duplicate of the original method. Only difference is that
-     * tab replacement is enabled for this test.}
-     *
-     * @beforeClass
-     *
-     * @return void
-     */
-    public static function initializeFile()
-    {
-        $config            = new Config();
-        $config->standards = 'PSR1';
-        $config->tabWidth  = 4;
-
-        $ruleset = new Ruleset($config);
-
-        // Default to a file with the same name as the test class. Extension is property based.
-        $relativeCN     = str_replace(__NAMESPACE__, '', get_called_class());
-        $relativePath   = str_replace('\\', DIRECTORY_SEPARATOR, $relativeCN);
-        $pathToTestFile = realpath(__DIR__).$relativePath.'.'.static::$fileExtension;
-
-        // Make sure the file gets parsed correctly based on the file type.
-        $contents  = 'phpcs_input_file: '.$pathToTestFile.PHP_EOL;
-        $contents .= file_get_contents($pathToTestFile);
-
-        self::$phpcsFile = new DummyFile($contents, $ruleset, $config);
-        self::$phpcsFile->process();
-
-    }//end initializeFile()
-
-
-    /**
      * Verify that leading (indent) whitespace in a heredoc/nowdoc closer token get the tab replacement treatment.
      *
-     * @param string $testMarker The comment prefacing the target token.
-     * @param array  $expected   Expectations for the token array.
+     * @param string                         $testMarker The comment prefacing the target token.
+     * @param array<string, int|string|null> $expected   Expectations for the token array.
      *
      * @dataProvider dataHeredocNowdocCloserTabReplacement
      * @covers       PHP_CodeSniffer\Tokenizers\Tokenizer::createPositionMap
@@ -69,7 +31,7 @@
      */
     public function testHeredocNowdocCloserTabReplacement($testMarker, $expected)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $closer = $this->getTargetToken($testMarker, T_END_HEREDOC, T_END_NOWDOC);
 
@@ -91,12 +53,12 @@
      *
      * @see testHeredocNowdocCloserTabReplacement()
      *
-     * @return array
+     * @return array<string, array<string, string|array<string, int|string|null>>>
      */
-    public function dataHeredocNowdocCloserTabReplacement()
+    public static function dataHeredocNowdocCloserTabReplacement()
     {
         return 
-            
+            'Heredoc closer without indent'      => 
                 'testMarker' => '/* testHeredocCloserNoIndent */',
                 'expected'   => 
                     'length'       => 3,
@@ -104,7 +66,7 @@
                     'orig_content' => null,
                 ,
             ,
-            
+            'Nowdoc closer without indent'       => 
                 'testMarker' => '/* testNowdocCloserNoIndent */',
                 'expected'   => 
                     'length'       => 3,
@@ -112,7 +74,7 @@
                     'orig_content' => null,
                 ,
             ,
-            
+            'Heredoc closer with indent, spaces' => 
                 'testMarker' => '/* testHeredocCloserSpaceIndent */',
                 'expected'   => 
                     'length'       => 7,
@@ -120,7 +82,7 @@
                     'orig_content' => null,
                 ,
             ,
-            
+            'Nowdoc closer with indent, spaces'  => 
                 'testMarker' => '/* testNowdocCloserSpaceIndent */',
                 'expected'   => 
                     'length'       => 8,
@@ -128,7 +90,7 @@
                     'orig_content' => null,
                 ,
             ,
-            
+            'Heredoc closer with indent, tabs'   => 
                 'testMarker' => '/* testHeredocCloserTabIndent */',
                 'expected'   => 
                     'length'       => 8,
@@ -136,7 +98,7 @@
                     'orig_content' => '	 END',
                 ,
             ,
-            
+            'Nowdoc closer with indent, tabs'    => 
                 'testMarker' => '/* testNowdocCloserTabIndent */',
                 'expected'   => 
                     'length'       => 7,

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

@@ -10,9 +10,7 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
-
-class HeredocStringTest extends AbstractMethodUnitTest
+final class HeredocStringTest extends AbstractTokenizerTestCase
 {
 
 
@@ -29,7 +27,7 @@
      */
     public function testHeredocString($testMarker, $expectedContent)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $target = $this->getTargetToken($testMarker, T_HEREDOC);
         $this->assertSame($expectedContent."\n", $tokens$target'content');
@@ -50,7 +48,7 @@
      */
     public function testHeredocStringWrapped($testMarker, $expectedContent)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $testMarker = substr($testMarker, 0, -3).'Wrapped */';
         $target     = $this->getTargetToken($testMarker, T_HEREDOC);
@@ -62,86 +60,94 @@
     /**
      * Data provider.
      *
+     * Type reference:
+     * 1. Directly embedded variables.
+     * 2. Braces outside the variable.
+     * 3. Braces after the dollar sign.
+     * 4. Variable variables and expressions.
+     *
+     * @link https://wiki.php.net/rfc/deprecate_dollar_brace_string_interpolation
+     *
      * @see testHeredocString()
      *
-     * @return array
+     * @return array<string, array<string, string>>
      */
-    public function dataHeredocString()
+    public static function dataHeredocString()
     {
         return 
-            
+            'Type 1: simple variable'                                                  => 
                 'testMarker'      => '/* testSimple1 */',
                 'expectedContent' => '$foo',
             ,
-            
+            'Type 2: simple variable'                                                  => 
                 'testMarker'      => '/* testSimple2 */',
                 'expectedContent' => '{$foo}',
             ,
-            
+            'Type 3: simple variable'                                                  => 
                 'testMarker'      => '/* testSimple3 */',
                 'expectedContent' => '${foo}',
             ,
-            
+            'Type 1: array offset'                                                     => 
                 'testMarker'      => '/* testDIM1 */',
                 'expectedContent' => '$foobar',
             ,
-            
+            'Type 2: array offset'                                                     => 
                 'testMarker'      => '/* testDIM2 */',
                 'expectedContent' => '{$foo\'bar\'}',
             ,
-            
+            'Type 3: array offset'                                                     => 
                 'testMarker'      => '/* testDIM3 */',
                 'expectedContent' => '${foo\'bar\'}',
             ,
-            
+            'Type 1: object property'                                                  => 
                 'testMarker'      => '/* testProperty1 */',
                 'expectedContent' => '$foo->bar',
             ,
-            
+            'Type 2: object property'                                                  => 
                 'testMarker'      => '/* testProperty2 */',
                 'expectedContent' => '{$foo->bar}',
             ,
-            
+            'Type 2: object method call'                                               => 
                 'testMarker'      => '/* testMethod1 */',
                 'expectedContent' => '{$foo->bar()}',
             ,
-            
+            'Type 2: closure function call'                                            => 
                 'testMarker'      => '/* testClosure1 */',
                 'expectedContent' => '{$foo()}',
             ,
-            
+            'Type 2: chaining various syntaxes'                                        => 
                 'testMarker'      => '/* testChain1 */',
                 'expectedContent' => '{$foo\'bar\'->baz()()}',
             ,
-            
+            'Type 4: variable variables'                                               => 
                 'testMarker'      => '/* testVariableVar1 */',
                 'expectedContent' => '${$bar}',
             ,
-            
+            'Type 4: variable constants'                                               => 
                 'testMarker'      => '/* testVariableVar2 */',
                 'expectedContent' => '${(foo)}',
             ,
-            
+            'Type 4: object property'                                                  => 
                 'testMarker'      => '/* testVariableVar3 */',
                 'expectedContent' => '${foo->bar}',
             ,
-            
+            'Type 4: variable variable nested in array offset'                         => 
                 'testMarker'      => '/* testNested1 */',
                 'expectedContent' => '${foo"${bar}"}',
             ,
-            
+            'Type 4: variable array offset nested in array offset'                     => 
                 'testMarker'      => '/* testNested2 */',
                 'expectedContent' => '${foo"${bar\'baz\'}"}',
             ,
-            
+            'Type 4: variable object property'                                         => 
                 'testMarker'      => '/* testNested3 */',
                 'expectedContent' => '${foo->{$baz}}',
             ,
-            
+            'Type 4: variable object property - complex with single quotes'            => 
                 'testMarker'      => '/* testNested4 */',
                 'expectedContent' => '${foo->{${\'a\'}}}',
             ,
-            
+            'Type 4: variable object property - complex with single and double quotes' => 
                 'testMarker'      => '/* testNested5 */',
                 'expectedContent' => '${foo->{"${\'a\'}"}}',
             ,

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

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

@@ -1,6 +1,6 @@
 <?php
 /**
- * Tests the backfilling of the T_FN token to PHP < 7.4.
+ * Tests the backfilling of the parameter labels for PHP 8.0 named parameters in function calls.
  *
  * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
  * @copyright 2020 Squiz Pty Ltd (ABN 77 084 670 600)
@@ -9,10 +9,9 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
 use PHP_CodeSniffer\Util\Tokens;
 
-class NamedFunctionCallArgumentsTest extends AbstractMethodUnitTest
+final class NamedFunctionCallArgumentsTest extends AbstractTokenizerTestCase
 {
 
 
@@ -20,8 +19,8 @@
      * Verify that parameter labels are tokenized as T_PARAM_NAME and that
      * the colon after it is tokenized as a T_COLON.
      *
-     * @param string $testMarker The comment prefacing the target token.
-     * @param array  $parameters The token content for each parameter label to look for.
+     * @param string        $testMarker The comment prefacing the target token.
+     * @param array<string> $parameters The token content for each parameter label to look for.
      *
      * @dataProvider dataNamedFunctionCallArguments
      * @covers       PHP_CodeSniffer\Tokenizers\PHP::tokenize
@@ -30,7 +29,7 @@
      */
     public function testNamedFunctionCallArguments($testMarker, $parameters)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         foreach ($parameters as $content) {
             $label = $this->getTargetToken($testMarker, T_STRING, T_PARAM_NAME, $content);
@@ -47,7 +46,7 @@
             );
 
             // Get the next non-empty token.
-            $colon = self::$phpcsFile->findNext(Tokens::$emptyTokens, ($label + 1), null, true);
+            $colon = $this->phpcsFile->findNext(Tokens::$emptyTokens, ($label + 1), null, true);
 
             $this->assertSame(
                 ':',
@@ -74,135 +73,141 @@
      *
      * @see testNamedFunctionCallArguments()
      *
-     * @return array
+     * @return array<string, array<string, string|array<string>>>
      */
-    public function dataNamedFunctionCallArguments()
+    public static function dataNamedFunctionCallArguments()
     {
         return 
-            
-                '/* testNamedArgs */',
-                
+            'function call, single line, all named args'                          => 
+                'testMarker' => '/* testNamedArgs */',
+                'parameters' => 
                     'start_index',
                     'count',
                     'value',
                 ,
             ,
-            
-                '/* testNamedArgsMultiline */',
-                
+            'function call, multi-line, all named args'                           => 
+                'testMarker' => '/* testNamedArgsMultiline */',
+                'parameters' => 
                     'start_index',
                     'count',
                     'value',
                 ,
             ,
-            
-                '/* testNamedArgsWithWhitespaceAndComments */',
-                
+            'function call, single line, all named args; comments and whitespace' => 
+                'testMarker' => '/* testNamedArgsWithWhitespaceAndComments */',
+                'parameters' => 
                     'start_index',
                     'count',
                     'value',
                 ,
             ,
-            
-                '/* testMixedPositionalAndNamedArgs */',
-                'double_encode',
+            'function call, single line, mixed positional and named args'         => 
+                'testMarker' => '/* testMixedPositionalAndNamedArgs */',
+                'parameters' => 
+                    'double_encode',
+                ,
             ,
-            
-                '/* testNestedFunctionCallOuter */',
-                
+            'function call containing nested function call values'                => 
+                'testMarker' => '/* testNestedFunctionCallOuter */',
+                'parameters' => 
                     'start_index',
                     'count',
                     'value',
                 ,
             ,
-            
-                '/* testNestedFunctionCallInner1 */',
-                'skip',
+            'function call nested in named arg 1'                               => 
+                'testMarker' => '/* testNestedFunctionCallInner1 */',
+                'parameters' => 
+                    'skip',
+                ,
             ,
-            
-                '/* testNestedFunctionCallInner2 */',
-                'array_or_countable',
+            'function call nested in named arg 2'                               => 
+                'testMarker' => '/* testNestedFunctionCallInner2 */',
+                'parameters' => 
+                    'array_or_countable',
+                ,
             ,
-            
-                '/* testNamespaceOperatorFunction */',
-                
+            'namespace relative function call'                                    => 
+                'testMarker' => '/* testNamespaceRelativeFunction */',
+                'parameters' => 
                     'label',
                     'more',
                 ,
             ,
-            
-                '/* testNamespaceRelativeFunction */',
-                
+            'partially qualified function call'                                   => 
+                'testMarker' => '/* testPartiallyQualifiedFunction */',
+                'parameters' => 
                     'label',
                     'more',
                 ,
             ,
-            
-                '/* testNamespacedFQNFunction */',
-                
+            'fully qualified function call'                                       => 
+                'testMarker' => '/* testFullyQualifiedFunction */',
+                'parameters' => 
                     'label',
                     'more',
                 ,
             ,
-            
-                '/* testVariableFunction */',
-                
+            'variable function call'                                              => 
+                'testMarker' => '/* testVariableFunction */',
+                'parameters' => 
                     'label',
                     'more',
                 ,
             ,
-            
-                '/* testVariableVariableFunction */',
-                
+            'variable variable function call'                                     => 
+                'testMarker' => '/* testVariableVariableFunction */',
+                'parameters' => 
                     'label',
                     'more',
                 ,
             ,
-            
-                '/* testMethodCall */',
-                
+            'method call'                                                         => 
+                'testMarker' => '/* testMethodCall */',
+                'parameters' => 
                     'label',
                     'more',
                 ,
             ,
-            
-                '/* testVariableMethodCall */',
-                
+            'variable method call'                                                => 
+                'testMarker' => '/* testVariableMethodCall */',
+                'parameters' => 
                     'label',
                     'more',
                 ,
             ,
-            
-                '/* testClassInstantiation */',
-                
+            'class instantiation'                                                 => 
+                'testMarker' => '/* testClassInstantiation */',
+                'parameters' => 
                     'label',
                     'more',
                 ,
             ,
-            
-                '/* testClassInstantiationSelf */',
-                
+            'class instantiation with "self"'                                     => 
+                'testMarker' => '/* testClassInstantiationSelf */',
+                'parameters' => 
                     'label',
                     'more',
                 ,
             ,
-            
-                '/* testClassInstantiationStatic */',
-                
+            'class instantiation with "static"'                                   => 
+                'testMarker' => '/* testClassInstantiationStatic */',
+                'parameters' => 
                     'label',
                     'more',
                 ,
             ,
-            
-                '/* testAnonClass */',
-                
+            'anonymous class instantiation'                                       => 
+                'testMarker' => '/* testAnonClass */',
+                'parameters' => 
                     'label',
                     'more',
                 ,
             ,
-            
-                '/* testNonAsciiNames */',
-                
+            'function call with non-ascii characters in the variable name labels' => 
+                'testMarker' => '/* testNonAsciiNames */',
+                'parameters' => 
                     '💩💩💩',
                     'Пасха',
                     '_valid',
@@ -210,48 +215,66 @@
             ,
 
             // Coding errors which should still be handled.
-            
-                '/* testCompileErrorNamedBeforePositional */',
-                'param',
+            'invalid: named arg before positional (compile error)'                => 
+                'testMarker' => '/* testCompileErrorNamedBeforePositional */',
+                'parameters' => 
+                    'param',
+                ,
             ,
-            
-                '/* testDuplicateName1 */',
-                'param',
+            'invalid: duplicate parameter name 1'                               => 
+                'testMarker' => '/* testDuplicateName1 */',
+                'parameters' => 
+                    'param',
+                ,
             ,
-            
-                '/* testDuplicateName2 */',
-                'param',
+            'invalid: duplicate parameter name 2'                               => 
+                'testMarker' => '/* testDuplicateName2 */',
+                'parameters' => 
+                    'param',
+                ,
             ,
-            
-                '/* testIncorrectOrderWithVariadic */',
-                'start_index',
+            'invalid: named arg before variadic (error exception)'                => 
+                'testMarker' => '/* testIncorrectOrderWithVariadic */',
+                'parameters' => 
+                    'start_index',
+                ,
             ,
-            
-                '/* testCompileErrorIncorrectOrderWithVariadic */',
-                'param',
+            'invalid: named arg after variadic (compile error)'                   => 
+                'testMarker' => '/* testCompileErrorIncorrectOrderWithVariadic */',
+                'parameters' => 
+                    'param',
+                ,
             ,
-            
-                '/* testParseErrorNoValue */',
-                
+            'invalid: named arg without value (parse error)'                      => 
+                'testMarker' => '/* testParseErrorNoValue */',
+                'parameters' => 
                     'param1',
                     'param2',
                 ,
             ,
-            
-                '/* testParseErrorExit */',
-                'status',
+            'invalid: named arg in exit() (parse error)'                          => 
+                'testMarker' => '/* testParseErrorExit */',
+                'parameters' => 
+                    'status',
+                ,
             ,
-            
-                '/* testParseErrorEmpty */',
-                'variable',
+            'invalid: named arg in empty() (parse error)'                         => 
+                'testMarker' => '/* testParseErrorEmpty */',
+                'parameters' => 
+                    'variable',
+                ,
             ,
-            
-                '/* testParseErrorEval */',
-                'code',
+            'invalid: named arg in eval() (parse error)'                          => 
+                'testMarker' => '/* testParseErrorEval */',
+                'parameters' => 
+                    'code',
+                ,
             ,
-            
-                '/* testParseErrorArbitraryParentheses */',
-                'something',
+            'invalid: named arg in arbitrary parentheses (parse error)'           => 
+                'testMarker' => '/* testParseErrorArbitraryParentheses */',
+                'parameters' => 
+                    'something',
+                ,
             ,
         ;
 
@@ -271,7 +294,7 @@
      */
     public function testOtherTstringInFunctionCall($testMarker, $content)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $label = $this->getTargetToken($testMarker, T_STRING, T_PARAM_NAME, $content);
 
@@ -294,26 +317,26 @@
      *
      * @see testOtherTstringInFunctionCall()
      *
-     * @return array
+     * @return array<string, array<string, string>>
      */
-    public function dataOtherTstringInFunctionCall()
+    public static function dataOtherTstringInFunctionCall()
     {
         return 
-            
-                '/* testPositionalArgs */',
-                'START_INDEX',
+            'not arg name - global constant'             => 
+                'testMarker' => '/* testPositionalArgs */',
+                'content'    => 'START_INDEX',
             ,
-            
-                '/* testPositionalArgs */',
-                'COUNT',
+            'not arg name - fully qualified constant'    => 
+                'testMarker' => '/* testPositionalArgs */',
+                'content'    => 'COUNT',
             ,
-            
-                '/* testPositionalArgs */',
-                'VALUE',
+            'not arg name - namespace relative constant' => 
+                'testMarker' => '/* testPositionalArgs */',
+                'content'    => 'VALUE',
             ,
-            
-                '/* testNestedFunctionCallInner2 */',
-                'count',
+            'not arg name - unqualified function call'   => 
+                'testMarker' => '/* testNestedFunctionCallInner2 */',
+                'content'    => 'count',
             ,
         ;
 
@@ -330,12 +353,12 @@
      */
     public function testMixedPositionalAndNamedArgsWithTernary()
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $true = $this->getTargetToken('/* testMixedPositionalAndNamedArgsWithTernary */', T_TRUE);
 
         // Get the next non-empty token.
-        $colon = self::$phpcsFile->findNext(Tokens::$emptyTokens, ($true + 1), null, true);
+        $colon = $this->phpcsFile->findNext(Tokens::$emptyTokens, ($true + 1), null, true);
 
         $this->assertSame(
             T_INLINE_ELSE,
@@ -351,7 +374,7 @@
         $label = $this->getTargetToken('/* testMixedPositionalAndNamedArgsWithTernary */', T_PARAM_NAME, 'name');
 
         // Get the next non-empty token.
-        $colon = self::$phpcsFile->findNext(Tokens::$emptyTokens, ($label + 1), null, true);
+        $colon = $this->phpcsFile->findNext(Tokens::$emptyTokens, ($label + 1), null, true);
 
         $this->assertSame(
             ':',
@@ -382,7 +405,7 @@
      */
     public function testNamedArgWithTernary()
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         /*
          * First argument.
@@ -391,7 +414,7 @@
         $label = $this->getTargetToken('/* testNamedArgWithTernary */', T_PARAM_NAME, 'label');
 
         // Get the next non-empty token.
-        $colon = self::$phpcsFile->findNext(Tokens::$emptyTokens, ($label + 1), null, true);
+        $colon = $this->phpcsFile->findNext(Tokens::$emptyTokens, ($label + 1), null, true);
 
         $this->assertSame(
             ':',
@@ -412,7 +435,7 @@
         $true = $this->getTargetToken('/* testNamedArgWithTernary */', T_TRUE);
 
         // Get the next non-empty token.
-        $colon = self::$phpcsFile->findNext(Tokens::$emptyTokens, ($true + 1), null, true);
+        $colon = $this->phpcsFile->findNext(Tokens::$emptyTokens, ($true + 1), null, true);
 
         $this->assertSame(
             T_INLINE_ELSE,
@@ -432,7 +455,7 @@
         $label = $this->getTargetToken('/* testNamedArgWithTernary */', T_PARAM_NAME, 'more');
 
         // Get the next non-empty token.
-        $colon = self::$phpcsFile->findNext(Tokens::$emptyTokens, ($label + 1), null, true);
+        $colon = $this->phpcsFile->findNext(Tokens::$emptyTokens, ($label + 1), null, true);
 
         $this->assertSame(
             ':',
@@ -453,7 +476,7 @@
         $true = $this->getTargetToken('/* testNamedArgWithTernary */', T_STRING, 'CONSTANT_A');
 
         // Get the next non-empty token.
-        $colon = self::$phpcsFile->findNext(Tokens::$emptyTokens, ($true + 1), null, true);
+        $colon = $this->phpcsFile->findNext(Tokens::$emptyTokens, ($true + 1), null, true);
 
         $this->assertSame(
             T_INLINE_ELSE,
@@ -479,7 +502,7 @@
      */
     public function testTernaryWithFunctionCallsInThenElse()
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         /*
          * Then.
@@ -488,7 +511,7 @@
         $label = $this->getTargetToken('/* testTernaryWithFunctionCallsInThenElse */', T_PARAM_NAME, 'label');
 
         // Get the next non-empty token.
-        $colon = self::$phpcsFile->findNext(Tokens::$emptyTokens, ($label + 1), null, true);
+        $colon = $this->phpcsFile->findNext(Tokens::$emptyTokens, ($label + 1), null, true);
 
         $this->assertSame(
             ':',
@@ -509,7 +532,7 @@
         $closeParens = $this->getTargetToken('/* testTernaryWithFunctionCallsInThenElse */', T_CLOSE_PARENTHESIS);
 
         // Get the next non-empty token.
-        $colon = self::$phpcsFile->findNext(Tokens::$emptyTokens, ($closeParens + 1), null, true);
+        $colon = $this->phpcsFile->findNext(Tokens::$emptyTokens, ($closeParens + 1), null, true);
 
         $this->assertSame(
             T_INLINE_ELSE,
@@ -529,7 +552,7 @@
         $label = $this->getTargetToken('/* testTernaryWithFunctionCallsInThenElse */', T_PARAM_NAME, 'more');
 
         // Get the next non-empty token.
-        $colon = self::$phpcsFile->findNext(Tokens::$emptyTokens, ($label + 1), null, true);
+        $colon = $this->phpcsFile->findNext(Tokens::$emptyTokens, ($label + 1), null, true);
 
         $this->assertSame(
             ':',
@@ -559,12 +582,12 @@
      */
     public function testTernaryWithConstantsInThenElse()
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $constant = $this->getTargetToken('/* testTernaryWithConstantsInThenElse */', T_STRING, 'CONSTANT_NAME');
 
         // Get the next non-empty token.
-        $colon = self::$phpcsFile->findNext(Tokens::$emptyTokens, ($constant + 1), null, true);
+        $colon = $this->phpcsFile->findNext(Tokens::$emptyTokens, ($constant + 1), null, true);
 
         $this->assertSame(
             T_INLINE_ELSE,
@@ -589,12 +612,12 @@
      */
     public function testSwitchStatement()
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $label = $this->getTargetToken('/* testSwitchCaseWithConstant */', T_STRING, 'MY_CONSTANT');
 
         // Get the next non-empty token.
-        $colon = self::$phpcsFile->findNext(Tokens::$emptyTokens, ($label + 1), null, true);
+        $colon = $this->phpcsFile->findNext(Tokens::$emptyTokens, ($label + 1), null, true);
 
         $this->assertSame(
             T_COLON,
@@ -610,7 +633,7 @@
         $label = $this->getTargetToken('/* testSwitchCaseWithClassProperty */', T_STRING, 'property');
 
         // Get the next non-empty token.
-        $colon = self::$phpcsFile->findNext(Tokens::$emptyTokens, ($label + 1), null, true);
+        $colon = $this->phpcsFile->findNext(Tokens::$emptyTokens, ($label + 1), null, true);
 
         $this->assertSame(
             T_COLON,
@@ -626,7 +649,7 @@
         $default = $this->getTargetToken('/* testSwitchDefault */', T_DEFAULT);
 
         // Get the next non-empty token.
-        $colon = self::$phpcsFile->findNext(Tokens::$emptyTokens, ($default + 1), null, true);
+        $colon = $this->phpcsFile->findNext(Tokens::$emptyTokens, ($default + 1), null, true);
 
         $this->assertSame(
             T_COLON,
@@ -651,7 +674,7 @@
      */
     public function testParseErrorVariableLabel()
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $label = $this->getTargetToken('/* testParseErrorDynamicName */', T_VARIABLE, T_PARAM_NAME, '$variableStoringParamName');
 
@@ -667,7 +690,7 @@
         );
 
         // Get the next non-empty token.
-        $colon = self::$phpcsFile->findNext(Tokens::$emptyTokens, ($label + 1), null, true);
+        $colon = $this->phpcsFile->findNext(Tokens::$emptyTokens, ($label + 1), null, true);
 
         $this->assertSame(
             ':',
@@ -689,12 +712,77 @@
 
 
     /**
+     * Verify whether the colons are tokenized correctly when a return type is used for an inline
+     * closure/arrow function declaration in a ternary.
+     *
+     * @param string $testMarker The comment prefacing the target token.
+     *
+     * @dataProvider dataOtherColonsInTernary
+     * @covers       PHP_CodeSniffer\Tokenizers\PHP::tokenize
+     *
+     * @return void
+     */
+    public function testOtherColonsInTernary($testMarker)
+    {
+        $tokens = $this->phpcsFile->getTokens();
+
+        $startOfStatement = $this->getTargetToken($testMarker, T_VARIABLE);
+
+        // Walk the statement and check the tokenization.
+        // There should be no T_PARAM_NAME tokens.
+        // First colon should be T_COLON for the return type.
+        // Second colon should be T_INLINE_ELSE for the ternary.
+        // Third colon should be T_COLON for the return type.
+        $colonCount = 0;
+        for ($i = ($startOfStatement + 1); $tokens$i'line' === $tokens$startOfStatement'line'; $i++) {
+            $this->assertNotEquals(T_PARAM_NAME, $tokens$i'code', "Token $i is tokenized as parameter label");
+
+            if ($tokens$i'content' === ':') {
+                ++$colonCount;
+
+                if ($colonCount === 1) {
+                    $this->assertSame(T_COLON, $tokens$i'code', 'First colon is not tokenized as T_COLON');
+                } else if ($colonCount === 2) {
+                    $this->assertSame(T_INLINE_ELSE, $tokens$i'code', 'Second colon is not tokenized as T_INLINE_ELSE');
+                } else if ($colonCount === 3) {
+                    $this->assertSame(T_COLON, $tokens$i'code', 'Third colon is not tokenized as T_COLON');
+                } else {
+                    $this->fail('Unexpected colon encountered in statement');
+                }
+            }
+        }
+
+    }//end testOtherColonsInTernary()
+
+
+    /**
+     * Data provider.
+     *
+     * @see testOtherColonsInTernary()
+     *
+     * @return array<string, array<string, string>>
+     */
+    public static function dataOtherColonsInTernary()
+    {
+        return 
+            'closures with return types in ternary'        => 
+                'testMarker' => '/* testTernaryWithClosuresAndReturnTypes */',
+            ,
+            'arrow functions with return types in ternary' => 
+                'testMarker' => '/* testTernaryWithArrowFunctionsAndReturnTypes */',
+            ,
+        ;
+
+    }//end dataOtherColonsInTernary()
+
+
+    /**
      * Verify that reserved keywords used as a parameter label are tokenized as T_PARAM_NAME
      * and that the colon after it is tokenized as a T_COLON.
      *
-     * @param string $testMarker   The comment prefacing the target token.
-     * @param array  $tokenTypes   The token codes to look for.
-     * @param string $tokenContent The token content to look for.
+     * @param string            $testMarker   The comment prefacing the target token.
+     * @param array<string|int> $tokenTypes   The token codes to look for.
+     * @param string            $tokenContent The token content to look for.
      *
      * @dataProvider dataReservedKeywordsAsName
      * @covers       PHP_CodeSniffer\Tokenizers\PHP::tokenize
@@ -703,7 +791,7 @@
      */
     public function testReservedKeywordsAsName($testMarker, $tokenTypes, $tokenContent)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
         $label  = $this->getTargetToken($testMarker, $tokenTypes, $tokenContent);
 
         $this->assertSame(
@@ -718,7 +806,7 @@
         );
 
         // Get the next non-empty token.
-        $colon = self::$phpcsFile->findNext(Tokens::$emptyTokens, ($label + 1), null, true);
+        $colon = $this->phpcsFile->findNext(Tokens::$emptyTokens, ($label + 1), null, true);
 
         $this->assertSame(
             ':',
@@ -744,9 +832,9 @@
      *
      * @see testReservedKeywordsAsName()
      *
-     * @return array
+     * @return array<string, array<string|array<string|int>>>
      */
-    public function dataReservedKeywordsAsName()
+    public static function dataReservedKeywordsAsName()
     {
         $reservedKeywords = 
             // '__halt_compiler', NOT TESTABLE

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

@@ -9,16 +9,15 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
 use PHP_CodeSniffer\Util\Tokens;
 
-class NullsafeObjectOperatorTest extends AbstractMethodUnitTest
+final class NullsafeObjectOperatorTest extends AbstractTokenizerTestCase
 {
 
     /**
      * Tokens to search for.
      *
-     * @var array
+     * @var array<int|string>
      */
     protected $find = 
         T_NULLSAFE_OBJECT_OPERATOR,
@@ -36,7 +35,7 @@
      */
     public function testObjectOperator()
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $operator = $this->getTargetToken('/* testObjectOperator */', $this->find);
         $this->assertSame(T_OBJECT_OPERATOR, $tokens$operator'code', 'Failed asserting code is object operator');
@@ -57,7 +56,7 @@
      */
     public function testNullsafeObjectOperator($testMarker)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $operator = $this->getTargetToken($testMarker, $this->find);
         $this->assertSame(T_NULLSAFE_OBJECT_OPERATOR, $tokens$operator'code', 'Failed asserting code is nullsafe object operator');
@@ -71,13 +70,13 @@
      *
      * @see testNullsafeObjectOperator()
      *
-     * @return array
+     * @return array<string, array<string>>
      */
-    public function dataNullsafeObjectOperator()
+    public static function dataNullsafeObjectOperator()
     {
         return 
-            '/* testNullsafeObjectOperator */',
-            '/* testNullsafeObjectOperatorWriteContext */',
+            'nullsafe operator'                         => '/* testNullsafeObjectOperator */',
+            'illegal nullsafe operator (write context)' => '/* testNullsafeObjectOperatorWriteContext */',
         ;
 
     }//end dataNullsafeObjectOperator()
@@ -97,14 +96,14 @@
      */
     public function testTernaryThen($testMarker, $testObjectOperator=false)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $operator = $this->getTargetToken($testMarker, $this->find);
         $this->assertSame(T_INLINE_THEN, $tokens$operator'code', 'Failed asserting code is inline then');
         $this->assertSame('T_INLINE_THEN', $tokens$operator'type', 'Failed asserting type is inline then');
 
         if ($testObjectOperator === true) {
-            $next = self::$phpcsFile->findNext(Tokens::$emptyTokens, ($operator + 1), null, true);
+            $next = $this->phpcsFile->findNext(Tokens::$emptyTokens, ($operator + 1), null, true);
             $this->assertSame(T_OBJECT_OPERATOR, $tokens$next'code', 'Failed asserting code is object operator');
             $this->assertSame('T_OBJECT_OPERATOR', $tokens$next'type', 'Failed asserting type is object operator');
         }
@@ -117,21 +116,25 @@
      *
      * @see testTernaryThen()
      *
-     * @return array
+     * @return array<string, array<string, string|bool>>
      */
-    public function dataTernaryThen()
+    public static function dataTernaryThen()
     {
         return 
-            '/* testTernaryThen */',
-            
-                '/* testParseErrorWhitespaceNotAllowed */',
-                true,
+            'ternary then'                                         => 
+                'testMarker' => '/* testTernaryThen */',
             ,
-            
-                '/* testParseErrorCommentNotAllowed */',
-                true,
+            'whitespace between question mark and object operator' => 
+                'testMarker'         => '/* testParseErrorWhitespaceNotAllowed */',
+                'testObjectOperator' => true,
+            ,
+            'comment between question mark and object operator'    => 
+                'testMarker'         => '/* testParseErrorCommentNotAllowed */',
+                'testObjectOperator' => true,
+            ,
+            'parse error/live coding'                              => 
+                'testMarker' => '/* testLiveCoding */',
             ,
-            '/* testLiveCoding */',
         ;
 
     }//end dataTernaryThen()

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

@@ -0,0 +1,67 @@
+<?php
+
+class OtherContextSensitiveKeywords
+{
+    const /* testParent */ PARENT = 'PARENT';
+    const /* testSelf */ SELF = 'SELF';
+
+    const /* testFalse */ FALSE = 'FALSE',
+    const /* testTrue */ TRUE = 'TRUE',
+    const /* testNull */ NULL = 'NULL',
+}
+
+abstract class SomeClass
+{
+    final function someFunction(
+        /* testSelfIsKeyword */
+        self $self,
+        /* testParentIsKeyword */
+        parent $parent
+    ) {
+        return $this;
+    }
+}
+
+$instantiated1 = new /* testClassInstantiationParentIsKeyword */ parent();
+$instantiated2 = new /* testClassInstantiationSelfIsKeyword */ SELF;
+
+function /* testKeywordSelfAfterFunctionByRefShouldBeString */ &self() {}
+function /* testKeywordParentAfterFunctionByRefShouldBeString */ &parent() {}
+function /* testKeywordFalseAfterFunctionByRefShouldBeString */ &false() {}
+function /* testKeywordTrueAfterFunctionByRefShouldBeString */ & true () {}
+function /* testKeywordNullAfterFunctionByRefShouldBeString */ &NULL() {}
+
+/* testKeywordAsFunctionCallNameShouldBeStringSelf */ self();
+/* testKeywordAsFunctionCallNameShouldBeStringParent */ parent();
+/* testKeywordAsFunctionCallNameShouldBeStringFalse */ false();
+/* testKeywordAsFunctionCallNameShouldBeStringTrue */ True ();
+/* testKeywordAsFunctionCallNameShouldBeStringNull */ null /*comment*/ ();
+
+$instantiated4 = new /* testClassInstantiationFalseIsString */ False();
+$instantiated5 = new /* testClassInstantiationTrueIsString */ true ();
+$instantiated6 = new /* testClassInstantiationNullIsString */ null();
+
+function standAloneFalseTrueNullTypesAndMore(
+    /* testFalseIsKeywordAsParamType */ false $paramA,
+    /* testTrueIsKeywordAsParamType */ true $paramB,
+    /* testNullIsKeywordAsParamType */ null $paramC,
+) /* testFalseIsKeywordAsReturnType */ false | /* testTrueIsKeywordAsReturnType */ true | /* testNullIsKeywordAsReturnType */ null {
+    if ($a === /* testFalseIsKeywordInComparison */ false
+    || $a === /* testTrueIsKeywordInComparison */ true
+    || $a === /* testNullIsKeywordInComparison */ null
+    ) {}
+}
+
+class TypedConstProp {
+    const /* testFalseIsKeywordAsConstType */ false /* testFalseIsNameForTypedConstant */ FALSE = /* testFalseIsKeywordAsConstDefault */ false;
+    const /* testTrueIsKeywordAsConstType */ true /* testTrueIsNameForTypedConstant */ TRUE = /* testTrueIsKeywordAsConstDefault */ true;
+    const /* testNullIsKeywordAsConstType */ null /* testNullIsNameForTypedConstant */ NULL = /* testNullIsKeywordAsConstDefault */ null;
+    const /* testSelfIsKeywordAsConstType */ self /* testSelfIsNameForTypedConstant */ SELF = new /* testSelfIsKeywordAsConstDefault */ self;
+    const /* testParentIsKeywordAsConstType */ parent /* testParentIsNameForTypedConstant */ PARENT = new /* testParentIsKeywordAsConstDefault */ parent;
+
+    public /* testFalseIsKeywordAsPropertyType */ false $false = /* testFalseIsKeywordAsPropertyDefault */ false;
+    protected readonly /* testTrueIsKeywordAsPropertyType */ true $true = /* testTrueIsKeywordAsPropertyDefault */ true;
+    static private /* testNullIsKeywordAsPropertyType */ null $null = /* testNullIsKeywordAsPropertyDefault */ null;
+    var /* testSelfIsKeywordAsPropertyType */ self $self = new /* testSelfIsKeywordAsPropertyDefault */ self;
+    protected /* testParentIsKeywordAsPropertyType */ parent $parent = new /* testParentIsKeywordAsPropertyDefault */ parent;
+}

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

@@ -0,0 +1,283 @@
+<?php
+/**
+ * Tests the conversion of PHPCS native context sensitive keyword tokens to T_STRING.
+ *
+ * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
+ * @copyright 2020 Squiz Pty Ltd (ABN 77 084 670 600)
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
+
+/**
+ * Tests the conversion of PHPCS native context sensitive keyword tokens to T_STRING.
+ *
+ * @covers PHP_CodeSniffer\Tokenizers\PHP::tokenize
+ * @covers PHP_CodeSniffer\Tokenizers\PHP::standardiseToken
+ */
+final class OtherContextSensitiveKeywordsTest extends AbstractTokenizerTestCase
+{
+
+
+    /**
+     * Clear the "resolved tokens" cache before running this test as otherwise the code
+     * under test may not be run during the test.
+     *
+     * @beforeClass
+     *
+     * @return void
+     */
+    public static function clearTokenCache()
+    {
+        parent::clearResolvedTokensCache();
+
+    }//end clearTokenCache()
+
+
+    /**
+     * Test that context sensitive keyword is tokenized as string when it should be string.
+     *
+     * @param string $testMarker The comment which prefaces the target token in the test file.
+     *
+     * @dataProvider dataStrings
+     *
+     * @return void
+     */
+    public function testStrings($testMarker)
+    {
+        $tokens     = $this->phpcsFile->getTokens();
+        $target     = $this->getTargetToken($testMarker, T_STRING, T_NULL, T_FALSE, T_TRUE, T_PARENT, T_SELF);
+        $tokenArray = $tokens$target;
+
+        $this->assertSame(T_STRING, $tokenArray'code', 'Token tokenized as '.$tokenArray'type'.', not T_STRING (code)');
+        $this->assertSame('T_STRING', $tokenArray'type', 'Token tokenized as '.$tokenArray'type'.', not T_STRING (type)');
+
+    }//end testStrings()
+
+
+    /**
+     * Data provider.
+     *
+     * @see testStrings()
+     *
+     * @return array<string, array<string>>
+     */
+    public static function dataStrings()
+    {
+        return 
+            'constant declaration: parent'                                      => '/* testParent */',
+            'constant declaration: self'                                        => '/* testSelf */',
+            'constant declaration: false'                                       => '/* testFalse */',
+            'constant declaration: true'                                        => '/* testTrue */',
+            'constant declaration: null'                                        => '/* testNull */',
+
+            'function declaration with return by ref: self'                     => '/* testKeywordSelfAfterFunctionByRefShouldBeString */',
+            'function declaration with return by ref: parent'                   => '/* testKeywordParentAfterFunctionByRefShouldBeString */',
+            'function declaration with return by ref: false'                    => '/* testKeywordFalseAfterFunctionByRefShouldBeString */',
+            'function declaration with return by ref: true'                     => '/* testKeywordTrueAfterFunctionByRefShouldBeString */',
+            'function declaration with return by ref: null'                     => '/* testKeywordNullAfterFunctionByRefShouldBeString */',
+
+            'function call: self'                                               => '/* testKeywordAsFunctionCallNameShouldBeStringSelf */',
+            'function call: parent'                                             => '/* testKeywordAsFunctionCallNameShouldBeStringParent */',
+            'function call: false'                                              => '/* testKeywordAsFunctionCallNameShouldBeStringFalse */',
+            'function call: true'                                               => '/* testKeywordAsFunctionCallNameShouldBeStringTrue */',
+            'function call: null; with comment between keyword and parentheses' => '/* testKeywordAsFunctionCallNameShouldBeStringNull */',
+
+            'class instantiation: false'                                        => '/* testClassInstantiationFalseIsString */',
+            'class instantiation: true'                                         => '/* testClassInstantiationTrueIsString */',
+            'class instantiation: null'                                         => '/* testClassInstantiationNullIsString */',
+
+            'constant declaration: false as name after type'                    => '/* testFalseIsNameForTypedConstant */',
+            'constant declaration: true as name after type'                     => '/* testTrueIsNameForTypedConstant */',
+            'constant declaration: null as name after type'                     => '/* testNullIsNameForTypedConstant */',
+            'constant declaration: self as name after type'                     => '/* testSelfIsNameForTypedConstant */',
+            'constant declaration: parent as name after type'                   => '/* testParentIsNameForTypedConstant */',
+        ;
+
+    }//end dataStrings()
+
+
+    /**
+     * Test that context sensitive keyword is tokenized as keyword when it should be keyword.
+     *
+     * @param string $testMarker        The comment which prefaces the target token in the test file.
+     * @param string $expectedTokenType The expected token type.
+     *
+     * @dataProvider dataKeywords
+     *
+     * @return void
+     */
+    public function testKeywords($testMarker, $expectedTokenType)
+    {
+        $tokens     = $this->phpcsFile->getTokens();
+        $target     = $this->getTargetToken($testMarker, T_STRING, T_NULL, T_FALSE, T_TRUE, T_PARENT, T_SELF);
+        $tokenArray = $tokens$target;
+
+        $this->assertSame(
+            constant($expectedTokenType),
+            $tokenArray'code',
+            'Token tokenized as '.$tokenArray'type'.', not '.$expectedTokenType.' (code)'
+        );
+        $this->assertSame(
+            $expectedTokenType,
+            $tokenArray'type',
+            'Token tokenized as '.$tokenArray'type'.', not '.$expectedTokenType.' (type)'
+        );
+
+    }//end testKeywords()
+
+
+    /**
+     * Data provider.
+     *
+     * @see testKeywords()
+     *
+     * @return array
+     */
+    public static function dataKeywords()
+    {
+        return 
+            'self: param type declaration'            => 
+                'testMarker'        => '/* testSelfIsKeyword */',
+                'expectedTokenType' => 'T_SELF',
+            ,
+            'parent: param type declaration'          => 
+                'testMarker'        => '/* testParentIsKeyword */',
+                'expectedTokenType' => 'T_PARENT',
+            ,
+
+            'parent: class instantiation'             => 
+                'testMarker'        => '/* testClassInstantiationParentIsKeyword */',
+                'expectedTokenType' => 'T_PARENT',
+            ,
+            'self: class instantiation'               => 
+                'testMarker'        => '/* testClassInstantiationSelfIsKeyword */',
+                'expectedTokenType' => 'T_SELF',
+            ,
+
+            'false: param type declaration'           => 
+                'testMarker'        => '/* testFalseIsKeywordAsParamType */',
+                'expectedTokenType' => 'T_FALSE',
+            ,
+            'true: param type declaration'            => 
+                'testMarker'        => '/* testTrueIsKeywordAsParamType */',
+                'expectedTokenType' => 'T_TRUE',
+            ,
+            'null: param type declaration'            => 
+                'testMarker'        => '/* testNullIsKeywordAsParamType */',
+                'expectedTokenType' => 'T_NULL',
+            ,
+            'false: return type declaration in union' => 
+                'testMarker'        => '/* testFalseIsKeywordAsReturnType */',
+                'expectedTokenType' => 'T_FALSE',
+            ,
+            'true: return type declaration in union'  => 
+                'testMarker'        => '/* testTrueIsKeywordAsReturnType */',
+                'expectedTokenType' => 'T_TRUE',
+            ,
+            'null: return type declaration in union'  => 
+                'testMarker'        => '/* testNullIsKeywordAsReturnType */',
+                'expectedTokenType' => 'T_NULL',
+            ,
+            'false: in comparison'                    => 
+                'testMarker'        => '/* testFalseIsKeywordInComparison */',
+                'expectedTokenType' => 'T_FALSE',
+            ,
+            'true: in comparison'                     => 
+                'testMarker'        => '/* testTrueIsKeywordInComparison */',
+                'expectedTokenType' => 'T_TRUE',
+            ,
+            'null: in comparison'                     => 
+                'testMarker'        => '/* testNullIsKeywordInComparison */',
+                'expectedTokenType' => 'T_NULL',
+            ,
+
+            'false: type in OO constant declaration'  => 
+                'testMarker'        => '/* testFalseIsKeywordAsConstType */',
+                'expectedTokenType' => 'T_FALSE',
+            ,
+            'true: type in OO constant declaration'   => 
+                'testMarker'        => '/* testTrueIsKeywordAsConstType */',
+                'expectedTokenType' => 'T_TRUE',
+            ,
+            'null: type in OO constant declaration'   => 
+                'testMarker'        => '/* testNullIsKeywordAsConstType */',
+                'expectedTokenType' => 'T_NULL',
+            ,
+            'self: type in OO constant declaration'   => 
+                'testMarker'        => '/* testSelfIsKeywordAsConstType */',
+                'expectedTokenType' => 'T_SELF',
+            ,
+            'parent: type in OO constant declaration' => 
+                'testMarker'        => '/* testParentIsKeywordAsConstType */',
+                'expectedTokenType' => 'T_PARENT',
+            ,
+
+            'false: value in constant declaration'    => 
+                'testMarker'        => '/* testFalseIsKeywordAsConstDefault */',
+                'expectedTokenType' => 'T_FALSE',
+            ,
+            'true: value in constant declaration'     => 
+                'testMarker'        => '/* testTrueIsKeywordAsConstDefault */',
+                'expectedTokenType' => 'T_TRUE',
+            ,
+            'null: value in constant declaration'     => 
+                'testMarker'        => '/* testNullIsKeywordAsConstDefault */',
+                'expectedTokenType' => 'T_NULL',
+            ,
+            'self: value in constant declaration'     => 
+                'testMarker'        => '/* testSelfIsKeywordAsConstDefault */',
+                'expectedTokenType' => 'T_SELF',
+            ,
+            'parent: value in constant declaration'   => 
+                'testMarker'        => '/* testParentIsKeywordAsConstDefault */',
+                'expectedTokenType' => 'T_PARENT',
+            ,
+
+            'false: type in property declaration'     => 
+                'testMarker'        => '/* testFalseIsKeywordAsPropertyType */',
+                'expectedTokenType' => 'T_FALSE',
+            ,
+            'true: type in property declaration'      => 
+                'testMarker'        => '/* testTrueIsKeywordAsPropertyType */',
+                'expectedTokenType' => 'T_TRUE',
+            ,
+            'null: type in property declaration'      => 
+                'testMarker'        => '/* testNullIsKeywordAsPropertyType */',
+                'expectedTokenType' => 'T_NULL',
+            ,
+            'self: type in property declaration'      => 
+                'testMarker'        => '/* testSelfIsKeywordAsPropertyType */',
+                'expectedTokenType' => 'T_SELF',
+            ,
+            'parent: type in property declaration'    => 
+                'testMarker'        => '/* testParentIsKeywordAsPropertyType */',
+                'expectedTokenType' => 'T_PARENT',
+            ,
+
+            'false: value in property declaration'    => 
+                'testMarker'        => '/* testFalseIsKeywordAsPropertyDefault */',
+                'expectedTokenType' => 'T_FALSE',
+            ,
+            'true: value in property declaration'     => 
+                'testMarker'        => '/* testTrueIsKeywordAsPropertyDefault */',
+                'expectedTokenType' => 'T_TRUE',
+            ,
+            'null: value in property declaration'     => 
+                'testMarker'        => '/* testNullIsKeywordAsPropertyDefault */',
+                'expectedTokenType' => 'T_NULL',
+            ,
+            'self: value in property declaration'     => 
+                'testMarker'        => '/* testSelfIsKeywordAsPropertyDefault */',
+                'expectedTokenType' => 'T_SELF',
+            ,
+            'parent: value in property declaration'   => 
+                'testMarker'        => '/* testParentIsKeywordAsPropertyDefault */',
+                'expectedTokenType' => 'T_PARENT',
+            ,
+        ;
+
+    }//end dataKeywords()
+
+
+}//end class

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

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

@@ -0,0 +1,432 @@
+<?php
+/**
+ * Tests that simple tokens are assigned the correct token type and code.
+ *
+ * @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;
+
+use PHP_CodeSniffer\Util\Tokens;
+
+/**
+ * Tests that simple tokens are assigned the correct token type and code.
+ *
+ * @covers PHP_CodeSniffer\Tokenizers\PHP::resolveSimpleToken
+ */
+final class ResolveSimpleTokenTest extends AbstractTokenizerTestCase
+{
+
+
+    /**
+     * Clear the "resolved tokens" cache before running this test as otherwise the code
+     * under test may not be run during the test.
+     *
+     * @beforeClass
+     *
+     * @return void
+     */
+    public static function clearTokenCache()
+    {
+        parent::clearResolvedTokensCache();
+
+    }//end clearTokenCache()
+
+
+    /**
+     * Verify tokenization of parentheses, square brackets, curly brackets and a switch colon.
+     *
+     * @return void
+     */
+    public function testBracesAndColon()
+    {
+        $expectedSequence = 
+            T_OPEN_PARENTHESIS,
+            T_VARIABLE,
+            T_OPEN_SQUARE_BRACKET,
+            T_LNUMBER,
+            T_CLOSE_SQUARE_BRACKET,
+            T_CLOSE_PARENTHESIS,
+            T_OPEN_CURLY_BRACKET,
+            T_CASE,
+            T_STRING,
+            T_COLON,
+            T_BREAK,
+            T_SEMICOLON,
+            T_CLOSE_CURLY_BRACKET,
+        ;
+
+        $target = $this->getTargetToken('/* '.__FUNCTION__.' */', T_SWITCH);
+
+        $this->checkTokenSequence(($target + 1), $expectedSequence);
+
+    }//end testBracesAndColon()
+
+
+    /**
+     * Verify tokenization of colon after named parameter.
+     *
+     * @return void
+     */
+    public function testNamedParamColon()
+    {
+        $expectedSequence = 
+            T_OPEN_PARENTHESIS,
+            T_PARAM_NAME,
+            T_COLON,
+            T_VARIABLE,
+            T_CLOSE_PARENTHESIS,
+            T_SEMICOLON,
+        ;
+
+        $target = $this->getTargetToken('/* '.__FUNCTION__.' */', T_STRING);
+
+        $this->checkTokenSequence(($target + 1), $expectedSequence);
+
+    }//end testNamedParamColon()
+
+
+    /**
+     * Verify tokenization of colon for a return type.
+     *
+     * @return void
+     */
+    public function testReturnTypeColon()
+    {
+        $expectedSequence = 
+            T_EQUAL,
+            T_CLOSURE,
+            T_OPEN_PARENTHESIS,
+            T_CLOSE_PARENTHESIS,
+            T_COLON,
+            T_STRING,
+            T_OPEN_CURLY_BRACKET,
+            T_CLOSE_CURLY_BRACKET,
+            T_SEMICOLON,
+        ;
+
+        $target = $this->getTargetToken('/* '.__FUNCTION__.' */', T_VARIABLE);
+
+        $this->checkTokenSequence(($target + 1), $expectedSequence);
+
+    }//end testReturnTypeColon()
+
+
+    /**
+     * Verify tokenization of a concatenation operator.
+     *
+     * @return void
+     */
+    public function testConcat()
+    {
+        $expectedSequence = 
+            T_STRING_CONCAT,
+            T_VARIABLE,
+            T_SEMICOLON,
+        ;
+
+        $target = $this->getTargetToken('/* '.__FUNCTION__.' */', T_CONSTANT_ENCAPSED_STRING);
+
+        $this->checkTokenSequence(($target + 1), $expectedSequence);
+
+    }//end testConcat()
+
+
+    /**
+     * Verify tokenization of simple math operators.
+     *
+     * @return void
+     */
+    public function testSimpleMathTokens()
+    {
+        $expectedSequence = 
+            T_EQUAL,
+            T_LNUMBER,
+            T_MULTIPLY,
+            T_LNUMBER,
+            T_DIVIDE,
+            T_LNUMBER,
+            T_PLUS,
+            T_LNUMBER,
+            T_MINUS,
+            T_LNUMBER,
+            T_MODULUS,
+            T_LNUMBER,
+            T_SEMICOLON,
+        ;
+
+        $target = $this->getTargetToken('/* '.__FUNCTION__.' */', T_VARIABLE);
+
+        $this->checkTokenSequence(($target + 1), $expectedSequence);
+
+    }//end testSimpleMathTokens()
+
+
+    /**
+     * Verify tokenization of unary plus/minus operators.
+     *
+     * @return void
+     */
+    public function testUnaryPlusMinus()
+    {
+        $expectedSequence = 
+            T_EQUAL,
+            T_PLUS,
+            T_LNUMBER,
+            T_DIVIDE,
+            T_MINUS,
+            T_LNUMBER,
+            T_SEMICOLON,
+        ;
+
+        $target = $this->getTargetToken('/* '.__FUNCTION__.' */', T_VARIABLE);
+
+        $this->checkTokenSequence(($target + 1), $expectedSequence);
+
+    }//end testUnaryPlusMinus()
+
+
+    /**
+     * Verify tokenization of bitwise operator tokens.
+     *
+     * @return void
+     */
+    public function testBitwiseTokens()
+    {
+        $expectedSequence = 
+            T_EQUAL,
+            T_STRING,
+            T_BITWISE_XOR,
+            T_STRING,
+            T_BITWISE_AND,
+            T_STRING,
+            T_BITWISE_OR,
+            T_STRING,
+            T_BITWISE_NOT,
+            T_STRING,
+            T_SEMICOLON,
+        ;
+
+        $target = $this->getTargetToken('/* '.__FUNCTION__.' */', T_VARIABLE);
+
+        $this->checkTokenSequence(($target + 1), $expectedSequence);
+
+    }//end testBitwiseTokens()
+
+
+    /**
+     * Verify tokenization of bitwise operator tokens.
+     *
+     * @return void
+     */
+    public function testBitwiseOrInCatch()
+    {
+        $expectedSequence = 
+            T_OPEN_PARENTHESIS,
+            T_STRING,
+            T_BITWISE_OR,
+            T_STRING,
+            T_VARIABLE,
+            T_CLOSE_PARENTHESIS,
+            T_OPEN_CURLY_BRACKET,
+            T_CLOSE_CURLY_BRACKET,
+        ;
+
+        $target = $this->getTargetToken('/* '.__FUNCTION__.' */', T_CATCH);
+
+        $this->checkTokenSequence(($target + 1), $expectedSequence);
+
+    }//end testBitwiseOrInCatch()
+
+
+    /**
+     * Verify tokenization of a less than operator.
+     *
+     * @return void
+     */
+    public function testLessThan()
+    {
+        $expectedSequence = 
+            T_LESS_THAN,
+            T_VARIABLE,
+            T_SEMICOLON,
+        ;
+
+        $target = $this->getTargetToken('/* '.__FUNCTION__.' */', T_LNUMBER);
+
+        $this->checkTokenSequence(($target + 1), $expectedSequence);
+
+    }//end testLessThan()
+
+
+    /**
+     * Verify tokenization of a greater than operator.
+     *
+     * @return void
+     */
+    public function testGreaterThan()
+    {
+        $expectedSequence = 
+            T_GREATER_THAN,
+            T_VARIABLE,
+            T_SEMICOLON,
+        ;
+
+        $target = $this->getTargetToken('/* '.__FUNCTION__.' */', T_LNUMBER);
+
+        $this->checkTokenSequence(($target + 1), $expectedSequence);
+
+    }//end testGreaterThan()
+
+
+    /**
+     * Verify tokenization of a boolean not operator.
+     *
+     * @return void
+     */
+    public function testBooleanNot()
+    {
+        $expectedSequence = 
+            T_BOOLEAN_NOT,
+            T_VARIABLE,
+            T_SEMICOLON,
+        ;
+
+        $target = $this->getTargetToken('/* '.__FUNCTION__.' */', T_EQUAL);
+
+        $this->checkTokenSequence(($target + 1), $expectedSequence);
+
+    }//end testBooleanNot()
+
+
+    /**
+     * Verify tokenization of commas.
+     *
+     * @return void
+     */
+    public function testComma()
+    {
+        $expectedSequence = 
+            T_COMMA,
+            T_VARIABLE,
+            T_COMMA,
+            T_VARIABLE,
+            T_SEMICOLON,
+        ;
+
+        $target = $this->getTargetToken('/* '.__FUNCTION__.' */', T_VARIABLE);
+
+        $this->checkTokenSequence(($target + 1), $expectedSequence);
+
+    }//end testComma()
+
+
+    /**
+     * Verify tokenization of the silence operator.
+     *
+     * @return void
+     */
+    public function testAsperand()
+    {
+        $expectedSequence = 
+            T_ASPERAND,
+            T_STRING,
+            T_OPEN_PARENTHESIS,
+            T_CLOSE_PARENTHESIS,
+            T_SEMICOLON,
+        ;
+
+        $target = $this->getTargetToken('/* '.__FUNCTION__.' */', T_EQUAL);
+
+        $this->checkTokenSequence(($target + 1), $expectedSequence);
+
+    }//end testAsperand()
+
+
+    /**
+     * Verify tokenization of the dollar token and curlies for a variable variable.
+     *
+     * @return void
+     */
+    public function testDollarAndCurlies()
+    {
+        $expectedSequence = 
+            T_DOLLAR,
+            T_OPEN_CURLY_BRACKET,
+            T_VARIABLE,
+            T_CLOSE_CURLY_BRACKET,
+            T_SEMICOLON,
+        ;
+
+        $target = $this->getTargetToken('/* '.__FUNCTION__.' */', T_ECHO);
+
+        $this->checkTokenSequence(($target + 1), $expectedSequence);
+
+    }//end testDollarAndCurlies()
+
+
+    /**
+     * Verify tokenization of the backtick operator.
+     *
+     * @return void
+     */
+    public function testBacktick()
+    {
+        $expectedSequence = 
+            T_BACKTICK,
+            T_ENCAPSED_AND_WHITESPACE,
+            T_BACKTICK,
+            T_SEMICOLON,
+        ;
+
+        $target = $this->getTargetToken('/* '.__FUNCTION__.' */', T_EQUAL);
+
+        $this->checkTokenSequence(($target + 1), $expectedSequence);
+
+    }//end testBacktick()
+
+
+    /**
+     * 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<int|string> $expectedSequence The consecutive token constants 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++) {
+            if (isset(Tokens::$emptyTokens$tokens$i'code') === true) {
+                // Ignore whitespace and comments, not interested in the tokenization of those for these tests.
+                continue;
+            }
+
+            $expectedTokenName = Tokens::tokenName($expectedSequence$sequenceKey);
+
+            $this->assertSame(
+                $expectedSequence$sequenceKey,
+                $tokens$i'code',
+                'Token tokenized as '.Tokens::tokenName($tokens$i'code').', not '.$expectedTokenName.' (code)'
+            );
+
+            $this->assertSame(
+                $expectedTokenName,
+                $tokens$i'type',
+                'Token tokenized as '.$tokens$i'type'.', not '.$expectedTokenName.' (type)'
+            );
+
+            ++$sequenceKey;
+        }//end for
+
+    }//end checkTokenSequence()
+
+
+}//end class

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

@@ -1,6 +1,6 @@
 <?php
 /**
- * Tests the adding of the "bracket_opener/closer" keys to use group tokens.
+ * Tests the scope opener/closers are set correctly when the namespace keyword is used as an operator.
  *
  * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
  * @copyright 2020 Squiz Pty Ltd (ABN 77 084 670 600)
@@ -9,19 +9,17 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
-
-class ScopeSettingWithNamespaceOperatorTest extends AbstractMethodUnitTest
+final class ScopeSettingWithNamespaceOperatorTest extends AbstractTokenizerTestCase
 {
 
 
     /**
      * Test that the scope opener/closers are set correctly when the namespace keyword is encountered as an operator.
      *
-     * @param string       $testMarker The comment which prefaces the target tokens in the test file.
-     * @param int|string $tokenTypes The token type to search for.
-     * @param int|string $open       Optional. The token type for the scope opener.
-     * @param int|string $close      Optional. The token type for the scope closer.
+     * @param string            $testMarker The comment which prefaces the target tokens in the test file.
+     * @param array<int|string> $tokenTypes The token type to search for.
+     * @param array<int|string> $open       Optional. The token type for the scope opener.
+     * @param array<int|string> $close      Optional. The token type for the scope closer.
      *
      * @dataProvider dataScopeSetting
      * @covers       PHP_CodeSniffer\Tokenizers\Tokenizer::recurseScopeMap
@@ -30,7 +28,7 @@
      */
     public function testScopeSetting($testMarker, $tokenTypes, $open=T_OPEN_CURLY_BRACKET, $close=T_CLOSE_CURLY_BRACKET)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens = $this->phpcsFile->getTokens();
 
         $target = $this->getTargetToken($testMarker, $tokenTypes);
         $opener = $this->getTargetToken($testMarker, $open);
@@ -59,36 +57,36 @@
      *
      * @see testScopeSetting()
      *
-     * @return array
+     * @return array<string, array<string, string|array<int|string>>>
      */
-    public function dataScopeSetting()
+    public static function dataScopeSetting()
     {
         return 
-            
-                '/* testClassExtends */',
-                T_CLASS,
+            'class which extends namespace relative name'           => 
+                'testMarker' => '/* testClassExtends */',
+                'tokenTypes' => T_CLASS,
             ,
-            
-                '/* testClassImplements */',
-                T_ANON_CLASS,
+            'class which implements namespace relative name'        => 
+                'testMarker' => '/* testClassImplements */',
+                'tokenTypes' => T_ANON_CLASS,
             ,
-            
-                '/* testInterfaceExtends */',
-                T_INTERFACE,
+            'interface which extend namespace relative name'        => 
+                'testMarker' => '/* testInterfaceExtends */',
+                'tokenTypes' => T_INTERFACE,
             ,
-            
-                '/* testFunctionReturnType */',
-                T_FUNCTION,
+            'namespace relative name in function return type'       => 
+                'testMarker' => '/* testFunctionReturnType */',
+                'tokenTypes' => T_FUNCTION,
             ,
-            
-                '/* testClosureReturnType */',
-                T_CLOSURE,
+            'namespace relative name in closure return type'        => 
+                'testMarker' => '/* testClosureReturnType */',
+                'tokenTypes' => T_CLOSURE,
             ,
-            
-                '/* testArrowFunctionReturnType */',
-                T_FN,
-                T_FN_ARROW,
-                T_SEMICOLON,
+            'namespace relative name in arrow function return type' => 
+                'testMarker' => '/* testArrowFunctionReturnType */',
+                'tokenTypes' => T_FN,
+                'open'       => T_FN_ARROW,
+                'close'      => T_SEMICOLON,
             ,
         ;

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

@@ -9,9 +9,7 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
-
-class ShortArrayTest extends AbstractMethodUnitTest
+final class ShortArrayTest extends AbstractTokenizerTestCase
 {
 
 
@@ -27,16 +25,19 @@
      */
     public function testSquareBrackets($testMarker)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens     = $this->phpcsFile->getTokens();
+        $opener     = $this->getTargetToken($testMarker, T_OPEN_SQUARE_BRACKET, T_OPEN_SHORT_ARRAY);
+        $tokenArray = $tokens$opener;
 
-        $opener = $this->getTargetToken($testMarker, T_OPEN_SQUARE_BRACKET, T_OPEN_SHORT_ARRAY);
-        $this->assertSame(T_OPEN_SQUARE_BRACKET, $tokens$opener'code');
-        $this->assertSame('T_OPEN_SQUARE_BRACKET', $tokens$opener'type');
+        $this->assertSame(T_OPEN_SQUARE_BRACKET, $tokenArray'code', 'Token tokenized as '.$tokenArray'type'.', not T_OPEN_SQUARE_BRACKET (code)');
+        $this->assertSame('T_OPEN_SQUARE_BRACKET', $tokenArray'type', 'Token tokenized as '.$tokenArray'type'.', not T_OPEN_SQUARE_BRACKET (type)');
 
         if (isset($tokens$opener'bracket_closer') === true) {
-            $closer = $tokens$opener'bracket_closer';
-            $this->assertSame(T_CLOSE_SQUARE_BRACKET, $tokens$closer'code');
-            $this->assertSame('T_CLOSE_SQUARE_BRACKET', $tokens$closer'type');
+            $closer     = $tokens$opener'bracket_closer';
+            $tokenArray = $tokens$closer;
+
+            $this->assertSame(T_CLOSE_SQUARE_BRACKET, $tokenArray'code', 'Token tokenized as '.$tokenArray'type'.', not T_CLOSE_SQUARE_BRACKET (code)');
+            $this->assertSame('T_CLOSE_SQUARE_BRACKET', $tokenArray'type', 'Token tokenized as '.$tokenArray'type'.', not T_CLOSE_SQUARE_BRACKET (type)');
         }
 
     }//end testSquareBrackets()
@@ -47,9 +48,9 @@
      *
      * @see testSquareBrackets()
      *
-     * @return array
+     * @return array<string, array<string>>
      */
-    public function dataSquareBrackets()
+    public static function dataSquareBrackets()
     {
         return 
             'array access 1'                                => '/* testArrayAccess1 */',
@@ -92,16 +93,19 @@
      */
     public function testShortArrays($testMarker)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens     = $this->phpcsFile->getTokens();
+        $opener     = $this->getTargetToken($testMarker, T_OPEN_SQUARE_BRACKET, T_OPEN_SHORT_ARRAY);
+        $tokenArray = $tokens$opener;
 
-        $opener = $this->getTargetToken($testMarker, T_OPEN_SQUARE_BRACKET, T_OPEN_SHORT_ARRAY);
-        $this->assertSame(T_OPEN_SHORT_ARRAY, $tokens$opener'code');
-        $this->assertSame('T_OPEN_SHORT_ARRAY', $tokens$opener'type');
+        $this->assertSame(T_OPEN_SHORT_ARRAY, $tokenArray'code', 'Token tokenized as '.$tokenArray'type'.', not T_OPEN_SHORT_ARRAY (code)');
+        $this->assertSame('T_OPEN_SHORT_ARRAY', $tokenArray'type', 'Token tokenized as '.$tokenArray'type'.', not T_OPEN_SHORT_ARRAY (type)');
 
         if (isset($tokens$opener'bracket_closer') === true) {
-            $closer = $tokens$opener'bracket_closer';
-            $this->assertSame(T_CLOSE_SHORT_ARRAY, $tokens$closer'code');
-            $this->assertSame('T_CLOSE_SHORT_ARRAY', $tokens$closer'type');
+            $closer     = $tokens$opener'bracket_closer';
+            $tokenArray = $tokens$closer;
+
+            $this->assertSame(T_CLOSE_SHORT_ARRAY, $tokenArray'code', 'Token tokenized as '.$tokenArray'type'.', not T_CLOSE_SHORT_ARRAY (code)');
+            $this->assertSame('T_CLOSE_SHORT_ARRAY', $tokenArray'type', 'Token tokenized as '.$tokenArray'type'.', not T_CLOSE_SHORT_ARRAY (type)');
         }
 
     }//end testShortArrays()
@@ -112,9 +116,9 @@
      *
      * @see testShortArrays()
      *
-     * @return array
+     * @return array<string, array<string>>
      */
-    public function dataShortArrays()
+    public static function dataShortArrays()
     {
         return 
             'short array empty'                              => '/* testShortArrayDeclarationEmpty */',

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

@@ -15,18 +15,17 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
 use PHP_CodeSniffer\Util\Tokens;
 
-class StableCommentWhitespaceTest extends AbstractMethodUnitTest
+final class StableCommentWhitespaceTest extends AbstractTokenizerTestCase
 {
 
 
     /**
      * Test that comment tokenization with new lines at the end of the comment is stable.
      *
-     * @param string $testMarker     The comment prefacing the test.
-     * @param array  $expectedTokens The tokenization expected.
+     * @param string                       $testMarker     The comment prefacing the test.
+     * @param array<array<string, string>> $expectedTokens The tokenization expected.
      *
      * @dataProvider dataCommentTokenization
      * @covers       PHP_CodeSniffer\Tokenizers\PHP::tokenize
@@ -35,12 +34,20 @@
      */
     public function testCommentTokenization($testMarker, $expectedTokens)
     {
-        $tokens  = self::$phpcsFile->getTokens();
+        $tokens  = $this->phpcsFile->getTokens();
         $comment = $this->getTargetToken($testMarker, Tokens::$commentTokens);
 
         foreach ($expectedTokens as $key => $tokenInfo) {
-            $this->assertSame(constant($tokenInfo'type'), $tokens$comment'code');
-            $this->assertSame($tokenInfo'type', $tokens$comment'type');
+            $this->assertSame(
+                constant($tokenInfo'type'),
+                $tokens$comment'code',
+                'Token tokenized as '.Tokens::tokenName($tokens$comment'code').', not '.$tokenInfo'type'.' (code)'
+            );
+            $this->assertSame(
+                $tokenInfo'type',
+                $tokens$comment'type',
+                'Token tokenized as '.$tokens$comment'type'.', not '.$tokenInfo'type'.' (type)'
+            );
             $this->assertSame($tokenInfo'content', $tokens$comment'content');
 
             ++$comment;
@@ -54,14 +61,14 @@
      *
      * @see testCommentTokenization()
      *
-     * @return array
+     * @return array<string, array<string, string|array<array<string, string>>>>
      */
-    public function dataCommentTokenization()
+    public static function dataCommentTokenization()
     {
         return 
-            
-                '/* testSingleLineSlashComment */',
-                
+            'slash comment, single line'                                  => 
+                'testMarker'     => '/* testSingleLineSlashComment */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '// Comment
@@ -74,9 +81,9 @@
                     ,
                 ,
             ,
-            
-                '/* testSingleLineSlashCommentTrailing */',
-                
+            'slash comment, single line, trailing'                        => 
+                'testMarker'     => '/* testSingleLineSlashCommentTrailing */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '// Comment
@@ -89,9 +96,9 @@
                     ,
                 ,
             ,
-            
-                '/* testSingleLineSlashAnnotation */',
-                
+            'slash ignore annotation, single line'                        => 
+                'testMarker'     => '/* testSingleLineSlashAnnotation */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_PHPCS_DISABLE',
                         'content' => '// phpcs:disable Stnd.Cat
@@ -104,9 +111,9 @@
                     ,
                 ,
             ,
-            
-                '/* testMultiLineSlashComment */',
-                
+            'slash comment, multi-line'                                   => 
+                'testMarker'     => '/* testMultiLineSlashComment */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '// Comment1
@@ -129,9 +136,9 @@
                     ,
                 ,
             ,
-            
-                '/* testMultiLineSlashCommentWithIndent */',
-                
+            'slash comment, multi-line, indented'                         => 
+                'testMarker'     => '/* testMultiLineSlashCommentWithIndent */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '// Comment1
@@ -162,9 +169,9 @@
                     ,
                 ,
             ,
-            
-                '/* testMultiLineSlashCommentWithAnnotationStart */',
-                
+            'slash comment, multi-line, ignore annotation as first line'  => 
+                'testMarker'     => '/* testMultiLineSlashCommentWithAnnotationStart */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_PHPCS_IGNORE',
                         'content' => '// phpcs:ignore Stnd.Cat
@@ -187,9 +194,9 @@
                     ,
                 ,
             ,
-            
-                '/* testMultiLineSlashCommentWithAnnotationMiddle */',
-                
+            'slash comment, multi-line, ignore annotation as middle line' => 
+                'testMarker'     => '/* testMultiLineSlashCommentWithAnnotationMiddle */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '// Comment1
@@ -212,9 +219,9 @@
                     ,
                 ,
             ,
-            
-                '/* testMultiLineSlashCommentWithAnnotationEnd */',
-                
+            'slash comment, multi-line, ignore annotation as last line'   => 
+                'testMarker'     => '/* testMultiLineSlashCommentWithAnnotationEnd */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '// Comment1
@@ -237,9 +244,9 @@
                     ,
                 ,
             ,
-            
-                '/* testSingleLineStarComment */',
-                
+            'star comment, single line'                                   => 
+                'testMarker'     => '/* testSingleLineStarComment */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '/* Single line star comment */',
@@ -251,9 +258,9 @@
                     ,
                 ,
             ,
-            
-                '/* testSingleLineStarCommentTrailing */',
-                
+            'star comment, single line, trailing'                         => 
+                'testMarker'     => '/* testSingleLineStarCommentTrailing */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '/* Comment */',
@@ -265,9 +272,9 @@
                     ,
                 ,
             ,
-            
-                '/* testSingleLineStarAnnotation */',
-                
+            'star ignore annotation, single line'                         => 
+                'testMarker'     => '/* testSingleLineStarAnnotation */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_PHPCS_IGNORE',
                         'content' => '/* phpcs:ignore Stnd.Cat */',
@@ -279,9 +286,9 @@
                     ,
                 ,
             ,
-            
-                '/* testMultiLineStarComment */',
-                
+            'star comment, multi-line'                                    => 
+                'testMarker'     => '/* testMultiLineStarComment */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '/* Comment1
@@ -303,9 +310,9 @@
                     ,
                 ,
             ,
-            
-                '/* testMultiLineStarCommentWithIndent */',
-                
+            'star comment, multi-line, indented'                          => 
+                'testMarker'     => '/* testMultiLineStarCommentWithIndent */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '/* Comment1
@@ -327,9 +334,9 @@
                     ,
                 ,
             ,
-            
-                '/* testMultiLineStarCommentWithAnnotationStart */',
-                
+            'star comment, multi-line, ignore annotation as first line'   => 
+                'testMarker'     => '/* testMultiLineStarCommentWithAnnotationStart */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_PHPCS_IGNORE',
                         'content' => '/* @phpcs:ignore Stnd.Cat
@@ -351,9 +358,9 @@
                     ,
                 ,
             ,
-            
-                '/* testMultiLineStarCommentWithAnnotationMiddle */',
-                
+            'star comment, multi-line, ignore annotation as middle line'  => 
+                'testMarker'     => '/* testMultiLineStarCommentWithAnnotationMiddle */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '/* Comment1
@@ -375,9 +382,9 @@
                     ,
                 ,
             ,
-            
-                '/* testMultiLineStarCommentWithAnnotationEnd */',
-                
+            'star comment, multi-line, ignore annotation as last line'    => 
+                'testMarker'     => '/* testMultiLineStarCommentWithAnnotationEnd */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '/* Comment1
@@ -400,9 +407,9 @@
                 ,
             ,
 
-            
-                '/* testSingleLineDocblockComment */',
-                
+            'docblock comment, single line'                               => 
+                'testMarker'     => '/* testSingleLineDocblockComment */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_DOC_COMMENT_OPEN_TAG',
                         'content' => '/**',
@@ -426,9 +433,9 @@
                     ,
                 ,
             ,
-            
-                '/* testSingleLineDocblockCommentTrailing */',
-                
+            'docblock comment, single line, trailing'                     => 
+                'testMarker'     => '/* testSingleLineDocblockCommentTrailing */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_DOC_COMMENT_OPEN_TAG',
                         'content' => '/**',
@@ -452,9 +459,9 @@
                     ,
                 ,
             ,
-            
-                '/* testSingleLineDocblockAnnotation */',
-                
+            'docblock ignore annotation, single line'                     => 
+                'testMarker'     => '/* testSingleLineDocblockAnnotation */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_DOC_COMMENT_OPEN_TAG',
                         'content' => '/**',
@@ -479,9 +486,9 @@
                 ,
             ,
 
-            
-                '/* testMultiLineDocblockComment */',
-                
+            'docblock comment, multi-line'                                => 
+                'testMarker'     => '/* testMultiLineDocblockComment */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_DOC_COMMENT_OPEN_TAG',
                         'content' => '/**',
@@ -590,9 +597,9 @@
                     ,
                 ,
             ,
-            
-                '/* testMultiLineDocblockCommentWithIndent */',
-                
+            'docblock comment, multi-line, indented'                      => 
+                'testMarker'     => '/* testMultiLineDocblockCommentWithIndent */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_DOC_COMMENT_OPEN_TAG',
                         'content' => '/**',
@@ -701,9 +708,9 @@
                     ,
                 ,
             ,
-            
-                '/* testMultiLineDocblockCommentWithAnnotation */',
-                
+            'docblock comment, multi-line, ignore annotation'             => 
+                'testMarker'     => '/* testMultiLineDocblockCommentWithAnnotation */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_DOC_COMMENT_OPEN_TAG',
                         'content' => '/**',
@@ -812,9 +819,9 @@
                     ,
                 ,
             ,
-            
-                '/* testMultiLineDocblockCommentWithTagAnnotation */',
-                
+            'docblock comment, multi-line, ignore annotation as tag'      => 
+                'testMarker'     => '/* testMultiLineDocblockCommentWithTagAnnotation */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_DOC_COMMENT_OPEN_TAG',
                         'content' => '/**',
@@ -923,9 +930,9 @@
                     ,
                 ,
             ,
-            
-                '/* testSingleLineHashComment */',
-                
+            'hash comment, single line'                                   => 
+                'testMarker'     => '/* testSingleLineHashComment */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '# Comment
@@ -938,9 +945,9 @@
                     ,
                 ,
             ,
-            
-                '/* testSingleLineHashCommentTrailing */',
-                
+            'hash comment, single line, trailing'                         => 
+                'testMarker'     => '/* testSingleLineHashCommentTrailing */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '# Comment
@@ -953,9 +960,9 @@
                     ,
                 ,
             ,
-            
-                '/* testMultiLineHashComment */',
-                
+            'hash comment, multi-line'                                    => 
+                'testMarker'     => '/* testMultiLineHashComment */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '# Comment1
@@ -978,9 +985,9 @@
                     ,
                 ,
             ,
-            
-                '/* testMultiLineHashCommentWithIndent */',
-                
+            'hash comment, multi-line, indented'                          => 
+                'testMarker'     => '/* testMultiLineHashCommentWithIndent */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '# Comment1
@@ -1011,9 +1018,9 @@
                     ,
                 ,
             ,
-            
-                '/* testSingleLineSlashCommentNoNewLineAtEnd */',
-                
+            'slash comment, single line, without new line at end'         => 
+                'testMarker'     => '/* testSingleLineSlashCommentNoNewLineAtEnd */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '// Slash ',
@@ -1025,9 +1032,9 @@
                     ,
                 ,
             ,
-            
-                '/* testSingleLineHashCommentNoNewLineAtEnd */',
-                
+            'hash comment, single line, without new line at end'          => 
+                'testMarker'     => '/* testSingleLineHashCommentNoNewLineAtEnd */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '# Hash ',
@@ -1039,9 +1046,9 @@
                     ,
                 ,
             ,
-            
-                '/* testCommentAtEndOfFile */',
-                
+            'unclosed star comment at end of file'                        => 
+                'testMarker'     => '/* testCommentAtEndOfFile */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '/* Comment',

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

@@ -12,18 +12,17 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
 use PHP_CodeSniffer\Util\Tokens;
 
-class StableCommentWhitespaceWinTest extends AbstractMethodUnitTest
+final class StableCommentWhitespaceWinTest extends AbstractTokenizerTestCase
 {
 
 
     /**
      * Test that comment tokenization with new lines at the end of the comment is stable.
      *
-     * @param string $testMarker     The comment prefacing the test.
-     * @param array  $expectedTokens The tokenization expected.
+     * @param string                       $testMarker     The comment prefacing the test.
+     * @param array<array<string, string>> $expectedTokens The tokenization expected.
      *
      * @dataProvider dataCommentTokenization
      * @covers       PHP_CodeSniffer\Tokenizers\PHP::tokenize
@@ -32,12 +31,20 @@
      */
     public function testCommentTokenization($testMarker, $expectedTokens)
     {
-        $tokens  = self::$phpcsFile->getTokens();
+        $tokens  = $this->phpcsFile->getTokens();
         $comment = $this->getTargetToken($testMarker, Tokens::$commentTokens);
 
         foreach ($expectedTokens as $key => $tokenInfo) {
-            $this->assertSame(constant($tokenInfo'type'), $tokens$comment'code');
-            $this->assertSame($tokenInfo'type', $tokens$comment'type');
+            $this->assertSame(
+                constant($tokenInfo'type'),
+                $tokens$comment'code',
+                'Token tokenized as '.Tokens::tokenName($tokens$comment'code').', not '.$tokenInfo'type'.' (code)'
+            );
+            $this->assertSame(
+                $tokenInfo'type',
+                $tokens$comment'type',
+                'Token tokenized as '.$tokens$comment'type'.', not '.$tokenInfo'type'.' (type)'
+            );
             $this->assertSame($tokenInfo'content', $tokens$comment'content');
 
             ++$comment;
@@ -51,14 +58,14 @@
      *
      * @see testCommentTokenization()
      *
-     * @return array
+     * @return array<string, array<string, string|array<array<string, string>>>>
      */
-    public function dataCommentTokenization()
+    public static function dataCommentTokenization()
     {
         return 
-            
-                '/* testSingleLineSlashComment */',
-                
+            'slash comment, single line'                                  => 
+                'testMarker'     => '/* testSingleLineSlashComment */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '// Comment
@@ -71,9 +78,9 @@
                     ,
                 ,
             ,
-            
-                '/* testSingleLineSlashCommentTrailing */',
-                
+            'slash comment, single line, trailing'                        => 
+                'testMarker'     => '/* testSingleLineSlashCommentTrailing */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '// Comment
@@ -86,9 +93,9 @@
                     ,
                 ,
             ,
-            
-                '/* testSingleLineSlashAnnotation */',
-                
+            'slash ignore annotation, single line'                        => 
+                'testMarker'     => '/* testSingleLineSlashAnnotation */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_PHPCS_DISABLE',
                         'content' => '// phpcs:disable Stnd.Cat
@@ -101,9 +108,9 @@
                     ,
                 ,
             ,
-            
-                '/* testMultiLineSlashComment */',
-                
+            'slash comment, multi-line'                                   => 
+                'testMarker'     => '/* testMultiLineSlashComment */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '// Comment1
@@ -126,9 +133,9 @@
                     ,
                 ,
             ,
-            
-                '/* testMultiLineSlashCommentWithIndent */',
-                
+            'slash comment, multi-line, indented'                         => 
+                'testMarker'     => '/* testMultiLineSlashCommentWithIndent */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '// Comment1
@@ -159,9 +166,9 @@
                     ,
                 ,
             ,
-            
-                '/* testMultiLineSlashCommentWithAnnotationStart */',
-                
+            'slash comment, multi-line, ignore annotation as first line'  => 
+                'testMarker'     => '/* testMultiLineSlashCommentWithAnnotationStart */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_PHPCS_IGNORE',
                         'content' => '// phpcs:ignore Stnd.Cat
@@ -184,9 +191,9 @@
                     ,
                 ,
             ,
-            
-                '/* testMultiLineSlashCommentWithAnnotationMiddle */',
-                
+            'slash comment, multi-line, ignore annotation as middle line' => 
+                'testMarker'     => '/* testMultiLineSlashCommentWithAnnotationMiddle */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '// Comment1
@@ -209,9 +216,9 @@
                     ,
                 ,
             ,
-            
-                '/* testMultiLineSlashCommentWithAnnotationEnd */',
-                
+            'slash comment, multi-line, ignore annotation as last line'   => 
+                'testMarker'     => '/* testMultiLineSlashCommentWithAnnotationEnd */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '// Comment1
@@ -234,9 +241,9 @@
                     ,
                 ,
             ,
-            
-                '/* testSingleLineSlashCommentNoNewLineAtEnd */',
-                
+            'slash comment, single line, without new line at end'         => 
+                'testMarker'     => '/* testSingleLineSlashCommentNoNewLineAtEnd */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '// Slash ',
@@ -248,9 +255,9 @@
                     ,
                 ,
             ,
-            
-                '/* testSingleLineHashComment */',
-                
+            'hash comment, single line'                                   => 
+                'testMarker'     => '/* testSingleLineHashComment */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '# Comment
@@ -263,9 +270,9 @@
                     ,
                 ,
             ,
-            
-                '/* testSingleLineHashCommentTrailing */',
-                
+            'hash comment, single line, trailing'                         => 
+                'testMarker'     => '/* testSingleLineHashCommentTrailing */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '# Comment
@@ -278,9 +285,9 @@
                     ,
                 ,
             ,
-            
-                '/* testMultiLineHashComment */',
-                
+            'hash comment, multi-line'                                    => 
+                'testMarker'     => '/* testMultiLineHashComment */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '# Comment1
@@ -303,9 +310,9 @@
                     ,
                 ,
             ,
-            
-                '/* testMultiLineHashCommentWithIndent */',
-                
+            'hash comment, multi-line, indented'                          => 
+                'testMarker'     => '/* testMultiLineHashCommentWithIndent */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '# Comment1
@@ -336,9 +343,9 @@
                     ,
                 ,
             ,
-            
-                '/* testSingleLineHashCommentNoNewLineAtEnd */',
-                
+            'hash comment, single line, without new line at end'          => 
+                'testMarker'     => '/* testSingleLineHashCommentNoNewLineAtEnd */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '# Hash ',
@@ -350,9 +357,9 @@
                     ,
                 ,
             ,
-            
-                '/* testCommentAtEndOfFile */',
-                
+            'unclosed star comment at end of file'                        => 
+                'testMarker'     => '/* testCommentAtEndOfFile */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_COMMENT',
                         'content' => '/* Comment',

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

@@ -9,6 +9,30 @@
 
 class TypeIntersection
 {
+    /* testTypeIntersectionOOConstSimple */
+    public const Foo&Bar SIMPLE = new Foo();
+
+    /* testTypeIntersectionOOConstReverseModifierOrder */
+    protected final const Something&Nothing MODIFIERS_REVERSED /* testBitwiseAndOOConstDefaultValue */ = E_WARNING & E_NOTICE;
+
+    const
+        /* testTypeIntersectionOOConstMulti1 */
+        Foo &
+        /* testTypeIntersectionOOConstMulti2 */
+        Traversable & // phpcs:ignore Stnd.Cat.Sniff
+        Boo
+        /* testTypeIntersectionOOConstMulti3 */
+        & Bar MULTI_INTERSECTION = false;
+
+    /* testTypeIntersectionOOConstNamespaceRelative */
+    const namespace\Sub\NameA&namespace\Sub\NameB NAMESPACE_RELATIVE = new namespace\Sub\NameB;
+
+    /* testTypeIntersectionOOConstPartiallyQualified */
+    const Partially\Qualified\NameA&Partially\Qualified\NameB PARTIALLY_QUALIFIED = new Partially\Qualified\NameA;
+
+    /* testTypeIntersectionOOConstFullyQualified */
+    const \Fully\Qualified\NameA&\Fully\Qualified\NameB FULLY_QUALIFIED = new \Fully\Qualified\NameB();
+
     /* testTypeIntersectionPropertySimple */
     public static Foo&Bar $obj;
 
@@ -59,12 +83,12 @@
         \Fully\Qualified\NameA&\Fully\Qualified\NameB $paramC,
     ) {}
 
-    /* testTypeIntersectionReturnType */
-    public function returnType() : Foo&Bar {}
-
     /* testTypeIntersectionConstructorPropertyPromotion */
     public function __construct( public Foo&Bar $property) {}
 
+    /* testTypeIntersectionReturnType */
+    public function returnType() : Foo&Bar {}
+
     /* testTypeIntersectionAbstractMethodReturnType1 */
     abstract public function abstractMethod(): Foo&Bar /* testTypeIntersectionAbstractMethodReturnType2 */ &Baz;
 
@@ -78,9 +102,6 @@
     public function identifierNamesReturnFQ() : \Fully\Qualified\NameA&\Fully\Qualified\NameB {}
 }
 
-/* testTypeIntersectionClosureParamIllegalNullable */
-$closureWithParamType = function (?Foo&Bar $string) {};
-
 function globalFunctionWithSpreadAndReference(
     /* testTypeIntersectionWithReference */
     Foo&Bar /* testBitwiseAnd5 */ &$paramA,
@@ -88,6 +109,9 @@
     Foo&Bar ...$paramB
 ) {}
 
+/* testTypeIntersectionClosureParamIllegalNullable */
+$closureWithParamType = function (?Foo&Bar $string) {};
+
 /* testBitwiseAndClosureParamDefault */
 $closureWithReturnType = function ($string = NONSENSE & FAKE)/* testTypeIntersectionClosureReturn */ : \Package\MyA&PackageB {};

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

@@ -10,9 +10,7 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
-
-class TypeIntersectionTest extends AbstractMethodUnitTest
+final class TypeIntersectionTest extends AbstractTokenizerTestCase
 {
 
 
@@ -28,11 +26,12 @@
      */
     public function testBitwiseAnd($testMarker)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens     = $this->phpcsFile->getTokens();
+        $target     = $this->getTargetToken($testMarker, T_BITWISE_AND, T_TYPE_INTERSECTION);
+        $tokenArray = $tokens$target;
 
-        $opener = $this->getTargetToken($testMarker, T_BITWISE_AND, T_TYPE_INTERSECTION);
-        $this->assertSame(T_BITWISE_AND, $tokens$opener'code');
-        $this->assertSame('T_BITWISE_AND', $tokens$opener'type');
+        $this->assertSame(T_BITWISE_AND, $tokenArray'code', 'Token tokenized as '.$tokenArray'type'.', not T_BITWISE_AND (code)');
+        $this->assertSame('T_BITWISE_AND', $tokenArray'type', 'Token tokenized as '.$tokenArray'type'.', not T_BITWISE_AND (type)');
 
     }//end testBitwiseAnd()
 
@@ -42,28 +41,29 @@
      *
      * @see testBitwiseAnd()
      *
-     * @return array
+     * @return array<string, array<string>>
      */
-    public function dataBitwiseAnd()
+    public static function dataBitwiseAnd()
     {
         return 
-            '/* testBitwiseAnd1 */',
-            '/* testBitwiseAnd2 */',
-            '/* testBitwiseAndPropertyDefaultValue */',
-            '/* testBitwiseAndParamDefaultValue */',
-            '/* testBitwiseAnd3 */',
-            '/* testBitwiseAnd4 */',
-            '/* testBitwiseAnd5 */',
-            '/* testBitwiseAndClosureParamDefault */',
-            '/* testBitwiseAndArrowParamDefault */',
-            '/* testBitwiseAndArrowExpression */',
-            '/* testBitwiseAndInArrayKey */',
-            '/* testBitwiseAndInArrayValue */',
-            '/* testBitwiseAndInShortArrayKey */',
-            '/* testBitwiseAndInShortArrayValue */',
-            '/* testBitwiseAndNonArrowFnFunctionCall */',
-            '/* testBitwiseAnd6 */',
-            '/* testLiveCoding */',
+            'in simple assignment 1'                    => '/* testBitwiseAnd1 */',
+            'in simple assignment 2'                    => '/* testBitwiseAnd2 */',
+            'in OO constant default value'              => '/* testBitwiseAndOOConstDefaultValue */',
+            'in property default value'                 => '/* testBitwiseAndPropertyDefaultValue */',
+            'in method parameter default value'         => '/* testBitwiseAndParamDefaultValue */',
+            'reference for method parameter'            => '/* testBitwiseAnd3 */',
+            'in return statement'                       => '/* testBitwiseAnd4 */',
+            'reference for function parameter'          => '/* testBitwiseAnd5 */',
+            'in closure parameter default value'        => '/* testBitwiseAndClosureParamDefault */',
+            'in arrow function parameter default value' => '/* testBitwiseAndArrowParamDefault */',
+            'in arrow function return expression'       => '/* testBitwiseAndArrowExpression */',
+            'in long array key'                         => '/* testBitwiseAndInArrayKey */',
+            'in long array value'                       => '/* testBitwiseAndInArrayValue */',
+            'in short array key'                        => '/* testBitwiseAndInShortArrayKey */',
+            'in short array value'                      => '/* testBitwiseAndInShortArrayValue */',
+            'in parameter in function call'             => '/* testBitwiseAndNonArrowFnFunctionCall */',
+            'function return by reference'              => '/* testBitwiseAnd6 */',
+            'live coding / undetermined'                => '/* testLiveCoding */',
         ;
 
     }//end dataBitwiseAnd()
@@ -81,11 +81,12 @@
      */
     public function testTypeIntersection($testMarker)
     {
-        $tokens = self::$phpcsFile->getTokens();
+        $tokens     = $this->phpcsFile->getTokens();
+        $target     = $this->getTargetToken($testMarker, T_BITWISE_AND, T_TYPE_INTERSECTION);
+        $tokenArray = $tokens$target;
 
-        $opener = $this->getTargetToken($testMarker, T_BITWISE_AND, T_TYPE_INTERSECTION);
-        $this->assertSame(T_TYPE_INTERSECTION, $tokens$opener'code');
-        $this->assertSame('T_TYPE_INTERSECTION', $tokens$opener'type');
+        $this->assertSame(T_TYPE_INTERSECTION, $tokenArray'code', 'Token tokenized as '.$tokenArray'type'.', not T_TYPE_INTERSECTION (code)');
+        $this->assertSame('T_TYPE_INTERSECTION', $tokenArray'type', 'Token tokenized as '.$tokenArray'type'.', not T_TYPE_INTERSECTION (type)');
 
     }//end testTypeIntersection()
 
@@ -95,42 +96,50 @@
      *
      * @see testTypeIntersection()
      *
-     * @return array
+     * @return array<string, array<string>>
      */
-    public function dataTypeIntersection()
+    public static function dataTypeIntersection()
     {
         return 
-            '/* testTypeIntersectionPropertySimple */',
-            '/* testTypeIntersectionPropertyReverseModifierOrder */',
-            '/* testTypeIntersectionPropertyMulti1 */',
-            '/* testTypeIntersectionPropertyMulti2 */',
-            '/* testTypeIntersectionPropertyMulti3 */',
-            '/* testTypeIntersectionPropertyNamespaceRelative */',
-            '/* testTypeIntersectionPropertyPartiallyQualified */',
-            '/* testTypeIntersectionPropertyFullyQualified */',
-            '/* testTypeIntersectionPropertyWithReadOnlyKeyword */',
-            '/* testTypeIntersectionPropertyWithStaticKeyword */',
-            '/* testTypeIntersectionParam1 */',
-            '/* testTypeIntersectionParam2 */',
-            '/* testTypeIntersectionParam3 */',
-            '/* testTypeIntersectionParamNamespaceRelative */',
-            '/* testTypeIntersectionParamPartiallyQualified */',
-            '/* testTypeIntersectionParamFullyQualified */',
-            '/* testTypeIntersectionReturnType */',
-            '/* testTypeIntersectionConstructorPropertyPromotion */',
-            '/* testTypeIntersectionAbstractMethodReturnType1 */',
-            '/* testTypeIntersectionAbstractMethodReturnType2 */',
-            '/* testTypeIntersectionReturnTypeNamespaceRelative */',
-            '/* testTypeIntersectionReturnPartiallyQualified */',
-            '/* testTypeIntersectionReturnFullyQualified */',
-            '/* testTypeIntersectionClosureParamIllegalNullable */',
-            '/* testTypeIntersectionWithReference */',
-            '/* testTypeIntersectionWithSpreadOperator */',
-            '/* testTypeIntersectionClosureReturn */',
-            '/* testTypeIntersectionArrowParam */',
-            '/* testTypeIntersectionArrowReturnType */',
-            '/* testTypeIntersectionNonArrowFunctionDeclaration */',
-            '/* testTypeIntersectionWithInvalidTypes */',
+            'type for OO constant'                                        => '/* testTypeIntersectionOOConstSimple */',
+            'type for OO constant, reversed modifier order'               => '/* testTypeIntersectionOOConstReverseModifierOrder */',
+            'type for OO constant, first of multi-intersect'              => '/* testTypeIntersectionOOConstMulti1 */',
+            'type for OO constant, middle of multi-intersect + comments'  => '/* testTypeIntersectionOOConstMulti2 */',
+            'type for OO constant, last of multi-intersect'               => '/* testTypeIntersectionOOConstMulti3 */',
+            'type for OO constant, using namespace relative names'        => '/* testTypeIntersectionOOConstNamespaceRelative */',
+            'type for OO constant, using partially qualified names'       => '/* testTypeIntersectionOOConstPartiallyQualified */',
+            'type for OO constant, using fully qualified names'           => '/* testTypeIntersectionOOConstFullyQualified */',
+            'type for static property'                                    => '/* testTypeIntersectionPropertySimple */',
+            'type for static property, reversed modifier order'           => '/* testTypeIntersectionPropertyReverseModifierOrder */',
+            'type for property, first of multi-intersect'                 => '/* testTypeIntersectionPropertyMulti1 */',
+            'type for property, middle of multi-intersect, also comments' => '/* testTypeIntersectionPropertyMulti2 */',
+            'type for property, last of multi-intersect'                  => '/* testTypeIntersectionPropertyMulti3 */',
+            'type for property using namespace relative names'            => '/* testTypeIntersectionPropertyNamespaceRelative */',
+            'type for property using partially qualified names'           => '/* testTypeIntersectionPropertyPartiallyQualified */',
+            'type for property using fully qualified names'               => '/* testTypeIntersectionPropertyFullyQualified */',
+            'type for readonly property'                                  => '/* testTypeIntersectionPropertyWithReadOnlyKeyword */',
+            'type for static readonly property'                           => '/* testTypeIntersectionPropertyWithStaticKeyword */',
+            'type for method parameter'                                   => '/* testTypeIntersectionParam1 */',
+            'type for method parameter, first in multi-intersect'         => '/* testTypeIntersectionParam2 */',
+            'type for method parameter, last in multi-intersect'          => '/* testTypeIntersectionParam3 */',
+            'type for method parameter with namespace relative names'     => '/* testTypeIntersectionParamNamespaceRelative */',
+            'type for method parameter with partially qualified names'    => '/* testTypeIntersectionParamPartiallyQualified */',
+            'type for method parameter with fully qualified names'        => '/* testTypeIntersectionParamFullyQualified */',
+            'type for property in constructor property promotion'         => '/* testTypeIntersectionConstructorPropertyPromotion */',
+            'return type for method'                                      => '/* testTypeIntersectionReturnType */',
+            'return type for method, first of multi-intersect'            => '/* testTypeIntersectionAbstractMethodReturnType1 */',
+            'return type for method, last of multi-intersect'             => '/* testTypeIntersectionAbstractMethodReturnType2 */',
+            'return type for method with namespace relative names'        => '/* testTypeIntersectionReturnTypeNamespaceRelative */',
+            'return type for method with partially qualified names'       => '/* testTypeIntersectionReturnPartiallyQualified */',
+            'return type for method with fully qualified names'           => '/* testTypeIntersectionReturnFullyQualified */',
+            'type for function parameter with reference'                  => '/* testTypeIntersectionWithReference */',
+            'type for function parameter with spread operator'            => '/* testTypeIntersectionWithSpreadOperator */',
+            'type for closure parameter with illegal nullable'            => '/* testTypeIntersectionClosureParamIllegalNullable */',
+            'return type for closure'                                     => '/* testTypeIntersectionClosureReturn */',
+            'type for arrow function parameter'                           => '/* testTypeIntersectionArrowParam */',
+            'return type for arrow function'                              => '/* testTypeIntersectionArrowReturnType */',
+            'type for function parameter, return by ref'                  => '/* testTypeIntersectionNonArrowFunctionDeclaration */',
+            'type for function parameter with invalid types'              => '/* testTypeIntersectionWithInvalidTypes */',
         ;
 
     }//end dataTypeIntersection()

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

@@ -0,0 +1,132 @@
+<?php
+
+/* testTernaryIsTernaryAfterConst */
+$a = $this->const ? 0 : 1;
+
+/* testGlobalConstantCannotBeTyped */
+const GLOBAL_UNTYPED = true;
+
+/* testGlobalConstantTypedShouldStillBeHandled */
+const ?int GLOBAL_TYPED = true;
+
+class ClassWithPlainTypedConstants {
+    /* testClassConstFinalUntyped */
+    final const FINAL_UNTYPED = true;
+
+    /* testClassConstVisibilityUntyped */
+    public const /*comment*/VISIBLE_UNTYPED = true;
+
+    /* testClassConstTypedTrue */
+    const true TYPED_TRUE = true;
+    /* testClassConstTypedFalse */
+    final const false TYPED_FALSE = false;
+    /* testClassConstTypedNull */
+    public const null TYPED_NULL = null;
+    /* testClassConstTypedBool */
+    final protected const/*comment*/bool TYPED_BOOL = false;
+    /* testClassConstTypedInt */
+    private const int TYPED_INT = 0;
+    /* testClassConstTypedFloat */
+    const float TYPED_FLOAT = 0.5;
+    /* testClassConstTypedString */
+    public final const string/*comment*/TYPED_STRING = 'string';
+    /* testClassConstTypedArray */
+    private final const array TYPED_ARRAY = ;
+    /* testClassConstTypedObject */
+    const
+        object
+        TYPED_OBJECT = MyClass::getInstance();
+    /* testClassConstTypedIterable */
+    const iterable typed_iterable = ;
+    /* testClassConstTypedMixed */
+    const mixed TYPED_MIXED = 'string';
+
+    /* testClassConstTypedClassUnqualified */
+    const MyClass TYPED_UNQUALIFIED_CLASSNAME = MyClass::getInstance();
+    /* testClassConstTypedClassFullyQualified */
+    public const \MyClass TYPED_FULLY_QUALIFIED_CLASSNAME = MyClass::getInstance();
+    /* testClassConstTypedClassNamespaceRelative */
+    protected const namespace\MyClass TYPED_NAMESPACE_RELATIVE_CLASSNAME = MyClass::getInstance();
+    /* testClassConstTypedClassPartiallyQualified */
+    private const Partial\MyClass TYPED_PARTIALLY_QUALIFIED_CLASSNAME = MyClass::getInstance();
+    /* testClassConstTypedParent */
+    const parent TYPED_PARENT = parent::getInstance();
+
+    // Illegal types - the fact that these are not allowed in PHP is not the concern of the PHPCS tokenizer.
+    /* testClassConstTypedCallable */
+    protected const callable TYPED_CALLABLE = 'function_name';
+    /* testClassConstTypedVoid */
+    protected const void TYPED_VOID = null;
+    /* testClassConstTypedNever */
+    protected const NEVER TYPED_NEVER = null;
+}
+
+trait TraitWithNullableTypedConstants {
+    /* testTraitConstTypedNullableTrue */
+    const ?true TYPED_TRUE = true;
+    /* testTraitConstTypedNullableFalse */
+    final const ?false TYPED_FALSE = false;
+    /* testTraitConstTypedNullableNull */
+    public const ?null TYPED_NULL = null;
+    /* testTraitConstTypedNullableBool */
+    final protected const ?bool TYPED_BOOL = false;
+    /* testTraitConstTypedNullableInt */
+    private const ?int TYPED_INT = 0;
+    /* testTraitConstTypedNullableFloat */
+    const ? /*comment*/ float TYPED_FLOAT = 0.5;
+    /* testTraitConstTypedNullableString */
+    public final const ?string TYPED_STRING = 'string';
+    /* testTraitConstTypedNullableArray */
+    private final const ?  array TYPED_ARRAY = ;
+    /* testTraitConstTypedNullableObject */
+    const ?object TYPED_OBJECT = MyClass::getInstance();
+    /* testTraitConstTypedNullableIterable */
+    const ?iterable TYPED_ITERABLE = ;
+    /* testTraitConstTypedNullableMixed */
+    const ?mixed TYPED_MIXED = 'string';
+
+    /* testTraitConstTypedNullableClassUnqualified */
+    const ?MyClass TYPED_UNQUALIFIED_CLASSNAME = MyClass::getInstance();
+    /* testTraitConstTypedNullableClassFullyQualified */
+    public const ?\MyClass TYPED_FULLY_QUALIFIED_CLASSNAME = MyClass::getInstance();
+    /* testTraitConstTypedNullableClassNamespaceRelative */
+    protected const ?namespace\MyClass TYPED_NAMESPACE_RELATIVE_CLASSNAME = MyClass::getInstance();
+    /* testTraitConstTypedNullableClassPartiallyQualified */
+    private const ?Partial\MyClass TYPED_PARTIALLY_QUALIFIED_CLASSNAME = MyClass::getInstance();
+    /* testTraitConstTypedNullableParent */
+    const ?parent TYPED_PARENT = parent::getInstance();
+}
+
+interface InterfaceWithUnionTypedConstants {
+    /* testInterfaceConstTypedUnionTrueNull */
+    const true|null /*comment*/ UNION_TRUE_NULL = true;
+    /* testInterfaceConstTypedUnionArrayObject */
+    const array|object UNION_ARRAY_OBJECT = ;
+    /* testInterfaceConstTypedUnionStringArrayInt */
+    const string | array | int UNION_STRING_ARRAY_INT = 'array middle';
+    /* testInterfaceConstTypedUnionFloatBoolArray */
+    const float /*comment*/| bool|array UNION_FLOAT_BOOL_ARRAY = false;
+    /* testInterfaceConstTypedUnionIterableFalse */
+    const iterable|false UNION_ITERABLE_FALSE = false;
+    /* testInterfaceConstTypedUnionUnqualifiedNamespaceRelative */
+    const Unqualified|namespace\Relative UNION_UNQUALIFIED_NSRELATIVE = new Unqualified();
+    /* testInterfaceConstTypedUnionFullyQualifiedPartiallyQualified */
+    const \Fully\Qualified|Partially\Qualified UNION_FQN_PARTIAL = new Partial\Qualified;
+}
+
+enum EnumWithIntersectionTypedConstants {
+    // Illegal types in a class, but legal in an enum.
+    /* testEnumConstTypedSelf */
+    final const self TYPED_SELF = self::getInstance();
+    /* testEnumConstTypedStatic */
+    const static TYPED_STATIC = static::getInstance();
+    /* testEnumConstTypedNullableSelf */
+    public const ?self TYPED_SELF = self::getInstance();
+    /* testEnumConstTypedNullableStatic */
+    const ?static TYPED_STATIC = static::getInstance();
+
+    /* testEnumConstTypedIntersectUnqualifiedNamespaceRelative */
+    const Unqualified&namespace\Relative UNION_UNQUALIFIED_NSRELATIVE = new Unqualified();
+    /* testEnumConstTypedIntersectFullyQualifiedPartiallyQualified */
+    const \Fully\Qualified&Partially\Qualified UNION_FQN_PARTIAL = new Partial\Qualified;
+}

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

@@ -0,0 +1,515 @@
+<?php
+/**
+ * Tests that typed OO constants will be tokenized correctly for:
+ * - the type keywords, including keywords like array (T_STRING).
+ * - the ? in nullable types
+ * - namespaced name types (PHPCS 3.x vs 4.x).
+ * - the | in union types
+ * - the & in intersection 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;
+
+use PHP_CodeSniffer\Util\Tokens;
+
+final class TypedConstantsTest extends AbstractTokenizerTestCase
+{
+
+
+    /**
+     * Test that a ? after a "const" which is not the constant keyword is tokenized as ternary then, not as the nullable operator.
+     *
+     * @covers PHP_CodeSniffer\Tokenizers\PHP::tokenize
+     *
+     * @return void
+     */
+    public function testTernaryIsInlineThen()
+    {
+        $tokens = $this->phpcsFile->getTokens();
+        $target = $this->getTargetToken('/* testTernaryIsTernaryAfterConst */', T_NULLABLE, T_INLINE_THEN);
+
+        $this->assertSame(
+            T_INLINE_THEN,
+            $tokens$target'code',
+            'Token tokenized as '.Tokens::tokenName($tokens$target'code').', not T_INLINE_THEN (code)'
+        );
+        $this->assertSame(
+            'T_INLINE_THEN',
+            $tokens$target'type',
+            'Token tokenized as '.$tokens$target'type'.', not T_INLINE_THEN (type)'
+        );
+
+    }//end testTernaryIsInlineThen()
+
+
+    /**
+     * Test the token name for an untyped constant is tokenized as T_STRING.
+     *
+     * @param string $testMarker The comment prefacing the target token.
+     *
+     * @dataProvider dataUntypedConstant
+     * @covers       PHP_CodeSniffer\Tokenizers\PHP::tokenize
+     *
+     * @return void
+     */
+    public function testUntypedConstant($testMarker)
+    {
+        $tokens = $this->phpcsFile->getTokens();
+        $target = $this->getTargetToken($testMarker, T_CONST);
+
+        for ($i = ($target + 1); $tokens$i'code' !== T_EQUAL; $i++) {
+            if (isset(Tokens::$emptyTokens$tokens$i'code') === true) {
+                // Ignore whitespace and comments, not interested in the tokenization of those.
+                continue;
+            }
+
+            $this->assertSame(
+                T_STRING,
+                $tokens$i'code',
+                'Token tokenized as '.Tokens::tokenName($tokens$i'code').', not T_STRING (code)'
+            );
+            $this->assertSame(
+                'T_STRING',
+                $tokens$i'type',
+                'Token tokenized as '.$tokens$i'type'.', not T_STRING (type)'
+            );
+        }
+
+    }//end testUntypedConstant()
+
+
+    /**
+     * Data provider.
+     *
+     * @see testUntypedConstant()
+     *
+     * @return array<string, array<string, string>>
+     */
+    public static function dataUntypedConstant()
+    {
+        return 
+            'non OO constant (untyped)'                  => 
+                'testMarker' => '/* testGlobalConstantCannotBeTyped */',
+            ,
+            'OO constant, final, untyped'                => 
+                'testMarker' => '/* testClassConstFinalUntyped */',
+            ,
+            'OO constant, public, untyped, with comment' => 
+                'testMarker' => '/* testClassConstVisibilityUntyped */',
+            ,
+        ;
+
+    }//end dataUntypedConstant()
+
+
+    /**
+     * Test the tokens in the type of a typed constant as well as the constant name are tokenized correctly.
+     *
+     * @param string $testMarker The comment prefacing the target token.
+     * @param string $sequence   The expected token sequence.
+     *
+     * @dataProvider dataTypedConstant
+     * @dataProvider dataNullableTypedConstant
+     * @dataProvider dataUnionTypedConstant
+     * @dataProvider dataIntersectionTypedConstant
+     * @covers       PHP_CodeSniffer\Tokenizers\PHP::tokenize
+     *
+     * @return void
+     */
+    public function testTypedConstant($testMarker, array $sequence)
+    {
+        $tokens = $this->phpcsFile->getTokens();
+        $target = $this->getTargetToken($testMarker, T_CONST);
+
+        $current = 0;
+        for ($i = ($target + 1); $tokens$i'code' !== T_EQUAL; $i++) {
+            if (isset(Tokens::$emptyTokens$tokens$i'code') === true) {
+                // Ignore whitespace and comments, not interested in the tokenization of those.
+                continue;
+            }
+
+            $this->assertSame(
+                $sequence$current,
+                $tokens$i'code',
+                'Token tokenized as '.Tokens::tokenName($tokens$i'code').', not '.Tokens::tokenName($sequence$current).' (code)'
+            );
+
+            ++$current;
+        }
+
+    }//end testTypedConstant()
+
+
+    /**
+     * Data provider.
+     *
+     * @see testTypedConstant()
+     *
+     * @return array<string, array<string, string>>
+     */
+    public static function dataTypedConstant()
+    {
+        $data = 
+            'simple type: true'                        => 
+                'testMarker' => '/* testClassConstTypedTrue */',
+                'sequence'   => T_TRUE,
+            ,
+            'simple type: false'                       => 
+                'testMarker' => '/* testClassConstTypedFalse */',
+                'sequence'   => T_FALSE,
+            ,
+            'simple type: null'                        => 
+                'testMarker' => '/* testClassConstTypedNull */',
+                'sequence'   => T_NULL,
+            ,
+            'simple type: bool'                        => 
+                'testMarker' => '/* testClassConstTypedBool */',
+                'sequence'   => T_STRING,
+            ,
+            'simple type: int'                         => 
+                'testMarker' => '/* testClassConstTypedInt */',
+                'sequence'   => T_STRING,
+            ,
+            'simple type: float'                       => 
+                'testMarker' => '/* testClassConstTypedFloat */',
+                'sequence'   => T_STRING,
+            ,
+            'simple type: string'                      => 
+                'testMarker' => '/* testClassConstTypedString */',
+                'sequence'   => T_STRING,
+            ,
+            'simple type: array'                       => 
+                'testMarker' => '/* testClassConstTypedArray */',
+                'sequence'   => T_STRING,
+            ,
+            'simple type: object'                      => 
+                'testMarker' => '/* testClassConstTypedObject */',
+                'sequence'   => T_STRING,
+            ,
+            'simple type: iterable'                    => 
+                'testMarker' => '/* testClassConstTypedIterable */',
+                'sequence'   => T_STRING,
+            ,
+            'simple type: mixed'                       => 
+                'testMarker' => '/* testClassConstTypedMixed */',
+                'sequence'   => T_STRING,
+            ,
+            'simple type: unqualified name'            => 
+                'testMarker' => '/* testClassConstTypedClassUnqualified */',
+                'sequence'   => T_STRING,
+            ,
+            'simple type: fully qualified name'        => 
+                'testMarker' => '/* testClassConstTypedClassFullyQualified */',
+                'sequence'   => 
+                    T_NS_SEPARATOR,
+                    T_STRING,
+                ,
+            ,
+            'simple type: namespace relative name'     => 
+                'testMarker' => '/* testClassConstTypedClassNamespaceRelative */',
+                'sequence'   => 
+                    T_NAMESPACE,
+                    T_NS_SEPARATOR,
+                    T_STRING,
+                ,
+            ,
+            'simple type: partially qualified name'    => 
+                'testMarker' => '/* testClassConstTypedClassPartiallyQualified */',
+                'sequence'   => 
+                    T_STRING,
+                    T_NS_SEPARATOR,
+                    T_STRING,
+                ,
+            ,
+            'simple type: parent'                      => 
+                'testMarker' => '/* testClassConstTypedParent */',
+                'sequence'   => T_PARENT,
+            ,
+
+            'simple type: callable (invalid)'          => 
+                'testMarker' => '/* testClassConstTypedCallable */',
+                'sequence'   => T_CALLABLE,
+            ,
+            'simple type: void (invalid)'              => 
+                'testMarker' => '/* testClassConstTypedVoid */',
+                'sequence'   => T_STRING,
+            ,
+            'simple type: NEVER (invalid)'             => 
+                'testMarker' => '/* testClassConstTypedNever */',
+                'sequence'   => T_STRING,
+            ,
+
+            'simple type: self (only valid in enum)'   => 
+                'testMarker' => '/* testEnumConstTypedSelf */',
+                'sequence'   => T_SELF,
+            ,
+            'simple type: static (only valid in enum)' => 
+                'testMarker' => '/* testEnumConstTypedStatic */',
+                'sequence'   => T_STATIC,
+            ,
+        ;
+
+        // The constant name, as the last token in the sequence, is always T_STRING.
+        foreach ($data as $key => $value) {
+            $data$key'sequence' = T_STRING;
+        }
+
+        return $data;
+
+    }//end dataTypedConstant()
+
+
+    /**
+     * Data provider.
+     *
+     * @see testTypedConstant()
+     *
+     * @return array<string, array<string, string>>
+     */
+    public static function dataNullableTypedConstant()
+    {
+        $data = 
+            // Global constants cannot be typed in PHP, but that's not our concern.
+            'global typed constant, invalid, ?int'       => 
+                'testMarker' => '/* testGlobalConstantTypedShouldStillBeHandled */',
+                'sequence'   => T_STRING,
+            ,
+
+            // OO constants.
+            'nullable type: true'                        => 
+                'testMarker' => '/* testTraitConstTypedNullableTrue */',
+                'sequence'   => T_TRUE,
+            ,
+            'nullable type: false'                       => 
+                'testMarker' => '/* testTraitConstTypedNullableFalse */',
+                'sequence'   => T_FALSE,
+            ,
+            'nullable type: null'                        => 
+                'testMarker' => '/* testTraitConstTypedNullableNull */',
+                'sequence'   => T_NULL,
+            ,
+            'nullable type: bool'                        => 
+                'testMarker' => '/* testTraitConstTypedNullableBool */',
+                'sequence'   => T_STRING,
+            ,
+            'nullable type: int'                         => 
+                'testMarker' => '/* testTraitConstTypedNullableInt */',
+                'sequence'   => T_STRING,
+            ,
+            'nullable type: float'                       => 
+                'testMarker' => '/* testTraitConstTypedNullableFloat */',
+                'sequence'   => T_STRING,
+            ,
+            'nullable type: string'                      => 
+                'testMarker' => '/* testTraitConstTypedNullableString */',
+                'sequence'   => T_STRING,
+            ,
+            'nullable type: array'                       => 
+                'testMarker' => '/* testTraitConstTypedNullableArray */',
+                'sequence'   => T_STRING,
+            ,
+            'nullable type: object'                      => 
+                'testMarker' => '/* testTraitConstTypedNullableObject */',
+                'sequence'   => T_STRING,
+            ,
+            'nullable type: iterable'                    => 
+                'testMarker' => '/* testTraitConstTypedNullableIterable */',
+                'sequence'   => T_STRING,
+            ,
+            'nullable type: mixed'                       => 
+                'testMarker' => '/* testTraitConstTypedNullableMixed */',
+                'sequence'   => T_STRING,
+            ,
+            'nullable type: unqualified name'            => 
+                'testMarker' => '/* testTraitConstTypedNullableClassUnqualified */',
+                'sequence'   => T_STRING,
+            ,
+            'nullable type: fully qualified name'        => 
+                'testMarker' => '/* testTraitConstTypedNullableClassFullyQualified */',
+                'sequence'   => 
+                    T_NS_SEPARATOR,
+                    T_STRING,
+                ,
+            ,
+            'nullable type: namespace relative name'     => 
+                'testMarker' => '/* testTraitConstTypedNullableClassNamespaceRelative */',
+                'sequence'   => 
+                    T_NAMESPACE,
+                    T_NS_SEPARATOR,
+                    T_STRING,
+                ,
+            ,
+            'nullable type: partially qualified name'    => 
+                'testMarker' => '/* testTraitConstTypedNullableClassPartiallyQualified */',
+                'sequence'   => 
+                    T_STRING,
+                    T_NS_SEPARATOR,
+                    T_STRING,
+                ,
+            ,
+            'nullable type: parent'                      => 
+                'testMarker' => '/* testTraitConstTypedNullableParent */',
+                'sequence'   => T_PARENT,
+            ,
+
+            'nullable type: self (only valid in enum)'   => 
+                'testMarker' => '/* testEnumConstTypedNullableSelf */',
+                'sequence'   => T_SELF,
+            ,
+            'nullable type: static (only valid in enum)' => 
+                'testMarker' => '/* testEnumConstTypedNullableStatic */',
+                'sequence'   => T_STATIC,
+            ,
+        ;
+
+        // The nullable operator, as the first token in the sequence, is always T_NULLABLE.
+        // The constant name, as the last token in the sequence, is always T_STRING.
+        foreach ($data as $key => $value) {
+            array_unshift($data$key'sequence', T_NULLABLE);
+            $data$key'sequence' = T_STRING;
+        }
+
+        return $data;
+
+    }//end dataNullableTypedConstant()
+
+
+    /**
+     * Data provider.
+     *
+     * @see testTypedConstant()
+     *
+     * @return array<string, array<string, string>>
+     */
+    public static function dataUnionTypedConstant()
+    {
+        $data = 
+            'union type: true|null'                      => 
+                'testMarker' => '/* testInterfaceConstTypedUnionTrueNull */',
+                'sequence'   => 
+                    T_TRUE,
+                    T_TYPE_UNION,
+                    T_NULL,
+                ,
+            ,
+            'union type: array|object'                   => 
+                'testMarker' => '/* testInterfaceConstTypedUnionArrayObject */',
+                'sequence'   => 
+                    T_STRING,
+                    T_TYPE_UNION,
+                    T_STRING,
+                ,
+            ,
+            'union type: string|array|int'               => 
+                'testMarker' => '/* testInterfaceConstTypedUnionStringArrayInt */',
+                'sequence'   => 
+                    T_STRING,
+                    T_TYPE_UNION,
+                    T_STRING,
+                    T_TYPE_UNION,
+                    T_STRING,
+                ,
+            ,
+            'union type: float|bool|array'               => 
+                'testMarker' => '/* testInterfaceConstTypedUnionFloatBoolArray */',
+                'sequence'   => 
+                    T_STRING,
+                    T_TYPE_UNION,
+                    T_STRING,
+                    T_TYPE_UNION,
+                    T_STRING,
+                ,
+            ,
+            'union type: iterable|false'                 => 
+                'testMarker' => '/* testInterfaceConstTypedUnionIterableFalse */',
+                'sequence'   => 
+                    T_STRING,
+                    T_TYPE_UNION,
+                    T_FALSE,
+                ,
+            ,
+            'union type: Unqualified|Namespace\Relative' => 
+                'testMarker' => '/* testInterfaceConstTypedUnionUnqualifiedNamespaceRelative */',
+                'sequence'   => 
+                    T_STRING,
+                    T_TYPE_UNION,
+                    T_NAMESPACE,
+                    T_NS_SEPARATOR,
+                    T_STRING,
+                ,
+            ,
+            'union type: FQN|Partial'                    => 
+                'testMarker' => '/* testInterfaceConstTypedUnionFullyQualifiedPartiallyQualified */',
+                'sequence'   => 
+                    T_NS_SEPARATOR,
+                    T_STRING,
+                    T_NS_SEPARATOR,
+                    T_STRING,
+                    T_TYPE_UNION,
+                    T_STRING,
+                    T_NS_SEPARATOR,
+                    T_STRING,
+                ,
+            ,
+        ;
+
+        // The constant name, as the last token in the sequence, is always T_STRING.
+        foreach ($data as $key => $value) {
+            $data$key'sequence' = T_STRING;
+        }
+
+        return $data;
+
+    }//end dataUnionTypedConstant()
+
+
+    /**
+     * Data provider.
+     *
+     * @see testTypedConstant()
+     *
+     * @return array<string, array<string, string>>
+     */
+    public static function dataIntersectionTypedConstant()
+    {
+        $data = 
+            'intersection type: Unqualified&Namespace\Relative' => 
+                'testMarker' => '/* testEnumConstTypedIntersectUnqualifiedNamespaceRelative */',
+                'sequence'   => 
+                    T_STRING,
+                    T_TYPE_INTERSECTION,
+                    T_NAMESPACE,
+                    T_NS_SEPARATOR,
+                    T_STRING,
+                ,
+            ,
+            'intersection type: FQN&Partial'                    => 
+                'testMarker' => '/* testEnumConstTypedIntersectFullyQualifiedPartiallyQualified */',
+                'sequence'   => 
+                    T_NS_SEPARATOR,
+                    T_STRING,
+                    T_NS_SEPARATOR,
+                    T_STRING,
+                    T_TYPE_INTERSECTION,
+                    T_STRING,
+                    T_NS_SEPARATOR,
+                    T_STRING,
+                ,
+            ,
+        ;
+
+        // The constant name, as the last token in the sequence, is always T_STRING.
+        foreach ($data as $key => $value) {
+            $data$key'sequence' = T_STRING;
+        }
+
+        return $data;
+
+    }//end dataIntersectionTypedConstant()
+
+
+}//end class

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

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

@@ -19,17 +19,17 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+use PHP_CodeSniffer\Util\Tokens;
 
-class UndoNamespacedNameSingleTokenTest extends AbstractMethodUnitTest
+final class UndoNamespacedNameSingleTokenTest extends AbstractTokenizerTestCase
 {
 
 
     /**
      * Test that identifier names are tokenized the same across PHP versions, based on the PHP 5/7 tokenization.
      *
-     * @param string $testMarker     The comment prefacing the test.
-     * @param array  $expectedTokens The tokenization expected.
+     * @param string                       $testMarker     The comment prefacing the test.
+     * @param array<array<string, string>> $expectedTokens The tokenization expected.
      *
      * @dataProvider dataIdentifierTokenization
      * @covers       PHP_CodeSniffer\Tokenizers\PHP::tokenize
@@ -38,12 +38,20 @@
      */
     public function testIdentifierTokenization($testMarker, $expectedTokens)
     {
-        $tokens     = self::$phpcsFile->getTokens();
+        $tokens     = $this->phpcsFile->getTokens();
         $identifier = $this->getTargetToken($testMarker, constant($expectedTokens0'type'));
 
         foreach ($expectedTokens as $key => $tokenInfo) {
-            $this->assertSame(constant($tokenInfo'type'), $tokens$identifier'code');
-            $this->assertSame($tokenInfo'type', $tokens$identifier'type');
+            $this->assertSame(
+                constant($tokenInfo'type'),
+                $tokens$identifier'code',
+                'Token tokenized as '.Tokens::tokenName($tokens$identifier'code').', not '.$tokenInfo'type'.' (code)'
+            );
+            $this->assertSame(
+                $tokenInfo'type',
+                $tokens$identifier'type',
+                'Token tokenized as '.$tokens$identifier'type'.', not '.$tokenInfo'type'.' (type)'
+            );
             $this->assertSame($tokenInfo'content', $tokens$identifier'content');
 
             ++$identifier;
@@ -57,14 +65,14 @@
      *
      * @see testIdentifierTokenization()
      *
-     * @return array
+     * @return array<string, array<string, string|array<array<string, string>>>>
      */
-    public function dataIdentifierTokenization()
+    public static function dataIdentifierTokenization()
     {
         return 
-            
-                '/* testNamespaceDeclaration */',
-                
+            'namespace declaration'                                                                       => 
+                'testMarker'     => '/* testNamespaceDeclaration */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_STRING',
                         'content' => 'Package',
@@ -75,9 +83,9 @@
                     ,
                 ,
             ,
-            
-                '/* testNamespaceDeclarationWithLevels */',
-                
+            'namespace declaration, multi-level'                                                          => 
+                'testMarker'     => '/* testNamespaceDeclarationWithLevels */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_STRING',
                         'content' => 'Vendor',
@@ -104,9 +112,9 @@
                     ,
                 ,
             ,
-            
-                '/* testUseStatement */',
-                
+            'import use statement, class'                                                                 => 
+                'testMarker'     => '/* testUseStatement */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_STRING',
                         'content' => 'ClassName',
@@ -117,9 +125,9 @@
                     ,
                 ,
             ,
-            
-                '/* testUseStatementWithLevels */',
-                
+            'import use statement, class, multi-level'                                                    => 
+                'testMarker'     => '/* testUseStatementWithLevels */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_STRING',
                         'content' => 'Vendor',
@@ -146,9 +154,9 @@
                     ,
                 ,
             ,
-            
-                '/* testFunctionUseStatement */',
-                
+            'import use statement, function'                                                              => 
+                'testMarker'     => '/* testFunctionUseStatement */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_STRING',
                         'content' => 'function',
@@ -167,9 +175,9 @@
                     ,
                 ,
             ,
-            
-                '/* testFunctionUseStatementWithLevels */',
-                
+            'import use statement, function, multi-level'                                                 => 
+                'testMarker'     => '/* testFunctionUseStatementWithLevels */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_STRING',
                         'content' => 'function',
@@ -204,9 +212,9 @@
                     ,
                 ,
             ,
-            
-                '/* testConstantUseStatement */',
-                
+            'import use statement, constant'                                                              => 
+                'testMarker'     => '/* testConstantUseStatement */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_STRING',
                         'content' => 'const',
@@ -225,9 +233,9 @@
                     ,
                 ,
             ,
-            
-                '/* testConstantUseStatementWithLevels */',
-                
+            'import use statement, constant, multi-level'                                                 => 
+                'testMarker'     => '/* testConstantUseStatementWithLevels */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_STRING',
                         'content' => 'const',
@@ -262,9 +270,9 @@
                     ,
                 ,
             ,
-            
-                '/* testMultiUseUnqualified */',
-                
+            'import use statement, multi-statement, unqualified class'                                    => 
+                'testMarker'     => '/* testMultiUseUnqualified */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_STRING',
                         'content' => 'UnqualifiedClassName',
@@ -275,9 +283,9 @@
                     ,
                 ,
             ,
-            
-                '/* testMultiUsePartiallyQualified */',
-                
+            'import use statement, multi-statement, partially qualified class'                            => 
+                'testMarker'     => '/* testMultiUsePartiallyQualified */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_STRING',
                         'content' => 'Sublevel',
@@ -296,9 +304,9 @@
                     ,
                 ,
             ,
-            
-                '/* testGroupUseStatement */',
-                
+            'group use statement, multi-level prefix, mix inside group'                                   => 
+                'testMarker'     => '/* testGroupUseStatement */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_STRING',
                         'content' => 'Vendor',
@@ -492,9 +500,9 @@
                     ,
                 ,
             ,
-            
-                '/* testClassName */',
-                
+            'class declaration'                                                                           => 
+                'testMarker'     => '/* testClassName */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_STRING',
                         'content' => 'MyClass',
@@ -506,9 +514,9 @@
                     ,
                 ,
             ,
-            
-                '/* testExtendedFQN */',
-                
+            'class declaration, extends fully qualified name'                                             => 
+                'testMarker'     => '/* testExtendedFQN */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_NS_SEPARATOR',
                         'content' => '\\',
@@ -540,9 +548,9 @@
                     ,
                 ,
             ,
-            
-                '/* testImplementsRelative */',
-                
+            'class declaration, implements namespace relative name'                                       => 
+                'testMarker'     => '/* testImplementsRelative */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_NAMESPACE',
                         'content' => 'namespace',
@@ -561,9 +569,9 @@
                     ,
                 ,
             ,
-            
-                '/* testImplementsFQN */',
-                
+            'class declaration, implements fully qualified name'                                          => 
+                'testMarker'     => '/* testImplementsFQN */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_NS_SEPARATOR',
                         'content' => '\\',
@@ -586,9 +594,9 @@
                     ,
                 ,
             ,
-            
-                '/* testImplementsUnqualified */',
-                
+            'class declaration, implements unqualified name'                                              => 
+                'testMarker'     => '/* testImplementsUnqualified */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_STRING',
                         'content' => 'Unqualified',
@@ -599,9 +607,9 @@
                     ,
                 ,
             ,
-            
-                '/* testImplementsPartiallyQualified */',
-                
+            'class declaration, implements partially qualified name'                                      => 
+                'testMarker'     => '/* testImplementsPartiallyQualified */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_STRING',
                         'content' => 'Sub',
@@ -629,9 +637,9 @@
                     ,
                 ,
             ,
-            
-                '/* testFunctionName */',
-                
+            'method declaration'                                                                          => 
+                'testMarker'     => '/* testFunctionName */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_STRING',
                         'content' => 'function_name',
@@ -642,9 +650,9 @@
                     ,
                 ,
             ,
-            
-                '/* testTypeDeclarationRelative */',
-                
+            'param type declaration, namespace relative name'                                             => 
+                'testMarker'     => '/* testTypeDeclarationRelative */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_NAMESPACE',
                         'content' => 'namespace',
@@ -667,9 +675,9 @@
                     ,
                 ,
             ,
-            
-                '/* testTypeDeclarationFQN */',
-                
+            'param type declaration, fully qualified name'                                                => 
+                'testMarker'     => '/* testTypeDeclarationFQN */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_NS_SEPARATOR',
                         'content' => '\\',
@@ -700,9 +708,9 @@
                     ,
                 ,
             ,
-            
-                '/* testTypeDeclarationUnqualified */',
-                
+            'param type declaration, unqualified name'                                                    => 
+                'testMarker'     => '/* testTypeDeclarationUnqualified */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_STRING',
                         'content' => 'Unqualified',
@@ -717,9 +725,9 @@
                     ,
                 ,
             ,
-            
-                '/* testTypeDeclarationPartiallyQualified */',
-                
+            'param type declaration, partially qualified name'                                            => 
+                'testMarker'     => '/* testTypeDeclarationPartiallyQualified */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_NULLABLE',
                         'content' => '?',
@@ -742,9 +750,9 @@
                     ,
                 ,
             ,
-            
-                '/* testReturnTypeFQN */',
-                
+            'return type declaration, fully qualified name'                                               => 
+                'testMarker'     => '/* testReturnTypeFQN */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_NULLABLE',
                         'content' => '?',
@@ -763,9 +771,9 @@
                     ,
                 ,
             ,
-            
-                '/* testFunctionCallRelative */',
-                
+            'function call, namespace relative name'                                                      => 
+                'testMarker'     => '/* testFunctionCallRelative */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_NAMESPACE',
                         'content' => 'NameSpace',
@@ -784,9 +792,9 @@
                     ,
                 ,
             ,
-            
-                '/* testFunctionCallFQN */',
-                
+            'function call, fully qualified name'                                                         => 
+                'testMarker'     => '/* testFunctionCallFQN */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_NS_SEPARATOR',
                         'content' => '\\',
@@ -817,9 +825,9 @@
                     ,
                 ,
             ,
-            
-                '/* testFunctionCallUnqualified */',
-                
+            'function call, unqualified name'                                                             => 
+                'testMarker'     => '/* testFunctionCallUnqualified */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_STRING',
                         'content' => 'function_name',
@@ -830,9 +838,9 @@
                     ,
                 ,
             ,
-            
-                '/* testFunctionPartiallyQualified */',
-                
+            'function call, partially qualified name'                                                     => 
+                'testMarker'     => '/* testFunctionCallPartiallyQualified */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_STRING',
                         'content' => 'Level',
@@ -851,9 +859,9 @@
                     ,
                 ,
             ,
-            
-                '/* testCatchRelative */',
-                
+            'catch, namespace relative name'                                                              => 
+                'testMarker'     => '/* testCatchRelative */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_NAMESPACE',
                         'content' => 'namespace',
@@ -880,9 +888,9 @@
                     ,
                 ,
             ,
-            
-                '/* testCatchFQN */',
-                
+            'catch, fully qualified name'                                                                 => 
+                'testMarker'     => '/* testCatchFQN */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_NS_SEPARATOR',
                         'content' => '\\',
@@ -897,9 +905,9 @@
                     ,
                 ,
             ,
-            
-                '/* testCatchUnqualified */',
-                
+            'catch, unqualified name'                                                                     => 
+                'testMarker'     => '/* testCatchUnqualified */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_STRING',
                         'content' => 'Exception',
@@ -910,9 +918,9 @@
                     ,
                 ,
             ,
-            
-                '/* testCatchPartiallyQualified */',
-                
+            'catch, partially qualified name'                                                             => 
+                'testMarker'     => '/* testCatchPartiallyQualified */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_STRING',
                         'content' => 'Level',
@@ -931,9 +939,9 @@
                     ,
                 ,
             ,
-            
-                '/* testNewRelative */',
-                
+            'class instantiation, namespace relative name'                                                => 
+                'testMarker'     => '/* testNewRelative */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_NAMESPACE',
                         'content' => 'namespace',
@@ -952,9 +960,9 @@
                     ,
                 ,
             ,
-            
-                '/* testNewFQN */',
-                
+            'class instantiation, fully qualified name'                                                   => 
+                'testMarker'     => '/* testNewFQN */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_NS_SEPARATOR',
                         'content' => '\\',
@@ -977,9 +985,9 @@
                     ,
                 ,
             ,
-            
-                '/* testNewUnqualified */',
-                
+            'class instantiation, unqualified name'                                                       => 
+                'testMarker'     => '/* testNewUnqualified */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_STRING',
                         'content' => 'ClassName',
@@ -990,9 +998,9 @@
                     ,
                 ,
             ,
-            
-                '/* testNewPartiallyQualified */',
-                
+            'class instantiation, partially qualified name'                                               => 
+                'testMarker'     => '/* testNewPartiallyQualified */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_STRING',
                         'content' => 'Level',
@@ -1011,9 +1019,9 @@
                     ,
                 ,
             ,
-            
-                '/* testDoubleColonRelative */',
-                
+            'double colon class access, namespace relative name'                                          => 
+                'testMarker'     => '/* testDoubleColonRelative */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_NAMESPACE',
                         'content' => 'namespace',
@@ -1032,9 +1040,9 @@
                     ,
                 ,
             ,
-            
-                '/* testDoubleColonFQN */',
-                
+            'double colon class access, fully qualified name'                                             => 
+                'testMarker'     => '/* testDoubleColonFQN */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_NS_SEPARATOR',
                         'content' => '\\',
@@ -1049,9 +1057,9 @@
                     ,
                 ,
             ,
-            
-                '/* testDoubleColonUnqualified */',
-                
+            'double colon class access, unqualified name'                                                 => 
+                'testMarker'     => '/* testDoubleColonUnqualified */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_STRING',
                         'content' => 'ClassName',
@@ -1062,9 +1070,9 @@
                     ,
                 ,
             ,
-            
-                '/* testDoubleColonPartiallyQualified */',
-                
+            'double colon class access, partially qualified name'                                         => 
+                'testMarker'     => '/* testDoubleColonPartiallyQualified */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_STRING',
                         'content' => 'Level',
@@ -1083,9 +1091,9 @@
                     ,
                 ,
             ,
-            
-                '/* testInstanceOfRelative */',
-                
+            'instanceof, namespace relative name'                                                         => 
+                'testMarker'     => '/* testInstanceOfRelative */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_NAMESPACE',
                         'content' => 'namespace',
@@ -1104,9 +1112,9 @@
                     ,
                 ,
             ,
-            
-                '/* testInstanceOfFQN */',
-                
+            'instanceof, fully qualified name'                                                            => 
+                'testMarker'     => '/* testInstanceOfFQN */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_NS_SEPARATOR',
                         'content' => '\\',
@@ -1129,9 +1137,9 @@
                     ,
                 ,
             ,
-            
-                '/* testInstanceOfUnqualified */',
-                
+            'instanceof, unqualified name'                                                                => 
+                'testMarker'     => '/* testInstanceOfUnqualified */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_STRING',
                         'content' => 'ClassName',
@@ -1142,9 +1150,9 @@
                     ,
                 ,
             ,
-            
-                '/* testInstanceOfPartiallyQualified */',
-                
+            'instanceof, partially qualified name'                                                        => 
+                'testMarker'     => '/* testInstanceOfPartiallyQualified */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_STRING',
                         'content' => 'Partially',
@@ -1163,9 +1171,9 @@
                     ,
                 ,
             ,
-            
-                '/* testInvalidInPHP8Whitespace */',
-                
+            'function call, namespace relative, with whitespace (invalid in PHP 8)'                       => 
+                'testMarker'     => '/* testInvalidInPHP8Whitespace */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_NAMESPACE',
                         'content' => 'namespace',
@@ -1213,9 +1221,9 @@
                     ,
                 ,
             ,
-            
-                '/* testInvalidInPHP8Comments */',
-                
+            'double colon class access, fully qualified, with whitespace and comments (invalid in PHP 8)' => 
+                'testMarker'     => '/* testInvalidInPHP8Comments */',
+                'expectedTokens' => 
                     
                         'type'    => 'T_NS_SEPARATOR',
                         'content' => '\\',

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

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

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

@@ -13,10 +13,10 @@
 
 namespace PHP_CodeSniffer\Tests\Standards;
 
-use PHP_CodeSniffer\Config;
 use PHP_CodeSniffer\Exceptions\RuntimeException;
 use PHP_CodeSniffer\Ruleset;
 use PHP_CodeSniffer\Files\LocalFile;
+use PHP_CodeSniffer\Tests\ConfigDouble;
 use PHP_CodeSniffer\Util\Common;
 use PHPUnit\Framework\TestCase;
 
@@ -134,7 +134,7 @@
         if (isset($GLOBALS'PHP_CODESNIFFER_CONFIG') === true) {
             $config = $GLOBALS'PHP_CODESNIFFER_CONFIG';
         } else {
-            $config        = new Config();
+            $config        = new ConfigDouble();
             $config->cache = false;
             $GLOBALS'PHP_CODESNIFFER_CONFIG' = $config;
         }
@@ -190,15 +190,17 @@
 
                 // Check for a .fixed file to check for accuracy of fixes.
                 $fixedFile = $testFile.'.fixed';
+                $filename  = basename($testFile);
                 if (file_exists($fixedFile) === true) {
                     $diff = $phpcsFile->fixer->generateDiff($fixedFile);
                     if (trim($diff) !== '') {
-                        $filename          = basename($testFile);
                         $fixedFilename     = basename($fixedFile);
                         $failureMessages = "Fixed version of $filename does not match expected version in $fixedFilename; the diff is\n$diff";
                     }
+                } else if (is_callable($this, 'addWarning') === true) {
+                    $this->addWarning("Missing fixed version of $filename to verify the accuracy of fixes, while the sniff is making fixes against the test case file");
                 }
-            }
+            }//end if
 
             // Restore the config.
             $config->setSettings($oldConfig);

roundcubemail-1.5.tar.gz/vendor/symfony/polyfill-ctype/composer.json 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 Added

roundcubemail-1.5.tar.gz/vendor/symfony/polyfill-mbstring/LICENSE Added

@@ -0,0 +1,19 @@
+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-mbstring/Mbstring.php Added

@@ -0,0 +1,947 @@
+<?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\Mbstring;
+
+/**
+ * Partial mbstring implementation in PHP, iconv based, UTF-8 centric.
+ *
+ * Implemented:
+ * - mb_chr                  - Returns a specific character from its Unicode code point
+ * - mb_convert_encoding     - Convert character encoding
+ * - mb_convert_variables    - Convert character code in variable(s)
+ * - mb_decode_mimeheader    - Decode string in MIME header field
+ * - mb_encode_mimeheader    - Encode string for MIME header XXX NATIVE IMPLEMENTATION IS REALLY BUGGED
+ * - mb_decode_numericentity - Decode HTML numeric string reference to character
+ * - mb_encode_numericentity - Encode character to HTML numeric string reference
+ * - mb_convert_case         - Perform case folding on a string
+ * - mb_detect_encoding      - Detect character encoding
+ * - mb_get_info             - Get internal settings of mbstring
+ * - mb_http_input           - Detect HTTP input character encoding
+ * - mb_http_output          - Set/Get HTTP output character encoding
+ * - mb_internal_encoding    - Set/Get internal character encoding
+ * - mb_list_encodings       - Returns an array of all supported encodings
+ * - mb_ord                  - Returns the Unicode code point of a character
+ * - mb_output_handler       - Callback function converts character encoding in output buffer
+ * - mb_scrub                - Replaces ill-formed byte sequences with substitute characters
+ * - mb_strlen               - Get string length
+ * - mb_strpos               - Find position of first occurrence of string in a string
+ * - mb_strrpos              - Find position of last occurrence of a string in a string
+ * - mb_str_split            - Convert a string to an array
+ * - mb_strtolower           - Make a string lowercase
+ * - mb_strtoupper           - Make a string uppercase
+ * - mb_substitute_character - Set/Get substitution character
+ * - mb_substr               - Get part of string
+ * - mb_stripos              - Finds position of first occurrence of a string within another, case insensitive
+ * - mb_stristr              - Finds first occurrence of a string within another, case insensitive
+ * - mb_strrchr              - Finds the last occurrence of a character in a string within another
+ * - mb_strrichr             - Finds the last occurrence of a character in a string within another, case insensitive
+ * - mb_strripos             - Finds position of last occurrence of a string within another, case insensitive
+ * - mb_strstr               - Finds first occurrence of a string within another
+ * - mb_strwidth             - Return width of string
+ * - mb_substr_count         - Count the number of substring occurrences
+ *
+ * Not implemented:
+ * - mb_convert_kana         - Convert "kana" one from another ("zen-kaku", "han-kaku" and more)
+ * - mb_ereg_*               - Regular expression with multibyte support
+ * - mb_parse_str            - Parse GET/POST/COOKIE data and set global variable
+ * - mb_preferred_mime_name  - Get MIME charset string
+ * - mb_regex_encoding       - Returns current encoding for multibyte regex as string
+ * - mb_regex_set_options    - Set/Get the default options for mbregex functions
+ * - mb_send_mail            - Send encoded mail
+ * - mb_split                - Split multibyte string using regular expression
+ * - mb_strcut               - Get part of string
+ * - mb_strimwidth           - Get truncated string with specified width
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @internal
+ */
+final class Mbstring
+{
+    public const MB_CASE_FOLD = \PHP_INT_MAX;
+
+    private const SIMPLE_CASE_FOLD = 
+        'µ', 'ſ', "\xCD\x85", 'ς', "\xCF\x90", "\xCF\x91", "\xCF\x95", "\xCF\x96", "\xCF\xB0", "\xCF\xB1", "\xCF\xB5", "\xE1\xBA\x9B", "\xE1\xBE\xBE",
+        'μ', 's', 'ι',        'σ', 'β',        'θ',        'φ',        'π',        'κ',        'ρ',        'ε',        "\xE1\xB9\xA1", 'ι',
+    ;
+
+    private static $encodingList = 'ASCII', 'UTF-8';
+    private static $language = 'neutral';
+    private static $internalEncoding = 'UTF-8';
+
+    public static function mb_convert_encoding($s, $toEncoding, $fromEncoding = null)
+    {
+        if (\is_array($fromEncoding) || (null !== $fromEncoding && false !== strpos($fromEncoding, ','))) {
+            $fromEncoding = self::mb_detect_encoding($s, $fromEncoding);
+        } else {
+            $fromEncoding = self::getEncoding($fromEncoding);
+        }
+
+        $toEncoding = self::getEncoding($toEncoding);
+
+        if ('BASE64' === $fromEncoding) {
+            $s = base64_decode($s);
+            $fromEncoding = $toEncoding;
+        }
+
+        if ('BASE64' === $toEncoding) {
+            return base64_encode($s);
+        }
+
+        if ('HTML-ENTITIES' === $toEncoding || 'HTML' === $toEncoding) {
+            if ('HTML-ENTITIES' === $fromEncoding || 'HTML' === $fromEncoding) {
+                $fromEncoding = 'Windows-1252';
+            }
+            if ('UTF-8' !== $fromEncoding) {
+                $s = iconv($fromEncoding, 'UTF-8//IGNORE', $s);
+            }
+
+            return preg_replace_callback('/\x80-\xFF+/', __CLASS__, 'html_encoding_callback', $s);
+        }
+
+        if ('HTML-ENTITIES' === $fromEncoding) {
+            $s = html_entity_decode($s, \ENT_COMPAT, 'UTF-8');
+            $fromEncoding = 'UTF-8';
+        }
+
+        return iconv($fromEncoding, $toEncoding.'//IGNORE', $s);
+    }
+
+    public static function mb_convert_variables($toEncoding, $fromEncoding, &...$vars)
+    {
+        $ok = true;
+        array_walk_recursive($vars, function (&$v) use (&$ok, $toEncoding, $fromEncoding) {
+            if (false === $v = self::mb_convert_encoding($v, $toEncoding, $fromEncoding)) {
+                $ok = false;
+            }
+        });
+
+        return $ok ? $fromEncoding : false;
+    }
+
+    public static function mb_decode_mimeheader($s)
+    {
+        return iconv_mime_decode($s, 2, self::$internalEncoding);
+    }
+
+    public static function mb_encode_mimeheader($s, $charset = null, $transferEncoding = null, $linefeed = null, $indent = null)
+    {
+        trigger_error('mb_encode_mimeheader() is bugged. Please use iconv_mime_encode() instead', \E_USER_WARNING);
+    }
+
+    public static function mb_decode_numericentity($s, $convmap, $encoding = null)
+    {
+        if (null !== $s && !\is_scalar($s) && !(\is_object($s) && method_exists($s, '__toString'))) {
+            trigger_error('mb_decode_numericentity() expects parameter 1 to be string, '.\gettype($s).' given', \E_USER_WARNING);
+
+            return null;
+        }
+
+        if (!\is_array($convmap) || (80000 > \PHP_VERSION_ID && !$convmap)) {
+            return false;
+        }
+
+        if (null !== $encoding && !\is_scalar($encoding)) {
+            trigger_error('mb_decode_numericentity() expects parameter 3 to be string, '.\gettype($s).' given', \E_USER_WARNING);
+
+            return '';  // Instead of null (cf. mb_encode_numericentity).
+        }
+
+        $s = (string) $s;
+        if ('' === $s) {
+            return '';
+        }
+
+        $encoding = self::getEncoding($encoding);
+
+        if ('UTF-8' === $encoding) {
+            $encoding = null;
+            if (!preg_match('//u', $s)) {
+                $s = @iconv('UTF-8', 'UTF-8//IGNORE', $s);
+            }
+        } else {
+            $s = iconv($encoding, 'UTF-8//IGNORE', $s);
+        }
+
+        $cnt = floor(\count($convmap) / 4) * 4;
+
+        for ($i = 0; $i < $cnt; $i += 4) {
+            // collector_decode_htmlnumericentity ignores $convmap$i + 3
+            $convmap$i += $convmap$i + 2;
+            $convmap$i + 1 += $convmap$i + 2;
+        }
+
+        $s = preg_replace_callback('/&#(?:0*(0-9+)|x0*(0-9a-fA-F+))(?!&);?/', function (array $m) use ($cnt, $convmap) {
+            $c = isset($m2) ? (int) hexdec($m2) : $m1;
+            for ($i = 0; $i < $cnt; $i += 4) {
+                if ($c >= $convmap$i && $c <= $convmap$i + 1) {
+                    return self::mb_chr($c - $convmap$i + 2);
+                }
+            }
+
+            return $m0;
+        }, $s);
+
+        if (null === $encoding) {
+            return $s;
+        }
+
+        return iconv('UTF-8', $encoding.'//IGNORE', $s);
+    }
+
+    public static function mb_encode_numericentity($s, $convmap, $encoding = null, $is_hex = false)
+    {
+        if (null !== $s && !\is_scalar($s) && !(\is_object($s) && method_exists($s, '__toString'))) {
+            trigger_error('mb_encode_numericentity() expects parameter 1 to be string, '.\gettype($s).' given', \E_USER_WARNING);
+
+            return null;
+        }
+
+        if (!\is_array($convmap) || (80000 > \PHP_VERSION_ID && !$convmap)) {
+            return false;
+        }
+
+        if (null !== $encoding && !\is_scalar($encoding)) {
+            trigger_error('mb_encode_numericentity() expects parameter 3 to be string, '.\gettype($s).' given', \E_USER_WARNING);
+
+            return null;  // Instead of '' (cf. mb_decode_numericentity).
+        }
+
+        if (null !== $is_hex && !\is_scalar($is_hex)) {
+            trigger_error('mb_encode_numericentity() expects parameter 4 to be boolean, '.\gettype($s).' given', \E_USER_WARNING);
+
+            return null;
+        }
+
+        $s = (string) $s;
+        if ('' === $s) {
+            return '';
+        }
+
+        $encoding = self::getEncoding($encoding);
+
+        if ('UTF-8' === $encoding) {
+            $encoding = null;
+            if (!preg_match('//u', $s)) {
+                $s = @iconv('UTF-8', 'UTF-8//IGNORE', $s);
+            }
+        } else {
+            $s = iconv($encoding, 'UTF-8//IGNORE', $s);
+        }
+
+        static $ulenMask = "\xC0" => 2, "\xD0" => 2, "\xE0" => 3, "\xF0" => 4;
+
+        $cnt = floor(\count($convmap) / 4) * 4;
+        $i = 0;
+        $len = \strlen($s);
+        $result = '';
+
+        while ($i < $len) {
+            $ulen = $s$i < "\x80" ? 1 : $ulenMask$s$i & "\xF0";
+            $uchr = substr($s, $i, $ulen);
+            $i += $ulen;
+            $c = self::mb_ord($uchr);
+
+            for ($j = 0; $j < $cnt; $j += 4) {
+                if ($c >= $convmap$j && $c <= $convmap$j + 1) {
+                    $cOffset = ($c + $convmap$j + 2) & $convmap$j + 3;
+                    $result .= $is_hex ? sprintf('&#x%X;', $cOffset) : '&#'.$cOffset.';';
+                    continue 2;
+                }
+            }
+            $result .= $uchr;
+        }
+
+        if (null === $encoding) {
+            return $result;
+        }
+
+        return iconv('UTF-8', $encoding.'//IGNORE', $result);
+    }
+
+    public static function mb_convert_case($s, $mode, $encoding = null)
+    {
+        $s = (string) $s;
+        if ('' === $s) {
+            return '';
+        }
+
+        $encoding = self::getEncoding($encoding);
+
+        if ('UTF-8' === $encoding) {
+            $encoding = null;
+            if (!preg_match('//u', $s)) {
+                $s = @iconv('UTF-8', 'UTF-8//IGNORE', $s);
+            }
+        } else {
+            $s = iconv($encoding, 'UTF-8//IGNORE', $s);
+        }
+
+        if (\MB_CASE_TITLE == $mode) {
+            static $titleRegexp = null;
+            if (null === $titleRegexp) {
+                $titleRegexp = self::getData('titleCaseRegexp');
+            }
+            $s = preg_replace_callback($titleRegexp, __CLASS__, 'title_case', $s);
+        } else {
+            if (\MB_CASE_UPPER == $mode) {
+                static $upper = null;
+                if (null === $upper) {
+                    $upper = self::getData('upperCase');
+                }
+                $map = $upper;
+            } else {
+                if (self::MB_CASE_FOLD === $mode) {
+                    static $caseFolding = null;
+                    if (null === $caseFolding) {
+                        $caseFolding = self::getData('caseFolding');
+                    }
+                    $s = strtr($s, $caseFolding);
+                }
+
+                static $lower = null;
+                if (null === $lower) {
+                    $lower = self::getData('lowerCase');
+                }
+                $map = $lower;
+            }
+
+            static $ulenMask = "\xC0" => 2, "\xD0" => 2, "\xE0" => 3, "\xF0" => 4;
+
+            $i = 0;
+            $len = \strlen($s);
+
+            while ($i < $len) {
+                $ulen = $s$i < "\x80" ? 1 : $ulenMask$s$i & "\xF0";
+                $uchr = substr($s, $i, $ulen);
+                $i += $ulen;
+
+                if (isset($map$uchr)) {
+                    $uchr = $map$uchr;
+                    $nlen = \strlen($uchr);
+
+                    if ($nlen == $ulen) {
+                        $nlen = $i;
+                        do {
+                            $s--$nlen = $uchr--$ulen;
+                        } while ($ulen);
+                    } else {
+                        $s = substr_replace($s, $uchr, $i - $ulen, $ulen);
+                        $len += $nlen - $ulen;
+                        $i += $nlen - $ulen;
+                    }
+                }
+            }
+        }
+
+        if (null === $encoding) {
+            return $s;
+        }
+
+        return iconv('UTF-8', $encoding.'//IGNORE', $s);
+    }
+
+    public static function mb_internal_encoding($encoding = null)
+    {
+        if (null === $encoding) {
+            return self::$internalEncoding;
+        }
+
+        $normalizedEncoding = self::getEncoding($encoding);
+
+        if ('UTF-8' === $normalizedEncoding || false !== @iconv($normalizedEncoding, $normalizedEncoding, ' ')) {
+            self::$internalEncoding = $normalizedEncoding;
+
+            return true;
+        }
+
+        if (80000 > \PHP_VERSION_ID) {
+            return false;
+        }
+
+        throw new \ValueError(sprintf('Argument #1 ($encoding) must be a valid encoding, "%s" given', $encoding));
+    }
+
+    public static function mb_language($lang = null)
+    {
+        if (null === $lang) {
+            return self::$language;
+        }
+
+        switch ($normalizedLang = strtolower($lang)) {
+            case 'uni':
+            case 'neutral':
+                self::$language = $normalizedLang;
+
+                return true;
+        }
+
+        if (80000 > \PHP_VERSION_ID) {
+            return false;
+        }
+
+        throw new \ValueError(sprintf('Argument #1 ($language) must be a valid language, "%s" given', $lang));
+    }
+
+    public static function mb_list_encodings()
+    {
+        return 'UTF-8';
+    }
+
+    public static function mb_encoding_aliases($encoding)
+    {
+        switch (strtoupper($encoding)) {
+            case 'UTF8':
+            case 'UTF-8':
+                return 'utf8';
+        }
+
+        return false;
+    }
+
+    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;
+            }
+            $encoding = self::$internalEncoding;
+        }
+
+        if (!\is_array($var)) {
+            return self::mb_detect_encoding($var, $encoding) || false !== @iconv($encoding, $encoding, $var);
+        }
+
+        foreach ($var as $key => $value) {
+            if (!self::mb_check_encoding($key, $encoding)) {
+                return false;
+            }
+            if (!self::mb_check_encoding($value, $encoding)) {
+                return false;
+            }
+        }
+
+        return true;
+
+    }
+
+    public static function mb_detect_encoding($str, $encodingList = null, $strict = false)
+    {
+        if (null === $encodingList) {
+            $encodingList = self::$encodingList;
+        } else {
+            if (!\is_array($encodingList)) {
+                $encodingList = array_map('trim', explode(',', $encodingList));
+            }
+            $encodingList = array_map('strtoupper', $encodingList);
+        }
+
+        foreach ($encodingList as $enc) {
+            switch ($enc) {
+                case 'ASCII':
+                    if (!preg_match('/\x80-\xFF/', $str)) {
+                        return $enc;
+                    }
+                    break;
+
+                case 'UTF8':
+                case 'UTF-8':
+                    if (preg_match('//u', $str)) {
+                        return 'UTF-8';
+                    }
+                    break;
+
+                default:
+                    if (0 === strncmp($enc, 'ISO-8859-', 9)) {
+                        return $enc;
+                    }
+            }
+        }
+
+        return false;
+    }
+
+    public static function mb_detect_order($encodingList = null)
+    {
+        if (null === $encodingList) {
+            return self::$encodingList;
+        }
+
+        if (!\is_array($encodingList)) {
+            $encodingList = array_map('trim', explode(',', $encodingList));
+        }
+        $encodingList = array_map('strtoupper', $encodingList);
+
+        foreach ($encodingList as $enc) {
+            switch ($enc) {
+                default:
+                    if (strncmp($enc, 'ISO-8859-', 9)) {
+                        return false;
+                    }
+                    // no break
+                case 'ASCII':
+                case 'UTF8':
+                case 'UTF-8':
+            }
+        }
+
+        self::$encodingList = $encodingList;
+
+        return true;
+    }
+
+    public static function mb_strlen($s, $encoding = null)
+    {
+        $encoding = self::getEncoding($encoding);
+        if ('CP850' === $encoding || 'ASCII' === $encoding) {
+            return \strlen($s);
+        }
+
+        return @iconv_strlen($s, $encoding);
+    }
+
+    public static function mb_strpos($haystack, $needle, $offset = 0, $encoding = null)
+    {
+        $encoding = self::getEncoding($encoding);
+        if ('CP850' === $encoding || 'ASCII' === $encoding) {
+            return strpos($haystack, $needle, $offset);
+        }
+
+        $needle = (string) $needle;
+        if ('' === $needle) {
+            if (80000 > \PHP_VERSION_ID) {
+                trigger_error(__METHOD__.': Empty delimiter', \E_USER_WARNING);
+
+                return false;
+            }
+
+            return 0;
+        }
+
+        return iconv_strpos($haystack, $needle, $offset, $encoding);
+    }
+
+    public static function mb_strrpos($haystack, $needle, $offset = 0, $encoding = null)
+    {
+        $encoding = self::getEncoding($encoding);
+        if ('CP850' === $encoding || 'ASCII' === $encoding) {
+            return strrpos($haystack, $needle, $offset);
+        }
+
+        if ($offset != (int) $offset) {
+            $offset = 0;
+        } elseif ($offset = (int) $offset) {
+            if ($offset < 0) {
+                if (0 > $offset += self::mb_strlen($needle)) {
+                    $haystack = self::mb_substr($haystack, 0, $offset, $encoding);
+                }
+                $offset = 0;
+            } else {
+                $haystack = self::mb_substr($haystack, $offset, 2147483647, $encoding);
+            }
+        }
+
+        $pos = '' !== $needle || 80000 > \PHP_VERSION_ID
+            ? iconv_strrpos($haystack, $needle, $encoding)
+            : self::mb_strlen($haystack, $encoding);
+
+        return false !== $pos ? $offset + $pos : false;
+    }
+
+    public static function mb_str_split($string, $split_length = 1, $encoding = null)
+    {
+        if (null !== $string && !\is_scalar($string) && !(\is_object($string) && method_exists($string, '__toString'))) {
+            trigger_error('mb_str_split() expects parameter 1 to be string, '.\gettype($string).' given', \E_USER_WARNING);
+
+            return null;
+        }
+
+        if (1 > $split_length = (int) $split_length) {
+            if (80000 > \PHP_VERSION_ID) {
+                trigger_error('The length of each segment must be greater than zero', \E_USER_WARNING);
+
+                return false;
+            }
+
+            throw new \ValueError('Argument #2 ($length) must be greater than 0');
+        }
+
+        if (null === $encoding) {
+            $encoding = mb_internal_encoding();
+        }
+
+        if ('UTF-8' === $encoding = self::getEncoding($encoding)) {
+            $rx = '/(';
+            while (65535 < $split_length) {
+                $rx .= '.{65535}';
+                $split_length -= 65535;
+            }
+            $rx .= '.{'.$split_length.'})/us';
+
+            return preg_split($rx, $string, -1, \PREG_SPLIT_DELIM_CAPTURE | \PREG_SPLIT_NO_EMPTY);
+        }
+
+        $result = ;
+        $length = mb_strlen($string, $encoding);
+
+        for ($i = 0; $i < $length; $i += $split_length) {
+            $result = mb_substr($string, $i, $split_length, $encoding);
+        }
+
+        return $result;
+    }
+
+    public static function mb_strtolower($s, $encoding = null)
+    {
+        return self::mb_convert_case($s, \MB_CASE_LOWER, $encoding);
+    }
+
+    public static function mb_strtoupper($s, $encoding = null)
+    {
+        return self::mb_convert_case($s, \MB_CASE_UPPER, $encoding);
+    }
+
+    public static function mb_substitute_character($c = null)
+    {
+        if (null === $c) {
+            return 'none';
+        }
+        if (0 === strcasecmp($c, 'none')) {
+            return true;
+        }
+        if (80000 > \PHP_VERSION_ID) {
+            return false;
+        }
+        if (\is_int($c) || 'long' === $c || 'entity' === $c) {
+            return false;
+        }
+
+        throw new \ValueError('Argument #1 ($substitute_character) must be "none", "long", "entity" or a valid codepoint');
+    }
+
+    public static function mb_substr($s, $start, $length = null, $encoding = null)
+    {
+        $encoding = self::getEncoding($encoding);
+        if ('CP850' === $encoding || 'ASCII' === $encoding) {
+            return (string) substr($s, $start, null === $length ? 2147483647 : $length);
+        }
+
+        if ($start < 0) {
+            $start = iconv_strlen($s, $encoding) + $start;
+            if ($start < 0) {
+                $start = 0;
+            }
+        }
+
+        if (null === $length) {
+            $length = 2147483647;
+        } elseif ($length < 0) {
+            $length = iconv_strlen($s, $encoding) + $length - $start;
+            if ($length < 0) {
+                return '';
+            }
+        }
+
+        return (string) iconv_substr($s, $start, $length, $encoding);
+    }
+
+    public static function mb_stripos($haystack, $needle, $offset = 0, $encoding = null)
+    {
+        $haystack, $needle = str_replace(self::SIMPLE_CASE_FOLD0, self::SIMPLE_CASE_FOLD1, 
+            self::mb_convert_case($haystack, \MB_CASE_LOWER, $encoding),
+            self::mb_convert_case($needle, \MB_CASE_LOWER, $encoding),
+        );
+
+        return self::mb_strpos($haystack, $needle, $offset, $encoding);
+    }
+
+    public static function mb_stristr($haystack, $needle, $part = false, $encoding = null)
+    {
+        $pos = self::mb_stripos($haystack, $needle, 0, $encoding);
+
+        return self::getSubpart($pos, $part, $haystack, $encoding);
+    }
+
+    public static function mb_strrchr($haystack, $needle, $part = false, $encoding = null)
+    {
+        $encoding = self::getEncoding($encoding);
+        if ('CP850' === $encoding || 'ASCII' === $encoding) {
+            $pos = strrpos($haystack, $needle);
+        } else {
+            $needle = self::mb_substr($needle, 0, 1, $encoding);
+            $pos = iconv_strrpos($haystack, $needle, $encoding);
+        }
+
+        return self::getSubpart($pos, $part, $haystack, $encoding);
+    }
+
+    public static function mb_strrichr($haystack, $needle, $part = false, $encoding = null)
+    {
+        $needle = self::mb_substr($needle, 0, 1, $encoding);
+        $pos = self::mb_strripos($haystack, $needle, $encoding);
+
+        return self::getSubpart($pos, $part, $haystack, $encoding);
+    }
+
+    public static function mb_strripos($haystack, $needle, $offset = 0, $encoding = null)
+    {
+        $haystack = self::mb_convert_case($haystack, \MB_CASE_LOWER, $encoding);
+        $needle = self::mb_convert_case($needle, \MB_CASE_LOWER, $encoding);
+
+        $haystack = str_replace(self::SIMPLE_CASE_FOLD0, self::SIMPLE_CASE_FOLD1, $haystack);
+        $needle = str_replace(self::SIMPLE_CASE_FOLD0, self::SIMPLE_CASE_FOLD1, $needle);
+
+        return self::mb_strrpos($haystack, $needle, $offset, $encoding);
+    }
+
+    public static function mb_strstr($haystack, $needle, $part = false, $encoding = null)
+    {
+        $pos = strpos($haystack, $needle);
+        if (false === $pos) {
+            return false;
+        }
+        if ($part) {
+            return substr($haystack, 0, $pos);
+        }
+
+        return substr($haystack, $pos);
+    }
+
+    public static function mb_get_info($type = 'all')
+    {
+        $info = 
+            'internal_encoding' => self::$internalEncoding,
+            'http_output' => 'pass',
+            'http_output_conv_mimetypes' => '^(text/|application/xhtml\+xml)',
+            'func_overload' => 0,
+            'func_overload_list' => 'no overload',
+            'mail_charset' => 'UTF-8',
+            'mail_header_encoding' => 'BASE64',
+            'mail_body_encoding' => 'BASE64',
+            'illegal_chars' => 0,
+            'encoding_translation' => 'Off',
+            'language' => self::$language,
+            'detect_order' => self::$encodingList,
+            'substitute_character' => 'none',
+            'strict_detection' => 'Off',
+        ;
+
+        if ('all' === $type) {
+            return $info;
+        }
+        if (isset($info$type)) {
+            return $info$type;
+        }
+
+        return false;
+    }
+
+    public static function mb_http_input($type = '')
+    {
+        return false;
+    }
+
+    public static function mb_http_output($encoding = null)
+    {
+        return null !== $encoding ? 'pass' === $encoding : 'pass';
+    }
+
+    public static function mb_strwidth($s, $encoding = null)
+    {
+        $encoding = self::getEncoding($encoding);
+
+        if ('UTF-8' !== $encoding) {
+            $s = iconv($encoding, 'UTF-8//IGNORE', $s);
+        }
+
+        $s = preg_replace('/\x{1100}-\x{115F}\x{2329}\x{232A}\x{2E80}-\x{303E}\x{3040}-\x{A4CF}\x{AC00}-\x{D7A3}\x{F900}-\x{FAFF}\x{FE10}-\x{FE19}\x{FE30}-\x{FE6F}\x{FF00}-\x{FF60}\x{FFE0}-\x{FFE6}\x{20000}-\x{2FFFD}\x{30000}-\x{3FFFD}/u', '', $s, -1, $wide);
+
+        return ($wide << 1) + iconv_strlen($s, 'UTF-8');
+    }
+
+    public static function mb_substr_count($haystack, $needle, $encoding = null)
+    {
+        return substr_count($haystack, $needle);
+    }
+
+    public static function mb_output_handler($contents, $status)
+    {
+        return $contents;
+    }
+
+    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 = self::getEncoding($encoding)) {
+            $s = mb_convert_encoding($s, $encoding, 'UTF-8');
+        }
+
+        return $s;
+    }
+
+    public static function mb_ord($s, $encoding = null)
+    {
+        if ('UTF-8' !== $encoding = self::getEncoding($encoding)) {
+            $s = mb_convert_encoding($s, 'UTF-8', $encoding);
+        }
+
+        if (1 === \strlen($s)) {
+            return \ord($s);
+        }
+
+        $code = ($s = unpack('C*', substr($s, 0, 4))) ? $s1 : 0;
+        if (0xF0 <= $code) {
+            return (($code - 0xF0) << 18) + (($s2 - 0x80) << 12) + (($s3 - 0x80) << 6) + $s4 - 0x80;
+        }
+        if (0xE0 <= $code) {
+            return (($code - 0xE0) << 12) + (($s2 - 0x80) << 6) + $s3 - 0x80;
+        }
+        if (0xC0 <= $code) {
+            return (($code - 0xC0) << 6) + $s2 - 0x80;
+        }
+
+        return $code;
+    }
+
+    public static function mb_str_pad(string $string, int $length, string $pad_string = ' ', int $pad_type = \STR_PAD_RIGHT, string $encoding = null): string
+    {
+        if (!\in_array($pad_type, \STR_PAD_RIGHT, \STR_PAD_LEFT, \STR_PAD_BOTH, true)) {
+            throw new \ValueError('mb_str_pad(): Argument #4 ($pad_type) must be STR_PAD_LEFT, STR_PAD_RIGHT, or STR_PAD_BOTH');
+        }
+
+        if (null === $encoding) {
+            $encoding = self::mb_internal_encoding();
+        }
+
+        try {
+            $validEncoding = @self::mb_check_encoding('', $encoding);
+        } catch (\ValueError $e) {
+            throw new \ValueError(sprintf('mb_str_pad(): Argument #5 ($encoding) must be a valid encoding, "%s" given', $encoding));
+        }
+
+        // BC for PHP 7.3 and lower
+        if (!$validEncoding) {
+            throw new \ValueError(sprintf('mb_str_pad(): Argument #5 ($encoding) must be a valid encoding, "%s" given', $encoding));
+        }
+
+        if (self::mb_strlen($pad_string, $encoding) <= 0) {
+            throw new \ValueError('mb_str_pad(): Argument #3 ($pad_string) must be a non-empty string');
+        }
+
+        $paddingRequired = $length - self::mb_strlen($string, $encoding);
+
+        if ($paddingRequired < 1) {
+            return $string;
+        }
+
+        switch ($pad_type) {
+            case \STR_PAD_LEFT:
+                return self::mb_substr(str_repeat($pad_string, $paddingRequired), 0, $paddingRequired, $encoding).$string;
+            case \STR_PAD_RIGHT:
+                return $string.self::mb_substr(str_repeat($pad_string, $paddingRequired), 0, $paddingRequired, $encoding);
+            default:
+                $leftPaddingLength = floor($paddingRequired / 2);
+                $rightPaddingLength = $paddingRequired - $leftPaddingLength;
+
+                return self::mb_substr(str_repeat($pad_string, $leftPaddingLength), 0, $leftPaddingLength, $encoding).$string.self::mb_substr(str_repeat($pad_string, $rightPaddingLength), 0, $rightPaddingLength, $encoding);
+        }
+    }
+
+    private static function getSubpart($pos, $part, $haystack, $encoding)
+    {
+        if (false === $pos) {
+            return false;
+        }
+        if ($part) {
+            return self::mb_substr($haystack, 0, $pos, $encoding);
+        }
+
+        return self::mb_substr($haystack, $pos, null, $encoding);
+    }
+
+    private static function html_encoding_callback(array $m)
+    {
+        $i = 1;
+        $entities = '';
+        $m = unpack('C*', htmlentities($m0, \ENT_COMPAT, 'UTF-8'));
+
+        while (isset($m$i)) {
+            if (0x80 > $m$i) {
+                $entities .= \chr($m$i++);
+                continue;
+            }
+            if (0xF0 <= $m$i) {
+                $c = (($m$i++ - 0xF0) << 18) + (($m$i++ - 0x80) << 12) + (($m$i++ - 0x80) << 6) + $m$i++ - 0x80;
+            } elseif (0xE0 <= $m$i) {
+                $c = (($m$i++ - 0xE0) << 12) + (($m$i++ - 0x80) << 6) + $m$i++ - 0x80;
+            } else {
+                $c = (($m$i++ - 0xC0) << 6) + $m$i++ - 0x80;
+            }
+
+            $entities .= '&#'.$c.';';
+        }
+
+        return $entities;
+    }
+
+    private static function title_case(array $s)
+    {
+        return self::mb_convert_case($s1, \MB_CASE_UPPER, 'UTF-8').self::mb_convert_case($s2, \MB_CASE_LOWER, 'UTF-8');
+    }
+
+    private static function getData($file)
+    {
+        if (file_exists($file = __DIR__.'/Resources/unidata/'.$file.'.php')) {
+            return require $file;
+        }
+
+        return false;
+    }
+
+    private static function getEncoding($encoding)
+    {
+        if (null === $encoding) {
+            return self::$internalEncoding;
+        }
+
+        if ('UTF-8' === $encoding) {
+            return 'UTF-8';
+        }
+
+        $encoding = strtoupper($encoding);
+
+        if ('8BIT' === $encoding || 'BINARY' === $encoding) {
+            return 'CP850';
+        }
+
+        if ('UTF8' === $encoding) {
+            return 'UTF-8';
+        }
+
+        return $encoding;
+    }
+}

roundcubemail-1.5.tar.gz/vendor/symfony/polyfill-mbstring/README.md Added

roundcubemail-1.5.tar.gz/vendor/symfony/polyfill-mbstring/Resources Added

roundcubemail-1.5.tar.gz/vendor/symfony/polyfill-mbstring/Resources/unidata Added

roundcubemail-1.5.tar.gz/vendor/symfony/polyfill-mbstring/Resources/unidata/caseFolding.php Added

@@ -0,0 +1,119 @@
+<?php
+
+return 
+    'İ' => 'i̇',
+    'µ' => 'μ',
+    'ſ' => 's',
+    'ͅ' => 'ι',
+    'ς' => 'σ',
+    'ϐ' => 'β',
+    'ϑ' => 'θ',
+    'ϕ' => 'φ',
+    'ϖ' => 'π',
+    'ϰ' => 'κ',
+    'ϱ' => 'ρ',
+    'ϵ' => 'ε',
+    'ẛ' => 'ṡ',
+    'ι' => 'ι',
+    'ß' => 'ss',
+    'ŉ' => 'ʼn',
+    'ǰ' => 'ǰ',
+    'ΐ' => 'ΐ',
+    'ΰ' => 'ΰ',
+    'և' => 'եւ',
+    'ẖ' => 'ẖ',
+    'ẗ' => 'ẗ',
+    'ẘ' => 'ẘ',
+    'ẙ' => 'ẙ',
+    'ẚ' => 'aʾ',
+    'ẞ' => 'ss',
+    'ὐ' => 'ὐ',
+    'ὒ' => 'ὒ',
+    'ὔ' => 'ὔ',
+    'ὖ' => 'ὖ',
+    'ᾀ' => 'ἀι',
+    'ᾁ' => 'ἁι',
+    'ᾂ' => 'ἂι',
+    'ᾃ' => 'ἃι',
+    'ᾄ' => 'ἄι',
+    'ᾅ' => 'ἅι',
+    'ᾆ' => 'ἆι',
+    'ᾇ' => 'ἇι',
+    'ᾈ' => 'ἀι',
+    'ᾉ' => 'ἁι',
+    'ᾊ' => 'ἂι',
+    'ᾋ' => 'ἃι',
+    'ᾌ' => 'ἄι',
+    'ᾍ' => 'ἅι',
+    'ᾎ' => 'ἆι',
+    'ᾏ' => 'ἇι',
+    'ᾐ' => 'ἠι',
+    'ᾑ' => 'ἡι',
+    'ᾒ' => 'ἢι',
+    'ᾓ' => 'ἣι',
+    'ᾔ' => 'ἤι',
+    'ᾕ' => 'ἥι',
+    'ᾖ' => 'ἦι',
+    'ᾗ' => 'ἧι',
+    'ᾘ' => 'ἠι',
+    'ᾙ' => 'ἡι',
+    'ᾚ' => 'ἢι',
+    'ᾛ' => 'ἣι',
+    'ᾜ' => 'ἤι',
+    'ᾝ' => 'ἥι',
+    'ᾞ' => 'ἦι',
+    'ᾟ' => 'ἧι',
+    'ᾠ' => 'ὠι',
+    'ᾡ' => 'ὡι',
+    'ᾢ' => 'ὢι',
+    'ᾣ' => 'ὣι',
+    'ᾤ' => 'ὤι',
+    'ᾥ' => 'ὥι',
+    'ᾦ' => 'ὦι',
+    'ᾧ' => 'ὧι',
+    'ᾨ' => 'ὠι',
+    'ᾩ' => 'ὡι',
+    'ᾪ' => 'ὢι',
+    'ᾫ' => 'ὣι',
+    'ᾬ' => 'ὤι',
+    'ᾭ' => 'ὥι',
+    'ᾮ' => 'ὦι',
+    'ᾯ' => 'ὧι',
+    'ᾲ' => 'ὰι',
+    'ᾳ' => 'αι',
+    'ᾴ' => 'άι',
+    'ᾶ' => 'ᾶ',
+    'ᾷ' => 'ᾶι',
+    'ᾼ' => 'αι',
+    'ῂ' => 'ὴι',
+    'ῃ' => 'ηι',
+    'ῄ' => 'ήι',
+    'ῆ' => 'ῆ',
+    'ῇ' => 'ῆι',
+    'ῌ' => 'ηι',
+    'ῒ' => 'ῒ',
+    'ῖ' => 'ῖ',
+    'ῗ' => 'ῗ',
+    'ῢ' => 'ῢ',
+    'ῤ' => 'ῤ',
+    'ῦ' => 'ῦ',
+    'ῧ' => 'ῧ',
+    'ῲ' => 'ὼι',
+    'ῳ' => 'ωι',
+    'ῴ' => 'ώι',
+    'ῶ' => 'ῶ',
+    'ῷ' => 'ῶι',
+    'ῼ' => 'ωι',
+    'ﬀ' => 'ff',
+    'ﬁ' => 'fi',
+    'ﬂ' => 'fl',
+    'ﬃ' => 'ffi',
+    'ﬄ' => 'ffl',
+    'ﬅ' => 'st',
+    'ﬆ' => 'st',
+    'ﬓ' => 'մն',
+    'ﬔ' => 'մե',
+    'ﬕ' => 'մի',
+    'ﬖ' => 'վն',
+    'ﬗ' => 'մխ',
+;

roundcubemail-1.5.tar.gz/vendor/symfony/polyfill-mbstring/Resources/unidata/lowerCase.php Added

@@ -0,0 +1,1397 @@
+<?php
+
+return array (
+  'A' => 'a',
+  'B' => 'b',
+  'C' => 'c',
+  'D' => 'd',
+  'E' => 'e',
+  'F' => 'f',
+  'G' => 'g',
+  'H' => 'h',
+  'I' => 'i',
+  'J' => 'j',
+  'K' => 'k',
+  'L' => 'l',
+  'M' => 'm',
+  'N' => 'n',
+  'O' => 'o',
+  'P' => 'p',
+  'Q' => 'q',
+  'R' => 'r',
+  'S' => 's',
+  'T' => 't',
+  'U' => 'u',
+  'V' => 'v',
+  'W' => 'w',
+  'X' => 'x',
+  'Y' => 'y',
+  'Z' => 'z',
+  'À' => 'à',
+  'Á' => 'á',
+  'Â' => 'â',
+  'Ã' => 'ã',
+  'Ä' => 'ä',
+  'Å' => 'å',
+  'Æ' => 'æ',
+  'Ç' => 'ç',
+  'È' => 'è',
+  'É' => 'é',
+  'Ê' => 'ê',
+  'Ë' => 'ë',
+  'Ì' => 'ì',
+  'Í' => 'í',
+  'Î' => 'î',
+  'Ï' => 'ï',
+  'Ð' => 'ð',
+  'Ñ' => 'ñ',
+  'Ò' => 'ò',
+  'Ó' => 'ó',
+  'Ô' => 'ô',
+  'Õ' => 'õ',
+  'Ö' => 'ö',
+  'Ø' => 'ø',
+  'Ù' => 'ù',
+  'Ú' => 'ú',
+  'Û' => 'û',
+  'Ü' => 'ü',
+  'Ý' => 'ý',
+  'Þ' => 'þ',
+  'Ā' => 'ā',
+  'Ă' => 'ă',
+  'Ą' => 'ą',
+  'Ć' => 'ć',
+  'Ĉ' => 'ĉ',
+  'Ċ' => 'ċ',
+  'Č' => 'č',
+  'Ď' => 'ď',
+  'Đ' => 'đ',
+  'Ē' => 'ē',
+  'Ĕ' => 'ĕ',
+  'Ė' => 'ė',
+  'Ę' => 'ę',
+  'Ě' => 'ě',
+  'Ĝ' => 'ĝ',
+  'Ğ' => 'ğ',
+  'Ġ' => 'ġ',
+  'Ģ' => 'ģ',
+  'Ĥ' => 'ĥ',
+  'Ħ' => 'ħ',
+  'Ĩ' => 'ĩ',
+  'Ī' => 'ī',
+  'Ĭ' => 'ĭ',
+  'Į' => 'į',
+  'İ' => 'i̇',
+  'Ĳ' => 'ĳ',
+  'Ĵ' => 'ĵ',
+  'Ķ' => 'ķ',
+  'Ĺ' => 'ĺ',
+  'Ļ' => 'ļ',
+  'Ľ' => 'ľ',
+  'Ŀ' => 'ŀ',
+  'Ł' => 'ł',
+  'Ń' => 'ń',
+  'Ņ' => 'ņ',
+  'Ň' => 'ň',
+  'Ŋ' => 'ŋ',
+  'Ō' => 'ō',
+  'Ŏ' => 'ŏ',
+  'Ő' => 'ő',
+  'Œ' => 'œ',
+  'Ŕ' => 'ŕ',
+  'Ŗ' => 'ŗ',
+  'Ř' => 'ř',
+  'Ś' => 'ś',
+  'Ŝ' => 'ŝ',
+  'Ş' => 'ş',
+  'Š' => 'š',
+  'Ţ' => 'ţ',
+  'Ť' => 'ť',
+  'Ŧ' => 'ŧ',
+  'Ũ' => 'ũ',
+  'Ū' => 'ū',
+  'Ŭ' => 'ŭ',
+  'Ů' => 'ů',
+  'Ű' => 'ű',
+  'Ų' => 'ų',
+  'Ŵ' => 'ŵ',
+  'Ŷ' => 'ŷ',
+  'Ÿ' => 'ÿ',
+  'Ź' => 'ź',
+  'Ż' => 'ż',
+  'Ž' => 'ž',
+  'Ɓ' => 'ɓ',
+  'Ƃ' => 'ƃ',
+  'Ƅ' => 'ƅ',
+  'Ɔ' => 'ɔ',
+  'Ƈ' => 'ƈ',
+  'Ɖ' => 'ɖ',
+  'Ɗ' => 'ɗ',
+  'Ƌ' => 'ƌ',
+  'Ǝ' => 'ǝ',
+  'Ə' => 'ə',
+  'Ɛ' => 'ɛ',
+  'Ƒ' => 'ƒ',
+  'Ɠ' => 'ɠ',
+  'Ɣ' => 'ɣ',
+  'Ɩ' => 'ɩ',
+  'Ɨ' => 'ɨ',
+  'Ƙ' => 'ƙ',
+  'Ɯ' => 'ɯ',
+  'Ɲ' => 'ɲ',
+  'Ɵ' => 'ɵ',
+  'Ơ' => 'ơ',
+  'Ƣ' => 'ƣ',
+  'Ƥ' => 'ƥ',
+  'Ʀ' => 'ʀ',
+  'Ƨ' => 'ƨ',
+  'Ʃ' => 'ʃ',
+  'Ƭ' => 'ƭ',
+  'Ʈ' => 'ʈ',
+  'Ư' => 'ư',
+  'Ʊ' => 'ʊ',
+  'Ʋ' => 'ʋ',
+  'Ƴ' => 'ƴ',
+  'Ƶ' => 'ƶ',
+  'Ʒ' => 'ʒ',
+  'Ƹ' => 'ƹ',
+  'Ƽ' => 'ƽ',
+  'Ǆ' => 'ǆ',
+  'ǅ' => 'ǆ',
+  'Ǉ' => 'ǉ',
+  'ǈ' => 'ǉ',
+  'Ǌ' => 'ǌ',
+  'ǋ' => 'ǌ',
+  'Ǎ' => 'ǎ',
+  'Ǐ' => 'ǐ',
+  'Ǒ' => 'ǒ',
+  'Ǔ' => 'ǔ',
+  'Ǖ' => 'ǖ',
+  'Ǘ' => 'ǘ',
+  'Ǚ' => 'ǚ',
+  'Ǜ' => 'ǜ',
+  'Ǟ' => 'ǟ',
+  'Ǡ' => 'ǡ',
+  'Ǣ' => 'ǣ',
+  'Ǥ' => 'ǥ',
+  'Ǧ' => 'ǧ',
+  'Ǩ' => 'ǩ',
+  'Ǫ' => 'ǫ',
+  'Ǭ' => 'ǭ',
+  'Ǯ' => 'ǯ',
+  'Ǳ' => 'ǳ',
+  'ǲ' => 'ǳ',
+  'Ǵ' => 'ǵ',
+  'Ƕ' => 'ƕ',
+  'Ƿ' => 'ƿ',
+  'Ǹ' => 'ǹ',
+  'Ǻ' => 'ǻ',
+  'Ǽ' => 'ǽ',
+  'Ǿ' => 'ǿ',
+  'Ȁ' => 'ȁ',
+  'Ȃ' => 'ȃ',
+  'Ȅ' => 'ȅ',
+  'Ȇ' => 'ȇ',
+  'Ȉ' => 'ȉ',
+  'Ȋ' => 'ȋ',
+  'Ȍ' => 'ȍ',
+  'Ȏ' => 'ȏ',
+  'Ȑ' => 'ȑ',
+  'Ȓ' => 'ȓ',
+  'Ȕ' => 'ȕ',
+  'Ȗ' => 'ȗ',
+  'Ș' => 'ș',
+  'Ț' => 'ț',
+  'Ȝ' => 'ȝ',
+  'Ȟ' => 'ȟ',
+  'Ƞ' => 'ƞ',
+  'Ȣ' => 'ȣ',
+  'Ȥ' => 'ȥ',
+  'Ȧ' => 'ȧ',
+  'Ȩ' => 'ȩ',
+  'Ȫ' => 'ȫ',
+  'Ȭ' => 'ȭ',
+  'Ȯ' => 'ȯ',
+  'Ȱ' => 'ȱ',
+  'Ȳ' => 'ȳ',
+  'Ⱥ' => 'ⱥ',
+  'Ȼ' => 'ȼ',
+  'Ƚ' => 'ƚ',
+  'Ⱦ' => 'ⱦ',
+  'Ɂ' => 'ɂ',
+  'Ƀ' => 'ƀ',
+  'Ʉ' => 'ʉ',
+  'Ʌ' => 'ʌ',
+  'Ɇ' => 'ɇ',
+  'Ɉ' => 'ɉ',
+  'Ɋ' => 'ɋ',
+  'Ɍ' => 'ɍ',
+  'Ɏ' => 'ɏ',
+  'Ͱ' => 'ͱ',
+  'Ͳ' => 'ͳ',
+  'Ͷ' => 'ͷ',
+  'Ϳ' => 'ϳ',
+  'Ά' => 'ά',
+  'Έ' => 'έ',
+  'Ή' => 'ή',
+  'Ί' => 'ί',
+  'Ό' => 'ό',
+  'Ύ' => 'ύ',
+  'Ώ' => 'ώ',
+  'Α' => 'α',
+  'Β' => 'β',
+  'Γ' => 'γ',
+  'Δ' => 'δ',
+  'Ε' => 'ε',
+  'Ζ' => 'ζ',
+  'Η' => 'η',
+  'Θ' => 'θ',
+  'Ι' => 'ι',
+  'Κ' => 'κ',
+  'Λ' => 'λ',
+  'Μ' => 'μ',
+  'Ν' => 'ν',
+  'Ξ' => 'ξ',
+  'Ο' => 'ο',
+  'Π' => 'π',
+  'Ρ' => 'ρ',
+  'Σ' => 'σ',
+  'Τ' => 'τ',
+  'Υ' => 'υ',
+  'Φ' => 'φ',
+  'Χ' => 'χ',
+  'Ψ' => 'ψ',
+  'Ω' => 'ω',
+  'Ϊ' => 'ϊ',
+  'Ϋ' => 'ϋ',
+  'Ϗ' => 'ϗ',
+  'Ϙ' => 'ϙ',
+  'Ϛ' => 'ϛ',
+  'Ϝ' => 'ϝ',
+  'Ϟ' => 'ϟ',
+  'Ϡ' => 'ϡ',
+  'Ϣ' => 'ϣ',
+  'Ϥ' => 'ϥ',
+  'Ϧ' => 'ϧ',
+  'Ϩ' => 'ϩ',
+  'Ϫ' => 'ϫ',
+  'Ϭ' => 'ϭ',
+  'Ϯ' => 'ϯ',
+  'ϴ' => 'θ',
+  'Ϸ' => 'ϸ',
+  'Ϲ' => 'ϲ',
+  'Ϻ' => 'ϻ',
+  'Ͻ' => 'ͻ',
+  'Ͼ' => 'ͼ',
+  'Ͽ' => 'ͽ',
+  'Ѐ' => 'ѐ',
+  'Ё' => 'ё',
+  'Ђ' => 'ђ',
+  'Ѓ' => 'ѓ',
+  'Є' => 'є',
+  'Ѕ' => 'ѕ',
+  'І' => 'і',
+  'Ї' => 'ї',
+  'Ј' => 'ј',
+  'Љ' => 'љ',
+  'Њ' => 'њ',
+  'Ћ' => 'ћ',
+  'Ќ' => 'ќ',
+  'Ѝ' => 'ѝ',
+  'Ў' => 'ў',
+  'Џ' => 'џ',
+  'А' => 'а',
+  'Б' => 'б',
+  'В' => 'в',
+  'Г' => 'г',
+  'Д' => 'д',
+  'Е' => 'е',
+  'Ж' => 'ж',
+  'З' => 'з',
+  'И' => 'и',
+  'Й' => 'й',
+  'К' => 'к',
+  'Л' => 'л',
+  'М' => 'м',
+  'Н' => 'н',
+  'О' => 'о',
+  'П' => 'п',
+  'Р' => 'р',
+  'С' => 'с',
+  'Т' => 'т',
+  'У' => 'у',
+  'Ф' => 'ф',
+  'Х' => 'х',
+  'Ц' => 'ц',
+  'Ч' => 'ч',
+  'Ш' => 'ш',
+  'Щ' => 'щ',
+  'Ъ' => 'ъ',
+  'Ы' => 'ы',
+  'Ь' => 'ь',
+  'Э' => 'э',
+  'Ю' => 'ю',
+  'Я' => 'я',
+  'Ѡ' => 'ѡ',
+  'Ѣ' => 'ѣ',
+  'Ѥ' => 'ѥ',
+  'Ѧ' => 'ѧ',
+  'Ѩ' => 'ѩ',
+  'Ѫ' => 'ѫ',
+  'Ѭ' => 'ѭ',
+  'Ѯ' => 'ѯ',
+  'Ѱ' => 'ѱ',
+  'Ѳ' => 'ѳ',
+  'Ѵ' => 'ѵ',
+  'Ѷ' => 'ѷ',
+  'Ѹ' => 'ѹ',
+  'Ѻ' => 'ѻ',
+  'Ѽ' => 'ѽ',
+  'Ѿ' => 'ѿ',
+  'Ҁ' => 'ҁ',
+  'Ҋ' => 'ҋ',
+  'Ҍ' => 'ҍ',
+  'Ҏ' => 'ҏ',
+  'Ґ' => 'ґ',
+  'Ғ' => 'ғ',
+  'Ҕ' => 'ҕ',
+  'Җ' => 'җ',
+  'Ҙ' => 'ҙ',
+  'Қ' => 'қ',
+  'Ҝ' => 'ҝ',
+  'Ҟ' => 'ҟ',
+  'Ҡ' => 'ҡ',
+  'Ң' => 'ң',
+  'Ҥ' => 'ҥ',
+  'Ҧ' => 'ҧ',
+  'Ҩ' => 'ҩ',
+  'Ҫ' => 'ҫ',
+  'Ҭ' => 'ҭ',
+  'Ү' => 'ү',
+  'Ұ' => 'ұ',
+  'Ҳ' => 'ҳ',
+  'Ҵ' => 'ҵ',
+  'Ҷ' => 'ҷ',
+  'Ҹ' => 'ҹ',
+  'Һ' => 'һ',
+  'Ҽ' => 'ҽ',
+  'Ҿ' => 'ҿ',
+  'Ӏ' => 'ӏ',
+  'Ӂ' => 'ӂ',
+  'Ӄ' => 'ӄ',
+  'Ӆ' => 'ӆ',
+  'Ӈ' => 'ӈ',
+  'Ӊ' => 'ӊ',
+  'Ӌ' => 'ӌ',
+  'Ӎ' => 'ӎ',
+  'Ӑ' => 'ӑ',
+  'Ӓ' => 'ӓ',
+  'Ӕ' => 'ӕ',
+  'Ӗ' => 'ӗ',
+  'Ә' => 'ә',
+  'Ӛ' => 'ӛ',
+  'Ӝ' => 'ӝ',
+  'Ӟ' => 'ӟ',
+  'Ӡ' => 'ӡ',
+  'Ӣ' => 'ӣ',
+  'Ӥ' => 'ӥ',
+  'Ӧ' => 'ӧ',
+  'Ө' => 'ө',
+  'Ӫ' => 'ӫ',
+  'Ӭ' => 'ӭ',
+  'Ӯ' => 'ӯ',
+  'Ӱ' => 'ӱ',
+  'Ӳ' => 'ӳ',
+  'Ӵ' => 'ӵ',
+  'Ӷ' => 'ӷ',
+  'Ӹ' => 'ӹ',
+  'Ӻ' => 'ӻ',
+  'Ӽ' => 'ӽ',
+  'Ӿ' => 'ӿ',
+  'Ԁ' => 'ԁ',
+  'Ԃ' => 'ԃ',
+  'Ԅ' => 'ԅ',
+  'Ԇ' => 'ԇ',
+  'Ԉ' => 'ԉ',
+  'Ԋ' => 'ԋ',
+  'Ԍ' => 'ԍ',
+  'Ԏ' => 'ԏ',
+  'Ԑ' => 'ԑ',
+  'Ԓ' => 'ԓ',
+  'Ԕ' => 'ԕ',
+  'Ԗ' => 'ԗ',
+  'Ԙ' => 'ԙ',
+  'Ԛ' => 'ԛ',
+  'Ԝ' => 'ԝ',
+  'Ԟ' => 'ԟ',
+  'Ԡ' => 'ԡ',
+  'Ԣ' => 'ԣ',
+  'Ԥ' => 'ԥ',
+  'Ԧ' => 'ԧ',
+  'Ԩ' => 'ԩ',
+  'Ԫ' => 'ԫ',
+  'Ԭ' => 'ԭ',
+  'Ԯ' => 'ԯ',
+  'Ա' => 'ա',
+  'Բ' => 'բ',
+  'Գ' => 'գ',
+  'Դ' => 'դ',
+  'Ե' => 'ե',
+  'Զ' => 'զ',
+  'Է' => 'է',
+  'Ը' => 'ը',
+  'Թ' => 'թ',
+  'Ժ' => 'ժ',
+  'Ի' => 'ի',
+  'Լ' => 'լ',
+  'Խ' => 'խ',
+  'Ծ' => 'ծ',
+  'Կ' => 'կ',
+  'Հ' => 'հ',
+  'Ձ' => 'ձ',
+  'Ղ' => 'ղ',
+  'Ճ' => 'ճ',
+  'Մ' => 'մ',
+  'Յ' => 'յ',
+  'Ն' => 'ն',
+  'Շ' => 'շ',
+  'Ո' => 'ո',
+  'Չ' => 'չ',
+  'Պ' => 'պ',
+  'Ջ' => 'ջ',
+  'Ռ' => 'ռ',
+  'Ս' => 'ս',
+  'Վ' => 'վ',
+  'Տ' => 'տ',
+  'Ր' => 'ր',
+  'Ց' => 'ց',
+  'Ւ' => 'ւ',
+  'Փ' => 'փ',
+  'Ք' => 'ք',
+  'Օ' => 'օ',
+  'Ֆ' => 'ֆ',
+  'Ⴀ' => 'ⴀ',
+  'Ⴁ' => 'ⴁ',
+  'Ⴂ' => 'ⴂ',
+  'Ⴃ' => 'ⴃ',
+  'Ⴄ' => 'ⴄ',
+  'Ⴅ' => 'ⴅ',
+  'Ⴆ' => 'ⴆ',
+  'Ⴇ' => 'ⴇ',
+  'Ⴈ' => 'ⴈ',
+  'Ⴉ' => 'ⴉ',
+  'Ⴊ' => 'ⴊ',
+  'Ⴋ' => 'ⴋ',
+  'Ⴌ' => 'ⴌ',
+  'Ⴍ' => 'ⴍ',
+  'Ⴎ' => 'ⴎ',
+  'Ⴏ' => 'ⴏ',
+  'Ⴐ' => 'ⴐ',
+  'Ⴑ' => 'ⴑ',
+  'Ⴒ' => 'ⴒ',
+  'Ⴓ' => 'ⴓ',
+  'Ⴔ' => 'ⴔ',
+  'Ⴕ' => 'ⴕ',
+  'Ⴖ' => 'ⴖ',
+  'Ⴗ' => 'ⴗ',
+  'Ⴘ' => 'ⴘ',
+  'Ⴙ' => 'ⴙ',
+  'Ⴚ' => 'ⴚ',
+  'Ⴛ' => 'ⴛ',
+  'Ⴜ' => 'ⴜ',
+  'Ⴝ' => 'ⴝ',
+  'Ⴞ' => 'ⴞ',
+  'Ⴟ' => 'ⴟ',
+  'Ⴠ' => 'ⴠ',
+  'Ⴡ' => 'ⴡ',
+  'Ⴢ' => 'ⴢ',
+  'Ⴣ' => 'ⴣ',
+  'Ⴤ' => 'ⴤ',
+  'Ⴥ' => 'ⴥ',
+  'Ⴧ' => 'ⴧ',
+  'Ⴭ' => 'ⴭ',
+  'Ꭰ' => 'ꭰ',
+  'Ꭱ' => 'ꭱ',
+  'Ꭲ' => 'ꭲ',
+  'Ꭳ' => 'ꭳ',
+  'Ꭴ' => 'ꭴ',
+  'Ꭵ' => 'ꭵ',
+  'Ꭶ' => 'ꭶ',
+  'Ꭷ' => 'ꭷ',
+  'Ꭸ' => 'ꭸ',
+  'Ꭹ' => 'ꭹ',
+  'Ꭺ' => 'ꭺ',
+  'Ꭻ' => 'ꭻ',
+  'Ꭼ' => 'ꭼ',
+  'Ꭽ' => 'ꭽ',
+  'Ꭾ' => 'ꭾ',
+  'Ꭿ' => 'ꭿ',
+  'Ꮀ' => 'ꮀ',
+  'Ꮁ' => 'ꮁ',
+  'Ꮂ' => 'ꮂ',
+  'Ꮃ' => 'ꮃ',
+  'Ꮄ' => 'ꮄ',
+  'Ꮅ' => 'ꮅ',
+  'Ꮆ' => 'ꮆ',
+  'Ꮇ' => 'ꮇ',
+  'Ꮈ' => 'ꮈ',
+  'Ꮉ' => 'ꮉ',
+  'Ꮊ' => 'ꮊ',
+  'Ꮋ' => 'ꮋ',
+  'Ꮌ' => 'ꮌ',
+  'Ꮍ' => 'ꮍ',
+  'Ꮎ' => 'ꮎ',
+  'Ꮏ' => 'ꮏ',
+  'Ꮐ' => 'ꮐ',
+  'Ꮑ' => 'ꮑ',
+  'Ꮒ' => 'ꮒ',
+  'Ꮓ' => 'ꮓ',
+  'Ꮔ' => 'ꮔ',
+  'Ꮕ' => 'ꮕ',
+  'Ꮖ' => 'ꮖ',
+  'Ꮗ' => 'ꮗ',
+  'Ꮘ' => 'ꮘ',
+  'Ꮙ' => 'ꮙ',
+  'Ꮚ' => 'ꮚ',
+  'Ꮛ' => 'ꮛ',
+  'Ꮜ' => 'ꮜ',
+  'Ꮝ' => 'ꮝ',
+  'Ꮞ' => 'ꮞ',
+  'Ꮟ' => 'ꮟ',
+  'Ꮠ' => 'ꮠ',
+  'Ꮡ' => 'ꮡ',
+  'Ꮢ' => 'ꮢ',
+  'Ꮣ' => 'ꮣ',
+  'Ꮤ' => 'ꮤ',
+  'Ꮥ' => 'ꮥ',
+  'Ꮦ' => 'ꮦ',
+  'Ꮧ' => 'ꮧ',
+  'Ꮨ' => 'ꮨ',
+  'Ꮩ' => 'ꮩ',
+  'Ꮪ' => 'ꮪ',
+  'Ꮫ' => 'ꮫ',
+  'Ꮬ' => 'ꮬ',
+  'Ꮭ' => 'ꮭ',
+  'Ꮮ' => 'ꮮ',
+  'Ꮯ' => 'ꮯ',
+  'Ꮰ' => 'ꮰ',
+  'Ꮱ' => 'ꮱ',
+  'Ꮲ' => 'ꮲ',
+  'Ꮳ' => 'ꮳ',
+  'Ꮴ' => 'ꮴ',
+  'Ꮵ' => 'ꮵ',
+  'Ꮶ' => 'ꮶ',
+  'Ꮷ' => 'ꮷ',
+  'Ꮸ' => 'ꮸ',
+  'Ꮹ' => 'ꮹ',
+  'Ꮺ' => 'ꮺ',
+  'Ꮻ' => 'ꮻ',
+  'Ꮼ' => 'ꮼ',
+  'Ꮽ' => 'ꮽ',
+  'Ꮾ' => 'ꮾ',
+  'Ꮿ' => 'ꮿ',
+  'Ᏸ' => 'ᏸ',
+  'Ᏹ' => 'ᏹ',
+  'Ᏺ' => 'ᏺ',
+  'Ᏻ' => 'ᏻ',
+  'Ᏼ' => 'ᏼ',
+  'Ᏽ' => 'ᏽ',
+  'Ა' => 'ა',
+  'Ბ' => 'ბ',
+  'Გ' => 'გ',
+  'Დ' => 'დ',
+  'Ე' => 'ე',
+  'Ვ' => 'ვ',
+  'Ზ' => 'ზ',
+  'Თ' => 'თ',
+  'Ი' => 'ი',
+  'Კ' => 'კ',
+  'Ლ' => 'ლ',
+  'Მ' => 'მ',
+  'Ნ' => 'ნ',
+  'Ო' => 'ო',
+  'Პ' => 'პ',
+  'Ჟ' => 'ჟ',
+  'Რ' => 'რ',
+  'Ს' => 'ს',
+  'Ტ' => 'ტ',
+  'Უ' => 'უ',
+  'Ფ' => 'ფ',
+  'Ქ' => 'ქ',
+  'Ღ' => 'ღ',
+  'Ყ' => 'ყ',
+  'Შ' => 'შ',
+  'Ჩ' => 'ჩ',
+  'Ც' => 'ც',
+  'Ძ' => 'ძ',
+  'Წ' => 'წ',
+  'Ჭ' => 'ჭ',
+  'Ხ' => 'ხ',
+  'Ჯ' => 'ჯ',
+  'Ჰ' => 'ჰ',
+  'Ჱ' => 'ჱ',
+  'Ჲ' => 'ჲ',
+  'Ჳ' => 'ჳ',
+  'Ჴ' => 'ჴ',
+  'Ჵ' => 'ჵ',
+  'Ჶ' => 'ჶ',
+  'Ჷ' => 'ჷ',
+  'Ჸ' => 'ჸ',
+  'Ჹ' => 'ჹ',
+  'Ჺ' => 'ჺ',
+  'Ჽ' => 'ჽ',
+  'Ჾ' => 'ჾ',
+  'Ჿ' => 'ჿ',
+  'Ḁ' => 'ḁ',
+  'Ḃ' => 'ḃ',
+  'Ḅ' => 'ḅ',
+  'Ḇ' => 'ḇ',
+  'Ḉ' => 'ḉ',
+  'Ḋ' => 'ḋ',
+  'Ḍ' => 'ḍ',
+  'Ḏ' => 'ḏ',
+  'Ḑ' => 'ḑ',
+  'Ḓ' => 'ḓ',
+  'Ḕ' => 'ḕ',
+  'Ḗ' => 'ḗ',
+  'Ḙ' => 'ḙ',
+  'Ḛ' => 'ḛ',
+  'Ḝ' => 'ḝ',
+  'Ḟ' => 'ḟ',
+  'Ḡ' => 'ḡ',
+  'Ḣ' => 'ḣ',
+  'Ḥ' => 'ḥ',
+  'Ḧ' => 'ḧ',
+  'Ḩ' => 'ḩ',
+  'Ḫ' => 'ḫ',
+  'Ḭ' => 'ḭ',
+  'Ḯ' => 'ḯ',
+  'Ḱ' => 'ḱ',
+  'Ḳ' => 'ḳ',
+  'Ḵ' => 'ḵ',
+  'Ḷ' => 'ḷ',
+  'Ḹ' => 'ḹ',
+  'Ḻ' => 'ḻ',
+  'Ḽ' => 'ḽ',
+  'Ḿ' => 'ḿ',
+  'Ṁ' => 'ṁ',
+  'Ṃ' => 'ṃ',
+  'Ṅ' => 'ṅ',
+  'Ṇ' => 'ṇ',
+  'Ṉ' => 'ṉ',
+  'Ṋ' => 'ṋ',
+  'Ṍ' => 'ṍ',
+  'Ṏ' => 'ṏ',
+  'Ṑ' => 'ṑ',
+  'Ṓ' => 'ṓ',
+  'Ṕ' => 'ṕ',
+  'Ṗ' => 'ṗ',
+  'Ṙ' => 'ṙ',
+  'Ṛ' => 'ṛ',
+  'Ṝ' => 'ṝ',
+  'Ṟ' => 'ṟ',
+  'Ṡ' => 'ṡ',
+  'Ṣ' => 'ṣ',
+  'Ṥ' => 'ṥ',
+  'Ṧ' => 'ṧ',
+  'Ṩ' => 'ṩ',
+  'Ṫ' => 'ṫ',
+  'Ṭ' => 'ṭ',
+  'Ṯ' => 'ṯ',
+  'Ṱ' => 'ṱ',
+  'Ṳ' => 'ṳ',
+  'Ṵ' => 'ṵ',
+  'Ṷ' => 'ṷ',
+  'Ṹ' => 'ṹ',
+  'Ṻ' => 'ṻ',
+  'Ṽ' => 'ṽ',
+  'Ṿ' => 'ṿ',
+  'Ẁ' => 'ẁ',
+  'Ẃ' => 'ẃ',
+  'Ẅ' => 'ẅ',
+  'Ẇ' => 'ẇ',
+  'Ẉ' => 'ẉ',
+  'Ẋ' => 'ẋ',
+  'Ẍ' => 'ẍ',
+  'Ẏ' => 'ẏ',
+  'Ẑ' => 'ẑ',
+  'Ẓ' => 'ẓ',
+  'Ẕ' => 'ẕ',
+  'ẞ' => 'ß',
+  'Ạ' => 'ạ',
+  'Ả' => 'ả',
+  'Ấ' => 'ấ',
+  'Ầ' => 'ầ',
+  'Ẩ' => 'ẩ',
+  'Ẫ' => 'ẫ',
+  'Ậ' => 'ậ',
+  'Ắ' => 'ắ',
+  'Ằ' => 'ằ',
+  'Ẳ' => 'ẳ',
+  'Ẵ' => 'ẵ',
+  'Ặ' => 'ặ',
+  'Ẹ' => 'ẹ',
+  'Ẻ' => 'ẻ',
+  'Ẽ' => 'ẽ',
+  'Ế' => 'ế',
+  'Ề' => 'ề',
+  'Ể' => 'ể',
+  'Ễ' => 'ễ',
+  'Ệ' => 'ệ',
+  'Ỉ' => 'ỉ',
+  'Ị' => 'ị',
+  'Ọ' => 'ọ',
+  'Ỏ' => 'ỏ',
+  'Ố' => 'ố',
+  'Ồ' => 'ồ',
+  'Ổ' => 'ổ',
+  'Ỗ' => 'ỗ',
+  'Ộ' => 'ộ',
+  'Ớ' => 'ớ',
+  'Ờ' => 'ờ',
+  'Ở' => 'ở',
+  'Ỡ' => 'ỡ',
+  'Ợ' => 'ợ',
+  'Ụ' => 'ụ',
+  'Ủ' => 'ủ',
+  'Ứ' => 'ứ',
+  'Ừ' => 'ừ',
+  'Ử' => 'ử',
+  'Ữ' => 'ữ',
+  'Ự' => 'ự',
+  'Ỳ' => 'ỳ',
+  'Ỵ' => 'ỵ',
+  'Ỷ' => 'ỷ',
+  'Ỹ' => 'ỹ',
+  'Ỻ' => 'ỻ',
+  'Ỽ' => 'ỽ',
+  'Ỿ' => 'ỿ',
+  'Ἀ' => 'ἀ',
+  'Ἁ' => 'ἁ',
+  'Ἂ' => 'ἂ',
+  'Ἃ' => 'ἃ',
+  'Ἄ' => 'ἄ',
+  'Ἅ' => 'ἅ',
+  'Ἆ' => 'ἆ',
+  'Ἇ' => 'ἇ',
+  'Ἐ' => 'ἐ',
+  'Ἑ' => 'ἑ',
+  'Ἒ' => 'ἒ',
+  'Ἓ' => 'ἓ',
+  'Ἔ' => 'ἔ',
+  'Ἕ' => 'ἕ',
+  'Ἠ' => 'ἠ',
+  'Ἡ' => 'ἡ',
+  'Ἢ' => 'ἢ',
+  'Ἣ' => 'ἣ',
+  'Ἤ' => 'ἤ',
+  'Ἥ' => 'ἥ',
+  'Ἦ' => 'ἦ',
+  'Ἧ' => 'ἧ',
+  'Ἰ' => 'ἰ',
+  'Ἱ' => 'ἱ',
+  'Ἲ' => 'ἲ',
+  'Ἳ' => 'ἳ',
+  'Ἴ' => 'ἴ',
+  'Ἵ' => 'ἵ',
+  'Ἶ' => 'ἶ',
+  'Ἷ' => 'ἷ',
+  'Ὀ' => 'ὀ',
+  'Ὁ' => 'ὁ',
+  'Ὂ' => 'ὂ',
+  'Ὃ' => 'ὃ',
+  'Ὄ' => 'ὄ',
+  'Ὅ' => 'ὅ',
+  'Ὑ' => 'ὑ',
+  'Ὓ' => 'ὓ',
+  'Ὕ' => 'ὕ',
+  'Ὗ' => 'ὗ',
+  'Ὠ' => 'ὠ',
+  'Ὡ' => 'ὡ',
+  'Ὢ' => 'ὢ',
+  'Ὣ' => 'ὣ',
+  'Ὤ' => 'ὤ',
+  'Ὥ' => 'ὥ',
+  'Ὦ' => 'ὦ',
+  'Ὧ' => 'ὧ',
+  'ᾈ' => 'ᾀ',
+  'ᾉ' => 'ᾁ',
+  'ᾊ' => 'ᾂ',
+  'ᾋ' => 'ᾃ',
+  'ᾌ' => 'ᾄ',
+  'ᾍ' => 'ᾅ',
+  'ᾎ' => 'ᾆ',
+  'ᾏ' => 'ᾇ',
+  'ᾘ' => 'ᾐ',
+  'ᾙ' => 'ᾑ',
+  'ᾚ' => 'ᾒ',
+  'ᾛ' => 'ᾓ',
+  'ᾜ' => 'ᾔ',
+  'ᾝ' => 'ᾕ',
+  'ᾞ' => 'ᾖ',
+  'ᾟ' => 'ᾗ',
+  'ᾨ' => 'ᾠ',
+  'ᾩ' => 'ᾡ',
+  'ᾪ' => 'ᾢ',
+  'ᾫ' => 'ᾣ',
+  'ᾬ' => 'ᾤ',
+  'ᾭ' => 'ᾥ',
+  'ᾮ' => 'ᾦ',
+  'ᾯ' => 'ᾧ',
+  'Ᾰ' => 'ᾰ',
+  'Ᾱ' => 'ᾱ',
+  'Ὰ' => 'ὰ',
+  'Ά' => 'ά',
+  'ᾼ' => 'ᾳ',
+  'Ὲ' => 'ὲ',
+  'Έ' => 'έ',
+  'Ὴ' => 'ὴ',
+  'Ή' => 'ή',
+  'ῌ' => 'ῃ',
+  'Ῐ' => 'ῐ',
+  'Ῑ' => 'ῑ',
+  'Ὶ' => 'ὶ',
+  'Ί' => 'ί',
+  'Ῠ' => 'ῠ',
+  'Ῡ' => 'ῡ',
+  'Ὺ' => 'ὺ',
+  'Ύ' => 'ύ',
+  'Ῥ' => 'ῥ',
+  'Ὸ' => 'ὸ',
+  'Ό' => 'ό',
+  'Ὼ' => 'ὼ',
+  'Ώ' => 'ώ',
+  'ῼ' => 'ῳ',
+  'Ω' => 'ω',
+  'K' => 'k',
+  'Å' => 'å',
+  'Ⅎ' => 'ⅎ',
+  'Ⅰ' => 'ⅰ',
+  'Ⅱ' => 'ⅱ',
+  'Ⅲ' => 'ⅲ',
+  'Ⅳ' => 'ⅳ',
+  'Ⅴ' => 'ⅴ',
+  'Ⅵ' => 'ⅵ',
+  'Ⅶ' => 'ⅶ',
+  'Ⅷ' => 'ⅷ',
+  'Ⅸ' => 'ⅸ',
+  'Ⅹ' => 'ⅹ',
+  'Ⅺ' => 'ⅺ',
+  'Ⅻ' => 'ⅻ',
+  'Ⅼ' => 'ⅼ',
+  'Ⅽ' => 'ⅽ',
+  'Ⅾ' => 'ⅾ',
+  'Ⅿ' => 'ⅿ',
+  'Ↄ' => 'ↄ',
+  'Ⓐ' => 'ⓐ',
+  'Ⓑ' => 'ⓑ',
+  'Ⓒ' => 'ⓒ',
+  'Ⓓ' => 'ⓓ',
+  'Ⓔ' => 'ⓔ',
+  'Ⓕ' => 'ⓕ',
+  'Ⓖ' => 'ⓖ',
+  'Ⓗ' => 'ⓗ',
+  'Ⓘ' => 'ⓘ',
+  'Ⓙ' => 'ⓙ',
+  'Ⓚ' => 'ⓚ',
+  'Ⓛ' => 'ⓛ',
+  'Ⓜ' => 'ⓜ',
+  'Ⓝ' => 'ⓝ',
+  'Ⓞ' => 'ⓞ',
+  'Ⓟ' => 'ⓟ',
+  'Ⓠ' => 'ⓠ',
+  'Ⓡ' => 'ⓡ',
+  'Ⓢ' => 'ⓢ',
+  'Ⓣ' => 'ⓣ',
+  'Ⓤ' => 'ⓤ',
+  'Ⓥ' => 'ⓥ',
+  'Ⓦ' => 'ⓦ',
+  'Ⓧ' => 'ⓧ',
+  'Ⓨ' => 'ⓨ',
+  'Ⓩ' => 'ⓩ',
+  'Ⰰ' => 'ⰰ',
+  'Ⰱ' => 'ⰱ',
+  'Ⰲ' => 'ⰲ',
+  'Ⰳ' => 'ⰳ',
+  'Ⰴ' => 'ⰴ',
+  'Ⰵ' => 'ⰵ',
+  'Ⰶ' => 'ⰶ',
+  'Ⰷ' => 'ⰷ',
+  'Ⰸ' => 'ⰸ',
+  'Ⰹ' => 'ⰹ',
+  'Ⰺ' => 'ⰺ',
+  'Ⰻ' => 'ⰻ',
+  'Ⰼ' => 'ⰼ',
+  'Ⰽ' => 'ⰽ',
+  'Ⰾ' => 'ⰾ',
+  'Ⰿ' => 'ⰿ',
+  'Ⱀ' => 'ⱀ',
+  'Ⱁ' => 'ⱁ',
+  'Ⱂ' => 'ⱂ',
+  'Ⱃ' => 'ⱃ',
+  'Ⱄ' => 'ⱄ',
+  'Ⱅ' => 'ⱅ',
+  'Ⱆ' => 'ⱆ',
+  'Ⱇ' => 'ⱇ',
+  'Ⱈ' => 'ⱈ',
+  'Ⱉ' => 'ⱉ',
+  'Ⱊ' => 'ⱊ',
+  'Ⱋ' => 'ⱋ',
+  'Ⱌ' => 'ⱌ',
+  'Ⱍ' => 'ⱍ',
+  'Ⱎ' => 'ⱎ',
+  'Ⱏ' => 'ⱏ',
+  'Ⱐ' => 'ⱐ',
+  'Ⱑ' => 'ⱑ',
+  'Ⱒ' => 'ⱒ',
+  'Ⱓ' => 'ⱓ',
+  'Ⱔ' => 'ⱔ',
+  'Ⱕ' => 'ⱕ',
+  'Ⱖ' => 'ⱖ',
+  'Ⱗ' => 'ⱗ',
+  'Ⱘ' => 'ⱘ',
+  'Ⱙ' => 'ⱙ',
+  'Ⱚ' => 'ⱚ',
+  'Ⱛ' => 'ⱛ',
+  'Ⱜ' => 'ⱜ',
+  'Ⱝ' => 'ⱝ',
+  'Ⱞ' => 'ⱞ',
+  'Ⱡ' => 'ⱡ',
+  'Ɫ' => 'ɫ',
+  'Ᵽ' => 'ᵽ',
+  'Ɽ' => 'ɽ',
+  'Ⱨ' => 'ⱨ',
+  'Ⱪ' => 'ⱪ',
+  'Ⱬ' => 'ⱬ',
+  'Ɑ' => 'ɑ',
+  'Ɱ' => 'ɱ',
+  'Ɐ' => 'ɐ',
+  'Ɒ' => 'ɒ',
+  'Ⱳ' => 'ⱳ',
+  'Ⱶ' => 'ⱶ',
+  'Ȿ' => 'ȿ',
+  'Ɀ' => 'ɀ',
+  'Ⲁ' => 'ⲁ',
+  'Ⲃ' => 'ⲃ',
+  'Ⲅ' => 'ⲅ',
+  'Ⲇ' => 'ⲇ',
+  'Ⲉ' => 'ⲉ',
+  'Ⲋ' => 'ⲋ',
+  'Ⲍ' => 'ⲍ',
+  'Ⲏ' => 'ⲏ',
+  'Ⲑ' => 'ⲑ',
+  'Ⲓ' => 'ⲓ',
+  'Ⲕ' => 'ⲕ',
+  'Ⲗ' => 'ⲗ',
+  'Ⲙ' => 'ⲙ',
+  'Ⲛ' => 'ⲛ',
+  'Ⲝ' => 'ⲝ',
+  'Ⲟ' => 'ⲟ',
+  'Ⲡ' => 'ⲡ',
+  'Ⲣ' => 'ⲣ',
+  'Ⲥ' => 'ⲥ',
+  'Ⲧ' => 'ⲧ',
+  'Ⲩ' => 'ⲩ',
+  'Ⲫ' => 'ⲫ',
+  'Ⲭ' => 'ⲭ',
+  'Ⲯ' => 'ⲯ',
+  'Ⲱ' => 'ⲱ',
+  'Ⲳ' => 'ⲳ',
+  'Ⲵ' => 'ⲵ',
+  'Ⲷ' => 'ⲷ',
+  'Ⲹ' => 'ⲹ',
+  'Ⲻ' => 'ⲻ',
+  'Ⲽ' => 'ⲽ',
+  'Ⲿ' => 'ⲿ',
+  'Ⳁ' => 'ⳁ',
+  'Ⳃ' => 'ⳃ',
+  'Ⳅ' => 'ⳅ',
+  'Ⳇ' => 'ⳇ',
+  'Ⳉ' => 'ⳉ',
+  'Ⳋ' => 'ⳋ',
+  'Ⳍ' => 'ⳍ',
+  'Ⳏ' => 'ⳏ',
+  'Ⳑ' => 'ⳑ',
+  'Ⳓ' => 'ⳓ',
+  'Ⳕ' => 'ⳕ',
+  'Ⳗ' => 'ⳗ',
+  'Ⳙ' => 'ⳙ',
+  'Ⳛ' => 'ⳛ',
+  'Ⳝ' => 'ⳝ',
+  'Ⳟ' => 'ⳟ',
+  'Ⳡ' => 'ⳡ',
+  'Ⳣ' => 'ⳣ',
+  'Ⳬ' => 'ⳬ',
+  'Ⳮ' => 'ⳮ',
+  'Ⳳ' => 'ⳳ',
+  'Ꙁ' => 'ꙁ',
+  'Ꙃ' => 'ꙃ',
+  'Ꙅ' => 'ꙅ',
+  'Ꙇ' => 'ꙇ',
+  'Ꙉ' => 'ꙉ',
+  'Ꙋ' => 'ꙋ',
+  'Ꙍ' => 'ꙍ',
+  'Ꙏ' => 'ꙏ',
+  'Ꙑ' => 'ꙑ',
+  'Ꙓ' => 'ꙓ',
+  'Ꙕ' => 'ꙕ',
+  'Ꙗ' => 'ꙗ',
+  'Ꙙ' => 'ꙙ',
+  'Ꙛ' => 'ꙛ',
+  'Ꙝ' => 'ꙝ',
+  'Ꙟ' => 'ꙟ',
+  'Ꙡ' => 'ꙡ',
+  'Ꙣ' => 'ꙣ',
+  'Ꙥ' => 'ꙥ',
+  'Ꙧ' => 'ꙧ',
+  'Ꙩ' => 'ꙩ',
+  'Ꙫ' => 'ꙫ',
+  'Ꙭ' => 'ꙭ',
+  'Ꚁ' => 'ꚁ',
+  'Ꚃ' => 'ꚃ',
+  'Ꚅ' => 'ꚅ',
+  'Ꚇ' => 'ꚇ',
+  'Ꚉ' => 'ꚉ',
+  'Ꚋ' => 'ꚋ',
+  'Ꚍ' => 'ꚍ',
+  'Ꚏ' => 'ꚏ',
+  'Ꚑ' => 'ꚑ',
+  'Ꚓ' => 'ꚓ',
+  'Ꚕ' => 'ꚕ',
+  'Ꚗ' => 'ꚗ',
+  'Ꚙ' => 'ꚙ',
+  'Ꚛ' => 'ꚛ',
+  'Ꜣ' => 'ꜣ',
+  'Ꜥ' => 'ꜥ',
+  'Ꜧ' => 'ꜧ',
+  'Ꜩ' => 'ꜩ',
+  'Ꜫ' => 'ꜫ',
+  'Ꜭ' => 'ꜭ',
+  'Ꜯ' => 'ꜯ',
+  'Ꜳ' => 'ꜳ',
+  'Ꜵ' => 'ꜵ',
+  'Ꜷ' => 'ꜷ',
+  'Ꜹ' => 'ꜹ',
+  'Ꜻ' => 'ꜻ',
+  'Ꜽ' => 'ꜽ',
+  'Ꜿ' => 'ꜿ',
+  'Ꝁ' => 'ꝁ',
+  'Ꝃ' => 'ꝃ',
+  'Ꝅ' => 'ꝅ',
+  'Ꝇ' => 'ꝇ',
+  'Ꝉ' => 'ꝉ',
+  'Ꝋ' => 'ꝋ',
+  'Ꝍ' => 'ꝍ',
+  'Ꝏ' => 'ꝏ',
+  'Ꝑ' => 'ꝑ',
+  'Ꝓ' => 'ꝓ',
+  'Ꝕ' => 'ꝕ',
+  'Ꝗ' => 'ꝗ',
+  'Ꝙ' => 'ꝙ',
+  'Ꝛ' => 'ꝛ',
+  'Ꝝ' => 'ꝝ',
+  'Ꝟ' => 'ꝟ',
+  'Ꝡ' => 'ꝡ',
+  'Ꝣ' => 'ꝣ',
+  'Ꝥ' => 'ꝥ',
+  'Ꝧ' => 'ꝧ',
+  'Ꝩ' => 'ꝩ',
+  'Ꝫ' => 'ꝫ',
+  'Ꝭ' => 'ꝭ',
+  'Ꝯ' => 'ꝯ',
+  'Ꝺ' => 'ꝺ',
+  'Ꝼ' => 'ꝼ',
+  'Ᵹ' => 'ᵹ',
+  'Ꝿ' => 'ꝿ',
+  'Ꞁ' => 'ꞁ',
+  'Ꞃ' => 'ꞃ',
+  'Ꞅ' => 'ꞅ',
+  'Ꞇ' => 'ꞇ',
+  'Ꞌ' => 'ꞌ',
+  'Ɥ' => 'ɥ',
+  'Ꞑ' => 'ꞑ',
+  'Ꞓ' => 'ꞓ',
+  'Ꞗ' => 'ꞗ',
+  'Ꞙ' => 'ꞙ',
+  'Ꞛ' => 'ꞛ',
+  'Ꞝ' => 'ꞝ',
+  'Ꞟ' => 'ꞟ',
+  'Ꞡ' => 'ꞡ',
+  'Ꞣ' => 'ꞣ',
+  'Ꞥ' => 'ꞥ',
+  'Ꞧ' => 'ꞧ',
+  'Ꞩ' => 'ꞩ',
+  'Ɦ' => 'ɦ',
+  'Ɜ' => 'ɜ',
+  'Ɡ' => 'ɡ',
+  'Ɬ' => 'ɬ',
+  'Ɪ' => 'ɪ',
+  'Ʞ' => 'ʞ',
+  'Ʇ' => 'ʇ',
+  'Ʝ' => 'ʝ',
+  'Ꭓ' => 'ꭓ',
+  'Ꞵ' => 'ꞵ',
+  'Ꞷ' => 'ꞷ',
+  'Ꞹ' => 'ꞹ',
+  'Ꞻ' => 'ꞻ',
+  'Ꞽ' => 'ꞽ',
+  'Ꞿ' => 'ꞿ',
+  'Ꟃ' => 'ꟃ',
+  'Ꞔ' => 'ꞔ',
+  'Ʂ' => 'ʂ',
+  'Ᶎ' => 'ᶎ',
+  'Ꟈ' => 'ꟈ',
+  'Ꟊ' => 'ꟊ',
+  'Ꟶ' => 'ꟶ',
+  'Ａ' => 'ａ',
+  'Ｂ' => 'ｂ',
+  'Ｃ' => 'ｃ',
+  'Ｄ' => 'ｄ',
+  'Ｅ' => 'ｅ',
+  'Ｆ' => 'ｆ',
+  'Ｇ' => 'ｇ',
+  'Ｈ' => 'ｈ',
+  'Ｉ' => 'ｉ',
+  'Ｊ' => 'ｊ',
+  'Ｋ' => 'ｋ',
+  'Ｌ' => 'ｌ',
+  'Ｍ' => 'ｍ',
+  'Ｎ' => 'ｎ',
+  'Ｏ' => 'ｏ',
+  'Ｐ' => 'ｐ',
+  'Ｑ' => 'ｑ',
+  'Ｒ' => 'ｒ',
+  'Ｓ' => 'ｓ',
+  'Ｔ' => 'ｔ',
+  'Ｕ' => 'ｕ',
+  'Ｖ' => 'ｖ',
+  'Ｗ' => 'ｗ',
+  'Ｘ' => 'ｘ',
+  'Ｙ' => 'ｙ',
+  'Ｚ' => 'ｚ',
+  '𐐀' => '𐐨',
+  '𐐁' => '𐐩',
+  '𐐂' => '𐐪',
+  '𐐃' => '𐐫',
+  '𐐄' => '𐐬',
+  '𐐅' => '𐐭',
+  '𐐆' => '𐐮',
+  '𐐇' => '𐐯',
+  '𐐈' => '𐐰',
+  '𐐉' => '𐐱',
+  '𐐊' => '𐐲',
+  '𐐋' => '𐐳',
+  '𐐌' => '𐐴',
+  '𐐍' => '𐐵',
+  '𐐎' => '𐐶',
+  '𐐏' => '𐐷',
+  '𐐐' => '𐐸',
+  '𐐑' => '𐐹',
+  '𐐒' => '𐐺',
+  '𐐓' => '𐐻',
+  '𐐔' => '𐐼',
+  '𐐕' => '𐐽',
+  '𐐖' => '𐐾',
+  '𐐗' => '𐐿',
+  '𐐘' => '𐑀',
+  '𐐙' => '𐑁',
+  '𐐚' => '𐑂',
+  '𐐛' => '𐑃',
+  '𐐜' => '𐑄',
+  '𐐝' => '𐑅',
+  '𐐞' => '𐑆',
+  '𐐟' => '𐑇',
+  '𐐠' => '𐑈',
+  '𐐡' => '𐑉',
+  '𐐢' => '𐑊',
+  '𐐣' => '𐑋',
+  '𐐤' => '𐑌',
+  '𐐥' => '𐑍',
+  '𐐦' => '𐑎',
+  '𐐧' => '𐑏',
+  '𐒰' => '𐓘',
+  '𐒱' => '𐓙',
+  '𐒲' => '𐓚',
+  '𐒳' => '𐓛',
+  '𐒴' => '𐓜',
+  '𐒵' => '𐓝',
+  '𐒶' => '𐓞',
+  '𐒷' => '𐓟',
+  '𐒸' => '𐓠',
+  '𐒹' => '𐓡',
+  '𐒺' => '𐓢',
+  '𐒻' => '𐓣',
+  '𐒼' => '𐓤',
+  '𐒽' => '𐓥',
+  '𐒾' => '𐓦',
+  '𐒿' => '𐓧',
+  '𐓀' => '𐓨',
+  '𐓁' => '𐓩',
+  '𐓂' => '𐓪',
+  '𐓃' => '𐓫',
+  '𐓄' => '𐓬',
+  '𐓅' => '𐓭',
+  '𐓆' => '𐓮',
+  '𐓇' => '𐓯',
+  '𐓈' => '𐓰',
+  '𐓉' => '𐓱',
+  '𐓊' => '𐓲',
+  '𐓋' => '𐓳',
+  '𐓌' => '𐓴',
+  '𐓍' => '𐓵',
+  '𐓎' => '𐓶',
+  '𐓏' => '𐓷',
+  '𐓐' => '𐓸',
+  '𐓑' => '𐓹',
+  '𐓒' => '𐓺',
+  '𐓓' => '𐓻',
+  '𐲀' => '𐳀',
+  '𐲁' => '𐳁',
+  '𐲂' => '𐳂',
+  '𐲃' => '𐳃',
+  '𐲄' => '𐳄',
+  '𐲅' => '𐳅',
+  '𐲆' => '𐳆',
+  '𐲇' => '𐳇',
+  '𐲈' => '𐳈',
+  '𐲉' => '𐳉',
+  '𐲊' => '𐳊',
+  '𐲋' => '𐳋',
+  '𐲌' => '𐳌',
+  '𐲍' => '𐳍',
+  '𐲎' => '𐳎',
+  '𐲏' => '𐳏',
+  '𐲐' => '𐳐',
+  '𐲑' => '𐳑',
+  '𐲒' => '𐳒',
+  '𐲓' => '𐳓',
+  '𐲔' => '𐳔',
+  '𐲕' => '𐳕',
+  '𐲖' => '𐳖',
+  '𐲗' => '𐳗',
+  '𐲘' => '𐳘',
+  '𐲙' => '𐳙',
+  '𐲚' => '𐳚',
+  '𐲛' => '𐳛',
+  '𐲜' => '𐳜',
+  '𐲝' => '𐳝',
+  '𐲞' => '𐳞',
+  '𐲟' => '𐳟',
+  '𐲠' => '𐳠',
+  '𐲡' => '𐳡',
+  '𐲢' => '𐳢',
+  '𐲣' => '𐳣',
+  '𐲤' => '𐳤',
+  '𐲥' => '𐳥',
+  '𐲦' => '𐳦',
+  '𐲧' => '𐳧',
+  '𐲨' => '𐳨',
+  '𐲩' => '𐳩',
+  '𐲪' => '𐳪',
+  '𐲫' => '𐳫',
+  '𐲬' => '𐳬',
+  '𐲭' => '𐳭',
+  '𐲮' => '𐳮',
+  '𐲯' => '𐳯',
+  '𐲰' => '𐳰',
+  '𐲱' => '𐳱',
+  '𐲲' => '𐳲',
+  '𑢠' => '𑣀',
+  '𑢡' => '𑣁',
+  '𑢢' => '𑣂',
+  '𑢣' => '𑣃',
+  '𑢤' => '𑣄',
+  '𑢥' => '𑣅',
+  '𑢦' => '𑣆',
+  '𑢧' => '𑣇',
+  '𑢨' => '𑣈',
+  '𑢩' => '𑣉',
+  '𑢪' => '𑣊',
+  '𑢫' => '𑣋',
+  '𑢬' => '𑣌',
+  '𑢭' => '𑣍',
+  '𑢮' => '𑣎',
+  '𑢯' => '𑣏',
+  '𑢰' => '𑣐',
+  '𑢱' => '𑣑',
+  '𑢲' => '𑣒',
+  '𑢳' => '𑣓',
+  '𑢴' => '𑣔',
+  '𑢵' => '𑣕',
+  '𑢶' => '𑣖',
+  '𑢷' => '𑣗',
+  '𑢸' => '𑣘',
+  '𑢹' => '𑣙',
+  '𑢺' => '𑣚',
+  '𑢻' => '𑣛',
+  '𑢼' => '𑣜',
+  '𑢽' => '𑣝',
+  '𑢾' => '𑣞',
+  '𑢿' => '𑣟',
+  '𖹀' => '𖹠',
+  '𖹁' => '𖹡',
+  '𖹂' => '𖹢',
+  '𖹃' => '𖹣',
+  '𖹄' => '𖹤',
+  '𖹅' => '𖹥',
+  '𖹆' => '𖹦',
+  '𖹇' => '𖹧',
+  '𖹈' => '𖹨',
+  '𖹉' => '𖹩',
+  '𖹊' => '𖹪',
+  '𖹋' => '𖹫',
+  '𖹌' => '𖹬',
+  '𖹍' => '𖹭',
+  '𖹎' => '𖹮',
+  '𖹏' => '𖹯',
+  '𖹐' => '𖹰',
+  '𖹑' => '𖹱',
+  '𖹒' => '𖹲',
+  '𖹓' => '𖹳',
+  '𖹔' => '𖹴',
+  '𖹕' => '𖹵',
+  '𖹖' => '𖹶',
+  '𖹗' => '𖹷',
+  '𖹘' => '𖹸',
+  '𖹙' => '𖹹',
+  '𖹚' => '𖹺',
+  '𖹛' => '𖹻',
+  '𖹜' => '𖹼',
+  '𖹝' => '𖹽',
+  '𖹞' => '𖹾',
+  '𖹟' => '𖹿',
+  '𞤀' => '𞤢',
+  '𞤁' => '𞤣',
+  '𞤂' => '𞤤',
+  '𞤃' => '𞤥',
+  '𞤄' => '𞤦',
+  '𞤅' => '𞤧',
+  '𞤆' => '𞤨',
+  '𞤇' => '𞤩',
+  '𞤈' => '𞤪',
+  '𞤉' => '𞤫',
+  '𞤊' => '𞤬',
+  '𞤋' => '𞤭',
+  '𞤌' => '𞤮',
+  '𞤍' => '𞤯',
+  '𞤎' => '𞤰',
+  '𞤏' => '𞤱',
+  '𞤐' => '𞤲',
+  '𞤑' => '𞤳',
+  '𞤒' => '𞤴',
+  '𞤓' => '𞤵',
+  '𞤔' => '𞤶',
+  '𞤕' => '𞤷',
+  '𞤖' => '𞤸',
+  '𞤗' => '𞤹',
+  '𞤘' => '𞤺',
+  '𞤙' => '𞤻',
+  '𞤚' => '𞤼',
+  '𞤛' => '𞤽',
+  '𞤜' => '𞤾',
+  '𞤝' => '𞤿',
+  '𞤞' => '𞥀',
+  '𞤟' => '𞥁',
+  '𞤠' => '𞥂',
+  '𞤡' => '𞥃',
+);

roundcubemail-1.5.tar.gz/vendor/symfony/polyfill-mbstring/Resources/unidata/titleCaseRegexp.php Added

@@ -0,0 +1,5 @@
+<?php
+
+// from Case_Ignorable in https://unicode.org/Public/UNIDATA/DerivedCoreProperties.txt
+
+return '/(?<!\x{0027}\x{002E}\x{003A}\x{005E}\x{0060}\x{00A8}\x{00AD}\x{00AF}\x{00B4}\x{00B7}\x{00B8}\x{02B0}-\x{02C1}\x{02C2}-\x{02C5}\x{02C6}-\x{02D1}\x{02D2}-\x{02DF}\x{02E0}-\x{02E4}\x{02E5}-\x{02EB}\x{02EC}\x{02ED}\x{02EE}\x{02EF}-\x{02FF}\x{0300}-\x{036F}\x{0374}\x{0375}\x{037A}\x{0384}-\x{0385}\x{0387}\x{0483}-\x{0487}\x{0488}-\x{0489}\x{0559}\x{0591}-\x{05BD}\x{05BF}\x{05C1}-\x{05C2}\x{05C4}-\x{05C5}\x{05C7}\x{05F4}\x{0600}-\x{0605}\x{0610}-\x{061A}\x{061C}\x{0640}\x{064B}-\x{065F}\x{0670}\x{06D6}-\x{06DC}\x{06DD}\x{06DF}-\x{06E4}\x{06E5}-\x{06E6}\x{06E7}-\x{06E8}\x{06EA}-\x{06ED}\x{070F}\x{0711}\x{0730}-\x{074A}\x{07A6}-\x{07B0}\x{07EB}-\x{07F3}\x{07F4}-\x{07F5}\x{07FA}\x{07FD}\x{0816}-\x{0819}\x{081A}\x{081B}-\x{0823}\x{0824}\x{0825}-\x{0827}\x{0828}\x{0829}-\x{082D}\x{0859}-\x{085B}\x{08D3}-\x{08E1}\x{08E2}\x{08E3}-\x{0902}\x{093A}\x{093C}\x{0941}-\x{0948}\x{094D}\x{0951}-\x{0957}\x{0962}-\x{0963}\x{0971}\x{0981}\x{09BC}\x{09C1}-\x{09C4}\x{09CD}\x{09E2}-\x{09E3}\x{09FE}\x{0A01}-\x{0A02}\x{0A3C}\x{0A41}-\x{0A42}\x{0A47}-\x{0A48}\x{0A4B}-\x{0A4D}\x{0A51}\x{0A70}-\x{0A71}\x{0A75}\x{0A81}-\x{0A82}\x{0ABC}\x{0AC1}-\x{0AC5}\x{0AC7}-\x{0AC8}\x{0ACD}\x{0AE2}-\x{0AE3}\x{0AFA}-\x{0AFF}\x{0B01}\x{0B3C}\x{0B3F}\x{0B41}-\x{0B44}\x{0B4D}\x{0B56}\x{0B62}-\x{0B63}\x{0B82}\x{0BC0}\x{0BCD}\x{0C00}\x{0C04}\x{0C3E}-\x{0C40}\x{0C46}-\x{0C48}\x{0C4A}-\x{0C4D}\x{0C55}-\x{0C56}\x{0C62}-\x{0C63}\x{0C81}\x{0CBC}\x{0CBF}\x{0CC6}\x{0CCC}-\x{0CCD}\x{0CE2}-\x{0CE3}\x{0D00}-\x{0D01}\x{0D3B}-\x{0D3C}\x{0D41}-\x{0D44}\x{0D4D}\x{0D62}-\x{0D63}\x{0DCA}\x{0DD2}-\x{0DD4}\x{0DD6}\x{0E31}\x{0E34}-\x{0E3A}\x{0E46}\x{0E47}-\x{0E4E}\x{0EB1}\x{0EB4}-\x{0EB9}\x{0EBB}-\x{0EBC}\x{0EC6}\x{0EC8}-\x{0ECD}\x{0F18}-\x{0F19}\x{0F35}\x{0F37}\x{0F39}\x{0F71}-\x{0F7E}\x{0F80}-\x{0F84}\x{0F86}-\x{0F87}\x{0F8D}-\x{0F97}\x{0F99}-\x{0FBC}\x{0FC6}\x{102D}-\x{1030}\x{1032}-\x{1037}\x{1039}-\x{103A}\x{103D}-\x{103E}\x{1058}-\x{1059}\x{105E}-\x{1060}\x{1071}-\x{1074}\x{1082}\x{1085}-\x{1086}\x{108D}\x{109D}\x{10FC}\x{135D}-\x{135F}\x{1712}-\x{1714}\x{1732}-\x{1734}\x{1752}-\x{1753}\x{1772}-\x{1773}\x{17B4}-\x{17B5}\x{17B7}-\x{17BD}\x{17C6}\x{17C9}-\x{17D3}\x{17D7}\x{17DD}\x{180B}-\x{180D}\x{180E}\x{1843}\x{1885}-\x{1886}\x{18A9}\x{1920}-\x{1922}\x{1927}-\x{1928}\x{1932}\x{1939}-\x{193B}\x{1A17}-\x{1A18}\x{1A1B}\x{1A56}\x{1A58}-\x{1A5E}\x{1A60}\x{1A62}\x{1A65}-\x{1A6C}\x{1A73}-\x{1A7C}\x{1A7F}\x{1AA7}\x{1AB0}-\x{1ABD}\x{1ABE}\x{1B00}-\x{1B03}\x{1B34}\x{1B36}-\x{1B3A}\x{1B3C}\x{1B42}\x{1B6B}-\x{1B73}\x{1B80}-\x{1B81}\x{1BA2}-\x{1BA5}\x{1BA8}-\x{1BA9}\x{1BAB}-\x{1BAD}\x{1BE6}\x{1BE8}-\x{1BE9}\x{1BED}\x{1BEF}-\x{1BF1}\x{1C2C}-\x{1C33}\x{1C36}-\x{1C37}\x{1C78}-\x{1C7D}\x{1CD0}-\x{1CD2}\x{1CD4}-\x{1CE0}\x{1CE2}-\x{1CE8}\x{1CED}\x{1CF4}\x{1CF8}-\x{1CF9}\x{1D2C}-\x{1D6A}\x{1D78}\x{1D9B}-\x{1DBF}\x{1DC0}-\x{1DF9}\x{1DFB}-\x{1DFF}\x{1FBD}\x{1FBF}-\x{1FC1}\x{1FCD}-\x{1FCF}\x{1FDD}-\x{1FDF}\x{1FED}-\x{1FEF}\x{1FFD}-\x{1FFE}\x{200B}-\x{200F}\x{2018}\x{2019}\x{2024}\x{2027}\x{202A}-\x{202E}\x{2060}-\x{2064}\x{2066}-\x{206F}\x{2071}\x{207F}\x{2090}-\x{209C}\x{20D0}-\x{20DC}\x{20DD}-\x{20E0}\x{20E1}\x{20E2}-\x{20E4}\x{20E5}-\x{20F0}\x{2C7C}-\x{2C7D}\x{2CEF}-\x{2CF1}\x{2D6F}\x{2D7F}\x{2DE0}-\x{2DFF}\x{2E2F}\x{3005}\x{302A}-\x{302D}\x{3031}-\x{3035}\x{303B}\x{3099}-\x{309A}\x{309B}-\x{309C}\x{309D}-\x{309E}\x{30FC}-\x{30FE}\x{A015}\x{A4F8}-\x{A4FD}\x{A60C}\x{A66F}\x{A670}-\x{A672}\x{A674}-\x{A67D}\x{A67F}\x{A69C}-\x{A69D}\x{A69E}-\x{A69F}\x{A6F0}-\x{A6F1}\x{A700}-\x{A716}\x{A717}-\x{A71F}\x{A720}-\x{A721}\x{A770}\x{A788}\x{A789}-\x{A78A}\x{A7F8}-\x{A7F9}\x{A802}\x{A806}\x{A80B}\x{A825}-\x{A826}\x{A8C4}-\x{A8C5}\x{A8E0}-\x{A8F1}\x{A8FF}\x{A926}-\x{A92D}\x{A947}-\x{A951}\x{A980}-\x{A982}\x{A9B3}\x{A9B6}-\x{A9B9}\x{A9BC}\x{A9CF}\x{A9E5}\x{A9E6}\x{AA29}-\x{AA2E}\x{AA31}-\x{AA32}\x{AA35}-\x{AA36}\x{AA43}\x{AA4C}\x{AA70}\x{AA7C}\x{AAB0}\x{AAB2}-\x{AAB4}\x{AAB7}-\x{AAB8}\x{AABE}-\x{AABF}\x{AAC1}\x{AADD}\x{AAEC}-\x{AAED}\x{AAF3}-\x{AAF4}\x{AAF6}\x{AB5B}\x{AB5C}-\x{AB5F}\x{ABE5}\x{ABE8}\x{ABED}\x{FB1E}\x{FBB2}-\x{FBC1}\x{FE00}-\x{FE0F}\x{FE13}\x{FE20}-\x{FE2F}\x{FE52}\x{FE55}\x{FEFF}\x{FF07}\x{FF0E}\x{FF1A}\x{FF3E}\x{FF40}\x{FF70}\x{FF9E}-\x{FF9F}\x{FFE3}\x{FFF9}-\x{FFFB}\x{101FD}\x{102E0}\x{10376}-\x{1037A}\x{10A01}-\x{10A03}\x{10A05}-\x{10A06}\x{10A0C}-\x{10A0F}\x{10A38}-\x{10A3A}\x{10A3F}\x{10AE5}-\x{10AE6}\x{10D24}-\x{10D27}\x{10F46}-\x{10F50}\x{11001}\x{11038}-\x{11046}\x{1107F}-\x{11081}\x{110B3}-\x{110B6}\x{110B9}-\x{110BA}\x{110BD}\x{110CD}\x{11100}-\x{11102}\x{11127}-\x{1112B}\x{1112D}-\x{11134}\x{11173}\x{11180}-\x{11181}\x{111B6}-\x{111BE}\x{111C9}-\x{111CC}\x{1122F}-\x{11231}\x{11234}\x{11236}-\x{11237}\x{1123E}\x{112DF}\x{112E3}-\x{112EA}\x{11300}-\x{11301}\x{1133B}-\x{1133C}\x{11340}\x{11366}-\x{1136C}\x{11370}-\x{11374}\x{11438}-\x{1143F}\x{11442}-\x{11444}\x{11446}\x{1145E}\x{114B3}-\x{114B8}\x{114BA}\x{114BF}-\x{114C0}\x{114C2}-\x{114C3}\x{115B2}-\x{115B5}\x{115BC}-\x{115BD}\x{115BF}-\x{115C0}\x{115DC}-\x{115DD}\x{11633}-\x{1163A}\x{1163D}\x{1163F}-\x{11640}\x{116AB}\x{116AD}\x{116B0}-\x{116B5}\x{116B7}\x{1171D}-\x{1171F}\x{11722}-\x{11725}\x{11727}-\x{1172B}\x{1182F}-\x{11837}\x{11839}-\x{1183A}\x{11A01}-\x{11A0A}\x{11A33}-\x{11A38}\x{11A3B}-\x{11A3E}\x{11A47}\x{11A51}-\x{11A56}\x{11A59}-\x{11A5B}\x{11A8A}-\x{11A96}\x{11A98}-\x{11A99}\x{11C30}-\x{11C36}\x{11C38}-\x{11C3D}\x{11C3F}\x{11C92}-\x{11CA7}\x{11CAA}-\x{11CB0}\x{11CB2}-\x{11CB3}\x{11CB5}-\x{11CB6}\x{11D31}-\x{11D36}\x{11D3A}\x{11D3C}-\x{11D3D}\x{11D3F}-\x{11D45}\x{11D47}\x{11D90}-\x{11D91}\x{11D95}\x{11D97}\x{11EF3}-\x{11EF4}\x{16AF0}-\x{16AF4}\x{16B30}-\x{16B36}\x{16B40}-\x{16B43}\x{16F8F}-\x{16F92}\x{16F93}-\x{16F9F}\x{16FE0}-\x{16FE1}\x{1BC9D}-\x{1BC9E}\x{1BCA0}-\x{1BCA3}\x{1D167}-\x{1D169}\x{1D173}-\x{1D17A}\x{1D17B}-\x{1D182}\x{1D185}-\x{1D18B}\x{1D1AA}-\x{1D1AD}\x{1D242}-\x{1D244}\x{1DA00}-\x{1DA36}\x{1DA3B}-\x{1DA6C}\x{1DA75}\x{1DA84}\x{1DA9B}-\x{1DA9F}\x{1DAA1}-\x{1DAAF}\x{1E000}-\x{1E006}\x{1E008}-\x{1E018}\x{1E01B}-\x{1E021}\x{1E023}-\x{1E024}\x{1E026}-\x{1E02A}\x{1E8D0}-\x{1E8D6}\x{1E944}-\x{1E94A}\x{1F3FB}-\x{1F3FF}\x{E0001}\x{E0020}-\x{E007F}\x{E0100}-\x{E01EF})(\pL)(\pL*+)/u';

roundcubemail-1.5.tar.gz/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.php Added

@@ -0,0 +1,1489 @@
+<?php
+
+return array (
+  'a' => 'A',
+  'b' => 'B',
+  'c' => 'C',
+  'd' => 'D',
+  'e' => 'E',
+  'f' => 'F',
+  'g' => 'G',
+  'h' => 'H',
+  'i' => 'I',
+  'j' => 'J',
+  'k' => 'K',
+  'l' => 'L',
+  'm' => 'M',
+  'n' => 'N',
+  'o' => 'O',
+  'p' => 'P',
+  'q' => 'Q',
+  'r' => 'R',
+  's' => 'S',
+  't' => 'T',
+  'u' => 'U',
+  'v' => 'V',
+  'w' => 'W',
+  'x' => 'X',
+  'y' => 'Y',
+  'z' => 'Z',
+  'µ' => 'Μ',
+  'à' => 'À',
+  'á' => 'Á',
+  'â' => 'Â',
+  'ã' => 'Ã',
+  'ä' => 'Ä',
+  'å' => 'Å',
+  'æ' => 'Æ',
+  'ç' => 'Ç',
+  'è' => 'È',
+  'é' => 'É',
+  'ê' => 'Ê',
+  'ë' => 'Ë',
+  'ì' => 'Ì',
+  'í' => 'Í',
+  'î' => 'Î',
+  'ï' => 'Ï',
+  'ð' => 'Ð',
+  'ñ' => 'Ñ',
+  'ò' => 'Ò',
+  'ó' => 'Ó',
+  'ô' => 'Ô',
+  'õ' => 'Õ',
+  'ö' => 'Ö',
+  'ø' => 'Ø',
+  'ù' => 'Ù',
+  'ú' => 'Ú',
+  'û' => 'Û',
+  'ü' => 'Ü',
+  'ý' => 'Ý',
+  'þ' => 'Þ',
+  'ÿ' => 'Ÿ',
+  'ā' => 'Ā',
+  'ă' => 'Ă',
+  'ą' => 'Ą',
+  'ć' => 'Ć',
+  'ĉ' => 'Ĉ',
+  'ċ' => 'Ċ',
+  'č' => 'Č',
+  'ď' => 'Ď',
+  'đ' => 'Đ',
+  'ē' => 'Ē',
+  'ĕ' => 'Ĕ',
+  'ė' => 'Ė',
+  'ę' => 'Ę',
+  'ě' => 'Ě',
+  'ĝ' => 'Ĝ',
+  'ğ' => 'Ğ',
+  'ġ' => 'Ġ',
+  'ģ' => 'Ģ',
+  'ĥ' => 'Ĥ',
+  'ħ' => 'Ħ',
+  'ĩ' => 'Ĩ',
+  'ī' => 'Ī',
+  'ĭ' => 'Ĭ',
+  'į' => 'Į',
+  'ı' => 'I',
+  'ĳ' => 'Ĳ',
+  'ĵ' => 'Ĵ',
+  'ķ' => 'Ķ',
+  'ĺ' => 'Ĺ',
+  'ļ' => 'Ļ',
+  'ľ' => 'Ľ',
+  'ŀ' => 'Ŀ',
+  'ł' => 'Ł',
+  'ń' => 'Ń',
+  'ņ' => 'Ņ',
+  'ň' => 'Ň',
+  'ŋ' => 'Ŋ',
+  'ō' => 'Ō',
+  'ŏ' => 'Ŏ',
+  'ő' => 'Ő',
+  'œ' => 'Œ',
+  'ŕ' => 'Ŕ',
+  'ŗ' => 'Ŗ',
+  'ř' => 'Ř',
+  'ś' => 'Ś',
+  'ŝ' => 'Ŝ',
+  'ş' => 'Ş',
+  'š' => 'Š',
+  'ţ' => 'Ţ',
+  'ť' => 'Ť',
+  'ŧ' => 'Ŧ',
+  'ũ' => 'Ũ',
+  'ū' => 'Ū',
+  'ŭ' => 'Ŭ',
+  'ů' => 'Ů',
+  'ű' => 'Ű',
+  'ų' => 'Ų',
+  'ŵ' => 'Ŵ',
+  'ŷ' => 'Ŷ',
+  'ź' => 'Ź',
+  'ż' => 'Ż',
+  'ž' => 'Ž',
+  'ſ' => 'S',
+  'ƀ' => 'Ƀ',
+  'ƃ' => 'Ƃ',
+  'ƅ' => 'Ƅ',
+  'ƈ' => 'Ƈ',
+  'ƌ' => 'Ƌ',
+  'ƒ' => 'Ƒ',
+  'ƕ' => 'Ƕ',
+  'ƙ' => 'Ƙ',
+  'ƚ' => 'Ƚ',
+  'ƞ' => 'Ƞ',
+  'ơ' => 'Ơ',
+  'ƣ' => 'Ƣ',
+  'ƥ' => 'Ƥ',
+  'ƨ' => 'Ƨ',
+  'ƭ' => 'Ƭ',
+  'ư' => 'Ư',
+  'ƴ' => 'Ƴ',
+  'ƶ' => 'Ƶ',
+  'ƹ' => 'Ƹ',
+  'ƽ' => 'Ƽ',
+  'ƿ' => 'Ƿ',
+  'ǅ' => 'Ǆ',
+  'ǆ' => 'Ǆ',
+  'ǈ' => 'Ǉ',
+  'ǉ' => 'Ǉ',
+  'ǋ' => 'Ǌ',
+  'ǌ' => 'Ǌ',
+  'ǎ' => 'Ǎ',
+  'ǐ' => 'Ǐ',
+  'ǒ' => 'Ǒ',
+  'ǔ' => 'Ǔ',
+  'ǖ' => 'Ǖ',
+  'ǘ' => 'Ǘ',
+  'ǚ' => 'Ǚ',
+  'ǜ' => 'Ǜ',
+  'ǝ' => 'Ǝ',
+  'ǟ' => 'Ǟ',
+  'ǡ' => 'Ǡ',
+  'ǣ' => 'Ǣ',
+  'ǥ' => 'Ǥ',
+  'ǧ' => 'Ǧ',
+  'ǩ' => 'Ǩ',
+  'ǫ' => 'Ǫ',
+  'ǭ' => 'Ǭ',
+  'ǯ' => 'Ǯ',
+  'ǲ' => 'Ǳ',
+  'ǳ' => 'Ǳ',
+  'ǵ' => 'Ǵ',
+  'ǹ' => 'Ǹ',
+  'ǻ' => 'Ǻ',
+  'ǽ' => 'Ǽ',
+  'ǿ' => 'Ǿ',
+  'ȁ' => 'Ȁ',
+  'ȃ' => 'Ȃ',
+  'ȅ' => 'Ȅ',
+  'ȇ' => 'Ȇ',
+  'ȉ' => 'Ȉ',
+  'ȋ' => 'Ȋ',
+  'ȍ' => 'Ȍ',
+  'ȏ' => 'Ȏ',
+  'ȑ' => 'Ȑ',
+  'ȓ' => 'Ȓ',
+  'ȕ' => 'Ȕ',
+  'ȗ' => 'Ȗ',
+  'ș' => 'Ș',
+  'ț' => 'Ț',
+  'ȝ' => 'Ȝ',
+  'ȟ' => 'Ȟ',
+  'ȣ' => 'Ȣ',
+  'ȥ' => 'Ȥ',
+  'ȧ' => 'Ȧ',
+  'ȩ' => 'Ȩ',
+  'ȫ' => 'Ȫ',
+  'ȭ' => 'Ȭ',
+  'ȯ' => 'Ȯ',
+  'ȱ' => 'Ȱ',
+  'ȳ' => 'Ȳ',
+  'ȼ' => 'Ȼ',
+  'ȿ' => 'Ȿ',
+  'ɀ' => 'Ɀ',
+  'ɂ' => 'Ɂ',
+  'ɇ' => 'Ɇ',
+  'ɉ' => 'Ɉ',
+  'ɋ' => 'Ɋ',
+  'ɍ' => 'Ɍ',
+  'ɏ' => 'Ɏ',
+  'ɐ' => 'Ɐ',
+  'ɑ' => 'Ɑ',
+  'ɒ' => 'Ɒ',
+  'ɓ' => 'Ɓ',
+  'ɔ' => 'Ɔ',
+  'ɖ' => 'Ɖ',
+  'ɗ' => 'Ɗ',
+  'ə' => 'Ə',
+  'ɛ' => 'Ɛ',
+  'ɜ' => 'Ɜ',
+  'ɠ' => 'Ɠ',
+  'ɡ' => 'Ɡ',
+  'ɣ' => 'Ɣ',
+  'ɥ' => 'Ɥ',
+  'ɦ' => 'Ɦ',
+  'ɨ' => 'Ɨ',
+  'ɩ' => 'Ɩ',
+  'ɪ' => 'Ɪ',
+  'ɫ' => 'Ɫ',
+  'ɬ' => 'Ɬ',
+  'ɯ' => 'Ɯ',
+  'ɱ' => 'Ɱ',
+  'ɲ' => 'Ɲ',
+  'ɵ' => 'Ɵ',
+  'ɽ' => 'Ɽ',
+  'ʀ' => 'Ʀ',
+  'ʂ' => 'Ʂ',
+  'ʃ' => 'Ʃ',
+  'ʇ' => 'Ʇ',
+  'ʈ' => 'Ʈ',
+  'ʉ' => 'Ʉ',
+  'ʊ' => 'Ʊ',
+  'ʋ' => 'Ʋ',
+  'ʌ' => 'Ʌ',
+  'ʒ' => 'Ʒ',
+  'ʝ' => 'Ʝ',
+  'ʞ' => 'Ʞ',
+  'ͅ' => 'Ι',
+  'ͱ' => 'Ͱ',
+  'ͳ' => 'Ͳ',
+  'ͷ' => 'Ͷ',
+  'ͻ' => 'Ͻ',
+  'ͼ' => 'Ͼ',
+  'ͽ' => 'Ͽ',
+  'ά' => 'Ά',
+  'έ' => 'Έ',
+  'ή' => 'Ή',
+  'ί' => 'Ί',
+  'α' => 'Α',
+  'β' => 'Β',
+  'γ' => 'Γ',
+  'δ' => 'Δ',
+  'ε' => 'Ε',
+  'ζ' => 'Ζ',
+  'η' => 'Η',
+  'θ' => 'Θ',
+  'ι' => 'Ι',
+  'κ' => 'Κ',
+  'λ' => 'Λ',
+  'μ' => 'Μ',
+  'ν' => 'Ν',
+  'ξ' => 'Ξ',
+  'ο' => 'Ο',
+  'π' => 'Π',
+  'ρ' => 'Ρ',
+  'ς' => 'Σ',
+  'σ' => 'Σ',
+  'τ' => 'Τ',
+  'υ' => 'Υ',
+  'φ' => 'Φ',
+  'χ' => 'Χ',
+  'ψ' => 'Ψ',
+  'ω' => 'Ω',
+  'ϊ' => 'Ϊ',
+  'ϋ' => 'Ϋ',
+  'ό' => 'Ό',
+  'ύ' => 'Ύ',
+  'ώ' => 'Ώ',
+  'ϐ' => 'Β',
+  'ϑ' => 'Θ',
+  'ϕ' => 'Φ',
+  'ϖ' => 'Π',
+  'ϗ' => 'Ϗ',
+  'ϙ' => 'Ϙ',
+  'ϛ' => 'Ϛ',
+  'ϝ' => 'Ϝ',
+  'ϟ' => 'Ϟ',
+  'ϡ' => 'Ϡ',
+  'ϣ' => 'Ϣ',
+  'ϥ' => 'Ϥ',
+  'ϧ' => 'Ϧ',
+  'ϩ' => 'Ϩ',
+  'ϫ' => 'Ϫ',
+  'ϭ' => 'Ϭ',
+  'ϯ' => 'Ϯ',
+  'ϰ' => 'Κ',
+  'ϱ' => 'Ρ',
+  'ϲ' => 'Ϲ',
+  'ϳ' => 'Ϳ',
+  'ϵ' => 'Ε',
+  'ϸ' => 'Ϸ',
+  'ϻ' => 'Ϻ',
+  'а' => 'А',
+  'б' => 'Б',
+  'в' => 'В',
+  'г' => 'Г',
+  'д' => 'Д',
+  'е' => 'Е',
+  'ж' => 'Ж',
+  'з' => 'З',
+  'и' => 'И',
+  'й' => 'Й',
+  'к' => 'К',
+  'л' => 'Л',
+  'м' => 'М',
+  'н' => 'Н',
+  'о' => 'О',
+  'п' => 'П',
+  'р' => 'Р',
+  'с' => 'С',
+  'т' => 'Т',
+  'у' => 'У',
+  'ф' => 'Ф',
+  'х' => 'Х',
+  'ц' => 'Ц',
+  'ч' => 'Ч',
+  'ш' => 'Ш',
+  'щ' => 'Щ',
+  'ъ' => 'Ъ',
+  'ы' => 'Ы',
+  'ь' => 'Ь',
+  'э' => 'Э',
+  'ю' => 'Ю',
+  'я' => 'Я',
+  'ѐ' => 'Ѐ',
+  'ё' => 'Ё',
+  'ђ' => 'Ђ',
+  'ѓ' => 'Ѓ',
+  'є' => 'Є',
+  'ѕ' => 'Ѕ',
+  'і' => 'І',
+  'ї' => 'Ї',
+  'ј' => 'Ј',
+  'љ' => 'Љ',
+  'њ' => 'Њ',
+  'ћ' => 'Ћ',
+  'ќ' => 'Ќ',
+  'ѝ' => 'Ѝ',
+  'ў' => 'Ў',
+  'џ' => 'Џ',
+  'ѡ' => 'Ѡ',
+  'ѣ' => 'Ѣ',
+  'ѥ' => 'Ѥ',
+  'ѧ' => 'Ѧ',
+  'ѩ' => 'Ѩ',
+  'ѫ' => 'Ѫ',
+  'ѭ' => 'Ѭ',
+  'ѯ' => 'Ѯ',
+  'ѱ' => 'Ѱ',
+  'ѳ' => 'Ѳ',
+  'ѵ' => 'Ѵ',
+  'ѷ' => 'Ѷ',
+  'ѹ' => 'Ѹ',
+  'ѻ' => 'Ѻ',
+  'ѽ' => 'Ѽ',
+  'ѿ' => 'Ѿ',
+  'ҁ' => 'Ҁ',
+  'ҋ' => 'Ҋ',
+  'ҍ' => 'Ҍ',
+  'ҏ' => 'Ҏ',
+  'ґ' => 'Ґ',
+  'ғ' => 'Ғ',
+  'ҕ' => 'Ҕ',
+  'җ' => 'Җ',
+  'ҙ' => 'Ҙ',
+  'қ' => 'Қ',
+  'ҝ' => 'Ҝ',
+  'ҟ' => 'Ҟ',
+  'ҡ' => 'Ҡ',
+  'ң' => 'Ң',
+  'ҥ' => 'Ҥ',
+  'ҧ' => 'Ҧ',
+  'ҩ' => 'Ҩ',
+  'ҫ' => 'Ҫ',
+  'ҭ' => 'Ҭ',
+  'ү' => 'Ү',
+  'ұ' => 'Ұ',
+  'ҳ' => 'Ҳ',
+  'ҵ' => 'Ҵ',
+  'ҷ' => 'Ҷ',
+  'ҹ' => 'Ҹ',
+  'һ' => 'Һ',
+  'ҽ' => 'Ҽ',
+  'ҿ' => 'Ҿ',
+  'ӂ' => 'Ӂ',
+  'ӄ' => 'Ӄ',
+  'ӆ' => 'Ӆ',
+  'ӈ' => 'Ӈ',
+  'ӊ' => 'Ӊ',
+  'ӌ' => 'Ӌ',
+  'ӎ' => 'Ӎ',
+  'ӏ' => 'Ӏ',
+  'ӑ' => 'Ӑ',
+  'ӓ' => 'Ӓ',
+  'ӕ' => 'Ӕ',
+  'ӗ' => 'Ӗ',
+  'ә' => 'Ә',
+  'ӛ' => 'Ӛ',
+  'ӝ' => 'Ӝ',
+  'ӟ' => 'Ӟ',
+  'ӡ' => 'Ӡ',
+  'ӣ' => 'Ӣ',
+  'ӥ' => 'Ӥ',
+  'ӧ' => 'Ӧ',
+  'ө' => 'Ө',
+  'ӫ' => 'Ӫ',
+  'ӭ' => 'Ӭ',
+  'ӯ' => 'Ӯ',
+  'ӱ' => 'Ӱ',
+  'ӳ' => 'Ӳ',
+  'ӵ' => 'Ӵ',
+  'ӷ' => 'Ӷ',
+  'ӹ' => 'Ӹ',
+  'ӻ' => 'Ӻ',
+  'ӽ' => 'Ӽ',
+  'ӿ' => 'Ӿ',
+  'ԁ' => 'Ԁ',
+  'ԃ' => 'Ԃ',
+  'ԅ' => 'Ԅ',
+  'ԇ' => 'Ԇ',
+  'ԉ' => 'Ԉ',
+  'ԋ' => 'Ԋ',
+  'ԍ' => 'Ԍ',
+  'ԏ' => 'Ԏ',
+  'ԑ' => 'Ԑ',
+  'ԓ' => 'Ԓ',
+  'ԕ' => 'Ԕ',
+  'ԗ' => 'Ԗ',
+  'ԙ' => 'Ԙ',
+  'ԛ' => 'Ԛ',
+  'ԝ' => 'Ԝ',
+  'ԟ' => 'Ԟ',
+  'ԡ' => 'Ԡ',
+  'ԣ' => 'Ԣ',
+  'ԥ' => 'Ԥ',
+  'ԧ' => 'Ԧ',
+  'ԩ' => 'Ԩ',
+  'ԫ' => 'Ԫ',
+  'ԭ' => 'Ԭ',
+  'ԯ' => 'Ԯ',
+  'ա' => 'Ա',
+  'բ' => 'Բ',
+  'գ' => 'Գ',
+  'դ' => 'Դ',
+  'ե' => 'Ե',
+  'զ' => 'Զ',
+  'է' => 'Է',
+  'ը' => 'Ը',
+  'թ' => 'Թ',
+  'ժ' => 'Ժ',
+  'ի' => 'Ի',
+  'լ' => 'Լ',
+  'խ' => 'Խ',
+  'ծ' => 'Ծ',
+  'կ' => 'Կ',
+  'հ' => 'Հ',
+  'ձ' => 'Ձ',
+  'ղ' => 'Ղ',
+  'ճ' => 'Ճ',
+  'մ' => 'Մ',
+  'յ' => 'Յ',
+  'ն' => 'Ն',
+  'շ' => 'Շ',
+  'ո' => 'Ո',
+  'չ' => 'Չ',
+  'պ' => 'Պ',
+  'ջ' => 'Ջ',
+  'ռ' => 'Ռ',
+  'ս' => 'Ս',
+  'վ' => 'Վ',
+  'տ' => 'Տ',
+  'ր' => 'Ր',
+  'ց' => 'Ց',
+  'ւ' => 'Ւ',
+  'փ' => 'Փ',
+  'ք' => 'Ք',
+  'օ' => 'Օ',
+  'ֆ' => 'Ֆ',
+  'ა' => 'Ა',
+  'ბ' => 'Ბ',
+  'გ' => 'Გ',
+  'დ' => 'Დ',
+  'ე' => 'Ე',
+  'ვ' => 'Ვ',
+  'ზ' => 'Ზ',
+  'თ' => 'Თ',
+  'ი' => 'Ი',
+  'კ' => 'Კ',
+  'ლ' => 'Ლ',
+  'მ' => 'Მ',
+  'ნ' => 'Ნ',
+  'ო' => 'Ო',
+  'პ' => 'Პ',
+  'ჟ' => 'Ჟ',
+  'რ' => 'Რ',
+  'ს' => 'Ს',
+  'ტ' => 'Ტ',
+  'უ' => 'Უ',
+  'ფ' => 'Ფ',
+  'ქ' => 'Ქ',
+  'ღ' => 'Ღ',
+  'ყ' => 'Ყ',
+  'შ' => 'Შ',
+  'ჩ' => 'Ჩ',
+  'ც' => 'Ც',
+  'ძ' => 'Ძ',
+  'წ' => 'Წ',
+  'ჭ' => 'Ჭ',
+  'ხ' => 'Ხ',
+  'ჯ' => 'Ჯ',
+  'ჰ' => 'Ჰ',
+  'ჱ' => 'Ჱ',
+  'ჲ' => 'Ჲ',
+  'ჳ' => 'Ჳ',
+  'ჴ' => 'Ჴ',
+  'ჵ' => 'Ჵ',
+  'ჶ' => 'Ჶ',
+  'ჷ' => 'Ჷ',
+  'ჸ' => 'Ჸ',
+  'ჹ' => 'Ჹ',
+  'ჺ' => 'Ჺ',
+  'ჽ' => 'Ჽ',
+  'ჾ' => 'Ჾ',
+  'ჿ' => 'Ჿ',
+  'ᏸ' => 'Ᏸ',
+  'ᏹ' => 'Ᏹ',
+  'ᏺ' => 'Ᏺ',
+  'ᏻ' => 'Ᏻ',
+  'ᏼ' => 'Ᏼ',
+  'ᏽ' => 'Ᏽ',
+  'ᲀ' => 'В',
+  'ᲁ' => 'Д',
+  'ᲂ' => 'О',
+  'ᲃ' => 'С',
+  'ᲄ' => 'Т',
+  'ᲅ' => 'Т',
+  'ᲆ' => 'Ъ',
+  'ᲇ' => 'Ѣ',
+  'ᲈ' => 'Ꙋ',
+  'ᵹ' => 'Ᵹ',
+  'ᵽ' => 'Ᵽ',
+  'ᶎ' => 'Ᶎ',
+  'ḁ' => 'Ḁ',
+  'ḃ' => 'Ḃ',
+  'ḅ' => 'Ḅ',
+  'ḇ' => 'Ḇ',
+  'ḉ' => 'Ḉ',
+  'ḋ' => 'Ḋ',
+  'ḍ' => 'Ḍ',
+  'ḏ' => 'Ḏ',
+  'ḑ' => 'Ḑ',
+  'ḓ' => 'Ḓ',
+  'ḕ' => 'Ḕ',
+  'ḗ' => 'Ḗ',
+  'ḙ' => 'Ḙ',
+  'ḛ' => 'Ḛ',
+  'ḝ' => 'Ḝ',
+  'ḟ' => 'Ḟ',
+  'ḡ' => 'Ḡ',
+  'ḣ' => 'Ḣ',
+  'ḥ' => 'Ḥ',
+  'ḧ' => 'Ḧ',
+  'ḩ' => 'Ḩ',
+  'ḫ' => 'Ḫ',
+  'ḭ' => 'Ḭ',
+  'ḯ' => 'Ḯ',
+  'ḱ' => 'Ḱ',
+  'ḳ' => 'Ḳ',
+  'ḵ' => 'Ḵ',
+  'ḷ' => 'Ḷ',
+  'ḹ' => 'Ḹ',
+  'ḻ' => 'Ḻ',
+  'ḽ' => 'Ḽ',
+  'ḿ' => 'Ḿ',
+  'ṁ' => 'Ṁ',
+  'ṃ' => 'Ṃ',
+  'ṅ' => 'Ṅ',
+  'ṇ' => 'Ṇ',
+  'ṉ' => 'Ṉ',
+  'ṋ' => 'Ṋ',
+  'ṍ' => 'Ṍ',
+  'ṏ' => 'Ṏ',
+  'ṑ' => 'Ṑ',
+  'ṓ' => 'Ṓ',
+  'ṕ' => 'Ṕ',
+  'ṗ' => 'Ṗ',
+  'ṙ' => 'Ṙ',
+  'ṛ' => 'Ṛ',
+  'ṝ' => 'Ṝ',
+  'ṟ' => 'Ṟ',
+  'ṡ' => 'Ṡ',
+  'ṣ' => 'Ṣ',
+  'ṥ' => 'Ṥ',
+  'ṧ' => 'Ṧ',
+  'ṩ' => 'Ṩ',
+  'ṫ' => 'Ṫ',
+  'ṭ' => 'Ṭ',
+  'ṯ' => 'Ṯ',
+  'ṱ' => 'Ṱ',
+  'ṳ' => 'Ṳ',
+  'ṵ' => 'Ṵ',
+  'ṷ' => 'Ṷ',
+  'ṹ' => 'Ṹ',
+  'ṻ' => 'Ṻ',
+  'ṽ' => 'Ṽ',
+  'ṿ' => 'Ṿ',
+  'ẁ' => 'Ẁ',
+  'ẃ' => 'Ẃ',
+  'ẅ' => 'Ẅ',
+  'ẇ' => 'Ẇ',
+  'ẉ' => 'Ẉ',
+  'ẋ' => 'Ẋ',
+  'ẍ' => 'Ẍ',
+  'ẏ' => 'Ẏ',
+  'ẑ' => 'Ẑ',
+  'ẓ' => 'Ẓ',
+  'ẕ' => 'Ẕ',
+  'ẛ' => 'Ṡ',
+  'ạ' => 'Ạ',
+  'ả' => 'Ả',
+  'ấ' => 'Ấ',
+  'ầ' => 'Ầ',
+  'ẩ' => 'Ẩ',
+  'ẫ' => 'Ẫ',
+  'ậ' => 'Ậ',
+  'ắ' => 'Ắ',
+  'ằ' => 'Ằ',
+  'ẳ' => 'Ẳ',
+  'ẵ' => 'Ẵ',
+  'ặ' => 'Ặ',
+  'ẹ' => 'Ẹ',
+  'ẻ' => 'Ẻ',
+  'ẽ' => 'Ẽ',
+  'ế' => 'Ế',
+  'ề' => 'Ề',
+  'ể' => 'Ể',
+  'ễ' => 'Ễ',
+  'ệ' => 'Ệ',
+  'ỉ' => 'Ỉ',
+  'ị' => 'Ị',
+  'ọ' => 'Ọ',
+  'ỏ' => 'Ỏ',
+  'ố' => 'Ố',
+  'ồ' => 'Ồ',
+  'ổ' => 'Ổ',
+  'ỗ' => 'Ỗ',
+  'ộ' => 'Ộ',
+  'ớ' => 'Ớ',
+  'ờ' => 'Ờ',
+  'ở' => 'Ở',
+  'ỡ' => 'Ỡ',
+  'ợ' => 'Ợ',
+  'ụ' => 'Ụ',
+  'ủ' => 'Ủ',
+  'ứ' => 'Ứ',
+  'ừ' => 'Ừ',
+  'ử' => 'Ử',
+  'ữ' => 'Ữ',
+  'ự' => 'Ự',
+  'ỳ' => 'Ỳ',
+  'ỵ' => 'Ỵ',
+  'ỷ' => 'Ỷ',
+  'ỹ' => 'Ỹ',
+  'ỻ' => 'Ỻ',
+  'ỽ' => 'Ỽ',
+  'ỿ' => 'Ỿ',
+  'ἀ' => 'Ἀ',
+  'ἁ' => 'Ἁ',
+  'ἂ' => 'Ἂ',
+  'ἃ' => 'Ἃ',
+  'ἄ' => 'Ἄ',
+  'ἅ' => 'Ἅ',
+  'ἆ' => 'Ἆ',
+  'ἇ' => 'Ἇ',
+  'ἐ' => 'Ἐ',
+  'ἑ' => 'Ἑ',
+  'ἒ' => 'Ἒ',
+  'ἓ' => 'Ἓ',
+  'ἔ' => 'Ἔ',
+  'ἕ' => 'Ἕ',
+  'ἠ' => 'Ἠ',
+  'ἡ' => 'Ἡ',
+  'ἢ' => 'Ἢ',
+  'ἣ' => 'Ἣ',
+  'ἤ' => 'Ἤ',
+  'ἥ' => 'Ἥ',
+  'ἦ' => 'Ἦ',
+  'ἧ' => 'Ἧ',
+  'ἰ' => 'Ἰ',
+  'ἱ' => 'Ἱ',
+  'ἲ' => 'Ἲ',
+  'ἳ' => 'Ἳ',
+  'ἴ' => 'Ἴ',
+  'ἵ' => 'Ἵ',
+  'ἶ' => 'Ἶ',
+  'ἷ' => 'Ἷ',
+  'ὀ' => 'Ὀ',
+  'ὁ' => 'Ὁ',
+  'ὂ' => 'Ὂ',
+  'ὃ' => 'Ὃ',
+  'ὄ' => 'Ὄ',
+  'ὅ' => 'Ὅ',
+  'ὑ' => 'Ὑ',
+  'ὓ' => 'Ὓ',
+  'ὕ' => 'Ὕ',
+  'ὗ' => 'Ὗ',
+  'ὠ' => 'Ὠ',
+  'ὡ' => 'Ὡ',
+  'ὢ' => 'Ὢ',
+  'ὣ' => 'Ὣ',
+  'ὤ' => 'Ὤ',
+  'ὥ' => 'Ὥ',
+  'ὦ' => 'Ὦ',
+  'ὧ' => 'Ὧ',
+  'ὰ' => 'Ὰ',
+  'ά' => 'Ά',
+  'ὲ' => 'Ὲ',
+  'έ' => 'Έ',
+  'ὴ' => 'Ὴ',
+  'ή' => 'Ή',
+  'ὶ' => 'Ὶ',
+  'ί' => 'Ί',
+  'ὸ' => 'Ὸ',
+  'ό' => 'Ό',
+  'ὺ' => 'Ὺ',
+  'ύ' => 'Ύ',
+  'ὼ' => 'Ὼ',
+  'ώ' => 'Ώ',
+  'ᾀ' => 'ἈΙ',
+  'ᾁ' => 'ἉΙ',
+  'ᾂ' => 'ἊΙ',
+  'ᾃ' => 'ἋΙ',
+  'ᾄ' => 'ἌΙ',
+  'ᾅ' => 'ἍΙ',
+  'ᾆ' => 'ἎΙ',
+  'ᾇ' => 'ἏΙ',
+  'ᾐ' => 'ἨΙ',
+  'ᾑ' => 'ἩΙ',
+  'ᾒ' => 'ἪΙ',
+  'ᾓ' => 'ἫΙ',
+  'ᾔ' => 'ἬΙ',
+  'ᾕ' => 'ἭΙ',
+  'ᾖ' => 'ἮΙ',
+  'ᾗ' => 'ἯΙ',
+  'ᾠ' => 'ὨΙ',
+  'ᾡ' => 'ὩΙ',
+  'ᾢ' => 'ὪΙ',
+  'ᾣ' => 'ὫΙ',
+  'ᾤ' => 'ὬΙ',
+  'ᾥ' => 'ὭΙ',
+  'ᾦ' => 'ὮΙ',
+  'ᾧ' => 'ὯΙ',
+  'ᾰ' => 'Ᾰ',
+  'ᾱ' => 'Ᾱ',
+  'ᾳ' => 'ΑΙ',
+  'ι' => 'Ι',
+  'ῃ' => 'ΗΙ',
+  'ῐ' => 'Ῐ',
+  'ῑ' => 'Ῑ',
+  'ῠ' => 'Ῠ',
+  'ῡ' => 'Ῡ',
+  'ῥ' => 'Ῥ',
+  'ῳ' => 'ΩΙ',
+  'ⅎ' => 'Ⅎ',
+  'ⅰ' => 'Ⅰ',
+  'ⅱ' => 'Ⅱ',
+  'ⅲ' => 'Ⅲ',
+  'ⅳ' => 'Ⅳ',
+  'ⅴ' => 'Ⅴ',
+  'ⅵ' => 'Ⅵ',
+  'ⅶ' => 'Ⅶ',
+  'ⅷ' => 'Ⅷ',
+  'ⅸ' => 'Ⅸ',
+  'ⅹ' => 'Ⅹ',
+  'ⅺ' => 'Ⅺ',
+  'ⅻ' => 'Ⅻ',
+  'ⅼ' => 'Ⅼ',
+  'ⅽ' => 'Ⅽ',
+  'ⅾ' => 'Ⅾ',
+  'ⅿ' => 'Ⅿ',
+  'ↄ' => 'Ↄ',
+  'ⓐ' => 'Ⓐ',
+  'ⓑ' => 'Ⓑ',
+  'ⓒ' => 'Ⓒ',
+  'ⓓ' => 'Ⓓ',
+  'ⓔ' => 'Ⓔ',
+  'ⓕ' => 'Ⓕ',
+  'ⓖ' => 'Ⓖ',
+  'ⓗ' => 'Ⓗ',
+  'ⓘ' => 'Ⓘ',
+  'ⓙ' => 'Ⓙ',
+  'ⓚ' => 'Ⓚ',
+  'ⓛ' => 'Ⓛ',
+  'ⓜ' => 'Ⓜ',
+  'ⓝ' => 'Ⓝ',
+  'ⓞ' => 'Ⓞ',
+  'ⓟ' => 'Ⓟ',
+  'ⓠ' => 'Ⓠ',
+  'ⓡ' => 'Ⓡ',
+  'ⓢ' => 'Ⓢ',
+  'ⓣ' => 'Ⓣ',
+  'ⓤ' => 'Ⓤ',
+  'ⓥ' => 'Ⓥ',
+  'ⓦ' => 'Ⓦ',
+  'ⓧ' => 'Ⓧ',
+  'ⓨ' => 'Ⓨ',
+  'ⓩ' => 'Ⓩ',
+  'ⰰ' => 'Ⰰ',
+  'ⰱ' => 'Ⰱ',
+  'ⰲ' => 'Ⰲ',
+  'ⰳ' => 'Ⰳ',
+  'ⰴ' => 'Ⰴ',
+  'ⰵ' => 'Ⰵ',
+  'ⰶ' => 'Ⰶ',
+  'ⰷ' => 'Ⰷ',
+  'ⰸ' => 'Ⰸ',
+  'ⰹ' => 'Ⰹ',
+  'ⰺ' => 'Ⰺ',
+  'ⰻ' => 'Ⰻ',
+  'ⰼ' => 'Ⰼ',
+  'ⰽ' => 'Ⰽ',
+  'ⰾ' => 'Ⰾ',
+  'ⰿ' => 'Ⰿ',
+  'ⱀ' => 'Ⱀ',
+  'ⱁ' => 'Ⱁ',
+  'ⱂ' => 'Ⱂ',
+  'ⱃ' => 'Ⱃ',
+  'ⱄ' => 'Ⱄ',
+  'ⱅ' => 'Ⱅ',
+  'ⱆ' => 'Ⱆ',
+  'ⱇ' => 'Ⱇ',
+  'ⱈ' => 'Ⱈ',
+  'ⱉ' => 'Ⱉ',
+  'ⱊ' => 'Ⱊ',
+  'ⱋ' => 'Ⱋ',
+  'ⱌ' => 'Ⱌ',
+  'ⱍ' => 'Ⱍ',
+  'ⱎ' => 'Ⱎ',
+  'ⱏ' => 'Ⱏ',
+  'ⱐ' => 'Ⱐ',
+  'ⱑ' => 'Ⱑ',
+  'ⱒ' => 'Ⱒ',
+  'ⱓ' => 'Ⱓ',
+  'ⱔ' => 'Ⱔ',
+  'ⱕ' => 'Ⱕ',
+  'ⱖ' => 'Ⱖ',
+  'ⱗ' => 'Ⱗ',
+  'ⱘ' => 'Ⱘ',
+  'ⱙ' => 'Ⱙ',
+  'ⱚ' => 'Ⱚ',
+  'ⱛ' => 'Ⱛ',
+  'ⱜ' => 'Ⱜ',
+  'ⱝ' => 'Ⱝ',
+  'ⱞ' => 'Ⱞ',
+  'ⱡ' => 'Ⱡ',
+  'ⱥ' => 'Ⱥ',
+  'ⱦ' => 'Ⱦ',
+  'ⱨ' => 'Ⱨ',
+  'ⱪ' => 'Ⱪ',
+  'ⱬ' => 'Ⱬ',
+  'ⱳ' => 'Ⱳ',
+  'ⱶ' => 'Ⱶ',
+  'ⲁ' => 'Ⲁ',
+  'ⲃ' => 'Ⲃ',
+  'ⲅ' => 'Ⲅ',
+  'ⲇ' => 'Ⲇ',
+  'ⲉ' => 'Ⲉ',
+  'ⲋ' => 'Ⲋ',
+  'ⲍ' => 'Ⲍ',
+  'ⲏ' => 'Ⲏ',
+  'ⲑ' => 'Ⲑ',
+  'ⲓ' => 'Ⲓ',
+  'ⲕ' => 'Ⲕ',
+  'ⲗ' => 'Ⲗ',
+  'ⲙ' => 'Ⲙ',
+  'ⲛ' => 'Ⲛ',
+  'ⲝ' => 'Ⲝ',
+  'ⲟ' => 'Ⲟ',
+  'ⲡ' => 'Ⲡ',
+  'ⲣ' => 'Ⲣ',
+  'ⲥ' => 'Ⲥ',
+  'ⲧ' => 'Ⲧ',
+  'ⲩ' => 'Ⲩ',
+  'ⲫ' => 'Ⲫ',
+  'ⲭ' => 'Ⲭ',
+  'ⲯ' => 'Ⲯ',
+  'ⲱ' => 'Ⲱ',
+  'ⲳ' => 'Ⲳ',
+  'ⲵ' => 'Ⲵ',
+  'ⲷ' => 'Ⲷ',
+  'ⲹ' => 'Ⲹ',
+  'ⲻ' => 'Ⲻ',
+  'ⲽ' => 'Ⲽ',
+  'ⲿ' => 'Ⲿ',
+  'ⳁ' => 'Ⳁ',
+  'ⳃ' => 'Ⳃ',
+  'ⳅ' => 'Ⳅ',
+  'ⳇ' => 'Ⳇ',
+  'ⳉ' => 'Ⳉ',
+  'ⳋ' => 'Ⳋ',
+  'ⳍ' => 'Ⳍ',
+  'ⳏ' => 'Ⳏ',
+  'ⳑ' => 'Ⳑ',
+  'ⳓ' => 'Ⳓ',
+  'ⳕ' => 'Ⳕ',
+  'ⳗ' => 'Ⳗ',
+  'ⳙ' => 'Ⳙ',
+  'ⳛ' => 'Ⳛ',
+  'ⳝ' => 'Ⳝ',
+  'ⳟ' => 'Ⳟ',
+  'ⳡ' => 'Ⳡ',
+  'ⳣ' => 'Ⳣ',
+  'ⳬ' => 'Ⳬ',
+  'ⳮ' => 'Ⳮ',
+  'ⳳ' => 'Ⳳ',
+  'ⴀ' => 'Ⴀ',
+  'ⴁ' => 'Ⴁ',
+  'ⴂ' => 'Ⴂ',
+  'ⴃ' => 'Ⴃ',
+  'ⴄ' => 'Ⴄ',
+  'ⴅ' => 'Ⴅ',
+  'ⴆ' => 'Ⴆ',
+  'ⴇ' => 'Ⴇ',
+  'ⴈ' => 'Ⴈ',
+  'ⴉ' => 'Ⴉ',
+  'ⴊ' => 'Ⴊ',
+  'ⴋ' => 'Ⴋ',
+  'ⴌ' => 'Ⴌ',
+  'ⴍ' => 'Ⴍ',
+  'ⴎ' => 'Ⴎ',
+  'ⴏ' => 'Ⴏ',
+  'ⴐ' => 'Ⴐ',
+  'ⴑ' => 'Ⴑ',
+  'ⴒ' => 'Ⴒ',
+  'ⴓ' => 'Ⴓ',
+  'ⴔ' => 'Ⴔ',
+  'ⴕ' => 'Ⴕ',
+  'ⴖ' => 'Ⴖ',
+  'ⴗ' => 'Ⴗ',
+  'ⴘ' => 'Ⴘ',
+  'ⴙ' => 'Ⴙ',
+  'ⴚ' => 'Ⴚ',
+  'ⴛ' => 'Ⴛ',
+  'ⴜ' => 'Ⴜ',
+  'ⴝ' => 'Ⴝ',
+  'ⴞ' => 'Ⴞ',
+  'ⴟ' => 'Ⴟ',
+  'ⴠ' => 'Ⴠ',
+  'ⴡ' => 'Ⴡ',
+  'ⴢ' => 'Ⴢ',
+  'ⴣ' => 'Ⴣ',
+  'ⴤ' => 'Ⴤ',
+  'ⴥ' => 'Ⴥ',
+  'ⴧ' => 'Ⴧ',
+  'ⴭ' => 'Ⴭ',
+  'ꙁ' => 'Ꙁ',
+  'ꙃ' => 'Ꙃ',
+  'ꙅ' => 'Ꙅ',
+  'ꙇ' => 'Ꙇ',
+  'ꙉ' => 'Ꙉ',
+  'ꙋ' => 'Ꙋ',
+  'ꙍ' => 'Ꙍ',
+  'ꙏ' => 'Ꙏ',
+  'ꙑ' => 'Ꙑ',
+  'ꙓ' => 'Ꙓ',
+  'ꙕ' => 'Ꙕ',
+  'ꙗ' => 'Ꙗ',
+  'ꙙ' => 'Ꙙ',
+  'ꙛ' => 'Ꙛ',
+  'ꙝ' => 'Ꙝ',
+  'ꙟ' => 'Ꙟ',
+  'ꙡ' => 'Ꙡ',
+  'ꙣ' => 'Ꙣ',
+  'ꙥ' => 'Ꙥ',
+  'ꙧ' => 'Ꙧ',
+  'ꙩ' => 'Ꙩ',
+  'ꙫ' => 'Ꙫ',
+  'ꙭ' => 'Ꙭ',
+  'ꚁ' => 'Ꚁ',
+  'ꚃ' => 'Ꚃ',
+  'ꚅ' => 'Ꚅ',
+  'ꚇ' => 'Ꚇ',
+  'ꚉ' => 'Ꚉ',
+  'ꚋ' => 'Ꚋ',
+  'ꚍ' => 'Ꚍ',
+  'ꚏ' => 'Ꚏ',
+  'ꚑ' => 'Ꚑ',
+  'ꚓ' => 'Ꚓ',
+  'ꚕ' => 'Ꚕ',
+  'ꚗ' => 'Ꚗ',
+  'ꚙ' => 'Ꚙ',
+  'ꚛ' => 'Ꚛ',
+  'ꜣ' => 'Ꜣ',
+  'ꜥ' => 'Ꜥ',
+  'ꜧ' => 'Ꜧ',
+  'ꜩ' => 'Ꜩ',
+  'ꜫ' => 'Ꜫ',
+  'ꜭ' => 'Ꜭ',
+  'ꜯ' => 'Ꜯ',
+  'ꜳ' => 'Ꜳ',
+  'ꜵ' => 'Ꜵ',
+  'ꜷ' => 'Ꜷ',
+  'ꜹ' => 'Ꜹ',
+  'ꜻ' => 'Ꜻ',
+  'ꜽ' => 'Ꜽ',
+  'ꜿ' => 'Ꜿ',
+  'ꝁ' => 'Ꝁ',
+  'ꝃ' => 'Ꝃ',
+  'ꝅ' => 'Ꝅ',
+  'ꝇ' => 'Ꝇ',
+  'ꝉ' => 'Ꝉ',
+  'ꝋ' => 'Ꝋ',
+  'ꝍ' => 'Ꝍ',
+  'ꝏ' => 'Ꝏ',
+  'ꝑ' => 'Ꝑ',
+  'ꝓ' => 'Ꝓ',
+  'ꝕ' => 'Ꝕ',
+  'ꝗ' => 'Ꝗ',
+  'ꝙ' => 'Ꝙ',
+  'ꝛ' => 'Ꝛ',
+  'ꝝ' => 'Ꝝ',
+  'ꝟ' => 'Ꝟ',
+  'ꝡ' => 'Ꝡ',
+  'ꝣ' => 'Ꝣ',
+  'ꝥ' => 'Ꝥ',
+  'ꝧ' => 'Ꝧ',
+  'ꝩ' => 'Ꝩ',
+  'ꝫ' => 'Ꝫ',
+  'ꝭ' => 'Ꝭ',
+  'ꝯ' => 'Ꝯ',
+  'ꝺ' => 'Ꝺ',
+  'ꝼ' => 'Ꝼ',
+  'ꝿ' => 'Ꝿ',
+  'ꞁ' => 'Ꞁ',
+  'ꞃ' => 'Ꞃ',
+  'ꞅ' => 'Ꞅ',
+  'ꞇ' => 'Ꞇ',
+  'ꞌ' => 'Ꞌ',
+  'ꞑ' => 'Ꞑ',
+  'ꞓ' => 'Ꞓ',
+  'ꞔ' => 'Ꞔ',
+  'ꞗ' => 'Ꞗ',
+  'ꞙ' => 'Ꞙ',
+  'ꞛ' => 'Ꞛ',
+  'ꞝ' => 'Ꞝ',
+  'ꞟ' => 'Ꞟ',
+  'ꞡ' => 'Ꞡ',
+  'ꞣ' => 'Ꞣ',
+  'ꞥ' => 'Ꞥ',
+  'ꞧ' => 'Ꞧ',
+  'ꞩ' => 'Ꞩ',
+  'ꞵ' => 'Ꞵ',
+  'ꞷ' => 'Ꞷ',
+  'ꞹ' => 'Ꞹ',
+  'ꞻ' => 'Ꞻ',
+  'ꞽ' => 'Ꞽ',
+  'ꞿ' => 'Ꞿ',
+  'ꟃ' => 'Ꟃ',
+  'ꟈ' => 'Ꟈ',
+  'ꟊ' => 'Ꟊ',
+  'ꟶ' => 'Ꟶ',
+  'ꭓ' => 'Ꭓ',
+  'ꭰ' => 'Ꭰ',
+  'ꭱ' => 'Ꭱ',
+  'ꭲ' => 'Ꭲ',
+  'ꭳ' => 'Ꭳ',
+  'ꭴ' => 'Ꭴ',
+  'ꭵ' => 'Ꭵ',
+  'ꭶ' => 'Ꭶ',
+  'ꭷ' => 'Ꭷ',
+  'ꭸ' => 'Ꭸ',
+  'ꭹ' => 'Ꭹ',
+  'ꭺ' => 'Ꭺ',
+  'ꭻ' => 'Ꭻ',
+  'ꭼ' => 'Ꭼ',
+  'ꭽ' => 'Ꭽ',
+  'ꭾ' => 'Ꭾ',
+  'ꭿ' => 'Ꭿ',
+  'ꮀ' => 'Ꮀ',
+  'ꮁ' => 'Ꮁ',
+  'ꮂ' => 'Ꮂ',
+  'ꮃ' => 'Ꮃ',
+  'ꮄ' => 'Ꮄ',
+  'ꮅ' => 'Ꮅ',
+  'ꮆ' => 'Ꮆ',
+  'ꮇ' => 'Ꮇ',
+  'ꮈ' => 'Ꮈ',
+  'ꮉ' => 'Ꮉ',
+  'ꮊ' => 'Ꮊ',
+  'ꮋ' => 'Ꮋ',
+  'ꮌ' => 'Ꮌ',
+  'ꮍ' => 'Ꮍ',
+  'ꮎ' => 'Ꮎ',
+  'ꮏ' => 'Ꮏ',
+  'ꮐ' => 'Ꮐ',
+  'ꮑ' => 'Ꮑ',
+  'ꮒ' => 'Ꮒ',
+  'ꮓ' => 'Ꮓ',
+  'ꮔ' => 'Ꮔ',
+  'ꮕ' => 'Ꮕ',
+  'ꮖ' => 'Ꮖ',
+  'ꮗ' => 'Ꮗ',
+  'ꮘ' => 'Ꮘ',
+  'ꮙ' => 'Ꮙ',
+  'ꮚ' => 'Ꮚ',
+  'ꮛ' => 'Ꮛ',
+  'ꮜ' => 'Ꮜ',
+  'ꮝ' => 'Ꮝ',
+  'ꮞ' => 'Ꮞ',
+  'ꮟ' => 'Ꮟ',
+  'ꮠ' => 'Ꮠ',
+  'ꮡ' => 'Ꮡ',
+  'ꮢ' => 'Ꮢ',
+  'ꮣ' => 'Ꮣ',
+  'ꮤ' => 'Ꮤ',
+  'ꮥ' => 'Ꮥ',
+  'ꮦ' => 'Ꮦ',
+  'ꮧ' => 'Ꮧ',
+  'ꮨ' => 'Ꮨ',
+  'ꮩ' => 'Ꮩ',
+  'ꮪ' => 'Ꮪ',
+  'ꮫ' => 'Ꮫ',
+  'ꮬ' => 'Ꮬ',
+  'ꮭ' => 'Ꮭ',
+  'ꮮ' => 'Ꮮ',
+  'ꮯ' => 'Ꮯ',
+  'ꮰ' => 'Ꮰ',
+  'ꮱ' => 'Ꮱ',
+  'ꮲ' => 'Ꮲ',
+  'ꮳ' => 'Ꮳ',
+  'ꮴ' => 'Ꮴ',
+  'ꮵ' => 'Ꮵ',
+  'ꮶ' => 'Ꮶ',
+  'ꮷ' => 'Ꮷ',
+  'ꮸ' => 'Ꮸ',
+  'ꮹ' => 'Ꮹ',
+  'ꮺ' => 'Ꮺ',
+  'ꮻ' => 'Ꮻ',
+  'ꮼ' => 'Ꮼ',
+  'ꮽ' => 'Ꮽ',
+  'ꮾ' => 'Ꮾ',
+  'ꮿ' => 'Ꮿ',
+  'ａ' => 'Ａ',
+  'ｂ' => 'Ｂ',
+  'ｃ' => 'Ｃ',
+  'ｄ' => 'Ｄ',
+  'ｅ' => 'Ｅ',
+  'ｆ' => 'Ｆ',
+  'ｇ' => 'Ｇ',
+  'ｈ' => 'Ｈ',
+  'ｉ' => 'Ｉ',
+  'ｊ' => 'Ｊ',
+  'ｋ' => 'Ｋ',
+  'ｌ' => 'Ｌ',
+  'ｍ' => 'Ｍ',
+  'ｎ' => 'Ｎ',
+  'ｏ' => 'Ｏ',
+  'ｐ' => 'Ｐ',
+  'ｑ' => 'Ｑ',
+  'ｒ' => 'Ｒ',
+  'ｓ' => 'Ｓ',
+  'ｔ' => 'Ｔ',
+  'ｕ' => 'Ｕ',
+  'ｖ' => 'Ｖ',
+  'ｗ' => 'Ｗ',
+  'ｘ' => 'Ｘ',
+  'ｙ' => 'Ｙ',
+  'ｚ' => 'Ｚ',
+  '𐐨' => '𐐀',
+  '𐐩' => '𐐁',
+  '𐐪' => '𐐂',
+  '𐐫' => '𐐃',
+  '𐐬' => '𐐄',
+  '𐐭' => '𐐅',
+  '𐐮' => '𐐆',
+  '𐐯' => '𐐇',
+  '𐐰' => '𐐈',
+  '𐐱' => '𐐉',
+  '𐐲' => '𐐊',
+  '𐐳' => '𐐋',
+  '𐐴' => '𐐌',
+  '𐐵' => '𐐍',
+  '𐐶' => '𐐎',
+  '𐐷' => '𐐏',
+  '𐐸' => '𐐐',
+  '𐐹' => '𐐑',
+  '𐐺' => '𐐒',
+  '𐐻' => '𐐓',
+  '𐐼' => '𐐔',
+  '𐐽' => '𐐕',
+  '𐐾' => '𐐖',
+  '𐐿' => '𐐗',
+  '𐑀' => '𐐘',
+  '𐑁' => '𐐙',
+  '𐑂' => '𐐚',
+  '𐑃' => '𐐛',
+  '𐑄' => '𐐜',
+  '𐑅' => '𐐝',
+  '𐑆' => '𐐞',
+  '𐑇' => '𐐟',
+  '𐑈' => '𐐠',
+  '𐑉' => '𐐡',
+  '𐑊' => '𐐢',
+  '𐑋' => '𐐣',
+  '𐑌' => '𐐤',
+  '𐑍' => '𐐥',
+  '𐑎' => '𐐦',
+  '𐑏' => '𐐧',
+  '𐓘' => '𐒰',
+  '𐓙' => '𐒱',
+  '𐓚' => '𐒲',
+  '𐓛' => '𐒳',
+  '𐓜' => '𐒴',
+  '𐓝' => '𐒵',
+  '𐓞' => '𐒶',
+  '𐓟' => '𐒷',
+  '𐓠' => '𐒸',
+  '𐓡' => '𐒹',
+  '𐓢' => '𐒺',
+  '𐓣' => '𐒻',
+  '𐓤' => '𐒼',
+  '𐓥' => '𐒽',
+  '𐓦' => '𐒾',
+  '𐓧' => '𐒿',
+  '𐓨' => '𐓀',
+  '𐓩' => '𐓁',
+  '𐓪' => '𐓂',
+  '𐓫' => '𐓃',
+  '𐓬' => '𐓄',
+  '𐓭' => '𐓅',
+  '𐓮' => '𐓆',
+  '𐓯' => '𐓇',
+  '𐓰' => '𐓈',
+  '𐓱' => '𐓉',
+  '𐓲' => '𐓊',
+  '𐓳' => '𐓋',
+  '𐓴' => '𐓌',
+  '𐓵' => '𐓍',
+  '𐓶' => '𐓎',
+  '𐓷' => '𐓏',
+  '𐓸' => '𐓐',
+  '𐓹' => '𐓑',
+  '𐓺' => '𐓒',
+  '𐓻' => '𐓓',
+  '𐳀' => '𐲀',
+  '𐳁' => '𐲁',
+  '𐳂' => '𐲂',
+  '𐳃' => '𐲃',
+  '𐳄' => '𐲄',
+  '𐳅' => '𐲅',
+  '𐳆' => '𐲆',
+  '𐳇' => '𐲇',
+  '𐳈' => '𐲈',
+  '𐳉' => '𐲉',
+  '𐳊' => '𐲊',
+  '𐳋' => '𐲋',
+  '𐳌' => '𐲌',
+  '𐳍' => '𐲍',
+  '𐳎' => '𐲎',
+  '𐳏' => '𐲏',
+  '𐳐' => '𐲐',
+  '𐳑' => '𐲑',
+  '𐳒' => '𐲒',
+  '𐳓' => '𐲓',
+  '𐳔' => '𐲔',
+  '𐳕' => '𐲕',
+  '𐳖' => '𐲖',
+  '𐳗' => '𐲗',
+  '𐳘' => '𐲘',
+  '𐳙' => '𐲙',
+  '𐳚' => '𐲚',
+  '𐳛' => '𐲛',
+  '𐳜' => '𐲜',
+  '𐳝' => '𐲝',
+  '𐳞' => '𐲞',
+  '𐳟' => '𐲟',
+  '𐳠' => '𐲠',
+  '𐳡' => '𐲡',
+  '𐳢' => '𐲢',
+  '𐳣' => '𐲣',
+  '𐳤' => '𐲤',
+  '𐳥' => '𐲥',
+  '𐳦' => '𐲦',
+  '𐳧' => '𐲧',
+  '𐳨' => '𐲨',
+  '𐳩' => '𐲩',
+  '𐳪' => '𐲪',
+  '𐳫' => '𐲫',
+  '𐳬' => '𐲬',
+  '𐳭' => '𐲭',
+  '𐳮' => '𐲮',
+  '𐳯' => '𐲯',
+  '𐳰' => '𐲰',
+  '𐳱' => '𐲱',
+  '𐳲' => '𐲲',
+  '𑣀' => '𑢠',
+  '𑣁' => '𑢡',
+  '𑣂' => '𑢢',
+  '𑣃' => '𑢣',
+  '𑣄' => '𑢤',
+  '𑣅' => '𑢥',
+  '𑣆' => '𑢦',
+  '𑣇' => '𑢧',
+  '𑣈' => '𑢨',
+  '𑣉' => '𑢩',
+  '𑣊' => '𑢪',
+  '𑣋' => '𑢫',
+  '𑣌' => '𑢬',
+  '𑣍' => '𑢭',
+  '𑣎' => '𑢮',
+  '𑣏' => '𑢯',
+  '𑣐' => '𑢰',
+  '𑣑' => '𑢱',
+  '𑣒' => '𑢲',
+  '𑣓' => '𑢳',
+  '𑣔' => '𑢴',
+  '𑣕' => '𑢵',
+  '𑣖' => '𑢶',
+  '𑣗' => '𑢷',
+  '𑣘' => '𑢸',
+  '𑣙' => '𑢹',
+  '𑣚' => '𑢺',
+  '𑣛' => '𑢻',
+  '𑣜' => '𑢼',
+  '𑣝' => '𑢽',
+  '𑣞' => '𑢾',
+  '𑣟' => '𑢿',
+  '𖹠' => '𖹀',
+  '𖹡' => '𖹁',
+  '𖹢' => '𖹂',
+  '𖹣' => '𖹃',
+  '𖹤' => '𖹄',
+  '𖹥' => '𖹅',
+  '𖹦' => '𖹆',
+  '𖹧' => '𖹇',
+  '𖹨' => '𖹈',
+  '𖹩' => '𖹉',
+  '𖹪' => '𖹊',
+  '𖹫' => '𖹋',
+  '𖹬' => '𖹌',
+  '𖹭' => '𖹍',
+  '𖹮' => '𖹎',
+  '𖹯' => '𖹏',
+  '𖹰' => '𖹐',
+  '𖹱' => '𖹑',
+  '𖹲' => '𖹒',
+  '𖹳' => '𖹓',
+  '𖹴' => '𖹔',
+  '𖹵' => '𖹕',
+  '𖹶' => '𖹖',
+  '𖹷' => '𖹗',
+  '𖹸' => '𖹘',
+  '𖹹' => '𖹙',
+  '𖹺' => '𖹚',
+  '𖹻' => '𖹛',
+  '𖹼' => '𖹜',
+  '𖹽' => '𖹝',
+  '𖹾' => '𖹞',
+  '𖹿' => '𖹟',
+  '𞤢' => '𞤀',
+  '𞤣' => '𞤁',
+  '𞤤' => '𞤂',
+  '𞤥' => '𞤃',
+  '𞤦' => '𞤄',
+  '𞤧' => '𞤅',
+  '𞤨' => '𞤆',
+  '𞤩' => '𞤇',
+  '𞤪' => '𞤈',
+  '𞤫' => '𞤉',
+  '𞤬' => '𞤊',
+  '𞤭' => '𞤋',
+  '𞤮' => '𞤌',
+  '𞤯' => '𞤍',
+  '𞤰' => '𞤎',
+  '𞤱' => '𞤏',
+  '𞤲' => '𞤐',
+  '𞤳' => '𞤑',
+  '𞤴' => '𞤒',
+  '𞤵' => '𞤓',
+  '𞤶' => '𞤔',
+  '𞤷' => '𞤕',
+  '𞤸' => '𞤖',
+  '𞤹' => '𞤗',
+  '𞤺' => '𞤘',
+  '𞤻' => '𞤙',
+  '𞤼' => '𞤚',
+  '𞤽' => '𞤛',
+  '𞤾' => '𞤜',
+  '𞤿' => '𞤝',
+  '𞥀' => '𞤞',
+  '𞥁' => '𞤟',
+  '𞥂' => '𞤠',
+  '𞥃' => '𞤡',
+  'ß' => 'SS',
+  'ﬀ' => 'FF',
+  'ﬁ' => 'FI',
+  'ﬂ' => 'FL',
+  'ﬃ' => 'FFI',
+  'ﬄ' => 'FFL',
+  'ﬅ' => 'ST',
+  'ﬆ' => 'ST',
+  'և' => 'ԵՒ',
+  'ﬓ' => 'ՄՆ',
+  'ﬔ' => 'ՄԵ',
+  'ﬕ' => 'ՄԻ',
+  'ﬖ' => 'ՎՆ',
+  'ﬗ' => 'ՄԽ',
+  'ŉ' => 'ʼN',
+  'ΐ' => 'Ϊ́',
+  'ΰ' => 'Ϋ́',
+  'ǰ' => 'J̌',
+  'ẖ' => 'H̱',
+  'ẗ' => 'T̈',
+  'ẘ' => 'W̊',
+  'ẙ' => 'Y̊',
+  'ẚ' => 'Aʾ',
+  'ὐ' => 'Υ̓',
+  'ὒ' => 'Υ̓̀',
+  'ὔ' => 'Υ̓́',
+  'ὖ' => 'Υ̓͂',
+  'ᾶ' => 'Α͂',
+  'ῆ' => 'Η͂',
+  'ῒ' => 'Ϊ̀',
+  'ΐ' => 'Ϊ́',
+  'ῖ' => 'Ι͂',
+  'ῗ' => 'Ϊ͂',
+  'ῢ' => 'Ϋ̀',
+  'ΰ' => 'Ϋ́',
+  'ῤ' => 'Ρ̓',
+  'ῦ' => 'Υ͂',
+  'ῧ' => 'Ϋ͂',
+  'ῶ' => 'Ω͂',
+  'ᾈ' => 'ἈΙ',
+  'ᾉ' => 'ἉΙ',
+  'ᾊ' => 'ἊΙ',
+  'ᾋ' => 'ἋΙ',
+  'ᾌ' => 'ἌΙ',
+  'ᾍ' => 'ἍΙ',
+  'ᾎ' => 'ἎΙ',
+  'ᾏ' => 'ἏΙ',
+  'ᾘ' => 'ἨΙ',
+  'ᾙ' => 'ἩΙ',
+  'ᾚ' => 'ἪΙ',
+  'ᾛ' => 'ἫΙ',
+  'ᾜ' => 'ἬΙ',
+  'ᾝ' => 'ἭΙ',
+  'ᾞ' => 'ἮΙ',
+  'ᾟ' => 'ἯΙ',
+  'ᾨ' => 'ὨΙ',
+  'ᾩ' => 'ὩΙ',
+  'ᾪ' => 'ὪΙ',
+  'ᾫ' => 'ὫΙ',
+  'ᾬ' => 'ὬΙ',
+  'ᾭ' => 'ὭΙ',
+  'ᾮ' => 'ὮΙ',
+  'ᾯ' => 'ὯΙ',
+  'ᾼ' => 'ΑΙ',
+  'ῌ' => 'ΗΙ',
+  'ῼ' => 'ΩΙ',
+  'ᾲ' => 'ᾺΙ',
+  'ᾴ' => 'ΆΙ',
+  'ῂ' => 'ῊΙ',
+  'ῄ' => 'ΉΙ',
+  'ῲ' => 'ῺΙ',
+  'ῴ' => 'ΏΙ',
+  'ᾷ' => 'Α͂Ι',
+  'ῇ' => 'Η͂Ι',
+  'ῷ' => 'Ω͂Ι',
+);

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

@@ -0,0 +1,151 @@
+<?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\Mbstring as p;
+
+if (\PHP_VERSION_ID >= 80000) {
+    return require __DIR__.'/bootstrap80.php';
+}
+
+if (!function_exists('mb_convert_encoding')) {
+    function mb_convert_encoding($string, $to_encoding, $from_encoding = null) { return p\Mbstring::mb_convert_encoding($string, $to_encoding, $from_encoding); }
+}
+if (!function_exists('mb_decode_mimeheader')) {
+    function mb_decode_mimeheader($string) { return p\Mbstring::mb_decode_mimeheader($string); }
+}
+if (!function_exists('mb_encode_mimeheader')) {
+    function mb_encode_mimeheader($string, $charset = null, $transfer_encoding = null, $newline = "\r\n", $indent = 0) { return p\Mbstring::mb_encode_mimeheader($string, $charset, $transfer_encoding, $newline, $indent); }
+}
+if (!function_exists('mb_decode_numericentity')) {
+    function mb_decode_numericentity($string, $map, $encoding = null) { return p\Mbstring::mb_decode_numericentity($string, $map, $encoding); }
+}
+if (!function_exists('mb_encode_numericentity')) {
+    function mb_encode_numericentity($string, $map, $encoding = null, $hex = false) { return p\Mbstring::mb_encode_numericentity($string, $map, $encoding, $hex); }
+}
+if (!function_exists('mb_convert_case')) {
+    function mb_convert_case($string, $mode, $encoding = null) { return p\Mbstring::mb_convert_case($string, $mode, $encoding); }
+}
+if (!function_exists('mb_internal_encoding')) {
+    function mb_internal_encoding($encoding = null) { return p\Mbstring::mb_internal_encoding($encoding); }
+}
+if (!function_exists('mb_language')) {
+    function mb_language($language = null) { return p\Mbstring::mb_language($language); }
+}
+if (!function_exists('mb_list_encodings')) {
+    function mb_list_encodings() { return p\Mbstring::mb_list_encodings(); }
+}
+if (!function_exists('mb_encoding_aliases')) {
+    function mb_encoding_aliases($encoding) { return p\Mbstring::mb_encoding_aliases($encoding); }
+}
+if (!function_exists('mb_check_encoding')) {
+    function mb_check_encoding($value = null, $encoding = null) { return p\Mbstring::mb_check_encoding($value, $encoding); }
+}
+if (!function_exists('mb_detect_encoding')) {
+    function mb_detect_encoding($string, $encodings = null, $strict = false) { return p\Mbstring::mb_detect_encoding($string, $encodings, $strict); }
+}
+if (!function_exists('mb_detect_order')) {
+    function mb_detect_order($encoding = null) { return p\Mbstring::mb_detect_order($encoding); }
+}
+if (!function_exists('mb_parse_str')) {
+    function mb_parse_str($string, &$result = ) { parse_str($string, $result); return (bool) $result; }
+}
+if (!function_exists('mb_strlen')) {
+    function mb_strlen($string, $encoding = null) { return p\Mbstring::mb_strlen($string, $encoding); }
+}
+if (!function_exists('mb_strpos')) {
+    function mb_strpos($haystack, $needle, $offset = 0, $encoding = null) { return p\Mbstring::mb_strpos($haystack, $needle, $offset, $encoding); }
+}
+if (!function_exists('mb_strtolower')) {
+    function mb_strtolower($string, $encoding = null) { return p\Mbstring::mb_strtolower($string, $encoding); }
+}
+if (!function_exists('mb_strtoupper')) {
+    function mb_strtoupper($string, $encoding = null) { return p\Mbstring::mb_strtoupper($string, $encoding); }
+}
+if (!function_exists('mb_substitute_character')) {
+    function mb_substitute_character($substitute_character = null) { return p\Mbstring::mb_substitute_character($substitute_character); }
+}
+if (!function_exists('mb_substr')) {
+    function mb_substr($string, $start, $length = 2147483647, $encoding = null) { return p\Mbstring::mb_substr($string, $start, $length, $encoding); }
+}
+if (!function_exists('mb_stripos')) {
+    function mb_stripos($haystack, $needle, $offset = 0, $encoding = null) { return p\Mbstring::mb_stripos($haystack, $needle, $offset, $encoding); }
+}
+if (!function_exists('mb_stristr')) {
+    function mb_stristr($haystack, $needle, $before_needle = false, $encoding = null) { return p\Mbstring::mb_stristr($haystack, $needle, $before_needle, $encoding); }
+}
+if (!function_exists('mb_strrchr')) {
+    function mb_strrchr($haystack, $needle, $before_needle = false, $encoding = null) { return p\Mbstring::mb_strrchr($haystack, $needle, $before_needle, $encoding); }
+}
+if (!function_exists('mb_strrichr')) {
+    function mb_strrichr($haystack, $needle, $before_needle = false, $encoding = null) { return p\Mbstring::mb_strrichr($haystack, $needle, $before_needle, $encoding); }
+}
+if (!function_exists('mb_strripos')) {
+    function mb_strripos($haystack, $needle, $offset = 0, $encoding = null) { return p\Mbstring::mb_strripos($haystack, $needle, $offset, $encoding); }
+}
+if (!function_exists('mb_strrpos')) {
+    function mb_strrpos($haystack, $needle, $offset = 0, $encoding = null) { return p\Mbstring::mb_strrpos($haystack, $needle, $offset, $encoding); }
+}
+if (!function_exists('mb_strstr')) {
+    function mb_strstr($haystack, $needle, $before_needle = false, $encoding = null) { return p\Mbstring::mb_strstr($haystack, $needle, $before_needle, $encoding); }
+}
+if (!function_exists('mb_get_info')) {
+    function mb_get_info($type = 'all') { return p\Mbstring::mb_get_info($type); }
+}
+if (!function_exists('mb_http_output')) {
+    function mb_http_output($encoding = null) { return p\Mbstring::mb_http_output($encoding); }
+}
+if (!function_exists('mb_strwidth')) {
+    function mb_strwidth($string, $encoding = null) { return p\Mbstring::mb_strwidth($string, $encoding); }
+}
+if (!function_exists('mb_substr_count')) {
+    function mb_substr_count($haystack, $needle, $encoding = null) { return p\Mbstring::mb_substr_count($haystack, $needle, $encoding); }
+}
+if (!function_exists('mb_output_handler')) {
+    function mb_output_handler($string, $status) { return p\Mbstring::mb_output_handler($string, $status); }
+}
+if (!function_exists('mb_http_input')) {
+    function mb_http_input($type = null) { return p\Mbstring::mb_http_input($type); }
+}
+
+if (!function_exists('mb_convert_variables')) {
+    function mb_convert_variables($to_encoding, $from_encoding, &...$vars) { return p\Mbstring::mb_convert_variables($to_encoding, $from_encoding, ...$vars); }
+}
+
+if (!function_exists('mb_ord')) {
+    function mb_ord($string, $encoding = null) { return p\Mbstring::mb_ord($string, $encoding); }
+}
+if (!function_exists('mb_chr')) {
+    function mb_chr($codepoint, $encoding = null) { return p\Mbstring::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); }
+}
+if (!function_exists('mb_str_split')) {
+    function mb_str_split($string, $length = 1, $encoding = null) { return p\Mbstring::mb_str_split($string, $length, $encoding); }
+}
+
+if (!function_exists('mb_str_pad')) {
+    function mb_str_pad(string $string, int $length, string $pad_string = ' ', int $pad_type = STR_PAD_RIGHT, ?string $encoding = null): string { return p\Mbstring::mb_str_pad($string, $length, $pad_string, $pad_type, $encoding); }
+}
+
+if (extension_loaded('mbstring')) {
+    return;
+}
+
+if (!defined('MB_CASE_UPPER')) {
+    define('MB_CASE_UPPER', 0);
+}
+if (!defined('MB_CASE_LOWER')) {
+    define('MB_CASE_LOWER', 1);
+}
+if (!defined('MB_CASE_TITLE')) {
+    define('MB_CASE_TITLE', 2);
+}

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

@@ -0,0 +1,147 @@
+<?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\Mbstring as p;
+
+if (!function_exists('mb_convert_encoding')) {
+    function mb_convert_encoding(array|string|null $string, ?string $to_encoding, array|string|null $from_encoding = null): array|string|false { return p\Mbstring::mb_convert_encoding($string ?? '', (string) $to_encoding, $from_encoding); }
+}
+if (!function_exists('mb_decode_mimeheader')) {
+    function mb_decode_mimeheader(?string $string): string { return p\Mbstring::mb_decode_mimeheader((string) $string); }
+}
+if (!function_exists('mb_encode_mimeheader')) {
+    function mb_encode_mimeheader(?string $string, ?string $charset = null, ?string $transfer_encoding = null, ?string $newline = "\r\n", ?int $indent = 0): string { return p\Mbstring::mb_encode_mimeheader((string) $string, $charset, $transfer_encoding, (string) $newline, (int) $indent); }
+}
+if (!function_exists('mb_decode_numericentity')) {
+    function mb_decode_numericentity(?string $string, array $map, ?string $encoding = null): string { return p\Mbstring::mb_decode_numericentity((string) $string, $map, $encoding); }
+}
+if (!function_exists('mb_encode_numericentity')) {
+    function mb_encode_numericentity(?string $string, array $map, ?string $encoding = null, ?bool $hex = false): string { return p\Mbstring::mb_encode_numericentity((string) $string, $map, $encoding, (bool) $hex); }
+}
+if (!function_exists('mb_convert_case')) {
+    function mb_convert_case(?string $string, ?int $mode, ?string $encoding = null): string { return p\Mbstring::mb_convert_case((string) $string, (int) $mode, $encoding); }
+}
+if (!function_exists('mb_internal_encoding')) {
+    function mb_internal_encoding(?string $encoding = null): string|bool { return p\Mbstring::mb_internal_encoding($encoding); }
+}
+if (!function_exists('mb_language')) {
+    function mb_language(?string $language = null): string|bool { return p\Mbstring::mb_language($language); }
+}
+if (!function_exists('mb_list_encodings')) {
+    function mb_list_encodings(): array { return p\Mbstring::mb_list_encodings(); }
+}
+if (!function_exists('mb_encoding_aliases')) {
+    function mb_encoding_aliases(?string $encoding): array { return p\Mbstring::mb_encoding_aliases((string) $encoding); }
+}
+if (!function_exists('mb_check_encoding')) {
+    function mb_check_encoding(array|string|null $value = null, ?string $encoding = null): bool { return p\Mbstring::mb_check_encoding($value, $encoding); }
+}
+if (!function_exists('mb_detect_encoding')) {
+    function mb_detect_encoding(?string $string, array|string|null $encodings = null, ?bool $strict = false): string|false { return p\Mbstring::mb_detect_encoding((string) $string, $encodings, (bool) $strict); }
+}
+if (!function_exists('mb_detect_order')) {
+    function mb_detect_order(array|string|null $encoding = null): array|bool { return p\Mbstring::mb_detect_order($encoding); }
+}
+if (!function_exists('mb_parse_str')) {
+    function mb_parse_str(?string $string, &$result = ): bool { parse_str((string) $string, $result); return (bool) $result; }
+}
+if (!function_exists('mb_strlen')) {
+    function mb_strlen(?string $string, ?string $encoding = null): int { return p\Mbstring::mb_strlen((string) $string, $encoding); }
+}
+if (!function_exists('mb_strpos')) {
+    function mb_strpos(?string $haystack, ?string $needle, ?int $offset = 0, ?string $encoding = null): int|false { return p\Mbstring::mb_strpos((string) $haystack, (string) $needle, (int) $offset, $encoding); }
+}
+if (!function_exists('mb_strtolower')) {
+    function mb_strtolower(?string $string, ?string $encoding = null): string { return p\Mbstring::mb_strtolower((string) $string, $encoding); }
+}
+if (!function_exists('mb_strtoupper')) {
+    function mb_strtoupper(?string $string, ?string $encoding = null): string { return p\Mbstring::mb_strtoupper((string) $string, $encoding); }
+}
+if (!function_exists('mb_substitute_character')) {
+    function mb_substitute_character(string|int|null $substitute_character = null): string|int|bool { return p\Mbstring::mb_substitute_character($substitute_character); }
+}
+if (!function_exists('mb_substr')) {
+    function mb_substr(?string $string, ?int $start, ?int $length = null, ?string $encoding = null): string { return p\Mbstring::mb_substr((string) $string, (int) $start, $length, $encoding); }
+}
+if (!function_exists('mb_stripos')) {
+    function mb_stripos(?string $haystack, ?string $needle, ?int $offset = 0, ?string $encoding = null): int|false { return p\Mbstring::mb_stripos((string) $haystack, (string) $needle, (int) $offset, $encoding); }
+}
+if (!function_exists('mb_stristr')) {
+    function mb_stristr(?string $haystack, ?string $needle, ?bool $before_needle = false, ?string $encoding = null): string|false { return p\Mbstring::mb_stristr((string) $haystack, (string) $needle, (bool) $before_needle, $encoding); }
+}
+if (!function_exists('mb_strrchr')) {
+    function mb_strrchr(?string $haystack, ?string $needle, ?bool $before_needle = false, ?string $encoding = null): string|false { return p\Mbstring::mb_strrchr((string) $haystack, (string) $needle, (bool) $before_needle, $encoding); }
+}
+if (!function_exists('mb_strrichr')) {
+    function mb_strrichr(?string $haystack, ?string $needle, ?bool $before_needle = false, ?string $encoding = null): string|false { return p\Mbstring::mb_strrichr((string) $haystack, (string) $needle, (bool) $before_needle, $encoding); }
+}
+if (!function_exists('mb_strripos')) {
+    function mb_strripos(?string $haystack, ?string $needle, ?int $offset = 0, ?string $encoding = null): int|false { return p\Mbstring::mb_strripos((string) $haystack, (string) $needle, (int) $offset, $encoding); }
+}
+if (!function_exists('mb_strrpos')) {
+    function mb_strrpos(?string $haystack, ?string $needle, ?int $offset = 0, ?string $encoding = null): int|false { return p\Mbstring::mb_strrpos((string) $haystack, (string) $needle, (int) $offset, $encoding); }
+}
+if (!function_exists('mb_strstr')) {
+    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); }
+}
+if (!function_exists('mb_http_output')) {
+    function mb_http_output(?string $encoding = null): string|bool { return p\Mbstring::mb_http_output($encoding); }
+}
+if (!function_exists('mb_strwidth')) {
+    function mb_strwidth(?string $string, ?string $encoding = null): int { return p\Mbstring::mb_strwidth((string) $string, $encoding); }
+}
+if (!function_exists('mb_substr_count')) {
+    function mb_substr_count(?string $haystack, ?string $needle, ?string $encoding = null): int { return p\Mbstring::mb_substr_count((string) $haystack, (string) $needle, $encoding); }
+}
+if (!function_exists('mb_output_handler')) {
+    function mb_output_handler(?string $string, ?int $status): string { return p\Mbstring::mb_output_handler((string) $string, (int) $status); }
+}
+if (!function_exists('mb_http_input')) {
+    function mb_http_input(?string $type = null): array|string|false { return p\Mbstring::mb_http_input($type); }
+}
+
+if (!function_exists('mb_convert_variables')) {
+    function mb_convert_variables(?string $to_encoding, array|string|null $from_encoding, mixed &$var, mixed &...$vars): string|false { return p\Mbstring::mb_convert_variables((string) $to_encoding, $from_encoding ?? '', $var, ...$vars); }
+}
+
+if (!function_exists('mb_ord')) {
+    function mb_ord(?string $string, ?string $encoding = null): int|false { return p\Mbstring::mb_ord((string) $string, $encoding); }
+}
+if (!function_exists('mb_chr')) {
+    function mb_chr(?int $codepoint, ?string $encoding = null): string|false { return p\Mbstring::mb_chr((int) $codepoint, $encoding); }
+}
+if (!function_exists('mb_scrub')) {
+    function mb_scrub(?string $string, ?string $encoding = null): string { $encoding ??= mb_internal_encoding(); return mb_convert_encoding((string) $string, $encoding, $encoding); }
+}
+if (!function_exists('mb_str_split')) {
+    function mb_str_split(?string $string, ?int $length = 1, ?string $encoding = null): array { return p\Mbstring::mb_str_split((string) $string, (int) $length, $encoding); }
+}
+
+if (!function_exists('mb_str_pad')) {
+    function mb_str_pad(string $string, int $length, string $pad_string = ' ', int $pad_type = STR_PAD_RIGHT, ?string $encoding = null): string { return p\Mbstring::mb_str_pad($string, $length, $pad_string, $pad_type, $encoding); }
+}
+
+if (extension_loaded('mbstring')) {
+    return;
+}
+
+if (!defined('MB_CASE_UPPER')) {
+    define('MB_CASE_UPPER', 0);
+}
+if (!defined('MB_CASE_LOWER')) {
+    define('MB_CASE_LOWER', 1);
+}
+if (!defined('MB_CASE_TITLE')) {
+    define('MB_CASE_TITLE', 2);
+}

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

@@ -0,0 +1,38 @@
+{
+    "name": "symfony/polyfill-mbstring",
+    "type": "library",
+    "description": "Symfony polyfill for the Mbstring extension",
+    "keywords": "polyfill", "shim", "compatibility", "portable", "mbstring",
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": 
+        {
+            "name": "Nicolas Grekas",
+            "email": "p@tchwork.com"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ,
+    "require": {
+        "php": ">=7.1"
+    },
+    "provide": {
+        "ext-mbstring": "*"
+    },
+    "autoload": {
+        "psr-4": { "Symfony\\Polyfill\\Mbstring\\": "" },
+        "files":  "bootstrap.php" 
+    },
+    "suggest": {
+        "ext-mbstring": "For best performance"
+    },
+    "minimum-stability": "dev",
+    "extra": {
+        "thanks": {
+            "name": "symfony/polyfill",
+            "url": "https://github.com/symfony/polyfill"
+        }
+    }
+}

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

roundcubemail.dsc Changed

Overview

Request 3280 (accepted)

Request History