Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions conf/bleedingEdge.neon
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ parameters:
unresolvedTemplateArguments: true
closureSignaturesFromUsages: true
staticVariablesFromUsages: true
backedEnumFromParameterType: true
unusedVariable: true
unusedParameters: true
1 change: 1 addition & 0 deletions conf/config.neon
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ parameters:
unresolvedTemplateArguments: false
closureSignaturesFromUsages: false
staticVariablesFromUsages: false
backedEnumFromParameterType: false
unusedVariable: false
unusedParameters: false
fileExtensions:
Expand Down
1 change: 1 addition & 0 deletions conf/parametersSchema.neon
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ parametersSchema:
unresolvedTemplateArguments: bool()
closureSignaturesFromUsages: bool()
staticVariablesFromUsages: bool()
backedEnumFromParameterType: bool()
unusedVariable: bool()
unusedParameters: bool()
])
Expand Down
4 changes: 3 additions & 1 deletion src/Reflection/Php/PhpClassReflectionExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ public function __construct(
#[AutowiredParameter]
private bool $inferPrivatePropertyTypeFromConstructor,
private PhpVersion $phpVersion,
#[AutowiredParameter(ref: '%featureToggles.backedEnumFromParameterType%')]
private bool $backedEnumFromParameterType,
#[AutowiredParameter(ref: '%cache.memberCacheKeysMax%')]
int $memberCacheKeysMax,
)
Expand Down Expand Up @@ -803,7 +805,7 @@ private function createMethod(
$this->findMethodTrait($methodReflection),
);

if (in_array(strtolower($methodReflection->getName()), ['from', 'tryfrom'], true)) {
if ($this->backedEnumFromParameterType && in_array(strtolower($methodReflection->getName()), ['from', 'tryfrom'], true)) {
$backedEnumType = $declaringClass->getBackedEnumType();
if ($backedEnumType !== null) {
return new BackedEnumFromMethodReflection($method, $backedEnumType);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?php declare(strict_types = 1);

namespace PHPStan\Reflection\Php;

use PHPStan\Testing\TypeInferenceTestCase;
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\Attributes\RequiresPhp;
use function array_merge;

/**
* With backedEnumFromParameterType off, from() and tryFrom() of a backed
* enum keep the int|string parameter reflection declares.
*/
#[RequiresPhp('>= 8.1.0')]
class BackedEnumFromParameterTypeToggleOffTest extends TypeInferenceTestCase
{

/** @return iterable<mixed> */
public static function dataFileAsserts(): iterable
{
yield from self::gatherAssertTypes(__DIR__ . '/data/backed-enum-from-parameter-type-off.php');
}

/**
* @param mixed ...$args
*/
#[DataProvider('dataFileAsserts')]
public function testFileAsserts(
string $assertType,
string $file,
...$args,
): void
{
$this->assertFileAsserts($assertType, $file, ...$args);
}

public static function getAdditionalConfigFiles(): array
{
return array_merge(parent::getAdditionalConfigFiles(), [
__DIR__ . '/../../../../conf/bleedingEdge.neon',
__DIR__ . '/backed-enum-from-parameter-type-off.neon',
]);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
parameters:
featureToggles:
backedEnumFromParameterType: false
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?php // lint >= 8.1

declare(strict_types = 1);

namespace BackedEnumFromParameterTypeOff;

use function PHPStan\Testing\assertType;

enum NumberEnum: int
{
case One = 1;
}

enum WordEnum: string
{
case One = 'one';
}

function (): void {
assertType('Closure(int|string): BackedEnumFromParameterTypeOff\NumberEnum', NumberEnum::from(...));
assertType('Closure(int|string): (BackedEnumFromParameterTypeOff\NumberEnum|null)', NumberEnum::tryFrom(...));
assertType('Closure(int|string): BackedEnumFromParameterTypeOff\WordEnum', WordEnum::from(...));
assertType('Closure(int|string): (BackedEnumFromParameterTypeOff\WordEnum|null)', WordEnum::tryFrom(...));
};
9 changes: 8 additions & 1 deletion turbo-ext/src/PhpClassReflectionExtension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ struct ConstructorArgs
zval *allowedConstantsMapProvider;
bool inferPrivatePropertyTypeFromConstructor;
zval *phpVersion;
bool backedEnumFromParameterType;
zend_long memberCacheKeysMax;
};

Expand Down Expand Up @@ -365,6 +366,7 @@ class PhpClassReflectionExtension
ZVAL_COPY(OBJ_PROP_NUM(object, entry.slot), value);
}
ZVAL_BOOL(OBJ_PROP_NUM(object, slots::inferPrivatePropertyTypeFromConstructor), a.inferPrivatePropertyTypeFromConstructor);
ZVAL_BOOL(OBJ_PROP_NUM(object, slots::backedEnumFromParameterType), a.backedEnumFromParameterType);

zval lru;
if (UNEXPECTED(!pt_lru_cache_new(&lru, a.memberCacheKeysMax))) return false;
Expand Down Expand Up @@ -1576,6 +1578,8 @@ class PhpClassReflectionExtension
zv::Val method = createUserlandMethodReflection(declaringClass, declaringClass, methodReflection, methodTrait.raw());
if (UNEXPECTED(method.isUndef())) return zv::Val();

if (Z_TYPE_P(slot(slots::backedEnumFromParameterType)) != IS_TRUE) return method;

zv::Str loweredName = zv::Str::adopt(zend_string_tolower(methodNameStr.get()));
if (zend_string_equals_literal(loweredName.get(), "from") || zend_string_equals_literal(loweredName.get(), "tryfrom")) {
zv::Val backedEnumType = call(declaringClass, PT_LC("getbackedenumtype"));
Expand Down Expand Up @@ -2953,7 +2957,8 @@ PT_MINIT_REGISTRATION(pt_register_php_class_reflection_extension)
cls.method(sigs::__construct, [](INTERNAL_FUNCTION_PARAMETERS) {
ConstructorArgs a;
bool inferPrivatePropertyTypeFromConstructor;
ZEND_PARSE_PARAMETERS_START(18, 18)
bool backedEnumFromParameterType;
ZEND_PARSE_PARAMETERS_START(19, 19)
Z_PARAM_OBJECT(a.scopeFactory)
Z_PARAM_OBJECT(a.phpDocsResolver)
Z_PARAM_OBJECT(a.nodeScopeResolver)
Expand All @@ -2971,9 +2976,11 @@ PT_MINIT_REGISTRATION(pt_register_php_class_reflection_extension)
Z_PARAM_OBJECT(a.allowedConstantsMapProvider)
Z_PARAM_BOOL(inferPrivatePropertyTypeFromConstructor)
Z_PARAM_OBJECT(a.phpVersion)
Z_PARAM_BOOL(backedEnumFromParameterType)
Z_PARAM_LONG(a.memberCacheKeysMax)
ZEND_PARSE_PARAMETERS_END();
a.inferPrivatePropertyTypeFromConstructor = inferPrivatePropertyTypeFromConstructor;
a.backedEnumFromParameterType = backedEnumFromParameterType;
if (UNEXPECTED(!phpstanturbo::PhpClassReflectionExtension::construct(Z_OBJ_P(ZEND_THIS), a))) RETURN_THROWS();
});

Expand Down
Loading
Loading