Skip to content

feat: add support for phpstan>=2.1.12 #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nunomaduro merged 8 commits into from
Apr 25, 2025
Merged

feat: add support for phpstan>=2.1.12 #47

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d998e40
feat: add support for phpstan>=2.1.12
maxwellmezadre Apr 16, 2025
07f66c5
refactor: add named arguments
maxwellmezadre Apr 17, 2025
e8cf76b
refactor: improve readability and maintainability
maxwellmezadre Apr 19, 2025
8216d24
refactor: improve readability and maintainability
maxwellmezadre Apr 19, 2025
f1d1a3e
refactor: improve readability and maintainability
maxwellmezadre Apr 19, 2025
5889f5d
Merge remote-tracking branch 'origin/3.x' into 3.x
maxwellmezadre Apr 19, 2025
8cae11a
refactor: revert fix description
maxwellmezadre Apr 19, 2025
c65a9d7
Merge branch '3.x' into 3.x
maxwellmezadre Apr 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
150 changes: 7 additions & 143 deletions src/PHPStanAnalyser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,15 @@

namespace Pest\TypeCoverage;

use Composer\InstalledVersions;
use PhpParser\Node;
use PHPStan\Analyser\Analyser;
use PHPStan\Analyser\FileAnalyser;
use PHPStan\Analyser\IgnoreErrorExtensionProvider;
use PHPStan\Analyser\LocalIgnoresProcessor;
use PHPStan\Analyser\NodeScopeResolver;
use PHPStan\Analyser\RuleErrorTransformer;
use PHPStan\Collectors\Collector;
use PHPStan\Collectors\Registry;
use PHPStan\Dependency\DependencyResolver;
use PHPStan\DependencyInjection\Container;
use PHPStan\DependencyInjection\Reflection\ClassReflectionExtensionRegistryProvider;
use PHPStan\DependencyInjection\Type\DynamicThrowTypeExtensionProvider;
use PHPStan\DependencyInjection\Type\ParameterClosureTypeExtensionProvider;
use PHPStan\DependencyInjection\Type\ParameterOutTypeExtensionProvider;
use PHPStan\File\FileHelper;
use PHPStan\Php\PhpVersion;
use PHPStan\PhpDoc\PhpDocInheritanceResolver;
use PHPStan\PhpDoc\StubPhpDocProvider;
use PHPStan\Reflection\AttributeReflectionFactory;
use PHPStan\Reflection\Deprecation\DeprecationProvider;
use PHPStan\Reflection\InitializerExprTypeResolver;
use PHPStan\Reflection\ReflectionProvider;
use PHPStan\Reflection\SignatureMap\SignatureMapProvider;
use PHPStan\Rules\DirectRegistry;
use PHPStan\Rules\Properties\ReadWritePropertiesExtensionProvider;
use PHPStan\Rules\Rule;
use PHPStan\Type\FileTypeMapper;

/**
* @internal
Expand All @@ -47,128 +27,12 @@ final class PHPStanAnalyser
*/
public static function make(Container $container, array $rules, array $collectors): Analyser
{
$ruleRegistry = new DirectRegistry($rules);
$collectorRegistry = new Registry($collectors);

$reflectionProvider = $container->getByType(ReflectionProvider::class);
$typeSpecifier = $container->getService('typeSpecifier');

$scopeFactory = TestCaseForTypeCoverage::createScopeFactory($reflectionProvider, $typeSpecifier); // @phpstan-ignore-line

$version = InstalledVersions::getPrettyVersion('phpstan/phpstan') ?? InstalledVersions::getPrettyVersion('phpstan/phpstan-src');
if ($version !== null && version_compare($version, '2.1.3', '>=')) {
$nodeScopeResolver = new NodeScopeResolver( // @phpstan-ignore-line
$reflectionProvider,
$container->getByType(InitializerExprTypeResolver::class),
$container->getService('betterReflectionReflector'), // @phpstan-ignore-line
$container->getByType(ClassReflectionExtensionRegistryProvider::class),
$container->getByType(ParameterOutTypeExtensionProvider::class),
$container->getService('defaultAnalysisParser'), // @phpstan-ignore-line
$container->getByType(FileTypeMapper::class),
$container->getByType(StubPhpDocProvider::class),
$container->getByType(PhpVersion::class),
$container->getByType(SignatureMapProvider::class),
$container->getByType(DeprecationProvider::class),
$container->getByType(AttributeReflectionFactory::class),
$container->getByType(PhpDocInheritanceResolver::class),
$container->getByType(FileHelper::class),
$typeSpecifier, // @phpstan-ignore-line
$container->getByType(DynamicThrowTypeExtensionProvider::class),
$container->getByType(ReadWritePropertiesExtensionProvider::class),
$container->getByType(ParameterClosureTypeExtensionProvider::class),
$scopeFactory,
false,
true,
true, // @phpstan-ignore-line
[],
[],
[], // @phpstan-ignore-line
true,
true,
false,
);
} elseif ($version !== null && version_compare($version, '2.0.0', '>=')) {
$nodeScopeResolver = new NodeScopeResolver( // @phpstan-ignore-line
$reflectionProvider,
$container->getByType(InitializerExprTypeResolver::class),
$container->getService('betterReflectionReflector'), // @phpstan-ignore-line
$container->getByType(ClassReflectionExtensionRegistryProvider::class),
$container->getByType(ParameterOutTypeExtensionProvider::class),
$container->getService('defaultAnalysisParser'), // @phpstan-ignore-line
$container->getByType(FileTypeMapper::class),
$container->getByType(StubPhpDocProvider::class),
$container->getByType(PhpVersion::class),
$container->getByType(SignatureMapProvider::class),
$container->getByType(PhpDocInheritanceResolver::class),
$container->getByType(FileHelper::class),
$typeSpecifier, // @phpstan-ignore-line
$container->getByType(DynamicThrowTypeExtensionProvider::class),
$container->getByType(ReadWritePropertiesExtensionProvider::class),
$container->getByType(ParameterClosureTypeExtensionProvider::class),
$scopeFactory,
false,
true,
true, // @phpstan-ignore-line
[],
[],
[], // @phpstan-ignore-line
true,
true,
);
} else {
$nodeScopeResolver = new NodeScopeResolver(
$reflectionProvider,
$container->getByType(InitializerExprTypeResolver::class),
$container->getService('betterReflectionReflector'), // @phpstan-ignore-line
$container->getByType(ClassReflectionExtensionRegistryProvider::class),
$container->getByType(ParameterOutTypeExtensionProvider::class),
$container->getService('defaultAnalysisParser'), // @phpstan-ignore-line
$container->getByType(FileTypeMapper::class),
$container->getByType(StubPhpDocProvider::class),
$container->getByType(PhpVersion::class),
$container->getByType(SignatureMapProvider::class),
$container->getByType(PhpDocInheritanceResolver::class),
$container->getByType(FileHelper::class),
$typeSpecifier, // @phpstan-ignore-line
$container->getByType(DynamicThrowTypeExtensionProvider::class),
$container->getByType(ReadWritePropertiesExtensionProvider::class),
$container->getByType(ParameterClosureTypeExtensionProvider::class),
$scopeFactory,
false,
true,
[],
[],
[],
true,
true,
false,
true,
false,
false,
);
}

try {
$fileAnalyser = new FileAnalyser(
scopeFactory: $scopeFactory,
nodeScopeResolver: $nodeScopeResolver,
parser: $container->getService('defaultAnalysisParser'), // @phpstan-ignore-line
dependencyResolver: $container->getByType(DependencyResolver::class),
ignoreErrorExtensionProvider: $container->getByType(IgnoreErrorExtensionProvider::class),
ruleErrorTransformer: new RuleErrorTransformer,
localIgnoresProcessor: $container->getByType(LocalIgnoresProcessor::class),
);
} catch (\Throwable $e) {
$fileAnalyser = new FileAnalyser(
scopeFactory: $scopeFactory,
nodeScopeResolver: $nodeScopeResolver,
parser: $container->getService('defaultAnalysisParser'), // @phpstan-ignore-line
dependencyResolver: $container->getByType(DependencyResolver::class),
ruleErrorTransformer: new RuleErrorTransformer,
localIgnoresProcessor: $container->getByType(LocalIgnoresProcessor::class),
);
}

return new Analyser($fileAnalyser, $ruleRegistry, $collectorRegistry, $nodeScopeResolver, 9_999_999_999_999);
return new Analyser(
fileAnalyser: $container->getByType(FileAnalyser::class),
ruleRegistry: new DirectRegistry($rules),
collectorRegistry: new Registry($collectors),
nodeScopeResolver: $container->getByType(NodeScopeResolver::class),
internalErrorsCountLimit: 9_999_999_999_999
);
}
}