diff --git a/composer.lock b/composer.lock index 50e7b75adf..4e0f43e6b2 100644 --- a/composer.lock +++ b/composer.lock @@ -4,9 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f2d0f79ec65b184383e3351117dce813", - "packages": [], - "packages-dev": [ + "content-hash": "053200295ad5701159d227c4b1823f44", + "packages": [ { "name": "clue/stream-filter", "version": "v1.5.0", @@ -1815,16 +1814,16 @@ }, { "name": "maximebf/debugbar", - "version": "v1.16.5", + "version": "v1.17.1", "source": { "type": "git", "url": "https://github.com/maximebf/php-debugbar.git", - "reference": "6d51ee9e94cff14412783785e79a4e7ef97b9d62" + "reference": "0a3532556be0145603f8a9de23e76dc28eed7054" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/6d51ee9e94cff14412783785e79a4e7ef97b9d62", - "reference": "6d51ee9e94cff14412783785e79a4e7ef97b9d62", + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/0a3532556be0145603f8a9de23e76dc28eed7054", + "reference": "0a3532556be0145603f8a9de23e76dc28eed7054", "shasum": "" }, "require": { @@ -1843,7 +1842,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.16-dev" + "dev-master": "1.17-dev" } }, "autoload": { @@ -1874,9 +1873,9 @@ ], "support": { "issues": "https://github.com/maximebf/php-debugbar/issues", - "source": "https://github.com/maximebf/php-debugbar/tree/v1.16.5" + "source": "https://github.com/maximebf/php-debugbar/tree/v1.17.1" }, - "time": "2020-12-07T11:07:24+00:00" + "time": "2021-08-01T09:19:02+00:00" }, { "name": "monolog/monolog", @@ -2065,16 +2064,16 @@ }, { "name": "pear/archive_tar", - "version": "1.4.13", + "version": "1.4.14", "source": { "type": "git", "url": "https://github.com/pear/Archive_Tar.git", - "reference": "2b87b41178cc6d4ad3cba678a46a1cae49786011" + "reference": "4d761c5334c790e45ef3245f0864b8955c562caa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/2b87b41178cc6d4ad3cba678a46a1cae49786011", - "reference": "2b87b41178cc6d4ad3cba678a46a1cae49786011", + "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/4d761c5334c790e45ef3245f0864b8955c562caa", + "reference": "4d761c5334c790e45ef3245f0864b8955c562caa", "shasum": "" }, "require": { @@ -2141,7 +2140,7 @@ "type": "patreon" } ], - "time": "2021-02-16T10:50:50+00:00" + "time": "2021-07-20T13:53:39+00:00" }, { "name": "pear/console_getopt", @@ -2252,16 +2251,16 @@ }, { "name": "pear/pear-core-minimal", - "version": "v1.10.10", + "version": "v1.10.11", "source": { "type": "git", "url": "https://github.com/pear/pear-core-minimal.git", - "reference": "625a3c429d9b2c1546438679074cac1b089116a7" + "reference": "68d0d32ada737153b7e93b8d3c710ebe70ac867d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/625a3c429d9b2c1546438679074cac1b089116a7", - "reference": "625a3c429d9b2c1546438679074cac1b089116a7", + "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/68d0d32ada737153b7e93b8d3c710ebe70ac867d", + "reference": "68d0d32ada737153b7e93b8d3c710ebe70ac867d", "shasum": "" }, "require": { @@ -2296,7 +2295,7 @@ "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=PEAR", "source": "https://github.com/pear/pear-core-minimal" }, - "time": "2019-11-19T19:00:24+00:00" + "time": "2021-08-10T22:31:03+00:00" }, { "name": "pear/pear_exception", @@ -2760,16 +2759,16 @@ }, { "name": "php-http/message", - "version": "1.11.1", + "version": "1.12.0", "source": { "type": "git", "url": "https://github.com/php-http/message.git", - "reference": "887734d9c515ad9a564f6581a682fff87a6253cc" + "reference": "39eb7548be982a81085fe5a6e2a44268cd586291" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/message/zipball/887734d9c515ad9a564f6581a682fff87a6253cc", - "reference": "887734d9c515ad9a564f6581a682fff87a6253cc", + "url": "https://api.github.com/repos/php-http/message/zipball/39eb7548be982a81085fe5a6e2a44268cd586291", + "reference": "39eb7548be982a81085fe5a6e2a44268cd586291", "shasum": "" }, "require": { @@ -2828,9 +2827,9 @@ ], "support": { "issues": "https://github.com/php-http/message/issues", - "source": "https://github.com/php-http/message/tree/1.11.1" + "source": "https://github.com/php-http/message/tree/1.12.0" }, - "time": "2021-05-24T18:11:08+00:00" + "time": "2021-08-29T09:13:12+00:00" }, { "name": "php-http/message-factory", @@ -4855,23 +4854,23 @@ }, { "name": "symfony/options-resolver", - "version": "v5.3.0", + "version": "v5.3.7", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "162e886ca035869866d233a2bfef70cc28f9bbe5" + "reference": "4b78e55b179003a42523a362cc0e8327f7a69b5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/162e886ca035869866d233a2bfef70cc28f9bbe5", - "reference": "162e886ca035869866d233a2bfef70cc28f9bbe5", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/4b78e55b179003a42523a362cc0e8327f7a69b5e", + "reference": "4b78e55b179003a42523a362cc0e8327f7a69b5e", "shasum": "" }, "require": { "php": ">=7.2.5", "symfony/deprecation-contracts": "^2.1", "symfony/polyfill-php73": "~1.0", - "symfony/polyfill-php80": "^1.15" + "symfony/polyfill-php80": "^1.16" }, "type": "library", "autoload": { @@ -4904,7 +4903,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v5.3.0" + "source": "https://github.com/symfony/options-resolver/tree/v5.3.7" }, "funding": [ { @@ -4920,7 +4919,7 @@ "type": "tidelift" } ], - "time": "2021-05-26T17:43:10+00:00" + "time": "2021-08-04T21:20:46+00:00" }, { "name": "symfony/polyfill-ctype", @@ -5174,16 +5173,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.23.0", + "version": "v1.23.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1" + "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2df51500adbaebdc4c38dea4c89a2e131c45c8a1", - "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6", + "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6", "shasum": "" }, "require": { @@ -5234,7 +5233,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.1" }, "funding": [ { @@ -5250,7 +5249,7 @@ "type": "tidelift" } ], - "time": "2021-05-27T09:27:20+00:00" + "time": "2021-05-27T12:26:48+00:00" }, { "name": "symfony/polyfill-php72", @@ -5409,16 +5408,16 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.23.0", + "version": "v1.23.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0" + "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/eca0bf41ed421bed1b57c4958bab16aa86b757d0", - "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be", + "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be", "shasum": "" }, "require": { @@ -5472,7 +5471,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.1" }, "funding": [ { @@ -5488,26 +5487,26 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2021-07-28T13:41:28+00:00" }, { "name": "symfony/var-dumper", - "version": "v5.3.3", + "version": "v5.3.7", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "46aa709affb9ad3355bd7a810f9662d71025c384" + "reference": "3ad5af4aed07d0a0201bbcfc42658fe6c5b2fb8f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/46aa709affb9ad3355bd7a810f9662d71025c384", - "reference": "46aa709affb9ad3355bd7a810f9662d71025c384", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/3ad5af4aed07d0a0201bbcfc42658fe6c5b2fb8f", + "reference": "3ad5af4aed07d0a0201bbcfc42658fe6c5b2fb8f", "shasum": "" }, "require": { "php": ">=7.2.5", "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php80": "^1.15" + "symfony/polyfill-php80": "^1.16" }, "conflict": { "phpunit/phpunit": "<5.4.3", @@ -5560,7 +5559,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.3.3" + "source": "https://github.com/symfony/var-dumper/tree/v5.3.7" }, "funding": [ { @@ -5576,7 +5575,7 @@ "type": "tidelift" } ], - "time": "2021-06-24T08:13:00+00:00" + "time": "2021-08-04T23:19:25+00:00" }, { "name": "symfony/yaml", @@ -5826,6 +5825,7 @@ "time": "2019-09-05T20:03:20+00:00" } ], + "packages-dev": [], "aliases": [], "minimum-stability": "stable", "stability-flags": { diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php index e545a4f3e8..98a0e82ac6 100755 --- a/vendor/composer/autoload_files.php +++ b/vendor/composer/autoload_files.php @@ -6,24 +6,24 @@ $baseDir = dirname($vendorDir); return array( - '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php', 'e88992873b7765f9b5710cab95ba5dd7' => $vendorDir . '/hoa/consistency/Prelude.php', + '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php', '3e76f7f02b41af8cea96018933f6b7e3' => $vendorDir . '/hoa/protocol/Wrapper.php', '7b11c4dc42b3b3023073cb14e519683c' => $vendorDir . '/ralouphie/getallheaders/src/getallheaders.php', 'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php', 'a4a119a56e50fbb293281d9a48007e0e' => $vendorDir . '/symfony/polyfill-php80/bootstrap.php', - '0d59ee240a4cd96ddbb4ff164fccea4d' => $vendorDir . '/symfony/polyfill-php73/bootstrap.php', '6e3fae29631ef280660b3cdad06f25a8' => $vendorDir . '/symfony/deprecation-contracts/function.php', + '0d59ee240a4cd96ddbb4ff164fccea4d' => $vendorDir . '/symfony/polyfill-php73/bootstrap.php', '9c67151ae59aff4788964ce8eb2a0f43' => $vendorDir . '/clue/stream-filter/src/functions_include.php', - '25072dd6e2470089de65ae7bf11d3109' => $vendorDir . '/symfony/polyfill-php72/bootstrap.php', 'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php', + '25072dd6e2470089de65ae7bf11d3109' => $vendorDir . '/symfony/polyfill-php72/bootstrap.php', '8cff32064859f4559445b89279f3199c' => $vendorDir . '/php-http/message/src/filters.php', 'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php', 'f598d06aa772fa33d905e87be6398fb1' => $vendorDir . '/symfony/polyfill-intl-idn/bootstrap.php', - 'ad155f8f1cf0d418fe49e248db8c661b' => $vendorDir . '/react/promise/src/functions_include.php', '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php', + 'ad155f8f1cf0d418fe49e248db8c661b' => $vendorDir . '/react/promise/src/functions_include.php', '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php', - '667aeda72477189d0494fecd327c3641' => $vendorDir . '/symfony/var-dumper/Resources/functions/dump.php', '6124b4c8570aa390c21fafd04a26c69f' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php', + '667aeda72477189d0494fecd327c3641' => $vendorDir . '/symfony/var-dumper/Resources/functions/dump.php', '2cffec82183ee1cea088009cef9a6fc3' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php', ); diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php index ede4738aa5..f84dd9bd44 100755 --- a/vendor/composer/autoload_psr4.php +++ b/vendor/composer/autoload_psr4.php @@ -6,7 +6,7 @@ $baseDir = dirname($vendorDir); return array( - 'phpDocumentor\\Reflection\\' => array($vendorDir . '/phpdocumentor/reflection-common/src', $vendorDir . '/phpdocumentor/type-resolver/src', $vendorDir . '/phpdocumentor/reflection-docblock/src'), + 'phpDocumentor\\Reflection\\' => array($vendorDir . '/phpdocumentor/reflection-common/src', $vendorDir . '/phpdocumentor/reflection-docblock/src', $vendorDir . '/phpdocumentor/type-resolver/src'), 'Zend\\Escaper\\' => array($vendorDir . '/zendframework/zend-escaper/src'), 'Webmozart\\Assert\\' => array($vendorDir . '/webmozart/assert/src'), 'Symfony\\Polyfill\\Php80\\' => array($vendorDir . '/symfony/polyfill-php80'), diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index d78e8aaf3a..f071a2aa84 100755 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -7,25 +7,25 @@ class ComposerStaticInitf893b44b064e0ec87bc556a4718fc134 { public static $files = array ( - '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php', 'e88992873b7765f9b5710cab95ba5dd7' => __DIR__ . '/..' . '/hoa/consistency/Prelude.php', + '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php', '3e76f7f02b41af8cea96018933f6b7e3' => __DIR__ . '/..' . '/hoa/protocol/Wrapper.php', '7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php', 'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php', 'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php', - '0d59ee240a4cd96ddbb4ff164fccea4d' => __DIR__ . '/..' . '/symfony/polyfill-php73/bootstrap.php', '6e3fae29631ef280660b3cdad06f25a8' => __DIR__ . '/..' . '/symfony/deprecation-contracts/function.php', + '0d59ee240a4cd96ddbb4ff164fccea4d' => __DIR__ . '/..' . '/symfony/polyfill-php73/bootstrap.php', '9c67151ae59aff4788964ce8eb2a0f43' => __DIR__ . '/..' . '/clue/stream-filter/src/functions_include.php', - '25072dd6e2470089de65ae7bf11d3109' => __DIR__ . '/..' . '/symfony/polyfill-php72/bootstrap.php', 'e69f7f6ee287b969198c3c9d6777bd38' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/bootstrap.php', + '25072dd6e2470089de65ae7bf11d3109' => __DIR__ . '/..' . '/symfony/polyfill-php72/bootstrap.php', '8cff32064859f4559445b89279f3199c' => __DIR__ . '/..' . '/php-http/message/src/filters.php', 'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php', 'f598d06aa772fa33d905e87be6398fb1' => __DIR__ . '/..' . '/symfony/polyfill-intl-idn/bootstrap.php', - 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php', + 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php', - '667aeda72477189d0494fecd327c3641' => __DIR__ . '/..' . '/symfony/var-dumper/Resources/functions/dump.php', '6124b4c8570aa390c21fafd04a26c69f' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php', + '667aeda72477189d0494fecd327c3641' => __DIR__ . '/..' . '/symfony/var-dumper/Resources/functions/dump.php', '2cffec82183ee1cea088009cef9a6fc3' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php', ); @@ -134,8 +134,8 @@ class ComposerStaticInitf893b44b064e0ec87bc556a4718fc134 'phpDocumentor\\Reflection\\' => array ( 0 => __DIR__ . '/..' . '/phpdocumentor/reflection-common/src', - 1 => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src', - 2 => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src', + 1 => __DIR__ . '/..' . '/phpdocumentor/reflection-docblock/src', + 2 => __DIR__ . '/..' . '/phpdocumentor/type-resolver/src', ), 'Zend\\Escaper\\' => array ( diff --git a/vendor/composer/include_paths.php b/vendor/composer/include_paths.php index 009546fad8..625c04322e 100755 --- a/vendor/composer/include_paths.php +++ b/vendor/composer/include_paths.php @@ -6,9 +6,9 @@ $baseDir = dirname($vendorDir); return array( - $vendorDir . '/pear/pear_exception', $vendorDir . '/pear/console_getopt', - $vendorDir . '/pear/pear-core-minimal/src', $vendorDir . '/pear/file_marc', + $vendorDir . '/pear/pear_exception', + $vendorDir . '/pear/pear-core-minimal/src', $vendorDir . '/pear/archive_tar', ); diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index f8d3c52e97..93a395f257 100755 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -1892,17 +1892,17 @@ }, { "name": "maximebf/debugbar", - "version": "v1.16.5", - "version_normalized": "1.16.5.0", + "version": "v1.17.1", + "version_normalized": "1.17.1.0", "source": { "type": "git", "url": "https://github.com/maximebf/php-debugbar.git", - "reference": "6d51ee9e94cff14412783785e79a4e7ef97b9d62" + "reference": "0a3532556be0145603f8a9de23e76dc28eed7054" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/6d51ee9e94cff14412783785e79a4e7ef97b9d62", - "reference": "6d51ee9e94cff14412783785e79a4e7ef97b9d62", + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/0a3532556be0145603f8a9de23e76dc28eed7054", + "reference": "0a3532556be0145603f8a9de23e76dc28eed7054", "shasum": "" }, "require": { @@ -1918,11 +1918,11 @@ "monolog/monolog": "Log using Monolog", "predis/predis": "Redis storage" }, - "time": "2020-12-07T11:07:24+00:00", + "time": "2021-08-01T09:19:02+00:00", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.16-dev" + "dev-master": "1.17-dev" } }, "installation-source": "dist", @@ -1954,7 +1954,7 @@ ], "support": { "issues": "https://github.com/maximebf/php-debugbar/issues", - "source": "https://github.com/maximebf/php-debugbar/tree/v1.16.5" + "source": "https://github.com/maximebf/php-debugbar/tree/v1.17.1" }, "install-path": "../maximebf/debugbar" }, @@ -2154,17 +2154,17 @@ }, { "name": "pear/archive_tar", - "version": "1.4.13", - "version_normalized": "1.4.13.0", + "version": "1.4.14", + "version_normalized": "1.4.14.0", "source": { "type": "git", "url": "https://github.com/pear/Archive_Tar.git", - "reference": "2b87b41178cc6d4ad3cba678a46a1cae49786011" + "reference": "4d761c5334c790e45ef3245f0864b8955c562caa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/2b87b41178cc6d4ad3cba678a46a1cae49786011", - "reference": "2b87b41178cc6d4ad3cba678a46a1cae49786011", + "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/4d761c5334c790e45ef3245f0864b8955c562caa", + "reference": "4d761c5334c790e45ef3245f0864b8955c562caa", "shasum": "" }, "require": { @@ -2179,7 +2179,7 @@ "ext-xz": "Lzma2 compression support.", "ext-zlib": "Gzip compression support." }, - "time": "2021-02-16T10:50:50+00:00", + "time": "2021-07-20T13:53:39+00:00", "type": "library", "extra": { "branch-alias": { @@ -2350,17 +2350,17 @@ }, { "name": "pear/pear-core-minimal", - "version": "v1.10.10", - "version_normalized": "1.10.10.0", + "version": "v1.10.11", + "version_normalized": "1.10.11.0", "source": { "type": "git", "url": "https://github.com/pear/pear-core-minimal.git", - "reference": "625a3c429d9b2c1546438679074cac1b089116a7" + "reference": "68d0d32ada737153b7e93b8d3c710ebe70ac867d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/625a3c429d9b2c1546438679074cac1b089116a7", - "reference": "625a3c429d9b2c1546438679074cac1b089116a7", + "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/68d0d32ada737153b7e93b8d3c710ebe70ac867d", + "reference": "68d0d32ada737153b7e93b8d3c710ebe70ac867d", "shasum": "" }, "require": { @@ -2370,7 +2370,7 @@ "replace": { "rsky/pear-core-min": "self.version" }, - "time": "2019-11-19T19:00:24+00:00", + "time": "2021-08-10T22:31:03+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -2885,17 +2885,17 @@ }, { "name": "php-http/message", - "version": "1.11.1", - "version_normalized": "1.11.1.0", + "version": "1.12.0", + "version_normalized": "1.12.0.0", "source": { "type": "git", "url": "https://github.com/php-http/message.git", - "reference": "887734d9c515ad9a564f6581a682fff87a6253cc" + "reference": "39eb7548be982a81085fe5a6e2a44268cd586291" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/message/zipball/887734d9c515ad9a564f6581a682fff87a6253cc", - "reference": "887734d9c515ad9a564f6581a682fff87a6253cc", + "url": "https://api.github.com/repos/php-http/message/zipball/39eb7548be982a81085fe5a6e2a44268cd586291", + "reference": "39eb7548be982a81085fe5a6e2a44268cd586291", "shasum": "" }, "require": { @@ -2921,7 +2921,7 @@ "laminas/laminas-diactoros": "Used with Diactoros Factories", "slim/slim": "Used with Slim Framework PSR-7 implementation" }, - "time": "2021-05-24T18:11:08+00:00", + "time": "2021-08-29T09:13:12+00:00", "type": "library", "extra": { "branch-alias": { @@ -2956,7 +2956,7 @@ ], "support": { "issues": "https://github.com/php-http/message/issues", - "source": "https://github.com/php-http/message/tree/1.11.1" + "source": "https://github.com/php-http/message/tree/1.12.0" }, "install-path": "../php-http/message" }, @@ -5088,26 +5088,26 @@ }, { "name": "symfony/options-resolver", - "version": "v5.3.0", - "version_normalized": "5.3.0.0", + "version": "v5.3.7", + "version_normalized": "5.3.7.0", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "162e886ca035869866d233a2bfef70cc28f9bbe5" + "reference": "4b78e55b179003a42523a362cc0e8327f7a69b5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/162e886ca035869866d233a2bfef70cc28f9bbe5", - "reference": "162e886ca035869866d233a2bfef70cc28f9bbe5", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/4b78e55b179003a42523a362cc0e8327f7a69b5e", + "reference": "4b78e55b179003a42523a362cc0e8327f7a69b5e", "shasum": "" }, "require": { "php": ">=7.2.5", "symfony/deprecation-contracts": "^2.1", "symfony/polyfill-php73": "~1.0", - "symfony/polyfill-php80": "^1.15" + "symfony/polyfill-php80": "^1.16" }, - "time": "2021-05-26T17:43:10+00:00", + "time": "2021-08-04T21:20:46+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -5140,7 +5140,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v5.3.0" + "source": "https://github.com/symfony/options-resolver/tree/v5.3.7" }, "funding": [ { @@ -5419,17 +5419,17 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.23.0", - "version_normalized": "1.23.0.0", + "version": "v1.23.1", + "version_normalized": "1.23.1.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1" + "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2df51500adbaebdc4c38dea4c89a2e131c45c8a1", - "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6", + "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6", "shasum": "" }, "require": { @@ -5438,7 +5438,7 @@ "suggest": { "ext-mbstring": "For best performance" }, - "time": "2021-05-27T09:27:20+00:00", + "time": "2021-05-27T12:26:48+00:00", "type": "library", "extra": { "branch-alias": { @@ -5482,7 +5482,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.1" }, "funding": [ { @@ -5663,23 +5663,23 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.23.0", - "version_normalized": "1.23.0.0", + "version": "v1.23.1", + "version_normalized": "1.23.1.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0" + "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/eca0bf41ed421bed1b57c4958bab16aa86b757d0", - "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be", + "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be", "shasum": "" }, "require": { "php": ">=7.1" }, - "time": "2021-02-19T12:13:01+00:00", + "time": "2021-07-28T13:41:28+00:00", "type": "library", "extra": { "branch-alias": { @@ -5729,7 +5729,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.1" }, "funding": [ { @@ -5749,23 +5749,23 @@ }, { "name": "symfony/var-dumper", - "version": "v5.3.3", - "version_normalized": "5.3.3.0", + "version": "v5.3.7", + "version_normalized": "5.3.7.0", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "46aa709affb9ad3355bd7a810f9662d71025c384" + "reference": "3ad5af4aed07d0a0201bbcfc42658fe6c5b2fb8f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/46aa709affb9ad3355bd7a810f9662d71025c384", - "reference": "46aa709affb9ad3355bd7a810f9662d71025c384", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/3ad5af4aed07d0a0201bbcfc42658fe6c5b2fb8f", + "reference": "3ad5af4aed07d0a0201bbcfc42658fe6c5b2fb8f", "shasum": "" }, "require": { "php": ">=7.2.5", "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php80": "^1.15" + "symfony/polyfill-php80": "^1.16" }, "conflict": { "phpunit/phpunit": "<5.4.3", @@ -5782,7 +5782,7 @@ "ext-intl": "To show region name in time zone dump", "symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script" }, - "time": "2021-06-24T08:13:00+00:00", + "time": "2021-08-04T23:19:25+00:00", "bin": [ "Resources/bin/var-dump-server" ], @@ -5820,7 +5820,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.3.3" + "source": "https://github.com/symfony/var-dumper/tree/v5.3.7" }, "funding": [ { diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index f03ee164c8..70afe15b67 100755 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -5,7 +5,7 @@ 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => '0eb78b556d8833497cc045e0779a69fc899eacf9', + 'reference' => '8d54e7a4d6eccf0f6e9675633dfe457cf93dc689', 'name' => '__root__', 'dev' => true, ), @@ -16,7 +16,7 @@ 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => '0eb78b556d8833497cc045e0779a69fc899eacf9', + 'reference' => '8d54e7a4d6eccf0f6e9675633dfe457cf93dc689', 'dev_requirement' => false, ), 'clue/stream-filter' => array( @@ -272,12 +272,12 @@ 'dev_requirement' => false, ), 'maximebf/debugbar' => array( - 'pretty_version' => 'v1.16.5', - 'version' => '1.16.5.0', + 'pretty_version' => 'v1.17.1', + 'version' => '1.17.1.0', 'type' => 'library', 'install_path' => __DIR__ . '/../maximebf/debugbar', 'aliases' => array(), - 'reference' => '6d51ee9e94cff14412783785e79a4e7ef97b9d62', + 'reference' => '0a3532556be0145603f8a9de23e76dc28eed7054', 'dev_requirement' => false, ), 'monolog/monolog' => array( @@ -311,12 +311,12 @@ 'dev_requirement' => false, ), 'pear/archive_tar' => array( - 'pretty_version' => '1.4.13', - 'version' => '1.4.13.0', + 'pretty_version' => '1.4.14', + 'version' => '1.4.14.0', 'type' => 'library', 'install_path' => __DIR__ . '/../pear/archive_tar', 'aliases' => array(), - 'reference' => '2b87b41178cc6d4ad3cba678a46a1cae49786011', + 'reference' => '4d761c5334c790e45ef3245f0864b8955c562caa', 'dev_requirement' => false, ), 'pear/console_getopt' => array( @@ -338,12 +338,12 @@ 'dev_requirement' => false, ), 'pear/pear-core-minimal' => array( - 'pretty_version' => 'v1.10.10', - 'version' => '1.10.10.0', + 'pretty_version' => 'v1.10.11', + 'version' => '1.10.11.0', 'type' => 'library', 'install_path' => __DIR__ . '/../pear/pear-core-minimal', 'aliases' => array(), - 'reference' => '625a3c429d9b2c1546438679074cac1b089116a7', + 'reference' => '68d0d32ada737153b7e93b8d3c710ebe70ac867d', 'dev_requirement' => false, ), 'pear/pear_exception' => array( @@ -431,12 +431,12 @@ 'dev_requirement' => false, ), 'php-http/message' => array( - 'pretty_version' => '1.11.1', - 'version' => '1.11.1.0', + 'pretty_version' => '1.12.0', + 'version' => '1.12.0.0', 'type' => 'library', 'install_path' => __DIR__ . '/../php-http/message', 'aliases' => array(), - 'reference' => '887734d9c515ad9a564f6581a682fff87a6253cc', + 'reference' => '39eb7548be982a81085fe5a6e2a44268cd586291', 'dev_requirement' => false, ), 'php-http/message-factory' => array( @@ -664,7 +664,7 @@ 'rsky/pear-core-min' => array( 'dev_requirement' => false, 'replaced' => array( - 0 => 'v1.10.10', + 0 => 'v1.10.11', ), ), 'sabberworm/php-css-parser' => array( @@ -785,12 +785,12 @@ 'dev_requirement' => false, ), 'symfony/options-resolver' => array( - 'pretty_version' => 'v5.3.0', - 'version' => '5.3.0.0', + 'pretty_version' => 'v5.3.7', + 'version' => '5.3.7.0', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/options-resolver', 'aliases' => array(), - 'reference' => '162e886ca035869866d233a2bfef70cc28f9bbe5', + 'reference' => '4b78e55b179003a42523a362cc0e8327f7a69b5e', 'dev_requirement' => false, ), 'symfony/polyfill-ctype' => array( @@ -821,12 +821,12 @@ 'dev_requirement' => false, ), 'symfony/polyfill-mbstring' => array( - 'pretty_version' => 'v1.23.0', - 'version' => '1.23.0.0', + 'pretty_version' => 'v1.23.1', + 'version' => '1.23.1.0', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/polyfill-mbstring', 'aliases' => array(), - 'reference' => '2df51500adbaebdc4c38dea4c89a2e131c45c8a1', + 'reference' => '9174a3d80210dca8daa7f31fec659150bbeabfc6', 'dev_requirement' => false, ), 'symfony/polyfill-php72' => array( @@ -848,21 +848,21 @@ 'dev_requirement' => false, ), 'symfony/polyfill-php80' => array( - 'pretty_version' => 'v1.23.0', - 'version' => '1.23.0.0', + 'pretty_version' => 'v1.23.1', + 'version' => '1.23.1.0', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/polyfill-php80', 'aliases' => array(), - 'reference' => 'eca0bf41ed421bed1b57c4958bab16aa86b757d0', + 'reference' => '1100343ed1a92e3a38f9ae122fc0eb21602547be', 'dev_requirement' => false, ), 'symfony/var-dumper' => array( - 'pretty_version' => 'v5.3.3', - 'version' => '5.3.3.0', + 'pretty_version' => 'v5.3.7', + 'version' => '5.3.7.0', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/var-dumper', 'aliases' => array(), - 'reference' => '46aa709affb9ad3355bd7a810f9662d71025c384', + 'reference' => '3ad5af4aed07d0a0201bbcfc42658fe6c5b2fb8f', 'dev_requirement' => false, ), 'symfony/yaml' => array( diff --git a/vendor/maximebf/debugbar/.github/workflows/run-tests.yml b/vendor/maximebf/debugbar/.github/workflows/run-tests.yml old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/LICENSE b/vendor/maximebf/debugbar/LICENSE old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/composer.json b/vendor/maximebf/debugbar/composer.json old mode 100755 new mode 100644 index 80d36c6ba9..41c1dabe05 --- a/vendor/maximebf/debugbar/composer.json +++ b/vendor/maximebf/debugbar/composer.json @@ -36,7 +36,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.16-dev" + "dev-master": "1.17-dev" } } } diff --git a/vendor/maximebf/debugbar/src/DebugBar/Bridge/CacheCacheCollector.php b/vendor/maximebf/debugbar/src/DebugBar/Bridge/CacheCacheCollector.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Bridge/DoctrineCollector.php b/vendor/maximebf/debugbar/src/DebugBar/Bridge/DoctrineCollector.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Bridge/MonologCollector.php b/vendor/maximebf/debugbar/src/DebugBar/Bridge/MonologCollector.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Bridge/Propel2Collector.php b/vendor/maximebf/debugbar/src/DebugBar/Bridge/Propel2Collector.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Bridge/PropelCollector.php b/vendor/maximebf/debugbar/src/DebugBar/Bridge/PropelCollector.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Bridge/SlimCollector.php b/vendor/maximebf/debugbar/src/DebugBar/Bridge/SlimCollector.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Bridge/SwiftMailer/SwiftLogCollector.php b/vendor/maximebf/debugbar/src/DebugBar/Bridge/SwiftMailer/SwiftLogCollector.php old mode 100755 new mode 100644 index fdef79a0bd..e8c2fcd92f --- a/vendor/maximebf/debugbar/src/DebugBar/Bridge/SwiftMailer/SwiftLogCollector.php +++ b/vendor/maximebf/debugbar/src/DebugBar/Bridge/SwiftMailer/SwiftLogCollector.php @@ -34,7 +34,16 @@ public function add($entry) public function dump() { - return implode(PHP_EOL, $this->_log); + $dump = ''; + foreach ($this->messages as $message) { + if (!$message['is_string']) { + continue; + } + + $dump .= $message['message'] . PHP_EOL; + } + + return $dump; } public function getName() diff --git a/vendor/maximebf/debugbar/src/DebugBar/Bridge/SwiftMailer/SwiftMailCollector.php b/vendor/maximebf/debugbar/src/DebugBar/Bridge/SwiftMailer/SwiftMailCollector.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Bridge/Twig/TimeableTwigExtensionProfiler.php b/vendor/maximebf/debugbar/src/DebugBar/Bridge/Twig/TimeableTwigExtensionProfiler.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Bridge/Twig/TraceableTwigEnvironment.php b/vendor/maximebf/debugbar/src/DebugBar/Bridge/Twig/TraceableTwigEnvironment.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Bridge/Twig/TraceableTwigTemplate.php b/vendor/maximebf/debugbar/src/DebugBar/Bridge/Twig/TraceableTwigTemplate.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Bridge/Twig/TwigCollector.php b/vendor/maximebf/debugbar/src/DebugBar/Bridge/Twig/TwigCollector.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Bridge/TwigProfileCollector.php b/vendor/maximebf/debugbar/src/DebugBar/Bridge/TwigProfileCollector.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/DataCollector/AggregatedCollector.php b/vendor/maximebf/debugbar/src/DebugBar/DataCollector/AggregatedCollector.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/DataCollector/AssetProvider.php b/vendor/maximebf/debugbar/src/DebugBar/DataCollector/AssetProvider.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/DataCollector/ConfigCollector.php b/vendor/maximebf/debugbar/src/DebugBar/DataCollector/ConfigCollector.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/DataCollector/DataCollector.php b/vendor/maximebf/debugbar/src/DebugBar/DataCollector/DataCollector.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/DataCollector/DataCollectorInterface.php b/vendor/maximebf/debugbar/src/DebugBar/DataCollector/DataCollectorInterface.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/DataCollector/ExceptionsCollector.php b/vendor/maximebf/debugbar/src/DebugBar/DataCollector/ExceptionsCollector.php old mode 100755 new mode 100644 index 285bc97110..3fcac39801 --- a/vendor/maximebf/debugbar/src/DebugBar/DataCollector/ExceptionsCollector.php +++ b/vendor/maximebf/debugbar/src/DebugBar/DataCollector/ExceptionsCollector.php @@ -21,6 +21,10 @@ class ExceptionsCollector extends DataCollector implements Renderable protected $exceptions = array(); protected $chainExceptions = false; + // The HTML var dumper requires debug bar users to support the new inline assets, which not all + // may support yet - so return false by default for now. + protected $useHtmlVarDumper = false; + /** * Adds an exception to be profiled in the debug bar * @@ -65,6 +69,30 @@ public function getExceptions() return $this->exceptions; } + /** + * Sets a flag indicating whether the Symfony HtmlDumper will be used to dump variables for + * rich variable rendering. + * + * @param bool $value + * @return $this + */ + public function useHtmlVarDumper($value = true) + { + $this->useHtmlVarDumper = $value; + return $this; + } + + /** + * Indicates whether the Symfony HtmlDumper will be used to dump variables for rich variable + * rendering. + * + * @return mixed + */ + public function isHtmlVarDumperUsed() + { + return $this->useHtmlVarDumper; + } + public function collect() { return array( @@ -102,6 +130,11 @@ public function formatThrowableData($e) $lines = array("Cannot open the file ($filePath) in which the exception occurred "); } + $traceHtml = null; + if ($this->isHtmlVarDumperUsed()) { + $traceHtml = $this->getVarDumper()->renderVar($e->getTrace()); + } + return array( 'type' => get_class($e), 'message' => $e->getMessage(), @@ -109,6 +142,7 @@ public function formatThrowableData($e) 'file' => $filePath, 'line' => $e->getLine(), 'stack_trace' => $e->getTraceAsString(), + 'stack_trace_html' => $traceHtml, 'surrounding_lines' => $lines, 'xdebug_link' => $this->getXdebugLink($filePath, $e->getLine()) ); diff --git a/vendor/maximebf/debugbar/src/DebugBar/DataCollector/LocalizationCollector.php b/vendor/maximebf/debugbar/src/DebugBar/DataCollector/LocalizationCollector.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/DataCollector/MemoryCollector.php b/vendor/maximebf/debugbar/src/DebugBar/DataCollector/MemoryCollector.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/DataCollector/MessagesAggregateInterface.php b/vendor/maximebf/debugbar/src/DebugBar/DataCollector/MessagesAggregateInterface.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/DataCollector/MessagesCollector.php b/vendor/maximebf/debugbar/src/DebugBar/DataCollector/MessagesCollector.php old mode 100755 new mode 100644 index f26d3716ca..594ab2a506 --- a/vendor/maximebf/debugbar/src/DebugBar/DataCollector/MessagesCollector.php +++ b/vendor/maximebf/debugbar/src/DebugBar/DataCollector/MessagesCollector.php @@ -185,9 +185,35 @@ public function getMessages() */ public function log($level, $message, array $context = array()) { + // For string messages, interpolate the context following PSR-3 + if (is_string($message)) { + $message = $this->interpolate($message, $context); + } $this->addMessage($message, $level); } + /** + * Interpolates context values into the message placeholders. + * + * @param $message + * @param array $context + * @return string + */ + function interpolate($message, array $context = array()) + { + // build a replacement array with braces around the context keys + $replace = array(); + foreach ($context as $key => $val) { + // check that the value can be cast to string + if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) { + $replace['{' . $key . '}'] = $val; + } + } + + // interpolate replacement values into the message and return + return strtr($message, $replace); + } + /** * Deletes all messages */ diff --git a/vendor/maximebf/debugbar/src/DebugBar/DataCollector/PDO/PDOCollector.php b/vendor/maximebf/debugbar/src/DebugBar/DataCollector/PDO/PDOCollector.php old mode 100755 new mode 100644 index e1eb35ad0b..77e3630709 --- a/vendor/maximebf/debugbar/src/DebugBar/DataCollector/PDO/PDOCollector.php +++ b/vendor/maximebf/debugbar/src/DebugBar/DataCollector/PDO/PDOCollector.php @@ -21,10 +21,10 @@ class PDOCollector extends DataCollector implements Renderable, AssetProvider protected $sqlQuotationChar = '<>'; /** - * @param TraceablePDO $pdo + * @param \PDO $pdo * @param TimeDataCollector $timeCollector */ - public function __construct(TraceablePDO $pdo = null, TimeDataCollector $timeCollector = null) + public function __construct(\PDO $pdo = null, TimeDataCollector $timeCollector = null) { $this->timeCollector = $timeCollector; if ($pdo !== null) { @@ -65,11 +65,14 @@ public function getSqlQuotationChar() * @param TraceablePDO $pdo * @param string $name Optional connection name */ - public function addConnection(TraceablePDO $pdo, $name = null) + public function addConnection(\PDO $pdo, $name = null) { if ($name === null) { $name = spl_object_hash($pdo); } + if (!($pdo instanceof TraceablePDO)) { + $pdo = new TraceablePDO($pdo); + } $this->connections[$name] = $pdo; } diff --git a/vendor/maximebf/debugbar/src/DebugBar/DataCollector/PDO/TraceablePDO.php b/vendor/maximebf/debugbar/src/DebugBar/DataCollector/PDO/TraceablePDO.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/DataCollector/PDO/TraceablePDOStatement.php b/vendor/maximebf/debugbar/src/DebugBar/DataCollector/PDO/TraceablePDOStatement.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/DataCollector/PDO/TracedStatement.php b/vendor/maximebf/debugbar/src/DebugBar/DataCollector/PDO/TracedStatement.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/DataCollector/PhpInfoCollector.php b/vendor/maximebf/debugbar/src/DebugBar/DataCollector/PhpInfoCollector.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/DataCollector/Renderable.php b/vendor/maximebf/debugbar/src/DebugBar/DataCollector/Renderable.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/DataCollector/RequestDataCollector.php b/vendor/maximebf/debugbar/src/DebugBar/DataCollector/RequestDataCollector.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/DataCollector/TimeDataCollector.php b/vendor/maximebf/debugbar/src/DebugBar/DataCollector/TimeDataCollector.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/DataFormatter/DataFormatter.php b/vendor/maximebf/debugbar/src/DebugBar/DataFormatter/DataFormatter.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/DataFormatter/DataFormatterInterface.php b/vendor/maximebf/debugbar/src/DebugBar/DataFormatter/DataFormatterInterface.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/DataFormatter/DebugBarVarDumper.php b/vendor/maximebf/debugbar/src/DebugBar/DataFormatter/DebugBarVarDumper.php old mode 100755 new mode 100644 index 7b92ddf0a3..ee13263de8 --- a/vendor/maximebf/debugbar/src/DebugBar/DataFormatter/DebugBarVarDumper.php +++ b/vendor/maximebf/debugbar/src/DebugBar/DataFormatter/DebugBarVarDumper.php @@ -285,7 +285,7 @@ public function renderVar($data) */ public function getAssets() { $dumper = $this->getDumper(); - $dumper->setDumpHeader(null); // this will cause the default dump header to regenerate + $dumper->resetDumpHeader(); // this will cause the default dump header to regenerate return array( 'inline_head' => array( 'html_var_dumper' => $dumper->getDumpHeaderByDebugBar(), diff --git a/vendor/maximebf/debugbar/src/DebugBar/DataFormatter/VarDumper/DebugBarHtmlDumper.php b/vendor/maximebf/debugbar/src/DebugBar/DataFormatter/VarDumper/DebugBarHtmlDumper.php old mode 100755 new mode 100644 index 0ff4919c18..136d1ae8f0 --- a/vendor/maximebf/debugbar/src/DebugBar/DataFormatter/VarDumper/DebugBarHtmlDumper.php +++ b/vendor/maximebf/debugbar/src/DebugBar/DataFormatter/VarDumper/DebugBarHtmlDumper.php @@ -10,6 +10,14 @@ */ class DebugBarHtmlDumper extends HtmlDumper { + /** + * Resets an HTML header. + */ + public function resetDumpHeader() + { + $this->dumpHeader = null; + } + public function getDumpHeaderByDebugBar() { // getDumpHeader is protected: return str_replace('pre.sf-dump', '.phpdebugbar pre.sf-dump', $this->getDumpHeader()); diff --git a/vendor/maximebf/debugbar/src/DebugBar/DataFormatter/VarDumper/SeekingData.php b/vendor/maximebf/debugbar/src/DebugBar/DataFormatter/VarDumper/SeekingData.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/DebugBar.php b/vendor/maximebf/debugbar/src/DebugBar/DebugBar.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/DebugBarException.php b/vendor/maximebf/debugbar/src/DebugBar/DebugBarException.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/HttpDriverInterface.php b/vendor/maximebf/debugbar/src/DebugBar/HttpDriverInterface.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/JavascriptRenderer.php b/vendor/maximebf/debugbar/src/DebugBar/JavascriptRenderer.php old mode 100755 new mode 100644 index 16689992c4..c9fbd48a33 --- a/vendor/maximebf/debugbar/src/DebugBar/JavascriptRenderer.php +++ b/vendor/maximebf/debugbar/src/DebugBar/JavascriptRenderer.php @@ -82,6 +82,8 @@ class JavascriptRenderer protected $openHandlerUrl; + protected $cspNonce; + /** * @param \DebugBar\DebugBar $debugBar * @param string $baseUrl @@ -183,6 +185,9 @@ public function setOptions(array $options) if (array_key_exists('open_handler_url', $options)) { $this->setOpenHandlerUrl($options['open_handler_url']); } + if (array_key_exists('csp_nonce', $options)) { + $this->setCspNonce($options['csp_nonce']); + } } /** @@ -606,6 +611,28 @@ public function getOpenHandlerUrl() return $this->openHandlerUrl; } + /** + * Sets the CSP Nonce (or remove it by setting to null) + * + * @param string|null $nonce + * @return $this + */ + public function setCspNonce($nonce = null) + { + $this->cspNonce = $nonce; + return $this; + } + + /** + * Get the CSP Nonce + * + * @return string|null + */ + public function getCspNonce() + { + return $this->cspNonce; + } + /** * Add assets stored in files to render in the head * @@ -905,6 +932,8 @@ public function renderHead() list($cssFiles, $jsFiles, $inlineCss, $inlineJs, $inlineHead) = $this->getAssets(null, self::RELATIVE_URL); $html = ''; + $nonce = $this->getNonceAttribute(); + foreach ($cssFiles as $file) { $html .= sprintf('' . "\n", $file); } @@ -918,7 +947,7 @@ public function renderHead() } foreach ($inlineJs as $content) { - $html .= sprintf('' . "\n", $content); + $html .= sprintf('' . "\n", $nonce, $content); } foreach ($inlineHead as $content) { @@ -926,7 +955,7 @@ public function renderHead() } if ($this->enableJqueryNoConflict && !$this->useRequireJs) { - $html .= '' . "\n"; + $html .= '' . "\n"; } return $html; @@ -1013,10 +1042,12 @@ public function render($initialize = true, $renderStackedData = true) $suffix = !$initialize ? '(ajax)' : null; $js .= $this->getAddDatasetCode($this->debugBar->getCurrentRequestId(), $this->debugBar->getData(), $suffix); + $nonce = $this->getNonceAttribute(); + if ($this->useRequireJs){ - return "\n"; + return "\n"; } else { - return "\n"; + return "\n"; } } @@ -1149,4 +1180,17 @@ protected function getAddDatasetCode($requestId, $data, $suffix = null) ); return $js; } + + /** + * If a nonce it set, create the correct attribute + * @return string + */ + protected function getNonceAttribute() + { + if ($nonce = $this->getCspNonce()) { + return ' nonce="' . $nonce .'"'; + } + + return ''; + } } diff --git a/vendor/maximebf/debugbar/src/DebugBar/OpenHandler.php b/vendor/maximebf/debugbar/src/DebugBar/OpenHandler.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/PhpHttpDriver.php b/vendor/maximebf/debugbar/src/DebugBar/PhpHttpDriver.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/RequestIdGenerator.php b/vendor/maximebf/debugbar/src/DebugBar/RequestIdGenerator.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/RequestIdGeneratorInterface.php b/vendor/maximebf/debugbar/src/DebugBar/RequestIdGeneratorInterface.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Resources/debugbar.css b/vendor/maximebf/debugbar/src/DebugBar/Resources/debugbar.css old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Resources/debugbar.js b/vendor/maximebf/debugbar/src/DebugBar/Resources/debugbar.js old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Resources/openhandler.css b/vendor/maximebf/debugbar/src/DebugBar/Resources/openhandler.css old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Resources/openhandler.js b/vendor/maximebf/debugbar/src/DebugBar/Resources/openhandler.js old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/css/font-awesome.min.css b/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/css/font-awesome.min.css old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/FontAwesome.otf b/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/FontAwesome.otf old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.eot b/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.eot old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.svg b/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.svg old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.ttf b/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.ttf old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.woff b/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.woff old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.woff2 b/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.woff2 old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/highlightjs/highlight.pack.js b/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/highlightjs/highlight.pack.js old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/highlightjs/styles/github.css b/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/highlightjs/styles/github.css old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/jquery/dist/jquery.min.js b/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/jquery/dist/jquery.min.js old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets.css b/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets.css old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets.js b/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets.js old mode 100755 new mode 100644 index b4a583dfc5..4fd69fae8c --- a/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets.js +++ b/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets.js @@ -216,11 +216,11 @@ if (typeof(PhpDebugBar) == 'undefined') { }); // ------------------------------------------------------------------ - + /** * An extension of KVListWidget where the data represents a list * of variables - * + * * Options: * - data */ @@ -468,7 +468,7 @@ if (typeof(PhpDebugBar) == 'undefined') { m.appendTo(li); this.$el.append(li); - + if (measure.params && !$.isEmptyObject(measure.params)) { var table = $('
Params
').addClass(csscls('params')).appendTo(li); for (var key in measure.params) { @@ -518,7 +518,7 @@ if (typeof(PhpDebugBar) == 'undefined') { }); // ------------------------------------------------------------------ - + /** * Widget for the displaying exceptions * @@ -550,20 +550,26 @@ if (typeof(PhpDebugBar) == 'undefined') { } if (e.surrounding_lines) { var pre = createCodeBlock(e.surrounding_lines.join(""), 'php').addClass(csscls('file')).appendTo(li); - li.click(function() { - if (pre.is(':visible')) { - pre.hide(); - } else { - pre.show(); - } - }); + if (!e.stack_trace_html) { + // This click event makes the var-dumper hard to use. + li.click(function () { + if (pre.is(':visible')) { + pre.hide(); + } else { + pre.show(); + } + }); + } } - if (e.stack_trace) { - e.stack_trace.split("\n").forEach(function(trace) { - var $traceLine = $('
'); - $('').addClass(csscls('filename')).text(trace).appendTo($traceLine); - $traceLine.appendTo(li); - }); + if (e.stack_trace_html) { + var $trace = $('').addClass(csscls('filename')).html(e.stack_trace_html); + $trace.appendTo(li); + } else if (e.stack_trace) { + e.stack_trace.split("\n").forEach(function (trace) { + var $traceLine = $('
'); + $('').addClass(csscls('filename')).text(trace).appendTo($traceLine); + $traceLine.appendTo(li); + }); } }}); this.$list.$el.appendTo(this.$el); @@ -578,6 +584,6 @@ if (typeof(PhpDebugBar) == 'undefined') { } }); - + })(PhpDebugBar.$); diff --git a/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets/mails/widget.css b/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets/mails/widget.css old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets/mails/widget.js b/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets/mails/widget.js old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets/sqlqueries/widget.css b/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets/sqlqueries/widget.css old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets/sqlqueries/widget.js b/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets/sqlqueries/widget.js old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets/templates/widget.css b/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets/templates/widget.css old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets/templates/widget.js b/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets/templates/widget.js old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/StandardDebugBar.php b/vendor/maximebf/debugbar/src/DebugBar/StandardDebugBar.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Storage/FileStorage.php b/vendor/maximebf/debugbar/src/DebugBar/Storage/FileStorage.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Storage/MemcachedStorage.php b/vendor/maximebf/debugbar/src/DebugBar/Storage/MemcachedStorage.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Storage/PdoStorage.php b/vendor/maximebf/debugbar/src/DebugBar/Storage/PdoStorage.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Storage/RedisStorage.php b/vendor/maximebf/debugbar/src/DebugBar/Storage/RedisStorage.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Storage/StorageInterface.php b/vendor/maximebf/debugbar/src/DebugBar/Storage/StorageInterface.php old mode 100755 new mode 100644 diff --git a/vendor/maximebf/debugbar/src/DebugBar/Storage/pdo_storage_schema.sql b/vendor/maximebf/debugbar/src/DebugBar/Storage/pdo_storage_schema.sql old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/.github/FUNDING.yml b/vendor/pear/archive_tar/.github/FUNDING.yml old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/.github/dependabot.yml b/vendor/pear/archive_tar/.github/dependabot.yml old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/.github/workflows/build.yml b/vendor/pear/archive_tar/.github/workflows/build.yml old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/.gitignore b/vendor/pear/archive_tar/.gitignore old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/.travis.yml b/vendor/pear/archive_tar/.travis.yml old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/Archive/Tar.php b/vendor/pear/archive_tar/Archive/Tar.php old mode 100755 new mode 100644 index a8c9501ccf..3356ad6ac1 --- a/vendor/pear/archive_tar/Archive/Tar.php +++ b/vendor/pear/archive_tar/Archive/Tar.php @@ -2124,25 +2124,40 @@ public function _extractList( } } } elseif ($v_header['typeflag'] == "2") { + if (!$p_symlinks) { + $this->_warning('Symbolic links are not allowed. ' + . 'Unable to extract {' + . $v_header['filename'] . '}' + ); + return false; + } + $absolute_link = FALSE; $link_depth = 0; - foreach (explode("/", $v_header['filename']) as $dir) { - if ($dir === "..") { - $link_depth--; - } elseif ($dir !== "" && $dir !== "." ) { - $link_depth++; - } + if (strpos($v_header['link'], "/") === 0 || strpos($v_header['link'], ':') !== FALSE) { + $absolute_link = TRUE; } - foreach (explode("/", $v_header['link']) as $dir){ - if ($link_depth <= 0) { - break; + else { + $s_filename = preg_replace('@^' . preg_quote($p_path) . '@', "", $v_header['filename']); + $s_linkname = str_replace('\\', '/', $v_header['link']); + foreach (explode("/", $s_filename) as $dir) { + if ($dir === "..") { + $link_depth--; + } elseif ($dir !== "" && $dir !== "." ) { + $link_depth++; + } } - if ($dir === "..") { - $link_depth--; - } elseif ($dir !== "" && $dir !== ".") { - $link_depth++; + foreach (explode("/", $s_linkname) as $dir){ + if ($link_depth <= 0) { + break; + } + if ($dir === "..") { + $link_depth--; + } elseif ($dir !== "" && $dir !== ".") { + $link_depth++; + } } } - if (strpos($v_header['link'], "/") === 0 or $link_depth <= 0) { + if ($absolute_link || $link_depth <= 0) { $this->_error( 'Out-of-path file extraction {' . $v_header['filename'] . ' --> ' . @@ -2150,13 +2165,6 @@ public function _extractList( ); return false; } - if (!$p_symlinks) { - $this->_warning('Symbolic links are not allowed. ' - . 'Unable to extract {' - . $v_header['filename'] . '}' - ); - return false; - } if (@file_exists($v_header['filename'])) { @unlink($v_header['filename']); } diff --git a/vendor/pear/archive_tar/README.md b/vendor/pear/archive_tar/README.md old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/composer.json b/vendor/pear/archive_tar/composer.json old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/docs/Archive_Tar.txt b/vendor/pear/archive_tar/docs/Archive_Tar.txt old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/package.xml b/vendor/pear/archive_tar/package.xml old mode 100755 new mode 100644 index 8da0d40c9a..d4f20bd4b0 --- a/vendor/pear/archive_tar/package.xml +++ b/vendor/pear/archive_tar/package.xml @@ -32,10 +32,10 @@ Also Lzma2 compressed archives are supported with xz extension. stig@php.net no - 2021-02-16 - + 2021-07-20 + - 1.4.13 + 1.4.14 1.4.0 @@ -44,7 +44,7 @@ Also Lzma2 compressed archives are supported with xz extension. New BSD License -* Fix Bug #27010: Relative symlinks failing (out-of path file extraction) [mrook] +* Properly fix symbolic link path traversal (CVE-2021-32610) @@ -74,6 +74,21 @@ Also Lzma2 compressed archives are supported with xz extension. + + + 1.4.13 + 1.4.0 + + + stable + stable + + 2021-02-16 + New BSD License + + * Fix Bug #27010: Relative symlinks failing (out-of path file extraction) [mrook] + + 1.4.12 diff --git a/vendor/pear/archive_tar/tests/512nbytesfile.phpt b/vendor/pear/archive_tar/tests/512nbytesfile.phpt old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/tests/deadlinks.phpt b/vendor/pear/archive_tar/tests/deadlinks.phpt old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/tests/dirtraversal.phpt b/vendor/pear/archive_tar/tests/dirtraversal.phpt old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/tests/hamidTARtester2.tar b/vendor/pear/archive_tar/tests/hamidTARtester2.tar old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/tests/invalidblock.phpt b/vendor/pear/archive_tar/tests/invalidblock.phpt old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/tests/invalidchecksum.phpt b/vendor/pear/archive_tar/tests/invalidchecksum.phpt old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/tests/longfilename.phpt b/vendor/pear/archive_tar/tests/longfilename.phpt old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/tests/longsymlinks.phpt b/vendor/pear/archive_tar/tests/longsymlinks.phpt old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/tests/out_of_path_fnames.phpt b/vendor/pear/archive_tar/tests/out_of_path_fnames.phpt old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/tests/out_of_path_symlink.tar b/vendor/pear/archive_tar/tests/out_of_path_symlink.tar old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/tests/pax.phpt b/vendor/pear/archive_tar/tests/pax.phpt old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/tests/permissions.phpt b/vendor/pear/archive_tar/tests/permissions.phpt old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/tests/phpt_test.php.inc b/vendor/pear/archive_tar/tests/phpt_test.php.inc old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/tests/relativesymlink.phpt b/vendor/pear/archive_tar/tests/relativesymlink.phpt old mode 100755 new mode 100644 index 68cd4b3e2a..9500b52859 --- a/vendor/pear/archive_tar/tests/relativesymlink.phpt +++ b/vendor/pear/archive_tar/tests/relativesymlink.phpt @@ -16,8 +16,10 @@ echo 'tests done'; ?> --CLEAN-- --EXPECT-- diff --git a/vendor/pear/archive_tar/tests/relativesymlink.tar b/vendor/pear/archive_tar/tests/relativesymlink.tar old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/tests/setup.php.inc b/vendor/pear/archive_tar/tests/setup.php.inc old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/tests/symlink.phpt b/vendor/pear/archive_tar/tests/symlink.phpt old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/tests/symlink_disallow.phpt b/vendor/pear/archive_tar/tests/symlink_disallow.phpt old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/tests/testblock1/a.txt b/vendor/pear/archive_tar/tests/testblock1/a.txt old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/tests/testblock1/bugTriggeringPng.png b/vendor/pear/archive_tar/tests/testblock1/bugTriggeringPng.png old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/tests/testblock2/.gitignore b/vendor/pear/archive_tar/tests/testblock2/.gitignore old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/tests/testblock3/1024bytes.txt b/vendor/pear/archive_tar/tests/testblock3/1024bytes.txt old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/tests/testblock3/randombytes.txt b/vendor/pear/archive_tar/tests/testblock3/randombytes.txt old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/tests/testpax.tar b/vendor/pear/archive_tar/tests/testpax.tar old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/tests/testperms.tar b/vendor/pear/archive_tar/tests/testperms.tar old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/tests/testsymlink.tar b/vendor/pear/archive_tar/tests/testsymlink.tar old mode 100755 new mode 100644 diff --git a/vendor/pear/archive_tar/tests/text-0.txt b/vendor/pear/archive_tar/tests/text-0.txt old mode 100755 new mode 100644 diff --git a/vendor/pear/pear-core-minimal/README.rst b/vendor/pear/pear-core-minimal/README.rst old mode 100755 new mode 100644 diff --git a/vendor/pear/pear-core-minimal/composer.json b/vendor/pear/pear-core-minimal/composer.json old mode 100755 new mode 100644 diff --git a/vendor/pear/pear-core-minimal/src/OS/Guess.php b/vendor/pear/pear-core-minimal/src/OS/Guess.php old mode 100755 new mode 100644 index d5aa295c3b..88cd659102 --- a/vendor/pear/pear-core-minimal/src/OS/Guess.php +++ b/vendor/pear/pear-core-minimal/src/OS/Guess.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * @category pear - * @package PEAR - * @author Stig Bakken - * @author Gregory Beaver - * @copyright 1997-2009 The Authors - * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @link http://pear.php.net/package/PEAR - * @since File available since PEAR 0.1 + * @category pear + * @package PEAR + * @author Stig Bakken + * @author Gregory Beaver + * @copyright 1997-2009 The Authors + * @license http://opensource.org/licenses/bsd-license.php New BSD License + * @link http://pear.php.net/package/PEAR + * @since File available since PEAR 0.1 */ // {{{ uname examples @@ -80,15 +80,15 @@ * * This class uses php_uname() to grok information about the current OS * - * @category pear - * @package PEAR - * @author Stig Bakken - * @author Gregory Beaver - * @copyright 1997-2009 The Authors - * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @version Release: @package_version@ - * @link http://pear.php.net/package/PEAR - * @since Class available since Release 0.1 + * @category pear + * @package PEAR + * @author Stig Bakken + * @author Gregory Beaver + * @copyright 1997-2020 The Authors + * @license http://opensource.org/licenses/bsd-license.php New BSD License + * @version Release: @package_version@ + * @link http://pear.php.net/package/PEAR + * @since Class available since Release 0.1 */ class OS_Guess { @@ -138,13 +138,9 @@ function parseSignature($uname = null) $release = "$parts[3].$parts[2]"; break; case 'Windows' : - switch ($parts[1]) { - case '95/98': - $release = '9x'; - break; - default: - $release = $parts[1]; - break; + $release = $parts[1]; + if ($release == '95/98') { + $release = '9x'; } $cpu = 'i386'; break; @@ -157,18 +153,10 @@ function parseSignature($uname = null) $sysname = 'darwin'; $nodename = $parts[2]; $release = $parts[3]; - if ($cpu == 'Macintosh') { - if ($parts[$n - 2] == 'Power') { - $cpu = 'powerpc'; - } - } + $cpu = $this->_determineIfPowerpc($cpu, $parts); break; case 'Darwin' : - if ($cpu == 'Macintosh') { - if ($parts[$n - 2] == 'Power') { - $cpu = 'powerpc'; - } - } + $cpu = $this->_determineIfPowerpc($cpu, $parts); $release = preg_replace('/^([0-9]+\.[0-9]+).*/', '\1', $parts[2]); break; default: @@ -187,6 +175,15 @@ function parseSignature($uname = null) return array($sysname, $release, $cpu, $extra, $nodename); } + function _determineIfPowerpc($cpu, $parts) + { + $n = count($parts); + if ($cpu == 'Macintosh' && $parts[$n - 2] == 'Power') { + $cpu = 'powerpc'; + } + return $cpu; + } + function _detectGlibcVersion() { static $glibc = false; @@ -196,80 +193,131 @@ function _detectGlibcVersion() $major = $minor = 0; include_once "System.php"; - if (@is_link('/lib64/libc.so.6')) { - // Let's try reading the libc.so.6 symlink - if (preg_match('/^libc-(.*)\.so$/', basename(readlink('/lib64/libc.so.6')), $matches)) { - list($major, $minor) = explode('.', $matches[1]); - } - } else if (@is_link('/lib/libc.so.6')) { - // Let's try reading the libc.so.6 symlink - if (preg_match('/^libc-(.*)\.so$/', basename(readlink('/lib/libc.so.6')), $matches)) { - list($major, $minor) = explode('.', $matches[1]); + // Let's try reading possible libc.so.6 symlinks + $libcs = array( + '/lib64/libc.so.6', + '/lib/libc.so.6', + '/lib/i386-linux-gnu/libc.so.6' + ); + $versions = array(); + foreach ($libcs as $file) { + $versions = $this->_readGlibCVersionFromSymlink($file); + if ($versions != []) { + list($major, $minor) = $versions; + break; } } + // Use glibc's header file to // get major and minor version number: - if (!($major && $minor) && - @file_exists('/usr/include/features.h') && - @is_readable('/usr/include/features.h')) { - if (!@file_exists('/usr/bin/cpp') || !@is_executable('/usr/bin/cpp')) { - $features_file = fopen('/usr/include/features.h', 'rb'); - while (!feof($features_file)) { - $line = fgets($features_file, 8192); - if (!$line || (strpos($line, '#define') === false)) { - continue; - } - if (strpos($line, '__GLIBC__')) { - // major version number #define __GLIBC__ version - $line = preg_split('/\s+/', $line); - $glibc_major = trim($line[2]); - if (isset($glibc_minor)) { - break; - } - continue; - } - - if (strpos($line, '__GLIBC_MINOR__')) { - // got the minor version number - // #define __GLIBC_MINOR__ version - $line = preg_split('/\s+/', $line); - $glibc_minor = trim($line[2]); - if (isset($glibc_major)) { - break; - } - continue; - } - } - fclose($features_file); - if (!isset($glibc_major) || !isset($glibc_minor)) { - return $glibc = ''; - } - return $glibc = 'glibc' . trim($glibc_major) . "." . trim($glibc_minor) ; - } // no cpp - - $tmpfile = System::mktemp("glibctest"); - $fp = fopen($tmpfile, "w"); - fwrite($fp, "#include \n__GLIBC__ __GLIBC_MINOR__\n"); - fclose($fp); - $cpp = popen("/usr/bin/cpp $tmpfile", "r"); - while ($line = fgets($cpp, 1024)) { - if ($line[0] == '#' || trim($line) == '') { - continue; + if (!($major && $minor)) { + $versions = $this->_readGlibCVersionFromFeaturesHeaderFile(); + } + if (is_array($versions) && $versions != []) { + list($major, $minor) = $versions; + } + + if (!($major && $minor)) { + return $glibc = ''; + } + + return $glibc = "glibc{$major}.{$minor}"; + } + + function _readGlibCVersionFromSymlink($file) + { + $versions = array(); + if (@is_link($file) + && (preg_match('/^libc-(.*)\.so$/', basename(readlink($file)), $matches)) + ) { + $versions = explode('.', $matches[1]); + } + return $versions; + } + + + function _readGlibCVersionFromFeaturesHeaderFile() + { + $features_header_file = '/usr/include/features.h'; + if (!(@file_exists($features_header_file) + && @is_readable($features_header_file)) + ) { + return array(); + } + if (!@file_exists('/usr/bin/cpp') || !@is_executable('/usr/bin/cpp')) { + return $this-_parseFeaturesHeaderFile($features_header_file); + } // no cpp + + return $this->_fromGlibCTest(); + } + + function _parseFeaturesHeaderFile($features_header_file) + { + $features_file = fopen($features_header_file, 'rb'); + while (!feof($features_file)) { + $line = fgets($features_file, 8192); + if (!$this->_IsADefinition($line)) { + continue; + } + if (strpos($line, '__GLIBC__')) { + // major version number #define __GLIBC__ version + $line = preg_split('/\s+/', $line); + $glibc_major = trim($line[2]); + if (isset($glibc_minor)) { + break; } + continue; + } - if (list($major, $minor) = explode(' ', trim($line))) { + if (strpos($line, '__GLIBC_MINOR__')) { + // got the minor version number + // #define __GLIBC_MINOR__ version + $line = preg_split('/\s+/', $line); + $glibc_minor = trim($line[2]); + if (isset($glibc_major)) { break; } } - pclose($cpp); - unlink($tmpfile); - } // features.h + } + fclose($features_file); + if (!isset($glibc_major) || !isset($glibc_minor)) { + return array(); + } + return array(trim($glibc_major), trim($glibc_minor)); + } - if (!($major && $minor)) { - return $glibc = ''; + function _IsADefinition($line) + { + if ($line === false) { + return false; } + return strpos(trim($line), '#define') !== false; + } - return $glibc = "glibc{$major}.{$minor}"; + function _fromGlibCTest() + { + $major = null; + $minor = null; + + $tmpfile = System::mktemp("glibctest"); + $fp = fopen($tmpfile, "w"); + fwrite($fp, "#include \n__GLIBC__ __GLIBC_MINOR__\n"); + fclose($fp); + $cpp = popen("/usr/bin/cpp $tmpfile", "r"); + while ($line = fgets($cpp, 1024)) { + if ($line[0] == '#' || trim($line) == '') { + continue; + } + + if (list($major, $minor) = explode(' ', trim($line))) { + break; + } + } + pclose($cpp); + unlink($tmpfile); + if ($major !== null && $minor !== null) { + return [$major, $minor]; + } } function getSignature() @@ -328,12 +376,16 @@ function matchSignature($match) function _matchFragment($fragment, $value) { if (strcspn($fragment, '*?') < strlen($fragment)) { - $reg = '/^' . str_replace(array('*', '?', '/'), array('.*', '.', '\\/'), $fragment) . '\\z/'; + $expression = str_replace( + array('*', '?', '/'), + array('.*', '.', '\\/'), + $fragment + ); + $reg = '/^' . $expression . '\\z/'; return preg_match($reg, $value); } return ($fragment == '*' || !strcasecmp($fragment, $value)); } - } /* * Local Variables: diff --git a/vendor/pear/pear-core-minimal/src/PEAR.php b/vendor/pear/pear-core-minimal/src/PEAR.php old mode 100755 new mode 100644 diff --git a/vendor/pear/pear-core-minimal/src/PEAR/Error.php b/vendor/pear/pear-core-minimal/src/PEAR/Error.php old mode 100755 new mode 100644 diff --git a/vendor/pear/pear-core-minimal/src/PEAR/ErrorStack.php b/vendor/pear/pear-core-minimal/src/PEAR/ErrorStack.php old mode 100755 new mode 100644 diff --git a/vendor/pear/pear-core-minimal/src/System.php b/vendor/pear/pear-core-minimal/src/System.php old mode 100755 new mode 100644 index cf8f379935..a7ef465984 --- a/vendor/pear/pear-core-minimal/src/System.php +++ b/vendor/pear/pear-core-minimal/src/System.php @@ -530,7 +530,9 @@ public static function which($program, $fallback = false) // It's possible to run a .bat on Windows that is_executable // would return false for. The is_executable check is meaningless... if (OS_WINDOWS) { - return $file; + if (file_exists($file)) { + return $file; + } } else { if (is_executable($file)) { return $file; diff --git a/vendor/php-http/message/CHANGELOG.md b/vendor/php-http/message/CHANGELOG.md old mode 100755 new mode 100644 index 2c580bde78..d3eb840bc5 --- a/vendor/php-http/message/CHANGELOG.md +++ b/vendor/php-http/message/CHANGELOG.md @@ -6,6 +6,14 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [1.12.0] - 2021-08-29 + +- Added support for adjusting binary detection regex in FullHttpMessageFormatter + +## [1.11.2] - 2021-08-03 + +- Support GuzzleHttp/Psr7 version 2.0 in the (deprecated) GuzzleStreamFactory. + ## [1.11.1] - 2021-05-24 - Support GuzzleHttp/Psr7 version 2.0 in the (deprecated) GuzzleUriFactory. diff --git a/vendor/php-http/message/LICENSE b/vendor/php-http/message/LICENSE old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/README.md b/vendor/php-http/message/README.md old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/apigen.neon b/vendor/php-http/message/apigen.neon old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/composer.json b/vendor/php-http/message/composer.json old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/puli.json b/vendor/php-http/message/puli.json old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Authentication.php b/vendor/php-http/message/src/Authentication.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Authentication/AutoBasicAuth.php b/vendor/php-http/message/src/Authentication/AutoBasicAuth.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Authentication/BasicAuth.php b/vendor/php-http/message/src/Authentication/BasicAuth.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Authentication/Bearer.php b/vendor/php-http/message/src/Authentication/Bearer.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Authentication/Chain.php b/vendor/php-http/message/src/Authentication/Chain.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Authentication/Header.php b/vendor/php-http/message/src/Authentication/Header.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Authentication/Matching.php b/vendor/php-http/message/src/Authentication/Matching.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Authentication/QueryParam.php b/vendor/php-http/message/src/Authentication/QueryParam.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Authentication/RequestConditional.php b/vendor/php-http/message/src/Authentication/RequestConditional.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Authentication/Wsse.php b/vendor/php-http/message/src/Authentication/Wsse.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Builder/ResponseBuilder.php b/vendor/php-http/message/src/Builder/ResponseBuilder.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Cookie.php b/vendor/php-http/message/src/Cookie.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/CookieJar.php b/vendor/php-http/message/src/CookieJar.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/CookieUtil.php b/vendor/php-http/message/src/CookieUtil.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Decorator/MessageDecorator.php b/vendor/php-http/message/src/Decorator/MessageDecorator.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Decorator/RequestDecorator.php b/vendor/php-http/message/src/Decorator/RequestDecorator.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Decorator/ResponseDecorator.php b/vendor/php-http/message/src/Decorator/ResponseDecorator.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Decorator/StreamDecorator.php b/vendor/php-http/message/src/Decorator/StreamDecorator.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Encoding/ChunkStream.php b/vendor/php-http/message/src/Encoding/ChunkStream.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Encoding/CompressStream.php b/vendor/php-http/message/src/Encoding/CompressStream.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Encoding/DechunkStream.php b/vendor/php-http/message/src/Encoding/DechunkStream.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Encoding/DecompressStream.php b/vendor/php-http/message/src/Encoding/DecompressStream.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Encoding/DeflateStream.php b/vendor/php-http/message/src/Encoding/DeflateStream.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Encoding/Filter/Chunk.php b/vendor/php-http/message/src/Encoding/Filter/Chunk.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Encoding/FilteredStream.php b/vendor/php-http/message/src/Encoding/FilteredStream.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Encoding/GzipDecodeStream.php b/vendor/php-http/message/src/Encoding/GzipDecodeStream.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Encoding/GzipEncodeStream.php b/vendor/php-http/message/src/Encoding/GzipEncodeStream.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Encoding/InflateStream.php b/vendor/php-http/message/src/Encoding/InflateStream.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Exception.php b/vendor/php-http/message/src/Exception.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Exception/UnexpectedValueException.php b/vendor/php-http/message/src/Exception/UnexpectedValueException.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Formatter.php b/vendor/php-http/message/src/Formatter.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Formatter/CurlCommandFormatter.php b/vendor/php-http/message/src/Formatter/CurlCommandFormatter.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Formatter/FullHttpMessageFormatter.php b/vendor/php-http/message/src/Formatter/FullHttpMessageFormatter.php old mode 100755 new mode 100644 index 64ce3ce8fd..bb22efe2e3 --- a/vendor/php-http/message/src/Formatter/FullHttpMessageFormatter.php +++ b/vendor/php-http/message/src/Formatter/FullHttpMessageFormatter.php @@ -21,12 +21,19 @@ class FullHttpMessageFormatter implements Formatter */ private $maxBodyLength; + /** + * @var string + */ + private $binaryDetectionRegex; + /** * @param int|null $maxBodyLength + * @param string $binaryDetectionRegex By default, this is all non-printable ASCII characters and except for \t, \r, \n */ - public function __construct($maxBodyLength = 1000) + public function __construct($maxBodyLength = 1000, string $binaryDetectionRegex = '/([\x00-\x09\x0C\x0E-\x1F\x7F])/') { $this->maxBodyLength = $maxBodyLength; + $this->binaryDetectionRegex = $binaryDetectionRegex; } /** @@ -86,8 +93,7 @@ private function addBody(MessageInterface $request, $message) $data = $stream->__toString(); $stream->rewind(); - // all non-printable ASCII characters and except for \t, \r, \n - if (preg_match('/([\x00-\x09\x0C\x0E-\x1F\x7F])/', $data)) { + if (preg_match($this->binaryDetectionRegex, $data)) { return $message.'[binary stream omitted]'; } diff --git a/vendor/php-http/message/src/Formatter/SimpleFormatter.php b/vendor/php-http/message/src/Formatter/SimpleFormatter.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/MessageFactory/DiactorosMessageFactory.php b/vendor/php-http/message/src/MessageFactory/DiactorosMessageFactory.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/MessageFactory/GuzzleMessageFactory.php b/vendor/php-http/message/src/MessageFactory/GuzzleMessageFactory.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/MessageFactory/SlimMessageFactory.php b/vendor/php-http/message/src/MessageFactory/SlimMessageFactory.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/RequestMatcher.php b/vendor/php-http/message/src/RequestMatcher.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/RequestMatcher/CallbackRequestMatcher.php b/vendor/php-http/message/src/RequestMatcher/CallbackRequestMatcher.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/RequestMatcher/RegexRequestMatcher.php b/vendor/php-http/message/src/RequestMatcher/RegexRequestMatcher.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/RequestMatcher/RequestMatcher.php b/vendor/php-http/message/src/RequestMatcher/RequestMatcher.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/Stream/BufferedStream.php b/vendor/php-http/message/src/Stream/BufferedStream.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/StreamFactory/DiactorosStreamFactory.php b/vendor/php-http/message/src/StreamFactory/DiactorosStreamFactory.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/StreamFactory/GuzzleStreamFactory.php b/vendor/php-http/message/src/StreamFactory/GuzzleStreamFactory.php old mode 100755 new mode 100644 index 9adeeb5ec3..14d83e9436 --- a/vendor/php-http/message/src/StreamFactory/GuzzleStreamFactory.php +++ b/vendor/php-http/message/src/StreamFactory/GuzzleStreamFactory.php @@ -2,6 +2,7 @@ namespace Http\Message\StreamFactory; +use GuzzleHttp\Psr7\Utils; use Http\Message\StreamFactory; /** @@ -18,6 +19,10 @@ final class GuzzleStreamFactory implements StreamFactory */ public function createStream($body = null) { + if (class_exists(Utils::class)) { + return Utils::streamFor($body); + } + return \GuzzleHttp\Psr7\stream_for($body); } } diff --git a/vendor/php-http/message/src/StreamFactory/SlimStreamFactory.php b/vendor/php-http/message/src/StreamFactory/SlimStreamFactory.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/UriFactory/DiactorosUriFactory.php b/vendor/php-http/message/src/UriFactory/DiactorosUriFactory.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/UriFactory/GuzzleUriFactory.php b/vendor/php-http/message/src/UriFactory/GuzzleUriFactory.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/UriFactory/SlimUriFactory.php b/vendor/php-http/message/src/UriFactory/SlimUriFactory.php old mode 100755 new mode 100644 diff --git a/vendor/php-http/message/src/filters.php b/vendor/php-http/message/src/filters.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/options-resolver/CHANGELOG.md b/vendor/symfony/options-resolver/CHANGELOG.md old mode 100755 new mode 100644 diff --git a/vendor/symfony/options-resolver/Debug/OptionsResolverIntrospector.php b/vendor/symfony/options-resolver/Debug/OptionsResolverIntrospector.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/options-resolver/Exception/AccessException.php b/vendor/symfony/options-resolver/Exception/AccessException.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/options-resolver/Exception/ExceptionInterface.php b/vendor/symfony/options-resolver/Exception/ExceptionInterface.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/options-resolver/Exception/InvalidArgumentException.php b/vendor/symfony/options-resolver/Exception/InvalidArgumentException.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/options-resolver/Exception/InvalidOptionsException.php b/vendor/symfony/options-resolver/Exception/InvalidOptionsException.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/options-resolver/Exception/MissingOptionsException.php b/vendor/symfony/options-resolver/Exception/MissingOptionsException.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/options-resolver/Exception/NoConfigurationException.php b/vendor/symfony/options-resolver/Exception/NoConfigurationException.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/options-resolver/Exception/NoSuchOptionException.php b/vendor/symfony/options-resolver/Exception/NoSuchOptionException.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/options-resolver/Exception/OptionDefinitionException.php b/vendor/symfony/options-resolver/Exception/OptionDefinitionException.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/options-resolver/Exception/UndefinedOptionsException.php b/vendor/symfony/options-resolver/Exception/UndefinedOptionsException.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/options-resolver/LICENSE b/vendor/symfony/options-resolver/LICENSE old mode 100755 new mode 100644 diff --git a/vendor/symfony/options-resolver/OptionConfigurator.php b/vendor/symfony/options-resolver/OptionConfigurator.php old mode 100755 new mode 100644 index 47f5bea557..62f03d064a --- a/vendor/symfony/options-resolver/OptionConfigurator.php +++ b/vendor/symfony/options-resolver/OptionConfigurator.php @@ -28,8 +28,6 @@ public function __construct(string $name, OptionsResolver $resolver) /** * Adds allowed types for this option. * - * @param string ...$types One or more accepted types - * * @return $this * * @throws AccessException If called from a lazy option or normalizer @@ -100,8 +98,6 @@ public function deprecated(string $package, string $version, $message = 'The opt /** * Sets the normalizer for this option. * - * @param \Closure $normalizer The normalizer - * * @return $this * * @throws AccessException If called from a lazy option or normalizer diff --git a/vendor/symfony/options-resolver/Options.php b/vendor/symfony/options-resolver/Options.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/options-resolver/OptionsResolver.php b/vendor/symfony/options-resolver/OptionsResolver.php old mode 100755 new mode 100644 index a8ae153f46..bb95548260 --- a/vendor/symfony/options-resolver/OptionsResolver.php +++ b/vendor/symfony/options-resolver/OptionsResolver.php @@ -261,10 +261,6 @@ public function setDefault(string $option, $value) } /** - * Sets a list of default values. - * - * @param array $defaults The default values to set - * * @return $this * * @throws AccessException If called from a lazy option or normalizer @@ -284,8 +280,6 @@ public function setDefaults(array $defaults) * Returns true if {@link setDefault()} was called for this option. * An option is also considered set if it was set to null. * - * @param string $option The option name - * * @return bool Whether a default value is set */ public function hasDefault(string $option) @@ -321,8 +315,6 @@ public function setRequired($optionNames) * * An option is required if it was passed to {@link setRequired()}. * - * @param string $option The name of the option - * * @return bool Whether the option is required */ public function isRequired(string $option) @@ -349,8 +341,6 @@ public function getRequiredOptions() * to {@link setDefault()}. This option must be passed explicitly to * {@link resolve()}, otherwise an exception will be thrown. * - * @param string $option The name of the option - * * @return bool Whether the option is missing */ public function isMissing(string $option) @@ -402,8 +392,6 @@ public function setDefined($optionNames) * Returns true for any option passed to {@link setDefault()}, * {@link setRequired()} or {@link setDefined()}. * - * @param string $option The option name - * * @return bool Whether the option is defined */ public function isDefined(string $option) @@ -516,9 +504,6 @@ public function isDeprecated(string $option): bool * * The resolved option value is set to the return value of the closure. * - * @param string $option The option name - * @param \Closure $normalizer The normalizer - * * @return $this * * @throws UndefinedOptionsException If the option is undefined @@ -560,10 +545,6 @@ public function setNormalizer(string $option, \Closure $normalizer) * * The resolved option value is set to the return value of the closure. * - * @param string $option The option name - * @param \Closure $normalizer The normalizer - * @param bool $forcePrepend If set to true, prepend instead of appending - * * @return $this * * @throws UndefinedOptionsException If the option is undefined @@ -687,7 +668,6 @@ public function addAllowedValues(string $option, $allowedValues) * acceptable. Additionally, fully-qualified class or interface names may * be passed. * - * @param string $option The option name * @param string|string[] $allowedTypes One or more accepted types * * @return $this @@ -722,7 +702,6 @@ public function setAllowedTypes(string $option, $allowedTypes) * acceptable. Additionally, fully-qualified class or interface names may * be passed. * - * @param string $option The option name * @param string|string[] $allowedTypes One or more accepted types * * @return $this @@ -890,8 +869,6 @@ public function clear() * - Options have invalid types; * - Options have invalid values. * - * @param array $options A map of option names to values - * * @return array The merged and validated options * * @throws UndefinedOptionsException If an option name is undefined @@ -953,8 +930,7 @@ public function resolve(array $options = []) /** * Returns the resolved value of an option. * - * @param string $option The option name - * @param bool $triggerDeprecation Whether to trigger the deprecation or not (true by default) + * @param bool $triggerDeprecation Whether to trigger the deprecation or not (true by default) * * @return mixed The option value * @@ -966,6 +942,7 @@ public function resolve(array $options = []) * @throws OptionDefinitionException If there is a cyclic dependency between * lazy options and/or normalizers */ + #[\ReturnTypeWillChange] public function offsetGet($option, bool $triggerDeprecation = true) { if (!$this->locked) { @@ -1073,7 +1050,7 @@ public function offsetGet($option, bool $triggerDeprecation = true) $fmtAllowedTypes = implode('" or "', $this->allowedTypes[$option]); $fmtProvidedTypes = implode('|', array_keys($invalidTypes)); $allowedContainsArrayType = \count(array_filter($this->allowedTypes[$option], static function ($item) { - return '[]' === substr($item, -2); + return str_ends_with($item, '[]'); })) > 0; if (\is_array($value) && $allowedContainsArrayType) { @@ -1223,6 +1200,7 @@ private function verifyTypes(string $type, $value, array &$invalidTypes, int $le * * @see \ArrayAccess::offsetExists() */ + #[\ReturnTypeWillChange] public function offsetExists($option) { if (!$this->locked) { @@ -1235,8 +1213,11 @@ public function offsetExists($option) /** * Not supported. * + * @return void + * * @throws AccessException */ + #[\ReturnTypeWillChange] public function offsetSet($option, $value) { throw new AccessException('Setting options via array access is not supported. Use setDefault() instead.'); @@ -1245,8 +1226,11 @@ public function offsetSet($option, $value) /** * Not supported. * + * @return void + * * @throws AccessException */ + #[\ReturnTypeWillChange] public function offsetUnset($option) { throw new AccessException('Removing options via array access is not supported. Use remove() instead.'); @@ -1263,6 +1247,7 @@ public function offsetUnset($option) * * @see \Countable::count() */ + #[\ReturnTypeWillChange] public function count() { if (!$this->locked) { diff --git a/vendor/symfony/options-resolver/README.md b/vendor/symfony/options-resolver/README.md old mode 100755 new mode 100644 diff --git a/vendor/symfony/options-resolver/composer.json b/vendor/symfony/options-resolver/composer.json old mode 100755 new mode 100644 index 7679819682..6e65a79e93 --- a/vendor/symfony/options-resolver/composer.json +++ b/vendor/symfony/options-resolver/composer.json @@ -19,7 +19,7 @@ "php": ">=7.2.5", "symfony/deprecation-contracts": "^2.1", "symfony/polyfill-php73": "~1.0", - "symfony/polyfill-php80": "^1.15" + "symfony/polyfill-php80": "^1.16" }, "autoload": { "psr-4": { "Symfony\\Component\\OptionsResolver\\": "" }, diff --git a/vendor/symfony/polyfill-mbstring/LICENSE b/vendor/symfony/polyfill-mbstring/LICENSE old mode 100755 new mode 100644 diff --git a/vendor/symfony/polyfill-mbstring/Mbstring.php b/vendor/symfony/polyfill-mbstring/Mbstring.php old mode 100755 new mode 100644 index c31611fb83..b59909563f --- a/vendor/symfony/polyfill-mbstring/Mbstring.php +++ b/vendor/symfony/polyfill-mbstring/Mbstring.php @@ -69,14 +69,15 @@ final class Mbstring { public const MB_CASE_FOLD = \PHP_INT_MAX; - private static $encodingList = ['ASCII', 'UTF-8']; - private static $language = 'neutral'; - private static $internalEncoding = 'UTF-8'; - private static $caseFold = [ + private const 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) || false !== strpos($fromEncoding, ',')) { @@ -300,7 +301,7 @@ public static function mb_convert_case($s, $mode, $encoding = null) $map = $upper; } else { if (self::MB_CASE_FOLD === $mode) { - $s = str_replace(self::$caseFold[0], self::$caseFold[1], $s); + $s = str_replace(self::CASE_FOLD[0], self::CASE_FOLD[1], $s); } static $lower = null; diff --git a/vendor/symfony/polyfill-mbstring/README.md b/vendor/symfony/polyfill-mbstring/README.md old mode 100755 new mode 100644 diff --git a/vendor/symfony/polyfill-mbstring/Resources/unidata/lowerCase.php b/vendor/symfony/polyfill-mbstring/Resources/unidata/lowerCase.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/polyfill-mbstring/Resources/unidata/titleCaseRegexp.php b/vendor/symfony/polyfill-mbstring/Resources/unidata/titleCaseRegexp.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.php b/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/polyfill-mbstring/bootstrap.php b/vendor/symfony/polyfill-mbstring/bootstrap.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/polyfill-mbstring/bootstrap80.php b/vendor/symfony/polyfill-mbstring/bootstrap80.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/polyfill-mbstring/composer.json b/vendor/symfony/polyfill-mbstring/composer.json old mode 100755 new mode 100644 diff --git a/vendor/symfony/polyfill-php80/LICENSE b/vendor/symfony/polyfill-php80/LICENSE old mode 100755 new mode 100644 diff --git a/vendor/symfony/polyfill-php80/Php80.php b/vendor/symfony/polyfill-php80/Php80.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/polyfill-php80/README.md b/vendor/symfony/polyfill-php80/README.md old mode 100755 new mode 100644 index eaa3050abc..10b8ee49a8 --- a/vendor/symfony/polyfill-php80/README.md +++ b/vendor/symfony/polyfill-php80/README.md @@ -16,7 +16,7 @@ This component provides features added to PHP 8.0 core: - [`get_resource_id`](https://php.net/get_resource_id) More information can be found in the -[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md). +[main Polyfill README](https://github.com/symfony/polyfill/blob/main/README.md). License ======= diff --git a/vendor/symfony/polyfill-php80/Resources/stubs/Attribute.php b/vendor/symfony/polyfill-php80/Resources/stubs/Attribute.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/polyfill-php80/Resources/stubs/Stringable.php b/vendor/symfony/polyfill-php80/Resources/stubs/Stringable.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php b/vendor/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/polyfill-php80/Resources/stubs/ValueError.php b/vendor/symfony/polyfill-php80/Resources/stubs/ValueError.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/polyfill-php80/bootstrap.php b/vendor/symfony/polyfill-php80/bootstrap.php old mode 100755 new mode 100644 index 4f791f9e3f..e5f7dbc1a4 --- a/vendor/symfony/polyfill-php80/bootstrap.php +++ b/vendor/symfony/polyfill-php80/bootstrap.php @@ -26,13 +26,13 @@ function fdiv(float $num1, float $num2): float { return p\Php80::fdiv($num1, $nu function preg_last_error_msg(): string { return p\Php80::preg_last_error_msg(); } } if (!function_exists('str_contains')) { - function str_contains(string $haystack, string $needle): bool { return p\Php80::str_contains($haystack, $needle); } + function str_contains(?string $haystack, ?string $needle): bool { return p\Php80::str_contains($haystack ?? '', $needle ?? ''); } } if (!function_exists('str_starts_with')) { - function str_starts_with(string $haystack, string $needle): bool { return p\Php80::str_starts_with($haystack, $needle); } + function str_starts_with(?string $haystack, ?string $needle): bool { return p\Php80::str_starts_with($haystack ?? '', $needle ?? ''); } } if (!function_exists('str_ends_with')) { - function str_ends_with(string $haystack, string $needle): bool { return p\Php80::str_ends_with($haystack, $needle); } + function str_ends_with(?string $haystack, ?string $needle): bool { return p\Php80::str_ends_with($haystack ?? '', $needle ?? ''); } } if (!function_exists('get_debug_type')) { function get_debug_type($value): string { return p\Php80::get_debug_type($value); } diff --git a/vendor/symfony/polyfill-php80/composer.json b/vendor/symfony/polyfill-php80/composer.json old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/CHANGELOG.md b/vendor/symfony/var-dumper/CHANGELOG.md old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Caster/AmqpCaster.php b/vendor/symfony/var-dumper/Caster/AmqpCaster.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Caster/ArgsStub.php b/vendor/symfony/var-dumper/Caster/ArgsStub.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Caster/Caster.php b/vendor/symfony/var-dumper/Caster/Caster.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Caster/ClassStub.php b/vendor/symfony/var-dumper/Caster/ClassStub.php old mode 100755 new mode 100644 index 612a7ca2d9..48f848354b --- a/vendor/symfony/var-dumper/Caster/ClassStub.php +++ b/vendor/symfony/var-dumper/Caster/ClassStub.php @@ -55,7 +55,7 @@ public function __construct(string $identifier, $callable = null) } } - if (false !== strpos($identifier, "@anonymous\0")) { + if (str_contains($identifier, "@anonymous\0")) { $this->value = $identifier = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', function ($m) { return class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0]; }, $identifier); @@ -65,7 +65,7 @@ public function __construct(string $identifier, $callable = null) $s = ReflectionCaster::castFunctionAbstract($r, [], new Stub(), true, Caster::EXCLUDE_VERBOSE); $s = ReflectionCaster::getSignature($s); - if ('()' === substr($identifier, -2)) { + if (str_ends_with($identifier, '()')) { $this->value = substr_replace($identifier, $s, -2); } else { $this->value .= $s; diff --git a/vendor/symfony/var-dumper/Caster/ConstStub.php b/vendor/symfony/var-dumper/Caster/ConstStub.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Caster/CutArrayStub.php b/vendor/symfony/var-dumper/Caster/CutArrayStub.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Caster/CutStub.php b/vendor/symfony/var-dumper/Caster/CutStub.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Caster/DOMCaster.php b/vendor/symfony/var-dumper/Caster/DOMCaster.php old mode 100755 new mode 100644 index 5644e489f3..4dd16e0ee7 --- a/vendor/symfony/var-dumper/Caster/DOMCaster.php +++ b/vendor/symfony/var-dumper/Caster/DOMCaster.php @@ -82,7 +82,7 @@ public static function castLength($dom, array $a, Stub $stub, bool $isNested) return $a; } - public static function castImplementation($dom, array $a, Stub $stub, bool $isNested) + public static function castImplementation(\DOMImplementation $dom, array $a, Stub $stub, bool $isNested) { $a += [ Caster::PREFIX_VIRTUAL.'Core' => '1.0', diff --git a/vendor/symfony/var-dumper/Caster/DateCaster.php b/vendor/symfony/var-dumper/Caster/DateCaster.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Caster/DoctrineCaster.php b/vendor/symfony/var-dumper/Caster/DoctrineCaster.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Caster/DsCaster.php b/vendor/symfony/var-dumper/Caster/DsCaster.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Caster/DsPairStub.php b/vendor/symfony/var-dumper/Caster/DsPairStub.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Caster/EnumStub.php b/vendor/symfony/var-dumper/Caster/EnumStub.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Caster/ExceptionCaster.php b/vendor/symfony/var-dumper/Caster/ExceptionCaster.php old mode 100755 new mode 100644 index 437db26d29..baa7a180b0 --- a/vendor/symfony/var-dumper/Caster/ExceptionCaster.php +++ b/vendor/symfony/var-dumper/Caster/ExceptionCaster.php @@ -149,7 +149,7 @@ public static function castTraceStub(TraceStub $trace, array $a, Stub $stub, boo $f = self::castFrameStub($frame, [], $frame, true); if (isset($f[$prefix.'src'])) { foreach ($f[$prefix.'src']->value as $label => $frame) { - if (0 === strpos($label, "\0~collapse=0")) { + if (str_starts_with($label, "\0~collapse=0")) { if ($collapse) { $label = substr_replace($label, '1', 11, 1); } else { @@ -281,7 +281,7 @@ private static function filterExceptionArray(string $xClass, array $a, string $x } unset($a[$xPrefix.'string'], $a[Caster::PREFIX_DYNAMIC.'xdebug_message'], $a[Caster::PREFIX_DYNAMIC.'__destructorException']); - if (isset($a[Caster::PREFIX_PROTECTED.'message']) && false !== strpos($a[Caster::PREFIX_PROTECTED.'message'], "@anonymous\0")) { + if (isset($a[Caster::PREFIX_PROTECTED.'message']) && str_contains($a[Caster::PREFIX_PROTECTED.'message'], "@anonymous\0")) { $a[Caster::PREFIX_PROTECTED.'message'] = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', function ($m) { return class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0]; }, $a[Caster::PREFIX_PROTECTED.'message']); diff --git a/vendor/symfony/var-dumper/Caster/FrameStub.php b/vendor/symfony/var-dumper/Caster/FrameStub.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Caster/GmpCaster.php b/vendor/symfony/var-dumper/Caster/GmpCaster.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Caster/ImagineCaster.php b/vendor/symfony/var-dumper/Caster/ImagineCaster.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Caster/ImgStub.php b/vendor/symfony/var-dumper/Caster/ImgStub.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Caster/IntlCaster.php b/vendor/symfony/var-dumper/Caster/IntlCaster.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Caster/LinkStub.php b/vendor/symfony/var-dumper/Caster/LinkStub.php old mode 100755 new mode 100644 index 0aa076a265..7e0780339a --- a/vendor/symfony/var-dumper/Caster/LinkStub.php +++ b/vendor/symfony/var-dumper/Caster/LinkStub.php @@ -23,7 +23,7 @@ class LinkStub extends ConstStub private static $vendorRoots; private static $composerRoots; - public function __construct($label, int $line = 0, $href = null) + public function __construct(string $label, int $line = 0, string $href = null) { $this->value = $label; @@ -33,12 +33,12 @@ public function __construct($label, int $line = 0, $href = null) if (!\is_string($href)) { return; } - if (0 === strpos($href, 'file://')) { + if (str_starts_with($href, 'file://')) { if ($href === $label) { $label = substr($label, 7); } $href = substr($href, 7); - } elseif (false !== strpos($href, '://')) { + } elseif (str_contains($href, '://')) { $this->attr['href'] = $href; return; @@ -69,7 +69,7 @@ private function getComposerRoot(string $file, bool &$inVendor) self::$vendorRoots = []; foreach (get_declared_classes() as $class) { - if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) { + if ('C' === $class[0] && str_starts_with($class, 'ComposerAutoloaderInit')) { $r = new \ReflectionClass($class); $v = \dirname($r->getFileName(), 2); if (is_file($v.'/composer/installed.json')) { @@ -85,7 +85,7 @@ private function getComposerRoot(string $file, bool &$inVendor) } foreach (self::$vendorRoots as $root) { - if ($inVendor = 0 === strpos($file, $root)) { + if ($inVendor = str_starts_with($file, $root)) { return $root; } } diff --git a/vendor/symfony/var-dumper/Caster/MemcachedCaster.php b/vendor/symfony/var-dumper/Caster/MemcachedCaster.php old mode 100755 new mode 100644 index 111b0607e9..cfef19acc3 --- a/vendor/symfony/var-dumper/Caster/MemcachedCaster.php +++ b/vendor/symfony/var-dumper/Caster/MemcachedCaster.php @@ -71,7 +71,7 @@ private static function getOptionConstants(): array $optionConstants = []; foreach ($reflectedMemcached->getConstants() as $constantKey => $value) { - if (0 === strpos($constantKey, 'OPT_')) { + if (str_starts_with($constantKey, 'OPT_')) { $optionConstants[$constantKey] = $value; } } diff --git a/vendor/symfony/var-dumper/Caster/PdoCaster.php b/vendor/symfony/var-dumper/Caster/PdoCaster.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Caster/PgSqlCaster.php b/vendor/symfony/var-dumper/Caster/PgSqlCaster.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Caster/ProxyManagerCaster.php b/vendor/symfony/var-dumper/Caster/ProxyManagerCaster.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Caster/RdKafkaCaster.php b/vendor/symfony/var-dumper/Caster/RdKafkaCaster.php old mode 100755 new mode 100644 index c3e4eb9f34..db4bba8d38 --- a/vendor/symfony/var-dumper/Caster/RdKafkaCaster.php +++ b/vendor/symfony/var-dumper/Caster/RdKafkaCaster.php @@ -31,7 +31,7 @@ */ class RdKafkaCaster { - public static function castKafkaConsumer(KafkaConsumer $c, array $a, Stub $stub, $isNested) + public static function castKafkaConsumer(KafkaConsumer $c, array $a, Stub $stub, bool $isNested) { $prefix = Caster::PREFIX_VIRTUAL; @@ -51,7 +51,7 @@ public static function castKafkaConsumer(KafkaConsumer $c, array $a, Stub $stub, return $a; } - public static function castTopic(Topic $c, array $a, Stub $stub, $isNested) + public static function castTopic(Topic $c, array $a, Stub $stub, bool $isNested) { $prefix = Caster::PREFIX_VIRTUAL; @@ -75,7 +75,7 @@ public static function castTopicPartition(TopicPartition $c, array $a) return $a; } - public static function castMessage(Message $c, array $a, Stub $stub, $isNested) + public static function castMessage(Message $c, array $a, Stub $stub, bool $isNested) { $prefix = Caster::PREFIX_VIRTUAL; @@ -86,7 +86,7 @@ public static function castMessage(Message $c, array $a, Stub $stub, $isNested) return $a; } - public static function castConf(Conf $c, array $a, Stub $stub, $isNested) + public static function castConf(Conf $c, array $a, Stub $stub, bool $isNested) { $prefix = Caster::PREFIX_VIRTUAL; @@ -97,7 +97,7 @@ public static function castConf(Conf $c, array $a, Stub $stub, $isNested) return $a; } - public static function castTopicConf(TopicConf $c, array $a, Stub $stub, $isNested) + public static function castTopicConf(TopicConf $c, array $a, Stub $stub, bool $isNested) { $prefix = Caster::PREFIX_VIRTUAL; @@ -108,7 +108,7 @@ public static function castTopicConf(TopicConf $c, array $a, Stub $stub, $isNest return $a; } - public static function castRdKafka(\RdKafka $c, array $a, Stub $stub, $isNested) + public static function castRdKafka(\RdKafka $c, array $a, Stub $stub, bool $isNested) { $prefix = Caster::PREFIX_VIRTUAL; @@ -121,14 +121,14 @@ public static function castRdKafka(\RdKafka $c, array $a, Stub $stub, $isNested) return $a; } - public static function castCollectionMetadata(CollectionMetadata $c, array $a, Stub $stub, $isNested) + public static function castCollectionMetadata(CollectionMetadata $c, array $a, Stub $stub, bool $isNested) { $a += iterator_to_array($c); return $a; } - public static function castTopicMetadata(TopicMetadata $c, array $a, Stub $stub, $isNested) + public static function castTopicMetadata(TopicMetadata $c, array $a, Stub $stub, bool $isNested) { $prefix = Caster::PREFIX_VIRTUAL; @@ -140,7 +140,7 @@ public static function castTopicMetadata(TopicMetadata $c, array $a, Stub $stub, return $a; } - public static function castPartitionMetadata(PartitionMetadata $c, array $a, Stub $stub, $isNested) + public static function castPartitionMetadata(PartitionMetadata $c, array $a, Stub $stub, bool $isNested) { $prefix = Caster::PREFIX_VIRTUAL; @@ -153,7 +153,7 @@ public static function castPartitionMetadata(PartitionMetadata $c, array $a, Stu return $a; } - public static function castBrokerMetadata(BrokerMetadata $c, array $a, Stub $stub, $isNested) + public static function castBrokerMetadata(BrokerMetadata $c, array $a, Stub $stub, bool $isNested) { $prefix = Caster::PREFIX_VIRTUAL; diff --git a/vendor/symfony/var-dumper/Caster/RedisCaster.php b/vendor/symfony/var-dumper/Caster/RedisCaster.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Caster/ReflectionCaster.php b/vendor/symfony/var-dumper/Caster/ReflectionCaster.php old mode 100755 new mode 100644 index c850e0b1d3..1781f469d5 --- a/vendor/symfony/var-dumper/Caster/ReflectionCaster.php +++ b/vendor/symfony/var-dumper/Caster/ReflectionCaster.php @@ -42,7 +42,7 @@ public static function castClosure(\Closure $c, array $a, Stub $stub, bool $isNe $a = static::castFunctionAbstract($c, $a, $stub, $isNested, $filter); - if (false === strpos($c->name, '{closure}')) { + if (!str_contains($c->name, '{closure}')) { $stub->class = isset($a[$prefix.'class']) ? $a[$prefix.'class']->value.'::'.$c->name : $c->name; unset($a[$prefix.'class']); } @@ -102,7 +102,7 @@ public static function castType(\ReflectionType $c, array $a, Stub $stub, bool $ $prefix.'allowsNull' => $c->allowsNull(), $prefix.'isBuiltin' => $c->isBuiltin(), ]; - } elseif ($c instanceof \ReflectionUnionType) { + } elseif ($c instanceof \ReflectionUnionType || $c instanceof \ReflectionIntersectionType) { $a[$prefix.'allowsNull'] = $c->allowsNull(); self::addMap($a, $c, [ 'types' => 'getTypes', @@ -381,7 +381,7 @@ public static function getSignature(array $a) } elseif (\is_array($v)) { $signature .= $v ? '[…'.\count($v).']' : '[]'; } elseif (\is_string($v)) { - $signature .= 10 > \strlen($v) && false === strpos($v, '\\') ? "'{$v}'" : "'…".\strlen($v)."'"; + $signature .= 10 > \strlen($v) && !str_contains($v, '\\') ? "'{$v}'" : "'…".\strlen($v)."'"; } elseif (\is_bool($v)) { $signature .= $v ? 'true' : 'false'; } else { diff --git a/vendor/symfony/var-dumper/Caster/ResourceCaster.php b/vendor/symfony/var-dumper/Caster/ResourceCaster.php old mode 100755 new mode 100644 index 6b2ed52236..6ae908524f --- a/vendor/symfony/var-dumper/Caster/ResourceCaster.php +++ b/vendor/symfony/var-dumper/Caster/ResourceCaster.php @@ -48,7 +48,7 @@ public static function castProcess($process, array $a, Stub $stub, bool $isNeste public static function castStream($stream, array $a, Stub $stub, bool $isNested) { $a = stream_get_meta_data($stream) + static::castStreamContext($stream, $a, $stub, $isNested); - if (isset($a['uri'])) { + if ($a['uri'] ?? false) { $a['uri'] = new LinkStub($a['uri']); } @@ -60,7 +60,7 @@ public static function castStreamContext($stream, array $a, Stub $stub, bool $is return @stream_context_get_params($stream) ?: $a; } - public static function castGd($gd, array $a, Stub $stub, $isNested) + public static function castGd($gd, array $a, Stub $stub, bool $isNested) { $a['size'] = imagesx($gd).'x'.imagesy($gd); $a['trueColor'] = imageistruecolor($gd); diff --git a/vendor/symfony/var-dumper/Caster/SplCaster.php b/vendor/symfony/var-dumper/Caster/SplCaster.php old mode 100755 new mode 100644 index 07f053e4a9..07f445116f --- a/vendor/symfony/var-dumper/Caster/SplCaster.php +++ b/vendor/symfony/var-dumper/Caster/SplCaster.php @@ -39,7 +39,7 @@ public static function castArrayIterator(\ArrayIterator $c, array $a, Stub $stub return self::castSplArray($c, $a, $stub, $isNested); } - public static function castHeap(\Iterator $c, array $a, Stub $stub, $isNested) + public static function castHeap(\Iterator $c, array $a, Stub $stub, bool $isNested) { $a += [ Caster::PREFIX_VIRTUAL.'heap' => iterator_to_array(clone $c), @@ -129,7 +129,7 @@ public static function castFileInfo(\SplFileInfo $c, array $a, Stub $stub, bool } } - if (isset($a[$prefix.'realPath'])) { + if ($a[$prefix.'realPath'] ?? false) { $a[$prefix.'realPath'] = new LinkStub($a[$prefix.'realPath']); } diff --git a/vendor/symfony/var-dumper/Caster/StubCaster.php b/vendor/symfony/var-dumper/Caster/StubCaster.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Caster/SymfonyCaster.php b/vendor/symfony/var-dumper/Caster/SymfonyCaster.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Caster/TraceStub.php b/vendor/symfony/var-dumper/Caster/TraceStub.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Caster/UuidCaster.php b/vendor/symfony/var-dumper/Caster/UuidCaster.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Caster/XmlReaderCaster.php b/vendor/symfony/var-dumper/Caster/XmlReaderCaster.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Caster/XmlResourceCaster.php b/vendor/symfony/var-dumper/Caster/XmlResourceCaster.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Cloner/AbstractCloner.php b/vendor/symfony/var-dumper/Cloner/AbstractCloner.php old mode 100755 new mode 100644 index 739e069934..ac55da5518 --- a/vendor/symfony/var-dumper/Cloner/AbstractCloner.php +++ b/vendor/symfony/var-dumper/Cloner/AbstractCloner.php @@ -309,7 +309,7 @@ protected function castObject(Stub $stub, bool $isNested) $obj = $stub->value; $class = $stub->class; - if (\PHP_VERSION_ID < 80000 ? "\0" === ($class[15] ?? null) : false !== strpos($class, "@anonymous\0")) { + if (\PHP_VERSION_ID < 80000 ? "\0" === ($class[15] ?? null) : str_contains($class, "@anonymous\0")) { $stub->class = get_debug_type($obj); } if (isset($this->classInfo[$class])) { diff --git a/vendor/symfony/var-dumper/Cloner/ClonerInterface.php b/vendor/symfony/var-dumper/Cloner/ClonerInterface.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Cloner/Cursor.php b/vendor/symfony/var-dumper/Cloner/Cursor.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Cloner/Data.php b/vendor/symfony/var-dumper/Cloner/Data.php old mode 100755 new mode 100644 index c695a11aef..b17dc55e27 --- a/vendor/symfony/var-dumper/Cloner/Data.php +++ b/vendor/symfony/var-dumper/Cloner/Data.php @@ -111,6 +111,7 @@ public function getValue($recursive = false) /** * @return int */ + #[\ReturnTypeWillChange] public function count() { return \count($this->getValue()); @@ -119,6 +120,7 @@ public function count() /** * @return \Traversable */ + #[\ReturnTypeWillChange] public function getIterator() { if (!\is_array($value = $this->getValue())) { @@ -150,21 +152,34 @@ public function __isset(string $key) /** * @return bool */ + #[\ReturnTypeWillChange] public function offsetExists($key) { return $this->__isset($key); } + /** + * @return mixed + */ + #[\ReturnTypeWillChange] public function offsetGet($key) { return $this->__get($key); } + /** + * @return void + */ + #[\ReturnTypeWillChange] public function offsetSet($key, $value) { throw new \BadMethodCallException(self::class.' objects are immutable.'); } + /** + * @return void + */ + #[\ReturnTypeWillChange] public function offsetUnset($key) { throw new \BadMethodCallException(self::class.' objects are immutable.'); diff --git a/vendor/symfony/var-dumper/Cloner/DumperInterface.php b/vendor/symfony/var-dumper/Cloner/DumperInterface.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Cloner/Stub.php b/vendor/symfony/var-dumper/Cloner/Stub.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Cloner/VarCloner.php b/vendor/symfony/var-dumper/Cloner/VarCloner.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Command/Descriptor/CliDescriptor.php b/vendor/symfony/var-dumper/Command/Descriptor/CliDescriptor.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Command/Descriptor/DumpDescriptorInterface.php b/vendor/symfony/var-dumper/Command/Descriptor/DumpDescriptorInterface.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Command/Descriptor/HtmlDescriptor.php b/vendor/symfony/var-dumper/Command/Descriptor/HtmlDescriptor.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Command/ServerDumpCommand.php b/vendor/symfony/var-dumper/Command/ServerDumpCommand.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Dumper/AbstractDumper.php b/vendor/symfony/var-dumper/Dumper/AbstractDumper.php old mode 100755 new mode 100644 index 941f8c68d9..6064ea99f5 --- a/vendor/symfony/var-dumper/Dumper/AbstractDumper.php +++ b/vendor/symfony/var-dumper/Dumper/AbstractDumper.php @@ -63,7 +63,7 @@ public function __construct($output = null, string $charset = null, int $flags = */ public function setOutput($output) { - $prev = null !== $this->outputStream ? $this->outputStream : $this->lineDumper; + $prev = $this->outputStream ?? $this->lineDumper; if (\is_callable($output)) { $this->outputStream = null; diff --git a/vendor/symfony/var-dumper/Dumper/CliDumper.php b/vendor/symfony/var-dumper/Dumper/CliDumper.php old mode 100755 new mode 100644 index ab919e1558..c1539ee050 --- a/vendor/symfony/var-dumper/Dumper/CliDumper.php +++ b/vendor/symfony/var-dumper/Dumper/CliDumper.php @@ -150,7 +150,7 @@ public function dumpScalar(Cursor $cursor, string $type, $value) case is_nan($value): $value = 'NAN'; break; default: $value = (string) $value; - if (false === strpos($value, $this->decimalPoint)) { + if (!str_contains($value, $this->decimalPoint)) { $value .= $this->decimalPoint.'0'; } break; @@ -324,7 +324,7 @@ public function leaveHash(Cursor $cursor, int $type, $class, bool $hasChild, int * @param bool $hasChild When the dump of the hash has child item * @param int $cut The number of items the hash has been cut by */ - protected function dumpEllipsis(Cursor $cursor, $hasChild, $cut) + protected function dumpEllipsis(Cursor $cursor, bool $hasChild, int $cut) { if ($cut) { $this->line .= ' …'; @@ -428,7 +428,7 @@ protected function dumpKey(Cursor $cursor) * * @return string The value with style decoration */ - protected function style($style, $value, $attr = []) + protected function style(string $style, string $value, array $attr = []) { if (null === $this->colors) { $this->colors = $this->supportsColors(); @@ -441,7 +441,7 @@ protected function style($style, $value, $attr = []) if (isset($attr['ellipsis'], $attr['ellipsis-type'])) { $prefix = substr($value, 0, -$attr['ellipsis']); - if ('cli' === \PHP_SAPI && 'path' === $attr['ellipsis-type'] && isset($_SERVER[$pwd = '\\' === \DIRECTORY_SEPARATOR ? 'CD' : 'PWD']) && 0 === strpos($prefix, $_SERVER[$pwd])) { + if ('cli' === \PHP_SAPI && 'path' === $attr['ellipsis-type'] && isset($_SERVER[$pwd = '\\' === \DIRECTORY_SEPARATOR ? 'CD' : 'PWD']) && str_starts_with($prefix, $_SERVER[$pwd])) { $prefix = '.'.substr($prefix, \strlen($_SERVER[$pwd])); } if (!empty($attr['ellipsis-tail'])) { @@ -475,7 +475,7 @@ protected function style($style, $value, $attr = []) } else { $value = "\033[{$this->styles[$style]}m".$value; } - if ($cchrCount && $endCchr === substr($value, -\strlen($endCchr))) { + if ($cchrCount && str_ends_with($value, $endCchr)) { $value = substr($value, 0, -\strlen($endCchr)); } else { $value .= "\033[{$this->styles['default']}m"; diff --git a/vendor/symfony/var-dumper/Dumper/ContextProvider/CliContextProvider.php b/vendor/symfony/var-dumper/Dumper/ContextProvider/CliContextProvider.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Dumper/ContextProvider/ContextProviderInterface.php b/vendor/symfony/var-dumper/Dumper/ContextProvider/ContextProviderInterface.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Dumper/ContextProvider/RequestContextProvider.php b/vendor/symfony/var-dumper/Dumper/ContextProvider/RequestContextProvider.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Dumper/ContextProvider/SourceContextProvider.php b/vendor/symfony/var-dumper/Dumper/ContextProvider/SourceContextProvider.php old mode 100755 new mode 100644 index c3cd3221a8..2e2c818161 --- a/vendor/symfony/var-dumper/Dumper/ContextProvider/SourceContextProvider.php +++ b/vendor/symfony/var-dumper/Dumper/ContextProvider/SourceContextProvider.php @@ -56,7 +56,7 @@ public function getContext(): ?array $line = $trace[$i]['line'] ?? $line; while (++$i < $this->limit) { - if (isset($trace[$i]['function'], $trace[$i]['file']) && empty($trace[$i]['class']) && 0 !== strpos($trace[$i]['function'], 'call_user_func')) { + if (isset($trace[$i]['function'], $trace[$i]['file']) && empty($trace[$i]['class']) && !str_starts_with($trace[$i]['function'], 'call_user_func')) { $file = $trace[$i]['file']; $line = $trace[$i]['line']; @@ -98,7 +98,7 @@ public function getContext(): ?array if (null !== $this->projectDir) { $context['project_dir'] = $this->projectDir; - if (0 === strpos($file, $this->projectDir)) { + if (str_starts_with($file, $this->projectDir)) { $context['file_relative'] = ltrim(substr($file, \strlen($this->projectDir)), \DIRECTORY_SEPARATOR); } } diff --git a/vendor/symfony/var-dumper/Dumper/ContextualizedDumper.php b/vendor/symfony/var-dumper/Dumper/ContextualizedDumper.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Dumper/DataDumperInterface.php b/vendor/symfony/var-dumper/Dumper/DataDumperInterface.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Dumper/HtmlDumper.php b/vendor/symfony/var-dumper/Dumper/HtmlDumper.php old mode 100755 new mode 100644 index 9bbd2d65ab..6c3abaa2bf --- a/vendor/symfony/var-dumper/Dumper/HtmlDumper.php +++ b/vendor/symfony/var-dumper/Dumper/HtmlDumper.php @@ -116,21 +116,16 @@ public function setDisplayOptions(array $displayOptions) /** * Sets an HTML header that will be dumped once in the output stream. - * - * @param string $header An HTML string */ - public function setDumpHeader($header) + public function setDumpHeader(?string $header) { $this->dumpHeader = $header; } /** * Sets an HTML prefix and suffix that will encapse every single dump. - * - * @param string $prefix The prepended HTML string - * @param string $suffix The appended HTML string */ - public function setDumpBoundaries($prefix, $suffix) + public function setDumpBoundaries(string $prefix, string $suffix) { $this->dumpPrefix = $prefix; $this->dumpSuffix = $suffix; @@ -153,7 +148,7 @@ public function dump(Data $data, $output = null, array $extraDisplayOptions = [] */ protected function getDumpHeader() { - $this->headerIsDumped = null !== $this->outputStream ? $this->outputStream : $this->lineDumper; + $this->headerIsDumped = $this->outputStream ?? $this->lineDumper; if (null !== $this->dumpHeader) { return $this->dumpHeader; @@ -851,7 +846,7 @@ public function leaveHash(Cursor $cursor, int $type, $class, bool $hasChild, int /** * {@inheritdoc} */ - protected function style($style, $value, $attr = []) + protected function style(string $style, string $value, array $attr = []) { if ('' === $value) { return ''; @@ -951,7 +946,7 @@ protected function dumpLine(int $depth, bool $endOfValue = false) if (-1 === $this->lastDepth) { $this->line = sprintf($this->dumpPrefix, $this->dumpId, $this->indentPad).$this->line; } - if ($this->headerIsDumped !== (null !== $this->outputStream ? $this->outputStream : $this->lineDumper)) { + if ($this->headerIsDumped !== ($this->outputStream ?? $this->lineDumper)) { $this->line = $this->getDumpHeader().$this->line; } @@ -985,7 +980,7 @@ private function getSourceLink(string $file, int $line) } } -function esc($str) +function esc(string $str) { return htmlspecialchars($str, \ENT_QUOTES, 'UTF-8'); } diff --git a/vendor/symfony/var-dumper/Dumper/ServerDumper.php b/vendor/symfony/var-dumper/Dumper/ServerDumper.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Exception/ThrowingCasterException.php b/vendor/symfony/var-dumper/Exception/ThrowingCasterException.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/LICENSE b/vendor/symfony/var-dumper/LICENSE old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/README.md b/vendor/symfony/var-dumper/README.md old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Resources/css/htmlDescriptor.css b/vendor/symfony/var-dumper/Resources/css/htmlDescriptor.css old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Resources/functions/dump.php b/vendor/symfony/var-dumper/Resources/functions/dump.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Resources/js/htmlDescriptor.js b/vendor/symfony/var-dumper/Resources/js/htmlDescriptor.js old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/Server/Connection.php b/vendor/symfony/var-dumper/Server/Connection.php old mode 100755 new mode 100644 index d8be23587e..55d9214d0f --- a/vendor/symfony/var-dumper/Server/Connection.php +++ b/vendor/symfony/var-dumper/Server/Connection.php @@ -31,7 +31,7 @@ class Connection */ public function __construct(string $host, array $contextProviders = []) { - if (false === strpos($host, '://')) { + if (!str_contains($host, '://')) { $host = 'tcp://'.$host; } @@ -78,7 +78,7 @@ public function write(Data $data): bool return false; } - private static function nullErrorHandler($t, $m) + private static function nullErrorHandler(int $t, string $m) { // no-op } diff --git a/vendor/symfony/var-dumper/Server/DumpServer.php b/vendor/symfony/var-dumper/Server/DumpServer.php old mode 100755 new mode 100644 index 28decf3191..7cb5bf0c48 --- a/vendor/symfony/var-dumper/Server/DumpServer.php +++ b/vendor/symfony/var-dumper/Server/DumpServer.php @@ -30,7 +30,7 @@ class DumpServer public function __construct(string $host, LoggerInterface $logger = null) { - if (false === strpos($host, '://')) { + if (!str_contains($host, '://')) { $host = 'tcp://'.$host; } diff --git a/vendor/symfony/var-dumper/Test/VarDumperTestTrait.php b/vendor/symfony/var-dumper/Test/VarDumperTestTrait.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/VarDumper.php b/vendor/symfony/var-dumper/VarDumper.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/var-dumper/composer.json b/vendor/symfony/var-dumper/composer.json old mode 100755 new mode 100644 index 16da4888fc..2d4889d005 --- a/vendor/symfony/var-dumper/composer.json +++ b/vendor/symfony/var-dumper/composer.json @@ -18,7 +18,7 @@ "require": { "php": ">=7.2.5", "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php80": "^1.15" + "symfony/polyfill-php80": "^1.16" }, "require-dev": { "ext-iconv": "*",