Skip to content

fix: resolve static/self/parent relative to @param-closure-this bound class#6061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
staabm merged 1 commit into from
Jul 20, 2026
Merged

fix: resolve static/self/parent relative to @param-closure-this bound class #6061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 43 additions & 1 deletion src/Analyser/MutatingScope.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2020,7 +2020,7 @@ public function restoreThis(self $restoreThisScope): self
$expressionTypes,
$nativeExpressionTypes,
$this->conditionalExpressions,
$this->inClosureBindScopeClasses,
$restoreThisScope->inClosureBindScopeClasses,
$this->anonymousFunctionReflection,
$this->inFirstLevelStatement,
[],
Expand DownExpand Up@@ -2059,6 +2059,31 @@ public function isInClosureBind(): bool
return $this->inClosureBindScopeClasses !== [];
}

/**
* @param list<non-empty-string> $scopeClasses
*/
public function withClosureBindScopeClasses(array $scopeClasses): self
{
return $this->scopeFactory->create(
$this->context,
$this->isDeclareStrictTypes(),
$this->getFunction(),
$this->getNamespace(),
$this->expressionTypes,
$this->nativeExpressionTypes,
$this->conditionalExpressions,
$scopeClasses,
$this->anonymousFunctionReflection,
$this->isInFirstLevelStatement(),
$this->currentlyAssignedExpressions,
$this->currentlyAllowedUndefinedExpressions,
$this->inFunctionCallsStack,
$this->afterExtractCall,
$this->parentScope,
$this->nativeTypesPromoted,
);
}

/**
* @api
* @param ParameterReflection[]|null $callableParameters
Expand DownExpand Up@@ -2397,6 +2422,23 @@ public function getFunctionType($type, bool $isNullable, bool $isVariadic): Type
false,
)), new AccessoryArrayListType()]);
}
if (
$type instanceof Name
&& $this->inClosureBindScopeClasses !== []
&& $this->inClosureBindScopeClasses !== ['static']
&& in_array($type->toLowerString(), ['static', 'self', 'parent'], true)
&& $this->reflectionProvider->hasClass($this->inClosureBindScopeClasses[0])
Comment thread
calebdw marked this conversation as resolved.
) {
return $this->initializerExprTypeResolver->getFunctionType(
$type,
$isNullable,
Comment thread
calebdw marked this conversation as resolved.
false,
InitializerExprContext::fromClassReflection(
$this->reflectionProvider->getClass($this->inClosureBindScopeClasses[0]),
),
);
}

return $this->initializerExprTypeResolver->getFunctionType($type, $isNullable, false, InitializerExprContext::fromScope($this));
}

Expand Down
6 changes: 4 additions & 2 deletions src/Analyser/NodeScopeResolver.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3656,7 +3656,8 @@ public function processArgs(
$closureThisType = $this->resolveClosureThisType($callLike, $calleeReflection, $parameter, $scopeToPass);
if ($closureThisType !== null) {
$restoreThisScope = $scopeToPass;
$scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes());
$scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes())
->withClosureBindScopeClasses($closureThisType->getObjectClassNames());
}
}

Expand DownExpand Up@@ -3722,7 +3723,8 @@ public function processArgs(
) {
$closureThisType = $this->resolveClosureThisType($callLike, $calleeReflection, $parameter, $scopeToPass);
if ($closureThisType !== null) {
$scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes());
$scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes())
->withClosureBindScopeClasses($closureThisType->getObjectClassNames());
}
}

Expand Down
72 changes: 72 additions & 0 deletions tests/PHPStan/Analyser/nsrt/param-closure-this.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -316,3 +316,75 @@ public function doFoo(): void
}

}

class FooParent
{

}

class FooChild extends FooParent
{

private string $secret = 'secret';

}

class StaticReturnClosureThis
{

/**
* @param-closure-this FooChild $cb
*/
public function withFooChild(callable $cb): void
{

}

/**
* @param-closure-this Foo $cb
*/
public function withFoo(callable $cb): void
{

}

}

class TestStaticResolutionInParamClosureThis
Comment thread
calebdw marked this conversation as resolved.
{

public function testStaticReturnType(StaticReturnClosureThis $o): void
{
$o->withFoo(function (): static {
assertType('ParamClosureThis\Foo', $this);
return $this;
});

$o->withFoo(fn (): static => $this);
}

public function testSelfReturnType(StaticReturnClosureThis $o): void
{
$o->withFooChild(function (): self {
assertType('ParamClosureThis\FooChild', $this);
return $this;
});
}

public function testParentReturnType(StaticReturnClosureThis $o): void
{
$o->withFooChild(function (): parent {
assertType('ParamClosureThis\FooChild', $this);
return $this;
});
}

public function testNullableStaticReturnType(StaticReturnClosureThis $o): void
{
$o->withFoo(function (): ?static {
assertType('ParamClosureThis\Foo', $this);
return rand() ? $this : null;
});
}

}
9 changes: 9 additions & 0 deletions tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3394,6 +3394,15 @@ public function testClosureBindToParamClosureThis(): void
]);
}

public function testBug11010(): void
{
$this->checkThisOnly = false;
$this->checkNullables = true;
$this->checkUnionTypes = true;
$this->checkExplicitMixed = true;
$this->analyse([__DIR__ . '/data/bug-11010.php'], []);
}

public function testPureCallable(): void
{
$this->checkThisOnly = false;
Expand Down
28 changes: 28 additions & 0 deletions tests/PHPStan/Rules/Methods/data/bug-11010.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
<?php

namespace Bug11010;

class HelloWorld
{
protected function sayHello(): void
{
echo 'Hello';
}

/**
* @param-closure-this self $cb
*/
public static function cb(\Closure $cb): void
{
$cb = $cb->bindTo(new self, self::class);
if ($cb) {
$cb();
}
}
}

function (): void {
HelloWorld::cb(function () {
$this->sayHello();
});
};
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix: resolve static/self/parent relative to @param-closure-this bound class by calebdw · Pull Request #6061 · phpstan/phpstan-src · GitHub
Skip to content
fix: resolve static/self/parent relative to @param-closure-this bound class#6061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

staabm
merged 1 commit into

from

Jul 20, 2026
 Merged


fix: resolve static/self/parent relative to @param-closure-this bound class
#6061
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


44 changes: 43 additions & 1 deletion
src/Analyser/MutatingScope.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2020,7 +2020,7 @@ public function restoreThis(self $restoreThisScope): self
 $expressionTypes,
 $nativeExpressionTypes,
 $this->conditionalExpressions,
 $this->inClosureBindScopeClasses,
 $restoreThisScope->inClosureBindScopeClasses,
 $this->anonymousFunctionReflection,
 $this->inFirstLevelStatement,
 [],
Expand DownExpand Up@@ -2059,6 +2059,31 @@ public function isInClosureBind(): bool
 return $this->inClosureBindScopeClasses !== [];
	}

	/**
 * @param list<non-empty-string> $scopeClasses
 */
	public function withClosureBindScopeClasses(array $scopeClasses): self
	{
 return $this->scopeFactory->create(
 $this->context,
 $this->isDeclareStrictTypes(),
 $this->getFunction(),
 $this->getNamespace(),
 $this->expressionTypes,
 $this->nativeExpressionTypes,
 $this->conditionalExpressions,
 $scopeClasses,
 $this->anonymousFunctionReflection,
 $this->isInFirstLevelStatement(),
 $this->currentlyAssignedExpressions,
 $this->currentlyAllowedUndefinedExpressions,
 $this->inFunctionCallsStack,
 $this->afterExtractCall,
 $this->parentScope,
 $this->nativeTypesPromoted,
 );
	}

	/**
 * @api
 * @param ParameterReflection[]|null $callableParameters
Expand DownExpand Up@@ -2397,6 +2422,23 @@ public function getFunctionType($type, bool $isNullable, bool $isVariadic): Type
 false,
 )), new AccessoryArrayListType()]);
 }
 if (
 $type instanceof Name
 && $this->inClosureBindScopeClasses !== []
 && $this->inClosureBindScopeClasses !== ['static']
 && in_array($type->toLowerString(), ['static', 'self', 'parent'], true)
 && $this->reflectionProvider->hasClass($this->inClosureBindScopeClasses[0])
Comment thread
calebdw marked this conversation as resolved.

 ) {
 return $this->initializerExprTypeResolver->getFunctionType(
 $type,
 $isNullable,
Comment thread
calebdw marked this conversation as resolved.

 false,
 InitializerExprContext::fromClassReflection(
 $this->reflectionProvider->getClass($this->inClosureBindScopeClasses[0]),
 ),
 );
 }

 return $this->initializerExprTypeResolver->getFunctionType($type, $isNullable, false, InitializerExprContext::fromScope($this));
	}

Expand Down

6 changes: 4 additions & 2 deletions
src/Analyser/NodeScopeResolver.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3656,7 +3656,8 @@ public function processArgs(
 $closureThisType = $this->resolveClosureThisType($callLike, $calleeReflection, $parameter, $scopeToPass);
 if ($closureThisType !== null) {
 $restoreThisScope = $scopeToPass;
 $scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes());
 $scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes())
 ->withClosureBindScopeClasses($closureThisType->getObjectClassNames());
 }
 }

Expand DownExpand Up@@ -3722,7 +3723,8 @@ public function processArgs(
 ) {
 $closureThisType = $this->resolveClosureThisType($callLike, $calleeReflection, $parameter, $scopeToPass);
 if ($closureThisType !== null) {
 $scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes());
 $scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes())
 ->withClosureBindScopeClasses($closureThisType->getObjectClassNames());
 }
 }

Expand Down

72 changes: 72 additions & 0 deletions
tests/PHPStan/Analyser/nsrt/param-closure-this.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -316,3 +316,75 @@ public function doFoo(): void
	}

}

class FooParent
{

}

class FooChild extends FooParent
{

	private string $secret = 'secret';

}

class StaticReturnClosureThis
{

	/**
 * @param-closure-this FooChild $cb
 */
	public function withFooChild(callable $cb): void
	{

	}

	/**
 * @param-closure-this Foo $cb
 */
	public function withFoo(callable $cb): void
	{

	}

}

class TestStaticResolutionInParamClosureThis
Comment thread
calebdw marked this conversation as resolved.

{

	public function testStaticReturnType(StaticReturnClosureThis $o): void
	{
 $o->withFoo(function (): static {
 assertType('ParamClosureThis\Foo', $this);
 return $this;
 });

 $o->withFoo(fn (): static => $this);
	}

	public function testSelfReturnType(StaticReturnClosureThis $o): void
	{
 $o->withFooChild(function (): self {
 assertType('ParamClosureThis\FooChild', $this);
 return $this;
 });
	}

	public function testParentReturnType(StaticReturnClosureThis $o): void
	{
 $o->withFooChild(function (): parent {
 assertType('ParamClosureThis\FooChild', $this);
 return $this;
 });
	}

	public function testNullableStaticReturnType(StaticReturnClosureThis $o): void
	{
 $o->withFoo(function (): ?static {
 assertType('ParamClosureThis\Foo', $this);
 return rand() ? $this : null;
 });
	}

}

9 changes: 9 additions & 0 deletions
tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3394,6 +3394,15 @@ public function testClosureBindToParamClosureThis(): void
 ]);
	}

	public function testBug11010(): void
	{
 $this->checkThisOnly = false;
 $this->checkNullables = true;
 $this->checkUnionTypes = true;
 $this->checkExplicitMixed = true;
 $this->analyse([__DIR__ . '/data/bug-11010.php'], []);
	}

	public function testPureCallable(): void
	{
 $this->checkThisOnly = false;
Expand Down

28 changes: 28 additions & 0 deletions
tests/PHPStan/Rules/Methods/data/bug-11010.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
<?php

namespace Bug11010;

class HelloWorld
{
	protected function sayHello(): void
	{
 echo 'Hello';
	}

	/**
 * @param-closure-this self $cb
 */
	public static function cb(\Closure $cb): void
	{
 $cb = $cb->bindTo(new self, self::class);
 if ($cb) {
 $cb();
 }
	}
}

function (): void {
	HelloWorld::cb(function () {
 $this->sayHello();
	});
};
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: resolve static/self/parent relative to @param-closure-this bound class by calebdw · Pull Request #6061 · phpstan/phpstan-src · GitHub
Skip to content
fix: resolve static/self/parent relative to @param-closure-this bound class#6061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

staabm
merged 1 commit into

from

Jul 20, 2026
 Merged


fix: resolve static/self/parent relative to @param-closure-this bound class
#6061
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


44 changes: 43 additions & 1 deletion
src/Analyser/MutatingScope.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2020,7 +2020,7 @@ public function restoreThis(self $restoreThisScope): self
 $expressionTypes,
 $nativeExpressionTypes,
 $this->conditionalExpressions,
 $this->inClosureBindScopeClasses,
 $restoreThisScope->inClosureBindScopeClasses,
 $this->anonymousFunctionReflection,
 $this->inFirstLevelStatement,
 [],
Expand DownExpand Up@@ -2059,6 +2059,31 @@ public function isInClosureBind(): bool
 return $this->inClosureBindScopeClasses !== [];
	}

	/**
 * @param list<non-empty-string> $scopeClasses
 */
	public function withClosureBindScopeClasses(array $scopeClasses): self
	{
 return $this->scopeFactory->create(
 $this->context,
 $this->isDeclareStrictTypes(),
 $this->getFunction(),
 $this->getNamespace(),
 $this->expressionTypes,
 $this->nativeExpressionTypes,
 $this->conditionalExpressions,
 $scopeClasses,
 $this->anonymousFunctionReflection,
 $this->isInFirstLevelStatement(),
 $this->currentlyAssignedExpressions,
 $this->currentlyAllowedUndefinedExpressions,
 $this->inFunctionCallsStack,
 $this->afterExtractCall,
 $this->parentScope,
 $this->nativeTypesPromoted,
 );
	}

	/**
 * @api
 * @param ParameterReflection[]|null $callableParameters
Expand DownExpand Up@@ -2397,6 +2422,23 @@ public function getFunctionType($type, bool $isNullable, bool $isVariadic): Type
 false,
 )), new AccessoryArrayListType()]);
 }
 if (
 $type instanceof Name
 && $this->inClosureBindScopeClasses !== []
 && $this->inClosureBindScopeClasses !== ['static']
 && in_array($type->toLowerString(), ['static', 'self', 'parent'], true)
 && $this->reflectionProvider->hasClass($this->inClosureBindScopeClasses[0])
Comment thread
calebdw marked this conversation as resolved.

 ) {
 return $this->initializerExprTypeResolver->getFunctionType(
 $type,
 $isNullable,
Comment thread
calebdw marked this conversation as resolved.

 false,
 InitializerExprContext::fromClassReflection(
 $this->reflectionProvider->getClass($this->inClosureBindScopeClasses[0]),
 ),
 );
 }

 return $this->initializerExprTypeResolver->getFunctionType($type, $isNullable, false, InitializerExprContext::fromScope($this));
	}

Expand Down

6 changes: 4 additions & 2 deletions
src/Analyser/NodeScopeResolver.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3656,7 +3656,8 @@ public function processArgs(
 $closureThisType = $this->resolveClosureThisType($callLike, $calleeReflection, $parameter, $scopeToPass);
 if ($closureThisType !== null) {
 $restoreThisScope = $scopeToPass;
 $scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes());
 $scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes())
 ->withClosureBindScopeClasses($closureThisType->getObjectClassNames());
 }
 }

Expand DownExpand Up@@ -3722,7 +3723,8 @@ public function processArgs(
 ) {
 $closureThisType = $this->resolveClosureThisType($callLike, $calleeReflection, $parameter, $scopeToPass);
 if ($closureThisType !== null) {
 $scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes());
 $scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes())
 ->withClosureBindScopeClasses($closureThisType->getObjectClassNames());
 }
 }

Expand Down

72 changes: 72 additions & 0 deletions
tests/PHPStan/Analyser/nsrt/param-closure-this.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -316,3 +316,75 @@ public function doFoo(): void
	}

}

class FooParent
{

}

class FooChild extends FooParent
{

	private string $secret = 'secret';

}

class StaticReturnClosureThis
{

	/**
 * @param-closure-this FooChild $cb
 */
	public function withFooChild(callable $cb): void
	{

	}

	/**
 * @param-closure-this Foo $cb
 */
	public function withFoo(callable $cb): void
	{

	}

}

class TestStaticResolutionInParamClosureThis
Comment thread
calebdw marked this conversation as resolved.

{

	public function testStaticReturnType(StaticReturnClosureThis $o): void
	{
 $o->withFoo(function (): static {
 assertType('ParamClosureThis\Foo', $this);
 return $this;
 });

 $o->withFoo(fn (): static => $this);
	}

	public function testSelfReturnType(StaticReturnClosureThis $o): void
	{
 $o->withFooChild(function (): self {
 assertType('ParamClosureThis\FooChild', $this);
 return $this;
 });
	}

	public function testParentReturnType(StaticReturnClosureThis $o): void
	{
 $o->withFooChild(function (): parent {
 assertType('ParamClosureThis\FooChild', $this);
 return $this;
 });
	}

	public function testNullableStaticReturnType(StaticReturnClosureThis $o): void
	{
 $o->withFoo(function (): ?static {
 assertType('ParamClosureThis\Foo', $this);
 return rand() ? $this : null;
 });
	}

}

9 changes: 9 additions & 0 deletions
tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3394,6 +3394,15 @@ public function testClosureBindToParamClosureThis(): void
 ]);
	}

	public function testBug11010(): void
	{
 $this->checkThisOnly = false;
 $this->checkNullables = true;
 $this->checkUnionTypes = true;
 $this->checkExplicitMixed = true;
 $this->analyse([__DIR__ . '/data/bug-11010.php'], []);
	}

	public function testPureCallable(): void
	{
 $this->checkThisOnly = false;
Expand Down

28 changes: 28 additions & 0 deletions
tests/PHPStan/Rules/Methods/data/bug-11010.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
<?php

namespace Bug11010;

class HelloWorld
{
	protected function sayHello(): void
	{
 echo 'Hello';
	}

	/**
 * @param-closure-this self $cb
 */
	public static function cb(\Closure $cb): void
	{
 $cb = $cb->bindTo(new self, self::class);
 if ($cb) {
 $cb();
 }
	}
}

function (): void {
	HelloWorld::cb(function () {
 $this->sayHello();
	});
};
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: resolve static/self/parent relative to @param-closure-this bound class by calebdw · Pull Request #6061 · phpstan/phpstan-src · GitHub
Skip to content
fix: resolve static/self/parent relative to @param-closure-this bound class#6061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

staabm
merged 1 commit into

from

Jul 20, 2026
 Merged


fix: resolve static/self/parent relative to @param-closure-this bound class
#6061
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


44 changes: 43 additions & 1 deletion
src/Analyser/MutatingScope.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2020,7 +2020,7 @@ public function restoreThis(self $restoreThisScope): self
 $expressionTypes,
 $nativeExpressionTypes,
 $this->conditionalExpressions,
 $this->inClosureBindScopeClasses,
 $restoreThisScope->inClosureBindScopeClasses,
 $this->anonymousFunctionReflection,
 $this->inFirstLevelStatement,
 [],
Expand DownExpand Up@@ -2059,6 +2059,31 @@ public function isInClosureBind(): bool
 return $this->inClosureBindScopeClasses !== [];
	}

	/**
 * @param list<non-empty-string> $scopeClasses
 */
	public function withClosureBindScopeClasses(array $scopeClasses): self
	{
 return $this->scopeFactory->create(
 $this->context,
 $this->isDeclareStrictTypes(),
 $this->getFunction(),
 $this->getNamespace(),
 $this->expressionTypes,
 $this->nativeExpressionTypes,
 $this->conditionalExpressions,
 $scopeClasses,
 $this->anonymousFunctionReflection,
 $this->isInFirstLevelStatement(),
 $this->currentlyAssignedExpressions,
 $this->currentlyAllowedUndefinedExpressions,
 $this->inFunctionCallsStack,
 $this->afterExtractCall,
 $this->parentScope,
 $this->nativeTypesPromoted,
 );
	}

	/**
 * @api
 * @param ParameterReflection[]|null $callableParameters
Expand DownExpand Up@@ -2397,6 +2422,23 @@ public function getFunctionType($type, bool $isNullable, bool $isVariadic): Type
 false,
 )), new AccessoryArrayListType()]);
 }
 if (
 $type instanceof Name
 && $this->inClosureBindScopeClasses !== []
 && $this->inClosureBindScopeClasses !== ['static']
 && in_array($type->toLowerString(), ['static', 'self', 'parent'], true)
 && $this->reflectionProvider->hasClass($this->inClosureBindScopeClasses[0])
Comment thread
calebdw marked this conversation as resolved.

 ) {
 return $this->initializerExprTypeResolver->getFunctionType(
 $type,
 $isNullable,
Comment thread
calebdw marked this conversation as resolved.

 false,
 InitializerExprContext::fromClassReflection(
 $this->reflectionProvider->getClass($this->inClosureBindScopeClasses[0]),
 ),
 );
 }

 return $this->initializerExprTypeResolver->getFunctionType($type, $isNullable, false, InitializerExprContext::fromScope($this));
	}

Expand Down

6 changes: 4 additions & 2 deletions
src/Analyser/NodeScopeResolver.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3656,7 +3656,8 @@ public function processArgs(
 $closureThisType = $this->resolveClosureThisType($callLike, $calleeReflection, $parameter, $scopeToPass);
 if ($closureThisType !== null) {
 $restoreThisScope = $scopeToPass;
 $scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes());
 $scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes())
 ->withClosureBindScopeClasses($closureThisType->getObjectClassNames());
 }
 }

Expand DownExpand Up@@ -3722,7 +3723,8 @@ public function processArgs(
 ) {
 $closureThisType = $this->resolveClosureThisType($callLike, $calleeReflection, $parameter, $scopeToPass);
 if ($closureThisType !== null) {
 $scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes());
 $scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes())
 ->withClosureBindScopeClasses($closureThisType->getObjectClassNames());
 }
 }

Expand Down

72 changes: 72 additions & 0 deletions
tests/PHPStan/Analyser/nsrt/param-closure-this.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -316,3 +316,75 @@ public function doFoo(): void
	}

}

class FooParent
{

}

class FooChild extends FooParent
{

	private string $secret = 'secret';

}

class StaticReturnClosureThis
{

	/**
 * @param-closure-this FooChild $cb
 */
	public function withFooChild(callable $cb): void
	{

	}

	/**
 * @param-closure-this Foo $cb
 */
	public function withFoo(callable $cb): void
	{

	}

}

class TestStaticResolutionInParamClosureThis
Comment thread
calebdw marked this conversation as resolved.

{

	public function testStaticReturnType(StaticReturnClosureThis $o): void
	{
 $o->withFoo(function (): static {
 assertType('ParamClosureThis\Foo', $this);
 return $this;
 });

 $o->withFoo(fn (): static => $this);
	}

	public function testSelfReturnType(StaticReturnClosureThis $o): void
	{
 $o->withFooChild(function (): self {
 assertType('ParamClosureThis\FooChild', $this);
 return $this;
 });
	}

	public function testParentReturnType(StaticReturnClosureThis $o): void
	{
 $o->withFooChild(function (): parent {
 assertType('ParamClosureThis\FooChild', $this);
 return $this;
 });
	}

	public function testNullableStaticReturnType(StaticReturnClosureThis $o): void
	{
 $o->withFoo(function (): ?static {
 assertType('ParamClosureThis\Foo', $this);
 return rand() ? $this : null;
 });
	}

}

9 changes: 9 additions & 0 deletions
tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3394,6 +3394,15 @@ public function testClosureBindToParamClosureThis(): void
 ]);
	}

	public function testBug11010(): void
	{
 $this->checkThisOnly = false;
 $this->checkNullables = true;
 $this->checkUnionTypes = true;
 $this->checkExplicitMixed = true;
 $this->analyse([__DIR__ . '/data/bug-11010.php'], []);
	}

	public function testPureCallable(): void
	{
 $this->checkThisOnly = false;
Expand Down

28 changes: 28 additions & 0 deletions
tests/PHPStan/Rules/Methods/data/bug-11010.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
<?php

namespace Bug11010;

class HelloWorld
{
	protected function sayHello(): void
	{
 echo 'Hello';
	}

	/**
 * @param-closure-this self $cb
 */
	public static function cb(\Closure $cb): void
	{
 $cb = $cb->bindTo(new self, self::class);
 if ($cb) {
 $cb();
 }
	}
}

function (): void {
	HelloWorld::cb(function () {
 $this->sayHello();
	});
};
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
fix: resolve static/self/parent relative to @param-closure-this bound class by calebdw · Pull Request #6061 · phpstan/phpstan-src · GitHub
Skip to content
fix: resolve static/self/parent relative to @param-closure-this bound class#6061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

staabm
merged 1 commit into

from

Jul 20, 2026
 Merged


fix: resolve static/self/parent relative to @param-closure-this bound class
#6061
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


44 changes: 43 additions & 1 deletion
src/Analyser/MutatingScope.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2020,7 +2020,7 @@ public function restoreThis(self $restoreThisScope): self
 $expressionTypes,
 $nativeExpressionTypes,
 $this->conditionalExpressions,
 $this->inClosureBindScopeClasses,
 $restoreThisScope->inClosureBindScopeClasses,
 $this->anonymousFunctionReflection,
 $this->inFirstLevelStatement,
 [],
Expand DownExpand Up@@ -2059,6 +2059,31 @@ public function isInClosureBind(): bool
 return $this->inClosureBindScopeClasses !== [];
	}

	/**
 * @param list<non-empty-string> $scopeClasses
 */
	public function withClosureBindScopeClasses(array $scopeClasses): self
	{
 return $this->scopeFactory->create(
 $this->context,
 $this->isDeclareStrictTypes(),
 $this->getFunction(),
 $this->getNamespace(),
 $this->expressionTypes,
 $this->nativeExpressionTypes,
 $this->conditionalExpressions,
 $scopeClasses,
 $this->anonymousFunctionReflection,
 $this->isInFirstLevelStatement(),
 $this->currentlyAssignedExpressions,
 $this->currentlyAllowedUndefinedExpressions,
 $this->inFunctionCallsStack,
 $this->afterExtractCall,
 $this->parentScope,
 $this->nativeTypesPromoted,
 );
	}

	/**
 * @api
 * @param ParameterReflection[]|null $callableParameters
Expand DownExpand Up@@ -2397,6 +2422,23 @@ public function getFunctionType($type, bool $isNullable, bool $isVariadic): Type
 false,
 )), new AccessoryArrayListType()]);
 }
 if (
 $type instanceof Name
 && $this->inClosureBindScopeClasses !== []
 && $this->inClosureBindScopeClasses !== ['static']
 && in_array($type->toLowerString(), ['static', 'self', 'parent'], true)
 && $this->reflectionProvider->hasClass($this->inClosureBindScopeClasses[0])
Comment thread
calebdw marked this conversation as resolved.

 ) {
 return $this->initializerExprTypeResolver->getFunctionType(
 $type,
 $isNullable,
Comment thread
calebdw marked this conversation as resolved.

 false,
 InitializerExprContext::fromClassReflection(
 $this->reflectionProvider->getClass($this->inClosureBindScopeClasses[0]),
 ),
 );
 }

 return $this->initializerExprTypeResolver->getFunctionType($type, $isNullable, false, InitializerExprContext::fromScope($this));
	}

Expand Down

6 changes: 4 additions & 2 deletions
src/Analyser/NodeScopeResolver.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3656,7 +3656,8 @@ public function processArgs(
 $closureThisType = $this->resolveClosureThisType($callLike, $calleeReflection, $parameter, $scopeToPass);
 if ($closureThisType !== null) {
 $restoreThisScope = $scopeToPass;
 $scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes());
 $scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes())
 ->withClosureBindScopeClasses($closureThisType->getObjectClassNames());
 }
 }

Expand DownExpand Up@@ -3722,7 +3723,8 @@ public function processArgs(
 ) {
 $closureThisType = $this->resolveClosureThisType($callLike, $calleeReflection, $parameter, $scopeToPass);
 if ($closureThisType !== null) {
 $scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes());
 $scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes())
 ->withClosureBindScopeClasses($closureThisType->getObjectClassNames());
 }
 }

Expand Down

72 changes: 72 additions & 0 deletions
tests/PHPStan/Analyser/nsrt/param-closure-this.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -316,3 +316,75 @@ public function doFoo(): void
	}

}

class FooParent
{

}

class FooChild extends FooParent
{

	private string $secret = 'secret';

}

class StaticReturnClosureThis
{

	/**
 * @param-closure-this FooChild $cb
 */
	public function withFooChild(callable $cb): void
	{

	}

	/**
 * @param-closure-this Foo $cb
 */
	public function withFoo(callable $cb): void
	{

	}

}

class TestStaticResolutionInParamClosureThis
Comment thread
calebdw marked this conversation as resolved.

{

	public function testStaticReturnType(StaticReturnClosureThis $o): void
	{
 $o->withFoo(function (): static {
 assertType('ParamClosureThis\Foo', $this);
 return $this;
 });

 $o->withFoo(fn (): static => $this);
	}

	public function testSelfReturnType(StaticReturnClosureThis $o): void
	{
 $o->withFooChild(function (): self {
 assertType('ParamClosureThis\FooChild', $this);
 return $this;
 });
	}

	public function testParentReturnType(StaticReturnClosureThis $o): void
	{
 $o->withFooChild(function (): parent {
 assertType('ParamClosureThis\FooChild', $this);
 return $this;
 });
	}

	public function testNullableStaticReturnType(StaticReturnClosureThis $o): void
	{
 $o->withFoo(function (): ?static {
 assertType('ParamClosureThis\Foo', $this);
 return rand() ? $this : null;
 });
	}

}

9 changes: 9 additions & 0 deletions
tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3394,6 +3394,15 @@ public function testClosureBindToParamClosureThis(): void
 ]);
	}

	public function testBug11010(): void
	{
 $this->checkThisOnly = false;
 $this->checkNullables = true;
 $this->checkUnionTypes = true;
 $this->checkExplicitMixed = true;
 $this->analyse([__DIR__ . '/data/bug-11010.php'], []);
	}

	public function testPureCallable(): void
	{
 $this->checkThisOnly = false;
Expand Down

28 changes: 28 additions & 0 deletions
tests/PHPStan/Rules/Methods/data/bug-11010.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
<?php

namespace Bug11010;

class HelloWorld
{
	protected function sayHello(): void
	{
 echo 'Hello';
	}

	/**
 * @param-closure-this self $cb
 */
	public static function cb(\Closure $cb): void
	{
 $cb = $cb->bindTo(new self, self::class);
 if ($cb) {
 $cb();
 }
	}
}

function (): void {
	HelloWorld::cb(function () {
 $this->sayHello();
	});
};
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: resolve static/self/parent relative to @param-closure-this bound class by calebdw · Pull Request #6061 · phpstan/phpstan-src · GitHub
Skip to content
fix: resolve static/self/parent relative to @param-closure-this bound class#6061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

staabm
merged 1 commit into

from

Jul 20, 2026
 Merged


fix: resolve static/self/parent relative to @param-closure-this bound class
#6061
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


44 changes: 43 additions & 1 deletion
src/Analyser/MutatingScope.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2020,7 +2020,7 @@ public function restoreThis(self $restoreThisScope): self
 $expressionTypes,
 $nativeExpressionTypes,
 $this->conditionalExpressions,
 $this->inClosureBindScopeClasses,
 $restoreThisScope->inClosureBindScopeClasses,
 $this->anonymousFunctionReflection,
 $this->inFirstLevelStatement,
 [],
Expand DownExpand Up@@ -2059,6 +2059,31 @@ public function isInClosureBind(): bool
 return $this->inClosureBindScopeClasses !== [];
	}

	/**
 * @param list<non-empty-string> $scopeClasses
 */
	public function withClosureBindScopeClasses(array $scopeClasses): self
	{
 return $this->scopeFactory->create(
 $this->context,
 $this->isDeclareStrictTypes(),
 $this->getFunction(),
 $this->getNamespace(),
 $this->expressionTypes,
 $this->nativeExpressionTypes,
 $this->conditionalExpressions,
 $scopeClasses,
 $this->anonymousFunctionReflection,
 $this->isInFirstLevelStatement(),
 $this->currentlyAssignedExpressions,
 $this->currentlyAllowedUndefinedExpressions,
 $this->inFunctionCallsStack,
 $this->afterExtractCall,
 $this->parentScope,
 $this->nativeTypesPromoted,
 );
	}

	/**
 * @api
 * @param ParameterReflection[]|null $callableParameters
Expand DownExpand Up@@ -2397,6 +2422,23 @@ public function getFunctionType($type, bool $isNullable, bool $isVariadic): Type
 false,
 )), new AccessoryArrayListType()]);
 }
 if (
 $type instanceof Name
 && $this->inClosureBindScopeClasses !== []
 && $this->inClosureBindScopeClasses !== ['static']
 && in_array($type->toLowerString(), ['static', 'self', 'parent'], true)
 && $this->reflectionProvider->hasClass($this->inClosureBindScopeClasses[0])
Comment thread
calebdw marked this conversation as resolved.

 ) {
 return $this->initializerExprTypeResolver->getFunctionType(
 $type,
 $isNullable,
Comment thread
calebdw marked this conversation as resolved.

 false,
 InitializerExprContext::fromClassReflection(
 $this->reflectionProvider->getClass($this->inClosureBindScopeClasses[0]),
 ),
 );
 }

 return $this->initializerExprTypeResolver->getFunctionType($type, $isNullable, false, InitializerExprContext::fromScope($this));
	}

Expand Down

6 changes: 4 additions & 2 deletions
src/Analyser/NodeScopeResolver.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3656,7 +3656,8 @@ public function processArgs(
 $closureThisType = $this->resolveClosureThisType($callLike, $calleeReflection, $parameter, $scopeToPass);
 if ($closureThisType !== null) {
 $restoreThisScope = $scopeToPass;
 $scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes());
 $scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes())
 ->withClosureBindScopeClasses($closureThisType->getObjectClassNames());
 }
 }

Expand DownExpand Up@@ -3722,7 +3723,8 @@ public function processArgs(
 ) {
 $closureThisType = $this->resolveClosureThisType($callLike, $calleeReflection, $parameter, $scopeToPass);
 if ($closureThisType !== null) {
 $scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes());
 $scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes())
 ->withClosureBindScopeClasses($closureThisType->getObjectClassNames());
 }
 }

Expand Down

72 changes: 72 additions & 0 deletions
tests/PHPStan/Analyser/nsrt/param-closure-this.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -316,3 +316,75 @@ public function doFoo(): void
	}

}

class FooParent
{

}

class FooChild extends FooParent
{

	private string $secret = 'secret';

}

class StaticReturnClosureThis
{

	/**
 * @param-closure-this FooChild $cb
 */
	public function withFooChild(callable $cb): void
	{

	}

	/**
 * @param-closure-this Foo $cb
 */
	public function withFoo(callable $cb): void
	{

	}

}

class TestStaticResolutionInParamClosureThis
Comment thread
calebdw marked this conversation as resolved.

{

	public function testStaticReturnType(StaticReturnClosureThis $o): void
	{
 $o->withFoo(function (): static {
 assertType('ParamClosureThis\Foo', $this);
 return $this;
 });

 $o->withFoo(fn (): static => $this);
	}

	public function testSelfReturnType(StaticReturnClosureThis $o): void
	{
 $o->withFooChild(function (): self {
 assertType('ParamClosureThis\FooChild', $this);
 return $this;
 });
	}

	public function testParentReturnType(StaticReturnClosureThis $o): void
	{
 $o->withFooChild(function (): parent {
 assertType('ParamClosureThis\FooChild', $this);
 return $this;
 });
	}

	public function testNullableStaticReturnType(StaticReturnClosureThis $o): void
	{
 $o->withFoo(function (): ?static {
 assertType('ParamClosureThis\Foo', $this);
 return rand() ? $this : null;
 });
	}

}

9 changes: 9 additions & 0 deletions
tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3394,6 +3394,15 @@ public function testClosureBindToParamClosureThis(): void
 ]);
	}

	public function testBug11010(): void
	{
 $this->checkThisOnly = false;
 $this->checkNullables = true;
 $this->checkUnionTypes = true;
 $this->checkExplicitMixed = true;
 $this->analyse([__DIR__ . '/data/bug-11010.php'], []);
	}

	public function testPureCallable(): void
	{
 $this->checkThisOnly = false;
Expand Down

28 changes: 28 additions & 0 deletions
tests/PHPStan/Rules/Methods/data/bug-11010.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
<?php

namespace Bug11010;

class HelloWorld
{
	protected function sayHello(): void
	{
 echo 'Hello';
	}

	/**
 * @param-closure-this self $cb
 */
	public static function cb(\Closure $cb): void
	{
 $cb = $cb->bindTo(new self, self::class);
 if ($cb) {
 $cb();
 }
	}
}

function (): void {
	HelloWorld::cb(function () {
 $this->sayHello();
	});
};
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
fix: resolve static/self/parent relative to @param-closure-this bound class by calebdw · Pull Request #6061 · phpstan/phpstan-src · GitHub
Skip to content
fix: resolve static/self/parent relative to @param-closure-this bound class#6061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

staabm
merged 1 commit into

from

Jul 20, 2026
 Merged


fix: resolve static/self/parent relative to @param-closure-this bound class
#6061
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


44 changes: 43 additions & 1 deletion
src/Analyser/MutatingScope.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2020,7 +2020,7 @@ public function restoreThis(self $restoreThisScope): self
 $expressionTypes,
 $nativeExpressionTypes,
 $this->conditionalExpressions,
 $this->inClosureBindScopeClasses,
 $restoreThisScope->inClosureBindScopeClasses,
 $this->anonymousFunctionReflection,
 $this->inFirstLevelStatement,
 [],
Expand DownExpand Up@@ -2059,6 +2059,31 @@ public function isInClosureBind(): bool
 return $this->inClosureBindScopeClasses !== [];
	}

	/**
 * @param list<non-empty-string> $scopeClasses
 */
	public function withClosureBindScopeClasses(array $scopeClasses): self
	{
 return $this->scopeFactory->create(
 $this->context,
 $this->isDeclareStrictTypes(),
 $this->getFunction(),
 $this->getNamespace(),
 $this->expressionTypes,
 $this->nativeExpressionTypes,
 $this->conditionalExpressions,
 $scopeClasses,
 $this->anonymousFunctionReflection,
 $this->isInFirstLevelStatement(),
 $this->currentlyAssignedExpressions,
 $this->currentlyAllowedUndefinedExpressions,
 $this->inFunctionCallsStack,
 $this->afterExtractCall,
 $this->parentScope,
 $this->nativeTypesPromoted,
 );
	}

	/**
 * @api
 * @param ParameterReflection[]|null $callableParameters
Expand DownExpand Up@@ -2397,6 +2422,23 @@ public function getFunctionType($type, bool $isNullable, bool $isVariadic): Type
 false,
 )), new AccessoryArrayListType()]);
 }
 if (
 $type instanceof Name
 && $this->inClosureBindScopeClasses !== []
 && $this->inClosureBindScopeClasses !== ['static']
 && in_array($type->toLowerString(), ['static', 'self', 'parent'], true)
 && $this->reflectionProvider->hasClass($this->inClosureBindScopeClasses[0])
Comment thread
calebdw marked this conversation as resolved.

 ) {
 return $this->initializerExprTypeResolver->getFunctionType(
 $type,
 $isNullable,
Comment thread
calebdw marked this conversation as resolved.

 false,
 InitializerExprContext::fromClassReflection(
 $this->reflectionProvider->getClass($this->inClosureBindScopeClasses[0]),
 ),
 );
 }

 return $this->initializerExprTypeResolver->getFunctionType($type, $isNullable, false, InitializerExprContext::fromScope($this));
	}

Expand Down

6 changes: 4 additions & 2 deletions
src/Analyser/NodeScopeResolver.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3656,7 +3656,8 @@ public function processArgs(
 $closureThisType = $this->resolveClosureThisType($callLike, $calleeReflection, $parameter, $scopeToPass);
 if ($closureThisType !== null) {
 $restoreThisScope = $scopeToPass;
 $scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes());
 $scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes())
 ->withClosureBindScopeClasses($closureThisType->getObjectClassNames());
 }
 }

Expand DownExpand Up@@ -3722,7 +3723,8 @@ public function processArgs(
 ) {
 $closureThisType = $this->resolveClosureThisType($callLike, $calleeReflection, $parameter, $scopeToPass);
 if ($closureThisType !== null) {
 $scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes());
 $scopeToPass = $scopeToPass->assignVariable('this', $closureThisType, new ObjectWithoutClassType(), TrinaryLogic::createYes())
 ->withClosureBindScopeClasses($closureThisType->getObjectClassNames());
 }
 }

Expand Down

72 changes: 72 additions & 0 deletions
tests/PHPStan/Analyser/nsrt/param-closure-this.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -316,3 +316,75 @@ public function doFoo(): void
	}

}

class FooParent
{

}

class FooChild extends FooParent
{

	private string $secret = 'secret';

}

class StaticReturnClosureThis
{

	/**
 * @param-closure-this FooChild $cb
 */
	public function withFooChild(callable $cb): void
	{

	}

	/**
 * @param-closure-this Foo $cb
 */
	public function withFoo(callable $cb): void
	{

	}

}

class TestStaticResolutionInParamClosureThis
Comment thread
calebdw marked this conversation as resolved.

{

	public function testStaticReturnType(StaticReturnClosureThis $o): void
	{
 $o->withFoo(function (): static {
 assertType('ParamClosureThis\Foo', $this);
 return $this;
 });

 $o->withFoo(fn (): static => $this);
	}

	public function testSelfReturnType(StaticReturnClosureThis $o): void
	{
 $o->withFooChild(function (): self {
 assertType('ParamClosureThis\FooChild', $this);
 return $this;
 });
	}

	public function testParentReturnType(StaticReturnClosureThis $o): void
	{
 $o->withFooChild(function (): parent {
 assertType('ParamClosureThis\FooChild', $this);
 return $this;
 });
	}

	public function testNullableStaticReturnType(StaticReturnClosureThis $o): void
	{
 $o->withFoo(function (): ?static {
 assertType('ParamClosureThis\Foo', $this);
 return rand() ? $this : null;
 });
	}

}

9 changes: 9 additions & 0 deletions
tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3394,6 +3394,15 @@ public function testClosureBindToParamClosureThis(): void
 ]);
	}

	public function testBug11010(): void
	{
 $this->checkThisOnly = false;
 $this->checkNullables = true;
 $this->checkUnionTypes = true;
 $this->checkExplicitMixed = true;
 $this->analyse([__DIR__ . '/data/bug-11010.php'], []);
	}

	public function testPureCallable(): void
	{
 $this->checkThisOnly = false;
Expand Down

28 changes: 28 additions & 0 deletions
tests/PHPStan/Rules/Methods/data/bug-11010.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
<?php

namespace Bug11010;

class HelloWorld
{
	protected function sayHello(): void
	{
 echo 'Hello';
	}

	/**
 * @param-closure-this self $cb
 */
	public static function cb(\Closure $cb): void
	{
 $cb = $cb->bindTo(new self, self::class);
 if ($cb) {
 $cb();
 }
	}
}

function (): void {
	HelloWorld::cb(function () {
 $this->sayHello();
	});
};
Loading