Updated coding standard that can run on PHP 7.4

Author: ruudk

composer.json

@@ -17,7 +17,7 @@
 		"doctrine/persistence": "<1.3"
 	},
 	"require-dev": {
-		"consistence/coding-standard": "^3.0.1",
+		"consistence/coding-standard": "^3.10",
 		"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
 		"doctrine/collections": "^1.0",
 		"doctrine/common": "^2.7 || ^3.0",
@@ -31,7 +31,7 @@
 		"phpstan/phpstan-strict-rules": "^0.12",
 		"phpunit/phpunit": "^7.0",
 		"ramsey/uuid-doctrine": "^1.5.0",
-		"slevomat/coding-standard": "^4.5.2"
+		"slevomat/coding-standard": "^6.4"
 	},
 	"config": {
 		"platform": {

phpcs.xml

@@ -19,7 +19,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,
@@ -30,8 +30,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"/>

src/Type/Doctrine/ObjectMetadataResolver.php

@@ -78,7 +78,9 @@ private function getResolvedRepositoryClass(): string
 		$objectManager = $this->getObjectManager();
 		if ($this->repositoryClass !== null) {
 			return $this->resolvedRepositoryClass = $this->repositoryClass;
-		} elseif ($objectManager !== null && get_class($objectManager) === 'Doctrine\ODM\MongoDB\DocumentManager') {
+		}
+
+		if ($objectManager !== null && get_class($objectManager) === 'Doctrine\ODM\MongoDB\DocumentManager') {
 			return $this->resolvedRepositoryClass = 'Doctrine\ODM\MongoDB\Repository\DocumentRepository';
 		}