diff --git a/site/composer.lock b/site/composer.lock index cab6989a7..4624858b5 100644 --- a/site/composer.lock +++ b/site/composer.lock @@ -2228,16 +2228,16 @@ }, { "name": "symfony/cache", - "version": "v7.0.3", + "version": "v7.0.4", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "2207eceb2433d74df81232d97439bf508cb9e050" + "reference": "fc822951dd360a593224bb2cef90a087d0dff60f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/2207eceb2433d74df81232d97439bf508cb9e050", - "reference": "2207eceb2433d74df81232d97439bf508cb9e050", + "url": "https://api.github.com/repos/symfony/cache/zipball/fc822951dd360a593224bb2cef90a087d0dff60f", + "reference": "fc822951dd360a593224bb2cef90a087d0dff60f", "shasum": "" }, "require": { @@ -2304,7 +2304,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v7.0.3" + "source": "https://github.com/symfony/cache/tree/v7.0.4" }, "funding": [ { @@ -2320,7 +2320,7 @@ "type": "tidelift" } ], - "time": "2024-01-23T15:02:46+00:00" + "time": "2024-02-22T20:27:20+00:00" }, { "name": "symfony/cache-contracts", @@ -2400,16 +2400,16 @@ }, { "name": "symfony/config", - "version": "v7.0.3", + "version": "v7.0.4", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "86a5027869ca3d6bdecae6d5d6c2f77c8f2c1d16" + "reference": "44deeba7233f08f383185ffa37dace3b3bc87364" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/86a5027869ca3d6bdecae6d5d6c2f77c8f2c1d16", - "reference": "86a5027869ca3d6bdecae6d5d6c2f77c8f2c1d16", + "url": "https://api.github.com/repos/symfony/config/zipball/44deeba7233f08f383185ffa37dace3b3bc87364", + "reference": "44deeba7233f08f383185ffa37dace3b3bc87364", "shasum": "" }, "require": { @@ -2455,7 +2455,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v7.0.3" + "source": "https://github.com/symfony/config/tree/v7.0.4" }, "funding": [ { @@ -2471,7 +2471,7 @@ "type": "tidelift" } ], - "time": "2024-01-30T08:34:29+00:00" + "time": "2024-02-26T07:52:39+00:00" }, { "name": "symfony/deprecation-contracts", @@ -2687,16 +2687,16 @@ }, { "name": "symfony/translation", - "version": "v7.0.3", + "version": "v7.0.4", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "7285f25c7dcc74d9ec1232473114274604e50f00" + "reference": "5b75e872f7d135d7abb4613809fadc8d9f3d30a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/7285f25c7dcc74d9ec1232473114274604e50f00", - "reference": "7285f25c7dcc74d9ec1232473114274604e50f00", + "url": "https://api.github.com/repos/symfony/translation/zipball/5b75e872f7d135d7abb4613809fadc8d9f3d30a0", + "reference": "5b75e872f7d135d7abb4613809fadc8d9f3d30a0", "shasum": "" }, "require": { @@ -2761,7 +2761,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v7.0.3" + "source": "https://github.com/symfony/translation/tree/v7.0.4" }, "funding": [ { @@ -2777,7 +2777,7 @@ "type": "tidelift" } ], - "time": "2024-01-29T15:41:16+00:00" + "time": "2024-02-22T20:27:20+00:00" }, { "name": "symfony/translation-contracts", @@ -2859,16 +2859,16 @@ }, { "name": "symfony/var-exporter", - "version": "v7.0.3", + "version": "v7.0.4", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "1fb79308cb5fc2b44bff6e8af10a5af6812e05b8" + "reference": "dfb0acb6803eb714f05d97dd4c5abe6d5fa9fe41" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/1fb79308cb5fc2b44bff6e8af10a5af6812e05b8", - "reference": "1fb79308cb5fc2b44bff6e8af10a5af6812e05b8", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/dfb0acb6803eb714f05d97dd4c5abe6d5fa9fe41", + "reference": "dfb0acb6803eb714f05d97dd4c5abe6d5fa9fe41", "shasum": "" }, "require": { @@ -2913,7 +2913,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v7.0.3" + "source": "https://github.com/symfony/var-exporter/tree/v7.0.4" }, "funding": [ { @@ -2929,7 +2929,7 @@ "type": "tidelift" } ], - "time": "2024-01-23T15:02:46+00:00" + "time": "2024-02-26T10:35:24+00:00" }, { "name": "texy/texy", @@ -3318,16 +3318,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.25.0", + "version": "1.26.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "bd84b629c8de41aa2ae82c067c955e06f1b00240" + "reference": "231e3186624c03d7e7c890ec662b81e6b0405227" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bd84b629c8de41aa2ae82c067c955e06f1b00240", - "reference": "bd84b629c8de41aa2ae82c067c955e06f1b00240", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/231e3186624c03d7e7c890ec662b81e6b0405227", + "reference": "231e3186624c03d7e7c890ec662b81e6b0405227", "shasum": "" }, "require": { @@ -3359,22 +3359,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.25.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.26.0" }, - "time": "2024-01-04T17:06:16+00:00" + "time": "2024-02-23T16:05:55+00:00" }, { "name": "phpstan/phpstan", - "version": "1.10.58", + "version": "1.10.59", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "a23518379ec4defd9e47cbf81019526861623ec2" + "reference": "e607609388d3a6d418a50a49f7940e8086798281" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a23518379ec4defd9e47cbf81019526861623ec2", - "reference": "a23518379ec4defd9e47cbf81019526861623ec2", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e607609388d3a6d418a50a49f7940e8086798281", + "reference": "e607609388d3a6d418a50a49f7940e8086798281", "shasum": "" }, "require": { @@ -3423,7 +3423,7 @@ "type": "tidelift" } ], - "time": "2024-02-12T20:02:57+00:00" + "time": "2024-02-20T13:59:13+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -3537,16 +3537,16 @@ }, { "name": "psalm/phar", - "version": "5.22.1", + "version": "5.22.2", "source": { "type": "git", "url": "https://github.com/psalm/phar.git", - "reference": "e69b15968ed39a66bd1a8ed1b7cbb07857d1cd1f" + "reference": "380b34d2b19c5a48a201e6f84fab5388c5eced49" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/psalm/phar/zipball/e69b15968ed39a66bd1a8ed1b7cbb07857d1cd1f", - "reference": "e69b15968ed39a66bd1a8ed1b7cbb07857d1cd1f", + "url": "https://api.github.com/repos/psalm/phar/zipball/380b34d2b19c5a48a201e6f84fab5388c5eced49", + "reference": "380b34d2b19c5a48a201e6f84fab5388c5eced49", "shasum": "" }, "require": { @@ -3566,9 +3566,9 @@ "description": "Composer-based Psalm Phar", "support": { "issues": "https://github.com/psalm/phar/issues", - "source": "https://github.com/psalm/phar/tree/5.22.1" + "source": "https://github.com/psalm/phar/tree/5.22.2" }, - "time": "2024-02-15T22:59:35+00:00" + "time": "2024-02-22T23:45:18+00:00" }, { "name": "roave/security-advisories", @@ -3576,12 +3576,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "3e513f303c13a625befa037a23b5d1ac9bde2a52" + "reference": "8f1e484da92817191c75c9b00108f13fb62fd741" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/3e513f303c13a625befa037a23b5d1ac9bde2a52", - "reference": "3e513f303c13a625befa037a23b5d1ac9bde2a52", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/8f1e484da92817191c75c9b00108f13fb62fd741", + "reference": "8f1e484da92817191c75c9b00108f13fb62fd741", "shasum": "" }, "conflict": { @@ -3621,12 +3621,12 @@ "backpack/crud": "<3.4.9", "bacula-web/bacula-web": "<8.0.0.0-RC2-dev", "badaso/core": "<2.7", - "bagisto/bagisto": "<1.3.2", + "bagisto/bagisto": "<2.1", "barrelstrength/sprout-base-email": "<1.2.7", "barrelstrength/sprout-forms": "<3.9", "barryvdh/laravel-translation-manager": "<0.6.2", "barzahlen/barzahlen-php": "<2.0.1", - "baserproject/basercms": "<4.8", + "baserproject/basercms": "<5.0.9", "bassjobsen/bootstrap-3-typeahead": ">4.0.2", "bigfork/silverstripe-form-capture": ">=3,<3.1.1", "billz/raspap-webgui": "<2.9.5", @@ -3656,8 +3656,8 @@ "cesnet/simplesamlphp-module-proxystatistics": "<3.1", "chriskacerguis/codeigniter-restserver": "<=2.7.1", "civicrm/civicrm-core": ">=4.2,<4.2.9|>=4.3,<4.3.3", - "ckeditor/ckeditor": "<4.17", - "cockpit-hq/cockpit": "<=2.6.3", + "ckeditor/ckeditor": "<4.24", + "cockpit-hq/cockpit": "<=2.6.3|==2.7", "codeception/codeception": "<3.1.3|>=4,<4.1.22", "codeigniter/framework": "<3.1.9", "codeigniter4/framework": "<=4.4.2", @@ -3712,6 +3712,7 @@ "elijaa/phpmemcacheadmin": "<=1.3", "encore/laravel-admin": "<=1.8.19", "endroid/qr-code-bundle": "<3.4.2", + "enhavo/enhavo-app": "<=0.13.1", "enshrined/svg-sanitize": "<0.15", "erusev/parsedown": "<1.7.2", "ether/logs": "<3.0.4", @@ -3772,7 +3773,7 @@ "gaoming13/wechat-php-sdk": "<=1.10.2", "genix/cms": "<=1.1.11", "getgrav/grav": "<1.7.44", - "getkirby/cms": "<3.5.8.3-dev|>=3.6,<3.6.6.3-dev|>=3.7,<3.7.5.2-dev|>=3.8,<3.8.4.1-dev|>=3.9,<3.9.6", + "getkirby/cms": "<4.1.1", "getkirby/kirby": "<=2.5.12", "getkirby/panel": "<2.5.14", "getkirby/starterkit": "<=3.7.0.2", @@ -3829,7 +3830,7 @@ "joomla/archive": "<1.1.12|>=2,<2.0.1", "joomla/filesystem": "<1.6.2|>=2,<2.0.1", "joomla/filter": "<1.4.4|>=2,<2.0.1", - "joomla/framework": "<1.5.4|>=2.5.4,<=3.8.12", + "joomla/framework": "<1.5.7|>=2.5.4,<=3.8.12", "joomla/input": ">=2,<2.0.2", "joomla/joomla-cms": ">=2.5,<3.9.12", "joomla/session": "<1.3.1", @@ -3878,7 +3879,7 @@ "magneto/core": "<1.9.4.4-dev", "maikuolan/phpmussel": ">=1,<1.6", "mainwp/mainwp": "<=4.4.3.3", - "mantisbt/mantisbt": "<=2.25.7", + "mantisbt/mantisbt": "<2.26.1", "marcwillmann/turn": "<0.3.3", "matyhtf/framework": "<3.0.6", "mautic/core": "<4.3", @@ -3901,7 +3902,7 @@ "mojo42/jirafeau": "<4.4", "mongodb/mongodb": ">=1,<1.9.2", "monolog/monolog": ">=1.8,<1.12", - "moodle/moodle": "<4.3.0.0-RC2-dev", + "moodle/moodle": "<4.3.3", "mos/cimage": "<0.7.19", "movim/moxl": ">=0.8,<=0.10", "mpdf/mpdf": "<=7.1.7", @@ -3939,7 +3940,7 @@ "open-web-analytics/open-web-analytics": "<1.7.4", "opencart/opencart": "<=3.0.3.7|>=4,<4.0.2.3-dev", "openid/php-openid": "<2.3", - "openmage/magento-lts": "<20.2", + "openmage/magento-lts": "<20.5", "opensource-workshop/connect-cms": "<1.7.2|>=2,<2.3.2", "orchid/platform": ">=9,<9.4.4|>=14.0.0.0-alpha4,<14.5", "oro/calendar-bundle": ">=4.2,<=4.2.6|>=5,<=5.0.6|>=5.1,<5.1.1", @@ -3963,7 +3964,7 @@ "pegasus/google-for-jobs": "<1.5.1|>=2,<2.1.1", "personnummer/personnummer": "<3.0.2", "phanan/koel": "<5.1.4", - "phenx/php-svg-lib": "<0.5.1", + "phenx/php-svg-lib": "<0.5.2", "php-mod/curl": "<2.3.2", "phpbb/phpbb": "<3.2.10|>=3.3,<3.3.1", "phpems/phpems": ">=6,<=6.1.3", @@ -3982,7 +3983,7 @@ "phpxmlrpc/extras": "<0.6.1", "phpxmlrpc/phpxmlrpc": "<4.9.2", "pi/pi": "<=2.5", - "pimcore/admin-ui-classic-bundle": "<1.3.3", + "pimcore/admin-ui-classic-bundle": "<1.3.4", "pimcore/customer-management-framework-bundle": "<4.0.6", "pimcore/data-hub": "<1.2.4", "pimcore/demo": "<10.3", @@ -4000,7 +4001,7 @@ "prestashop/blockwishlist": ">=2,<2.1.1", "prestashop/contactform": ">=1.0.1,<4.3", "prestashop/gamification": "<2.3.2", - "prestashop/prestashop": "<8.1.3", + "prestashop/prestashop": "<8.1.4", "prestashop/productcomments": "<5.0.2", "prestashop/ps_emailsubscription": "<2.6.1", "prestashop/ps_facetedsearch": "<3.4.1", @@ -4023,6 +4024,7 @@ "rap2hpoutre/laravel-log-viewer": "<0.13", "react/http": ">=0.7,<1.9", "really-simple-plugins/complianz-gdpr": "<6.4.2", + "redaxo/source": "<=5.15.1", "remdex/livehelperchat": "<3.99", "reportico-web/reportico": "<=7.1.21", "rhukster/dom-sanitizer": "<1.0.7", @@ -4160,6 +4162,7 @@ "topthink/framework": "<6.0.14", "topthink/think": "<=6.1.1", "topthink/thinkphp": "<=3.2.3", + "torrentpier/torrentpier": "<=2.4.1", "tpwd/ke_search": "<4.0.3|>=4.1,<4.6.6|>=5,<5.0.2", "tribalsystems/zenario": "<=9.4.59197", "truckersmp/phpwhois": "<=4.3.1", @@ -4305,7 +4308,7 @@ "type": "tidelift" } ], - "time": "2024-02-16T21:04:04+00:00" + "time": "2024-03-01T21:04:56+00:00" }, { "name": "slevomat/coding-standard", diff --git a/site/vendor/composer/installed.json b/site/vendor/composer/installed.json index fe35d2f4d..497ca7842 100644 --- a/site/vendor/composer/installed.json +++ b/site/vendor/composer/installed.json @@ -1961,17 +1961,17 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.25.0", - "version_normalized": "1.25.0.0", + "version": "1.26.0", + "version_normalized": "1.26.0.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "bd84b629c8de41aa2ae82c067c955e06f1b00240" + "reference": "231e3186624c03d7e7c890ec662b81e6b0405227" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bd84b629c8de41aa2ae82c067c955e06f1b00240", - "reference": "bd84b629c8de41aa2ae82c067c955e06f1b00240", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/231e3186624c03d7e7c890ec662b81e6b0405227", + "reference": "231e3186624c03d7e7c890ec662b81e6b0405227", "shasum": "" }, "require": { @@ -1988,7 +1988,7 @@ "phpunit/phpunit": "^9.5", "symfony/process": "^5.2" }, - "time": "2024-01-04T17:06:16+00:00", + "time": "2024-02-23T16:05:55+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -2005,23 +2005,23 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.25.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.26.0" }, "install-path": "../phpstan/phpdoc-parser" }, { "name": "phpstan/phpstan", - "version": "1.10.58", - "version_normalized": "1.10.58.0", + "version": "1.10.59", + "version_normalized": "1.10.59.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "a23518379ec4defd9e47cbf81019526861623ec2" + "reference": "e607609388d3a6d418a50a49f7940e8086798281" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a23518379ec4defd9e47cbf81019526861623ec2", - "reference": "a23518379ec4defd9e47cbf81019526861623ec2", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e607609388d3a6d418a50a49f7940e8086798281", + "reference": "e607609388d3a6d418a50a49f7940e8086798281", "shasum": "" }, "require": { @@ -2030,7 +2030,7 @@ "conflict": { "phpstan/phpstan-shim": "*" }, - "time": "2024-02-12T20:02:57+00:00", + "time": "2024-02-20T13:59:13+00:00", "bin": [ "phpstan", "phpstan.phar" @@ -2192,17 +2192,17 @@ }, { "name": "psalm/phar", - "version": "5.22.1", - "version_normalized": "5.22.1.0", + "version": "5.22.2", + "version_normalized": "5.22.2.0", "source": { "type": "git", "url": "https://github.com/psalm/phar.git", - "reference": "e69b15968ed39a66bd1a8ed1b7cbb07857d1cd1f" + "reference": "380b34d2b19c5a48a201e6f84fab5388c5eced49" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/psalm/phar/zipball/e69b15968ed39a66bd1a8ed1b7cbb07857d1cd1f", - "reference": "e69b15968ed39a66bd1a8ed1b7cbb07857d1cd1f", + "url": "https://api.github.com/repos/psalm/phar/zipball/380b34d2b19c5a48a201e6f84fab5388c5eced49", + "reference": "380b34d2b19c5a48a201e6f84fab5388c5eced49", "shasum": "" }, "require": { @@ -2211,7 +2211,7 @@ "conflict": { "vimeo/psalm": "*" }, - "time": "2024-02-15T22:59:35+00:00", + "time": "2024-02-22T23:45:18+00:00", "bin": [ "psalm.phar" ], @@ -2224,7 +2224,7 @@ "description": "Composer-based Psalm Phar", "support": { "issues": "https://github.com/psalm/phar/issues", - "source": "https://github.com/psalm/phar/tree/5.22.1" + "source": "https://github.com/psalm/phar/tree/5.22.2" }, "install-path": "../psalm/phar" }, @@ -2396,12 +2396,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "3e513f303c13a625befa037a23b5d1ac9bde2a52" + "reference": "8f1e484da92817191c75c9b00108f13fb62fd741" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/3e513f303c13a625befa037a23b5d1ac9bde2a52", - "reference": "3e513f303c13a625befa037a23b5d1ac9bde2a52", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/8f1e484da92817191c75c9b00108f13fb62fd741", + "reference": "8f1e484da92817191c75c9b00108f13fb62fd741", "shasum": "" }, "conflict": { @@ -2441,12 +2441,12 @@ "backpack/crud": "<3.4.9", "bacula-web/bacula-web": "<8.0.0.0-RC2-dev", "badaso/core": "<2.7", - "bagisto/bagisto": "<1.3.2", + "bagisto/bagisto": "<2.1", "barrelstrength/sprout-base-email": "<1.2.7", "barrelstrength/sprout-forms": "<3.9", "barryvdh/laravel-translation-manager": "<0.6.2", "barzahlen/barzahlen-php": "<2.0.1", - "baserproject/basercms": "<4.8", + "baserproject/basercms": "<5.0.9", "bassjobsen/bootstrap-3-typeahead": ">4.0.2", "bigfork/silverstripe-form-capture": ">=3,<3.1.1", "billz/raspap-webgui": "<2.9.5", @@ -2476,8 +2476,8 @@ "cesnet/simplesamlphp-module-proxystatistics": "<3.1", "chriskacerguis/codeigniter-restserver": "<=2.7.1", "civicrm/civicrm-core": ">=4.2,<4.2.9|>=4.3,<4.3.3", - "ckeditor/ckeditor": "<4.17", - "cockpit-hq/cockpit": "<=2.6.3", + "ckeditor/ckeditor": "<4.24", + "cockpit-hq/cockpit": "<=2.6.3|==2.7", "codeception/codeception": "<3.1.3|>=4,<4.1.22", "codeigniter/framework": "<3.1.9", "codeigniter4/framework": "<=4.4.2", @@ -2532,6 +2532,7 @@ "elijaa/phpmemcacheadmin": "<=1.3", "encore/laravel-admin": "<=1.8.19", "endroid/qr-code-bundle": "<3.4.2", + "enhavo/enhavo-app": "<=0.13.1", "enshrined/svg-sanitize": "<0.15", "erusev/parsedown": "<1.7.2", "ether/logs": "<3.0.4", @@ -2592,7 +2593,7 @@ "gaoming13/wechat-php-sdk": "<=1.10.2", "genix/cms": "<=1.1.11", "getgrav/grav": "<1.7.44", - "getkirby/cms": "<3.5.8.3-dev|>=3.6,<3.6.6.3-dev|>=3.7,<3.7.5.2-dev|>=3.8,<3.8.4.1-dev|>=3.9,<3.9.6", + "getkirby/cms": "<4.1.1", "getkirby/kirby": "<=2.5.12", "getkirby/panel": "<2.5.14", "getkirby/starterkit": "<=3.7.0.2", @@ -2649,7 +2650,7 @@ "joomla/archive": "<1.1.12|>=2,<2.0.1", "joomla/filesystem": "<1.6.2|>=2,<2.0.1", "joomla/filter": "<1.4.4|>=2,<2.0.1", - "joomla/framework": "<1.5.4|>=2.5.4,<=3.8.12", + "joomla/framework": "<1.5.7|>=2.5.4,<=3.8.12", "joomla/input": ">=2,<2.0.2", "joomla/joomla-cms": ">=2.5,<3.9.12", "joomla/session": "<1.3.1", @@ -2698,7 +2699,7 @@ "magneto/core": "<1.9.4.4-dev", "maikuolan/phpmussel": ">=1,<1.6", "mainwp/mainwp": "<=4.4.3.3", - "mantisbt/mantisbt": "<=2.25.7", + "mantisbt/mantisbt": "<2.26.1", "marcwillmann/turn": "<0.3.3", "matyhtf/framework": "<3.0.6", "mautic/core": "<4.3", @@ -2721,7 +2722,7 @@ "mojo42/jirafeau": "<4.4", "mongodb/mongodb": ">=1,<1.9.2", "monolog/monolog": ">=1.8,<1.12", - "moodle/moodle": "<4.3.0.0-RC2-dev", + "moodle/moodle": "<4.3.3", "mos/cimage": "<0.7.19", "movim/moxl": ">=0.8,<=0.10", "mpdf/mpdf": "<=7.1.7", @@ -2759,7 +2760,7 @@ "open-web-analytics/open-web-analytics": "<1.7.4", "opencart/opencart": "<=3.0.3.7|>=4,<4.0.2.3-dev", "openid/php-openid": "<2.3", - "openmage/magento-lts": "<20.2", + "openmage/magento-lts": "<20.5", "opensource-workshop/connect-cms": "<1.7.2|>=2,<2.3.2", "orchid/platform": ">=9,<9.4.4|>=14.0.0.0-alpha4,<14.5", "oro/calendar-bundle": ">=4.2,<=4.2.6|>=5,<=5.0.6|>=5.1,<5.1.1", @@ -2783,7 +2784,7 @@ "pegasus/google-for-jobs": "<1.5.1|>=2,<2.1.1", "personnummer/personnummer": "<3.0.2", "phanan/koel": "<5.1.4", - "phenx/php-svg-lib": "<0.5.1", + "phenx/php-svg-lib": "<0.5.2", "php-mod/curl": "<2.3.2", "phpbb/phpbb": "<3.2.10|>=3.3,<3.3.1", "phpems/phpems": ">=6,<=6.1.3", @@ -2802,7 +2803,7 @@ "phpxmlrpc/extras": "<0.6.1", "phpxmlrpc/phpxmlrpc": "<4.9.2", "pi/pi": "<=2.5", - "pimcore/admin-ui-classic-bundle": "<1.3.3", + "pimcore/admin-ui-classic-bundle": "<1.3.4", "pimcore/customer-management-framework-bundle": "<4.0.6", "pimcore/data-hub": "<1.2.4", "pimcore/demo": "<10.3", @@ -2820,7 +2821,7 @@ "prestashop/blockwishlist": ">=2,<2.1.1", "prestashop/contactform": ">=1.0.1,<4.3", "prestashop/gamification": "<2.3.2", - "prestashop/prestashop": "<8.1.3", + "prestashop/prestashop": "<8.1.4", "prestashop/productcomments": "<5.0.2", "prestashop/ps_emailsubscription": "<2.6.1", "prestashop/ps_facetedsearch": "<3.4.1", @@ -2843,6 +2844,7 @@ "rap2hpoutre/laravel-log-viewer": "<0.13", "react/http": ">=0.7,<1.9", "really-simple-plugins/complianz-gdpr": "<6.4.2", + "redaxo/source": "<=5.15.1", "remdex/livehelperchat": "<3.99", "reportico-web/reportico": "<=7.1.21", "rhukster/dom-sanitizer": "<1.0.7", @@ -2980,6 +2982,7 @@ "topthink/framework": "<6.0.14", "topthink/think": "<=6.1.1", "topthink/thinkphp": "<=3.2.3", + "torrentpier/torrentpier": "<=2.4.1", "tpwd/ke_search": "<4.0.3|>=4.1,<4.6.6|>=5,<5.0.2", "tribalsystems/zenario": "<=9.4.59197", "truckersmp/phpwhois": "<=4.3.1", @@ -3089,7 +3092,7 @@ "zfr/zfr-oauth2-server-module": "<0.1.2", "zoujingli/thinkadmin": "<=6.1.53" }, - "time": "2024-02-16T21:04:04+00:00", + "time": "2024-03-01T21:04:56+00:00", "default-branch": true, "type": "metapackage", "notification-url": "https://packagist.org/downloads/", @@ -3861,17 +3864,17 @@ }, { "name": "symfony/cache", - "version": "v7.0.3", - "version_normalized": "7.0.3.0", + "version": "v7.0.4", + "version_normalized": "7.0.4.0", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "2207eceb2433d74df81232d97439bf508cb9e050" + "reference": "fc822951dd360a593224bb2cef90a087d0dff60f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/2207eceb2433d74df81232d97439bf508cb9e050", - "reference": "2207eceb2433d74df81232d97439bf508cb9e050", + "url": "https://api.github.com/repos/symfony/cache/zipball/fc822951dd360a593224bb2cef90a087d0dff60f", + "reference": "fc822951dd360a593224bb2cef90a087d0dff60f", "shasum": "" }, "require": { @@ -3905,7 +3908,7 @@ "symfony/messenger": "^6.4|^7.0", "symfony/var-dumper": "^6.4|^7.0" }, - "time": "2024-01-23T15:02:46+00:00", + "time": "2024-02-22T20:27:20+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -3940,7 +3943,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v7.0.3" + "source": "https://github.com/symfony/cache/tree/v7.0.4" }, "funding": [ { @@ -4039,17 +4042,17 @@ }, { "name": "symfony/config", - "version": "v7.0.3", - "version_normalized": "7.0.3.0", + "version": "v7.0.4", + "version_normalized": "7.0.4.0", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "86a5027869ca3d6bdecae6d5d6c2f77c8f2c1d16" + "reference": "44deeba7233f08f383185ffa37dace3b3bc87364" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/86a5027869ca3d6bdecae6d5d6c2f77c8f2c1d16", - "reference": "86a5027869ca3d6bdecae6d5d6c2f77c8f2c1d16", + "url": "https://api.github.com/repos/symfony/config/zipball/44deeba7233f08f383185ffa37dace3b3bc87364", + "reference": "44deeba7233f08f383185ffa37dace3b3bc87364", "shasum": "" }, "require": { @@ -4069,7 +4072,7 @@ "symfony/service-contracts": "^2.5|^3", "symfony/yaml": "^6.4|^7.0" }, - "time": "2024-01-30T08:34:29+00:00", + "time": "2024-02-26T07:52:39+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -4097,7 +4100,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v7.0.3" + "source": "https://github.com/symfony/config/tree/v7.0.4" }, "funding": [ { @@ -4338,17 +4341,17 @@ }, { "name": "symfony/translation", - "version": "v7.0.3", - "version_normalized": "7.0.3.0", + "version": "v7.0.4", + "version_normalized": "7.0.4.0", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "7285f25c7dcc74d9ec1232473114274604e50f00" + "reference": "5b75e872f7d135d7abb4613809fadc8d9f3d30a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/7285f25c7dcc74d9ec1232473114274604e50f00", - "reference": "7285f25c7dcc74d9ec1232473114274604e50f00", + "url": "https://api.github.com/repos/symfony/translation/zipball/5b75e872f7d135d7abb4613809fadc8d9f3d30a0", + "reference": "5b75e872f7d135d7abb4613809fadc8d9f3d30a0", "shasum": "" }, "require": { @@ -4384,7 +4387,7 @@ "symfony/service-contracts": "^2.5|^3", "symfony/yaml": "^6.4|^7.0" }, - "time": "2024-01-29T15:41:16+00:00", + "time": "2024-02-22T20:27:20+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -4415,7 +4418,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v7.0.3" + "source": "https://github.com/symfony/translation/tree/v7.0.4" }, "funding": [ { @@ -4516,17 +4519,17 @@ }, { "name": "symfony/var-exporter", - "version": "v7.0.3", - "version_normalized": "7.0.3.0", + "version": "v7.0.4", + "version_normalized": "7.0.4.0", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "1fb79308cb5fc2b44bff6e8af10a5af6812e05b8" + "reference": "dfb0acb6803eb714f05d97dd4c5abe6d5fa9fe41" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/1fb79308cb5fc2b44bff6e8af10a5af6812e05b8", - "reference": "1fb79308cb5fc2b44bff6e8af10a5af6812e05b8", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/dfb0acb6803eb714f05d97dd4c5abe6d5fa9fe41", + "reference": "dfb0acb6803eb714f05d97dd4c5abe6d5fa9fe41", "shasum": "" }, "require": { @@ -4535,7 +4538,7 @@ "require-dev": { "symfony/var-dumper": "^6.4|^7.0" }, - "time": "2024-01-23T15:02:46+00:00", + "time": "2024-02-26T10:35:24+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -4573,7 +4576,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v7.0.3" + "source": "https://github.com/symfony/var-exporter/tree/v7.0.4" }, "funding": [ { diff --git a/site/vendor/composer/installed.php b/site/vendor/composer/installed.php index 1e46a79ec..cddcfcfc9 100644 --- a/site/vendor/composer/installed.php +++ b/site/vendor/composer/installed.php @@ -3,7 +3,7 @@ 'name' => 'spaze/michalspacek.cz', 'pretty_version' => 'dev-main', 'version' => 'dev-main', - 'reference' => '3651d24e4fc4e08cd3b532afef0856b4b9a52df5', + 'reference' => '3b74388fb0b085f18077ed24694bf651905bfc7c', 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -314,18 +314,18 @@ ), ), 'phpstan/phpdoc-parser' => array( - 'pretty_version' => '1.25.0', - 'version' => '1.25.0.0', - 'reference' => 'bd84b629c8de41aa2ae82c067c955e06f1b00240', + 'pretty_version' => '1.26.0', + 'version' => '1.26.0.0', + 'reference' => '231e3186624c03d7e7c890ec662b81e6b0405227', 'type' => 'library', 'install_path' => __DIR__ . '/../phpstan/phpdoc-parser', 'aliases' => array(), 'dev_requirement' => true, ), 'phpstan/phpstan' => array( - 'pretty_version' => '1.10.58', - 'version' => '1.10.58.0', - 'reference' => 'a23518379ec4defd9e47cbf81019526861623ec2', + 'pretty_version' => '1.10.59', + 'version' => '1.10.59.0', + 'reference' => 'e607609388d3a6d418a50a49f7940e8086798281', 'type' => 'library', 'install_path' => __DIR__ . '/../phpstan/phpstan', 'aliases' => array(), @@ -350,9 +350,9 @@ 'dev_requirement' => true, ), 'psalm/phar' => array( - 'pretty_version' => '5.22.1', - 'version' => '5.22.1.0', - 'reference' => 'e69b15968ed39a66bd1a8ed1b7cbb07857d1cd1f', + 'pretty_version' => '5.22.2', + 'version' => '5.22.2.0', + 'reference' => '380b34d2b19c5a48a201e6f84fab5388c5eced49', 'type' => 'library', 'install_path' => __DIR__ . '/../psalm/phar', 'aliases' => array(), @@ -400,7 +400,7 @@ 'roave/security-advisories' => array( 'pretty_version' => 'dev-latest', 'version' => 'dev-latest', - 'reference' => '3e513f303c13a625befa037a23b5d1ac9bde2a52', + 'reference' => '8f1e484da92817191c75c9b00108f13fb62fd741', 'type' => 'metapackage', 'install_path' => NULL, 'aliases' => array( @@ -456,7 +456,7 @@ 'spaze/michalspacek.cz' => array( 'pretty_version' => 'dev-main', 'version' => 'dev-main', - 'reference' => '3651d24e4fc4e08cd3b532afef0856b4b9a52df5', + 'reference' => '3b74388fb0b085f18077ed24694bf651905bfc7c', 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -541,9 +541,9 @@ ), ), 'symfony/cache' => array( - 'pretty_version' => 'v7.0.3', - 'version' => '7.0.3.0', - 'reference' => '2207eceb2433d74df81232d97439bf508cb9e050', + 'pretty_version' => 'v7.0.4', + 'version' => '7.0.4.0', + 'reference' => 'fc822951dd360a593224bb2cef90a087d0dff60f', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/cache', 'aliases' => array(), @@ -565,9 +565,9 @@ ), ), 'symfony/config' => array( - 'pretty_version' => 'v7.0.3', - 'version' => '7.0.3.0', - 'reference' => '86a5027869ca3d6bdecae6d5d6c2f77c8f2c1d16', + 'pretty_version' => 'v7.0.4', + 'version' => '7.0.4.0', + 'reference' => '44deeba7233f08f383185ffa37dace3b3bc87364', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/config', 'aliases' => array(), @@ -631,9 +631,9 @@ 'dev_requirement' => false, ), 'symfony/translation' => array( - 'pretty_version' => 'v7.0.3', - 'version' => '7.0.3.0', - 'reference' => '7285f25c7dcc74d9ec1232473114274604e50f00', + 'pretty_version' => 'v7.0.4', + 'version' => '7.0.4.0', + 'reference' => '5b75e872f7d135d7abb4613809fadc8d9f3d30a0', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/translation', 'aliases' => array(), @@ -655,9 +655,9 @@ ), ), 'symfony/var-exporter' => array( - 'pretty_version' => 'v7.0.3', - 'version' => '7.0.3.0', - 'reference' => '1fb79308cb5fc2b44bff6e8af10a5af6812e05b8', + 'pretty_version' => 'v7.0.4', + 'version' => '7.0.4.0', + 'reference' => 'dfb0acb6803eb714f05d97dd4c5abe6d5fa9fe41', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/var-exporter', 'aliases' => array(), diff --git a/site/vendor/phpstan/phpdoc-parser/src/Ast/Type/CallableTypeNode.php b/site/vendor/phpstan/phpdoc-parser/src/Ast/Type/CallableTypeNode.php index e57e5f823..4c9131985 100644 --- a/site/vendor/phpstan/phpdoc-parser/src/Ast/Type/CallableTypeNode.php +++ b/site/vendor/phpstan/phpdoc-parser/src/Ast/Type/CallableTypeNode.php @@ -3,6 +3,7 @@ namespace PHPStan\PhpDocParser\Ast\Type; use PHPStan\PhpDocParser\Ast\NodeAttributes; +use PHPStan\PhpDocParser\Ast\PhpDoc\TemplateTagValueNode; use function implode; class CallableTypeNode implements TypeNode @@ -13,6 +14,9 @@ class CallableTypeNode implements TypeNode /** @var IdentifierTypeNode */ public $identifier; + /** @var TemplateTagValueNode[] */ + public $templateTypes; + /** @var CallableTypeParameterNode[] */ public $parameters; @@ -21,12 +25,14 @@ class CallableTypeNode implements TypeNode /** * @param CallableTypeParameterNode[] $parameters + * @param TemplateTagValueNode[] $templateTypes */ - public function __construct(IdentifierTypeNode $identifier, array $parameters, TypeNode $returnType) + public function __construct(IdentifierTypeNode $identifier, array $parameters, TypeNode $returnType, array $templateTypes = []) { $this->identifier = $identifier; $this->parameters = $parameters; $this->returnType = $returnType; + $this->templateTypes = $templateTypes; } @@ -36,8 +42,11 @@ public function __toString(): string if ($returnType instanceof self) { $returnType = "({$returnType})"; } + $template = $this->templateTypes !== [] + ? '<' . implode(', ', $this->templateTypes) . '>' + : ''; $parameters = implode(', ', $this->parameters); - return "{$this->identifier}({$parameters}): {$returnType}"; + return "{$this->identifier}{$template}({$parameters}): {$returnType}"; } } diff --git a/site/vendor/phpstan/phpdoc-parser/src/Parser/PhpDocParser.php b/site/vendor/phpstan/phpdoc-parser/src/Parser/PhpDocParser.php index e87d92c4d..475dd5ba5 100644 --- a/site/vendor/phpstan/phpdoc-parser/src/Parser/PhpDocParser.php +++ b/site/vendor/phpstan/phpdoc-parser/src/Parser/PhpDocParser.php @@ -449,7 +449,12 @@ public function parseTagValue(TokenIterator $tokens, string $tag): Ast\PhpDoc\Ph case '@template-contravariant': case '@phpstan-template-contravariant': case '@psalm-template-contravariant': - $tagValue = $this->parseTemplateTagValue($tokens, true); + $tagValue = $this->typeParser->parseTemplateTagValue( + $tokens, + function ($tokens) { + return $this->parseOptionalDescription($tokens); + } + ); break; case '@extends': @@ -919,10 +924,16 @@ private function parsePropertyTagValue(TokenIterator $tokens): Ast\PhpDoc\Proper private function parseMethodTagValue(TokenIterator $tokens): Ast\PhpDoc\MethodTagValueNode { - $isStatic = $tokens->tryConsumeTokenValue('static'); - $startLine = $tokens->currentTokenLine(); - $startIndex = $tokens->currentTokenIndex(); - $returnTypeOrMethodName = $this->typeParser->parse($tokens); + $staticKeywordOrReturnTypeOrMethodName = $this->typeParser->parse($tokens); + + if ($staticKeywordOrReturnTypeOrMethodName instanceof Ast\Type\IdentifierTypeNode && $staticKeywordOrReturnTypeOrMethodName->name === 'static') { + $isStatic = true; + $returnTypeOrMethodName = $this->typeParser->parse($tokens); + + } else { + $isStatic = false; + $returnTypeOrMethodName = $staticKeywordOrReturnTypeOrMethodName; + } if ($tokens->isCurrentTokenType(Lexer::TOKEN_IDENTIFIER)) { $returnType = $returnTypeOrMethodName; @@ -930,9 +941,7 @@ private function parseMethodTagValue(TokenIterator $tokens): Ast\PhpDoc\MethodTa $tokens->next(); } elseif ($returnTypeOrMethodName instanceof Ast\Type\IdentifierTypeNode) { - $returnType = $isStatic - ? $this->typeParser->enrichWithAttributes($tokens, new Ast\Type\IdentifierTypeNode('static'), $startLine, $startIndex) - : null; + $returnType = $isStatic ? $staticKeywordOrReturnTypeOrMethodName : null; $methodName = $returnTypeOrMethodName->name; $isStatic = false; @@ -947,7 +956,12 @@ private function parseMethodTagValue(TokenIterator $tokens): Ast\PhpDoc\MethodTa do { $startLine = $tokens->currentTokenLine(); $startIndex = $tokens->currentTokenIndex(); - $templateTypes[] = $this->enrichWithAttributes($tokens, $this->parseTemplateTagValue($tokens, false), $startLine, $startIndex); + $templateTypes[] = $this->enrichWithAttributes( + $tokens, + $this->typeParser->parseTemplateTagValue($tokens), + $startLine, + $startIndex + ); } while ($tokens->tryConsumeTokenType(Lexer::TOKEN_COMMA)); $tokens->consumeTokenType(Lexer::TOKEN_CLOSE_ANGLE_BRACKET); } @@ -1003,33 +1017,6 @@ private function parseMethodTagValueParameter(TokenIterator $tokens): Ast\PhpDoc ); } - private function parseTemplateTagValue(TokenIterator $tokens, bool $parseDescription): Ast\PhpDoc\TemplateTagValueNode - { - $name = $tokens->currentTokenValue(); - $tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER); - - if ($tokens->tryConsumeTokenValue('of') || $tokens->tryConsumeTokenValue('as')) { - $bound = $this->typeParser->parse($tokens); - - } else { - $bound = null; - } - - if ($tokens->tryConsumeTokenValue('=')) { - $default = $this->typeParser->parse($tokens); - } else { - $default = null; - } - - if ($parseDescription) { - $description = $this->parseOptionalDescription($tokens); - } else { - $description = ''; - } - - return new Ast\PhpDoc\TemplateTagValueNode($name, $bound, $description, $default); - } - private function parseExtendsTagValue(string $tagName, TokenIterator $tokens): Ast\PhpDoc\PhpDocTagValueNode { $startLine = $tokens->currentTokenLine(); diff --git a/site/vendor/phpstan/phpdoc-parser/src/Parser/TypeParser.php b/site/vendor/phpstan/phpdoc-parser/src/Parser/TypeParser.php index 79e702759..ebc2fbab4 100644 --- a/site/vendor/phpstan/phpdoc-parser/src/Parser/TypeParser.php +++ b/site/vendor/phpstan/phpdoc-parser/src/Parser/TypeParser.php @@ -4,6 +4,7 @@ use LogicException; use PHPStan\PhpDocParser\Ast; +use PHPStan\PhpDocParser\Ast\PhpDoc\TemplateTagValueNode; use PHPStan\PhpDocParser\Lexer\Lexer; use function in_array; use function str_replace; @@ -164,13 +165,17 @@ private function parseAtomic(TokenIterator $tokens): Ast\Type\TypeNode return $type; } - $type = $this->parseGeneric($tokens, $type); + $origType = $type; + $type = $this->tryParseCallable($tokens, $type, true); + if ($type === $origType) { + $type = $this->parseGeneric($tokens, $type); - if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) { - $type = $this->tryParseArrayOrOffsetAccess($tokens, $type); + if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) { + $type = $this->tryParseArrayOrOffsetAccess($tokens, $type); + } } } elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_PARENTHESES)) { - $type = $this->tryParseCallable($tokens, $type); + $type = $this->tryParseCallable($tokens, $type, false); } elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) { $type = $this->tryParseArrayOrOffsetAccess($tokens, $type); @@ -464,10 +469,48 @@ public function parseGenericTypeArgument(TokenIterator $tokens): array return [$type, $variance]; } + /** + * @throws ParserException + * @param ?callable(TokenIterator): string $parseDescription + */ + public function parseTemplateTagValue( + TokenIterator $tokens, + ?callable $parseDescription = null + ): TemplateTagValueNode + { + $name = $tokens->currentTokenValue(); + $tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER); + + if ($tokens->tryConsumeTokenValue('of') || $tokens->tryConsumeTokenValue('as')) { + $bound = $this->parse($tokens); + + } else { + $bound = null; + } + + if ($tokens->tryConsumeTokenValue('=')) { + $default = $this->parse($tokens); + } else { + $default = null; + } + + if ($parseDescription !== null) { + $description = $parseDescription($tokens); + } else { + $description = ''; + } + + return new Ast\PhpDoc\TemplateTagValueNode($name, $bound, $description, $default); + } + /** @phpstan-impure */ - private function parseCallable(TokenIterator $tokens, Ast\Type\IdentifierTypeNode $identifier): Ast\Type\TypeNode + private function parseCallable(TokenIterator $tokens, Ast\Type\IdentifierTypeNode $identifier, bool $hasTemplate): Ast\Type\TypeNode { + $templates = $hasTemplate + ? $this->parseCallableTemplates($tokens) + : []; + $tokens->consumeTokenType(Lexer::TOKEN_OPEN_PARENTHESES); $tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL); @@ -492,7 +535,52 @@ private function parseCallable(TokenIterator $tokens, Ast\Type\IdentifierTypeNod $startIndex = $tokens->currentTokenIndex(); $returnType = $this->enrichWithAttributes($tokens, $this->parseCallableReturnType($tokens), $startLine, $startIndex); - return new Ast\Type\CallableTypeNode($identifier, $parameters, $returnType); + return new Ast\Type\CallableTypeNode($identifier, $parameters, $returnType, $templates); + } + + + /** + * @return Ast\PhpDoc\TemplateTagValueNode[] + * + * @phpstan-impure + */ + private function parseCallableTemplates(TokenIterator $tokens): array + { + $tokens->consumeTokenType(Lexer::TOKEN_OPEN_ANGLE_BRACKET); + + $templates = []; + + $isFirst = true; + while ($isFirst || $tokens->tryConsumeTokenType(Lexer::TOKEN_COMMA)) { + $tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL); + + // trailing comma case + if (!$isFirst && $tokens->isCurrentTokenType(Lexer::TOKEN_CLOSE_ANGLE_BRACKET)) { + break; + } + $isFirst = false; + + $templates[] = $this->parseCallableTemplateArgument($tokens); + $tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL); + } + + $tokens->consumeTokenType(Lexer::TOKEN_CLOSE_ANGLE_BRACKET); + + return $templates; + } + + + private function parseCallableTemplateArgument(TokenIterator $tokens): Ast\PhpDoc\TemplateTagValueNode + { + $startLine = $tokens->currentTokenLine(); + $startIndex = $tokens->currentTokenIndex(); + + return $this->enrichWithAttributes( + $tokens, + $this->parseTemplateTagValue($tokens), + $startLine, + $startIndex + ); } @@ -670,11 +758,11 @@ private function parseCallableReturnType(TokenIterator $tokens): Ast\Type\TypeNo /** @phpstan-impure */ - private function tryParseCallable(TokenIterator $tokens, Ast\Type\IdentifierTypeNode $identifier): Ast\Type\TypeNode + private function tryParseCallable(TokenIterator $tokens, Ast\Type\IdentifierTypeNode $identifier, bool $hasTemplate): Ast\Type\TypeNode { try { $tokens->pushSavePoint(); - $type = $this->parseCallable($tokens, $identifier); + $type = $this->parseCallable($tokens, $identifier, $hasTemplate); $tokens->dropSavePoint(); } catch (ParserException $e) { diff --git a/site/vendor/phpstan/phpdoc-parser/src/Printer/Printer.php b/site/vendor/phpstan/phpdoc-parser/src/Printer/Printer.php index 0093e6ca2..d9a060b39 100644 --- a/site/vendor/phpstan/phpdoc-parser/src/Printer/Printer.php +++ b/site/vendor/phpstan/phpdoc-parser/src/Printer/Printer.php @@ -99,6 +99,7 @@ final class Printer ArrayShapeNode::class . '->items' => ', ', ObjectShapeNode::class . '->items' => ', ', CallableTypeNode::class . '->parameters' => ', ', + CallableTypeNode::class . '->templateTypes' => ', ', GenericTypeNode::class . '->genericTypes' => ', ', ConstExprArrayNode::class . '->items' => ', ', MethodTagValueNode::class . '->parameters' => ', ', @@ -380,10 +381,15 @@ private function printType(TypeNode $node): string } else { $returnType = $this->printType($node->returnType); } + $template = $node->templateTypes !== [] + ? '<' . implode(', ', array_map(function (TemplateTagValueNode $templateNode): string { + return $this->print($templateNode); + }, $node->templateTypes)) . '>' + : ''; $parameters = implode(', ', array_map(function (CallableTypeParameterNode $parameterNode): string { return $this->print($parameterNode); }, $node->parameters)); - return "{$node->identifier}({$parameters}): {$returnType}"; + return "{$node->identifier}{$template}({$parameters}): {$returnType}"; } if ($node instanceof ConditionalTypeForParameterNode) { return sprintf( diff --git a/site/vendor/phpstan/phpstan/phpstan.phar b/site/vendor/phpstan/phpstan/phpstan.phar index b2d1aa4bf..d1ccf0dbc 100755 Binary files a/site/vendor/phpstan/phpstan/phpstan.phar and b/site/vendor/phpstan/phpstan/phpstan.phar differ diff --git a/site/vendor/phpstan/phpstan/phpstan.phar.asc b/site/vendor/phpstan/phpstan/phpstan.phar.asc index 1c63f0f09..1fdd24b76 100644 --- a/site/vendor/phpstan/phpstan/phpstan.phar.asc +++ b/site/vendor/phpstan/phpstan/phpstan.phar.asc @@ -1,16 +1,16 @@ -----BEGIN PGP SIGNATURE----- -iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmXKeVEACgkQUcZzBf/C -5cAUqA//X7zDdV5tuXrLIDP4Y3sqINhgN1KlBzON7MjmTi21emIVwaMXrk8nxfIc -K4ApOvM25Y0RR2M6Kj7rlkuYqGwVKIZ+SHzSblpTq40ybmWPPT6LvCdeYK3keZCK -/qlyoREzzSb3XtcG3kamrGH84Gg8wPcsywzy7nMWcqXrGK6m2DJRUrxhB6ayCFTW -V90R+Xg61lOusIiTPNW8QmgffVKg/5U9yE1QOLy8IRpbfPuvijFwIjrSM1I6WJ9J -ObArp/cf7RMb2y2whmxm877Xo4onn1EZbW+1V9lCIrLCPhhRxW21tzZTNqeROFGz -gNjEcaFDozOn5lzOoWzfDW3vOvWIPb64RT1h1OpiLPBNx4IpcWGOvbQ9t+B+VUYY -9ZxZ5QderEomY+IRh2XhpcjSMpEbm+2/CFkdxelJG26vJlUzV2tYt+l1Yv/ql9wv -yS5z+/bzoGDvw6areum+AL+szWZkrxnXHLxIz8iPBGr1ceoCwTtTYZNU+LZLhoa+ -6taLqGZFxk+/rOZkmwWTT3i8zh4f9df91/capm9N0EZhR51axlwK0JPdA3FM4pHe -Q9CGyJTb4VlMyD/jVZo7Dsh0ih2A+to0f1lm2DLpOhoCF6+T7CDfvM1FY6b9OS1F -D57zG8IvlDudIwOSIROb+BEcbgvt0WVJesnRt2awcdfhKJXHROw= -=Cm+0 +iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmXUsBAACgkQUcZzBf/C +5cCX4w/+Ijclm5zQ5dkSWruihUvNeXp1GW+CZsO3J2K1KoyNIsGEtz5BXwMZm9p4 +FRxSf0F4A7O+Bs8pE8eaFt+rK9B4LDyxMN4k91c/p5eaVeWp6q0/TNbi9Oq60Azv +A0wefbNxpowvOsnx1SNmfQOHKYgH46JeExzWZ8jRAeM6mXOZg1aqgAR+HqbIX7PQ +/ikqUBLQbvfCeoflPADA3VXMMGkwSRNKnrxjW+JHKlxXx38QoT1VPtryI0VMvMC0 +JS593vtqefVdRxChHNJOFdBXmpYqMsaphK6bgpG9iHg+xi+QIARkZGtBtz1L3GEM +DMEAsqgsTEVT2rKcqdZ4IQ3RmvA1/pRRyjZWQOQ/O4195Bx2uYPZHiikbgGFHw1E +nxi56IZ08xHWR6N7tSZrRvUTv5h9gyxxVq6ePJnNondquU39kP4XoEv1XT34Wi7i +CJDU9qh7Oj0YXem3jrfCLDcMBIWLatjMQDKaXqW+LgK2J6xxH2WWzoW/ra6QEBqz +pg71EzPycq5jrrrEm73ps7XS65Lb8AWT9gJrbRvoXpWw+jFxJezsGR2I31BpNrkW +OztYx/QxsazaVWL/I6byT0RpWoBJuXq4dU/yeKG2MlgtvnKc88cB6o4mjcK2uC6T +RMs0ELxo39UPx+QmYS9FMk1bTLseLqy507WfR/C25GvAKEPSHuw= +=3aD9 -----END PGP SIGNATURE----- diff --git a/site/vendor/psalm/phar/psalm.phar b/site/vendor/psalm/phar/psalm.phar index b0cd44e29..942f7b20f 100644 Binary files a/site/vendor/psalm/phar/psalm.phar and b/site/vendor/psalm/phar/psalm.phar differ diff --git a/site/vendor/psalm/phar/psalm.phar.asc b/site/vendor/psalm/phar/psalm.phar.asc index e6d94f54c..b787488ff 100644 --- a/site/vendor/psalm/phar/psalm.phar.asc +++ b/site/vendor/psalm/phar/psalm.phar.asc @@ -1,11 +1,11 @@ -----BEGIN PGP SIGNATURE----- -iQEzBAABCgAdFiEELeUOtgwBP/+oMQQNEs4PHSYkKaUFAmXOluAACgkQEs4PHSYk -KaWg5Af+PK47zmVcnJ1IrISOlpMhbp2LsA6J7N8arSQ3ukmmUwAgOHjc6yqwMWpO -gMdhGlBUt4Kc/R7p53xsd/8vRZN6/GGYCE8ZlPsHPitBNL/e1h+dT4GQBICKX4ji -9AwztHwHgQZwigrIssqQy+PitKh8y6Y5kcHPMdUvQgskTS2WnWV+IKY+Fk4vepdv -kkEemsJJ72v1lsWmXZnlq2BV7/HaB9zs4RdsufMHL0x2ORdcp/V/B9waEaT77IXQ -kE/LgWxPu7juWa2ZemE/Wv55JtQgp8MhHjTWax6qQglrchKiO6FRHxdaGkDY3Iu9 -hAY74uwhdqV4Mt8rxRvOrvWhWz+PjA== -=bdZp +iQEzBAABCgAdFiEELeUOtgwBP/+oMQQNEs4PHSYkKaUFAmXX258ACgkQEs4PHSYk +KaXCkgf/UjpSpFMx1kjdRHo5QMzRN47cbRKPKAGbUHvfQ4hN4y0kb2srYegbB6Oi +g1Mp1uuz7YGrvUklZtSAGvIGjD7qyv59viGqcTaT2O59xfRLuiZr4iuA4h6/K2HT +t7QhMsb6HCHlwI1bMeXLBpaHodG04DcfHscUJML3Ilfso5ArdAHXkp2sXMGZza6G +mj5Ih1YbkA/at1/ALqxMJXKypdMoQ8JIJK75AODx06zbeZmz5qgGPNWJR7FJknqC +5rZOpTjNFPwob9iLlZaEYXg633WUy29ygPjBen3zCRRAGtIVfFQDWUn9ANWIhU/1 +H4CWRTOzCRpjUuf46hMwGJcBfBcKAA== +=n/pu -----END PGP SIGNATURE----- diff --git a/site/vendor/symfony/cache/Adapter/TagAwareAdapter.php b/site/vendor/symfony/cache/Adapter/TagAwareAdapter.php index 6c4a42802..772c20183 100644 --- a/site/vendor/symfony/cache/Adapter/TagAwareAdapter.php +++ b/site/vendor/symfony/cache/Adapter/TagAwareAdapter.php @@ -146,8 +146,6 @@ public function getItems(array $keys = []): iterable foreach ($keys as $key) { if ('' !== $key && \is_string($key)) { $commit = $commit || isset($this->deferred[$key]); - $key = static::TAGS_PREFIX.$key; - $tagKeys[$key] = $key; // BC with pools populated before v6.1 } } @@ -156,7 +154,7 @@ public function getItems(array $keys = []): iterable } try { - $items = $this->pool->getItems($tagKeys + $keys); + $items = $this->pool->getItems($keys); } catch (InvalidArgumentException $e) { $this->pool->getItems($keys); // Should throw an exception @@ -166,18 +164,24 @@ public function getItems(array $keys = []): iterable $bufferedItems = $itemTags = []; foreach ($items as $key => $item) { - if (isset($tagKeys[$key])) { // BC with pools populated before v6.1 - if ($item->isHit()) { - $itemTags[substr($key, \strlen(static::TAGS_PREFIX))] = $item->get() ?: []; - } - continue; - } - if (null !== $tags = $item->getMetadata()[CacheItem::METADATA_TAGS] ?? null) { $itemTags[$key] = $tags; } $bufferedItems[$key] = $item; + + if (null === $tags) { + $key = "\0tags\0".$key; + $tagKeys[$key] = $key; // BC with pools populated before v6.1 + } + } + + if ($tagKeys) { + foreach ($this->pool->getItems($tagKeys) as $key => $item) { + if ($item->isHit()) { + $itemTags[substr($key, \strlen("\0tags\0"))] = $item->get() ?: []; + } + } } $tagVersions = $this->getTagVersions($itemTags, false); @@ -222,7 +226,7 @@ public function deleteItems(array $keys): bool { foreach ($keys as $key) { if ('' !== $key && \is_string($key)) { - $keys[] = static::TAGS_PREFIX.$key; // BC with pools populated before v6.1 + $keys[] = "\0tags\0".$key; // BC with pools populated before v6.1 } } diff --git a/site/vendor/symfony/cache/Traits/Redis6Proxy.php b/site/vendor/symfony/cache/Traits/Redis6Proxy.php index 0680404fc..59ab11b0f 100644 --- a/site/vendor/symfony/cache/Traits/Redis6Proxy.php +++ b/site/vendor/symfony/cache/Traits/Redis6Proxy.php @@ -96,6 +96,11 @@ public function bgrewriteaof(): \Redis|bool return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->bgrewriteaof(...\func_get_args()); } + public function waitaof($numlocal, $numreplicas, $timeout): \Redis|array|false + { + return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->waitaof(...\func_get_args()); + } + public function bitcount($key, $start = 0, $end = -1, $bybit = false): \Redis|false|int { return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->bitcount(...\func_get_args()); diff --git a/site/vendor/symfony/cache/Traits/RedisCluster6Proxy.php b/site/vendor/symfony/cache/Traits/RedisCluster6Proxy.php index fafc4acf2..da6526b6e 100644 --- a/site/vendor/symfony/cache/Traits/RedisCluster6Proxy.php +++ b/site/vendor/symfony/cache/Traits/RedisCluster6Proxy.php @@ -96,6 +96,11 @@ public function bgrewriteaof($key_or_address): \RedisCluster|bool return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->bgrewriteaof(...\func_get_args()); } + public function waitaof($key_or_address, $numlocal, $numreplicas, $timeout): \RedisCluster|array|false + { + return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->waitaof(...\func_get_args()); + } + public function bgsave($key_or_address): \RedisCluster|bool { return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->bgsave(...\func_get_args()); diff --git a/site/vendor/symfony/cache/Traits/RedisTrait.php b/site/vendor/symfony/cache/Traits/RedisTrait.php index 12887c107..032a290c7 100644 --- a/site/vendor/symfony/cache/Traits/RedisTrait.php +++ b/site/vendor/symfony/cache/Traits/RedisTrait.php @@ -260,6 +260,22 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra $extra = [ 'stream' => $params['ssl'] ?? null, ]; + $booleanStreamOptions = [ + 'allow_self_signed', + 'capture_peer_cert', + 'capture_peer_cert_chain', + 'disable_compression', + 'SNI_enabled', + 'verify_peer', + 'verify_peer_name', + ]; + + foreach ($extra['stream'] ?? [] as $streamOption => $value) { + if (\in_array($streamOption, $booleanStreamOptions, true) && \is_string($value)) { + $extra['stream'][$streamOption] = filter_var($value, \FILTER_VALIDATE_BOOL); + } + } + if (isset($params['auth'])) { $extra['auth'] = $params['auth']; } diff --git a/site/vendor/symfony/config/ResourceCheckerConfigCache.php b/site/vendor/symfony/config/ResourceCheckerConfigCache.php index 0070c4f74..a1145bedd 100644 --- a/site/vendor/symfony/config/ResourceCheckerConfigCache.php +++ b/site/vendor/symfony/config/ResourceCheckerConfigCache.php @@ -148,7 +148,7 @@ private function safelyUnserialize(string $file): mixed $signalingException = new \UnexpectedValueException(); $prevUnserializeHandler = ini_set('unserialize_callback_func', self::class.'::handleUnserializeCallback'); $prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = []) use (&$prevErrorHandler, $signalingException) { - if (__FILE__ === $file) { + if (__FILE__ === $file && !\in_array($type, [\E_DEPRECATED, \E_USER_DEPRECATED], true)) { throw $signalingException; } diff --git a/site/vendor/symfony/translation/Extractor/Visitor/TransMethodVisitor.php b/site/vendor/symfony/translation/Extractor/Visitor/TransMethodVisitor.php index 53a6981a2..011bf3b11 100644 --- a/site/vendor/symfony/translation/Extractor/Visitor/TransMethodVisitor.php +++ b/site/vendor/symfony/translation/Extractor/Visitor/TransMethodVisitor.php @@ -39,7 +39,7 @@ public function leaveNode(Node $node): ?Node return null; } - $name = (string) $node->name; + $name = $node->name instanceof Node\Name ? $node->name->getLast() : (string) $node->name; if ('trans' === $name || 't' === $name) { $firstNamedArgumentIndex = $this->nodeFirstNamedArgumentIndex($node); diff --git a/site/vendor/symfony/var-exporter/Internal/Hydrator.php b/site/vendor/symfony/var-exporter/Internal/Hydrator.php index f4ec8b7c4..65fdcd1d5 100644 --- a/site/vendor/symfony/var-exporter/Internal/Hydrator.php +++ b/site/vendor/symfony/var-exporter/Internal/Hydrator.php @@ -262,10 +262,19 @@ public static function getPropertyScopes($class): array $name = $property->name; if (\ReflectionProperty::IS_PRIVATE & $flags) { - $propertyScopes["\0$class\0$name"] = $propertyScopes[$name] = [$class, $name, $flags & \ReflectionProperty::IS_READONLY ? $class : null, $property]; + $readonlyScope = null; + if ($flags & \ReflectionProperty::IS_READONLY) { + $readonlyScope = $class; + } + $propertyScopes["\0$class\0$name"] = $propertyScopes[$name] = [$class, $name, $readonlyScope, $property]; + continue; } - $propertyScopes[$name] = [$class, $name, $flags & \ReflectionProperty::IS_READONLY ? $property->class : null, $property]; + $readonlyScope = null; + if ($flags & \ReflectionProperty::IS_READONLY) { + $readonlyScope = $property->class; + } + $propertyScopes[$name] = [$class, $name, $readonlyScope, $property]; if (\ReflectionProperty::IS_PROTECTED & $flags) { $propertyScopes["\0*\0$name"] = $propertyScopes[$name]; diff --git a/site/vendor/symfony/var-exporter/LazyGhostTrait.php b/site/vendor/symfony/var-exporter/LazyGhostTrait.php index b9b77e73d..08d0ed2cf 100644 --- a/site/vendor/symfony/var-exporter/LazyGhostTrait.php +++ b/site/vendor/symfony/var-exporter/LazyGhostTrait.php @@ -165,6 +165,10 @@ public function &__get($name): mixed return $accessor['get']($this, $name, null !== $readonlyScope); } catch (\Error) { + if (preg_match('/^Cannot access uninitialized non-nullable property ([^ ]++) by reference$/', $e->getMessage(), $matches)) { + throw new \Error('Typed property '.$matches[1].' must not be accessed before initialization', $e->getCode(), $e->getPrevious()); + } + throw $e; } } diff --git a/site/vendor/symfony/var-exporter/ProxyHelper.php b/site/vendor/symfony/var-exporter/ProxyHelper.php index b6792ad1d..7bc7ed010 100644 --- a/site/vendor/symfony/var-exporter/ProxyHelper.php +++ b/site/vendor/symfony/var-exporter/ProxyHelper.php @@ -28,7 +28,7 @@ final class ProxyHelper public static function generateLazyGhost(\ReflectionClass $class): string { if (\PHP_VERSION_ID < 80300 && $class->isReadOnly()) { - throw new LogicException(sprintf('Cannot generate lazy ghost: class "%s" is readonly.', $class->name)); + throw new LogicException(sprintf('Cannot generate lazy ghost with PHP < 8.3: class "%s" is readonly.', $class->name)); } if ($class->isFinal()) { throw new LogicException(sprintf('Cannot generate lazy ghost: class "%s" is final.', $class->name)); @@ -92,7 +92,7 @@ public static function generateLazyProxy(?\ReflectionClass $class, array $interf throw new LogicException(sprintf('Cannot generate lazy proxy: class "%s" is final.', $class->name)); } if (\PHP_VERSION_ID < 80300 && $class?->isReadOnly()) { - throw new LogicException(sprintf('Cannot generate lazy proxy: class "%s" is readonly.', $class->name)); + throw new LogicException(sprintf('Cannot generate lazy proxy with PHP < 8.3: class "%s" is readonly.', $class->name)); } $methodReflectors = [$class?->getMethods(\ReflectionMethod::IS_PUBLIC | \ReflectionMethod::IS_PROTECTED) ?? []];