Updated coding standard

Author: ondrejmirtes

build.xml

@@ -44,7 +44,6 @@
 			<arg value="--extensions=php"/>
 			<arg value="--encoding=utf-8"/>
 			<arg value="--tab-width=4"/>
-			<arg value="--ignore=tests/*/data"/>
 			<arg value="-sp"/>
 			<arg path="src"/>
 			<arg path="tests"/>

composer.json

@@ -14,12 +14,13 @@
 		"phpstan/phpstan": "^0.10"
 	},
 	"require-dev": {
-		"consistence/coding-standard": "^2.0.0",
-		"jakub-onderka/php-parallel-lint": "^0.9.2",
+		"consistence/coding-standard": "^3.0.1",
+		"dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
+		"jakub-onderka/php-parallel-lint": "^1.0",
 		"phing/phing": "^2.16.0",
 		"phpstan/phpstan-phpunit": "^0.10",
 		"phpunit/phpunit": "^7.0",
-		"slevomat/coding-standard": "^3.3.0"
+		"slevomat/coding-standard": "^4.5.2"
 	},
 	"autoload": {
 		"psr-4": {

phpcs.xml

@@ -1,18 +1,11 @@
 <?xml version="1.0"?>
-<ruleset name="PHPStan">
+<ruleset name="PHPStan strict rules">
 	<rule ref="vendor/consistence/coding-standard/Consistence/ruleset.xml">
 		<exclude name="Squiz.Functions.GlobalFunction.Found"/>
-	</rule>
-	<rule ref="vendor/slevomat/coding-standard/SlevomatCodingStandard/ruleset.xml">
-		<exclude name="SlevomatCodingStandard.Files.TypeNameMatchesFileName"/>
 		<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameAfterKeyword"/>
-		<exclude name="SlevomatCodingStandard.Namespaces.UseOnlyWhitelistedNamespaces"/>
+		<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameInAnnotation"/>
+		<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedExceptions"/>
 		<exclude name="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly"/>
-		<exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversableParameterTypeHintSpecification"/>
-		<exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversableReturnTypeHintSpecification"/>
-		<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameInAnnotation.NonFullyQualifiedClassName"/>
-		<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedGlobalConstants"/>
-		<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedGlobalFunctions"/>
 	</rule>
 	<rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses">
 		<properties>
@@ -32,4 +25,18 @@
 			"/>
 		</properties>
 	</rule>
+	<rule ref="SlevomatCodingStandard.ControlStructures.AssignmentInCondition"/>
+	<rule ref="SlevomatCodingStandard.ControlStructures.DisallowEqualOperators"/>
+	<rule ref="SlevomatCodingStandard.ControlStructures.EarlyExit"/>
+	<rule ref="SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming"/>
+	<rule ref="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming"/>
+	<!-- <rule ref="SlevomatCodingStandard.ControlStructures.DisallowShortTernaryOperator"/>-->
+	<!-- <rule ref="SlevomatCodingStandard.Namespaces.RequireOneNamespaceInFile"/> -->
+	<!-- <rule ref="SlevomatCodingStandard.PHP.ShortList"/> -->
+	<rule ref="SlevomatCodingStandard.Files.TypeNameMatchesFileName">
+		<properties>
+			<property name="rootNamespaces" type="array" value="src=>PHPStan,tests=>PHPStan"/>
+		</properties>
+	</rule>
+	<exclude-pattern>tests/*/data</exclude-pattern>
 </ruleset>

src/Rules/StrictCalls/DynamicCallOnStaticMethodsRule.php

@@ -11,9 +11,7 @@
 class DynamicCallOnStaticMethodsRule implements \PHPStan\Rules\Rule
 {
 
-	/**
-	 * @var \PHPStan\Rules\RuleLevelHelper
-	 */
+	/** @var \PHPStan\Rules\RuleLevelHelper */
 	private $ruleLevelHelper;
 
 	public function __construct(RuleLevelHelper $ruleLevelHelper)

src/Rules/SwitchConditions/MatchingTypeInSwitchCaseConditionRule.php

@@ -33,14 +33,16 @@ public function processNode(\PhpParser\Node $node, \PHPStan\Analyser\Scope $scop
 			}
 
 			$caseType = $scope->getType($case->cond);
-			if ($conditionType->isSuperTypeOf($caseType)->no()) {
-				$messages[] = sprintf(
-					'Switch condition type (%s) does not match case condition %s (%s).',
-					$conditionType->describe(),
-					$this->printer->prettyPrintExpr($case->cond),
-					$caseType->describe()
-				);
+			if (!$conditionType->isSuperTypeOf($caseType)->no()) {
+				continue;
 			}
+
+			$messages[] = sprintf(
+				'Switch condition type (%s) does not match case condition %s (%s).',
+				$conditionType->describe(),
+				$this->printer->prettyPrintExpr($case->cond),
+				$caseType->describe()
+			);
 		}
 
 		return $messages;

tests/Rules/StrictCalls/DynamicCallOnStaticMethodsRuleTest.php

@@ -8,9 +8,7 @@
 class DynamicCallOnStaticMethodsRuleTest extends \PHPStan\Testing\RuleTestCase
 {
 
-	/**
-	 * @var bool
-	 */
+	/** @var bool */
 	private $checkThisOnly;
 
 	protected function getRule(): Rule