diff --git a/composer.json b/composer.json index c748eb9ef..ed2a58b7a 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.7", + "phpstan/phpstan": "1.12.8", "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 33261a2d3..d847b89f3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a8d26ba5225a101dba7a325943d7c2a6", + "content-hash": "80e6c09b12df83c5f00dea813f4374bb", "packages": [ { "name": "beberlei/assert", - "version": "v3.3.2", + "version": "v3.3.3", "source": { "type": "git", "url": "https://github.com/beberlei/assert.git", - "reference": "cb70015c04be1baee6f5f5c953703347c0ac1655" + "reference": "b5fd8eacd8915a1b627b8bfc027803f1939734dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/beberlei/assert/zipball/cb70015c04be1baee6f5f5c953703347c0ac1655", - "reference": "cb70015c04be1baee6f5f5c953703347c0ac1655", + "url": "https://api.github.com/repos/beberlei/assert/zipball/b5fd8eacd8915a1b627b8bfc027803f1939734dd", + "reference": "b5fd8eacd8915a1b627b8bfc027803f1939734dd", "shasum": "" }, "require": { @@ -25,7 +25,7 @@ "ext-json": "*", "ext-mbstring": "*", "ext-simplexml": "*", - "php": "^7.0 || ^8.0" + "php": "^7.1 || ^8.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "*", @@ -69,9 +69,9 @@ ], "support": { "issues": "https://github.com/beberlei/assert/issues", - "source": "https://github.com/beberlei/assert/tree/v3.3.2" + "source": "https://github.com/beberlei/assert/tree/v3.3.3" }, - "time": "2021-12-16T21:41:27+00:00" + "time": "2024-07-15T13:18:35+00:00" }, { "name": "composer/semver", @@ -988,16 +988,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.12.7", + "version": "1.12.8", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "dc2b9976bd8b0f84ec9b0e50cc35378551de7af0" + "reference": "f6a60a4d66142b8156c9da923f1972657bc4748c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/dc2b9976bd8b0f84ec9b0e50cc35378551de7af0", - "reference": "dc2b9976bd8b0f84ec9b0e50cc35378551de7af0", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f6a60a4d66142b8156c9da923f1972657bc4748c", + "reference": "f6a60a4d66142b8156c9da923f1972657bc4748c", "shasum": "" }, "require": { @@ -1042,7 +1042,7 @@ "type": "github" } ], - "time": "2024-10-18T11:12:07+00:00" + "time": "2024-11-06T19:06:49+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", diff --git a/vendor/beberlei/assert/composer.json b/vendor/beberlei/assert/composer.json index 1485a0084..cbf18a953 100644 --- a/vendor/beberlei/assert/composer.json +++ b/vendor/beberlei/assert/composer.json @@ -23,7 +23,7 @@ "sort-packages": true }, "require": { - "php": "^7.0 || ^8.0", + "php": "^7.1 || ^8.0", "ext-simplexml": "*", "ext-mbstring": "*", "ext-ctype": "*", diff --git a/vendor/beberlei/assert/lib/Assert/Assert.php b/vendor/beberlei/assert/lib/Assert/Assert.php index 3614b3455..201bce57d 100644 --- a/vendor/beberlei/assert/lib/Assert/Assert.php +++ b/vendor/beberlei/assert/lib/Assert/Assert.php @@ -42,7 +42,7 @@ abstract class Assert * The assertion chain can be stateful, that means be careful when you reuse * it. You should never pass around the chain. */ - public static function that($value, $defaultMessage = null, string $defaultPropertyPath = null): AssertionChain + public static function that($value, $defaultMessage = null, ?string $defaultPropertyPath = null): AssertionChain { $assertionChain = new AssertionChain($value, $defaultMessage, $defaultPropertyPath); @@ -55,7 +55,7 @@ public static function that($value, $defaultMessage = null, string $defaultPrope * @param mixed $values * @param string|callable|null $defaultMessage */ - public static function thatAll($values, $defaultMessage = null, string $defaultPropertyPath = null): AssertionChain + public static function thatAll($values, $defaultMessage = null, ?string $defaultPropertyPath = null): AssertionChain { return static::that($values, $defaultMessage, $defaultPropertyPath)->all(); } @@ -66,7 +66,7 @@ public static function thatAll($values, $defaultMessage = null, string $defaultP * @param mixed $value * @param string|callable|null $defaultMessage */ - public static function thatNullOr($value, $defaultMessage = null, string $defaultPropertyPath = null): AssertionChain + public static function thatNullOr($value, $defaultMessage = null, ?string $defaultPropertyPath = null): AssertionChain { return static::that($value, $defaultMessage, $defaultPropertyPath)->nullOr(); } diff --git a/vendor/beberlei/assert/lib/Assert/Assertion.php b/vendor/beberlei/assert/lib/Assert/Assertion.php index 243e64d28..81bc97809 100644 --- a/vendor/beberlei/assert/lib/Assert/Assertion.php +++ b/vendor/beberlei/assert/lib/Assert/Assertion.php @@ -307,7 +307,7 @@ class Assertion * * @throws AssertionFailedException */ - public static function eq($value, $value2, $message = null, string $propertyPath = null): bool + public static function eq($value, $value2, $message = null, ?string $propertyPath = null): bool { if ($value != $value2) { $message = \sprintf( @@ -331,7 +331,7 @@ public static function eq($value, $value2, $message = null, string $propertyPath * * @throws AssertionFailedException */ - public static function eqArraySubset($value, $value2, $message = null, string $propertyPath = null): bool + public static function eqArraySubset($value, $value2, $message = null, ?string $propertyPath = null): bool { static::isArray($value, $message, $propertyPath); static::isArray($value2, $message, $propertyPath); @@ -358,7 +358,7 @@ public static function eqArraySubset($value, $value2, $message = null, string $p * * @throws AssertionFailedException */ - public static function same($value, $value2, $message = null, string $propertyPath = null): bool + public static function same($value, $value2, $message = null, ?string $propertyPath = null): bool { if ($value !== $value2) { $message = \sprintf( @@ -382,7 +382,7 @@ public static function same($value, $value2, $message = null, string $propertyPa * * @throws AssertionFailedException */ - public static function notEq($value1, $value2, $message = null, string $propertyPath = null): bool + public static function notEq($value1, $value2, $message = null, ?string $propertyPath = null): bool { if ($value1 == $value2) { $message = \sprintf( @@ -412,7 +412,7 @@ public static function notEq($value1, $value2, $message = null, string $property * * @throws AssertionFailedException */ - public static function notSame($value1, $value2, $message = null, string $propertyPath = null): bool + public static function notSame($value1, $value2, $message = null, ?string $propertyPath = null): bool { if ($value1 === $value2) { $message = \sprintf( @@ -434,7 +434,7 @@ public static function notSame($value1, $value2, $message = null, string $proper * * @throws AssertionFailedException */ - public static function notInArray($value, array $choices, $message = null, string $propertyPath = null): bool + public static function notInArray($value, array $choices, $message = null, ?string $propertyPath = null): bool { if (true === \in_array($value, $choices)) { $message = \sprintf( @@ -461,7 +461,7 @@ public static function notInArray($value, array $choices, $message = null, strin * * @throws AssertionFailedException */ - public static function integer($value, $message = null, string $propertyPath = null): bool + public static function integer($value, $message = null, ?string $propertyPath = null): bool { if (!\is_int($value)) { $message = \sprintf( @@ -488,7 +488,7 @@ public static function integer($value, $message = null, string $propertyPath = n * * @throws AssertionFailedException */ - public static function float($value, $message = null, string $propertyPath = null): bool + public static function float($value, $message = null, ?string $propertyPath = null): bool { if (!\is_float($value)) { $message = \sprintf( @@ -515,7 +515,7 @@ public static function float($value, $message = null, string $propertyPath = nul * * @throws AssertionFailedException */ - public static function digit($value, $message = null, string $propertyPath = null): bool + public static function digit($value, $message = null, ?string $propertyPath = null): bool { if (!\ctype_digit((string)$value)) { $message = \sprintf( @@ -537,7 +537,7 @@ public static function digit($value, $message = null, string $propertyPath = nul * * @throws AssertionFailedException */ - public static function integerish($value, $message = null, string $propertyPath = null): bool + public static function integerish($value, $message = null, ?string $propertyPath = null): bool { if ( \is_resource($value) || @@ -577,7 +577,7 @@ public static function integerish($value, $message = null, string $propertyPath * * @throws AssertionFailedException */ - public static function boolean($value, $message = null, string $propertyPath = null): bool + public static function boolean($value, $message = null, ?string $propertyPath = null): bool { if (!\is_bool($value)) { $message = \sprintf( @@ -604,7 +604,7 @@ public static function boolean($value, $message = null, string $propertyPath = n * * @throws AssertionFailedException */ - public static function scalar($value, $message = null, string $propertyPath = null): bool + public static function scalar($value, $message = null, ?string $propertyPath = null): bool { if (!\is_scalar($value)) { $message = \sprintf( @@ -631,7 +631,7 @@ public static function scalar($value, $message = null, string $propertyPath = nu * * @throws AssertionFailedException */ - public static function notEmpty($value, $message = null, string $propertyPath = null): bool + public static function notEmpty($value, $message = null, ?string $propertyPath = null): bool { if (empty($value)) { $message = \sprintf( @@ -658,7 +658,7 @@ public static function notEmpty($value, $message = null, string $propertyPath = * * @throws AssertionFailedException */ - public static function noContent($value, $message = null, string $propertyPath = null): bool + public static function noContent($value, $message = null, ?string $propertyPath = null): bool { if (!empty($value)) { $message = \sprintf( @@ -683,7 +683,7 @@ public static function noContent($value, $message = null, string $propertyPath = * * @return bool */ - public static function null($value, $message = null, string $propertyPath = null): bool + public static function null($value, $message = null, ?string $propertyPath = null): bool { if (null !== $value) { $message = \sprintf( @@ -710,7 +710,7 @@ public static function null($value, $message = null, string $propertyPath = null * * @throws AssertionFailedException */ - public static function notNull($value, $message = null, string $propertyPath = null): bool + public static function notNull($value, $message = null, ?string $propertyPath = null): bool { if (null === $value) { $message = \sprintf( @@ -737,7 +737,7 @@ public static function notNull($value, $message = null, string $propertyPath = n * * @throws AssertionFailedException */ - public static function string($value, $message = null, string $propertyPath = null) + public static function string($value, $message = null, ?string $propertyPath = null) { if (!\is_string($value)) { $message = \sprintf( @@ -766,7 +766,7 @@ public static function string($value, $message = null, string $propertyPath = nu * * @throws AssertionFailedException */ - public static function regex($value, $pattern, $message = null, string $propertyPath = null): bool + public static function regex($value, $pattern, $message = null, ?string $propertyPath = null): bool { static::string($value, $message, $propertyPath); @@ -794,7 +794,7 @@ public static function regex($value, $pattern, $message = null, string $property * * @throws AssertionFailedException */ - public static function notRegex($value, $pattern, $message = null, string $propertyPath = null): bool + public static function notRegex($value, $pattern, $message = null, ?string $propertyPath = null): bool { static::string($value, $message, $propertyPath); @@ -825,7 +825,7 @@ public static function notRegex($value, $pattern, $message = null, string $prope * * @throws AssertionFailedException */ - public static function length($value, $length, $message = null, string $propertyPath = null, $encoding = 'utf8'): bool + public static function length($value, $length, $message = null, ?string $propertyPath = null, $encoding = 'utf8'): bool { static::string($value, $message, $propertyPath); @@ -858,7 +858,7 @@ public static function length($value, $length, $message = null, string $property * * @throws AssertionFailedException */ - public static function minLength($value, $minLength, $message = null, string $propertyPath = null, $encoding = 'utf8'): bool + public static function minLength($value, $minLength, $message = null, ?string $propertyPath = null, $encoding = 'utf8'): bool { static::string($value, $message, $propertyPath); @@ -891,7 +891,7 @@ public static function minLength($value, $minLength, $message = null, string $pr * * @throws AssertionFailedException */ - public static function maxLength($value, $maxLength, $message = null, string $propertyPath = null, $encoding = 'utf8'): bool + public static function maxLength($value, $maxLength, $message = null, ?string $propertyPath = null, $encoding = 'utf8'): bool { static::string($value, $message, $propertyPath); @@ -925,7 +925,7 @@ public static function maxLength($value, $maxLength, $message = null, string $pr * * @throws AssertionFailedException */ - public static function betweenLength($value, $minLength, $maxLength, $message = null, string $propertyPath = null, $encoding = 'utf8'): bool + public static function betweenLength($value, $minLength, $maxLength, $message = null, ?string $propertyPath = null, $encoding = 'utf8'): bool { static::string($value, $message, $propertyPath); static::minLength($value, $minLength, $message, $propertyPath, $encoding); @@ -949,7 +949,7 @@ public static function betweenLength($value, $minLength, $maxLength, $message = * * @throws AssertionFailedException */ - public static function startsWith($string, $needle, $message = null, string $propertyPath = null, $encoding = 'utf8'): bool + public static function startsWith($string, $needle, $message = null, ?string $propertyPath = null, $encoding = 'utf8'): bool { static::string($string, $message, $propertyPath); @@ -981,7 +981,7 @@ public static function startsWith($string, $needle, $message = null, string $pro * * @throws AssertionFailedException */ - public static function endsWith($string, $needle, $message = null, string $propertyPath = null, $encoding = 'utf8'): bool + public static function endsWith($string, $needle, $message = null, ?string $propertyPath = null, $encoding = 'utf8'): bool { static::string($string, $message, $propertyPath); @@ -1015,7 +1015,7 @@ public static function endsWith($string, $needle, $message = null, string $prope * * @throws AssertionFailedException */ - public static function contains($string, $needle, $message = null, string $propertyPath = null, $encoding = 'utf8'): bool + public static function contains($string, $needle, $message = null, ?string $propertyPath = null, $encoding = 'utf8'): bool { static::string($string, $message, $propertyPath); @@ -1047,7 +1047,7 @@ public static function contains($string, $needle, $message = null, string $prope * * @throws AssertionFailedException */ - public static function notContains($string, $needle, $message = null, string $propertyPath = null, $encoding = 'utf8'): bool + public static function notContains($string, $needle, $message = null, ?string $propertyPath = null, $encoding = 'utf8'): bool { static::string($string, $message, $propertyPath); @@ -1072,7 +1072,7 @@ public static function notContains($string, $needle, $message = null, string $pr * * @throws AssertionFailedException */ - public static function choice($value, array $choices, $message = null, string $propertyPath = null): bool + public static function choice($value, array $choices, $message = null, ?string $propertyPath = null): bool { if (!\in_array($value, $choices, true)) { $message = \sprintf( @@ -1097,7 +1097,7 @@ public static function choice($value, array $choices, $message = null, string $p * * @throws AssertionFailedException */ - public static function inArray($value, array $choices, $message = null, string $propertyPath = null): bool + public static function inArray($value, array $choices, $message = null, ?string $propertyPath = null): bool { return static::choice($value, $choices, $message, $propertyPath); } @@ -1115,7 +1115,7 @@ public static function inArray($value, array $choices, $message = null, string $ * * @throws AssertionFailedException */ - public static function numeric($value, $message = null, string $propertyPath = null): bool + public static function numeric($value, $message = null, ?string $propertyPath = null): bool { if (!\is_numeric($value)) { $message = \sprintf( @@ -1140,7 +1140,7 @@ public static function numeric($value, $message = null, string $propertyPath = n * * @return bool */ - public static function isResource($value, $message = null, string $propertyPath = null): bool + public static function isResource($value, $message = null, ?string $propertyPath = null): bool { if (!\is_resource($value)) { $message = \sprintf( @@ -1167,7 +1167,7 @@ public static function isResource($value, $message = null, string $propertyPath * * @throws AssertionFailedException */ - public static function isArray($value, $message = null, string $propertyPath = null): bool + public static function isArray($value, $message = null, ?string $propertyPath = null): bool { if (!\is_array($value)) { $message = \sprintf( @@ -1194,7 +1194,7 @@ public static function isArray($value, $message = null, string $propertyPath = n * * @throws AssertionFailedException */ - public static function isTraversable($value, $message = null, string $propertyPath = null): bool + public static function isTraversable($value, $message = null, ?string $propertyPath = null): bool { if (!\is_array($value) && !$value instanceof Traversable) { $message = \sprintf( @@ -1216,7 +1216,7 @@ public static function isTraversable($value, $message = null, string $propertyPa * * @throws AssertionFailedException */ - public static function isArrayAccessible($value, $message = null, string $propertyPath = null): bool + public static function isArrayAccessible($value, $message = null, ?string $propertyPath = null): bool { if (!\is_array($value) && !$value instanceof ArrayAccess) { $message = \sprintf( @@ -1233,7 +1233,7 @@ public static function isArrayAccessible($value, $message = null, string $proper /** * Assert that value is countable. * - * @param array|Countable|ResourceBundle|SimpleXMLElement $value + * @param mixed $value * @param string|callable|null $message * @param string|null $propertyPath * @@ -1243,7 +1243,7 @@ public static function isArrayAccessible($value, $message = null, string $proper * * @throws AssertionFailedException */ - public static function isCountable($value, $message = null, string $propertyPath = null): bool + public static function isCountable($value, $message = null, ?string $propertyPath = null): bool { if (\function_exists('is_countable')) { $assert = \is_countable($value); @@ -1272,7 +1272,7 @@ public static function isCountable($value, $message = null, string $propertyPath * * @throws AssertionFailedException */ - public static function keyExists($value, $key, $message = null, string $propertyPath = null): bool + public static function keyExists($value, $key, $message = null, ?string $propertyPath = null): bool { static::isArray($value, $message, $propertyPath); @@ -1297,7 +1297,7 @@ public static function keyExists($value, $key, $message = null, string $property * * @throws AssertionFailedException */ - public static function keyNotExists($value, $key, $message = null, string $propertyPath = null): bool + public static function keyNotExists($value, $key, $message = null, ?string $propertyPath = null): bool { static::isArray($value, $message, $propertyPath); @@ -1321,7 +1321,7 @@ public static function keyNotExists($value, $key, $message = null, string $prope * * @throws AssertionFailedException */ - public static function uniqueValues(array $values, $message = null, string $propertyPath = null): bool + public static function uniqueValues(array $values, $message = null, ?string $propertyPath = null): bool { foreach ($values as $key => $value) { if (\array_search($value, $values, true) !== $key) { @@ -1346,7 +1346,7 @@ public static function uniqueValues(array $values, $message = null, string $prop * * @throws AssertionFailedException */ - public static function keyIsset($value, $key, $message = null, string $propertyPath = null): bool + public static function keyIsset($value, $key, $message = null, ?string $propertyPath = null): bool { static::isArrayAccessible($value, $message, $propertyPath); @@ -1371,7 +1371,7 @@ public static function keyIsset($value, $key, $message = null, string $propertyP * * @throws AssertionFailedException */ - public static function notEmptyKey($value, $key, $message = null, string $propertyPath = null): bool + public static function notEmptyKey($value, $key, $message = null, ?string $propertyPath = null): bool { static::keyIsset($value, $key, $message, $propertyPath); static::notEmpty($value[$key], $message, $propertyPath); @@ -1387,7 +1387,7 @@ public static function notEmptyKey($value, $key, $message = null, string $proper * * @throws AssertionFailedException */ - public static function notBlank($value, $message = null, string $propertyPath = null): bool + public static function notBlank($value, $message = null, ?string $propertyPath = null): bool { if (false === $value || (empty($value) && '0' != $value) || (\is_string($value) && '' === \trim($value))) { $message = \sprintf( @@ -1417,7 +1417,7 @@ public static function notBlank($value, $message = null, string $propertyPath = * * @throws AssertionFailedException */ - public static function isInstanceOf($value, $className, $message = null, string $propertyPath = null): bool + public static function isInstanceOf($value, $className, $message = null, ?string $propertyPath = null): bool { if (!($value instanceof $className)) { $message = \sprintf( @@ -1448,7 +1448,7 @@ public static function isInstanceOf($value, $className, $message = null, string * * @throws AssertionFailedException */ - public static function notIsInstanceOf($value, $className, $message = null, string $propertyPath = null): bool + public static function notIsInstanceOf($value, $className, $message = null, ?string $propertyPath = null): bool { if ($value instanceof $className) { $message = \sprintf( @@ -1472,7 +1472,7 @@ public static function notIsInstanceOf($value, $className, $message = null, stri * * @throws AssertionFailedException */ - public static function subclassOf($value, $className, $message = null, string $propertyPath = null): bool + public static function subclassOf($value, $className, $message = null, ?string $propertyPath = null): bool { if (!\is_subclass_of($value, $className)) { $message = \sprintf( @@ -1502,7 +1502,7 @@ public static function subclassOf($value, $className, $message = null, string $p * * @throws AssertionFailedException */ - public static function range($value, $minValue, $maxValue, $message = null, string $propertyPath = null): bool + public static function range($value, $minValue, $maxValue, $message = null, ?string $propertyPath = null): bool { static::numeric($value, $message, $propertyPath); @@ -1534,7 +1534,7 @@ public static function range($value, $minValue, $maxValue, $message = null, stri * * @throws AssertionFailedException */ - public static function min($value, $minValue, $message = null, string $propertyPath = null): bool + public static function min($value, $minValue, $message = null, ?string $propertyPath = null): bool { static::numeric($value, $message, $propertyPath); @@ -1565,7 +1565,7 @@ public static function min($value, $minValue, $message = null, string $propertyP * * @throws AssertionFailedException */ - public static function max($value, $maxValue, $message = null, string $propertyPath = null): bool + public static function max($value, $maxValue, $message = null, ?string $propertyPath = null): bool { static::numeric($value, $message, $propertyPath); @@ -1590,7 +1590,7 @@ public static function max($value, $maxValue, $message = null, string $propertyP * * @throws AssertionFailedException */ - public static function file($value, $message = null, string $propertyPath = null): bool + public static function file($value, $message = null, ?string $propertyPath = null): bool { static::string($value, $message, $propertyPath); static::notEmpty($value, $message, $propertyPath); @@ -1615,7 +1615,7 @@ public static function file($value, $message = null, string $propertyPath = null * * @throws AssertionFailedException */ - public static function directory($value, $message = null, string $propertyPath = null): bool + public static function directory($value, $message = null, ?string $propertyPath = null): bool { static::string($value, $message, $propertyPath); @@ -1639,7 +1639,7 @@ public static function directory($value, $message = null, string $propertyPath = * * @throws AssertionFailedException */ - public static function readable($value, $message = null, string $propertyPath = null): bool + public static function readable($value, $message = null, ?string $propertyPath = null): bool { static::string($value, $message, $propertyPath); @@ -1663,7 +1663,7 @@ public static function readable($value, $message = null, string $propertyPath = * * @throws AssertionFailedException */ - public static function writeable($value, $message = null, string $propertyPath = null): bool + public static function writeable($value, $message = null, ?string $propertyPath = null): bool { static::string($value, $message, $propertyPath); @@ -1692,7 +1692,7 @@ public static function writeable($value, $message = null, string $propertyPath = * * @throws AssertionFailedException */ - public static function email($value, $message = null, string $propertyPath = null): bool + public static function email($value, $message = null, ?string $propertyPath = null): bool { static::string($value, $message, $propertyPath); @@ -1726,7 +1726,7 @@ public static function email($value, $message = null, string $propertyPath = nul * @see https://github.com/symfony/Validator/blob/master/Constraints/UrlValidator.php * @see https://github.com/symfony/Validator/blob/master/Constraints/Url.php */ - public static function url($value, $message = null, string $propertyPath = null): bool + public static function url($value, $message = null, ?string $propertyPath = null): bool { static::string($value, $message, $propertyPath); @@ -1772,7 +1772,7 @@ public static function url($value, $message = null, string $propertyPath = null) * * @throws AssertionFailedException */ - public static function alnum($value, $message = null, string $propertyPath = null): bool + public static function alnum($value, $message = null, ?string $propertyPath = null): bool { try { static::regex($value, '(^([a-zA-Z]{1}[a-zA-Z0-9]*)$)', $message, $propertyPath); @@ -1801,7 +1801,7 @@ public static function alnum($value, $message = null, string $propertyPath = nul * * @throws AssertionFailedException */ - public static function true($value, $message = null, string $propertyPath = null): bool + public static function true($value, $message = null, ?string $propertyPath = null): bool { if (true !== $value) { $message = \sprintf( @@ -1828,7 +1828,7 @@ public static function true($value, $message = null, string $propertyPath = null * * @throws AssertionFailedException */ - public static function false($value, $message = null, string $propertyPath = null): bool + public static function false($value, $message = null, ?string $propertyPath = null): bool { if (false !== $value) { $message = \sprintf( @@ -1855,7 +1855,7 @@ public static function false($value, $message = null, string $propertyPath = nul * * @throws AssertionFailedException */ - public static function classExists($value, $message = null, string $propertyPath = null): bool + public static function classExists($value, $message = null, ?string $propertyPath = null): bool { if (!\class_exists($value)) { $message = \sprintf( @@ -1882,7 +1882,7 @@ public static function classExists($value, $message = null, string $propertyPath * * @throws AssertionFailedException */ - public static function interfaceExists($value, $message = null, string $propertyPath = null): bool + public static function interfaceExists($value, $message = null, ?string $propertyPath = null): bool { if (!\interface_exists($value)) { $message = \sprintf( @@ -1905,7 +1905,7 @@ public static function interfaceExists($value, $message = null, string $property * * @throws AssertionFailedException */ - public static function implementsInterface($class, $interfaceName, $message = null, string $propertyPath = null): bool + public static function implementsInterface($class, $interfaceName, $message = null, ?string $propertyPath = null): bool { try { $reflection = new ReflectionClass($class); @@ -1948,7 +1948,7 @@ public static function implementsInterface($class, $interfaceName, $message = nu * * @throws AssertionFailedException */ - public static function isJsonString($value, $message = null, string $propertyPath = null): bool + public static function isJsonString($value, $message = null, ?string $propertyPath = null): bool { if (null === \json_decode($value) && JSON_ERROR_NONE !== \json_last_error()) { $message = \sprintf( @@ -1972,7 +1972,7 @@ public static function isJsonString($value, $message = null, string $propertyPat * * @throws AssertionFailedException */ - public static function uuid($value, $message = null, string $propertyPath = null): bool + public static function uuid($value, $message = null, ?string $propertyPath = null): bool { $value = \str_replace(['urn:', 'uuid:', '{', '}'], '', $value); @@ -2002,7 +2002,7 @@ public static function uuid($value, $message = null, string $propertyPath = null * * @throws AssertionFailedException */ - public static function e164($value, $message = null, string $propertyPath = null): bool + public static function e164($value, $message = null, ?string $propertyPath = null): bool { if (!\preg_match('/^\+?[1-9]\d{1,14}$/', $value)) { $message = \sprintf( @@ -2028,7 +2028,7 @@ public static function e164($value, $message = null, string $propertyPath = null * * @throws AssertionFailedException */ - public static function count($countable, $count, $message = null, string $propertyPath = null): bool + public static function count($countable, $count, $message = null, ?string $propertyPath = null): bool { if ($count !== \count($countable)) { $message = \sprintf( @@ -2052,7 +2052,7 @@ public static function count($countable, $count, $message = null, string $proper * * @throws AssertionFailedException */ - public static function minCount($countable, $count, $message = null, string $propertyPath = null): bool + public static function minCount($countable, $count, $message = null, ?string $propertyPath = null): bool { if ($count > \count($countable)) { $message = \sprintf( @@ -2076,7 +2076,7 @@ public static function minCount($countable, $count, $message = null, string $pro * * @throws AssertionFailedException */ - public static function maxCount($countable, $count, $message = null, string $propertyPath = null): bool + public static function maxCount($countable, $count, $message = null, ?string $propertyPath = null): bool { if ($count < \count($countable)) { $message = \sprintf( @@ -2147,7 +2147,7 @@ public static function __callStatic($method, $args) * * @throws AssertionFailedException */ - public static function choicesNotEmpty(array $values, array $choices, $message = null, string $propertyPath = null): bool + public static function choicesNotEmpty(array $values, array $choices, $message = null, ?string $propertyPath = null): bool { static::notEmpty($values, $message, $propertyPath); @@ -2167,7 +2167,7 @@ public static function choicesNotEmpty(array $values, array $choices, $message = * * @throws AssertionFailedException */ - public static function methodExists($value, $object, $message = null, string $propertyPath = null): bool + public static function methodExists($value, $object, $message = null, ?string $propertyPath = null): bool { static::isObject($object, $message, $propertyPath); @@ -2196,7 +2196,7 @@ public static function methodExists($value, $object, $message = null, string $pr * * @throws AssertionFailedException */ - public static function isObject($value, $message = null, string $propertyPath = null): bool + public static function isObject($value, $message = null, ?string $propertyPath = null): bool { if (!\is_object($value)) { $message = \sprintf( @@ -2219,7 +2219,7 @@ public static function isObject($value, $message = null, string $propertyPath = * * @throws AssertionFailedException */ - public static function lessThan($value, $limit, $message = null, string $propertyPath = null): bool + public static function lessThan($value, $limit, $message = null, ?string $propertyPath = null): bool { if ($value >= $limit) { $message = \sprintf( @@ -2243,7 +2243,7 @@ public static function lessThan($value, $limit, $message = null, string $propert * * @throws AssertionFailedException */ - public static function lessOrEqualThan($value, $limit, $message = null, string $propertyPath = null): bool + public static function lessOrEqualThan($value, $limit, $message = null, ?string $propertyPath = null): bool { if ($value > $limit) { $message = \sprintf( @@ -2267,7 +2267,7 @@ public static function lessOrEqualThan($value, $limit, $message = null, string $ * * @throws AssertionFailedException */ - public static function greaterThan($value, $limit, $message = null, string $propertyPath = null): bool + public static function greaterThan($value, $limit, $message = null, ?string $propertyPath = null): bool { if ($value <= $limit) { $message = \sprintf( @@ -2291,7 +2291,7 @@ public static function greaterThan($value, $limit, $message = null, string $prop * * @throws AssertionFailedException */ - public static function greaterOrEqualThan($value, $limit, $message = null, string $propertyPath = null): bool + public static function greaterOrEqualThan($value, $limit, $message = null, ?string $propertyPath = null): bool { if ($value < $limit) { $message = \sprintf( @@ -2317,7 +2317,7 @@ public static function greaterOrEqualThan($value, $limit, $message = null, strin * * @throws AssertionFailedException */ - public static function between($value, $lowerLimit, $upperLimit, $message = null, string $propertyPath = null): bool + public static function between($value, $lowerLimit, $upperLimit, $message = null, ?string $propertyPath = null): bool { if ($lowerLimit > $value || $value > $upperLimit) { $message = \sprintf( @@ -2344,7 +2344,7 @@ public static function between($value, $lowerLimit, $upperLimit, $message = null * * @throws AssertionFailedException */ - public static function betweenExclusive($value, $lowerLimit, $upperLimit, $message = null, string $propertyPath = null): bool + public static function betweenExclusive($value, $lowerLimit, $upperLimit, $message = null, ?string $propertyPath = null): bool { if ($lowerLimit >= $value || $value >= $upperLimit) { $message = \sprintf( @@ -2368,7 +2368,7 @@ public static function betweenExclusive($value, $lowerLimit, $upperLimit, $messa * * @throws AssertionFailedException */ - public static function extensionLoaded($value, $message = null, string $propertyPath = null): bool + public static function extensionLoaded($value, $message = null, ?string $propertyPath = null): bool { if (!\extension_loaded($value)) { $message = \sprintf( @@ -2394,7 +2394,7 @@ public static function extensionLoaded($value, $message = null, string $property * * @see http://php.net/manual/function.date.php#refsect1-function.date-parameters */ - public static function date($value, $format, $message = null, string $propertyPath = null): bool + public static function date($value, $format, $message = null, ?string $propertyPath = null): bool { static::string($value, $message, $propertyPath); static::string($format, $message, $propertyPath); @@ -2422,7 +2422,7 @@ public static function date($value, $format, $message = null, string $propertyPa * * @throws AssertionFailedException */ - public static function objectOrClass($value, $message = null, string $propertyPath = null): bool + public static function objectOrClass($value, $message = null, ?string $propertyPath = null): bool { if (!\is_object($value)) { static::classExists($value, $message, $propertyPath); @@ -2440,7 +2440,7 @@ public static function objectOrClass($value, $message = null, string $propertyPa * * @throws AssertionFailedException */ - public static function propertyExists($value, $property, $message = null, string $propertyPath = null): bool + public static function propertyExists($value, $property, $message = null, ?string $propertyPath = null): bool { static::objectOrClass($value); @@ -2465,7 +2465,7 @@ public static function propertyExists($value, $property, $message = null, string * * @throws AssertionFailedException */ - public static function propertiesExist($value, array $properties, $message = null, string $propertyPath = null): bool + public static function propertiesExist($value, array $properties, $message = null, ?string $propertyPath = null): bool { static::objectOrClass($value); static::allString($properties, $message, $propertyPath); @@ -2500,7 +2500,7 @@ public static function propertiesExist($value, array $properties, $message = nul * * @throws AssertionFailedException */ - public static function version($version1, $operator, $version2, $message = null, string $propertyPath = null): bool + public static function version($version1, $operator, $version2, $message = null, ?string $propertyPath = null): bool { static::notEmpty($operator, 'versionCompare operator is required and cannot be empty.'); @@ -2527,7 +2527,7 @@ public static function version($version1, $operator, $version2, $message = null, * * @throws AssertionFailedException */ - public static function phpVersion($operator, $version, $message = null, string $propertyPath = null): bool + public static function phpVersion($operator, $version, $message = null, ?string $propertyPath = null): bool { static::defined('PHP_VERSION'); @@ -2544,7 +2544,7 @@ public static function phpVersion($operator, $version, $message = null, string $ * * @throws AssertionFailedException */ - public static function extensionVersion($extension, $operator, $version, $message = null, string $propertyPath = null): bool + public static function extensionVersion($extension, $operator, $version, $message = null, ?string $propertyPath = null): bool { static::extensionLoaded($extension, $message, $propertyPath); @@ -2564,7 +2564,7 @@ public static function extensionVersion($extension, $operator, $version, $messag * * @throws AssertionFailedException */ - public static function isCallable($value, $message = null, string $propertyPath = null): bool + public static function isCallable($value, $message = null, ?string $propertyPath = null): bool { if (!\is_callable($value)) { $message = \sprintf( @@ -2589,7 +2589,7 @@ public static function isCallable($value, $message = null, string $propertyPath * * @throws AssertionFailedException */ - public static function satisfy($value, $callback, $message = null, string $propertyPath = null): bool + public static function satisfy($value, $callback, $message = null, ?string $propertyPath = null): bool { static::isCallable($callback); @@ -2617,7 +2617,7 @@ public static function satisfy($value, $callback, $message = null, string $prope * * @see http://php.net/manual/filter.filters.flags.php */ - public static function ip($value, $flag = null, $message = null, string $propertyPath = null): bool + public static function ip($value, $flag = null, $message = null, ?string $propertyPath = null): bool { static::string($value, $message, $propertyPath); if ($flag === null) { @@ -2648,7 +2648,7 @@ public static function ip($value, $flag = null, $message = null, string $propert * * @see http://php.net/manual/filter.filters.flags.php */ - public static function ipv4($value, $flag = null, $message = null, string $propertyPath = null): bool + public static function ipv4($value, $flag = null, $message = null, ?string $propertyPath = null): bool { static::ip($value, $flag | FILTER_FLAG_IPV4, static::generateMessage($message ?: 'Value "%s" was expected to be a valid IPv4 address.'), $propertyPath); @@ -2667,7 +2667,7 @@ public static function ipv4($value, $flag = null, $message = null, string $prope * * @see http://php.net/manual/filter.filters.flags.php */ - public static function ipv6($value, $flag = null, $message = null, string $propertyPath = null): bool + public static function ipv6($value, $flag = null, $message = null, ?string $propertyPath = null): bool { static::ip($value, $flag | FILTER_FLAG_IPV6, static::generateMessage($message ?: 'Value "%s" was expected to be a valid IPv6 address.'), $propertyPath); @@ -2680,7 +2680,7 @@ public static function ipv6($value, $flag = null, $message = null, string $prope * @param mixed $constant * @param string|callable|null $message */ - public static function defined($constant, $message = null, string $propertyPath = null): bool + public static function defined($constant, $message = null, ?string $propertyPath = null): bool { if (!\defined($constant)) { $message = \sprintf(static::generateMessage($message ?: 'Value "%s" expected to be a defined constant.'), $constant); @@ -2699,7 +2699,7 @@ public static function defined($constant, $message = null, string $propertyPath * * @throws AssertionFailedException */ - public static function base64($value, $message = null, string $propertyPath = null): bool + public static function base64($value, $message = null, ?string $propertyPath = null): bool { if (false === \base64_decode($value, true)) { $message = \sprintf(static::generateMessage($message ?: 'Value "%s" is not a valid base64 string.'), $value); diff --git a/vendor/beberlei/assert/lib/Assert/AssertionChain.php b/vendor/beberlei/assert/lib/Assert/AssertionChain.php index 4c444350f..8d1f1b3c1 100644 --- a/vendor/beberlei/assert/lib/Assert/AssertionChain.php +++ b/vendor/beberlei/assert/lib/Assert/AssertionChain.php @@ -151,7 +151,7 @@ class AssertionChain * @param mixed $value * @param string|callable|null $defaultMessage */ - public function __construct($value, $defaultMessage = null, string $defaultPropertyPath = null) + public function __construct($value, $defaultMessage = null, ?string $defaultPropertyPath = null) { $this->value = $value; $this->defaultMessage = $defaultMessage; diff --git a/vendor/beberlei/assert/lib/Assert/InvalidArgumentException.php b/vendor/beberlei/assert/lib/Assert/InvalidArgumentException.php index 9516e0774..54f85aad2 100644 --- a/vendor/beberlei/assert/lib/Assert/InvalidArgumentException.php +++ b/vendor/beberlei/assert/lib/Assert/InvalidArgumentException.php @@ -31,7 +31,7 @@ class InvalidArgumentException extends \InvalidArgumentException implements Asse */ private $constraints; - public function __construct($message, $code, string $propertyPath = null, $value = null, array $constraints = []) + public function __construct($message, $code, ?string $propertyPath = null, $value = null, array $constraints = []) { parent::__construct($message, $code); diff --git a/vendor/beberlei/assert/lib/Assert/LazyAssertion.php b/vendor/beberlei/assert/lib/Assert/LazyAssertion.php index b3052178b..f7b6cd719 100644 --- a/vendor/beberlei/assert/lib/Assert/LazyAssertion.php +++ b/vendor/beberlei/assert/lib/Assert/LazyAssertion.php @@ -133,7 +133,7 @@ class LazyAssertion * * @return static */ - public function that($value, string $propertyPath = null, $defaultMessage = null) + public function that($value, ?string $propertyPath = null, $defaultMessage = null) { $this->currentChainFailed = false; $this->thisChainTryAll = false; diff --git a/vendor/beberlei/assert/lib/Assert/functions.php b/vendor/beberlei/assert/lib/Assert/functions.php index 1a4e84d92..77cdcedda 100644 --- a/vendor/beberlei/assert/lib/Assert/functions.php +++ b/vendor/beberlei/assert/lib/Assert/functions.php @@ -32,7 +32,7 @@ * The assertion chain can be stateful, that means be careful when you reuse * it. You should never pass around the chain. */ -function that($value, $defaultMessage = null, string $defaultPropertyPath = null): AssertionChain +function that($value, $defaultMessage = null, ?string $defaultPropertyPath = null): AssertionChain { return Assert::that($value, $defaultMessage, $defaultPropertyPath); } @@ -44,7 +44,7 @@ function that($value, $defaultMessage = null, string $defaultPropertyPath = null * @param string|callable|null $defaultMessage * @param string $defaultPropertyPath */ -function thatAll($values, $defaultMessage = null, string $defaultPropertyPath = null): AssertionChain +function thatAll($values, $defaultMessage = null, ?string $defaultPropertyPath = null): AssertionChain { return Assert::thatAll($values, $defaultMessage, $defaultPropertyPath); } @@ -58,7 +58,7 @@ function thatAll($values, $defaultMessage = null, string $defaultPropertyPath = * * @deprecated In favour of Assert::thatNullOr($value, $defaultMessage = null, $defaultPropertyPath = null) */ -function thatNullOr($value, $defaultMessage = null, string $defaultPropertyPath = null): AssertionChain +function thatNullOr($value, $defaultMessage = null, ?string $defaultPropertyPath = null): AssertionChain { return Assert::thatNullOr($value, $defaultMessage, $defaultPropertyPath); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index be5448053..9dae8af30 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -2,17 +2,17 @@ "packages": [ { "name": "beberlei/assert", - "version": "v3.3.2", - "version_normalized": "3.3.2.0", + "version": "v3.3.3", + "version_normalized": "3.3.3.0", "source": { "type": "git", "url": "https://github.com/beberlei/assert.git", - "reference": "cb70015c04be1baee6f5f5c953703347c0ac1655" + "reference": "b5fd8eacd8915a1b627b8bfc027803f1939734dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/beberlei/assert/zipball/cb70015c04be1baee6f5f5c953703347c0ac1655", - "reference": "cb70015c04be1baee6f5f5c953703347c0ac1655", + "url": "https://api.github.com/repos/beberlei/assert/zipball/b5fd8eacd8915a1b627b8bfc027803f1939734dd", + "reference": "b5fd8eacd8915a1b627b8bfc027803f1939734dd", "shasum": "" }, "require": { @@ -20,7 +20,7 @@ "ext-json": "*", "ext-mbstring": "*", "ext-simplexml": "*", - "php": "^7.0 || ^8.0" + "php": "^7.1 || ^8.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "*", @@ -31,7 +31,7 @@ "suggest": { "ext-intl": "Needed to allow Assertion::count(), Assertion::isCountable(), Assertion::minCount(), and Assertion::maxCount() to operate on ResourceBundles" }, - "time": "2021-12-16T21:41:27+00:00", + "time": "2024-07-15T13:18:35+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -66,7 +66,7 @@ ], "support": { "issues": "https://github.com/beberlei/assert/issues", - "source": "https://github.com/beberlei/assert/tree/v3.3.2" + "source": "https://github.com/beberlei/assert/tree/v3.3.3" }, "install-path": "../beberlei/assert" }, @@ -1021,17 +1021,17 @@ }, { "name": "phpstan/phpstan", - "version": "1.12.7", - "version_normalized": "1.12.7.0", + "version": "1.12.8", + "version_normalized": "1.12.8.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "dc2b9976bd8b0f84ec9b0e50cc35378551de7af0" + "reference": "f6a60a4d66142b8156c9da923f1972657bc4748c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/dc2b9976bd8b0f84ec9b0e50cc35378551de7af0", - "reference": "dc2b9976bd8b0f84ec9b0e50cc35378551de7af0", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f6a60a4d66142b8156c9da923f1972657bc4748c", + "reference": "f6a60a4d66142b8156c9da923f1972657bc4748c", "shasum": "" }, "require": { @@ -1040,7 +1040,7 @@ "conflict": { "phpstan/phpstan-shim": "*" }, - "time": "2024-10-18T11:12:07+00:00", + "time": "2024-11-06T19:06:49+00:00", "bin": [ "phpstan", "phpstan.phar" @@ -1239,17 +1239,17 @@ }, { "name": "phpstan/phpstan-symfony", - "version": "1.4.10", - "version_normalized": "1.4.10.0", + "version": "1.4.12", + "version_normalized": "1.4.12.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-symfony.git", - "reference": "f7d5782044bedf93aeb3f38e09c91148ee90e5a1" + "reference": "c7b7e7f520893621558bfbfdb2694d4364565c1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/f7d5782044bedf93aeb3f38e09c91148ee90e5a1", - "reference": "f7d5782044bedf93aeb3f38e09c91148ee90e5a1", + "url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/c7b7e7f520893621558bfbfdb2694d4364565c1d", + "reference": "c7b7e7f520893621558bfbfdb2694d4364565c1d", "shasum": "" }, "require": { @@ -1278,7 +1278,7 @@ "symfony/serializer": "^5.4", "symfony/service-contracts": "^2.2.0" }, - "time": "2024-09-26T18:14:50+00:00", + "time": "2024-11-06T10:13:18+00:00", "type": "phpstan-extension", "extra": { "phpstan": { @@ -1308,7 +1308,7 @@ "description": "Symfony Framework extensions and rules for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-symfony/issues", - "source": "https://github.com/phpstan/phpstan-symfony/tree/1.4.10" + "source": "https://github.com/phpstan/phpstan-symfony/tree/1.4.12" }, "install-path": "../phpstan/phpstan-symfony" }, @@ -1614,17 +1614,17 @@ }, { "name": "staabm/phpstan-dba", - "version": "0.2.83", - "version_normalized": "0.2.83.0", + "version": "0.2.85", + "version_normalized": "0.2.85.0", "source": { "type": "git", "url": "https://github.com/staabm/phpstan-dba.git", - "reference": "16f34c09099e14f35731e9fa9ab2af333eaf0a56" + "reference": "f55924169165d70e6eafb9479f6d061420bfdc21" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/staabm/phpstan-dba/zipball/16f34c09099e14f35731e9fa9ab2af333eaf0a56", - "reference": "16f34c09099e14f35731e9fa9ab2af333eaf0a56", + "url": "https://api.github.com/repos/staabm/phpstan-dba/zipball/f55924169165d70e6eafb9479f6d061420bfdc21", + "reference": "f55924169165d70e6eafb9479f6d061420bfdc21", "shasum": "" }, "require": { @@ -1652,7 +1652,7 @@ "tomasvotruba/unused-public": "^1.0", "vlucas/phpdotenv": "^5.4" }, - "time": "2024-10-03T10:24:37+00:00", + "time": "2024-10-28T14:28:22+00:00", "type": "phpstan-extension", "extra": { "phpstan": { @@ -1681,7 +1681,7 @@ ], "support": { "issues": "https://github.com/staabm/phpstan-dba/issues", - "source": "https://github.com/staabm/phpstan-dba/tree/0.2.83" + "source": "https://github.com/staabm/phpstan-dba/tree/0.2.85" }, "funding": [ { diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index b397fedd3..6c04829cb 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' => '6df6f2d72118b3656b45cb12b214a9b842c2bd7d', + 'reference' => 'ec4b9f268a46e305489bdc54d500d55431798df2', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -13,16 +13,16 @@ '__root__' => array( 'pretty_version' => 'dev-main', 'version' => 'dev-main', - 'reference' => '6df6f2d72118b3656b45cb12b214a9b842c2bd7d', + 'reference' => 'ec4b9f268a46e305489bdc54d500d55431798df2', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), 'dev_requirement' => false, ), 'beberlei/assert' => array( - 'pretty_version' => 'v3.3.2', - 'version' => '3.3.2.0', - 'reference' => 'cb70015c04be1baee6f5f5c953703347c0ac1655', + 'pretty_version' => 'v3.3.3', + 'version' => '3.3.3.0', + 'reference' => 'b5fd8eacd8915a1b627b8bfc027803f1939734dd', 'type' => 'library', 'install_path' => __DIR__ . '/../beberlei/assert', 'aliases' => array(), @@ -149,9 +149,9 @@ 'dev_requirement' => false, ), 'phpstan/phpstan' => array( - 'pretty_version' => '1.12.7', - 'version' => '1.12.7.0', - 'reference' => 'dc2b9976bd8b0f84ec9b0e50cc35378551de7af0', + 'pretty_version' => '1.12.8', + 'version' => '1.12.8.0', + 'reference' => 'f6a60a4d66142b8156c9da923f1972657bc4748c', 'type' => 'library', 'install_path' => __DIR__ . '/../phpstan/phpstan', 'aliases' => array(), @@ -185,9 +185,9 @@ 'dev_requirement' => false, ), 'phpstan/phpstan-symfony' => array( - 'pretty_version' => '1.4.10', - 'version' => '1.4.10.0', - 'reference' => 'f7d5782044bedf93aeb3f38e09c91148ee90e5a1', + 'pretty_version' => '1.4.12', + 'version' => '1.4.12.0', + 'reference' => 'c7b7e7f520893621558bfbfdb2694d4364565c1d', 'type' => 'phpstan-extension', 'install_path' => __DIR__ . '/../phpstan/phpstan-symfony', 'aliases' => array(), @@ -239,9 +239,9 @@ 'dev_requirement' => false, ), 'staabm/phpstan-dba' => array( - 'pretty_version' => '0.2.83', - 'version' => '0.2.83.0', - 'reference' => '16f34c09099e14f35731e9fa9ab2af333eaf0a56', + 'pretty_version' => '0.2.85', + 'version' => '0.2.85.0', + 'reference' => 'f55924169165d70e6eafb9479f6d061420bfdc21', 'type' => 'phpstan-extension', 'install_path' => __DIR__ . '/../staabm/phpstan-dba', 'aliases' => array(), diff --git a/vendor/phpstan/phpstan-symfony/extension.neon b/vendor/phpstan/phpstan-symfony/extension.neon index 512f9908d..4868bc2d9 100644 --- a/vendor/phpstan/phpstan-symfony/extension.neon +++ b/vendor/phpstan/phpstan-symfony/extension.neon @@ -66,6 +66,7 @@ parameters: - stubs/Symfony/Component/Messenger/Envelope.stub - stubs/Symfony/Component/OptionsResolver/Exception/InvalidOptionsException.stub - stubs/Symfony/Component/OptionsResolver/Options.stub + - stubs/Symfony/Component/Process/Exception/LogicException.stub - stubs/Symfony/Component/Process/Process.stub - stubs/Symfony/Component/PropertyAccess/Exception/AccessException.stub - stubs/Symfony/Component/PropertyAccess/Exception/ExceptionInterface.stub diff --git a/vendor/phpstan/phpstan-symfony/src/Symfony/ParameterDefinition.php b/vendor/phpstan/phpstan-symfony/src/Symfony/ParameterDefinition.php index e1aa2eaae..1da7723bd 100644 --- a/vendor/phpstan/phpstan-symfony/src/Symfony/ParameterDefinition.php +++ b/vendor/phpstan/phpstan-symfony/src/Symfony/ParameterDefinition.php @@ -2,6 +2,9 @@ namespace PHPStan\Symfony; +/** + * @api + */ interface ParameterDefinition { diff --git a/vendor/phpstan/phpstan-symfony/src/Symfony/ParameterMap.php b/vendor/phpstan/phpstan-symfony/src/Symfony/ParameterMap.php index ff0f52244..0c551635d 100644 --- a/vendor/phpstan/phpstan-symfony/src/Symfony/ParameterMap.php +++ b/vendor/phpstan/phpstan-symfony/src/Symfony/ParameterMap.php @@ -5,6 +5,9 @@ use PhpParser\Node\Expr; use PHPStan\Analyser\Scope; +/** + * @api + */ interface ParameterMap { diff --git a/vendor/phpstan/phpstan-symfony/src/Symfony/ServiceDefinition.php b/vendor/phpstan/phpstan-symfony/src/Symfony/ServiceDefinition.php index c7cdcd18c..6df34cba8 100644 --- a/vendor/phpstan/phpstan-symfony/src/Symfony/ServiceDefinition.php +++ b/vendor/phpstan/phpstan-symfony/src/Symfony/ServiceDefinition.php @@ -2,6 +2,9 @@ namespace PHPStan\Symfony; +/** + * @api + */ interface ServiceDefinition { diff --git a/vendor/phpstan/phpstan-symfony/src/Symfony/ServiceMap.php b/vendor/phpstan/phpstan-symfony/src/Symfony/ServiceMap.php index 6665ede01..bbd2d8a39 100644 --- a/vendor/phpstan/phpstan-symfony/src/Symfony/ServiceMap.php +++ b/vendor/phpstan/phpstan-symfony/src/Symfony/ServiceMap.php @@ -5,6 +5,9 @@ use PhpParser\Node\Expr; use PHPStan\Analyser\Scope; +/** + * @api + */ interface ServiceMap { diff --git a/vendor/phpstan/phpstan-symfony/stubs/Symfony/Component/Process/Exception/LogicException.stub b/vendor/phpstan/phpstan-symfony/stubs/Symfony/Component/Process/Exception/LogicException.stub new file mode 100644 index 000000000..cb781d6ac --- /dev/null +++ b/vendor/phpstan/phpstan-symfony/stubs/Symfony/Component/Process/Exception/LogicException.stub @@ -0,0 +1,8 @@ + */ class Process implements \IteratorAggregate { + /** + * @param int $flags + * + * @return \Generator + * + * @throws LogicException in case the output has been disabled + * @throws LogicException In case the process is not started + */ + public function getIterator(int $flags = 0): \Generator + { + + } + } diff --git a/vendor/phpstan/phpstan/phpstan.phar b/vendor/phpstan/phpstan/phpstan.phar index 6668bee4a..5fb8b6313 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 20c53718f..8cb8cf09b 100644 --- a/vendor/phpstan/phpstan/phpstan.phar.asc +++ b/vendor/phpstan/phpstan/phpstan.phar.asc @@ -1,16 +1,16 @@ -----BEGIN PGP SIGNATURE----- -iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmcSQmkACgkQUcZzBf/C -5cA9GQ/+KSa2ltmSTeqS6ygto9P9qZ2jZxWo6/1j5gJ4fYI7MdZZ9Tg6T5lLDaQn -o8wEvVN+KeYFS8TWMLxs5XVmta2c9r6uEXJgDeSaAkI5H4QyHeWOxKw2dp5UfJQd -MhQFQ52Qx8mmDK/QuyYdQBnOZJTRCIGUHSlh4uEWBIPguwYocZhbVarySZrOHoP1 -0a3JkRUjR5XIrR9ftktebF5TWdUa6IbcvTjb8sN3QMeHNc+fApMJPqXELhJ7LiZb -YgTSGvk9jUnuSm6zDAyJikzzH+MLG1ifxCIp8hBx9JmXg1JuGaCsbvJV1hSWLtdq -UPCNoSmr+3qvGZjbmdw5l3e69vwzQfPuKkM5heQ9lswW0KufYjVXjmoTuXjcruiJ -BsIikBgXEHC56SKT18n3qUC7MMfW2XqFku5T9YgshNEFJMpDVi2BpSZhxuRFa0hM -DQYg4SyCytxfTlj1+mMweWRHrxMVHtfym70rmvlxGGN0+IzFGQJSM5aBx2qaToXj -+99j7Rtu60fvTqu4Y5Kadewx5lP9WdbS3wYYM3KSnvUHUy5Ah7Qt30ruwuUzZmoK -uxLpbr3f4LKHAGqX2xcAMGMv45hOLpH1wmcL0dG34nacSV3OKU58oAhunyeP6NCR -JiV8sQU/frWjIX2aJlhwd7AQIdsQUeqoL36YeTgJ9IG12LkrW1Q= -=3xaL +iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmcrviwACgkQUcZzBf/C +5cCm4RAAmbBHfvvohZzqaDax4d5ynXpiqmlZYa5f5uqvR/WTQJUyr1UURJ71Nh/S ++vNktFpQJJCv4FqMy3Llz1CIiKovFpMbTK3fbUbjok/D25Zya4epWjxJ/7uBkiBt +AiY8EMuaTWgEvAvUt5fLcJ5OnOLgBoeDd2QXnNUZwwPqIO+2eS2KzzOGw03mH1lK +I4gQ7TMvbWWU3V6gprlgpcKEbLUBQcIharpDDagDn/4jl2jYWALq/x/y3p+9H5Bs +tKTpyXqxML6JkMfeyHTYICaSRxgtf0ysq/POUOVyvsFtFCzAms/yfLeO4VBsVhqM +wwB3CdKqNlvjzD8vLsJAlm0v5pPElZMju74T1bKCPIfUTn1K3hbDY13gRguUe++d +7XShl6lIh22SpZv2WkqoHa2BDKIAioDz7h1g4qHzaECIJ1VPseRsmK3fmKonI+wE +o8sNd5EWtKSF/Waa36YYQsNQTTQ34HI542ljYTbyWfnyhqmVmXkEqlHNtHR1phS/ +grDMr7ts5RvPnTNAo5PEciSCiVrZvjVuU6Q9+Xe9Q15VP5hzVizPMXKdQBUWB0fX +3if59/IA+142uHRjxQBMBButIluQzC9JpSPLv9A3NGlUuPlN2fHvjQ7LrpnbAoId +TJwuTYwsSt9jrWtWtFTM2ItkeLIUZI8GM/rMebIxj8BdYowCd7s= +=SlNJ -----END PGP SIGNATURE----- diff --git a/vendor/staabm/phpstan-dba/src/QueryReflection/QueryReflection.php b/vendor/staabm/phpstan-dba/src/QueryReflection/QueryReflection.php index f09baa9ac..f5472729a 100644 --- a/vendor/staabm/phpstan-dba/src/QueryReflection/QueryReflection.php +++ b/vendor/staabm/phpstan-dba/src/QueryReflection/QueryReflection.php @@ -77,6 +77,7 @@ public static function setupReflector(QueryReflector $reflector, RuntimeConfigur public function validateQueryString(string $queryString): ?Error { + $queryString = QuerySimulation::stripComments($queryString); $queryType = self::getQueryType($queryString); if (self::getRuntimeConfiguration()->isAnalyzingWriteQueries()) { @@ -110,6 +111,8 @@ public function validateQueryString(string $queryString): ?Error */ public function getResultType(string $queryString, int $fetchType): ?Type { + $queryString = QuerySimulation::stripComments($queryString); + if ('SELECT' !== self::getQueryType($queryString)) { return null; } @@ -397,6 +400,7 @@ private function resolveQueryStringExpr(Expr $queryExpr, Scope $scope, bool $res public static function getQueryType(string $query): ?string { + $query = QuerySimulation::stripComments($query); $query = ltrim($query); if (1 === preg_match('/^\s*\(?\s*(SELECT|SHOW|UPDATE|INSERT|DELETE|REPLACE|CREATE|CALL|OPTIMIZE)/i', $query, $matches)) { @@ -546,6 +550,8 @@ public static function getRuntimeConfiguration(): RuntimeConfiguration */ public function countPlaceholders(string $queryString): int { + $queryString = QuerySimulation::stripComments($queryString); + // match named placeholders first, as the regex involved is more specific/less error prone $namedPlaceholders = $this->extractNamedPlaceholders($queryString); @@ -573,6 +579,7 @@ public function countPlaceholders(string $queryString): int */ public function containsNamedPlaceholders(string $queryString, array $parameters): bool { + $queryString = QuerySimulation::stripComments($queryString); $namedPlaceholders = $this->extractNamedPlaceholders($queryString); if ([] !== $namedPlaceholders) { @@ -593,6 +600,8 @@ public function containsNamedPlaceholders(string $queryString, array $parameters */ public function extractNamedPlaceholders(string $queryString): array { + $queryString = QuerySimulation::stripComments($queryString); + if (preg_match_all(self::REGEX_NAMED_PLACEHOLDER, $queryString, $matches) > 0) { $candidates = $matches[0]; diff --git a/vendor/staabm/phpstan-dba/src/QueryReflection/QuerySimulation.php b/vendor/staabm/phpstan-dba/src/QueryReflection/QuerySimulation.php index 05a9997a3..00ed75a56 100644 --- a/vendor/staabm/phpstan-dba/src/QueryReflection/QuerySimulation.php +++ b/vendor/staabm/phpstan-dba/src/QueryReflection/QuerySimulation.php @@ -34,7 +34,7 @@ public static function simulateParamValueType(Type $paramType, bool $preparedPar return (string) $paramType->getValue(); } - if ($paramType->isArray()->yes()) { + if ($paramType->isIterable()->yes()) { return self::simulateParamValueType($paramType->getIterableValueType(), $preparedParam); } @@ -144,13 +144,17 @@ public static function stripTrailers(string $queryString): ?string } /** - * @see https://larrysteinle.com/2011/02/09/use-regular-expressions-to-clean-sql-statements/ * @see https://github.com/decemberster/sql-strip-comments/blob/3bef3558211a6f6191d2ad0ceb8577eda39dd303/index.js */ public static function stripComments(string $query): string { + // one line comments: from "#" to end of line, + // one line comments: from "--" to end of line, + // or multiline: from "/*" to "*/". + // string literals with sql comments omited + // nested comments are not supported return trim(preg_replace_callback( - '/("(""|[^"])*")|(\'(\'\'|[^\'])*\')|(--[^\n\r]*)|(\/\*[\w\W]*?(?=\*\/)\*\/)/m', + '/("(""|[^"])*")|(\'(\'\'|[^\'])*\')|((?:--|#)[^\n\r]*)|(\/\*[\w\W]*?(?=\*\/)\*\/)/m', static function (array $matches): string { $match = $matches[0]; $matchLength = \strlen($match); diff --git a/vendor/staabm/phpstan-dba/src/TypeMapping/MysqliTypeMapper.php b/vendor/staabm/phpstan-dba/src/TypeMapping/MysqliTypeMapper.php index 477037a25..c94cafd1e 100644 --- a/vendor/staabm/phpstan-dba/src/TypeMapping/MysqliTypeMapper.php +++ b/vendor/staabm/phpstan-dba/src/TypeMapping/MysqliTypeMapper.php @@ -28,7 +28,7 @@ final class MysqliTypeMapper public function __construct(?DbaApi $dbaApi) { $constants = get_defined_constants(true); - foreach ($constants['mysqli'] as $c => $n) { + foreach ((array) $constants['mysqli'] as $c => $n) { if (! \is_int($n)) { // skip bool constants like MYSQLI_IS_MARIADB continue;