Supporting namespaces using block format

cakephp · Oct 15, 2012 · 037f172 · 037f172
1 parent c4b92e4
commit 037f172
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Sniffs/NamingConventions/ValidNamespaceNameSniff.php b/Sniffs/NamingConventions/ValidNamespaceNameSniff.php
@@ -50,7 +50,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
 		$filename = $phpcsFile->getFilename();
 		$ns = '';
 
-		while ($tokens[$stackPtr + $i]['code'] !== T_SEMICOLON) {
+		while (!in_array($tokens[$stackPtr + $i]['code'], array(T_SEMICOLON, T_WHITESPACE, T_OPEN_CURLY_BRACKET))) {
 			$ns .= $tokens[$stackPtr + $i]['content'];
 			$i++;
 		}

diff --git a/tests/files/CakePHP/SniffTest/BlockNs_pass.php b/tests/files/CakePHP/SniffTest/BlockNs_pass.php
@@ -0,0 +1,5 @@
+<?php
+namespace CakePHP\SniffTest {
+	class TestFile {
+	}
+}