Updated coding standard that can run on PHP 7.4

phpstan · Oct 22, 2020 · 4ef28a7 · 4ef28a7
1 parent 774d190
commit 4ef28a7
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -11,15 +11,15 @@
 	},
 	"require-dev": {
 		"beberlei/assert": "^2.9.5",
-		"consistence/coding-standard": "^3.0.1",
+		"consistence/coding-standard": "^3.10",
 		"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
 		"ergebnis/composer-normalize": "^2.0.2",
 		"phing/phing": "^2.16.0",
 		"php-parallel-lint/php-parallel-lint": "^1.2",
 		"phpstan/phpstan-phpunit": "^0.12.3",
 		"phpstan/phpstan-strict-rules": "^0.12",
 		"phpunit/phpunit": "^7.5.18",
-		"slevomat/coding-standard": "^4.5.2"
+		"slevomat/coding-standard": "^6.4"
 	},
 	"config": {
 		"sort-packages": true

diff --git a/phpcs.xml b/phpcs.xml
@@ -17,7 +17,7 @@
 			<property name="newlinesCountBetweenOpenTagAndDeclare" value="0"/>
 		</properties>
 	</rule>
-	<rule ref="SlevomatCodingStandard.TypeHints.TypeHintDeclaration">
+	<rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint">
 		<properties>
 			<property name="usefulAnnotations" type="array" value="
 				@dataProvider,
@@ -28,8 +28,20 @@
 		<exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversableParameterTypeHintSpecification"/>
 		<exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversableReturnTypeHintSpecification"/>
 	</rule>
+	<rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint">
+		<properties>
+			<property name="enableNativeTypeHint" value="false"/>
+		</properties>
+		<exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingTraversableTypeHintSpecification"/>
+	</rule>
+	<rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint">
+		<properties>
+			<property name="enableObjectTypeHint" value="false"/>
+		</properties>
+		<exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingTraversableTypeHintSpecification"/>
+	</rule>
 	<rule ref="SlevomatCodingStandard.ControlStructures.AssignmentInCondition"/>
-	<rule ref="SlevomatCodingStandard.ControlStructures.DisallowEqualOperators"/>
+	<rule ref="SlevomatCodingStandard.Operators.DisallowEqualOperators"/>
 	<rule ref="SlevomatCodingStandard.ControlStructures.EarlyExit"/>
 	<rule ref="SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming"/>
 	<rule ref="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming"/>

diff --git a/src/Type/BeberleiAssert/AssertHelper.php b/src/Type/BeberleiAssert/AssertHelper.php
@@ -129,7 +129,9 @@ function (Type $type): Type {
 					return TypeCombinator::removeNull($type);
 				}
 			);
-		} elseif ($assertName === 'notIsInstanceOf') {
+		}
+
+		if ($assertName === 'notIsInstanceOf') {
 			$classType = $scope->getType($args[1]->value);
 			if (!$classType instanceof ConstantStringType) {
 				return new SpecifiedTypes([], []);
@@ -144,7 +146,9 @@ function (Type $type) use ($objectType): Type {
 					return TypeCombinator::remove($type, $objectType);
 				}
 			);
-		} elseif ($assertName === 'notSame') {
+		}
+
+		if ($assertName === 'notSame') {
 			$valueType = $scope->getType($args[1]->value);
 			return self::arrayOrIterable(
 				$typeSpecifier,

diff --git a/src/Type/BeberleiAssert/AssertThatDynamicMethodReturnTypeExtension.php b/src/Type/BeberleiAssert/AssertThatDynamicMethodReturnTypeExtension.php
@@ -33,7 +33,9 @@ public function getTypeFromStaticMethodCall(\PHPStan\Reflection\MethodReflection
 		$type = new AssertThatType($valueExpr, $scope->getType($valueExpr));
 		if ($methodReflection->getName() === 'thatNullOr') {
 			return $type->toNullOr();
-		} elseif ($methodReflection->getName() === 'thatAll') {
+		}
+
+		if ($methodReflection->getName() === 'thatAll') {
 			return $type->toAll();
 		}
 

diff --git a/src/Type/BeberleiAssert/AssertThatFunctionDynamicReturnTypeExtension.php b/src/Type/BeberleiAssert/AssertThatFunctionDynamicReturnTypeExtension.php
@@ -36,7 +36,9 @@ public function getTypeFromFunctionCall(
 		$type = new AssertThatType($valueExpr, $scope->getType($valueExpr));
 		if ($functionReflection->getName() === 'Assert\\thatNullOr') {
 			return $type->toNullOr();
-		} elseif ($functionReflection->getName() === 'Assert\\thatAll') {
+		}
+
+		if ($functionReflection->getName() === 'Assert\\thatAll') {
 			return $type->toAll();
 		}
 

diff --git a/src/Type/BeberleiAssert/AssertionChainDynamicReturnTypeExtension.php b/src/Type/BeberleiAssert/AssertionChainDynamicReturnTypeExtension.php
@@ -32,7 +32,9 @@ public function getTypeFromMethodCall(
 
 		if ($methodReflection->getName() === 'all') {
 			return $type->toAll();
-		} elseif ($methodReflection->getName() === 'nullOr') {
+		}
+
+		if ($methodReflection->getName() === 'nullOr') {
 			return $type->toNullOr();
 		}