diff --git a/composer.json b/composer.json index cb2f72b05a..3b27cd2849 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,7 @@ "nunomaduro/collision": "^8.1", "php-standard-library/phpstan-extension": "^1.0", "phpbench/phpbench": "^1.2", - "phpstan/phpstan": "^1.10.66", + "phpstan/phpstan": "1.11.x-dev#c80f35e as 1.10.66", "phpstan/phpstan-phpunit": "^1.3", "phpunit/phpunit": "^10.5", "symfony/console": "^7.0", diff --git a/composer.lock b/composer.lock index 25c79343f5..b9e196c918 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": "51ab2a3ae38d4b9df906fdab853c1fcf", + "content-hash": "c91e8ad49aa9879330c425f8bbd0eef3", "packages": [ { "name": "jrmajor/pluralrules", @@ -1527,16 +1527,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.66", + "version": "1.11.x-dev", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "94779c987e4ebd620025d9e5fdd23323903950bd" + "reference": "c80f35e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/94779c987e4ebd620025d9e5fdd23323903950bd", - "reference": "94779c987e4ebd620025d9e5fdd23323903950bd", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c80f35e", + "reference": "c80f35e", "shasum": "" }, "require": { @@ -1545,6 +1545,7 @@ "conflict": { "phpstan/phpstan-shim": "*" }, + "default-branch": true, "bin": [ "phpstan", "phpstan.phar" @@ -1579,13 +1580,9 @@ { "url": "https://github.com/phpstan", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan", - "type": "tidelift" } ], - "time": "2024-03-28T16:17:31+00:00" + "time": "2024-04-05T14:23:22+00:00" }, { "name": "phpstan/phpstan-phpunit", @@ -4773,9 +4770,18 @@ "time": "2022-05-24T19:45:58+00:00" } ], - "aliases": [], + "aliases": [ + { + "package": "phpstan/phpstan", + "version": "1.11.9999999.9999999-dev", + "alias": "1.10.66", + "alias_normalized": "1.10.66.0" + } + ], "minimum-stability": "dev", - "stability-flags": [], + "stability-flags": { + "phpstan/phpstan": 20 + }, "prefer-stable": true, "prefer-lowest": false, "platform": { diff --git a/src/Bundle/FluentBundle.php b/src/Bundle/FluentBundle.php index 6c077b7df9..807824a091 100644 --- a/src/Bundle/FluentBundle.php +++ b/src/Bundle/FluentBundle.php @@ -229,7 +229,7 @@ private function numberFunction( $number = new FluentNumber($number); } - /** @phpstan-ignore-next-line */ + /** @phpstan-ignore argument.type */ return $number->setLocale($this->locale)->setOptions($options); } diff --git a/src/Bundle/Types/FluentNumber.php b/src/Bundle/Types/FluentNumber.php index 8818c67466..f289169b79 100644 --- a/src/Bundle/Types/FluentNumber.php +++ b/src/Bundle/Types/FluentNumber.php @@ -70,7 +70,7 @@ public function original(): string public function __toString(): string { return (new NumberFormatter($this->locale))->format( - /** @phpstan-ignore-next-line */ + /** @phpstan-ignore argument.type */ $this->value, new Options(...$this->options), ); } diff --git a/src/Formatters/LocaleData.php b/src/Formatters/LocaleData.php index 3ec65a2593..65cded5064 100644 --- a/src/Formatters/LocaleData.php +++ b/src/Formatters/LocaleData.php @@ -90,7 +90,7 @@ private static function splitLocale(string $locale): array */ private static function getFiles(string $type, string $language): array { - /** @phpstan-ignore-next-line */ + /** @phpstan-ignore return.type */ return glob(self::Path . "{$type}/{$language}*.php"); } diff --git a/src/Formatters/Number/Options.php b/src/Formatters/Number/Options.php index 2e294cb01a..ee8b4dbc56 100644 --- a/src/Formatters/Number/Options.php +++ b/src/Formatters/Number/Options.php @@ -89,13 +89,13 @@ private function fillForOther(?Currency $currency): void $this->minimumFractionDigits ??= match ($this->style) { 'decimal', 'percent', 'unit' => 0, - /** @phpstan-ignore-next-line */ + /** @phpstan-ignore property.nonObject */ 'currency' => $currency->minorUnits, }; $this->maximumFractionDigits ??= match ($this->style) { 'decimal', 'unit' => max($this->minimumFractionDigits, 3), - /** @phpstan-ignore-next-line */ + /** @phpstan-ignore property.nonObject */ 'currency' => max($this->minimumFractionDigits, $currency->minorUnits), 'percent' => max($this->minimumFractionDigits, 0), }; diff --git a/tests/Helpers/Node.php b/tests/Helpers/Node.php index 5e76870aa8..b31c4f5af5 100644 --- a/tests/Helpers/Node.php +++ b/tests/Helpers/Node.php @@ -60,7 +60,7 @@ private function loadCache(): void File\write($this->path, '{}'); } - /** @phpstan-ignore-next-line */ + /** @phpstan-ignore assign.propertyType */ $this->cache = Json\decode(File\read($this->path)); } diff --git a/tests/Helpers/helpers.php b/tests/Helpers/helpers.php index 45b3e169e2..7e44ebac99 100644 --- a/tests/Helpers/helpers.php +++ b/tests/Helpers/helpers.php @@ -33,7 +33,7 @@ function count_values(array $values): array $primary = $b['count'] <=> $a['count']; $secondary = $a['value'] <=> $b['value']; - /** @phpstan-ignore-next-line */ + /** @phpstan-ignore ternary.alwaysFalse */ return $primary ?: $secondary; }); } diff --git a/tests/Parser/Literals/NumberLiteralTest.php b/tests/Parser/Literals/NumberLiteralTest.php index 0e2f458cba..c3e71cabb4 100644 --- a/tests/Parser/Literals/NumberLiteralTest.php +++ b/tests/Parser/Literals/NumberLiteralTest.php @@ -62,7 +62,7 @@ private static function assertValueAndPrecision( ): void { $ast = (new FluentParser(true))->parseEntry($ftl); - /** @phpstan-ignore-next-line */ + /** @phpstan-ignore property.notFound */ $expr = $ast->value->elements[0]->expression; $parsed = Type\instance_of(NumberLiteralValue::class)->coerce($expr->parse()); diff --git a/tests/Parser/Literals/StringLiteralTest.php b/tests/Parser/Literals/StringLiteralTest.php index ff7e8068fb..2bc2e6cfe8 100644 --- a/tests/Parser/Literals/StringLiteralTest.php +++ b/tests/Parser/Literals/StringLiteralTest.php @@ -51,7 +51,7 @@ private static function assertValue(string $value, string $ftl): void { $ast = (new FluentParser(true))->parseEntry($ftl); - /** @phpstan-ignore-next-line */ + /** @phpstan-ignore property.notFound */ $expr = $ast->value->elements[0]->expression; $parsed = Type\instance_of(StringLiteralValue::class)->coerce($expr->parse());