Merge "Extract two functions in CheckResultDeserializer"

wikimedia · Mar 27, 2018 · 930599c · 930599c
2 parents 159567f + fd05dc5
commit 930599c
Showing 1 changed file with 31 additions and 14 deletions.
diff --git a/src/ConstraintCheck/Result/CheckResultDeserializer.php b/src/ConstraintCheck/Result/CheckResultDeserializer.php
@@ -8,6 +8,7 @@
 use WikibaseQuality\ConstraintReport\ConstraintCheck\Cache\DependencyMetadata;
 use WikibaseQuality\ConstraintReport\ConstraintCheck\Cache\Metadata;
 use WikibaseQuality\ConstraintReport\ConstraintCheck\Context\ContextCursorDeserializer;
+use WikibaseQuality\ConstraintReport\ConstraintCheck\Message\ViolationMessage;
 use WikibaseQuality\ConstraintReport\ConstraintCheck\Message\ViolationMessageDeserializer;
 use WikibaseQuality\ConstraintReport\ConstraintDeserializer;
 
@@ -72,13 +73,7 @@ public function deserialize( array $serialization ) {
 
 			$status = $serialization[CheckResultSerializer::KEY_CHECK_RESULT_STATUS];
 
-			if ( array_key_exists( CheckResultSerializer::KEY_VIOLATION_MESSAGE, $serialization ) ) {
-				$violationMessage = $this->violationMessageDeserializer->deserialize(
-					$serialization[CheckResultSerializer::KEY_VIOLATION_MESSAGE]
-				);
-			} else {
-				$violationMessage = null;
-			}
+			$violationMessage = $this->getViolationMessageFromSerialization( $serialization );
 
 			$result = new CheckResult(
 				$contextCursor,
@@ -93,13 +88,7 @@ public function deserialize( array $serialization ) {
 			);
 		}
 
-		if ( array_key_exists( CheckResultSerializer::KEY_DEPENDENCY_METADATA, $serialization ) ) {
-			$dependencyMetadata = $this->deserializeDependencyMetadata(
-				$serialization[CheckResultSerializer::KEY_DEPENDENCY_METADATA]
-			);
-		} else {
-			$dependencyMetadata = DependencyMetadata::blank();
-		}
+		$dependencyMetadata = $this->getDependencyMetadataFromSerialization( $serialization );
 
 		return $result->withMetadata(
 			Metadata::merge( [
@@ -109,6 +98,34 @@ public function deserialize( array $serialization ) {
 		);
 	}
 
+	/**
+	 * @param array $serialization
+	 * @return null|ViolationMessage
+	 */
+	private function getViolationMessageFromSerialization( array $serialization ) {
+		if ( array_key_exists( CheckResultSerializer::KEY_VIOLATION_MESSAGE, $serialization ) ) {
+			return $this->violationMessageDeserializer->deserialize(
+				$serialization[CheckResultSerializer::KEY_VIOLATION_MESSAGE]
+			);
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * @param array $serialization
+	 * @return DependencyMetadata
+	 */
+	private function getDependencyMetadataFromSerialization( array $serialization ) {
+		if ( array_key_exists( CheckResultSerializer::KEY_DEPENDENCY_METADATA, $serialization ) ) {
+			return $this->deserializeDependencyMetadata(
+				$serialization[CheckResultSerializer::KEY_DEPENDENCY_METADATA]
+			);
+		} else {
+			return DependencyMetadata::blank();
+		}
+	}
+
 	/**
 	 * @param array $serialization
 	 * @return CachingMetadata