Skip to content

Commit

Permalink
Tokenizer/PHP: bug fix for static typed properties with union/interse…
Browse files Browse the repository at this point in the history
…ction types

Just like the `var` keyword, the `static` keyword can also be used stand-alone with property declarations.
https://3v4l.org/sbaDM

In that case, the tokenization of the `|` operator was not changed to `T_TYPE_UNION` and the `&` operator was not changed to `T_TYPE_INTERSECTION` as the `static` keyword can also be used in return type declarations, so was seen as part of the type declaration.

Fixed now by removing the `T_STATIC` token from the `$allowed` list before walking backwards from the operator.

Includes tests.

Note: this does mean that one test for the `File::getMemberProperties()` method needs to be changed, but as that was testing an illegal syntax anyway, I'm not concerned about making this change.
  • Loading branch information
jrfnl committed Aug 5, 2023
1 parent 7a733cd commit 075c32a
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 3 deletions.
5 changes: 5 additions & 0 deletions src/Tokenizers/PHP.php
Original file line number Diff line number Diff line change
Expand Up @@ -2916,6 +2916,10 @@ protected function processAdditional()
continue;
}

if ($suspectedType === 'property or parameter') {
unset($allowed[\T_STATIC]);
}

$typeTokenCount = 0;
$typeOperators = [$i];
$confirmed = false;
Expand Down Expand Up @@ -2948,6 +2952,7 @@ protected function processAdditional()
if ($suspectedType === 'property or parameter'
&& (isset(Util\Tokens::$scopeModifiers[$this->tokens[$x]['code']]) === true
|| $this->tokens[$x]['code'] === T_VAR
|| $this->tokens[$x]['code'] === T_STATIC
|| $this->tokens[$x]['code'] === T_READONLY)
) {
// This will also confirm constructor property promotion parameters, but that's fine.
Expand Down
3 changes: 2 additions & 1 deletion tests/Core/File/GetMemberPropertiesTest.inc
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,8 @@ $anon = class() {

/* testPHP8UnionTypesIllegalTypes */
// Intentional fatal error - types which are not allowed for properties, but that's not the concern of the method.
public callable|static|void $unionTypesIllegalTypes;
// Note: static is also not allowed as a type, but using static for a property type is not supported by the tokenizer.
public callable|void $unionTypesIllegalTypes;

/* testPHP8UnionTypesNullable */
// Intentional fatal error - nullability is not allowed with union types, but that's not the concern of the method.
Expand Down
3 changes: 1 addition & 2 deletions tests/Core/File/GetMemberPropertiesTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -584,8 +584,7 @@ public function dataGetMemberProperties()
'scope_specified' => true,
'is_static' => false,
'is_readonly' => false,
// Missing static, but that's OK as not an allowed syntax.
'type' => 'callable||void',
'type' => 'callable|void',
'nullable_type' => false,
],
],
Expand Down
3 changes: 3 additions & 0 deletions tests/Core/Tokenizer/BitwiseOrTest.inc
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ class TypeUnion
/* testTypeUnionPropertyWithOnlyReadOnlyKeyword */
readonly string|null $nullableString;

/* testTypeUnionPropertyWithOnlyStaticKeyword */
static Foo|Bar $obj;

public function paramTypes(
/* testTypeUnionParam1 */
int|float $paramA /* testBitwiseOrParamDefaultValue */ = CONSTANT_A | CONSTANT_B,
Expand Down
1 change: 1 addition & 0 deletions tests/Core/Tokenizer/BitwiseOrTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ public function dataTypeUnion()
['/* testTypeUnionPropertyWithStaticAndReadOnlyKeywords */'],
['/* testTypeUnionPropertyWithVarAndReadOnlyKeywords */'],
['/* testTypeUnionPropertyWithOnlyReadOnlyKeyword */'],
['/* testTypeUnionPropertyWithOnlyStaticKeyword */'],
['/* testTypeUnionParam1 */'],
['/* testTypeUnionParam2 */'],
['/* testTypeUnionParam3 */'],
Expand Down
3 changes: 3 additions & 0 deletions tests/Core/Tokenizer/TypeIntersectionTest.inc
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ class TypeIntersection
/* testTypeIntersectionPropertyWithReadOnlyKeyword */
protected readonly Foo&Bar $fooBar;

/* testTypeIntersectionPropertyWithStaticKeyword */
static Foo&Bar $obj;

public function paramTypes(
/* testTypeIntersectionParam1 */
Foo&Bar $paramA /* testBitwiseAndParamDefaultValue */ = CONSTANT_A & CONSTANT_B,
Expand Down
1 change: 1 addition & 0 deletions tests/Core/Tokenizer/TypeIntersectionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ public function dataTypeIntersection()
['/* testTypeIntersectionPropertyPartiallyQualified */'],
['/* testTypeIntersectionPropertyFullyQualified */'],
['/* testTypeIntersectionPropertyWithReadOnlyKeyword */'],
['/* testTypeIntersectionPropertyWithStaticKeyword */'],
['/* testTypeIntersectionParam1 */'],
['/* testTypeIntersectionParam2 */'],
['/* testTypeIntersectionParam3 */'],
Expand Down

0 comments on commit 075c32a

Please sign in to comment.