Don't allow package tags in namespaced files (#255)

Author: SharkyKZ

Joomla/Sniffs/Commenting/FileCommentSniff.php

@@ -263,23 +263,35 @@ protected function processTags(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $comm
 
 		foreach ($this->tags as $tag => $tagData)
 		{
-			if (isset($tagTokens[$tag]) === false)
+			// We don't use package tags in namespaced classes.
+			if ($tag === '@package' || $tag === '@subpackage')
 			{
-				if ($tagData['required'] === true)
+				// Check for a namespace token, if certain other tokens are found we can move on. This keeps us from searching the whole file.
+				$namespaced = $phpcsFile->findNext(array(T_NAMESPACE, T_CLASS, T_INTERFACE, T_TRAIT), 0);
+				$classes    = array(T_CLASS, T_INTERFACE, T_TRAIT);
+				$class      = $phpcsFile->findNext($classes, 0);
+
+				// If we found a namespaced class trigger the error.
+				if ($tokens[$namespaced]['code'] === T_NAMESPACE && in_array($tokens[$class]['code'], $classes, true))
 				{
-					// We don't use package tags in namespaced code
-					if ($tag == '@package')
+					if (isset($tagTokens[$tag]) === true)
 					{
-						// Check for a namespace token, if certain other tokens are found we can move on. This keeps us from searching the whole file.
-						$namespaced = $phpcsFile->findNext(array(T_NAMESPACE, T_CLASS, T_INTERFACE, T_TRAIT), 0);
-
-						// If we found a namespace token we skip the error, otherwise we let the error happen
-						if ($tokens[$namespaced]['code'] === T_NAMESPACE)
-						{
-							continue;
-						}
+						$error = '%s tag found in namespaced %s comment';
+						$data  = array(
+							$tag,
+							$docBlock,
+						);
+						$phpcsFile->addError($error, $commentEnd, ucfirst(substr($tag, 1)) . 'TagInNamespace', $data);
 					}
 
+					continue;
+				}
+			}
+
+			if (isset($tagTokens[$tag]) === false)
+			{
+				if ($tagData['required'] === true)
+				{
 					$error = 'Missing %s tag in %s comment';
 					$data  = array(
 							  $tag,