archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Support the actual #[\SensitiveParameter] attribute in stubs (#8836)

Browse source
This commit is contained in:
Tim Düsterhus 2022-07-12 12:43:44 +02:00 • committed by GitHub
parent f22e0df033
commit 342e18f105
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 752 additions and 502 deletions
Download patch file Download diff file Expand all files Collapse all files

42
build/gen_stub.php
View file

@ -815,9 +815,12 @@ class ArgInfo {
public $phpDocType;
/** @var string|null */
public $defaultValue;
/** @var bool */
public $isSensitive;
/** @var AttributeInfo[] */
public $attributes;
/**
* @param AttributeInfo[] $attributes
*/
public function __construct(
string $name,
int $sendBy,
@ -825,14 +828,14 @@ class ArgInfo {
?Type $type,
?Type $phpDocType,
?string $defaultValue,
bool $isSensitive
array $attributes
) {
$this->name = $name;
$this->sendBy = $sendBy;
$this->isVariadic = $isVariadic;
$this->setTypes($type, $phpDocType);
$this->defaultValue = $defaultValue;
$this->isSensitive = $isSensitive;
$this->attributes = $attributes;
}
public function equals(ArgInfo $other): bool {
@ -840,8 +843,7 @@ class ArgInfo {
&& $this->sendBy === $other->sendBy
&& $this->isVariadic === $other->isVariadic
&& Type::equals($this->type, $other->type)
&& $this->defaultValue === $other->defaultValue
&& $this->isSensitive === $other->isSensitive;
&& $this->defaultValue === $other->defaultValue;
}
public function getSendByString(): string {
@ -2570,7 +2572,7 @@ class ClassInfo {
}
}
if ($attributeInitializationCode = generateAttributeInitialization($this->funcInfos, $this->cond)) {
if ($attributeInitializationCode = generateAttributeInitialization($this->funcInfos, $this->cond, $allConstInfos)) {
if (!$php82MinimumCompatibility) {
$code .= "#if (PHP_VERSION_ID >= " . PHP_82_VERSION_ID . ")\n";
}
@ -3151,7 +3153,7 @@ class DocCommentTag {
if ($this->name === "param") {
preg_match('/^\s*[\w\|\\\\\[\]]+\s*\$(\w+).*$/', $value, $matches);
} elseif ($this->name === "prefer-ref" || $this->name === "sensitive-param") {
} elseif ($this->name === "prefer-ref") {
preg_match('/^\s*\$(\w+).*$/', $value, $matches);
}
@ -3242,7 +3244,6 @@ function parseFunctionLike(
break;
case 'prefer-ref':
case 'sensitive-param':
$varName = $tag->getVariableName();
if (!isset($paramMeta[$varName])) {
$paramMeta[$varName] = [];
@ -3260,7 +3261,12 @@ function parseFunctionLike(
foreach ($func->getParams() as $i => $param) {
$varName = $param->var->name;
$preferRef = !empty($paramMeta[$varName]['prefer-ref']);
$isSensitive = !empty($paramMeta[$varName]['sensitive-param']);
$attributes = [];
foreach ($param->attrGroups as $attrGroup) {
foreach ($attrGroup->attrs as $attr) {
$attributes[] = new AttributeInfo($attr->name->toString(), $attr->args);
}
}
unset($paramMeta[$varName]);
if (isset($varNameSet[$varName])) {
@ -3308,7 +3314,7 @@ function parseFunctionLike(
$type,
isset($docParamTypes[$varName]) ? Type::fromString($docParamTypes[$varName]) : null,
$param->default ? $prettyPrinter->prettyPrintExpr($param->default) : null,
$isSensitive
$attributes
);
if (!$param->default && !$param->variadic) {
$numRequiredArgs = $i + 1;
@ -3962,7 +3968,7 @@ function generateArgInfoCode(
}
if ($fileInfo->generateClassEntries) {
$attributeInitializationCode = generateAttributeInitialization($fileInfo->funcInfos);
$attributeInitializationCode = generateAttributeInitialization($fileInfo->funcInfos, null, $allConstInfos);
if ($attributeInitializationCode !== "" || !empty($fileInfo->constInfos)) {
$code .= "\nstatic void register_{$stubFilenameWithoutExtension}_symbols(int module_number)\n";
@ -4029,25 +4035,23 @@ function generateFunctionEntries(?Name $className, array $funcInfos, ?string $co
/**
* @param iterable<FuncInfo> $funcInfos
*/
function generateAttributeInitialization(iterable $funcInfos, ?string $parentCond = null): string {
function generateAttributeInitialization(iterable $funcInfos, ?string $parentCond = null, iterable $allConstInfos): string {
return generateCodeWithConditions(
$funcInfos,
"",
static function (FuncInfo $funcInfo) {
static function (FuncInfo $funcInfo) use ($allConstInfos) {
$code = null;
foreach ($funcInfo->args as $index => $arg) {
if (!$arg->isSensitive) {
continue;
}
if ($funcInfo->name instanceof MethodName) {
$functionTable = "&class_entry->function_table";
} else {
$functionTable = "CG(function_table)";
}
$code .= "\tzend_mark_function_parameter_as_sensitive($functionTable, \"" . $funcInfo->name->getNameForAttributes() . "\", $index);\n";
foreach ($arg->attributes as $attribute) {
$code .= $attribute->generateCode("zend_add_parameter_attribute(zend_hash_str_find_ptr($functionTable, \"" . $funcInfo->name->getNameForAttributes() . "\", sizeof(\"" . $funcInfo->name->getNameForAttributes() . "\") - 1), $index", "{$funcInfo->name->getMethodSynopsisFilename()}_arg{$index}", $allConstInfos);
}
}
return $code;