QA: update ruleset

Author: f3l1x

composer.json

@@ -23,7 +23,7 @@
   },
   "require-dev": {
     "mockery/mockery": "^1.3.1",
-    "ninjify/qa": "^0.9.0",
+    "ninjify/qa": "^0.12",
     "ninjify/nunjuck": "^0.4",
     "phpstan/extension-installer": "^1.0",
     "phpstan/phpstan-deprecation-rules": "^0.12.2",

ruleset.xml

@@ -1,31 +1,20 @@
 <?xml version="1.0"?>
 <ruleset>
 	<!-- Contributte Coding Standard -->
-	<rule ref="./vendor/ninjify/coding-standard/contributte.xml">
-		<exclude name="SlevomatCodingStandard.ControlStructures.RequireTernaryOperator.TernaryOperatorNotUsed"/>
-		<exclude name="SlevomatCodingStandard.ControlStructures.ControlStructureSpacing.IncorrectLinesCountBeforeControlStructure"/>
-		<exclude name="SlevomatCodingStandard.ControlStructures.ControlStructureSpacing.IncorrectLinesCountAfterControlStructure"/>
-		<exclude name="SlevomatCodingStandard.ControlStructures.ControlStructureSpacing.IncorrectLinesCountAfterLastControlStructure"/>
-		<exclude name="SlevomatCodingStandard.ControlStructures.RequireMultiLineTernaryOperator.MultiLineTernaryOperatorNotUsed"/>
-	</rule>
+	<rule ref="./vendor/ninjify/coding-standard/contributte.xml"/>
 
 	<!-- Specific -->
 	<rule ref="SlevomatCodingStandard.Files.TypeNameMatchesFileName">
 		<properties>
-			<property name="rootNamespaces" type="array" value="
-				src=>Nettrine\ORM,
-				tests/cases=>Tests\Cases,
-				tests/fixtures=>Tests\Fixtures,
-				tests/toolkit=>Tests\Toolkit
-			"/>
+			<property name="rootNamespaces" type="array">
+				<element key="src" value="Nettrine\ORM"/>
+				<element key="tests/cases" value="Tests\Cases"/>
+				<element key="tests/fixtures" value="Tests\Fixtures"/>
+				<element key="tests/toolkit" value="Tests\Toolkit"/>
+			</property>
 		</properties>
 	</rule>
 
-	<!-- Tests specific -->
-	<rule ref="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.UselessDocComment">
-		<exclude-pattern>/tests/cases</exclude-pattern>
-	</rule>
-
 	<!--Exclude folders -->
 	<exclude-pattern>/tests/tmp</exclude-pattern>
 </ruleset>

src/Mapping/ContainerEntityListenerResolver.php

@@ -61,11 +61,7 @@ public function resolve($className)
 			return $this->instances[$className];
 		}
 
-		if (($service = $this->container->getByType($className, false))) {
-			$this->instances[$className] = $this->container->getByType($className);
-		} else {
-			$this->instances[$className] = new $className();
-		}
+		$this->instances[$className] = $this->container->getByType($className, false) ?? new $className();
 
 		return $this->instances[$className];
 	}