REST: Handle invalid field type via json-diff lib

Removes temporary solution in JsonDiffJsonPatchValidator in favour of handling the `InvalidFieldTypeException` thrown by the JsonDiff lib after PR#60 merged upstream.
swaggest/json-diff#60

Bug: T320705
Change-Id: I7eb29e574964cffa65d470afb8170a238d6827e0

Author: outdooracorn

composer.json

@@ -39,7 +39,7 @@
 		"psr/log": "^1.1.3",
 		"psr/http-message": "^1.0.1",
 		"onoi/message-reporter": "~1.4",
-		"swaggest/json-diff": "^3.10"
+		"swaggest/json-diff": "^3.10.4"
 	},
 	"require-dev": {
 		"mediawiki/mediawiki-codesniffer": "38.0.0",

repo/rest-api/src/Infrastructure/JsonDiffJsonPatchValidator.php

@@ -3,6 +3,7 @@
 namespace Wikibase\Repo\RestApi\Infrastructure;
 
 use Swaggest\JsonDiff\Exception;
+use Swaggest\JsonDiff\InvalidFieldTypeException;
 use Swaggest\JsonDiff\JsonPatch;
 use Swaggest\JsonDiff\MissingFieldException;
 use Swaggest\JsonDiff\UnknownOperationException;
@@ -15,39 +16,18 @@
 class JsonDiffJsonPatchValidator implements JsonPatchValidator {
 
 	public function validate( array $patch ): ?ValidationError {
-		// TODO: remove foreach checks when upstream PR merged
-		// https://github.com/swaggest/json-diff/pull/60
-		foreach ( $patch as $operation ) {
-			if ( !is_array( $operation ) ) {
-				return new ValidationError( self::CODE_INVALID );
-			}
-			if ( array_key_exists( 'op', $operation ) && !is_string( $operation['op'] ) ) {
-				return new ValidationError(
-					self::CODE_INVALID_FIELD_TYPE,
-					[ self::ERROR_CONTEXT_OPERATION => $operation, self::ERROR_CONTEXT_FIELD => 'op' ]
-				);
-			}
-			if ( array_key_exists( 'path', $operation ) && !is_string( $operation['path'] ) ) {
-				return new ValidationError(
-					self::CODE_INVALID_FIELD_TYPE,
-					[ self::ERROR_CONTEXT_OPERATION => $operation, self::ERROR_CONTEXT_FIELD => 'path' ]
-				);
-			}
-			if ( array_key_exists( 'from', $operation ) && !is_string( $operation['from'] ) ) {
-				return new ValidationError(
-					self::CODE_INVALID_FIELD_TYPE,
-					[ self::ERROR_CONTEXT_OPERATION => $operation, self::ERROR_CONTEXT_FIELD => 'from' ]
-				);
-			}
-		}
-
 		try {
 			JsonPatch::import( $patch );
 		} catch ( MissingFieldException $e ) {
 			return new ValidationError(
 				self::CODE_MISSING_FIELD,
 				[ self::ERROR_CONTEXT_OPERATION => (array)$e->getOperation(), self::ERROR_CONTEXT_FIELD => $e->getMissingField() ]
 			);
+		} catch ( InvalidFieldTypeException $e ) {
+			return new ValidationError(
+				self::CODE_INVALID_FIELD_TYPE,
+				[ self::ERROR_CONTEXT_OPERATION => (array)$e->getOperation(), self::ERROR_CONTEXT_FIELD => $e->getField() ]
+			);
 		} catch ( UnknownOperationException $e ) {
 			return new ValidationError(
 				self::CODE_INVALID_OPERATION,