Skip to content

Squiz/ScopeKeywordSpacing: update for properties with asymmetric visibility #1124

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
merged 1 commit into from
Jun 9, 2025
Merged

Squiz/ScopeKeywordSpacing: update for properties with asymmetric visibility #1124

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
5 changes: 3 additions & 2 deletions src/Standards/Squiz/Sniffs/WhiteSpace/ScopeKeywordSpacingSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ class ScopeKeywordSpacingSniff implements Sniff
*/
public function register()
{
$register = Tokens::$methodPrefixes;
$register[] = T_READONLY;
$register = Tokens::$methodPrefixes;
$register += Tokens::$scopeModifiers;
$register[T_READONLY] = T_READONLY;
return $register;

}//end register()
Expand Down
10 changes: 10 additions & 0 deletions src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.1.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,3 +192,13 @@ class FinalProperties {
final readonly public ?MyType $spacing_correct;
protected final $spacing_incorrect = 'foo';
}

class AsymVisibility {
public(set) string $asymPublic = 'hello';
public protected(set) final $asymProtected = 'hello';
private(set) public string|false $asymPrivate = 'hello';

public public(set) $asymPublicPublic = 'hello';
protected(set) public $asymPublicProtected = 'hello';
protected private(set) $asymProtectedPrivate = 'hello';
}
10 changes: 10 additions & 0 deletions src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.1.inc.fixed
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,3 +185,13 @@ class FinalProperties {
final readonly public ?MyType $spacing_correct;
protected final $spacing_incorrect = 'foo';
}

class AsymVisibility {
public(set) string $asymPublic = 'hello';
public protected(set) final $asymProtected = 'hello';
private(set) public string|false $asymPrivate = 'hello';

public public(set) $asymPublicPublic = 'hello';
protected(set) public $asymPublicProtected = 'hello';
protected private(set) $asymProtectedPrivate = 'hello';
}
3 changes: 3 additions & 0 deletions src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ public function getErrorList($testFile='')
187 => 1,
188 => 1,
193 => 2,
197 => 1,
198 => 3,
199 => 2,
];

case 'ScopeKeywordSpacingUnitTest.3.inc':
Expand Down