Skip to content

Group $expressionTypes and $nativeExpressionTypes in Scope creation methods #2022

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 1 commit into from
Nov 24, 2022
Merged

Group $expressionTypes and $nativeExpressionTypes in Scope creation methods #2022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions src/Analyser/DirectInternalScopeFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,26 +42,25 @@ public function __construct(

/**
* @param array<string, ExpressionTypeHolder> $expressionTypes
* @param array<string, ExpressionTypeHolder> $nativeExpressionTypes
* @param array<string, ConditionalExpressionHolder[]> $conditionalExpressions
* @param array<(FunctionReflection|MethodReflection)> $inFunctionCallsStack
* @param array<string, true> $currentlyAssignedExpressions
* @param array<string, true> $currentlyAllowedUndefinedExpressions
* @param array<string, ExpressionTypeHolder> $nativeExpressionTypes
* @param array<(FunctionReflection|MethodReflection)> $inFunctionCallsStack
*
*/
public function create(
ScopeContext $context,
bool $declareStrictTypes = false,
FunctionReflection|MethodReflection|null $function = null,
?string $namespace = null,
array $expressionTypes = [],
array $nativeExpressionTypes = [],
array $conditionalExpressions = [],
?string $inClosureBindScopeClass = null,
?ParametersAcceptor $anonymousFunctionReflection = null,
bool $inFirstLevelStatement = true,
array $currentlyAssignedExpressions = [],
array $currentlyAllowedUndefinedExpressions = [],
array $nativeExpressionTypes = [],
array $inFunctionCallsStack = [],
bool $afterExtractCall = false,
?Scope $parentScope = null,
Expand Down Expand Up @@ -90,13 +89,13 @@ public function create(
$function,
$namespace,
$expressionTypes,
$nativeExpressionTypes,
$conditionalExpressions,
$inClosureBindScopeClass,
$anonymousFunctionReflection,
$inFirstLevelStatement,
$currentlyAssignedExpressions,
$currentlyAllowedUndefinedExpressions,
$nativeExpressionTypes,
$inFunctionCallsStack,
$this->treatPhpDocTypesAsCertain,
$afterExtractCall,
Expand Down
4 changes: 2 additions & 2 deletions src/Analyser/InternalScopeFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ interface InternalScopeFactory

/**
* @param array<string, ExpressionTypeHolder> $expressionTypes
* @param array<string, ExpressionTypeHolder> $nativeExpressionTypes
* @param array<string, ConditionalExpressionHolder[]> $conditionalExpressions
* @param array<string, true> $currentlyAssignedExpressions
* @param array<string, true> $currentlyAllowedUndefinedExpressions
* @param array<string, ExpressionTypeHolder> $nativeExpressionTypes
* @param array<MethodReflection|FunctionReflection> $inFunctionCallsStack
*/
public function create(
Expand All @@ -23,13 +23,13 @@ public function create(
FunctionReflection|MethodReflection|null $function = null,
?string $namespace = null,
array $expressionTypes = [],
array $nativeExpressionTypes = [],
array $conditionalExpressions = [],
?string $inClosureBindScopeClass = null,
?ParametersAcceptor $anonymousFunctionReflection = null,
bool $inFirstLevelStatement = true,
array $currentlyAssignedExpressions = [],
array $currentlyAllowedUndefinedExpressions = [],
array $nativeExpressionTypes = [],
array $inFunctionCallsStack = [],
bool $afterExtractCall = false,
?Scope $parentScope = null,
Expand Down
6 changes: 3 additions & 3 deletions src/Analyser/LazyInternalScopeFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ public function __construct(

/**
* @param array<string, ExpressionTypeHolder> $expressionTypes
* @param array<string, ExpressionTypeHolder> $nativeExpressionTypes
* @param array<string, ConditionalExpressionHolder[]> $conditionalExpressions
* @param array<string, true> $currentlyAssignedExpressions
* @param array<string, true> $currentlyAllowedUndefinedExpressions
* @param array<string, ExpressionTypeHolder> $nativeExpressionTypes
* @param array<(FunctionReflection|MethodReflection)> $inFunctionCallsStack
*
*/
Expand All @@ -52,13 +52,13 @@ public function create(
FunctionReflection|MethodReflection|null $function = null,
?string $namespace = null,
array $expressionTypes = [],
array $nativeExpressionTypes = [],
array $conditionalExpressions = [],
?string $inClosureBindScopeClass = null,
?ParametersAcceptor $anonymousFunctionReflection = null,
bool $inFirstLevelStatement = true,
array $currentlyAssignedExpressions = [],
array $currentlyAllowedUndefinedExpressions = [],
array $nativeExpressionTypes = [],
array $inFunctionCallsStack = [],
bool $afterExtractCall = false,
?Scope $parentScope = null,
Expand Down Expand Up @@ -87,13 +87,13 @@ public function create(
$function,
$namespace,
$expressionTypes,
$nativeExpressionTypes,
$conditionalExpressions,
$inClosureBindScopeClass,
$anonymousFunctionReflection,
$inFirstLevelStatement,
$currentlyAssignedExpressions,
$currentlyAllowedUndefinedExpressions,
$nativeExpressionTypes,
$inFunctionCallsStack,
$this->treatPhpDocTypesAsCertain,
$afterExtractCall,
Expand Down
Loading