Skip to content

PHP4-style typed properties not tokenized correctly #2804

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
gsherwood merged 1 commit into from
Jan 10, 2020
Merged

PHP4-style typed properties not tokenized correctly #2804

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
1 change: 1 addition & 0 deletions src/Tokenizers/PHP.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1152,6 +1152,7 @@ protected function tokenize($string)
if ($tokenType === T_FUNCTION
|| $tokenType === T_FN
|| isset(Util\Tokens::$methodPrefixes[$tokenType]) === true
|| $tokenType === T_VAR
) {
if (PHP_CODESNIFFER_VERBOSITY > 1) {
echo "\t\t* token $stackPtr changed from ? to T_NULLABLE".PHP_EOL;
Expand Down
4 changes: 2 additions & 2 deletions tests/Core/File/GetMemberPropertiesTest.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class TestMemberProperties
var $varA = true;

/* testVarType */
var int $varA = true;
var ?int $varA = true;

/* testPublic */
public $varB = true;
Expand All @@ -30,7 +30,7 @@ class TestMemberProperties
static $varE = true;

/* testStaticType */
static string $varE = true;
static ?string $varE = true;

/* testStaticVar */
static var $varF = true;
Expand Down
8 changes: 4 additions & 4 deletions tests/Core/File/GetMemberPropertiesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ public function dataGetMemberProperties()
'scope' => 'public',
'scope_specified' => false,
'is_static' => false,
'type' => 'int',
'nullable_type' => false,
'type' => '?int',
'nullable_type' => true,
],
],
[
Expand Down Expand Up @@ -141,8 +141,8 @@ public function dataGetMemberProperties()
'scope' => 'public',
'scope_specified' => false,
'is_static' => true,
'type' => 'string',
'nullable_type' => false,
'type' => '?string',
'nullable_type' => true,
],
],
[
Expand Down