Skip to content
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

Jump to bottom

Run method call prohibition analyzer when cloning #8155

Merged
merged 1 commit into from Jun 24, 2022
Merged

Run method call prohibition analyzer when cloning #8155

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 14 additions & 4 deletions src/Psalm/Internal/Analyzer/Statements/Expression/CloneAnalyzer.php
View file
Open in desktop
Expand Up @@ -6,6 +6,7 @@
use Psalm\CodeLocation;
use Psalm\Context;
use Psalm\Internal\Analyzer\MethodAnalyzer;
use Psalm\Internal\Analyzer\Statements\Expression\Call\Method\MethodCallProhibitionAnalyzer;
use Psalm\Internal\Analyzer\Statements\ExpressionAnalyzer;
use Psalm\Internal\Analyzer\StatementsAnalyzer;
use Psalm\Internal\MethodIdentifier;
Expand Down Expand Up @@ -39,6 +40,7 @@ public static function analyze(
return false;
}

$location = new CodeLocation($statements_analyzer->getSource(), $stmt);
$stmt_expr_type = $statements_analyzer->node_data->getType($stmt->expr);

if ($stmt_expr_type) {
Expand Down Expand Up @@ -71,7 +73,7 @@ public static function analyze(
$does_method_exist = $codebase_methods->methodExists(
$clone_method_id,
$context->calling_method_id,
new CodeLocation($statements_analyzer->getSource(), $stmt)
$location
);
$is_method_visible = MethodAnalyzer::isMethodVisible(
$clone_method_id,
Expand All @@ -81,6 +83,14 @@ public static function analyze(
if ($does_method_exist && !$is_method_visible) {
$invalid_clones[] = $clone_type_part->getId();
} else {
MethodCallProhibitionAnalyzer::analyze(
$codebase,
$context,
$clone_method_id,
$statements_analyzer->getNamespace(),
$location,
$statements_analyzer->getSuppressedIssues()
);
$possibly_valid = true;
$immutable_cloned = true;
}
Expand Down Expand Up @@ -108,7 +118,7 @@ public static function analyze(
IssueBuffer::maybeAdd(
new MixedClone(
'Cannot clone mixed',
new CodeLocation($statements_analyzer->getSource(), $stmt)
$location
),
$statements_analyzer->getSuppressedIssues()
);
Expand All @@ -119,15 +129,15 @@ public static function analyze(
IssueBuffer::maybeAdd(
new PossiblyInvalidClone(
'Cannot clone ' . $invalid_clones[0],
new CodeLocation($statements_analyzer->getSource(), $stmt)
$location
),
$statements_analyzer->getSuppressedIssues()
);
} else {
IssueBuffer::maybeAdd(
new InvalidClone(
'Cannot clone ' . $invalid_clones[0],
new CodeLocation($statements_analyzer->getSource(), $stmt)
$location
),
$statements_analyzer->getSuppressedIssues()
);
Expand Down
24 changes: 24 additions & 0 deletions tests/DeprecatedAnnotationTest.php
View file
Open in desktop
Expand Up @@ -26,6 +26,16 @@ public static function barBar(): void {
}
}',
],
'deprecatedCloneMethod' => [
'code' => '<?php
class Foo {
/**
* @deprecated
*/
public function __clone() {
}
}',
],
'deprecatedClassUsedInsideClass' => [
'code' => '<?php
/**
Expand Down Expand Up @@ -114,6 +124,20 @@ public static function barBar(): void {
Foo::barBar();',
'error_message' => 'DeprecatedMethod',
],
'deprecatedCloneMethodWithCall' => [
'code' => '<?php
class Foo {
/**
* @deprecated
*/
public function __clone() {
}
}

$a = new Foo;
$aa = clone $a;',
'error_message' => 'DeprecatedMethod',
],
'deprecatedClassWithStaticCall' => [
'code' => '<?php
/**
Expand Down
22 changes: 22 additions & 0 deletions tests/InternalAnnotationTest.php
View file
Open in desktop
Expand Up @@ -586,6 +586,28 @@ public function batBat(): void {
}',
'error_message' => 'The method A\Foo::barBar is internal to A but called from B\Bat',
],
'internalCloneMethodWithCall' => [
'code' => '<?php
namespace A {
class Foo {
/**
* @internal
*/
public function __clone() {
}
}
}

namespace B {
class Bat {
public function batBat(): void {
$a = new \A\Foo;
$aa = clone $a;
}
}
}',
'error_message' => 'The method A\Foo::__clone is internal to A but called from B\Bat',
],
'internalMethodWithCallFromRootNamespace' => [
'code' => '<?php
namespace A {
Expand Down