Fix up PHP7 return typehint support.

Author: dereuromark

PSR2R/Sniffs/Namespaces/UnusedUseStatementSniff.php

@@ -54,7 +54,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
 			return;
 		}
 
-		$classUsed = $phpcsFile->findNext(T_STRING, ($classNameIndex + 1), null, false, $tokens[$classNameIndex]['content']);
+		$classUsed = $phpcsFile->findNext([T_STRING, T_RETURN_TYPE], ($classNameIndex + 1), null, false, $tokens[$classNameIndex]['content']);
 
 		while ($classUsed !== false) {
 			$beforeUsage = $phpcsFile->findPrevious(
@@ -74,7 +74,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
 				return;
 			}
 
-			$classUsed = $phpcsFile->findNext(T_STRING, ($classUsed + 1), null, false, $tokens[$classNameIndex]['content']);
+			$classUsed = $phpcsFile->findNext([T_STRING, T_RETURN_TYPE], ($classUsed + 1), null, false, $tokens[$classNameIndex]['content']);
 		}
 
 		$warning = 'Unused use statement';

composer.json

@@ -28,6 +28,8 @@
 		"bin/sniff"
 	],
 	"scripts": {
-		"docs": "php docs/generate.php"
+		"docs": "php docs/generate.php",
+		"cs-check": "vendor/bin/phpcs --standard=PSR2R/ruleset.xml -v --ignore=psr2r-sniffer/vendor/,tests/files/ ./",
+		"cs-fix": "vendor/bin/phpcbf --standard=PSR2R/ruleset.xml -v --ignore=psr2r-sniffer/vendor/,tests/files/ ./"
 	}
 }

docs/README.md

@@ -111,11 +111,17 @@ You can also test specific methods per Test file using `--filter=testNameOfMetho
 ### Running own sniffs on this project
 There is a convenience script to run all sniffs for this repository:
 ```
-sh phpcs.sh
+composer cs-check
 ```
 If you want to fix the fixable errors, use
 ```
-sh phpcs.sh -f
+composer cs-fix
 ```
 Make sure the root folder name is the same as the GitHub repository name (psr2r-sniffer) to exclude vendor as expected.
 Once everything is green you can make a PR with your changes.
+
+### Updating docs
+Run
+```
+composer docs
+```

docs/sniffs.md

@@ -1,7 +1,7 @@
 # PSR2R Code Sniffer
 
 
-The PSR2R/ruleset.xml standard contains 101 sniffs
+The PSR2R/ruleset.xml standard contains 102 sniffs
 
 Generic (13 sniffs)
 -------------------
@@ -25,7 +25,7 @@ PEAR (3 sniffs)
 - PEAR.Functions.ValidDefaultValue
 - PEAR.NamingConventions.ValidClassName
 
-PSR2R (64 sniffs)
+PSR2R (65 sniffs)
 -----------------
 - PSR2R.Classes.BraceOnSameLine
 - PSR2R.Classes.ClassCreateInstance
@@ -38,6 +38,7 @@ PSR2R (64 sniffs)
 - PSR2R.Commenting.DocBlockParamAllowDefaultValue
 - PSR2R.Commenting.DocBlockParamArray
 - PSR2R.Commenting.DocBlockParamNoOp
+- PSR2R.Commenting.DocBlockParamNotJustNull
 - PSR2R.Commenting.DocBlockParam
 - PSR2R.Commenting.DocBlockPipeSpacing
 - PSR2R.Commenting.DocBlockReturnSelf