Skip to content

Commit d83250a

Browse files
committed
Thread @pure-unless-parameter-passed through the reflection layer
Add isPureUnlessParameterPassedParameter(): TrinaryLogic on parameter reflections, populated from PHPDoc and function metadata, mirroring the already-merged @pure-unless-callable-is-impure threading (same TrinaryLogic typing from the start, so combineAcceptors() merges it with equals-or-Maybe instead of ->or(), giving correct behavior on union method variants).
1 parent f48af55 commit d83250a

25 files changed

Lines changed: 102 additions & 8 deletions

‎src/Reflection/Annotations/AnnotationsMethodParameterReflection.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,9 @@ public function isPureUnlessCallableIsImpureParameter(): TrinaryLogic
9797
return TrinaryLogic::createNo();
9898
}
9999

100+
public function isPureUnlessParameterPassedParameter(): TrinaryLogic
101+
{
102+
return TrinaryLogic::createNo();
103+
}
104+
100105
}

‎src/Reflection/BetterReflection/BetterReflectionProvider.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ private function getCustomFunction(string $functionName): PhpFunctionReflection
295295
$phpDocParameterImmediatelyInvokedCallable = [];
296296
$phpDocParameterClosureThisTypeTags = [];
297297
$phpDocParameterPureUnlessCallableIsImpure = [];
298+
$phpDocParameterPureUnlessParameterPassed = [];
298299

299300
$resolvedPhpDoc = $this->stubPhpDocProvider->findFunctionPhpDoc($reflectionFunction->getName(), array_map(static fn (ReflectionParameter $parameter): string => $parameter->getName(), $reflectionFunction->getParameters()));
300301
if ($resolvedPhpDoc === null && $reflectionFunction->getFileName() !== false && $reflectionFunction->getDocComment() !== false) {
@@ -322,6 +323,7 @@ private function getCustomFunction(string $functionName): PhpFunctionReflection
322323
$phpDocParameterImmediatelyInvokedCallable = $resolvedPhpDoc->getParamsImmediatelyInvokedCallable();
323324
$phpDocParameterClosureThisTypeTags = $resolvedPhpDoc->getParamClosureThisTags();
324325
$phpDocParameterPureUnlessCallableIsImpure = $resolvedPhpDoc->getParamsPureUnlessCallableIsImpure();
326+
$phpDocParameterPureUnlessParameterPassed = $resolvedPhpDoc->getParamsPureUnlessParameterPassed();
325327
}
326328

327329
$lowerCasedFunctionName = strtolower($reflectionFunction->getName());
@@ -334,6 +336,13 @@ private function getCustomFunction(string $functionName): PhpFunctionReflection
334336

335337
$phpDocParameterPureUnlessCallableIsImpure[$parameterName] = $isPureUnlessCallableIsImpure;
336338
}
339+
foreach ($functionMetadata['pureUnlessParameterPassedParameters'] ?? [] as $parameterName => $isPureUnlessParameterPassed) {
340+
if (($phpDocParameterPureUnlessParameterPassed[$parameterName] ?? false) === true) {
341+
continue;
342+
}
343+
344+
$phpDocParameterPureUnlessParameterPassed[$parameterName] = $isPureUnlessParameterPassed;
345+
}
337346
}
338347

339348
return $this->functionReflectionFactory->create(
@@ -355,6 +364,7 @@ private function getCustomFunction(string $functionName): PhpFunctionReflection
355364
array_map(static fn (ParamClosureThisTag $tag): Type => $tag->getType(), $phpDocParameterClosureThisTypeTags),
356365
$this->attributeReflectionFactory->fromNativeReflection($reflectionFunction->getAttributes(), InitializerExprContext::fromFunction($reflectionFunction->getName(), $reflectionFunction->getFileName() !== false ? $reflectionFunction->getFileName() : null)),
357366
$phpDocParameterPureUnlessCallableIsImpure,
367+
$phpDocParameterPureUnlessParameterPassed,
358368
);
359369
}
360370

‎src/Reflection/ExtendedParameterReflection.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,6 @@ public function checkAllowedConstants(array $constants): AllowedConstantsResult;
3838

3939
public function isPureUnlessCallableIsImpureParameter(): TrinaryLogic;
4040

41+
public function isPureUnlessParameterPassedParameter(): TrinaryLogic;
42+
4143
}

‎src/Reflection/FunctionReflectionFactory.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ interface FunctionReflectionFactory
1717
* @param array<string, Type> $phpDocParameterClosureThisTypes
1818
* @param list<AttributeReflection> $attributes
1919
* @param array<string, bool> $phpDocParameterPureUnlessCallableIsImpure
20+
* @param array<string, bool> $phpDocParameterPureUnlessParameterPassed
2021
*/
2122
public function create(
2223
ReflectionFunction $reflection,
@@ -37,6 +38,7 @@ public function create(
3738
array $phpDocParameterClosureThisTypes,
3839
array $attributes,
3940
array $phpDocParameterPureUnlessCallableIsImpure,
41+
array $phpDocParameterPureUnlessParameterPassed,
4042
): PhpFunctionReflection;
4143

4244
}

‎src/Reflection/GenericParametersAcceptorResolver.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ public static function resolve(array $argTypes, ParametersAcceptor $parametersAc
133133
[],
134134
null,
135135
TrinaryLogic::createNo(),
136+
TrinaryLogic::createNo(),
136137
), $parameters),
137138
$parametersAcceptor->isVariadic(),
138139
$returnType,

‎src/Reflection/Native/ExtendedNativeParameterReflection.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public function __construct(
3232
private array $attributes,
3333
private ?ParameterAllowedConstants $allowedConstants,
3434
private TrinaryLogic $pureUnlessCallableIsImpureParameter,
35+
private TrinaryLogic $pureUnlessParameterPassedParameter,
3536
)
3637
{
3738
}
@@ -120,4 +121,9 @@ public function isPureUnlessCallableIsImpureParameter(): TrinaryLogic
120121
return $this->pureUnlessCallableIsImpureParameter;
121122
}
122123

124+
public function isPureUnlessParameterPassedParameter(): TrinaryLogic
125+
{
126+
return $this->pureUnlessParameterPassedParameter;
127+
}
128+
123129
}

‎src/Reflection/ParametersAcceptorSelector.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -769,6 +769,7 @@ public static function combineAcceptors(array $acceptors): ExtendedParametersAcc
769769
$parameter instanceof ExtendedParameterReflection ? $parameter->getAttributes() : [],
770770
$parameter instanceof ExtendedParameterReflection ? $parameter->getAllowedConstants() : null,
771771
$parameter instanceof ExtendedParameterReflection ? $parameter->isPureUnlessCallableIsImpureParameter() : TrinaryLogic::createNo(),
772+
$parameter instanceof ExtendedParameterReflection ? $parameter->isPureUnlessParameterPassedParameter() : TrinaryLogic::createNo(),
772773
);
773774
continue;
774775
}
@@ -827,6 +828,10 @@ public static function combineAcceptors(array $acceptors): ExtendedParametersAcc
827828
$rightPureUnless = $parameter instanceof ExtendedParameterReflection ? $parameter->isPureUnlessCallableIsImpureParameter() : TrinaryLogic::createNo();
828829
$pureUnlessCallableIsImpureParameter = $leftPureUnless->equals($rightPureUnless) ? $leftPureUnless : TrinaryLogic::createMaybe();
829830

831+
$leftPureUnlessParameterPassed = $parameters[$i]->isPureUnlessParameterPassedParameter();
832+
$rightPureUnlessParameterPassed = $parameter instanceof ExtendedParameterReflection ? $parameter->isPureUnlessParameterPassedParameter() : TrinaryLogic::createNo();
833+
$pureUnlessParameterPassedParameter = $leftPureUnlessParameterPassed->equals($rightPureUnlessParameterPassed) ? $leftPureUnlessParameterPassed : TrinaryLogic::createMaybe();
834+
830835
$parameters[$i] = new ExtendedDummyParameter(
831836
$parameters[$i]->getName() !== $parameter->getName() ? sprintf('%s|%s', $parameters[$i]->getName(), $parameter->getName()) : $parameter->getName(),
832837
$type,
@@ -842,6 +847,7 @@ public static function combineAcceptors(array $acceptors): ExtendedParametersAcc
842847
$attributes,
843848
$allowedConstants,
844849
$pureUnlessCallableIsImpureParameter,
850+
$pureUnlessParameterPassedParameter,
845851
);
846852

847853
if ($isVariadic) {
@@ -944,6 +950,7 @@ private static function wrapParameter(ParameterReflection $parameter): ExtendedP
944950
[],
945951
null,
946952
TrinaryLogic::createNo(),
953+
TrinaryLogic::createNo(),
947954
);
948955
}
949956

@@ -1273,6 +1280,7 @@ private static function overrideParameterType(ParameterReflection $original, Typ
12731280
$wrapped->getAttributes(),
12741281
$wrapped->getAllowedConstants(),
12751282
$wrapped->isPureUnlessCallableIsImpureParameter(),
1283+
$wrapped->isPureUnlessParameterPassedParameter(),
12761284
);
12771285
}
12781286

‎src/Reflection/Php/ClosureCallMethodReflection.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,9 @@ public function getVariants(): array
9999
null,
100100
[],
101101
null,
102-
// pure-unless-callable-is-impure is not threaded here: a closure's own
103-
// parameters cannot carry the tag.
102+
// pure-unless-callable-is-impure and pure-unless-parameter-passed are not
103+
// threaded here: a closure's own parameters cannot carry either tag.
104+
TrinaryLogic::createNo(),
104105
TrinaryLogic::createNo(),
105106
), $parameters),
106107
$this->closureType->isVariadic(),

‎src/Reflection/Php/ExitFunctionReflection.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ public function getVariants(): array
6161
[],
6262
null,
6363
TrinaryLogic::createNo(),
64+
TrinaryLogic::createNo(),
6465
),
6566
],
6667
false,

‎src/Reflection/Php/ExtendedDummyParameter.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public function __construct(
3232
private array $attributes,
3333
private ?ParameterAllowedConstants $allowedConstants,
3434
private TrinaryLogic $pureUnlessCallableIsImpureParameter,
35+
private TrinaryLogic $pureUnlessParameterPassedParameter,
3536
)
3637
{
3738
parent::__construct($name, $type, $optional, $passedByReference, $variadic, $defaultValue);
@@ -91,4 +92,9 @@ public function isPureUnlessCallableIsImpureParameter(): TrinaryLogic
9192
return $this->pureUnlessCallableIsImpureParameter;
9293
}
9394

95+
public function isPureUnlessParameterPassedParameter(): TrinaryLogic
96+
{
97+
return $this->pureUnlessParameterPassedParameter;
98+
}
99+
94100
}

0 commit comments

Comments
 (0)