danog/psalm-not-empty
1
0
Fork 0
mirror of https://github.com/danog/psalm-not-empty.git synced 2024-11-26 20:04:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix offset replacement, add parenthesis everywhere to avoid breaking !empty() syntax, fix variable display

Browse Source
This commit is contained in:
orklah 2021-02-21 11:30:47 +01:00
parent c28b0f0e96
commit 629cc8c059
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/Hooks/NotEmptyHooks.php
View File

@ -41,33 +41,40 @@ class NotEmptyHooks implements AfterExpressionAnalysisInterface
} }
if (!$type->isSingle()) { if (!$type->isSingle()) {
// TODO: add functionnality with isSingleAndMaybeNullable and add || EXPR !== null // TODO: add functionnality with isSingleAndMaybeNullable and add || EXPR === null
return true; return true;
} }
$startPos = $expr->getStartFilePos() + 1;
$endPos = $expr->getEndFilePos();
$atomic_types = $type->getAtomicTypes(); $atomic_types = $type->getAtomicTypes();
$atomic_type = array_shift($atomic_types); $atomic_type = array_shift($atomic_types);
$display_expr = (string)$expr->expr; $display_expr = '$' .$expr->expr->name;
$replacement = null;
if ($atomic_type instanceof Atomic\TInt) { if ($atomic_type instanceof Atomic\TInt) {
$file_manipulation = new FileManipulation($startPos, $endPos, $display_expr . " === 0"); $replacement = $display_expr . " === 0";
$event->setFileReplacements([$file_manipulation]);
} elseif ($atomic_type instanceof Atomic\TFloat) { } elseif ($atomic_type instanceof Atomic\TFloat) {
$file_manipulation = new FileManipulation($startPos, $endPos, $display_expr . " === 0.0"); $replacement = $display_expr . " === 0.0";
$event->setFileReplacements([$file_manipulation]);
} elseif ($atomic_type instanceof Atomic\TString) { } elseif ($atomic_type instanceof Atomic\TString) {
$file_manipulation = new FileManipulation($startPos, $endPos, "(" . $display_expr . " === '' || " . $display_expr . " === '0')"); $replacement = $display_expr . " === '' || " . $display_expr . " === '0'";
$event->setFileReplacements([$file_manipulation]); } elseif ($atomic_type instanceof Atomic\TArray
} elseif ($atomic_type instanceof Atomic\TArray) { || $atomic_type instanceof Atomic\TList
$file_manipulation = new FileManipulation($startPos, $endPos, $display_expr . " === []"); || $atomic_type instanceof Atomic\TKeyedArray
$event->setFileReplacements([$file_manipulation]); ) {
$replacement = $display_expr . " === []";
} elseif ($atomic_type instanceof Atomic\TBool) { } elseif ($atomic_type instanceof Atomic\TBool) {
$file_manipulation = new FileManipulation($startPos, $endPos, $display_expr . " === false"); $replacement = $display_expr . " === false";
$event->setFileReplacements([$file_manipulation]);
} else { } else {
var_dump(get_class($atomic_type)); if(!$atomic_type instanceof Atomic\TMixed) {
var_dump(get_class($atomic_type));
}
}
if($replacement !== null){
$startPos = $expr->getStartFilePos();
$endPos = $expr->getEndFilePos();
//TODO: possible improvement: detect !empty and invert conditions to avoid convoluted syntax like if(!(EXPR === 0))
$file_manipulation = new FileManipulation($startPos, $endPos, '('.$replacement.')');
$event->setFileReplacements([$file_manipulation]);
} }
return true; return true;