danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-26 12:24:49 +01:00
Code Issues Projects Releases Wiki Activity

Break out RedundantCast issues

Browse Source
This commit is contained in:
Matt Brown 2020-12-01 17:25:45 -05:00 committed by Daniil Gentili
parent 2a30e49d88
commit 06d69ba5f3
Signed by: danog
GPG Key ID: 8C1BE3B34B230CA7
11 changed files with 84 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.xsd
View File

@ -369,6 +369,8 @@
<xs:element name="PropertyNotSetInConstructor" type="PropertyIssueHandlerType" minOccurs="0" />
<xs:element name="PropertyTypeCoercion" type="PropertyIssueHandlerType" minOccurs="0" />
<xs:element name="RawObjectIteration" type="IssueHandlerType" minOccurs="0" />
<xs:element name="RedundantCast" type="IssueHandlerType" minOccurs="0" />
<xs:element name="RedundantCastGivenDocblockType" type="IssueHandlerType" minOccurs="0" />
<xs:element name="RedundantCondition" type="IssueHandlerType" minOccurs="0" />
<xs:element name="RedundantConditionGivenDocblockType" type="IssueHandlerType" minOccurs="0" />
<xs:element name="RedundantPropertyInitializationCheck" type="IssueHandlerType" minOccurs="0" />

10
docs/running_psalm/issues/RedundantCast.md Normal file
View File

@ -0,0 +1,10 @@
# RedundantCast
Emitted when a cast (string, int, float etc.) is redundant
```php
<?php
function foo(string $s) : string {
return (string) $s;
}
```

13
docs/running_psalm/issues/RedundantCastGivenDocblockType.md Normal file
View File

@ -0,0 +1,13 @@
# RedundantCastGivenDocblockType
Emitted when a cast (string, int, float etc.) is redundant given the docblock-provided type
```php
<?php
/**
* @param string $s
*/
function foo($s) : string {
return (string) $s;
}
```

2
src/Psalm/Internal/Analyzer/Statements/Expression/Assignment/InstancePropertyAssignmentAnalyzer.php
View File

@ -761,7 +761,7 @@ class InstancePropertyAssignmentAnalyzer
$context_type = $context_type ?: $assignment_value_type;
if ($var_id && $context_type) {
if ($var_id) {
if ($context->collect_initializations
&& $lhs_var_id === '$this'
) {

10
src/Psalm/Internal/Analyzer/Statements/Expression/Call/NamedFunctionCallHandler.php
View File

@ -377,10 +377,9 @@ class NamedFunctionCallHandler
) {
if ($first_arg_type->from_docblock) {
if (IssueBuffer::accepts(
new \Psalm\Issue\RedundantConditionGivenDocblockType(
new \Psalm\Issue\RedundantCastGivenDocblockType(
'The call to strtolower is unnecessary given the docblock type',
new CodeLocation($statements_analyzer, $function_name),
null
new CodeLocation($statements_analyzer, $function_name)
),
$statements_analyzer->getSuppressedIssues()
)) {
@ -388,10 +387,9 @@ class NamedFunctionCallHandler
}
} else {
if (IssueBuffer::accepts(
new \Psalm\Issue\RedundantCondition(
new \Psalm\Issue\RedundantCast(
'The call to strtolower is unnecessary',
new CodeLocation($statements_analyzer, $function_name),
null
new CodeLocation($statements_analyzer, $function_name)
),
$statements_analyzer->getSuppressedIssues()
)) {

54
src/Psalm/Internal/Analyzer/Statements/Expression/CastAnalyzer.php
View File

@ -9,8 +9,8 @@ use Psalm\CodeLocation;
use Psalm\Context;
use Psalm\Issue\InvalidCast;
use Psalm\Issue\PossiblyInvalidCast;
use Psalm\Issue\RedundantCondition;
use Psalm\Issue\RedundantConditionGivenDocblockType;
use Psalm\Issue\RedundantCast;
use Psalm\Issue\RedundantCastGivenDocblockType;
use Psalm\Issue\UnrecognizedExpression;
use Psalm\IssueBuffer;
use Psalm\Type;
@ -49,16 +49,14 @@ class CastAnalyzer
if ($maybe_type) {
if ($maybe_type->isInt()) {
if ($maybe_type->from_docblock) {
$issue = new RedundantConditionGivenDocblockType(
$issue = new RedundantCastGivenDocblockType(
'Redundant cast to ' . $maybe_type->getKey(),
new CodeLocation($statements_analyzer->getSource(), $stmt),
$maybe_type->getKey()
new CodeLocation($statements_analyzer->getSource(), $stmt)
);
} else {
$issue = new RedundantCondition(
$issue = new RedundantCast(
'Redundant cast to ' . $maybe_type->getKey(),
new CodeLocation($statements_analyzer->getSource(), $stmt),
$maybe_type->getKey()
new CodeLocation($statements_analyzer->getSource(), $stmt)
);
}
@ -103,16 +101,14 @@ class CastAnalyzer
if ($maybe_type) {
if ($maybe_type->isFloat()) {
if ($maybe_type->from_docblock) {
$issue = new RedundantConditionGivenDocblockType(
$issue = new RedundantCastGivenDocblockType(
'Redundant cast to ' . $maybe_type->getKey(),
new CodeLocation($statements_analyzer->getSource(), $stmt),
$maybe_type->getKey()
new CodeLocation($statements_analyzer->getSource(), $stmt)
);
} else {
$issue = new RedundantCondition(
$issue = new RedundantCast(
'Redundant cast to ' . $maybe_type->getKey(),
new CodeLocation($statements_analyzer->getSource(), $stmt),
$maybe_type->getKey()
new CodeLocation($statements_analyzer->getSource(), $stmt)
);
}
@ -145,16 +141,14 @@ class CastAnalyzer
if ($maybe_type) {
if ($maybe_type->isBool()) {
if ($maybe_type->from_docblock) {
$issue = new RedundantConditionGivenDocblockType(
$issue = new RedundantCastGivenDocblockType(
'Redundant cast to ' . $maybe_type->getKey(),
new CodeLocation($statements_analyzer->getSource(), $stmt),
$maybe_type->getKey()
new CodeLocation($statements_analyzer->getSource(), $stmt)
);
} else {
$issue = new RedundantCondition(
$issue = new RedundantCast(
'Redundant cast to ' . $maybe_type->getKey(),
new CodeLocation($statements_analyzer->getSource(), $stmt),
$maybe_type->getKey()
new CodeLocation($statements_analyzer->getSource(), $stmt)
);
}
@ -187,16 +181,14 @@ class CastAnalyzer
if ($stmt_expr_type) {
if ($stmt_expr_type->isString()) {
if ($stmt_expr_type->from_docblock) {
$issue = new RedundantConditionGivenDocblockType(
$issue = new RedundantCastGivenDocblockType(
'Redundant cast to ' . $stmt_expr_type->getKey(),
new CodeLocation($statements_analyzer->getSource(), $stmt),
$stmt_expr_type->getKey()
new CodeLocation($statements_analyzer->getSource(), $stmt)
);
} else {
$issue = new RedundantCondition(
$issue = new RedundantCast(
'Redundant cast to ' . $stmt_expr_type->getKey(),
new CodeLocation($statements_analyzer->getSource(), $stmt),
$stmt_expr_type->getKey()
new CodeLocation($statements_analyzer->getSource(), $stmt)
);
}
@ -258,16 +250,14 @@ class CastAnalyzer
if ($stmt_expr_type = $statements_analyzer->node_data->getType($stmt->expr)) {
if ($stmt_expr_type->isArray()) {
if ($stmt_expr_type->from_docblock) {
$issue = new RedundantConditionGivenDocblockType(
$issue = new RedundantCastGivenDocblockType(
'Redundant cast to ' . $stmt_expr_type->getKey(),
new CodeLocation($statements_analyzer->getSource(), $stmt),
$stmt_expr_type->getKey()
new CodeLocation($statements_analyzer->getSource(), $stmt)
);
} else {
$issue = new RedundantCondition(
$issue = new RedundantCast(
'Redundant cast to ' . $stmt_expr_type->getKey(),
new CodeLocation($statements_analyzer->getSource(), $stmt),
$stmt_expr_type->getKey()
new CodeLocation($statements_analyzer->getSource(), $stmt)
);
}

8
src/Psalm/Issue/RedundantCast.php Normal file
View File

@ -0,0 +1,8 @@
<?php
namespace Psalm\Issue;
class RedundantCast extends CodeIssue
{
public const ERROR_LEVEL = 4;
public const SHORTCODE = 262;
}

8
src/Psalm/Issue/RedundantCastGivenDocblockType.php Normal file
View File

@ -0,0 +1,8 @@
<?php
namespace Psalm\Issue;
class RedundantCastGivenDocblockType extends CodeIssue
{
public const ERROR_LEVEL = 2;
public const SHORTCODE = 263;
}

6
tests/ArrayAssignmentTest.php
View File

@ -1890,8 +1890,10 @@ class ArrayAssignmentTest extends TestCase
/**
* @param list<int> $bar
*/
function baz(array $bar) : void { foo((array) $bar); }',
'error_message' => 'RedundantCondition',
function baz(array $bar) : void {
foo((array) $bar);
}',
'error_message' => 'RedundantCast',
],
];
}

10
tests/PropertyTypeTest.php
View File

@ -2169,6 +2169,16 @@ class PropertyTypeTest extends TestCase
}
}',
],
'memoizePropertyAfterSetting' => [
'<?php
class A {
public function foo() : void {
/** @psalm-suppress UndefinedThisPropertyAssignment */
$this->b = "c";
echo strlen($this->b);
}
}'
],
];
}

5
tests/TypeReconciliation/RedundantConditionTest.php
View File

@ -69,16 +69,15 @@ class RedundantConditionTest extends \Psalm\Tests\TestCase
'<?php
/** @param int $i */
function foo($i): void {
/** @psalm-suppress RedundantConditionGivenDocblockType */
if ($i !== null) {
/** @psalm-suppress RedundantCastGivenDocblockType */
$i = (int) $i;
if ($i) {}
}
}',
'assertions' => [],
'error_levels' => [
'RedundantConditionGivenDocblockType',
],
],
'noRedundantConditionAfterDocblockTypeNullCheck' => [
'<?php