Skip to content

Failing test for #4650 #476

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
merged 1 commit into from
Apr 20, 2021
Merged

Failing test for #4650 #476

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
18 changes: 14 additions & 4 deletions src/Analyser/MutatingScope.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,8 +810,13 @@ private function resolveType(Expr $node): Type
}

if ($node instanceof Expr\BinaryOp\Identical) {
$leftType = $this->getType($node->left);
$rightType = $this->getType($node->right);
if ($this->treatPhpDocTypesAsCertain) {
$leftType = $this->getType($node->left);
$rightType = $this->getType($node->right);
} else {
$leftType = $this->getNativeType($node->left);
$rightType = $this->getNativeType($node->right);
}

if (
(
Expand Down Expand Up @@ -851,8 +856,13 @@ private function resolveType(Expr $node): Type
}

if ($node instanceof Expr\BinaryOp\NotIdentical) {
$leftType = $this->getType($node->left);
$rightType = $this->getType($node->right);
if ($this->treatPhpDocTypesAsCertain) {
$leftType = $this->getType($node->left);
$rightType = $this->getType($node->right);
} else {
$leftType = $this->getNativeType($node->left);
$rightType = $this->getNativeType($node->right);
}

if (
(
Expand Down
5 changes: 3 additions & 2 deletions src/Testing/TypeInferenceTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,9 @@ public function gatherAssertTypes(string $file): array
$actualType = $scope->getType($node->args[1]->value);
$assert = ['type', $file, $expectedType, $actualType, $node->getLine()];
} elseif ($functionName === 'PHPStan\\Testing\\assertNativeType') {
$expectedType = $scope->getNativeType($node->args[0]->value);
$actualType = $scope->getNativeType($node->args[1]->value);
$nativeScope = $scope->doNotTreatPhpDocTypesAsCertain();
$expectedType = $nativeScope->getNativeType($node->args[0]->value);
$actualType = $nativeScope->getNativeType($node->args[1]->value);
$assert = ['type', $file, $expectedType, $actualType, $node->getLine()];
} elseif ($functionName === 'PHPStan\\Testing\\assertVariableCertainty') {
$certainty = $node->args[0]->value;
Expand Down
1 change: 1 addition & 0 deletions tests/PHPStan/Analyser/NodeScopeResolverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,7 @@ public function dataFileAsserts(): iterable
require_once __DIR__ . '/data/type-aliases.php';

yield from $this->gatherAssertTypes(__DIR__ . '/data/type-aliases.php');
yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-4650.php');
}

/**
Expand Down
27 changes: 27 additions & 0 deletions tests/PHPStan/Analyser/data/bug-4650.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?php

namespace Bug4650;

use function PHPStan\Testing\assertNativeType;
use function PHPStan\Testing\assertType;

class Foo
{

/**
* @phpstan-param non-empty-array<string|int> $idx
*/
function doFoo(array $idx): void {
assertType('array<int|string>&nonEmpty', $idx);
assertNativeType('array', $idx);

assertType('array()', []);
assertNativeType('array()', []);

assertType('false', $idx === []);
assertNativeType('bool', $idx === []);
assertType('true', $idx !== []);
assertNativeType('bool', $idx !== []);
}

}