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

infer non-empty-string on strstr() comparison with constant string #1365

Merged
merged 4 commits into from
May 30, 2022
Merged

infer non-empty-string on strstr() comparison with constant string #1365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5b067f0
infer non-empty-string on strstr() comparison with constant string
clxmstaab May 30, 2022
85e8bb5
de-duplicate, also cover stristr
clxmstaab May 30, 2022
c36faa7
cover 'strchr', 'strrchr'
clxmstaab May 30, 2022
c80005c
rename test
clxmstaab May 30, 2022
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
2 changes: 1 addition & 1 deletion src/Analyser/TypeSpecifier.php
View file
Open in desktop
Expand Up @@ -250,7 +250,7 @@ public function specifyTypesInCondition(
if (
$exprNode instanceof FuncCall
&& $exprNode->name instanceof Name
&& strtolower($exprNode->name->toString()) === 'substr'
&& in_array(strtolower($exprNode->name->toString()), ['substr', 'strstr', 'stristr', 'strchr', 'strrchr'], true)
&& isset($exprNode->getArgs()[0])
&& $constantType instanceof ConstantStringType
&& $constantType->getValue() !== ''
Expand Down
2 changes: 2 additions & 0 deletions tests/PHPStan/Analyser/NodeScopeResolverTest.php
View file
Open in desktop
Expand Up @@ -900,6 +900,8 @@ public function dataFileAsserts(): iterable
yield from $this->gatherAssertTypes(__DIR__ . '/data/conditional-types-inference.php');
yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7210.php');
yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7341.php');
yield from $this->gatherAssertTypes(__DIR__ . '/data/non-empty-string-strstr-specifying.php');
yield from $this->gatherAssertTypes(__DIR__ . '/data/non-empty-string-strrchr-specifying.php');
}

/**
Expand Down
4 changes: 2 additions & 2 deletions tests/PHPStan/Analyser/data/non-empty-string-str-containing-fns.php
View file
Open in desktop
Expand Up @@ -101,11 +101,11 @@ public function variants(string $s) {
assertType('string', $s);

if (strstr($s, ':') === 'hallo') {
assertType('string', $s); // could be non-empty-string
assertType('non-empty-string', $s);
}
assertType('string', $s);
if (strstr($s, ':', true) === 'hallo') {
assertType('string', $s); // could be non-empty-string
assertType('non-empty-string', $s);
}
assertType('string', $s);
if (strstr($s, ':', true) !== false) {
Expand Down
36 changes: 36 additions & 0 deletions tests/PHPStan/Analyser/data/non-empty-string-strrchr-specifying.php
View file
Open in desktop
@@ -0,0 +1,36 @@
<?php

namespace NonEmptyStringStrrchr;

use function PHPStan\Testing\assertType;

class Foo {
public function nonEmptyStrrchr(string $s, string $needle): void
{
if (strrchr($s, 'abc') === 'hallo') {
assertType('non-empty-string', $s);
}
assertType('string', $s);
if ('hallo' === strrchr($s, 'abc')) {
assertType('non-empty-string', $s);
}
assertType('string', $s);

if (strrchr($s, $needle) === 'hallo') {
assertType('non-empty-string', $s);
}
assertType('string', $s);
if ('hallo' === strrchr($s, $needle)) {
assertType('non-empty-string', $s);
}
assertType('string', $s);

$x = (strrchr($s, $needle) === 'hallo');
assertType('string', $s);
var_dump($x);

$x = (strrchr($s, $needle) !== 'hallo');
assertType('string', $s);
var_dump($x);
}
}
124 changes: 124 additions & 0 deletions tests/PHPStan/Analyser/data/non-empty-string-strstr-specifying.php
View file
Open in desktop
@@ -0,0 +1,124 @@
<?php

namespace NonEmptyStringStrstr;

use function PHPStan\Testing\assertType;

class Foo {
public function nonEmptyStrstr(string $s, string $needle, bool $before_needle): void
{
if (strstr($s, 'abc') === 'hallo') {
assertType('non-empty-string', $s);
}
assertType('string', $s);
if ('hallo' === strstr($s, 'abc')) {
assertType('non-empty-string', $s);
}
assertType('string', $s);

if (strstr($s, $needle) === 'hallo') {
assertType('non-empty-string', $s);
}
assertType('string', $s);
if ('hallo' === strstr($s, $needle)) {
assertType('non-empty-string', $s);
}
assertType('string', $s);

if (strstr($s, $needle, true) === 'hallo') {
assertType('non-empty-string', $s);
}
assertType('string', $s);

if (strstr($s, $needle, false) === 'hallo') {
assertType('non-empty-string', $s);
}
assertType('string', $s);

if (strstr($s, $needle, $before_needle) === 'hallo') {
assertType('non-empty-string', $s);
}
assertType('string', $s);

if (strstr($s, $needle, $before_needle) !== 'hallo') {
assertType('string', $s);
}
assertType('string', $s);

if (strstr($s, $needle, $before_needle) === '') {
assertType('string', $s);
}
assertType('string', $s);
if ('' === strstr($s, $needle, $before_needle)) {
assertType('string', $s);
}
assertType('string', $s);

if (strstr($s, $needle, $before_needle) == '') {
assertType('string', $s);
}
assertType('string', $s);
if ('' == strstr($s, $needle, $before_needle)) {
assertType('string', $s);
}
assertType('string', $s);

$x = (strstr($s, $needle) === 'hallo');
assertType('string', $s);
var_dump($x);

$x = (strstr($s, $needle) !== 'hallo');
assertType('string', $s);
var_dump($x);
}

public function nonEmptyStristr(string $s, string $needle, bool $before_needle): void
{
if (stristr($s, 'abc') === 'hallo') {
assertType('non-empty-string', $s);
}
assertType('string', $s);
if ('hallo' === stristr($s, 'abc')) {
assertType('non-empty-string', $s);
}

if (stristr($s, $needle, $before_needle) == '') {
assertType('string', $s);
}
assertType('string', $s);
if ('' == stristr($s, $needle, $before_needle)) {
assertType('string', $s);
}
assertType('string', $s);

$x = (stristr($s, $needle) === 'hallo');
assertType('string', $s);
var_dump($x);
}


// strchr() is an alias of strstr()
public function nonEmptyStrchr(string $s, string $needle, bool $before_needle): void
{
if (strchr($s, 'abc') === 'hallo') {
assertType('non-empty-string', $s);
}
assertType('string', $s);
if ('hallo' === strchr($s, 'abc')) {
assertType('non-empty-string', $s);
}

if (strchr($s, $needle, $before_needle) == '') {
assertType('string', $s);
}
assertType('string', $s);
if ('' == strchr($s, $needle, $before_needle)) {
assertType('string', $s);
}
assertType('string', $s);

$x = (strchr($s, $needle) === 'hallo');
assertType('string', $s);
var_dump($x);
}
}