From 5c1078a18149fef6f056acbca1174eab1981bbc8 Mon Sep 17 00:00:00 2001 From: bondas83 Date: Fri, 30 Jun 2017 19:40:16 +0300 Subject: [PATCH 1/6] Update ObjectOperatorSpacingSniff.php Validate and Class :: staticFunction() and fix to Class::staticFunction() without spaces --- .../Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php index c8048c369c..d5cbcf5c0e 100644 --- a/src/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php +++ b/src/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php @@ -30,7 +30,7 @@ class ObjectOperatorSpacingSniff implements Sniff */ public function register() { - return array(T_OBJECT_OPERATOR); + return array(T_OBJECT_OPERATOR, T_DOUBLE_COLON); }//end register() From 8bd02baa09d70dedca7e5861089dc0b118e7dd02 Mon Sep 17 00:00:00 2001 From: bondas83 Date: Mon, 3 Jul 2017 11:33:30 +0300 Subject: [PATCH 2/6] Fixed code structure --- .../Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php index d5cbcf5c0e..428c766475 100644 --- a/src/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php +++ b/src/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php @@ -30,7 +30,10 @@ class ObjectOperatorSpacingSniff implements Sniff */ public function register() { - return array(T_OBJECT_OPERATOR, T_DOUBLE_COLON); + return array( + T_OBJECT_OPERATOR, + T_DOUBLE_COLON + ); }//end register() From 9611936dd89e6f9282ffdd95a3de7b03b4bf133a Mon Sep 17 00:00:00 2001 From: bondas83 Date: Mon, 3 Jul 2017 12:01:05 +0300 Subject: [PATCH 3/6] add coma for code structure --- .../Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php index 428c766475..5b667ad2b6 100644 --- a/src/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php +++ b/src/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php @@ -32,7 +32,7 @@ public function register() { return array( T_OBJECT_OPERATOR, - T_DOUBLE_COLON + T_DOUBLE_COLON, ); }//end register() From a2a4a3cc4586746255b81043f00f863345a63714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20=C5=A0matavi=C4=8Dius?= Date: Tue, 4 Jul 2017 21:13:37 +0300 Subject: [PATCH 4/6] Add unitests --- .../ObjectOperatorSpacingUnitTest.inc | 24 +++++++++++++++++++ .../ObjectOperatorSpacingUnitTest.php | 9 +++++++ 2 files changed, 33 insertions(+) diff --git a/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.inc b/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.inc index 1c8732195f..9c8c85851f 100644 --- a/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.inc +++ b/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.inc @@ -22,3 +22,27 @@ $this-> testThis(); // @codingStandardsChangeSetting Squiz.WhiteSpace.ObjectOperatorSpacing ignoreNewlines false + +thisObject::testThis(); +thisObject:: testThis(); +thisObject :: testThis(); +thisObject::/* comment here */testThis(); +thisObject/* comment here */ :: testThis(); +thisObject + ::testThis(); +thisObject:: + testThis(); + +// @codingStandardsChangeSetting Squiz.WhiteSpace.ObjectOperatorSpacing ignoreNewlines true + +thisObject::testThis(); +thisObject:: testThis(); +thisObject :: testThis(); +thisObject::/* comment here */testThis(); +thisObject/* comment here */ :: testThis(); +thisObject + ::testThis(); +thisObject:: + testThis(); + +// @codingStandardsChangeSetting Squiz.WhiteSpace.ObjectOperatorSpacing ignoreNewlines false \ No newline at end of file diff --git a/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php index 8fae2c769f..b432addba2 100644 --- a/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php +++ b/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php @@ -34,6 +34,15 @@ public function getErrorList() 15 => 1, 16 => 2, 18 => 2, + + 27 => 1, + 28 => 2, + 30 => 2, + 32 => 1, + 33 => 1, + 39 => 1, + 40 => 2, + 42 => 2, ); }//end getErrorList() From b80316981223060a5d9ed406b517b222fcebc345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20=C5=A0matavi=C4=8Dius?= Date: Tue, 4 Jul 2017 21:14:34 +0300 Subject: [PATCH 5/6] Add unitests --- .../Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php index b432addba2..9e0412b2d5 100644 --- a/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php +++ b/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php @@ -34,7 +34,6 @@ public function getErrorList() 15 => 1, 16 => 2, 18 => 2, - 27 => 1, 28 => 2, 30 => 2, From 55245498b5bd7c855a92727caaf9481fbd7dc792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20=C5=A0matavi=C4=8Dius?= Date: Tue, 4 Jul 2017 21:29:49 +0300 Subject: [PATCH 6/6] fix codesniffer --- .../Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php index 9e0412b2d5..745344f72a 100644 --- a/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php +++ b/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php @@ -34,11 +34,11 @@ public function getErrorList() 15 => 1, 16 => 2, 18 => 2, - 27 => 1, - 28 => 2, - 30 => 2, - 32 => 1, - 33 => 1, + 27 => 1, + 28 => 2, + 30 => 2, + 32 => 1, + 33 => 1, 39 => 1, 40 => 2, 42 => 2,