From 88a93294b4c5fffa3c4e39ef87e3e335ecca8ff2 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 23 Mar 2022 12:19:07 +0100 Subject: [PATCH 1/4] Fix int-mask-of doc example --- docs/running_psalm/plugins/plugins_type_system.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/running_psalm/plugins/plugins_type_system.md b/docs/running_psalm/plugins/plugins_type_system.md index 28e1ef9e8e2..0d9ecdf6048 100644 --- a/docs/running_psalm/plugins/plugins_type_system.md +++ b/docs/running_psalm/plugins/plugins_type_system.md @@ -47,7 +47,7 @@ The classes are as follows: `TIntMask` - 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` -`TIntMaskOf` - as above, but used with with a reference to constants in code`int-mask` will corresponds to `1|2|3|4|5|6|7` if there are three constant 1, 2 and 4 +`TIntMaskOf` - as above, but used with with a reference to constants in code`int-mask-of` will corresponds to `1|2|3|4|5|6|7` if there are three constant 1, 2 and 4 `TKeyOfArray` - Represents an offset of an array (e.g. `key-of`). From 076a916401a2dd831cf49dcbccddfcf45b2e536d Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 23 Mar 2022 12:19:55 +0100 Subject: [PATCH 2/4] Update docs on TIntMaskOf --- src/Psalm/Type/Atomic/TIntMaskOf.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Psalm/Type/Atomic/TIntMaskOf.php b/src/Psalm/Type/Atomic/TIntMaskOf.php index 5130eecf1f0..83dfa2da2d0 100644 --- a/src/Psalm/Type/Atomic/TIntMaskOf.php +++ b/src/Psalm/Type/Atomic/TIntMaskOf.php @@ -7,7 +7,7 @@ /** * 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` will corresponds to `0|1|2|3|4|5|6|7` if there are three constant 1, 2 and 4 + * `int-mask-of` will corresponds to `0|1|2|3|4|5|6|7` if there are three constant 1, 2 and 4 */ final class TIntMaskOf extends TInt { From 1eb8b5a853b2ba930286dfba97e8c7fe7852c1f3 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 23 Mar 2022 14:49:51 +0100 Subject: [PATCH 3/4] without with --- docs/running_psalm/plugins/plugins_type_system.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/running_psalm/plugins/plugins_type_system.md b/docs/running_psalm/plugins/plugins_type_system.md index 0d9ecdf6048..777c4018ad5 100644 --- a/docs/running_psalm/plugins/plugins_type_system.md +++ b/docs/running_psalm/plugins/plugins_type_system.md @@ -47,7 +47,7 @@ The classes are as follows: `TIntMask` - 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` -`TIntMaskOf` - as above, but used with with a reference to constants in code`int-mask-of` will corresponds to `1|2|3|4|5|6|7` if there are three constant 1, 2 and 4 +`TIntMaskOf` - as above, but used with a reference to constants in code `int-mask-of` will corresponds to `1|2|3|4|5|6|7` if there are three constant 1, 2 and 4 `TKeyOfArray` - Represents an offset of an array (e.g. `key-of`). From bbef5700d98c22ace40ab1d7d4c886517dc58b97 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 23 Mar 2022 14:50:14 +0100 Subject: [PATCH 4/4] Without with --- src/Psalm/Type/Atomic/TIntMaskOf.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Psalm/Type/Atomic/TIntMaskOf.php b/src/Psalm/Type/Atomic/TIntMaskOf.php index 83dfa2da2d0..056cab2bcea 100644 --- a/src/Psalm/Type/Atomic/TIntMaskOf.php +++ b/src/Psalm/Type/Atomic/TIntMaskOf.php @@ -6,7 +6,7 @@ /** * 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 + * This is the same concept as TIntMask but TIntMaskOf is used with a reference to constants in code * `int-mask-of` will corresponds to `0|1|2|3|4|5|6|7` if there are three constant 1, 2 and 4 */ final class TIntMaskOf extends TInt