Commit 285b49f

authored

Merge constantTypes with expressionTypes

1 parent 1ec058d commit 285b49fCopy full SHA for 285b49f

File tree

+55

-156

lines changed

+55

-156

lines changed

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`	`use PHPStan\Reflection\ReflectionProvider;`
`14`	`14`	`use PHPStan\Rules\Properties\PropertyReflectionFinder;`
`15`	`15`	`use PHPStan\ShouldNotHappenException;`
`16`		`-use PHPStan\Type\Type;`
`17`	`16`	`use function is_a;`
`18`	`17`
`19`	`18`	`/**`
`@@ -45,7 +44,6 @@ public function __construct(`
`45`	`44`	`}`
`46`	`45`
`47`	`46`	`/**`
`48`		`- * @param array<string, Type> $constantTypes`
`49`	`47`	`* @param ExpressionTypeHolder[] $expressionTypes`
`50`	`48`	`* @param array<string, ConditionalExpressionHolder[]> $conditionalExpressions`
`51`	`49`	`* @param array<string, true> $currentlyAssignedExpressions`
`@@ -57,7 +55,6 @@ public function __construct(`
`57`	`55`	`public function create(`
`58`	`56`	`ScopeContext $context,`
`59`	`57`	`bool $declareStrictTypes = false,`
`60`		`- array $constantTypes = [],`
`61`	`58`	`FunctionReflection\|MethodReflection\|null $function = null,`
`62`	`59`	`?string $namespace = null,`
`63`	`60`	`array $expressionTypes = [],`
`@@ -93,7 +90,6 @@ public function create(`
`93`	`90`	`$context,`
`94`	`91`	`$this->phpVersion,`
`95`	`92`	`$declareStrictTypes,`
`96`		`- $constantTypes,`
`97`	`93`	`$function,`
`98`	`94`	`$namespace,`
`99`	`95`	`$expressionTypes,`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`	`use PHPStan\Reflection\ReflectionProvider;`
`14`	`14`	`use PHPStan\Rules\Properties\PropertyReflectionFinder;`
`15`	`15`	`use PHPStan\ShouldNotHappenException;`
`16`		`-use PHPStan\Type\Type;`
`17`	`16`	`use function is_a;`
`18`	`17`
`19`	`18`	`class LazyScopeFactory implements ScopeFactory`
`@@ -39,7 +38,6 @@ public function __construct(`
`39`	`38`	`}`
`40`	`39`
`41`	`40`	`/**`
`42`		`- * @param array<string, Type> $constantTypes`
`43`	`41`	`* @param ExpressionTypeHolder[] $expressionTypes`
`44`	`42`	`* @param array<string, ConditionalExpressionHolder[]> $conditionalExpressions`
`45`	`43`	`* @param array<string, true> $currentlyAssignedExpressions`
`@@ -51,7 +49,6 @@ public function __construct(`
`51`	`49`	`public function create(`
`52`	`50`	`ScopeContext $context,`
`53`	`51`	`bool $declareStrictTypes = false,`
`54`		`- array $constantTypes = [],`
`55`	`52`	`FunctionReflection\|MethodReflection\|null $function = null,`
`56`	`53`	`?string $namespace = null,`
`57`	`54`	`array $expressionTypes = [],`
`@@ -87,7 +84,6 @@ public function create(`
`87`	`84`	`$context,`
`88`	`85`	`$this->container->getByType(PhpVersion::class),`
`89`	`86`	`$declareStrictTypes,`
`90`		`- $constantTypes,`
`91`	`87`	`$function,`
`92`	`88`	`$namespace,`
`93`	`89`	`$expressionTypes,`

Comments

(0)