diff --git a/composer.json b/composer.json index 8ccb488df..0c3d74c38 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "php": ">=7.4", "justinrainbow/json-schema": "^5.3", "php-parallel-lint/php-parallel-lint": "1.4", - "phpstan/phpstan": "1.12.5", + "phpstan/phpstan": "1.12.6", "phpstan/phpstan-deprecation-rules": "1.2.1", "phpstan/phpstan-phpunit": "1.4.0", "phpstan/phpstan-strict-rules": "1.6.1", diff --git a/composer.lock b/composer.lock index 2b04d1a59..5d2759c04 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "eb4733256b7d360a758d6e1f0ebf2655", + "content-hash": "af7735f8f371e531ade668d98be5c647", "packages": [ { "name": "beberlei/assert", @@ -712,21 +712,21 @@ }, { "name": "nette/neon", - "version": "v3.3.3", + "version": "v3.3.4", "source": { "type": "git", "url": "https://github.com/nette/neon.git", - "reference": "22e384da162fab42961d48eb06c06d3ad0c11b95" + "reference": "bb88bf3a54dd21bf4dbddb5cd525d7b0c61b7cda" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/neon/zipball/22e384da162fab42961d48eb06c06d3ad0c11b95", - "reference": "22e384da162fab42961d48eb06c06d3ad0c11b95", + "url": "https://api.github.com/repos/nette/neon/zipball/bb88bf3a54dd21bf4dbddb5cd525d7b0c61b7cda", + "reference": "bb88bf3a54dd21bf4dbddb5cd525d7b0c61b7cda", "shasum": "" }, "require": { "ext-json": "*", - "php": ">=7.1" + "php": "7.1 - 8.4" }, "require-dev": { "nette/tester": "^2.0", @@ -774,9 +774,9 @@ ], "support": { "issues": "https://github.com/nette/neon/issues", - "source": "https://github.com/nette/neon/tree/v3.3.3" + "source": "https://github.com/nette/neon/tree/v3.3.4" }, - "time": "2022-03-10T02:04:26+00:00" + "time": "2024-10-04T22:17:24+00:00" }, { "name": "nette/utils", @@ -988,16 +988,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.12.5", + "version": "1.12.6", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17" + "reference": "dc4d2f145a88ea7141ae698effd64d9df46527ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17", - "reference": "7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/dc4d2f145a88ea7141ae698effd64d9df46527ae", + "reference": "dc4d2f145a88ea7141ae698effd64d9df46527ae", "shasum": "" }, "require": { @@ -1042,7 +1042,7 @@ "type": "github" } ], - "time": "2024-09-26T12:45:22+00:00" + "time": "2024-10-06T15:03:59+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", diff --git a/vendor/bin/neon-lint b/vendor/bin/neon-lint index 069b5e960..c7741230b 100755 --- a/vendor/bin/neon-lint +++ b/vendor/bin/neon-lint @@ -112,9 +112,8 @@ if (PHP_VERSION_ID < 80000) { (function_exists('stream_get_wrappers') && in_array('phpvfscomposer', stream_get_wrappers(), true)) || (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) ) { - include("phpvfscomposer://" . __DIR__ . '/..'.'/nette/neon/bin/neon-lint'); - exit(0); + return include("phpvfscomposer://" . __DIR__ . '/..'.'/nette/neon/bin/neon-lint'); } } -include __DIR__ . '/..'.'/nette/neon/bin/neon-lint'; +return include __DIR__ . '/..'.'/nette/neon/bin/neon-lint'; diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 451688095..7830bc8f7 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -733,29 +733,29 @@ }, { "name": "nette/neon", - "version": "v3.3.3", - "version_normalized": "3.3.3.0", + "version": "v3.3.4", + "version_normalized": "3.3.4.0", "source": { "type": "git", "url": "https://github.com/nette/neon.git", - "reference": "22e384da162fab42961d48eb06c06d3ad0c11b95" + "reference": "bb88bf3a54dd21bf4dbddb5cd525d7b0c61b7cda" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/neon/zipball/22e384da162fab42961d48eb06c06d3ad0c11b95", - "reference": "22e384da162fab42961d48eb06c06d3ad0c11b95", + "url": "https://api.github.com/repos/nette/neon/zipball/bb88bf3a54dd21bf4dbddb5cd525d7b0c61b7cda", + "reference": "bb88bf3a54dd21bf4dbddb5cd525d7b0c61b7cda", "shasum": "" }, "require": { "ext-json": "*", - "php": ">=7.1" + "php": "7.1 - 8.4" }, "require-dev": { "nette/tester": "^2.0", "phpstan/phpstan": "^0.12", "tracy/tracy": "^2.7" }, - "time": "2022-03-10T02:04:26+00:00", + "time": "2024-10-04T22:17:24+00:00", "bin": [ "bin/neon-lint" ], @@ -798,7 +798,7 @@ ], "support": { "issues": "https://github.com/nette/neon/issues", - "source": "https://github.com/nette/neon/tree/v3.3.3" + "source": "https://github.com/nette/neon/tree/v3.3.4" }, "install-path": "../nette/neon" }, @@ -1021,17 +1021,17 @@ }, { "name": "phpstan/phpstan", - "version": "1.12.5", - "version_normalized": "1.12.5.0", + "version": "1.12.6", + "version_normalized": "1.12.6.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17" + "reference": "dc4d2f145a88ea7141ae698effd64d9df46527ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17", - "reference": "7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/dc4d2f145a88ea7141ae698effd64d9df46527ae", + "reference": "dc4d2f145a88ea7141ae698effd64d9df46527ae", "shasum": "" }, "require": { @@ -1040,7 +1040,7 @@ "conflict": { "phpstan/phpstan-shim": "*" }, - "time": "2024-09-26T12:45:22+00:00", + "time": "2024-10-06T15:03:59+00:00", "bin": [ "phpstan", "phpstan.phar" diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index b8fdd4178..614e5020b 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -3,7 +3,7 @@ 'name' => '__root__', 'pretty_version' => 'dev-main', 'version' => 'dev-main', - 'reference' => '470a106921fccdc2d0340f30e9b07ca7608dac2d', + 'reference' => '591e1dd6d35f7e6cabad238c99e1f79c2d2d4fe7', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -13,7 +13,7 @@ '__root__' => array( 'pretty_version' => 'dev-main', 'version' => 'dev-main', - 'reference' => '470a106921fccdc2d0340f30e9b07ca7608dac2d', + 'reference' => '591e1dd6d35f7e6cabad238c99e1f79c2d2d4fe7', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -113,9 +113,9 @@ 'dev_requirement' => false, ), 'nette/neon' => array( - 'pretty_version' => 'v3.3.3', - 'version' => '3.3.3.0', - 'reference' => '22e384da162fab42961d48eb06c06d3ad0c11b95', + 'pretty_version' => 'v3.3.4', + 'version' => '3.3.4.0', + 'reference' => 'bb88bf3a54dd21bf4dbddb5cd525d7b0c61b7cda', 'type' => 'library', 'install_path' => __DIR__ . '/../nette/neon', 'aliases' => array(), @@ -149,9 +149,9 @@ 'dev_requirement' => false, ), 'phpstan/phpstan' => array( - 'pretty_version' => '1.12.5', - 'version' => '1.12.5.0', - 'reference' => '7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17', + 'pretty_version' => '1.12.6', + 'version' => '1.12.6.0', + 'reference' => 'dc4d2f145a88ea7141ae698effd64d9df46527ae', 'type' => 'library', 'install_path' => __DIR__ . '/../phpstan/phpstan', 'aliases' => array(), diff --git a/vendor/nette/neon/composer.json b/vendor/nette/neon/composer.json index ccdf65ebb..7478227b9 100644 --- a/vendor/nette/neon/composer.json +++ b/vendor/nette/neon/composer.json @@ -15,7 +15,7 @@ } ], "require": { - "php": ">=7.1", + "php": "7.1 - 8.4", "ext-json": "*" }, "require-dev": { diff --git a/vendor/nette/neon/contributing.md b/vendor/nette/neon/contributing.md deleted file mode 100644 index 184152c02..000000000 --- a/vendor/nette/neon/contributing.md +++ /dev/null @@ -1,33 +0,0 @@ -How to contribute & use the issue tracker -========================================= - -Nette welcomes your contributions. There are several ways to help out: - -* Create an issue on GitHub, if you have found a bug -* Write test cases for open bug issues -* Write fixes for open bug/feature issues, preferably with test cases included -* Contribute to the [documentation](https://nette.org/en/writing) - -Issues ------- - -Please **do not use the issue tracker to ask questions**. We will be happy to help you -on [Nette forum](https://forum.nette.org) or chat with us on [Gitter](https://gitter.im/nette/nette). - -A good bug report shouldn't leave others needing to chase you up for more -information. Please try to be as detailed as possible in your report. - -**Feature requests** are welcome. But take a moment to find out whether your idea -fits with the scope and aims of the project. It's up to *you* to make a strong -case to convince the project's developers of the merits of this feature. - -Contributing ------------- - -If you'd like to contribute, please take a moment to read [the contributing guide](https://nette.org/en/contributing). - -The best way to propose a feature is to discuss your ideas on [Nette forum](https://forum.nette.org) before implementing them. - -Please do not fix whitespace, format code, or make a purely cosmetic patch. - -Thanks! :heart: diff --git a/vendor/nette/neon/readme.md b/vendor/nette/neon/readme.md index 981bbdc6c..574fc7941 100644 --- a/vendor/nette/neon/readme.md +++ b/vendor/nette/neon/readme.md @@ -37,7 +37,7 @@ Install via Composer: composer require nette/neon ``` -It requires PHP version 7.1 and supports PHP up to 8.1. Documentation can be found on the [website](https://doc.nette.org/neon). +It requires PHP version 7.1 up to 8.4. Documentation can be found on the [website](https://doc.nette.org/neon). `Neon::encode()` returns `$value` converted to NEON. As the second parameter `$blockMode` you can pass true, which will create multiline output. The third parameter `$indentation` specifies the characters used for indentation (default is tab). diff --git a/vendor/nette/neon/src/Neon/Neon.php b/vendor/nette/neon/src/Neon/Neon.php index 0c9481264..d23cc5184 100644 --- a/vendor/nette/neon/src/Neon/Neon.php +++ b/vendor/nette/neon/src/Neon/Neon.php @@ -50,11 +50,12 @@ public static function decode(string $input) */ public static function decodeFile(string $file) { - if (!is_file($file)) { - throw new Exception("File '$file' does not exist."); + $input = @file_get_contents($file); // @ is escalated to exception + if ($input === false) { + $error = preg_replace('#^\w+\(.*?\): #', '', error_get_last()['message'] ?? ''); + throw new Exception("Unable to read file '$file'. $error"); } - $input = file_get_contents($file); if (substr($input, 0, 3) === "\u{FEFF}") { // BOM $input = substr($input, 3); } diff --git a/vendor/nette/neon/src/Neon/Node/StringNode.php b/vendor/nette/neon/src/Neon/Node/StringNode.php index ffee11f6a..5de438463 100644 --- a/vendor/nette/neon/src/Neon/Node/StringNode.php +++ b/vendor/nette/neon/src/Neon/Node/StringNode.php @@ -80,16 +80,18 @@ function (array $m): string { public function toString(): string { if (strpos($this->value, "\n") === false) { - return "'" . str_replace("'", "''", $this->value) . "'"; + return preg_match('~[\x00-\x08\x0B-\x1F]~', $this->value) + ? json_encode($this->value, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) + : "'" . str_replace("'", "''", $this->value) . "'"; - } elseif (preg_match('~\n[\t ]+\'{3}~', $this->value)) { - $s = json_encode($this->value, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES); + } elseif (preg_match('~[\x00-\x08\x0B-\x1F]|\n[\t ]+\'{3}~', $this->value)) { + $s = substr(json_encode($this->value, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES), 1, -1); $s = preg_replace_callback( '#[^\\\\]|\\\\(.)#s', function ($m) { return ['n' => "\n", 't' => "\t", '"' => '"'][$m[1] ?? ''] ?? $m[0]; }, - substr($s, 1, -1) + $s ); $s = str_replace('"""', '""\"', $s); $delim = '"""'; diff --git a/vendor/nette/neon/src/Neon/Parser.php b/vendor/nette/neon/src/Neon/Parser.php index bc87742e9..af3669aa7 100644 --- a/vendor/nette/neon/src/Neon/Parser.php +++ b/vendor/nette/neon/src/Neon/Parser.php @@ -236,7 +236,7 @@ private function checkArrayKey(Node $key, array &$arr): void } - private function injectPos(Node $node, int $start = null, int $end = null): Node + private function injectPos(Node $node, ?int $start = null, ?int $end = null): Node { $node->startTokenPos = $start ?? $this->tokens->getPos(); $node->startLine = $this->posToLine[$node->startTokenPos]; diff --git a/vendor/phpstan/phpstan/phpstan.phar b/vendor/phpstan/phpstan/phpstan.phar index 95932296f..d3f6d41d7 100755 Binary files a/vendor/phpstan/phpstan/phpstan.phar and b/vendor/phpstan/phpstan/phpstan.phar differ diff --git a/vendor/phpstan/phpstan/phpstan.phar.asc b/vendor/phpstan/phpstan/phpstan.phar.asc index 8abddd1f4..7c21a474a 100644 --- a/vendor/phpstan/phpstan/phpstan.phar.asc +++ b/vendor/phpstan/phpstan/phpstan.phar.asc @@ -1,16 +1,16 @@ -----BEGIN PGP SIGNATURE----- -iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmb1V0gACgkQUcZzBf/C -5cBoFg/8CSNvVpvksAjqyOOLjVfCZ8JvJv+CGjsRQD7BWPi61T/Ef+A74U1M2Qf+ -F6j9SKbfnQ+g7jHewzRtziCmElNUip74iKee7268L9nSb0gDikwMgbBIoK7V3KX2 -9wa9P/3OdEyhKjRJtkB3E4mRXJ6MnWlDMi7xDEmh9lJPWSTELs4OAaLIL2tGA6JP -fRSPRmOpqcU5lbHho6wOc+KFjdvfAMqy5k1TsVY7ulibFAolsPuwatAn3Yhods/P -hKgupNBtGsFW79QIuapatuhxzU6SF1Xdd3WUG4q0C5gQRoNXysNBYkF3zLNaYx24 -XAMiEykfexGEkJrVoXUf9xdFXdGGtFNqkKViWjqtatgJhF4OjaIXXFK0utj8tDzp -Y5FgcTXAwn8X4K8OIoNoxaZrJThKne7kawvCGvmaRDAsv0zAykijkwDT5kV9yohD -R51fFWl/EN5/l35OJdl7W80zPRApgkY198mvNK+Q3XQSxbJcTPii9nH8Z3Xrt4Ko -Q5gd+v1dFEDy2ukmqPLayzszUF7t/NHeo7q4cOlY+A9EQfVhJtc9GuloMe10E5b2 -CT0vDuZw17zpltqUg/wfmYz0Coxx04fVbkQ+3t5yn6LNFXP0xJb4GlcRP0BmdtcI -vdS2nIG0aDbwwMOUFx5yylTWER0ikLozFfrJKYFJf/oYS9o0mn0= -=6tJf +iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmcCpsQACgkQUcZzBf/C +5cC55w/+IiJTLFbIHE02fPiXAfngSFXDX2VRLCeKo0teULm8Fev3OzwQxbgj3IT2 +QZO9KLkni0DLoepMF2DuZFYwhLiyW649JkRqbjdG3LIZm7sQxjL2ZgcK/PZ8RWQY +gi3ykp9Sk0vkGpltPgbpzR81XwbifcDT1INw8qKoQYrb0Ohl/IzVBqqD0tP7mWP3 +P4BNbj/LezLQSIps7VISrXk+twT+AAbjr1+EHy0Y6/D/469GkUP4Ikelmc0LwqPm +VEGncR07bhCgP7UfwW5HASZEfZROvNq3Vr/x/qvy3Fi16HiZ//ktjptK5jrmem+n +YkjkTUxAbVkuHOdufTOOYoz6rw3OWPbUwc30ENlX+UOau3c/GSEs/LgsnfdqWVXd +WYO5fN0OnCDUbLzAyVqbJIIT3HR+N4rAJ5AWAnt/zEnIMf5qccFjX803IVldj8X4 +//qgfFatGATFwxi98D6A19/VHnmlUT561YZ1T8TZ/cWScRuJSJ/Ch2PUxq/kAYVU +KPXnz2BN3JaxnMiCwc4J58/ognOlki5xklUpYzeBBfnQP8Qdx1NUrvv0bbe2v7V7 +jH8wRzY1Z1YThsE3GzdfwSVeSa/HIIGApiiMSrXnfOuw+OXdhLaeMx/yC5DMa5NV +H1MTG7dlzLxdlLgEht7fW3pVa3yBDHKLEE6eGu6/VwzG81zeCpI= +=Fq8/ -----END PGP SIGNATURE-----