Skip to content

Merge constant types #1938

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
merged 7 commits into from
Oct 30, 2022
Merged

Merge constant types #1938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1a6800b
merge constantTypes with expressionTypes
rajyan Oct 30, 2022
e286453
keep ConstFetch in anonymous function scope
rajyan Oct 30, 2022
3c6f3c0
fix tests for truthy scope type of PHP_MAJOR_VERSION
rajyan Oct 30, 2022
ecf3fe5
delete unused variables
rajyan Oct 30, 2022
a2b4275
skip specifying language level constants
rajyan Oct 30, 2022
d76ea5d
add getConstantTypes and keep constants when entering class and funct…
rajyan Oct 30, 2022
834032a
fix test
ondrejmirtes Oct 30, 2022
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
4 changes: 0 additions & 4 deletions src/Analyser/DirectScopeFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
use PHPStan\Reflection\ReflectionProvider;
use PHPStan\Rules\Properties\PropertyReflectionFinder;
use PHPStan\ShouldNotHappenException;
use PHPStan\Type\Type;
use function is_a;

/**
Expand Down Expand Up @@ -45,7 +44,6 @@ public function __construct(
}

/**
* @param array<string, Type> $constantTypes
* @param ExpressionTypeHolder[] $expressionTypes
* @param array<string, ConditionalExpressionHolder[]> $conditionalExpressions
* @param array<string, true> $currentlyAssignedExpressions
Expand All @@ -57,7 +55,6 @@ public function __construct(
public function create(
ScopeContext $context,
bool $declareStrictTypes = false,
array $constantTypes = [],
FunctionReflection|MethodReflection|null $function = null,
?string $namespace = null,
array $expressionTypes = [],
Expand Down Expand Up @@ -93,7 +90,6 @@ public function create(
$context,
$this->phpVersion,
$declareStrictTypes,
$constantTypes,
$function,
$namespace,
$expressionTypes,
Expand Down
4 changes: 0 additions & 4 deletions src/Analyser/LazyScopeFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
use PHPStan\Reflection\ReflectionProvider;
use PHPStan\Rules\Properties\PropertyReflectionFinder;
use PHPStan\ShouldNotHappenException;
use PHPStan\Type\Type;
use function is_a;

class LazyScopeFactory implements ScopeFactory
Expand All @@ -39,7 +38,6 @@ public function __construct(
}

/**
* @param array<string, Type> $constantTypes
* @param ExpressionTypeHolder[] $expressionTypes
* @param array<string, ConditionalExpressionHolder[]> $conditionalExpressions
* @param array<string, true> $currentlyAssignedExpressions
Expand All @@ -51,7 +49,6 @@ public function __construct(
public function create(
ScopeContext $context,
bool $declareStrictTypes = false,
array $constantTypes = [],
FunctionReflection|MethodReflection|null $function = null,
?string $namespace = null,
array $expressionTypes = [],
Expand Down Expand Up @@ -87,7 +84,6 @@ public function create(
$context,
$this->container->getByType(PhpVersion::class),
$declareStrictTypes,
$constantTypes,
$function,
$namespace,
$expressionTypes,
Expand Down
Loading