Merge pull request #18 from php-fig-rectified/feature/new-sniffs

Feature/new sniffs

Author: dereuromark

PSR2R/ruleset.xml

@@ -71,6 +71,7 @@
 	<rule ref="PSR12.Namespaces.CompoundNamespaceDepth"/>
 	<rule ref="PSR12.Operators.OperatorSpacing"/>
 	<rule ref="PSR12.Functions.NullableTypeDeclaration"/>
+	<rule ref="PSR12.Functions.ReturnTypeDeclaration"/>
 
 	<rule ref="Squiz.Functions.LowercaseFunctionKeywords"/>
 	<rule ref="Squiz.WhiteSpace.ScopeKeywordSpacing"/>

composer.json

@@ -13,7 +13,7 @@
 	],
 	"require": {
 		"php": ">=5.6",
-		"squizlabs/php_codesniffer": "^3.4.2"
+		"squizlabs/php_codesniffer": "^3.5.0"
 	},
 	"require-dev": {
 	},

docs/sniffs.md

@@ -1,9 +1,9 @@
 # PSR2R Code Sniffer
 
 
-The PSR2R standard contains 124 sniffs
+The PSR2R standard contains 126 sniffs
 
-Generic (20 sniffs)
+Generic (21 sniffs)
 -------------------
 - Generic.Arrays.DisallowLongArraySyntax
 - Generic.CodeAnalysis.ForLoopShouldBeWhileLoop
@@ -18,6 +18,7 @@ Generic (20 sniffs)
 - Generic.Formatting.NoSpaceAfterCast
 - Generic.NamingConventions.UpperCaseConstantName
 - Generic.PHP.DeprecatedFunctions
+- Generic.PHP.DisallowAlternativePHPTags
 - Generic.PHP.DisallowShortOpenTag
 - Generic.PHP.ForbiddenFunctions
 - Generic.PHP.LowerCaseConstant
@@ -38,10 +39,11 @@ PSR1 (3 sniffs)
 - PSR1.Files.SideEffects
 - PSR1.Methods.CamelCapsMethodName
 
-PSR12 (5 sniffs)
+PSR12 (6 sniffs)
 ----------------
 - PSR12.Classes.ClassInstantiation
 - PSR12.Functions.NullableTypeDeclaration
+- PSR12.Functions.ReturnTypeDeclaration
 - PSR12.Keywords.ShortFormTypeKeywords
 - PSR12.Namespaces.CompoundNamespaceDepth
 - PSR12.Operators.OperatorSpacing

phpunit.xml.dist

@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-	colors="true"
-	processIsolation="false"
-	stopOnFailure="false"
-	bootstrap="./tests/bootstrap.php"
-	>
+<phpunit bootstrap="tests/bootstrap.php">
 	<php>
 		<ini name="memory_limit" value="-1"/>
 		<ini name="apc.enable_cli" value="1"/>
 	</php>
 
 	<!-- Add any additional test suites you want to run here -->
 	<testsuites>
-		<testsuite name="Sniffer Test Suite">
-			<directory>./tests/Sniffs</directory>
+		<testsuite name="psr2r">
+			<directory>tests/Sniffs/</directory>
 		</testsuite>
 		<testsuite name="Extension of PHP_CodeSniffer Test Suite">
 			<file>tests/AllTests.php</file>
@@ -23,11 +18,8 @@
 
 	<filter>
 		<whitelist processUncoveredFilesFromWhitelist="true">
-			<directory>./PSR2R</directory>
+			<directory>PSR2R/</directory>
 		</whitelist>
-		<blacklist>
-			<directory>./vendor</directory>
-		</blacklist>
 	</filter>
 
 </phpunit>