From ea3ecf3892d734d721cf412d0292d30b8144acae Mon Sep 17 00:00:00 2001 From: Greg Sherwood Date: Mon, 30 Jan 2012 13:38:56 +1100 Subject: [PATCH] Fixed bug #19256 : T_DOC_COMMENT in CSS files breaks ClassDefinitionNameSpacingSniff --- .../Squiz/Sniffs/CSS/ClassDefinitionNameSpacingSniff.php | 1 + .../Squiz/Tests/CSS/ClassDefinitionNameSpacingUnitTest.css | 4 ++++ package.xml | 2 ++ 3 files changed, 7 insertions(+) diff --git a/CodeSniffer/Standards/Squiz/Sniffs/CSS/ClassDefinitionNameSpacingSniff.php b/CodeSniffer/Standards/Squiz/Sniffs/CSS/ClassDefinitionNameSpacingSniff.php index 93e94a6827..3858ac091e 100644 --- a/CodeSniffer/Standards/Squiz/Sniffs/CSS/ClassDefinitionNameSpacingSniff.php +++ b/CodeSniffer/Standards/Squiz/Sniffs/CSS/ClassDefinitionNameSpacingSniff.php @@ -66,6 +66,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) $endTokens = array( T_CLOSE_CURLY_BRACKET, T_COMMENT, + T_DOC_COMMENT, T_OPEN_TAG, ); diff --git a/CodeSniffer/Standards/Squiz/Tests/CSS/ClassDefinitionNameSpacingUnitTest.css b/CodeSniffer/Standards/Squiz/Tests/CSS/ClassDefinitionNameSpacingUnitTest.css index 275c7f550f..e52ec20731 100644 --- a/CodeSniffer/Standards/Squiz/Tests/CSS/ClassDefinitionNameSpacingUnitTest.css +++ b/CodeSniffer/Standards/Squiz/Tests/CSS/ClassDefinitionNameSpacingUnitTest.css @@ -31,6 +31,10 @@ width: 1000px; } +/** + * More styles below here. + */ + td.TableWidgetType-header.TableWidgetType-header-lastLogin, td.TableWidgetType-header.TableWidgetType-header-remove, td.TableWidgetType-header.TableWidgetType-header-email, diff --git a/package.xml b/package.xml index 4bd856fbeb..ec561c782e 100644 --- a/package.xml +++ b/package.xml @@ -41,6 +41,8 @@ http://pear.php.net/dtd/package-2.0.xsd"> -- Second issue was notices caused by bug #19137 - Fixed bug #19208 : UpperCaseConstantName reports class members -- Was also a problem with LowerCaseConstantName as well + - Fixed bug #19256 : T_DOC_COMMENT in CSS files breaks ClassDefinitionNameSpacingSniff + -- Thanks to Klaus Purer for the patch