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

Fixes

Browse Source
This commit is contained in:
Daniil Gentili 2023-07-25 10:09:29 +02:00
parent b65d7938f9
commit 1ad9fc66f8
Signed by: danog
GPG Key ID: 8C1BE3B34B230CA7
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/windows-ci.yml vendored
View File

@ -96,4 +96,4 @@ jobs:
run: php bin/generate_testsuites.php $env:CHUNK_COUNT
- name: Run unit tests
run: vendor/bin/paratest --processes=$env:PARALLEL_PROCESSES --testsuite=chunk_$env:CHUNK_NUMBER --log-junit build/phpunit/phpunit.xml
run: vendor/bin/paratest -f --processes=$env:PARALLEL_PROCESSES --testsuite=chunk_$env:CHUNK_NUMBER --log-junit build/phpunit/phpunit.xml

2
composer.json
View File

@ -112,7 +112,7 @@
"lint": "parallel-lint ./src ./tests",
"phpunit": [
"Composer\\Config::disableProcessTimeout",
"paratest --runner=WrapperRunner"
"paratest -f --runner=WrapperRunner"
],
"phpunit-std": [
"Composer\\Config::disableProcessTimeout",

10
src/Psalm/Internal/Codebase/ClassLikes.php
View File

@ -367,6 +367,8 @@ class ClassLikes
&& !$this->classlike_storage_provider->has($fq_class_name_lc)
) {
if (!isset($this->existing_classes_lc[$fq_class_name_lc])) {
$this->existing_classes_lc[$fq_class_name_lc] = false;
return false;
}
@ -399,8 +401,8 @@ class ClassLikes
|| !$this->classlike_storage_provider->has($fq_class_name_lc)
) {
if ((
!isset($this->existing_classes_lc[$fq_class_name_lc])
|| $this->existing_classes_lc[$fq_class_name_lc]
!isset($this->existing_interfaces_lc[$fq_class_name_lc])
|| $this->existing_interfaces_lc[$fq_class_name_lc]
)
&& !$this->classlike_storage_provider->has($fq_class_name_lc)
) {
@ -466,8 +468,8 @@ class ClassLikes
|| !$this->classlike_storage_provider->has($fq_class_name_lc)
) {
if ((
!isset($this->existing_classes_lc[$fq_class_name_lc])
|| $this->existing_classes_lc[$fq_class_name_lc]
!isset($this->existing_enums_lc[$fq_class_name_lc])
|| $this->existing_enums_lc[$fq_class_name_lc]
)
&& !$this->classlike_storage_provider->has($fq_class_name_lc)
) {

2
tests/TypeReconciliation/ReconcilerTest.php
View File

@ -2,6 +2,7 @@
namespace Psalm\Tests\TypeReconciliation;
use Countable;
use Psalm\Context;
use Psalm\Internal\Analyzer\FileAnalyzer;
use Psalm\Internal\Analyzer\StatementsAnalyzer;
@ -61,6 +62,7 @@ class ReconcilerTest extends TestCase
class B {}
interface SomeInterface {}
');
$this->project_analyzer->getCodebase()->queueClassLikeForScanning(Countable::class);
$this->project_analyzer->getCodebase()->scanFiles();
}