From 889d86b8b0282d440e74d5ccfa57a313cda0922b Mon Sep 17 00:00:00 2001 From: Jaapio Date: Tue, 23 Dec 2025 21:04:45 +0100 Subject: [PATCH] Remove support of eol versions of dependencies We need to move on. --- composer.json | 4 +-- composer.lock | 2 +- phpstan.neon | 28 ------------------ .../Tags/Factory/AbstractPHPStanFactory.php | 29 +++++-------------- 4 files changed, 11 insertions(+), 52 deletions(-) diff --git a/composer.json b/composer.json index 73e6197..a0ae92f 100644 --- a/composer.json +++ b/composer.json @@ -15,11 +15,11 @@ ], "require": { "php": "^7.4 || ^8.0", - "phpdocumentor/type-resolver": "^1.7|^2.x-dev", + "phpdocumentor/type-resolver": "^2.x-dev", "webmozart/assert": "^1.9.1 || ^2", "phpdocumentor/reflection-common": "^2.2", "ext-filter": "*", - "phpstan/phpdoc-parser": "^1.7|^2.0", + "phpstan/phpdoc-parser": "^2.0", "doctrine/deprecations": "^1.1" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 947ef33..8ee5b3e 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": "eb24d2656fed93011be150fd745b854b", + "content-hash": "69aa0af5bad8d21df103f96a6e42e6dc", "packages": [ { "name": "doctrine/deprecations", diff --git a/phpstan.neon b/phpstan.neon index 9ca87a2..c236577 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -3,33 +3,5 @@ parameters: ignoreErrors: - '#Method phpDocumentor\\Reflection\\DocBlock\\StandardTagFactory::createTag\(\) should return phpDocumentor\\Reflection\\DocBlock\\Tag but returns mixed#' - '#Offset 2 on array\{string, 28, int\} on left side of \?\? always exists and is not nullable\.#' - - - message: "#^Parameter \\#1 \\$constExprParser of class PHPStan\\\\PhpDocParser\\\\Parser\\\\TypeParser constructor expects PHPStan\\\\PhpDocParser\\\\Parser\\\\ConstExprParser\\|null, PHPStan\\\\PhpDocParser\\\\ParserConfig given\\.$#" - count: 1 - path: src/DocBlock/Tags/Factory/AbstractPHPStanFactory.php - - - message: "#^Parameter \\#1 \\$parseDoctrineAnnotations of class PHPStan\\\\PhpDocParser\\\\Lexer\\\\Lexer constructor expects bool, PHPStan\\\\PhpDocParser\\\\ParserConfig given\\.$#" - count: 1 - path: src/DocBlock/Tags/Factory/AbstractPHPStanFactory.php - - - message: "#^Parameter \\#1 \\$typeParser of class PHPStan\\\\PhpDocParser\\\\Parser\\\\PhpDocParser constructor expects PHPStan\\\\PhpDocParser\\\\Parser\\\\TypeParser, PHPStan\\\\PhpDocParser\\\\ParserConfig given\\.$#" - count: 1 - path: src/DocBlock/Tags/Factory/AbstractPHPStanFactory.php - - - message: "#^Parameter \\#1 \\$unescapeStrings of class PHPStan\\\\PhpDocParser\\\\Parser\\\\ConstExprParser constructor expects bool, PHPStan\\\\PhpDocParser\\\\ParserConfig given\\.$#" - count: 1 - path: src/DocBlock/Tags/Factory/AbstractPHPStanFactory.php - - - message: "#^Parameter \\#2 \\$constantExprParser of class PHPStan\\\\PhpDocParser\\\\Parser\\\\PhpDocParser constructor expects PHPStan\\\\PhpDocParser\\\\Parser\\\\ConstExprParser, PHPStan\\\\PhpDocParser\\\\Parser\\\\TypeParser given\\.$#" - count: 1 - path: src/DocBlock/Tags/Factory/AbstractPHPStanFactory.php - - - message: "#^Parameter \\#2 \\$quoteAwareConstExprString of class PHPStan\\\\PhpDocParser\\\\Parser\\\\TypeParser constructor expects bool, PHPStan\\\\PhpDocParser\\\\Parser\\\\ConstExprParser given\\.$#" - count: 1 - path: src/DocBlock/Tags/Factory/AbstractPHPStanFactory.php - - - message: "#^Parameter \\#3 \\$requireWhitespaceBeforeDescription of class PHPStan\\\\PhpDocParser\\\\Parser\\\\PhpDocParser constructor expects bool, PHPStan\\\\PhpDocParser\\\\Parser\\\\ConstExprParser given\\.$#" - count: 1 - path: src/DocBlock/Tags/Factory/AbstractPHPStanFactory.php paths: - src diff --git a/src/DocBlock/Tags/Factory/AbstractPHPStanFactory.php b/src/DocBlock/Tags/Factory/AbstractPHPStanFactory.php index f8babab..f061adf 100644 --- a/src/DocBlock/Tags/Factory/AbstractPHPStanFactory.php +++ b/src/DocBlock/Tags/Factory/AbstractPHPStanFactory.php @@ -46,27 +46,14 @@ class AbstractPHPStanFactory implements Factory public function __construct(PHPStanFactory ...$factories) { - if (class_exists(ParserConfig::class)) { - $config = new ParserConfig(['indexes' => true, 'lines' => true]); - $this->lexer = new Lexer($config); - $constParser = new ConstExprParser($config); - $this->parser = new PhpDocParser( - $config, - new TypeParser($config, $constParser), - $constParser - ); - } else { - $this->lexer = new Lexer(true); - $constParser = new ConstExprParser(true, true, ['lines' => true, 'indexes' => true]); - $this->parser = new PhpDocParser( - new TypeParser($constParser, true, ['lines' => true, 'indexes' => true]), - $constParser, - true, - true, - ['lines' => true, 'indexes' => true], - true - ); - } + $config = new ParserConfig(['indexes' => true, 'lines' => true]); + $this->lexer = new Lexer($config); + $constParser = new ConstExprParser($config); + $this->parser = new PhpDocParser( + $config, + new TypeParser($config, $constParser), + $constParser + ); $this->factories = $factories; }