From 6e7157fc4a6c9faddcdde9561c28ec1e773644ce Mon Sep 17 00:00:00 2001 From: jrfnl Date: Wed, 8 Jan 2025 11:41:07 +0100 Subject: [PATCH] Squiz/ScopeKeywordSpacing: add some tests which shouldn't throw errors Includes: * Making the spacing differences in the new tests a little more varied. * Changing an invalid modifier keyword combination to a valid one. --- .../WhiteSpace/ScopeKeywordSpacingUnitTest.1.inc | 16 ++++++++++++---- .../ScopeKeywordSpacingUnitTest.1.inc.fixed | 11 +++++++++-- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.1.inc b/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.1.inc index a0bd6386b3..9f871c0e77 100644 --- a/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.1.inc +++ b/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.1.inc @@ -152,17 +152,25 @@ class FinalTest { final public static function create(ContainerInterface $container) {} } -final class FinalTest2 { +final class FinalTest2 { } -final abstract class FinalTest3 { -} +final + readonly class FinalTest3 {} class FinalTest4 { final const X = "foo"; - final public const Y = "bar"; + final public const Y = "bar"; } abstract class AbstractTest { abstract public function foo(); } + +final class FinalSpacingCorrect { + public final const SPACING_CORRECT = true; +} + +abstract class AbstractSpacingCorrect { + public abstract function spacingCorrect() {} +} diff --git a/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.1.inc.fixed b/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.1.inc.fixed index d0df81b9ca..bf284b6188 100644 --- a/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.1.inc.fixed +++ b/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.1.inc.fixed @@ -149,8 +149,7 @@ class FinalTest { final class FinalTest2 { } -final abstract class FinalTest3 { -} +final readonly class FinalTest3 {} class FinalTest4 { final const X = "foo"; @@ -160,3 +159,11 @@ class FinalTest4 { abstract class AbstractTest { abstract public function foo(); } + +final class FinalSpacingCorrect { + public final const SPACING_CORRECT = true; +} + +abstract class AbstractSpacingCorrect { + public abstract function spacingCorrect() {} +}