Reduce visibility of some methods to private

staabm · web-flow · commit bd6eb7649f84 · 2025-10-03T21:31:55.000+02:00
diff --git a/build/PHPStan/Build/OrChainIdenticalComparisonToInArrayRule.php b/build/PHPStan/Build/OrChainIdenticalComparisonToInArrayRule.php
@@ -61,7 +61,7 @@ public function processNode(Node $node, Scope $scope): array
 	/**
 	 * @return list<IdentifierRuleError>
 	 */
-	public function processConditionNode(Expr $condNode, Scope $scope): array
+	private function processConditionNode(Expr $condNode, Scope $scope): array
 	{
 		$comparisons = $this->unpackOrChain($condNode);
 		if (count($comparisons) < 2) {
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -5089,7 +5089,7 @@ private function processPropertyHooks(
 	/**
 	 * @param FunctionReflection|MethodReflection|null $calleeReflection
 	 */
-	public function resolveClosureThisType(
+	private function resolveClosureThisType(
 		?CallLike $call,
 		$calleeReflection,
 		ParameterReflection $parameter,
@@ -7095,7 +7095,7 @@ private function getNextUnreachableStatements(array $nodes, bool $earlyBinding):
 	/**
 	 * @param array<Expr> $conditions
 	 */
-	public function getFilteringExprForMatchArm(Expr\Match_ $expr, array $conditions): BinaryOp\Identical|FuncCall
+	private function getFilteringExprForMatchArm(Expr\Match_ $expr, array $conditions): BinaryOp\Identical|FuncCall
 	{
 		if (count($conditions) === 1) {
 			return new BinaryOp\Identical($expr->cond, $conditions[0]);
diff --git a/src/Analyser/TypeSpecifier.php b/src/Analyser/TypeSpecifier.php
@@ -1401,7 +1401,7 @@ private function specifyTypesFromConditionalReturnType(
 	/**
 	 * @param array<string, Expr> $argsMap
 	 */
-	public function getConditionalSpecifiedTypes(
+	private function getConditionalSpecifiedTypes(
 		ConditionalTypeForParameter $conditionalType,
 		Type $leftType,
 		Type $rightType,
diff --git a/src/Parallel/Process.php b/src/Parallel/Process.php
@@ -17,7 +17,7 @@
 final class Process
 {
 
-	public \React\ChildProcess\Process $process;
+	private \React\ChildProcess\Process $process;
 
 	private ?WritableStreamInterface $in = null;
 
diff --git a/src/Reflection/ResolvedFunctionVariantWithOriginal.php b/src/Reflection/ResolvedFunctionVariantWithOriginal.php
@@ -145,7 +145,7 @@ public function getReturnTypeWithUnresolvableTemplateTypes(): Type
 			);
 	}
 
-	public function getPhpDocReturnTypeWithUnresolvableTemplateTypes(): Type
+	private function getPhpDocReturnTypeWithUnresolvableTemplateTypes(): Type
 	{
 		return $this->phpDocReturnTypeWithUnresolvableTemplateTypes ??=
 			$this->resolveConditionalTypesForParameter(
diff --git a/src/Rules/Comparison/ConstantConditionRuleHelper.php b/src/Rules/Comparison/ConstantConditionRuleHelper.php
@@ -22,7 +22,7 @@ public function __construct(
 	{
 	}
 
-	public function shouldSkip(Scope $scope, Expr $expr): bool
+	private function shouldSkip(Scope $scope, Expr $expr): bool
 	{
 		if (
 			$expr instanceof Expr\BinaryOp\Equal
diff --git a/src/Rules/Methods/MethodParameterComparisonHelper.php b/src/Rules/Methods/MethodParameterComparisonHelper.php
@@ -362,7 +362,7 @@ public function compare(ExtendedMethodReflection $prototype, ClassReflection $pr
 		return $messages;
 	}
 
-	public function isParameterTypeCompatible(Type $methodParameterType, Type $prototypeParameterType, bool $supportsContravariance): bool
+	private function isParameterTypeCompatible(Type $methodParameterType, Type $prototypeParameterType, bool $supportsContravariance): bool
 	{
 		return $this->isTypeCompatible($methodParameterType, $prototypeParameterType, $supportsContravariance, false);
 	}
diff --git a/src/Type/OperatorTypeSpecifyingExtensionRegistry.php b/src/Type/OperatorTypeSpecifyingExtensionRegistry.php
@@ -22,7 +22,7 @@ public function __construct(
 	/**
 	 * @return OperatorTypeSpecifyingExtension[]
 	 */
-	public function getOperatorTypeSpecifyingExtensions(string $operator, Type $leftType, Type $rightType): array
+	private function getOperatorTypeSpecifyingExtensions(string $operator, Type $leftType, Type $rightType): array
 	{
 		return array_values(array_filter($this->extensions, static fn (OperatorTypeSpecifyingExtension $extension): bool => $extension->isOperatorSupported($operator, $leftType, $rightType)));
 	}
diff --git a/src/Type/Php/DateFunctionReturnTypeHelper.php b/src/Type/Php/DateFunctionReturnTypeHelper.php
@@ -46,7 +46,7 @@ public function getTypeFromFormatType(Type $formatType, bool $useMicrosec): Type
 		return $type;
 	}
 
-	public function buildReturnTypeFromFormat(string $formatString, bool $useMicrosec): Type
+	private function buildReturnTypeFromFormat(string $formatString, bool $useMicrosec): Type
 	{
 		// see see https://www.php.net/manual/en/datetime.format.php
 		switch ($formatString) {
diff --git a/src/Type/Php/FilterFunctionReturnTypeHelper.php b/src/Type/Php/FilterFunctionReturnTypeHelper.php
@@ -54,7 +54,7 @@ public function __construct(private ReflectionProvider $reflectionProvider, priv
 		$this->flagsString = new ConstantStringType('flags');
 	}
 
-	public function getOffsetValueType(Type $inputType, Type $offsetType, ?Type $filterType, ?Type $flagsType): Type
+	private function getOffsetValueType(Type $inputType, Type $offsetType, ?Type $filterType, ?Type $flagsType): Type
 	{
 		$inexistentOffsetType = $this->hasFlag('FILTER_NULL_ON_FAILURE', $flagsType)
 			? new ConstantBooleanType(false)
diff --git a/src/Type/Php/FilterVarArrayDynamicReturnTypeExtension.php b/src/Type/Php/FilterVarArrayDynamicReturnTypeExtension.php
@@ -176,7 +176,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 	}
 
 	/** @return array{?Type, ?Type} */
-	public function fetchFilter(Type $type): array
+	private function fetchFilter(Type $type): array
 	{
 		if (!$type->isArray()->yes()) {
 			return [$type, null];
diff --git a/src/Type/Php/IdateFunctionReturnTypeHelper.php b/src/Type/Php/IdateFunctionReturnTypeHelper.php
@@ -27,7 +27,7 @@ public function getTypeFromFormatType(Type $formatType): ?Type
 		return TypeCombinator::union(...$types);
 	}
 
-	public function buildReturnTypeFromFormat(string $formatString): Type
+	private function buildReturnTypeFromFormat(string $formatString): Type
 	{
 		// see https://www.php.net/idate and https://www.php.net/manual/de/datetime.format
 		switch ($formatString) {
diff --git a/src/Type/Regex/RegexNonCapturingGroup.php b/src/Type/Regex/RegexNonCapturingGroup.php
@@ -15,7 +15,7 @@ public function __construct(
 	}
 
 	/** @phpstan-assert-if-true !null $this->getAlternationId() */
-	public function inAlternation(): bool
+	private function inAlternation(): bool
 	{
 		return $this->alternation !== null;
 	}

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function processNode(Node $node, Scope $scope): array`
`61`	`61`	`/**`
`62`	`62`	`* @return list<IdentifierRuleError>`
`63`	`63`	`*/`
`64`		`- public function processConditionNode(Expr $condNode, Scope $scope): array`
	`64`	`+ private function processConditionNode(Expr $condNode, Scope $scope): array`
`65`	`65`	`{`
`66`	`66`	`$comparisons = $this->unpackOrChain($condNode);`
`67`	`67`	`if (count($comparisons) < 2) {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`final class Process`
`18`	`18`	`{`
`19`	`19`
`20`		`- public \React\ChildProcess\Process $process;`
	`20`	`+ private \React\ChildProcess\Process $process;`
`21`	`21`
`22`	`22`	`private ?WritableStreamInterface $in = null;`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ public function getReturnTypeWithUnresolvableTemplateTypes(): Type`
`145`	`145`	`);`
`146`	`146`	`}`
`147`	`147`
`148`		`- public function getPhpDocReturnTypeWithUnresolvableTemplateTypes(): Type`
	`148`	`+ private function getPhpDocReturnTypeWithUnresolvableTemplateTypes(): Type`
`149`	`149`	`{`
`150`	`150`	`return $this->phpDocReturnTypeWithUnresolvableTemplateTypes ??=`
`151`	`151`	`$this->resolveConditionalTypesForParameter(`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public function __construct(`
`22`	`22`	`{`
`23`	`23`	`}`
`24`	`24`
`25`		`- public function shouldSkip(Scope $scope, Expr $expr): bool`
	`25`	`+ private function shouldSkip(Scope $scope, Expr $expr): bool`
`26`	`26`	`{`
`27`	`27`	`if (`
`28`	`28`	`$expr instanceof Expr\BinaryOp\Equal`
Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,7 @@ public function compare(ExtendedMethodReflection $prototype, ClassReflection $pr`
`362`	`362`	`return $messages;`
`363`	`363`	`}`
`364`	`364`
`365`		`- public function isParameterTypeCompatible(Type $methodParameterType, Type $prototypeParameterType, bool $supportsContravariance): bool`
	`365`	`+ private function isParameterTypeCompatible(Type $methodParameterType, Type $prototypeParameterType, bool $supportsContravariance): bool`
`366`	`366`	`{`
`367`	`367`	`return $this->isTypeCompatible($methodParameterType, $prototypeParameterType, $supportsContravariance, false);`
`368`	`368`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function getTypeFromFormatType(Type $formatType, bool $useMicrosec): Type`
`46`	`46`	`return $type;`
`47`	`47`	`}`
`48`	`48`
`49`		`- public function buildReturnTypeFromFormat(string $formatString, bool $useMicrosec): Type`
	`49`	`+ private function buildReturnTypeFromFormat(string $formatString, bool $useMicrosec): Type`
`50`	`50`	`{`
`51`	`51`	`// see see https://www.php.net/manual/en/datetime.format.php`
`52`	`52`	`switch ($formatString) {`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function __construct(private ReflectionProvider $reflectionProvider, priv`
`54`	`54`	`$this->flagsString = new ConstantStringType('flags');`
`55`	`55`	`}`
`56`	`56`
`57`		`- public function getOffsetValueType(Type $inputType, Type $offsetType, ?Type $filterType, ?Type $flagsType): Type`
	`57`	`+ private function getOffsetValueType(Type $inputType, Type $offsetType, ?Type $filterType, ?Type $flagsType): Type`
`58`	`58`	`{`
`59`	`59`	`$inexistentOffsetType = $this->hasFlag('FILTER_NULL_ON_FAILURE', $flagsType)`
`60`	`60`	`? new ConstantBooleanType(false)`