danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-22 05:41:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6121 from weirdan/fix-6119

Browse Source 
Allow 0 for all bitmask types
This commit is contained in:
Bruce Weirdan 2021-07-17 01:23:01 +03:00 committed by GitHub
commit 90687d7a9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Psalm/Internal/Type/TypeParser.php
View File

@ -442,6 +442,7 @@ class TypeParser
$potential_values = array_merge($new_values, $potential_values);
}
array_unshift($potential_values, 0);
$potential_values = array_unique($potential_values);
return array_map(

2
src/Psalm/Type/Atomic/TIntMask.php
View File

@ -5,7 +5,7 @@ use function substr;
/**
* Represents the type that is the result of a bitmask combination of its parameters.
* `int-mask<1, 2, 4>` corresponds to `1|2|3|4|5|6|7`
* `int-mask<1, 2, 4>` corresponds to `0|1|2|3|4|5|6|7`
*/
class TIntMask extends TInt
{

2
src/Psalm/Type/Atomic/TIntMaskOf.php
View File

@ -4,7 +4,7 @@ namespace Psalm\Type\Atomic;
/**
* Represents the type that is the result of a bitmask combination of its parameters.
* This is the same concept as TIntMask but TIntMaskOf is used with with a reference to constants in code
* `int-mask<MyClass::CLASS_CONSTANT_*>` will corresponds to `1|2|3|4|5|6|7` if there are three constant 1, 2 and 4
* `int-mask<MyClass::CLASS_CONSTANT_*>` will corresponds to `0|1|2|3|4|5|6|7` if there are three constant 1, 2 and 4
*/
class TIntMaskOf extends TInt
{

22
tests/AnnotationTest.php
View File

@ -1185,6 +1185,14 @@ class AnnotationTest extends TestCase
takesFlags(FileFlag::MODIFIED | FileFlag::NEW);'
],
'intMaskWithZero' => [
'<?php
/** @param int-mask<1,2> $_flags */
function takesFlags(int $_flags): void {}
takesFlags(0);
'
],
'intMaskOfWithClassWildcard' => [
'<?php
class FileFlag {
@ -1202,6 +1210,20 @@ class AnnotationTest extends TestCase
takesFlags(FileFlag::MODIFIED | FileFlag::NEW);'
],
'intMaskOfWithZero' => [
'<?php
class FileFlag {
public const OPEN = 1;
public const MODIFIED = 2;
public const NEW = 4;
}
/** @param int-mask-of<FileFlag::*> $_flags */
function takesFlags(int $_flags): void {}
takesFlags(0);
'
],
'emptyStringFirst' => [
'<?php
/**

6
tests/TypeParseTest.php
View File

@ -917,15 +917,15 @@ class TypeParseTest extends TestCase
$docblock_type = Type::parseString('int-mask<1, 2, 4>');
$this->assertSame('1|2|3|4|5|6|7', $docblock_type->getId());
$this->assertSame('0|1|2|3|4|5|6|7', $docblock_type->getId());
$docblock_type = Type::parseString('int-mask<1, 4>');
$this->assertSame('1|4|5', $docblock_type->getId());
$this->assertSame('0|1|4|5', $docblock_type->getId());
$docblock_type = Type::parseString('int-mask<PREG_PATTERN_ORDER, PREG_OFFSET_CAPTURE, PREG_UNMATCHED_AS_NULL>');
$this->assertSame('1|256|257|512|513|768|769', $docblock_type->getId());
$this->assertSame('0|1|256|257|512|513|768|769', $docblock_type->getId());
}
public function testIntMaskWithClassConstant(): void